From 4e4da0568d10a2baa1bcbe9f2dbc703977a57e3e Mon Sep 17 00:00:00 2001
From: qwerty287 <ndev@web.de>
Date: Wed, 29 Jun 2022 16:08:38 +0200
Subject: [PATCH] Add header view back

---
 .../fragments/CommitDetailFragment.java       |   6 -
 .../main/res/layout/custom_commit_header.xml  | 100 ---------------
 .../res/layout/fragment_commit_details.xml    | 119 ++++++++++++++++--
 3 files changed, 112 insertions(+), 113 deletions(-)
 delete mode 100644 app/src/main/res/layout/custom_commit_header.xml

diff --git a/app/src/main/java/org/mian/gitnex/fragments/CommitDetailFragment.java b/app/src/main/java/org/mian/gitnex/fragments/CommitDetailFragment.java
index eab290e2..4c4ec1bc 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/CommitDetailFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/CommitDetailFragment.java
@@ -21,7 +21,6 @@ import org.mian.gitnex.activities.ProfileActivity;
 import org.mian.gitnex.adapters.DiffFilesAdapter;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.databinding.CustomCommitHeaderBinding;
 import org.mian.gitnex.databinding.FragmentCommitDetailsBinding;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.AppUtil;
@@ -146,11 +145,6 @@ public class CommitDetailFragment extends Fragment {
 				public void onResponse(@NonNull Call<Commit> call, @NonNull Response<Commit> response) {
 
 					checkLoading();
-					CustomCommitHeaderBinding binding = CustomCommitHeaderBinding.inflate(getLayoutInflater());
-					binding.getRoot().setOnClickListener((v) -> {
-						// we need a ClickListener here to prevent that the ItemClickListener of the diffFiles ListView handles clicks for the header
-					});
-					//CommitDetailFragment.this.binding.diffFiles.addHeaderView(binding.getRoot());
 					Commit commitsModel = response.body();
 					if(commitsModel == null) {
 						onFailure(call, new Throwable());
diff --git a/app/src/main/res/layout/custom_commit_header.xml b/app/src/main/res/layout/custom_commit_header.xml
deleted file mode 100644
index c3787a38..00000000
--- a/app/src/main/res/layout/custom_commit_header.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<LinearLayout android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical"
-    android:background="?attr/primaryBackgroundColor"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <LinearLayout
-        android:id="@+id/linearLayoutFrame"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="16dp"
-        android:orientation="vertical"
-        android:background="?attr/primaryBackgroundColor">
-
-        <TextView
-            android:id="@+id/commitSubject"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="8dp"
-            android:textColor="?attr/primaryTextColor"
-            android:textSize="18sp"
-            tools:text="This is a test" />
-
-        <TextView
-            android:id="@+id/commitBody"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="8dp"
-            android:alpha=".8"
-            android:textColor="?attr/primaryTextColor"
-            android:textSize="14sp"
-            tools:text="This is a test commit message" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="5dp"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="center_vertical"
-                android:orientation="horizontal"
-                tools:ignore="UseCompoundDrawables">
-
-                <ImageView
-                    android:id="@+id/commitAuthorAvatar"
-                    android:layout_width="@dimen/list_avatar_size"
-                    android:layout_height="@dimen/list_avatar_size"
-                    android:layout_marginEnd="5dp"
-                    android:contentDescription="@string/generalImgContentText"
-                    tools:srcCompat="@tools:sample/avatars" />
-
-                <ImageView
-                    android:id="@+id/commitCommitterAvatar"
-                    android:layout_width="@dimen/list_avatar_size"
-                    android:layout_height="@dimen/list_avatar_size"
-                    android:layout_marginEnd="5dp"
-                    android:contentDescription="@string/generalImgContentText"
-                    tools:srcCompat="@tools:sample/avatars" />
-
-                <TextView
-                    android:id="@+id/commitAuthorAndCommitter"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginEnd="10dp"
-                    android:textSize="12sp"
-                    android:textColor="?attr/primaryTextColor"
-                    tools:text="opyale authored and opyale committed" />
-
-            </LinearLayout>
-
-            <TextView
-                android:id="@+id/commitSha"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="0"
-                android:alpha=".8"
-                android:drawablePadding="10dp"
-                android:textSize="12sp"
-                android:layout_marginStart="10dp"
-                android:gravity="center_vertical"
-                android:textColor="?attr/primaryTextColor"
-                app:drawableLeftCompat="@drawable/ic_commit"
-                tools:text="357f3qd5s" />
-
-        </LinearLayout>
-    </LinearLayout>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="?attr/dividerColor" />
-
-</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_commit_details.xml b/app/src/main/res/layout/fragment_commit_details.xml
index beb34c35..5383c8ac 100644
--- a/app/src/main/res/layout/fragment_commit_details.xml
+++ b/app/src/main/res/layout/fragment_commit_details.xml
@@ -2,6 +2,7 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -57,13 +58,117 @@
         style="@style/Widget.MaterialComponents.LinearProgressIndicator"
         app:indicatorColor="?attr/progressIndicatorColor" />
 
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/diff_files"
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginTop="4dp"
-        android:headerDividersEnabled="true"
-        android:background="?attr/primaryBackgroundColor"
-        android:scrollbars="vertical" />
+        android:layout_height="match_parent">
+
+        <LinearLayout android:layout_width="match_parent"
+                      android:layout_height="wrap_content"
+                      android:orientation="vertical"
+                      android:background="?attr/primaryBackgroundColor">
+
+            <LinearLayout
+                android:id="@+id/linearLayoutFrame"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:padding="16dp"
+                android:orientation="vertical"
+                android:background="?attr/primaryBackgroundColor">
+
+                <TextView
+                    android:id="@+id/commitSubject"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="8dp"
+                    android:textColor="?attr/primaryTextColor"
+                    android:textSize="18sp"
+                    tools:text="This is a test" />
+
+                <TextView
+                    android:id="@+id/commitBody"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="8dp"
+                    android:alpha=".8"
+                    android:textColor="?attr/primaryTextColor"
+                    android:textSize="14sp"
+                    tools:text="This is a test commit message" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="5dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal"
+                        tools:ignore="UseCompoundDrawables">
+
+                        <ImageView
+                            android:id="@+id/commitAuthorAvatar"
+                            android:layout_width="@dimen/list_avatar_size"
+                            android:layout_height="@dimen/list_avatar_size"
+                            android:layout_marginEnd="5dp"
+                            android:contentDescription="@string/generalImgContentText"
+                            tools:srcCompat="@tools:sample/avatars" />
+
+                        <ImageView
+                            android:id="@+id/commitCommitterAvatar"
+                            android:layout_width="@dimen/list_avatar_size"
+                            android:layout_height="@dimen/list_avatar_size"
+                            android:layout_marginEnd="5dp"
+                            android:contentDescription="@string/generalImgContentText"
+                            tools:srcCompat="@tools:sample/avatars" />
+
+                        <TextView
+                            android:id="@+id/commitAuthorAndCommitter"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginEnd="10dp"
+                            android:textSize="12sp"
+                            android:textColor="?attr/primaryTextColor"
+                            tools:text="opyale authored and opyale committed" />
+
+                    </LinearLayout>
+
+                    <TextView
+                        android:id="@+id/commitSha"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0"
+                        android:alpha=".8"
+                        android:drawablePadding="10dp"
+                        android:textSize="12sp"
+                        android:layout_marginStart="10dp"
+                        android:gravity="center_vertical"
+                        android:textColor="?attr/primaryTextColor"
+                        app:drawableLeftCompat="@drawable/ic_commit"
+                        tools:text="357f3qd5s" />
+
+                </LinearLayout>
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="?attr/dividerColor" />
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/diff_files"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="4dp"
+                android:headerDividersEnabled="true"
+                android:background="?attr/primaryBackgroundColor"
+                tools:listitem="@layout/list_diff_files"/>
+
+        </LinearLayout>
+
+    </ScrollView>
 
 </LinearLayout>