From 944e7f7458dbcbb1e52c101154bd3a45269435d0 Mon Sep 17 00:00:00 2001
From: M M Arif <mmarif@swatian.com>
Date: Mon, 1 Jun 2020 12:36:20 +0500
Subject: [PATCH 01/16] Fix repo layouts

---
 app/src/main/res/layout/fragment_my_repositories.xml      | 3 +--
 app/src/main/res/layout/fragment_repositories_by_org.xml  | 3 +--
 app/src/main/res/layout/fragment_starred_repositories.xml | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/src/main/res/layout/fragment_my_repositories.xml b/app/src/main/res/layout/fragment_my_repositories.xml
index 764019b..52b3249 100644
--- a/app/src/main/res/layout/fragment_my_repositories.xml
+++ b/app/src/main/res/layout/fragment_my_repositories.xml
@@ -15,7 +15,6 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="?attr/primaryBackgroundColor"
-            android:padding="4dp"
             android:scrollbars="vertical" />
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
@@ -52,4 +51,4 @@
         android:textSize="20sp"
         android:visibility="gone" />
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_repositories_by_org.xml b/app/src/main/res/layout/fragment_repositories_by_org.xml
index a34f531..213e730 100644
--- a/app/src/main/res/layout/fragment_repositories_by_org.xml
+++ b/app/src/main/res/layout/fragment_repositories_by_org.xml
@@ -15,7 +15,6 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="?attr/primaryBackgroundColor"
-            android:padding="4dp"
             android:scrollbars="vertical" />
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
@@ -40,4 +39,4 @@
         android:indeterminate="true"
         android:visibility="visible" />
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_starred_repositories.xml b/app/src/main/res/layout/fragment_starred_repositories.xml
index acb01e2..fd8b6aa 100644
--- a/app/src/main/res/layout/fragment_starred_repositories.xml
+++ b/app/src/main/res/layout/fragment_starred_repositories.xml
@@ -15,7 +15,6 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="?attr/primaryBackgroundColor"
-            android:padding="4dp"
             android:scrollbars="vertical" />
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
@@ -52,4 +51,4 @@
         android:padding="@dimen/fab_padding"
         android:contentDescription="@string/addNewContent" />
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
-- 
2.40.1


From 72c4ad06ff0cb24f40ea684cd8dec617adb8ddf3 Mon Sep 17 00:00:00 2001
From: M M Arif <mmarif@swatian.com>
Date: Mon, 1 Jun 2020 12:45:45 +0500
Subject: [PATCH 02/16] improve teams list layout by org

---
 .../layout/activity_create_team_by_org.xml    | 32 +++++++++----------
 .../main/res/layout/fragment_teams_by_org.xml |  3 +-
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/app/src/main/res/layout/activity_create_team_by_org.xml b/app/src/main/res/layout/activity_create_team_by_org.xml
index 435f435..e9a3f41 100644
--- a/app/src/main/res/layout/activity_create_team_by_org.xml
+++ b/app/src/main/res/layout/activity_create_team_by_org.xml
@@ -74,7 +74,7 @@
                 android:background="@drawable/shape_inputs"
                 android:textColor="?attr/inputTextColor"
                 android:textColorHint="?attr/hintColor"
-                android:textColorHighlight="?attr/primaryTextColor"/>
+                android:textColorHighlight="?attr/primaryTextColor" />
 
             <TextView
                 android:layout_width="match_parent"
@@ -97,7 +97,7 @@
                 android:background="@drawable/shape_inputs"
                 android:textColor="?attr/inputTextColor"
                 android:textColorHint="?attr/hintColor"
-                android:textColorHighlight="?attr/primaryTextColor"/>
+                android:textColorHighlight="?attr/primaryTextColor" />
 
             <TextView
                 android:layout_width="match_parent"
@@ -105,7 +105,7 @@
                 android:text="@string/newTeamPermission"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:layout_marginTop="10dp"/>
+                android:layout_marginTop="10dp" />
 
             <TextView
                 android:id="@+id/teamPermission"
@@ -116,10 +116,10 @@
                 android:textSize="14sp"
                 tools:ignore="Autofill"
                 android:background="@drawable/shape_inputs"
-                android:textColor="@color/white"
-                android:textColorHint="@color/white"
-                android:inputType="none"
-                android:textColorHighlight="@color/white"/>
+                android:textColor="?attr/inputTextColor"
+                android:textColorHint="?attr/hintColor"
+                android:textColorHighlight="?attr/primaryTextColor"
+                android:inputType="none" />
 
             <TextView
                 android:id="@+id/teamPermissionDetail"
@@ -128,7 +128,7 @@
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="12sp"
                 android:gravity="start"
-                android:visibility="gone"/>
+                android:visibility="gone" />
 
             <TextView
                 android:layout_width="match_parent"
@@ -136,7 +136,7 @@
                 android:text="@string/newTeamAccessControls"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:layout_marginTop="10dp"/>
+                android:layout_marginTop="10dp" />
 
             <TextView
                 android:id="@+id/teamAccessControls"
@@ -147,16 +147,16 @@
                 android:textSize="14sp"
                 tools:ignore="Autofill"
                 android:background="@drawable/shape_inputs"
-                android:textColor="?attr/primaryTextColor"
-                android:textColorHint="?attr/primaryTextColor"
-                android:inputType="none"
-                android:textColorHighlight="?attr/primaryTextColor"/>
+                android:textColor="?attr/inputTextColor"
+                android:textColorHint="?attr/hintColor"
+                android:textColorHighlight="?attr/primaryTextColor"
+                android:inputType="none" />
 
             <TextView
                 android:id="@+id/teamAccessControlsArray"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:visibility="gone"/>
+                android:visibility="gone" />
 
             <Button
                 android:id="@+id/createTeamButton"
@@ -171,10 +171,10 @@
 
             <View
                 android:layout_width="match_parent"
-                android:layout_height="35dp"/>
+                android:layout_height="35dp" />
 
         </LinearLayout>
 
     </ScrollView>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_teams_by_org.xml b/app/src/main/res/layout/fragment_teams_by_org.xml
index c72965b..6b1b58e 100644
--- a/app/src/main/res/layout/fragment_teams_by_org.xml
+++ b/app/src/main/res/layout/fragment_teams_by_org.xml
@@ -15,7 +15,6 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="?attr/primaryBackgroundColor"
-            android:padding="4dp"
             android:scrollbars="vertical" />
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
@@ -40,4 +39,4 @@
         android:indeterminate="true"
         android:visibility="visible" />
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
-- 
2.40.1


From 824140bc68f61597af6a339e4ce6547a1dd76955 Mon Sep 17 00:00:00 2001
From: M M Arif <mmarif@swatian.com>
Date: Mon, 1 Jun 2020 15:13:23 +0500
Subject: [PATCH 03/16] improve org info and list orgs

---
 .../fragments/OrganizationInfoFragment.java   | 24 ++++++++++++-------
 .../res/layout/fragment_organization_info.xml | 21 +++++++---------
 .../res/layout/fragment_organizations.xml     |  1 -
 .../main/res/layout/list_organizations.xml    | 14 ++++-------
 4 files changed, 28 insertions(+), 32 deletions(-)

diff --git a/app/src/main/java/org/mian/gitnex/fragments/OrganizationInfoFragment.java b/app/src/main/java/org/mian/gitnex/fragments/OrganizationInfoFragment.java
index 71cda31..adeb45b 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/OrganizationInfoFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/OrganizationInfoFragment.java
@@ -12,6 +12,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import org.mian.gitnex.R;
@@ -37,6 +38,7 @@ public class OrganizationInfoFragment extends Fragment {
     private TextView orgDescInfo;
     private TextView orgWebsiteInfo;
     private TextView orgLocationInfo;
+    private LinearLayout orgInfoLayout;
 
     private RepoInfoFragment.OnFragmentInteractionListener mListener;
 
@@ -76,6 +78,7 @@ public class OrganizationInfoFragment extends Fragment {
         orgDescInfo = v.findViewById(R.id.orgDescInfo);
         orgWebsiteInfo = v.findViewById(R.id.orgWebsiteInfo);
         orgLocationInfo = v.findViewById(R.id.orgLocationInfo);
+	    orgInfoLayout = v.findViewById(R.id.orgInfoLayout);
 
         orgNameInfo.setText(orgName);
 
@@ -99,19 +102,22 @@ public class OrganizationInfoFragment extends Fragment {
 
                 Organization orgInfo = response.body();
 
-                if (response.isSuccessful()) {
+                if (response.code() == 200) {
 
-                    if (response.code() == 200) {
+                    orgInfoLayout.setVisibility(View.VISIBLE);
 
-                        assert orgInfo != null;
-                        PicassoService.getInstance(ctx).get().load(orgInfo.getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(180, 180).centerCrop().into(orgAvatar);
-                        orgDescInfo.setText(orgInfo.getDescription());
-                        orgWebsiteInfo.setText(orgInfo.getWebsite());
-                        orgLocationInfo.setText(orgInfo.getLocation());
+                    assert orgInfo != null;
+                    PicassoService.getInstance(ctx).get().load(orgInfo.getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(180, 180).centerCrop().into(orgAvatar);
+                    orgDescInfo.setText(orgInfo.getDescription());
+                    orgWebsiteInfo.setText(orgInfo.getWebsite());
+                    orgLocationInfo.setText(orgInfo.getLocation());
 
-                        mProgressBar.setVisibility(View.GONE);
+                    mProgressBar.setVisibility(View.GONE);
 
-                    }
+                }
+                else if(response.code() == 404) {
+
+	                mProgressBar.setVisibility(View.GONE);
 
                 }
                 else {
diff --git a/app/src/main/res/layout/fragment_organization_info.xml b/app/src/main/res/layout/fragment_organization_info.xml
index affaec9..1e6103d 100644
--- a/app/src/main/res/layout/fragment_organization_info.xml
+++ b/app/src/main/res/layout/fragment_organization_info.xml
@@ -15,7 +15,8 @@
             android:orientation="vertical"
             android:id="@+id/orgInfoLayout"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:visibility="gone">
 
             <ImageView
                 android:id="@+id/orgAvatar"
@@ -24,22 +25,16 @@
                 android:layout_gravity="center_horizontal"
                 android:layout_marginTop="10dp"
                 android:contentDescription="@string/orgContentAvatar"
-                android:layout_marginBottom="20dp"/>
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:text="@string/nameText"
-                android:textSize="16sp"
-                android:textColor="?attr/primaryTextColor"/>
+                android:layout_marginBottom="15dp"/>
 
             <TextView
                 android:id="@+id/orgNameInfo"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center"
                 android:textIsSelectable="true"
                 android:textSize="16sp"
-                android:paddingTop="5dp"
                 android:textColor="?attr/primaryTextColor"/>
 
             <TextView
@@ -115,4 +110,4 @@
 
     </RelativeLayout>
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_organizations.xml b/app/src/main/res/layout/fragment_organizations.xml
index 77dec7e..b1068f4 100644
--- a/app/src/main/res/layout/fragment_organizations.xml
+++ b/app/src/main/res/layout/fragment_organizations.xml
@@ -13,7 +13,6 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="?attr/primaryBackgroundColor"
-            android:padding="4dp"
             android:scrollbars="vertical" />
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
diff --git a/app/src/main/res/layout/list_organizations.xml b/app/src/main/res/layout/list_organizations.xml
index 4775706..cc6204b 100644
--- a/app/src/main/res/layout/list_organizations.xml
+++ b/app/src/main/res/layout/list_organizations.xml
@@ -1,19 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?attr/primaryBackgroundColor" >
+    android:background="?attr/primaryBackgroundColor">
 
     <RelativeLayout
         android:id="@+id/linearLayoutFrame"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
-        android:fitsSystemWindows="true"
         android:orientation="vertical"
-        android:padding="10dp"
-        tools:context=".activities.MainActivity">
+        android:padding="15dp">
 
         <TextView
             android:id="@+id/organizationId"
@@ -26,7 +24,6 @@
             android:layout_width="40dp"
             android:layout_height="40dp"
             android:layout_marginEnd="15dp"
-            android:layout_marginBottom="5dp"
             android:src="@drawable/ic_android"
             android:contentDescription="@string/orgContentAvatar"/>
 
@@ -50,7 +47,6 @@
                 android:id="@+id/orgDescription"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="10dp"
                 android:text="@string/orgDescription"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-- 
2.40.1


From 1932a367b2474670fb8f3ab614b92478c8a09ca6 Mon Sep 17 00:00:00 2001
From: M M Arif <mmarif@swatian.com>
Date: Mon, 1 Jun 2020 15:17:59 +0500
Subject: [PATCH 04/16] improve files layout

---
 app/src/main/res/layout/fragment_files.xml | 3 +--
 app/src/main/res/layout/list_files.xml     | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/src/main/res/layout/fragment_files.xml b/app/src/main/res/layout/fragment_files.xml
index dce8d9c..3925f83 100644
--- a/app/src/main/res/layout/fragment_files.xml
+++ b/app/src/main/res/layout/fragment_files.xml
@@ -34,7 +34,6 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="?attr/primaryBackgroundColor"
-            android:padding="4dp"
             android:scrollbars="vertical" />
 
         <TextView
@@ -59,4 +58,4 @@
         android:indeterminate="true"
         android:visibility="gone" />
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/app/src/main/res/layout/list_files.xml b/app/src/main/res/layout/list_files.xml
index c21819b..c4a18e5 100644
--- a/app/src/main/res/layout/list_files.xml
+++ b/app/src/main/res/layout/list_files.xml
@@ -4,7 +4,7 @@
     android:id="@+id/linearLayoutFilesFrame"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="10dp"
+    android:layout_margin="12dp"
     android:background="?attr/primaryBackgroundColor">
 
     <TextView
@@ -62,4 +62,4 @@
 
     </LinearLayout>
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
-- 
2.40.1


From 2f212246ff850bfe68000be7c998d034621c782e Mon Sep 17 00:00:00 2001
From: M M Arif <mmarif@swatian.com>
Date: Mon, 1 Jun 2020 15:36:55 +0500
Subject: [PATCH 05/16] layout updates for issues, pr. Fix pr nullable objects
 for lower versions

---
 .../gitnex/adapters/PullRequestsAdapter.java  |   8 +-
 app/src/main/res/layout/fragment_issues.xml   |   3 +-
 .../res/layout/fragment_pull_requests.xml     |   3 +-
 app/src/main/res/layout/list_issues.xml       | 122 +++++++++---------
 app/src/main/res/layout/list_pr.xml           | 114 ++++++++--------
 5 files changed, 131 insertions(+), 119 deletions(-)

diff --git a/app/src/main/java/org/mian/gitnex/adapters/PullRequestsAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/PullRequestsAdapter.java
index 992f018..60a2c9f 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/PullRequestsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/PullRequestsAdapter.java
@@ -188,9 +188,11 @@ public class PullRequestsAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
 
 			prNumber.setText(String.valueOf(prModel.getNumber()));
 			prMergeable.setText(String.valueOf(prModel.isMergeable()));
-			prHeadBranch.setText(prModel.getHead().getRef());
-			prIsFork.setText(String.valueOf(prModel.getHead().getRepo().isFork()));
-			prForkFullName.setText(prModel.getHead().getRepo().getFull_name());
+			if(prModel.getHead() != null) {
+				prHeadBranch.setText(prModel.getHead().getRef());
+				prIsFork.setText(String.valueOf(prModel.getHead().getRepo().isFork()));
+				prForkFullName.setText(prModel.getHead().getRepo().getFull_name());
+			}
 			prCommentsCount.setText(String.valueOf(prModel.getComments()));
 
 			prCreatedTime.setText(TimeHelper.formatTime(prModel.getCreated_at(), new Locale(locale), timeFormat, context));
diff --git a/app/src/main/res/layout/fragment_issues.xml b/app/src/main/res/layout/fragment_issues.xml
index 528ab48..c99afd0 100644
--- a/app/src/main/res/layout/fragment_issues.xml
+++ b/app/src/main/res/layout/fragment_issues.xml
@@ -16,7 +16,6 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="?attr/primaryBackgroundColor"
-            android:padding="4dp"
             android:scrollbars="vertical" />
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
@@ -41,4 +40,4 @@
         android:textSize="20sp"
         android:visibility="gone" />
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_pull_requests.xml b/app/src/main/res/layout/fragment_pull_requests.xml
index dc51a37..4ab0966 100644
--- a/app/src/main/res/layout/fragment_pull_requests.xml
+++ b/app/src/main/res/layout/fragment_pull_requests.xml
@@ -16,7 +16,6 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="?attr/primaryBackgroundColor"
-            android:padding="4dp"
             android:scrollbars="vertical" />
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
@@ -41,4 +40,4 @@
         android:textSize="20sp"
         android:visibility="gone" />
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/app/src/main/res/layout/list_issues.xml b/app/src/main/res/layout/list_issues.xml
index f08f952..6a15a29 100644
--- a/app/src/main/res/layout/list_issues.xml
+++ b/app/src/main/res/layout/list_issues.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout
-    xmlns:tools="http://schemas.android.com/tools"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/relativeLayoutFrameIssuesList"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="15dp"
-    android:layout_marginStart="15dp"
-    android:layout_marginEnd="15dp"
-    android:background="?attr/primaryBackgroundColor"
-    tools:context=".activities.RepoDetailActivity">
+    android:background="?attr/primaryBackgroundColor">
 
     <TextView
         android:id="@+id/issueNumber"
@@ -17,86 +12,95 @@
         android:layout_height="wrap_content"
         android:visibility="invisible" />
 
-    <ImageView
-        android:id="@+id/assigneeAvatar"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
-        android:layout_marginEnd="15dp"
-        android:contentDescription="@string/generalImgContentText"
-        android:src="@drawable/ic_android" />
-
-    <LinearLayout
-        android:id="@+id/infoSection"
+    <RelativeLayout
+        android:id="@+id/mainFrame"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_toEndOf="@+id/assigneeAvatar"
+        android:layout_alignParentTop="true"
+        android:layout_margin="15dp"
         android:orientation="vertical">
 
-        <LinearLayout
-            android:id="@+id/frameIssueNameStatus"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="10dp"
-            android:orientation="horizontal">
-
-            <TextView
-                android:id="@+id/issueTitle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="top|center_vertical"
-                android:textAlignment="gravity"
-                android:text="@string/strFilter"
-                android:textColor="?attr/primaryTextColor"
-                android:textSize="18sp" />
-
-        </LinearLayout>
+        <ImageView
+            android:id="@+id/assigneeAvatar"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_marginEnd="15dp"
+            android:contentDescription="@string/generalImgContentText"
+            android:src="@drawable/ic_android" />
 
         <LinearLayout
-            android:id="@+id/frameCreatedDate"
+            android:id="@+id/infoSection"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:orientation="horizontal">
+            android:layout_toEndOf="@+id/assigneeAvatar"
+            android:orientation="vertical">
 
             <LinearLayout
-                android:id="@+id/frameCommentsCount"
-                android:layout_width="0dp"
-                android:layout_weight=".25"
+                android:id="@+id/frameIssueNameStatus"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginBottom="10dp"
                 android:orientation="horizontal">
 
                 <TextView
-                    android:id="@+id/issueCommentsCount"
+                    android:id="@+id/issueTitle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:gravity="start"
-                    android:drawablePadding="5dp"
-                    android:drawableStart="@drawable/ic_comment_20"
-                    android:layout_gravity="center_horizontal"
+                    android:gravity="top|center_vertical"
+                    android:textAlignment="gravity"
+                    android:text="@string/strFilter"
+                    android:textColor="?attr/primaryTextColor"
+                    android:textSize="18sp" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/frameCreatedDate"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:orientation="horizontal">
+
+                <LinearLayout
+                    android:id="@+id/frameCommentsCount"
+                    android:layout_width="0dp"
+                    android:layout_weight=".25"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:id="@+id/issueCommentsCount"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:gravity="start"
+                        android:drawablePadding="5dp"
+                        android:drawableStart="@drawable/ic_comment_20"
+                        android:layout_gravity="center_horizontal"
+                        android:textColor="?attr/primaryTextColor"
+                        android:textSize="14sp" />
+
+                </LinearLayout>
+
+                <TextView
+                    android:id="@+id/issueCreatedTime"
+                    android:layout_width="0dp"
+                    android:layout_weight=".25"
+                    android:layout_height="wrap_content"
+                    android:gravity="end"
                     android:textColor="?attr/primaryTextColor"
                     android:textSize="14sp" />
 
             </LinearLayout>
 
-            <TextView
-                android:id="@+id/issueCreatedTime"
-                android:layout_width="0dp"
-                android:layout_weight=".25"
-                android:layout_height="wrap_content"
-                android:gravity="end"
-                android:textColor="?attr/primaryTextColor"
-                android:textSize="14sp" />
-
         </LinearLayout>
 
-    </LinearLayout>
+    </RelativeLayout>
 
     <View
-        android:layout_below="@id/infoSection"
+        android:layout_below="@id/mainFrame"
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:id="@+id/divider"
-        android:layout_marginTop="15dp"
         android:background="?attr/dividerColor" />
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/app/src/main/res/layout/list_pr.xml b/app/src/main/res/layout/list_pr.xml
index b038072..7aecb80 100644
--- a/app/src/main/res/layout/list_pr.xml
+++ b/app/src/main/res/layout/list_pr.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout
-    xmlns:tools="http://schemas.android.com/tools"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/relativeLayoutFrame"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="15dp"
-    tools:context=".activities.RepoDetailActivity">
+    android:background="?attr/primaryBackgroundColor">
 
     <TextView
         android:id="@+id/prNumber"
@@ -38,77 +36,87 @@
         android:layout_height="wrap_content"
         android:visibility="invisible"/>
 
-    <ImageView
-        android:id="@+id/assigneeAvatar"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
-        android:layout_marginEnd="15dp"
-        android:contentDescription="@string/generalImgContentText"
-        android:src="@drawable/ic_android" />
-
-    <LinearLayout
-        android:id="@+id/infoSection"
+    <RelativeLayout
+        android:id="@+id/mainFrame"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_toEndOf="@+id/assigneeAvatar"
+        android:layout_alignParentTop="true"
+        android:layout_margin="15dp"
         android:orientation="vertical">
 
-        <LinearLayout
-            android:id="@+id/framePrNameStatus"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="10dp"
-            android:orientation="horizontal">
-
-            <TextView
-                android:id="@+id/prTitle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="top|center_vertical"
-                android:textAlignment="gravity"
-                android:textColor="?attr/primaryTextColor"
-                android:textSize="18sp" />
-
-        </LinearLayout>
+        <ImageView
+            android:id="@+id/assigneeAvatar"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_marginEnd="15dp"
+            android:contentDescription="@string/generalImgContentText"
+            android:src="@drawable/ic_android" />
 
         <LinearLayout
-            android:id="@+id/frameCreatedDate"
+            android:id="@+id/infoSection"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:orientation="horizontal">
+            android:layout_toEndOf="@+id/assigneeAvatar"
+            android:orientation="vertical">
 
             <LinearLayout
-                android:id="@+id/frameCommentsCount"
-                android:layout_width="0dp"
-                android:layout_weight=".25"
+                android:id="@+id/framePrNameStatus"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginBottom="10dp"
                 android:orientation="horizontal">
 
                 <TextView
-                    android:id="@+id/prCommentsCount"
+                    android:id="@+id/prTitle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:gravity="start"
-                    android:drawablePadding="5dp"
-                    android:drawableStart="@drawable/ic_comment_20"
-                    android:layout_gravity="center_horizontal"
+                    android:gravity="top|center_vertical"
+                    android:textAlignment="gravity"
+                    android:textColor="?attr/primaryTextColor"
+                    android:textSize="18sp" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/frameCreatedDate"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:orientation="horizontal">
+
+                <LinearLayout
+                    android:id="@+id/frameCommentsCount"
+                    android:layout_width="0dp"
+                    android:layout_weight=".25"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:id="@+id/prCommentsCount"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:gravity="start"
+                        android:drawablePadding="5dp"
+                        android:drawableStart="@drawable/ic_comment_20"
+                        android:layout_gravity="center_horizontal"
+                        android:textColor="?attr/primaryTextColor"
+                        android:textSize="14sp" />
+
+                </LinearLayout>
+
+                <TextView
+                    android:id="@+id/prCreatedTime"
+                    android:layout_width="0dp"
+                    android:layout_weight=".25"
+                    android:layout_height="wrap_content"
+                    android:gravity="end"
                     android:textColor="?attr/primaryTextColor"
                     android:textSize="14sp" />
 
             </LinearLayout>
 
-            <TextView
-                android:id="@+id/prCreatedTime"
-                android:layout_width="0dp"
-                android:layout_weight=".25"
-                android:layout_height="wrap_content"
-                android:gravity="end"
-                android:textColor="?attr/primaryTextColor"
-                android:textSize="14sp" />
-
         </LinearLayout>
 
-    </LinearLayout>
+    </RelativeLayout>
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
-- 
2.40.1


From b0aa895a106e675981edd7fbfb64b152cdbc43ad Mon Sep 17 00:00:00 2001
From: M M Arif <mmarif@swatian.com>
Date: Mon, 1 Jun 2020 17:05:47 +0500
Subject: [PATCH 06/16] branches and milestones layout update. Fix milestone
 infinite pagination loop for lower versions

---
 .../gitnex/fragments/MilestonesFragment.java  |  38 +--
 app/src/main/res/layout/fragment_branches.xml |   3 +-
 .../main/res/layout/fragment_milestones.xml   |   3 +-
 app/src/main/res/layout/list_branches.xml     |   3 +-
 app/src/main/res/layout/list_milestones.xml   | 222 ++++++++++--------
 5 files changed, 146 insertions(+), 123 deletions(-)

diff --git a/app/src/main/java/org/mian/gitnex/fragments/MilestonesFragment.java b/app/src/main/java/org/mian/gitnex/fragments/MilestonesFragment.java
index 6801e43..4aac365 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/MilestonesFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/MilestonesFragment.java
@@ -77,16 +77,20 @@ public class MilestonesFragment extends Fragment {
         dataList = new ArrayList<>();
         adapter = new MilestonesAdapter(ctx, dataList);
 
-        adapter.setLoadMoreListener(() -> viewBinding.recyclerView.post(() -> {
+	    if(new Version(tinyDb.getString("giteaVersion")).higherOrEqual("1.12.0")) {
 
-            if(dataList.size() == resultLimit || pageSize == resultLimit) {
+		    adapter.setLoadMoreListener(() -> viewBinding.recyclerView.post(() -> {
 
-                int page = (dataList.size() + resultLimit) / resultLimit;
-                loadMore(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, page, resultLimit, tinyDb.getString("milestoneState"));
+			    if(dataList.size() == resultLimit || pageSize == resultLimit) {
 
-            }
+				    int page = (dataList.size() + resultLimit) / resultLimit;
+				    loadMore(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, page, resultLimit, tinyDb.getString("milestoneState"));
 
-        }));
+			    }
+
+		    }));
+
+	    }
 
         viewBinding.recyclerView.setHasFixedSize(true);
         viewBinding.recyclerView.setLayoutManager(new LinearLayoutManager(ctx));
@@ -113,16 +117,21 @@ public class MilestonesFragment extends Fragment {
             dataList.clear();
 
             adapter = new MilestonesAdapter(ctx, dataList);
-            adapter.setLoadMoreListener(() -> viewBinding.recyclerView.post(() -> {
 
-                if(dataList.size() == resultLimit || pageSize == resultLimit) {
+	        if(new Version(tinyDb.getString("giteaVersion")).higherOrEqual("1.12.0")) {
 
-                    int page = (dataList.size() + resultLimit) / resultLimit;
-                    loadMore(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, page, resultLimit, milestoneState);
+		        adapter.setLoadMoreListener(() -> viewBinding.recyclerView.post(() -> {
 
-                }
+			        if(dataList.size() == resultLimit || pageSize == resultLimit) {
 
-            }));
+				        int page = (dataList.size() + resultLimit) / resultLimit;
+				        loadMore(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, page, resultLimit, milestoneState);
+
+			        }
+
+		        }));
+
+	        }
 
             tinyDb.putString("milestoneState", milestoneState);
 
@@ -171,7 +180,7 @@ public class MilestonesFragment extends Fragment {
             @Override
             public void onResponse(@NonNull Call<List<Milestones>> call, @NonNull Response<List<Milestones>> response) {
 
-                if(response.isSuccessful()) {
+                if(response.code() == 200) {
 
                     assert response.body() != null;
                     if(response.body().size() > 0) {
@@ -222,7 +231,7 @@ public class MilestonesFragment extends Fragment {
             @Override
             public void onResponse(@NonNull Call<List<Milestones>> call, @NonNull Response<List<Milestones>> response) {
 
-                if(response.isSuccessful()) {
+	            if(response.code() == 200) {
 
                     //remove loading view
                     dataList.remove(dataList.size() - 1);
@@ -238,7 +247,6 @@ public class MilestonesFragment extends Fragment {
                     }
                     else {
 
-                        Toasty.info(ctx, getString(R.string.noMoreData));
                         adapter.setMoreDataAvailable(false);
 
                     }
diff --git a/app/src/main/res/layout/fragment_branches.xml b/app/src/main/res/layout/fragment_branches.xml
index 0711614..8fd7ea7 100644
--- a/app/src/main/res/layout/fragment_branches.xml
+++ b/app/src/main/res/layout/fragment_branches.xml
@@ -16,7 +16,6 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="?attr/primaryBackgroundColor"
-            android:padding="4dp"
             android:scrollbars="vertical" />
 
         <GridView
@@ -50,4 +49,4 @@
         android:indeterminate="true"
         android:visibility="visible" />
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_milestones.xml b/app/src/main/res/layout/fragment_milestones.xml
index 65fcf8a..4095f72 100644
--- a/app/src/main/res/layout/fragment_milestones.xml
+++ b/app/src/main/res/layout/fragment_milestones.xml
@@ -16,7 +16,6 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="?attr/primaryBackgroundColor"
-            android:padding="4dp"
             android:scrollbars="vertical" />
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
@@ -54,4 +53,4 @@
         android:visibility="gone"
         android:contentDescription="@string/addNewContent" />
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/app/src/main/res/layout/list_branches.xml b/app/src/main/res/layout/list_branches.xml
index 48095e4..8cf098c 100644
--- a/app/src/main/res/layout/list_branches.xml
+++ b/app/src/main/res/layout/list_branches.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
diff --git a/app/src/main/res/layout/list_milestones.xml b/app/src/main/res/layout/list_milestones.xml
index fd869b1..e1c256a 100644
--- a/app/src/main/res/layout/list_milestones.xml
+++ b/app/src/main/res/layout/list_milestones.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="15dp"
     android:id="@+id/milestoneFrame"
     android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical">
@@ -21,119 +20,136 @@
         android:id="@+id/milestoneStatus" />
 
     <LinearLayout
-        android:id="@+id/frameTitle"
+        android:id="@+id/mainFrame"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal">
+        android:layout_alignParentTop="true"
+        android:layout_margin="15dp"
+        android:orientation="vertical">
 
-        <TextView
-            android:id="@+id/milestoneTitle"
-            android:layout_width="0dp"
-            android:textIsSelectable="true"
+        <LinearLayout
+            android:id="@+id/frameTitle"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight=".80"
-            android:layout_marginBottom="5dp"
-            android:textColor="?attr/primaryTextColor"
-            android:textSize="18sp" />
-
-        <ImageView
-            android:id="@+id/milestoneState"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight=".15"
-            android:layout_gravity="end"
-            android:gravity="end"
-            android:scaleType="fitEnd"
-            android:contentDescription="@string/pageTitleCreateMilestone"
-            android:layout_marginBottom="5dp" />
-
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/milestoneDescription"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/repoDescription"
-        android:textIsSelectable="true"
-        android:textColor="?attr/primaryTextColor"
-        android:textSize="14sp" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        android:layout_marginBottom="5dp"
-        android:orientation="horizontal">
-
-        <TextView
-            android:id="@+id/milestoneIssuesClosed"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="8"
-            android:text="@string/repoWatchers"
-            android:gravity="start"
-            android:textColor="?attr/primaryTextColor"
-            android:textSize="14sp" />
-
-        <ProgressBar
-            android:id="@+id/milestoneProgress"
-            style="@style/Widget.AppCompat.ProgressBar.Horizontal"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="80"
-            android:progress="50"
-            android:layout_marginTop="2dp"
-            android:progressDrawable="@drawable/progress_bar"
-            android:progressTint="@color/colorLightGreen" />
-
-        <TextView
-            android:id="@+id/milestoneIssuesOpen"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="8"
-            android:text="@string/repoStars"
-            android:gravity="end"
-            android:textColor="?attr/primaryTextColor"
-            android:textSize="14sp" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:id="@+id/milestoneDateMenuFrame"
-        android:layout_marginTop="8dp"
-        android:orientation="horizontal">
-
-        <RelativeLayout
-            android:layout_width="0dp"
-            android:layout_weight=".90"
-            android:layout_height="wrap_content"
-            android:id="@+id/dueDateFrame"
-            android:orientation="horizontal"
-            android:layout_marginTop="3dp">
+            android:orientation="horizontal">
 
             <TextView
-                android:id="@+id/milestoneDueDate"
-                android:layout_width="wrap_content"
+                android:id="@+id/milestoneTitle"
+                android:layout_width="0dp"
+                android:textIsSelectable="true"
                 android:layout_height="wrap_content"
-                android:text="@string/dueDate"
+                android:layout_weight=".80"
+                android:layout_marginBottom="5dp"
+                android:textColor="?attr/primaryTextColor"
+                android:textSize="18sp" />
+
+            <ImageView
+                android:id="@+id/milestoneState"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight=".15"
+                android:layout_gravity="end"
+                android:gravity="end"
+                android:scaleType="fitEnd"
+                android:contentDescription="@string/pageTitleCreateMilestone"
+                android:layout_marginBottom="5dp" />
+
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/milestoneDescription"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/repoDescription"
+            android:textIsSelectable="true"
+            android:textColor="?attr/primaryTextColor"
+            android:textSize="14sp" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:layout_marginBottom="5dp"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/milestoneIssuesClosed"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="8"
+                android:text="@string/repoWatchers"
                 android:gravity="start"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="12sp" />
+                android:textSize="14sp" />
 
-        </RelativeLayout>
+            <ProgressBar
+                android:id="@+id/milestoneProgress"
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="80"
+                android:progress="50"
+                android:layout_marginTop="2dp"
+                android:progressDrawable="@drawable/progress_bar"
+                android:progressTint="@color/colorLightGreen" />
 
-        <ImageView
-            android:id="@+id/milestonesMenu"
-            android:layout_width="0dp"
-            android:layout_weight=".10"
+            <TextView
+                android:id="@+id/milestoneIssuesOpen"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="8"
+                android:text="@string/repoStars"
+                android:gravity="end"
+                android:textColor="?attr/primaryTextColor"
+                android:textSize="14sp" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="end"
-            android:scaleType="fitEnd"
-            android:src="@drawable/ic_dotted_menu_horizontal"
-            android:contentDescription="@string/menuContentDesc" />
+            android:id="@+id/milestoneDateMenuFrame"
+            android:layout_marginTop="8dp"
+            android:orientation="horizontal">
+
+            <RelativeLayout
+                android:layout_width="0dp"
+                android:layout_weight=".90"
+                android:layout_height="wrap_content"
+                android:id="@+id/dueDateFrame"
+                android:orientation="horizontal"
+                android:layout_marginTop="3dp">
+
+                <TextView
+                    android:id="@+id/milestoneDueDate"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/dueDate"
+                    android:gravity="start"
+                    android:textColor="?attr/primaryTextColor"
+                    android:textSize="12sp" />
+
+            </RelativeLayout>
+
+            <ImageView
+                android:id="@+id/milestonesMenu"
+                android:layout_width="0dp"
+                android:layout_weight=".10"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end"
+                android:scaleType="fitEnd"
+                android:src="@drawable/ic_dotted_menu_horizontal"
+                android:contentDescription="@string/menuContentDesc" />
+
+        </LinearLayout>
 
     </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+    <View
+        android:layout_below="@id/mainFrame"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:id="@+id/divider"
+        android:background="?attr/dividerColor" />
+
+</RelativeLayout>
-- 
2.40.1


From 54f90bfe450417ad017e5e7bcd5e48476cdaf448 Mon Sep 17 00:00:00 2001
From: opyale <opyale@noreply.gitea.io>
Date: Mon, 1 Jun 2020 15:35:25 +0200
Subject: [PATCH 07/16] Improving milestones.

---
 .../gitnex/adapters/MilestonesAdapter.java    |  62 ++----
 app/src/main/res/drawable/progress_bar.xml    |   8 +-
 .../res/drawable/shape_milestone_closed.xml   |  14 ++
 .../res/drawable/shape_milestone_open.xml     |  14 ++
 app/src/main/res/layout/list_milestones.xml   | 186 +++++++++++-------
 app/src/main/res/values/colors.xml            |   2 +-
 6 files changed, 168 insertions(+), 118 deletions(-)
 create mode 100644 app/src/main/res/drawable/shape_milestone_closed.xml
 create mode 100644 app/src/main/res/drawable/shape_milestone_open.xml

diff --git a/app/src/main/java/org/mian/gitnex/adapters/MilestonesAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/MilestonesAdapter.java
index 9807250..d3f1ab9 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/MilestonesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/MilestonesAdapter.java
@@ -112,7 +112,7 @@ public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
         private TextView msOpenIssues;
         private TextView msClosedIssues;
         private TextView msDueDate;
-        private ImageView msStatus;
+        private TextView msStatus;
         private ProgressBar msProgress;
         private TextView milestoneStatus;
 
@@ -241,52 +241,28 @@ public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 
             if(dataModel.getState().equals("open")) {
 
-                @SuppressLint("ResourceType") int color = Color.parseColor(context.getResources().getString(R.color.releaseStable));
-                TextDrawable drawable = TextDrawable.builder()
-                        .beginConfig()
-                        //.useFont(Typeface.DEFAULT)
-                        .textColor(context.getResources().getColor(R.color.white))
-                        .fontSize(30)
-                        .toUpperCase()
-                        .width(120)
-                        .height(60)
-                        .endConfig()
-                        .buildRoundRect("open", color, 8);
-
-                msStatus.setImageDrawable(drawable);
-
-            }
-            else if(dataModel.getState().equals("closed")) {
-
-                @SuppressLint("ResourceType") int color = Color.parseColor(context.getResources().getString(R.color.colorRed));
-                TextDrawable drawable = TextDrawable.builder()
-                        .beginConfig()
-                        //.useFont(Typeface.DEFAULT)
-                        .textColor(context.getResources().getColor(R.color.white))
-                        .fontSize(30)
-                        .toUpperCase()
-                        .width(140)
-                        .height(60)
-                        .endConfig()
-                        .buildRoundRect("closed", color, 8);
-
-                msStatus.setImageDrawable(drawable);
-
-            }
-
-            if (!dataModel.getDescription().equals("")) {
-                final CharSequence bodyWithMD = markwon.toMarkdown(EmojiParser.parseToUnicode(dataModel.getDescription()));
-                msDescription.setText(bodyWithMD);
+	            msStatus.setBackground(context.getResources().getDrawable(R.drawable.shape_milestone_open));
             }
             else {
-                msDescription.setText("");
+
+				msStatus.setBackground(context.getResources().getDrawable(R.drawable.shape_milestone_closed));
             }
 
-            msOpenIssues.setText(String.valueOf(dataModel.getOpen_issues()));
-            msOpenIssues.setOnClickListener(new ClickListener(context.getResources().getString(R.string.milestoneOpenIssues, dataModel.getOpen_issues()), context));
+	        msStatus.setText(dataModel.getState());
 
-            msClosedIssues.setText(String.valueOf(dataModel.getClosed_issues()));
-            msClosedIssues.setOnClickListener(new ClickListener(context.getResources().getString(R.string.milestoneClosedIssues, dataModel.getClosed_issues()), context));
+            if (!dataModel.getDescription().equals("")) {
+
+            	CharSequence bodyWithMD = markwon.toMarkdown(EmojiParser.parseToUnicode(dataModel.getDescription()));
+            	msDescription.setText(bodyWithMD);
+
+            }
+            else {
+
+                msDescription.setText("No description");
+            }
+
+            msOpenIssues.setText(dataModel.getOpen_issues() + " Open");
+            msClosedIssues.setText(dataModel.getClosed_issues() + " Closed");
 
             if ((dataModel.getOpen_issues() + dataModel.getClosed_issues()) > 0) {
 
@@ -347,7 +323,7 @@ public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 
             }
             else {
-                msDueDate.setText("");
+                msDueDate.setText("No due date");
             }
 
         }
diff --git a/app/src/main/res/drawable/progress_bar.xml b/app/src/main/res/drawable/progress_bar.xml
index 935176f..b8b362e 100644
--- a/app/src/main/res/drawable/progress_bar.xml
+++ b/app/src/main/res/drawable/progress_bar.xml
@@ -9,8 +9,8 @@
         android:right="1dp"
         android:left="1dp">
         <shape>
-            <corners android:radius="15dp"/>
-            <solid android:color="@color/divider"/>
+            <corners android:radius="10dp"/>
+            <solid android:color="?attr/inputBackgroundColor"/>
         </shape>
     </item>
 
@@ -23,9 +23,9 @@
 
         <scale android:scaleWidth="100%">
             <shape>
-                <corners android:radius="15dp" />
+                <corners android:radius="10dp" />
             </shape>
         </scale>
     </item>
 
-</layer-list>
\ No newline at end of file
+</layer-list>
diff --git a/app/src/main/res/drawable/shape_milestone_closed.xml b/app/src/main/res/drawable/shape_milestone_closed.xml
new file mode 100644
index 0000000..206e29f
--- /dev/null
+++ b/app/src/main/res/drawable/shape_milestone_closed.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid
+        android:color="@color/colorRed">
+    </solid>
+
+    <corners
+        android:radius="5dp">
+    </corners>
+
+</shape>
diff --git a/app/src/main/res/drawable/shape_milestone_open.xml b/app/src/main/res/drawable/shape_milestone_open.xml
new file mode 100644
index 0000000..9598f2f
--- /dev/null
+++ b/app/src/main/res/drawable/shape_milestone_open.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid
+        android:color="@color/btnBackground">
+    </solid>
+
+    <corners
+        android:radius="5dp">
+    </corners>
+
+</shape>
diff --git a/app/src/main/res/layout/list_milestones.xml b/app/src/main/res/layout/list_milestones.xml
index e1c256a..26df47d 100644
--- a/app/src/main/res/layout/list_milestones.xml
+++ b/app/src/main/res/layout/list_milestones.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout
     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="wrap_content"
     android:id="@+id/milestoneFrame"
@@ -14,10 +16,11 @@
         android:id="@+id/milestoneId" />
 
     <TextView
+        android:id="@+id/milestoneStatus"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:visibility="gone"
-        android:id="@+id/milestoneStatus" />
+        tools:visibility="visible" />
 
     <LinearLayout
         android:id="@+id/mainFrame"
@@ -31,115 +34,158 @@
             android:id="@+id/frameTitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:gravity="center_vertical"
             android:orientation="horizontal">
 
             <TextView
                 android:id="@+id/milestoneTitle"
-                android:layout_width="0dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="0"
+                android:textColor="?attr/primaryTextColor"
                 android:textIsSelectable="true"
-                android:layout_height="wrap_content"
-                android:layout_weight=".80"
-                android:layout_marginBottom="5dp"
-                android:textColor="?attr/primaryTextColor"
                 android:textSize="18sp" />
 
-            <ImageView
-                android:id="@+id/milestoneState"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight=".15"
-                android:layout_gravity="end"
-                android:gravity="end"
-                android:scaleType="fitEnd"
-                android:contentDescription="@string/pageTitleCreateMilestone"
-                android:layout_marginBottom="5dp" />
-
-        </LinearLayout>
-
-        <TextView
-            android:id="@+id/milestoneDescription"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/repoDescription"
-            android:textIsSelectable="true"
-            android:textColor="?attr/primaryTextColor"
-            android:textSize="14sp" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:layout_marginBottom="5dp"
-            android:orientation="horizontal">
-
-            <TextView
-                android:id="@+id/milestoneIssuesClosed"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="8"
-                android:text="@string/repoWatchers"
-                android:gravity="start"
-                android:textColor="?attr/primaryTextColor"
-                android:textSize="14sp" />
-
             <ProgressBar
                 android:id="@+id/milestoneProgress"
                 style="@style/Widget.AppCompat.ProgressBar.Horizontal"
                 android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="80"
+                android:layout_height="10dp"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                android:layout_weight="1"
+                android:indeterminate="false"
                 android:progress="50"
-                android:layout_marginTop="2dp"
                 android:progressDrawable="@drawable/progress_bar"
-                android:progressTint="@color/colorLightGreen" />
+                android:progressTint="@color/btnBackground" />
 
             <TextView
-                android:id="@+id/milestoneIssuesOpen"
-                android:layout_width="0dp"
+                android:id="@+id/milestoneState"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_weight="8"
-                android:text="@string/repoStars"
+                android:layout_weight="0"
+                android:background="@drawable/shape_milestone_open"
                 android:gravity="end"
-                android:textColor="?attr/primaryTextColor"
-                android:textSize="14sp" />
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:textColor="@color/colorWhite"
+                android:textSize="16sp"
+                tools:text="@string/isOpen" />
 
         </LinearLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:id="@+id/milestoneDateMenuFrame"
-            android:layout_marginTop="8dp"
+            android:layout_marginTop="10dp"
             android:orientation="horizontal">
 
-            <RelativeLayout
-                android:layout_width="0dp"
-                android:layout_weight=".90"
-                android:layout_height="wrap_content"
-                android:id="@+id/dueDateFrame"
-                android:orientation="horizontal"
-                android:layout_marginTop="3dp">
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_marginRight="15dp"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="15dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="5dp"
+                    android:contentDescription="@string/generalImgContentText"
+                    app:srcCompat="@drawable/ic_calendar" />
 
                 <TextView
                     android:id="@+id/milestoneDueDate"
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/dueDate"
-                    android:gravity="start"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="12sp" />
+                    android:textSize="14sp" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_marginRight="15dp"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="15dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="5dp"
+                    android:contentDescription="@string/generalImgContentText"
+                    app:srcCompat="@drawable/ic_issue_open" />
+
+                <TextView
+                    android:id="@+id/milestoneIssuesClosed"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/repoWatchers"
+                    android:textColor="?attr/primaryTextColor"
+                    android:textSize="14sp" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="15dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="5dp"
+                    android:contentDescription="@string/generalImgContentText"
+                    app:srcCompat="@drawable/ic_issue_closed" />
+
+                <TextView
+                    android:id="@+id/milestoneIssuesOpen"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/repoStars"
+                    android:textColor="?attr/primaryTextColor"
+                    android:textSize="14sp" />
+            </LinearLayout>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/milestoneDateMenuFrame"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5dp"
+            android:orientation="horizontal">
+
+            <RelativeLayout
+                android:id="@+id/dueDateFrame"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="3dp"
+                android:layout_weight=".90"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/milestoneDescription"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/repoDescription"
+                    android:textColor="?attr/primaryTextColor"
+                    android:textIsSelectable="true"
+                    android:textSize="14sp"
+                    android:visibility="visible" />
 
             </RelativeLayout>
 
             <ImageView
                 android:id="@+id/milestonesMenu"
                 android:layout_width="0dp"
-                android:layout_weight=".10"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
+                android:layout_weight=".10"
+                android:contentDescription="@string/menuContentDesc"
                 android:scaleType="fitEnd"
-                android:src="@drawable/ic_dotted_menu_horizontal"
-                android:contentDescription="@string/menuContentDesc" />
+                android:src="@drawable/ic_dotted_menu_horizontal" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 5bd6a62..a691ee7 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -18,7 +18,7 @@
     <color name="divider">#1d1d1d</color>
     <color name="releasePre">#eb7121</color>
     <color name="releaseStable">#219214</color>
-    <color name="colorRed">#eb3718</color>
+    <color name="colorRed">#CC361C</color>
     <color name="colorLightGreen">#49da39</color>
     <color name="colorDarkGreen">#009486</color>
     <color name="darkRed">#e74c3c</color>
-- 
2.40.1


From 639049f18616e64b59d5066beaf5ecec14c05e25 Mon Sep 17 00:00:00 2001
From: opyale <opyale@noreply.gitea.io>
Date: Mon, 1 Jun 2020 15:50:53 +0200
Subject: [PATCH 08/16] Removing milestone state.

---
 .../mian/gitnex/adapters/MilestonesAdapter.java | 13 -------------
 .../res/drawable/shape_milestone_closed.xml     | 14 --------------
 .../main/res/drawable/shape_milestone_open.xml  | 14 --------------
 app/src/main/res/layout/list_milestones.xml     | 17 ++---------------
 4 files changed, 2 insertions(+), 56 deletions(-)
 delete mode 100644 app/src/main/res/drawable/shape_milestone_closed.xml
 delete mode 100644 app/src/main/res/drawable/shape_milestone_open.xml

diff --git a/app/src/main/java/org/mian/gitnex/adapters/MilestonesAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/MilestonesAdapter.java
index d3f1ab9..ad81457 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/MilestonesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/MilestonesAdapter.java
@@ -112,7 +112,6 @@ public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
         private TextView msOpenIssues;
         private TextView msClosedIssues;
         private TextView msDueDate;
-        private TextView msStatus;
         private ProgressBar msProgress;
         private TextView milestoneStatus;
 
@@ -122,7 +121,6 @@ public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 
             milestoneId = itemView.findViewById(R.id.milestoneId);
             msTitle = itemView.findViewById(R.id.milestoneTitle);
-            msStatus = itemView.findViewById(R.id.milestoneState);
             msDescription = itemView.findViewById(R.id.milestoneDescription);
             msOpenIssues = itemView.findViewById(R.id.milestoneIssuesOpen);
             msClosedIssues = itemView.findViewById(R.id.milestoneIssuesClosed);
@@ -239,17 +237,6 @@ public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
             Spanned msTitle_ = markwon.toMarkdown(dataModel.getTitle());
             markwon.setParsedMarkdown(msTitle, msTitle_);
 
-            if(dataModel.getState().equals("open")) {
-
-	            msStatus.setBackground(context.getResources().getDrawable(R.drawable.shape_milestone_open));
-            }
-            else {
-
-				msStatus.setBackground(context.getResources().getDrawable(R.drawable.shape_milestone_closed));
-            }
-
-	        msStatus.setText(dataModel.getState());
-
             if (!dataModel.getDescription().equals("")) {
 
             	CharSequence bodyWithMD = markwon.toMarkdown(EmojiParser.parseToUnicode(dataModel.getDescription()));
diff --git a/app/src/main/res/drawable/shape_milestone_closed.xml b/app/src/main/res/drawable/shape_milestone_closed.xml
deleted file mode 100644
index 206e29f..0000000
--- a/app/src/main/res/drawable/shape_milestone_closed.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid
-        android:color="@color/colorRed">
-    </solid>
-
-    <corners
-        android:radius="5dp">
-    </corners>
-
-</shape>
diff --git a/app/src/main/res/drawable/shape_milestone_open.xml b/app/src/main/res/drawable/shape_milestone_open.xml
deleted file mode 100644
index 9598f2f..0000000
--- a/app/src/main/res/drawable/shape_milestone_open.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid
-        android:color="@color/btnBackground">
-    </solid>
-
-    <corners
-        android:radius="5dp">
-    </corners>
-
-</shape>
diff --git a/app/src/main/res/layout/list_milestones.xml b/app/src/main/res/layout/list_milestones.xml
index 26df47d..d5f66f3 100644
--- a/app/src/main/res/layout/list_milestones.xml
+++ b/app/src/main/res/layout/list_milestones.xml
@@ -51,27 +51,14 @@
                 style="@style/Widget.AppCompat.ProgressBar.Horizontal"
                 android:layout_width="0dp"
                 android:layout_height="10dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
                 android:layout_weight="1"
                 android:indeterminate="false"
                 android:progress="50"
                 android:progressDrawable="@drawable/progress_bar"
                 android:progressTint="@color/btnBackground" />
 
-            <TextView
-                android:id="@+id/milestoneState"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="0"
-                android:background="@drawable/shape_milestone_open"
-                android:gravity="end"
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp"
-                android:textColor="@color/colorWhite"
-                android:textSize="16sp"
-                tools:text="@string/isOpen" />
-
         </LinearLayout>
 
         <LinearLayout
-- 
2.40.1


From 29a375f0b1118abf8c571d1aa15f96156cc809f4 Mon Sep 17 00:00:00 2001
From: opyale <opyale@noreply.gitea.io>
Date: Mon, 1 Jun 2020 15:56:45 +0200
Subject: [PATCH 09/16] Formatting and removing unused imports.

---
 .../gitnex/adapters/MilestonesAdapter.java    | 482 +++++++++---------
 1 file changed, 240 insertions(+), 242 deletions(-)

diff --git a/app/src/main/java/org/mian/gitnex/adapters/MilestonesAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/MilestonesAdapter.java
index ad81457..ce24425 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/MilestonesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/MilestonesAdapter.java
@@ -2,7 +2,6 @@ package org.mian.gitnex.adapters;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.text.Spanned;
@@ -15,7 +14,6 @@ import android.widget.ProgressBar;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
-import com.amulyakhare.textdrawable.TextDrawable;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
 import com.vdurmont.emoji.EmojiParser;
 import org.mian.gitnex.R;
@@ -56,332 +54,332 @@ import io.noties.markwon.linkify.LinkifyPlugin;
 
 public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
-    private Context context;
-    private final int TYPE_LOAD = 0;
-    private List<Milestones> dataList;
-    private OnLoadMoreListener loadMoreListener;
-    private boolean isLoading = false;
-    private boolean isMoreDataAvailable = true;
-    private String TAG = StaticGlobalVariables.tagMilestonesAdapter;
+	private Context context;
+	private final int TYPE_LOAD = 0;
+	private List<Milestones> dataList;
+	private OnLoadMoreListener loadMoreListener;
+	private boolean isLoading = false;
+	private boolean isMoreDataAvailable = true;
+	private String TAG = StaticGlobalVariables.tagMilestonesAdapter;
 
-    public MilestonesAdapter(Context context, List<Milestones> dataListMain) {
+	public MilestonesAdapter(Context context, List<Milestones> dataListMain) {
 
-        this.context = context;
-        this.dataList = dataListMain;
+		this.context = context;
+		this.dataList = dataListMain;
 
-    }
+	}
 
-    @NonNull
-    @Override
-    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+	@NonNull
+	@Override
+	public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
 
-        LayoutInflater inflater = LayoutInflater.from(context);
+		LayoutInflater inflater = LayoutInflater.from(context);
 
-        if(viewType == TYPE_LOAD) {
-            return new MilestonesAdapter.DataHolder(inflater.inflate(R.layout.list_milestones, parent, false));
-        }
-        else {
-            return new MilestonesAdapter.LoadHolder(inflater.inflate(R.layout.row_load, parent, false));
-        }
+		if(viewType == TYPE_LOAD) {
+			return new MilestonesAdapter.DataHolder(inflater.inflate(R.layout.list_milestones, parent, false));
+		}
+		else {
+			return new MilestonesAdapter.LoadHolder(inflater.inflate(R.layout.row_load, parent, false));
+		}
 
-    }
+	}
 
-    @Override
-    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+	@Override
+	public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
 
-        if(position >= getItemCount() - 1 && isMoreDataAvailable && !isLoading && loadMoreListener != null) {
+		if(position >= getItemCount() - 1 && isMoreDataAvailable && !isLoading && loadMoreListener != null) {
 
-            isLoading = true;
-            loadMoreListener.onLoadMore();
+			isLoading = true;
+			loadMoreListener.onLoadMore();
 
-        }
+		}
 
-        if(getItemViewType(position) == TYPE_LOAD) {
+		if(getItemViewType(position) == TYPE_LOAD) {
 
-            ((MilestonesAdapter.DataHolder) holder).bindData(dataList.get(position));
+			((MilestonesAdapter.DataHolder) holder).bindData(dataList.get(position));
 
-        }
+		}
 
-    }
+	}
 
-    class DataHolder extends RecyclerView.ViewHolder {
+	class DataHolder extends RecyclerView.ViewHolder {
 
-        private TextView milestoneId;
-        private TextView msTitle;
-        private TextView msDescription;
-        private TextView msOpenIssues;
-        private TextView msClosedIssues;
-        private TextView msDueDate;
-        private ProgressBar msProgress;
-        private TextView milestoneStatus;
+		private TextView milestoneId;
+		private TextView msTitle;
+		private TextView msDescription;
+		private TextView msOpenIssues;
+		private TextView msClosedIssues;
+		private TextView msDueDate;
+		private ProgressBar msProgress;
+		private TextView milestoneStatus;
 
-        DataHolder(View itemView) {
+		DataHolder(View itemView) {
 
-            super(itemView);
+			super(itemView);
 
-            milestoneId = itemView.findViewById(R.id.milestoneId);
-            msTitle = itemView.findViewById(R.id.milestoneTitle);
-            msDescription = itemView.findViewById(R.id.milestoneDescription);
-            msOpenIssues = itemView.findViewById(R.id.milestoneIssuesOpen);
-            msClosedIssues = itemView.findViewById(R.id.milestoneIssuesClosed);
-            msDueDate = itemView.findViewById(R.id.milestoneDueDate);
-            msProgress = itemView.findViewById(R.id.milestoneProgress);
-            ImageView milestonesMenu = itemView.findViewById(R.id.milestonesMenu);
-            milestoneStatus = itemView.findViewById(R.id.milestoneStatus);
+			milestoneId = itemView.findViewById(R.id.milestoneId);
+			msTitle = itemView.findViewById(R.id.milestoneTitle);
+			msDescription = itemView.findViewById(R.id.milestoneDescription);
+			msOpenIssues = itemView.findViewById(R.id.milestoneIssuesOpen);
+			msClosedIssues = itemView.findViewById(R.id.milestoneIssuesClosed);
+			msDueDate = itemView.findViewById(R.id.milestoneDueDate);
+			msProgress = itemView.findViewById(R.id.milestoneProgress);
+			ImageView milestonesMenu = itemView.findViewById(R.id.milestonesMenu);
+			milestoneStatus = itemView.findViewById(R.id.milestoneStatus);
 
-            milestonesMenu.setOnClickListener(v -> {
+			milestonesMenu.setOnClickListener(v -> {
 
-                Context ctx = v.getContext();
-                int milestoneId_ = Integer.parseInt(milestoneId.getText().toString());
+				Context ctx = v.getContext();
+				int milestoneId_ = Integer.parseInt(milestoneId.getText().toString());
 
-                @SuppressLint("InflateParams") View view = LayoutInflater.from(ctx).inflate(R.layout.bottom_sheet_milestones_in_list, null);
+				@SuppressLint("InflateParams") View view = LayoutInflater.from(ctx).inflate(R.layout.bottom_sheet_milestones_in_list, null);
 
-                TextView closeMilestone = view.findViewById(R.id.closeMilestone);
-                TextView openMilestone = view.findViewById(R.id.openMilestone);
+				TextView closeMilestone = view.findViewById(R.id.closeMilestone);
+				TextView openMilestone = view.findViewById(R.id.openMilestone);
 
-                BottomSheetDialog dialog = new BottomSheetDialog(ctx);
-                dialog.setContentView(view);
-                dialog.show();
+				BottomSheetDialog dialog = new BottomSheetDialog(ctx);
+				dialog.setContentView(view);
+				dialog.show();
 
-                if(milestoneStatus.getText().toString().equals("open")) {
+				if(milestoneStatus.getText().toString().equals("open")) {
 
-                    closeMilestone.setVisibility(View.VISIBLE);
-                    openMilestone.setVisibility(View.GONE);
+					closeMilestone.setVisibility(View.VISIBLE);
+					openMilestone.setVisibility(View.GONE);
 
-                }
-                else {
+				}
+				else {
 
-                    closeMilestone.setVisibility(View.GONE);
-                    openMilestone.setVisibility(View.VISIBLE);
+					closeMilestone.setVisibility(View.GONE);
+					openMilestone.setVisibility(View.VISIBLE);
 
-                }
+				}
 
-                closeMilestone.setOnClickListener(v12 -> {
+				closeMilestone.setOnClickListener(v12 -> {
 
-                    MilestoneActions.closeMilestone(ctx, milestoneId_);
-                    dialog.dismiss();
-                    updateAdapter(getAdapterPosition());
+					MilestoneActions.closeMilestone(ctx, milestoneId_);
+					dialog.dismiss();
+					updateAdapter(getAdapterPosition());
 
-                });
+				});
 
-                openMilestone.setOnClickListener(v12 -> {
+				openMilestone.setOnClickListener(v12 -> {
 
-                    MilestoneActions.openMilestone(ctx, milestoneId_);
-                    dialog.dismiss();
-                    updateAdapter(getAdapterPosition());
+					MilestoneActions.openMilestone(ctx, milestoneId_);
+					dialog.dismiss();
+					updateAdapter(getAdapterPosition());
 
-                });
+				});
 
-            });
+			});
 
-        }
+		}
 
-        @SuppressLint("SetTextI18n")
-        void bindData(Milestones dataModel) {
+		@SuppressLint("SetTextI18n")
+		void bindData(Milestones dataModel) {
 
-            final TinyDB tinyDb = new TinyDB(context);
-            final String locale = tinyDb.getString("locale");
-            final String timeFormat = tinyDb.getString("dateFormat");
+			final TinyDB tinyDb = new TinyDB(context);
+			final String locale = tinyDb.getString("locale");
+			final String timeFormat = tinyDb.getString("dateFormat");
 
-            milestoneId.setText(String.valueOf(dataModel.getId()));
-            milestoneStatus.setText(dataModel.getState());
+			milestoneId.setText(String.valueOf(dataModel.getId()));
+			milestoneStatus.setText(dataModel.getState());
 
-            final Markwon markwon = Markwon.builder(Objects.requireNonNull(context))
-                    .usePlugin(CorePlugin.create())
-                    .usePlugin(ImagesPlugin.create(plugin -> {
-                        plugin.addSchemeHandler(new SchemeHandler() {
-                            @NonNull
-                            @Override
-                            public ImageItem handle(@NonNull String raw, @NonNull Uri uri) {
+			final Markwon markwon = Markwon.builder(Objects.requireNonNull(context))
+					.usePlugin(CorePlugin.create())
+					.usePlugin(ImagesPlugin.create(plugin -> {
+						plugin.addSchemeHandler(new SchemeHandler() {
+							@NonNull
+							@Override
+							public ImageItem handle(@NonNull String raw, @NonNull Uri uri) {
 
-                                final int resourceId = context.getResources().getIdentifier(
-                                        raw.substring("drawable://".length()),
-                                        "drawable",
-                                        context.getPackageName());
-
-                                final Drawable drawable = context.getDrawable(resourceId);
-
-                                assert drawable != null;
-                                return ImageItem.withResult(drawable);
-                            }
-
-                            @NonNull
-                            @Override
-                            public Collection<String> supportedSchemes() {
-                                return Collections.singleton("drawable");
-                            }
-                        });
-                        plugin.placeholderProvider(drawable -> null);
-                        plugin.addMediaDecoder(GifMediaDecoder.create(false));
-                        plugin.addMediaDecoder(SvgMediaDecoder.create(context.getResources()));
-                        plugin.addMediaDecoder(SvgMediaDecoder.create());
-                        plugin.defaultMediaDecoder(DefaultMediaDecoder.create(context.getResources()));
-                        plugin.defaultMediaDecoder(DefaultMediaDecoder.create());
-                    }))
-                    .usePlugin(new AbstractMarkwonPlugin() {
-                        @Override
-                        public void configureTheme(@NonNull MarkwonTheme.Builder builder) {
-                            builder
-                                    .codeTextColor(tinyDb.getInt("codeBlockColor"))
-                                    .codeBackgroundColor(tinyDb.getInt("codeBlockBackground"))
-                                    .linkColor(context.getResources().getColor(R.color.lightBlue));
-                        }
-                    })
-                    .usePlugin(TablePlugin.create(context))
-                    .usePlugin(TaskListPlugin.create(context))
-                    .usePlugin(HtmlPlugin.create())
-                    .usePlugin(StrikethroughPlugin.create())
-                    .usePlugin(LinkifyPlugin.create())
-                    .build();
-
-            Spanned msTitle_ = markwon.toMarkdown(dataModel.getTitle());
-            markwon.setParsedMarkdown(msTitle, msTitle_);
-
-            if (!dataModel.getDescription().equals("")) {
-
-            	CharSequence bodyWithMD = markwon.toMarkdown(EmojiParser.parseToUnicode(dataModel.getDescription()));
-            	msDescription.setText(bodyWithMD);
+								final int resourceId = context.getResources().getIdentifier(
+										raw.substring("drawable://".length()),
+										"drawable",
+										context.getPackageName());
+
+								final Drawable drawable = context.getDrawable(resourceId);
+
+								assert drawable != null;
+								return ImageItem.withResult(drawable);
+							}
+
+							@NonNull
+							@Override
+							public Collection<String> supportedSchemes() {
+								return Collections.singleton("drawable");
+							}
+						});
+						plugin.placeholderProvider(drawable -> null);
+						plugin.addMediaDecoder(GifMediaDecoder.create(false));
+						plugin.addMediaDecoder(SvgMediaDecoder.create(context.getResources()));
+						plugin.addMediaDecoder(SvgMediaDecoder.create());
+						plugin.defaultMediaDecoder(DefaultMediaDecoder.create(context.getResources()));
+						plugin.defaultMediaDecoder(DefaultMediaDecoder.create());
+					}))
+					.usePlugin(new AbstractMarkwonPlugin() {
+						@Override
+						public void configureTheme(@NonNull MarkwonTheme.Builder builder) {
+							builder
+									.codeTextColor(tinyDb.getInt("codeBlockColor"))
+									.codeBackgroundColor(tinyDb.getInt("codeBlockBackground"))
+									.linkColor(context.getResources().getColor(R.color.lightBlue));
+						}
+					})
+					.usePlugin(TablePlugin.create(context))
+					.usePlugin(TaskListPlugin.create(context))
+					.usePlugin(HtmlPlugin.create())
+					.usePlugin(StrikethroughPlugin.create())
+					.usePlugin(LinkifyPlugin.create())
+					.build();
+
+			Spanned msTitle_ = markwon.toMarkdown(dataModel.getTitle());
+			markwon.setParsedMarkdown(msTitle, msTitle_);
+
+			if (!dataModel.getDescription().equals("")) {
+
+				CharSequence bodyWithMD = markwon.toMarkdown(EmojiParser.parseToUnicode(dataModel.getDescription()));
+				msDescription.setText(bodyWithMD);
 
-            }
-            else {
+			}
+			else {
 
-                msDescription.setText("No description");
-            }
+				msDescription.setText("No description");
+			}
 
-            msOpenIssues.setText(dataModel.getOpen_issues() + " Open");
-            msClosedIssues.setText(dataModel.getClosed_issues() + " Closed");
+			msOpenIssues.setText(dataModel.getOpen_issues() + " Open");
+			msClosedIssues.setText(dataModel.getClosed_issues() + " Closed");
 
-            if ((dataModel.getOpen_issues() + dataModel.getClosed_issues()) > 0) {
+			if ((dataModel.getOpen_issues() + dataModel.getClosed_issues()) > 0) {
 
-                if (dataModel.getOpen_issues() == 0) {
-                    msProgress.setProgress(100);
-                    msProgress.setOnClickListener(new ClickListener(context.getResources().getString(R.string.milestoneCompletion, 100), context));
-                }
-                else {
-                    int msCompletion = 100 * dataModel.getClosed_issues() / (dataModel.getOpen_issues() + dataModel.getClosed_issues());
-                    msProgress.setOnClickListener(new ClickListener(context.getResources().getString(R.string.milestoneCompletion, msCompletion), context));
-                    msProgress.setProgress(msCompletion);
-                }
+				if (dataModel.getOpen_issues() == 0) {
+					msProgress.setProgress(100);
+					msProgress.setOnClickListener(new ClickListener(context.getResources().getString(R.string.milestoneCompletion, 100), context));
+				}
+				else {
+					int msCompletion = 100 * dataModel.getClosed_issues() / (dataModel.getOpen_issues() + dataModel.getClosed_issues());
+					msProgress.setOnClickListener(new ClickListener(context.getResources().getString(R.string.milestoneCompletion, msCompletion), context));
+					msProgress.setProgress(msCompletion);
+				}
 
-            }
-            else {
-                msProgress.setProgress(0);
-                msProgress.setOnClickListener(new ClickListener(context.getResources().getString(R.string.milestoneCompletion, 0), context));
-            }
+			}
+			else {
+				msProgress.setProgress(0);
+				msProgress.setOnClickListener(new ClickListener(context.getResources().getString(R.string.milestoneCompletion, 0), context));
+			}
 
-            if(dataModel.getDue_on() != null) {
+			if(dataModel.getDue_on() != null) {
 
-                if (timeFormat.equals("normal") || timeFormat.equals("pretty")) {
+				if (timeFormat.equals("normal") || timeFormat.equals("pretty")) {
 
-                    DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd", new Locale(locale));
-                    Date date = null;
-                    try {
-                        date = formatter.parse(dataModel.getDue_on());
-                    }
-                    catch (ParseException e) {
-                        Log.e(TAG, e.toString());
-                    }
-                    assert date != null;
-                    String dueDate = formatter.format(date);
+					DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd", new Locale(locale));
+					Date date = null;
+					try {
+						date = formatter.parse(dataModel.getDue_on());
+					}
+					catch (ParseException e) {
+						Log.e(TAG, e.toString());
+					}
+					assert date != null;
+					String dueDate = formatter.format(date);
 
-                    if(date.before(new Date())) {
-                        msDueDate.setTextColor(context.getResources().getColor(R.color.darkRed));
-                    }
+					if(date.before(new Date())) {
+						msDueDate.setTextColor(context.getResources().getColor(R.color.darkRed));
+					}
 
-                    msDueDate.setText(dueDate);
-                    msDueDate.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToast(dataModel.getDue_on()), context));
+					msDueDate.setText(dueDate);
+					msDueDate.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToast(dataModel.getDue_on()), context));
 
-                }
-                else if (timeFormat.equals("normal1")) {
+				}
+				else if (timeFormat.equals("normal1")) {
 
-                    SimpleDateFormat formatter = new SimpleDateFormat("dd-MM-yyyy", new Locale(locale));
-                    Date date1 = null;
-                    try {
-                        date1 = formatter.parse(dataModel.getDue_on());
-                    }
-                    catch (ParseException e) {
-                        Log.e(TAG, e.toString());
-                    }
-                    assert date1 != null;
-                    String dueDate = formatter.format(date1);
-                    msDueDate.setText(dueDate);
+					SimpleDateFormat formatter = new SimpleDateFormat("dd-MM-yyyy", new Locale(locale));
+					Date date1 = null;
+					try {
+						date1 = formatter.parse(dataModel.getDue_on());
+					}
+					catch (ParseException e) {
+						Log.e(TAG, e.toString());
+					}
+					assert date1 != null;
+					String dueDate = formatter.format(date1);
+					msDueDate.setText(dueDate);
 
-                }
+				}
 
-            }
-            else {
-                msDueDate.setText("No due date");
-            }
+			}
+			else {
+				msDueDate.setText("No due date");
+			}
 
-        }
+		}
 
-    }
+	}
 
-    private void updateAdapter(int position) {
+	private void updateAdapter(int position) {
 
-        dataList.remove(position);
-        notifyItemRemoved(position);
-        notifyItemRangeChanged(position, dataList.size());
+		dataList.remove(position);
+		notifyItemRemoved(position);
+		notifyItemRangeChanged(position, dataList.size());
 
-    }
+	}
 
-    @Override
-    public int getItemViewType(int position) {
+	@Override
+	public int getItemViewType(int position) {
 
-        if(dataList.get(position).getTitle() != null) {
-            return TYPE_LOAD;
-        }
-        else {
-            return 1;
-        }
+		if(dataList.get(position).getTitle() != null) {
+			return TYPE_LOAD;
+		}
+		else {
+			return 1;
+		}
 
-    }
+	}
 
-    @Override
-    public int getItemCount() {
+	@Override
+	public int getItemCount() {
 
-        return dataList.size();
+		return dataList.size();
 
-    }
+	}
 
-    static class LoadHolder extends RecyclerView.ViewHolder {
+	static class LoadHolder extends RecyclerView.ViewHolder {
 
-        LoadHolder(View itemView) {
+		LoadHolder(View itemView) {
 
-            super(itemView);
-        }
+			super(itemView);
+		}
 
-    }
+	}
 
-    public void setMoreDataAvailable(boolean moreDataAvailable) {
+	public void setMoreDataAvailable(boolean moreDataAvailable) {
 
-        isMoreDataAvailable = moreDataAvailable;
+		isMoreDataAvailable = moreDataAvailable;
 
-    }
+	}
 
-    public void notifyDataChanged() {
+	public void notifyDataChanged() {
 
-        notifyDataSetChanged();
-        isLoading = false;
+		notifyDataSetChanged();
+		isLoading = false;
 
-    }
+	}
 
-    public interface OnLoadMoreListener {
+	public interface OnLoadMoreListener {
 
-        void onLoadMore();
+		void onLoadMore();
 
-    }
+	}
 
-    public void setLoadMoreListener(OnLoadMoreListener loadMoreListener) {
+	public void setLoadMoreListener(OnLoadMoreListener loadMoreListener) {
 
-        this.loadMoreListener = loadMoreListener;
+		this.loadMoreListener = loadMoreListener;
 
-    }
+	}
 
-    public void updateList(List<Milestones> list) {
+	public void updateList(List<Milestones> list) {
 
-        dataList = list;
-        notifyDataSetChanged();
-    }
+		dataList = list;
+		notifyDataSetChanged();
+	}
 
 }
-- 
2.40.1


From c80cd3123ee4337f791dd76de5f44ad106516539 Mon Sep 17 00:00:00 2001
From: opyale <opyale@noreply.gitea.io>
Date: Mon, 1 Jun 2020 16:12:01 +0200
Subject: [PATCH 10/16] Enhancing editorconfig

---
 .editorconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.editorconfig b/.editorconfig
index b795216..a91945a 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -4,6 +4,7 @@ end_of_line = lf
 indent_size = 4
 indent_style = space
 insert_final_newline = true
+trim_trailing_whitespace = true
 max_line_length = 150
 
 [*.java]
-- 
2.40.1


From ccb954ce34f4835518ac182ab9e1f4282da8181a Mon Sep 17 00:00:00 2001
From: opyale <opyale@noreply.gitea.io>
Date: Mon, 1 Jun 2020 16:23:25 +0200
Subject: [PATCH 11/16] Translation and additional formatting.

---
 .../gitnex/adapters/MilestonesAdapter.java    | 120 ++++++++++--------
 app/src/main/res/values/strings.xml           |   8 +-
 2 files changed, 73 insertions(+), 55 deletions(-)

diff --git a/app/src/main/java/org/mian/gitnex/adapters/MilestonesAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/MilestonesAdapter.java
index ce24425..f47ea10 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/MilestonesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/MilestonesAdapter.java
@@ -184,58 +184,60 @@ public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 			milestoneId.setText(String.valueOf(dataModel.getId()));
 			milestoneStatus.setText(dataModel.getState());
 
-			final Markwon markwon = Markwon.builder(Objects.requireNonNull(context))
-					.usePlugin(CorePlugin.create())
-					.usePlugin(ImagesPlugin.create(plugin -> {
-						plugin.addSchemeHandler(new SchemeHandler() {
-							@NonNull
-							@Override
-							public ImageItem handle(@NonNull String raw, @NonNull Uri uri) {
+			Markwon markwon = Markwon.builder(Objects.requireNonNull(context)).usePlugin(CorePlugin.create()).usePlugin(ImagesPlugin.create(plugin -> {
+				plugin.addSchemeHandler(new SchemeHandler() {
 
-								final int resourceId = context.getResources().getIdentifier(
-										raw.substring("drawable://".length()),
-										"drawable",
-										context.getPackageName());
+					@NonNull
+					@Override
+					public ImageItem handle(@NonNull String raw, @NonNull Uri uri) {
 
-								final Drawable drawable = context.getDrawable(resourceId);
+							final int resourceId = context.getResources().getIdentifier(
+									raw.substring("drawable://".length()),
+									"drawable",
+									context.getPackageName());
 
-								assert drawable != null;
-								return ImageItem.withResult(drawable);
-							}
+							final Drawable drawable = context.getDrawable(resourceId);
 
-							@NonNull
-							@Override
-							public Collection<String> supportedSchemes() {
-								return Collections.singleton("drawable");
-							}
-						});
-						plugin.placeholderProvider(drawable -> null);
-						plugin.addMediaDecoder(GifMediaDecoder.create(false));
-						plugin.addMediaDecoder(SvgMediaDecoder.create(context.getResources()));
-						plugin.addMediaDecoder(SvgMediaDecoder.create());
-						plugin.defaultMediaDecoder(DefaultMediaDecoder.create(context.getResources()));
-						plugin.defaultMediaDecoder(DefaultMediaDecoder.create());
-					}))
-					.usePlugin(new AbstractMarkwonPlugin() {
-						@Override
-						public void configureTheme(@NonNull MarkwonTheme.Builder builder) {
-							builder
-									.codeTextColor(tinyDb.getInt("codeBlockColor"))
-									.codeBackgroundColor(tinyDb.getInt("codeBlockBackground"))
-									.linkColor(context.getResources().getColor(R.color.lightBlue));
+							assert drawable != null;
+							return ImageItem.withResult(drawable);
 						}
-					})
-					.usePlugin(TablePlugin.create(context))
-					.usePlugin(TaskListPlugin.create(context))
-					.usePlugin(HtmlPlugin.create())
-					.usePlugin(StrikethroughPlugin.create())
-					.usePlugin(LinkifyPlugin.create())
-					.build();
+
+						@NonNull
+						@Override
+						public Collection<String> supportedSchemes() {
+							return Collections.singleton("drawable");
+						}
+					});
+
+					plugin.placeholderProvider(drawable -> null);
+					plugin.addMediaDecoder(GifMediaDecoder.create(false));
+					plugin.addMediaDecoder(SvgMediaDecoder.create(context.getResources()));
+					plugin.addMediaDecoder(SvgMediaDecoder.create());
+					plugin.defaultMediaDecoder(DefaultMediaDecoder.create(context.getResources()));
+					plugin.defaultMediaDecoder(DefaultMediaDecoder.create());
+
+				}))
+
+			.usePlugin(new AbstractMarkwonPlugin() {
+				@Override
+				public void configureTheme(@NonNull MarkwonTheme.Builder builder) {
+					builder
+							.codeTextColor(tinyDb.getInt("codeBlockColor"))
+							.codeBackgroundColor(tinyDb.getInt("codeBlockBackground"))
+							.linkColor(context.getResources().getColor(R.color.lightBlue));
+				}
+			})
+			.usePlugin(TablePlugin.create(context))
+			.usePlugin(TaskListPlugin.create(context))
+			.usePlugin(HtmlPlugin.create())
+			.usePlugin(StrikethroughPlugin.create())
+			.usePlugin(LinkifyPlugin.create())
+			.build();
 
 			Spanned msTitle_ = markwon.toMarkdown(dataModel.getTitle());
 			markwon.setParsedMarkdown(msTitle, msTitle_);
 
-			if (!dataModel.getDescription().equals("")) {
+			if(!dataModel.getDescription().equals("")) {
 
 				CharSequence bodyWithMD = markwon.toMarkdown(EmojiParser.parseToUnicode(dataModel.getDescription()));
 				msDescription.setText(bodyWithMD);
@@ -243,42 +245,50 @@ public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 			}
 			else {
 
-				msDescription.setText("No description");
+				msDescription.setText(context.getString(R.string.milestoneNoDescription));
 			}
 
-			msOpenIssues.setText(dataModel.getOpen_issues() + " Open");
-			msClosedIssues.setText(dataModel.getClosed_issues() + " Closed");
+			msOpenIssues.setText(context.getString(R.string.milestoneIssueStatusOpen, dataModel.getOpen_issues()));
+			msClosedIssues.setText(context.getString(R.string.milestoneIssueStatusClosed, dataModel.getClosed_issues()));
 
-			if ((dataModel.getOpen_issues() + dataModel.getClosed_issues()) > 0) {
+			if((dataModel.getOpen_issues() + dataModel.getClosed_issues()) > 0) {
+
+				if(dataModel.getOpen_issues() == 0) {
 
-				if (dataModel.getOpen_issues() == 0) {
 					msProgress.setProgress(100);
 					msProgress.setOnClickListener(new ClickListener(context.getResources().getString(R.string.milestoneCompletion, 100), context));
+
 				}
 				else {
+
 					int msCompletion = 100 * dataModel.getClosed_issues() / (dataModel.getOpen_issues() + dataModel.getClosed_issues());
 					msProgress.setOnClickListener(new ClickListener(context.getResources().getString(R.string.milestoneCompletion, msCompletion), context));
 					msProgress.setProgress(msCompletion);
+
 				}
 
 			}
 			else {
+
 				msProgress.setProgress(0);
 				msProgress.setOnClickListener(new ClickListener(context.getResources().getString(R.string.milestoneCompletion, 0), context));
+
 			}
 
 			if(dataModel.getDue_on() != null) {
 
-				if (timeFormat.equals("normal") || timeFormat.equals("pretty")) {
+				if(timeFormat.equals("normal") || timeFormat.equals("pretty")) {
 
 					DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd", new Locale(locale));
 					Date date = null;
+
 					try {
 						date = formatter.parse(dataModel.getDue_on());
 					}
-					catch (ParseException e) {
+					catch(ParseException e) {
 						Log.e(TAG, e.toString());
 					}
+
 					assert date != null;
 					String dueDate = formatter.format(date);
 
@@ -290,16 +300,19 @@ public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 					msDueDate.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToast(dataModel.getDue_on()), context));
 
 				}
-				else if (timeFormat.equals("normal1")) {
+				else if(timeFormat.equals("normal1")) {
 
 					SimpleDateFormat formatter = new SimpleDateFormat("dd-MM-yyyy", new Locale(locale));
+
 					Date date1 = null;
+
 					try {
 						date1 = formatter.parse(dataModel.getDue_on());
 					}
-					catch (ParseException e) {
+					catch(ParseException e) {
 						Log.e(TAG, e.toString());
 					}
+
 					assert date1 != null;
 					String dueDate = formatter.format(date1);
 					msDueDate.setText(dueDate);
@@ -308,7 +321,8 @@ public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 
 			}
 			else {
-				msDueDate.setText("No due date");
+
+				msDueDate.setText(context.getString(R.string.milestoneNoDueDate));
 			}
 
 		}
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c5f98a0..bb5f086 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -232,8 +232,12 @@
     <string name="milestoneCreated">Milestone created successfully</string>
     <string name="milestoneCreatedError">Something went wrong, please try again</string>
     <string name="milestoneDateEmpty">Please choose due date</string>
-    <string name="milestoneOpenIssues">Open issues : %1$d</string>
-    <string name="milestoneClosedIssues">Closed issues : %1$d</string>
+    <string name="milestoneNoDueDate">No due date</string>
+    <string name="milestoneNoDescription">No description</string>
+    <string name="milestoneIssueStatusOpen">%1$d Open</string>
+    <string name="milestoneIssueStatusClosed">%1$d Closed</string>
+    <string name="milestoneOpenIssues">Open issues : %1$d</string> <!-- TODO Can be removed -->
+    <string name="milestoneClosedIssues">Closed issues : %1$d</string> <!-- TODO Can be removed -->
 
     <string name="newIssueSelectAssigneesListTitle">Select Assignees</string>
     <string name="newIssueSelectLabelsListTitle">Select Labels</string>
-- 
2.40.1


From 282b7f5cd3137979a654a110105e75c9ef416521 Mon Sep 17 00:00:00 2001
From: opyale <opyale@noreply.gitea.io>
Date: Mon, 1 Jun 2020 16:52:27 +0200
Subject: [PATCH 12/16] Moving items.

---
 app/src/main/res/layout/list_milestones.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/res/layout/list_milestones.xml b/app/src/main/res/layout/list_milestones.xml
index d5f66f3..999d917 100644
--- a/app/src/main/res/layout/list_milestones.xml
+++ b/app/src/main/res/layout/list_milestones.xml
@@ -102,13 +102,13 @@
                     android:layout_height="wrap_content"
                     android:layout_marginRight="5dp"
                     android:contentDescription="@string/generalImgContentText"
-                    app:srcCompat="@drawable/ic_issue_open" />
+                    app:srcCompat="@drawable/ic_issue_closed" />
 
                 <TextView
-                    android:id="@+id/milestoneIssuesClosed"
+                    android:id="@+id/milestoneIssuesOpen"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/repoWatchers"
+                    android:text="@string/repoStars"
                     android:textColor="?attr/primaryTextColor"
                     android:textSize="14sp" />
             </LinearLayout>
@@ -124,13 +124,13 @@
                     android:layout_height="wrap_content"
                     android:layout_marginRight="5dp"
                     android:contentDescription="@string/generalImgContentText"
-                    app:srcCompat="@drawable/ic_issue_closed" />
+                    app:srcCompat="@drawable/ic_issue_open" />
 
                 <TextView
-                    android:id="@+id/milestoneIssuesOpen"
+                    android:id="@+id/milestoneIssuesClosed"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/repoStars"
+                    android:text="@string/repoWatchers"
                     android:textColor="?attr/primaryTextColor"
                     android:textSize="14sp" />
             </LinearLayout>
-- 
2.40.1


From 9de23667a1c96077edbbfebcd8f2b8483590d348 Mon Sep 17 00:00:00 2001
From: opyale <opyale@noreply.gitea.io>
Date: Mon, 1 Jun 2020 16:59:05 +0200
Subject: [PATCH 13/16] Minor improvements.

---
 app/src/main/res/layout/list_milestones.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/list_milestones.xml b/app/src/main/res/layout/list_milestones.xml
index 999d917..e1cd451 100644
--- a/app/src/main/res/layout/list_milestones.xml
+++ b/app/src/main/res/layout/list_milestones.xml
@@ -168,7 +168,7 @@
                 android:id="@+id/milestonesMenu"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_gravity="end"
+                android:layout_gravity="end|bottom"
                 android:layout_weight=".10"
                 android:contentDescription="@string/menuContentDesc"
                 android:scaleType="fitEnd"
-- 
2.40.1


From 8688354710f2924a45d0a586641d2671978e70fb Mon Sep 17 00:00:00 2001
From: opyale <opyale@noreply.gitea.io>
Date: Mon, 1 Jun 2020 18:19:08 +0200
Subject: [PATCH 14/16] Swapping icons.

---
 app/src/main/res/layout/list_milestones.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/list_milestones.xml b/app/src/main/res/layout/list_milestones.xml
index e1cd451..8804c61 100644
--- a/app/src/main/res/layout/list_milestones.xml
+++ b/app/src/main/res/layout/list_milestones.xml
@@ -102,7 +102,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginRight="5dp"
                     android:contentDescription="@string/generalImgContentText"
-                    app:srcCompat="@drawable/ic_issue_closed" />
+                    app:srcCompat="@drawable/ic_issue_open" />
 
                 <TextView
                     android:id="@+id/milestoneIssuesOpen"
@@ -124,7 +124,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginRight="5dp"
                     android:contentDescription="@string/generalImgContentText"
-                    app:srcCompat="@drawable/ic_issue_open" />
+                    app:srcCompat="@drawable/ic_issue_closed" />
 
                 <TextView
                     android:id="@+id/milestoneIssuesClosed"
-- 
2.40.1


From 6d9334b475dfba07cf378d8ff9292ccc83639de4 Mon Sep 17 00:00:00 2001
From: opyale <opyale@noreply.gitea.io>
Date: Mon, 1 Jun 2020 18:21:32 +0200
Subject: [PATCH 15/16] Adding a little bit more space between title and
 progress bar.

---
 app/src/main/res/layout/list_milestones.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/list_milestones.xml b/app/src/main/res/layout/list_milestones.xml
index 8804c61..f6b5eba 100644
--- a/app/src/main/res/layout/list_milestones.xml
+++ b/app/src/main/res/layout/list_milestones.xml
@@ -51,7 +51,7 @@
                 style="@style/Widget.AppCompat.ProgressBar.Horizontal"
                 android:layout_width="0dp"
                 android:layout_height="10dp"
-                android:layout_marginLeft="10dp"
+                android:layout_marginLeft="15dp"
                 android:layout_marginRight="10dp"
                 android:layout_weight="1"
                 android:indeterminate="false"
-- 
2.40.1


From 319b001c965c52b616c13e10c9d468f737102e28 Mon Sep 17 00:00:00 2001
From: opyale <opyale@noreply.gitea.io>
Date: Mon, 1 Jun 2020 18:24:57 +0200
Subject: [PATCH 16/16] Removing unused strings.

---
 app/src/main/res/values/strings.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bb5f086..775bab8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -236,8 +236,6 @@
     <string name="milestoneNoDescription">No description</string>
     <string name="milestoneIssueStatusOpen">%1$d Open</string>
     <string name="milestoneIssueStatusClosed">%1$d Closed</string>
-    <string name="milestoneOpenIssues">Open issues : %1$d</string> <!-- TODO Can be removed -->
-    <string name="milestoneClosedIssues">Closed issues : %1$d</string> <!-- TODO Can be removed -->
 
     <string name="newIssueSelectAssigneesListTitle">Select Assignees</string>
     <string name="newIssueSelectLabelsListTitle">Select Labels</string>
-- 
2.40.1