From dbf5be25a5534f192a8255a3b17eae970e3730ec Mon Sep 17 00:00:00 2001
From: M M Arif <mmarif@noreply.codeberg.org>
Date: Sun, 13 Sep 2020 06:52:30 +0200
Subject: [PATCH] Add stat indicator pr/issues (#686)

Merge branch 'master' into add-stat-indicator

Merge branch 'master' of codeberg.org:gitnex/GitNex into master

Show PR/Issue stat

Merge branch 'master' of codeberg.org:gitnex/GitNex into master

Merge branch 'master' of codeberg.org:gitnex/GitNex into master

endline

Co-authored-by: M M Arif <mmarif@swatian.com>
Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/686
---
 .../activities/IssueDetailActivity.java       | 23 +++++++++++++
 .../main/res/drawable/ic_issue_closed_red.xml | 20 +++++++++++
 .../res/drawable/ic_pull_request_closed.xml   | 34 +++++++++++++++++++
 .../res/drawable/ic_pull_request_merged.xml   | 34 +++++++++++++++++++
 .../main/res/layout/activity_issue_detail.xml | 10 ++++++
 app/src/main/res/values/colors.xml            |  3 ++
 6 files changed, 124 insertions(+)
 create mode 100644 app/src/main/res/drawable/ic_issue_closed_red.xml
 create mode 100644 app/src/main/res/drawable/ic_pull_request_closed.xml
 create mode 100644 app/src/main/res/drawable/ic_pull_request_merged.xml

diff --git a/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java b/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java
index 76f8d4e5..154cacab 100644
--- a/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java
@@ -104,6 +104,7 @@ public class IssueDetailActivity extends BaseActivity {
 	private LinearLayout assigneesLayout;
 	private View divider;
 	private ProgressBar progressBar;
+	private ImageView issuePrState;
 
 	@Override
 	protected int getLayoutResourceId() {
@@ -145,6 +146,7 @@ public class IssueDetailActivity extends BaseActivity {
 		assigneesLayout = findViewById(R.id.frameAssignees);
 		divider = findViewById(R.id.divider);
 		progressBar = findViewById(R.id.progressBar);
+		issuePrState = findViewById(R.id.issuePrState);
 
 		Toolbar toolbar = findViewById(R.id.toolbar);
 		TextView toolbarTitle = toolbar.findViewById(R.id.toolbar_title);
@@ -351,6 +353,27 @@ public class IssueDetailActivity extends BaseActivity {
 					Issues singleIssue = response.body();
 					assert singleIssue != null;
 
+					issuePrState.setVisibility(View.VISIBLE);
+					if(singleIssue.getPull_request() != null) {
+
+						if(singleIssue.getPull_request().isMerged()) { // merged
+
+							issuePrState.setImageResource(R.drawable.ic_pull_request_merged);
+						}
+						else if(!singleIssue.getPull_request().isMerged() && singleIssue.getState().equals("closed")) { // closed
+
+							issuePrState.setImageResource(R.drawable.ic_pull_request_closed);
+						}
+						else { // open
+
+							issuePrState.setImageResource(R.drawable.ic_pull_request);
+						}
+					}
+					else if(singleIssue.getState().equals("closed")) { // issue closed
+
+						issuePrState.setImageResource(R.drawable.ic_issue_closed_red);
+					}
+
 					final Markwon markwon = Markwon.builder(Objects.requireNonNull(ctx)).usePlugin(CorePlugin.create())
 						.usePlugin(ImagesPlugin.create(plugin -> {
 							plugin.addSchemeHandler(new SchemeHandler() {
diff --git a/app/src/main/res/drawable/ic_issue_closed_red.xml b/app/src/main/res/drawable/ic_issue_closed_red.xml
new file mode 100644
index 00000000..0f0ee63f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_issue_closed_red.xml
@@ -0,0 +1,20 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:pathData="M22,11.08V12a10,10 0,1 1,-5.93 -9.14"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:fillColor="#00000000"
+        android:strokeColor="@color/iconIssuePrClosedColor"
+        android:strokeLineCap="round"/>
+    <path
+        android:pathData="M22,4l-10,10.01l-3,-3"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:fillColor="#00000000"
+        android:strokeColor="@color/iconIssuePrClosedColor"
+        android:strokeLineCap="round"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_pull_request_closed.xml b/app/src/main/res/drawable/ic_pull_request_closed.xml
new file mode 100644
index 00000000..2845a5c8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_pull_request_closed.xml
@@ -0,0 +1,34 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:pathData="M18,18m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:fillColor="#00000000"
+        android:strokeColor="@color/iconIssuePrClosedColor"
+        android:strokeLineCap="round"/>
+    <path
+        android:pathData="M6,6m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:fillColor="#00000000"
+        android:strokeColor="@color/iconIssuePrClosedColor"
+        android:strokeLineCap="round"/>
+    <path
+        android:pathData="M13,6h3a2,2 0,0 1,2 2v7"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:fillColor="#00000000"
+        android:strokeColor="@color/iconIssuePrClosedColor"
+        android:strokeLineCap="round"/>
+    <path
+        android:pathData="M6,9L6,21"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:fillColor="#00000000"
+        android:strokeColor="@color/iconIssuePrClosedColor"
+        android:strokeLineCap="round"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_pull_request_merged.xml b/app/src/main/res/drawable/ic_pull_request_merged.xml
new file mode 100644
index 00000000..e68c8a06
--- /dev/null
+++ b/app/src/main/res/drawable/ic_pull_request_merged.xml
@@ -0,0 +1,34 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:pathData="M18,18m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:fillColor="#00000000"
+        android:strokeColor="@color/iconPrMergedColor"
+        android:strokeLineCap="round"/>
+    <path
+        android:pathData="M6,6m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:fillColor="#00000000"
+        android:strokeColor="@color/iconPrMergedColor"
+        android:strokeLineCap="round"/>
+    <path
+        android:pathData="M13,6h3a2,2 0,0 1,2 2v7"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:fillColor="#00000000"
+        android:strokeColor="@color/iconPrMergedColor"
+        android:strokeLineCap="round"/>
+    <path
+        android:pathData="M6,9L6,21"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:fillColor="#00000000"
+        android:strokeColor="@color/iconPrMergedColor"
+        android:strokeLineCap="round"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_issue_detail.xml b/app/src/main/res/layout/activity_issue_detail.xml
index 80efb9cd..0d642551 100644
--- a/app/src/main/res/layout/activity_issue_detail.xml
+++ b/app/src/main/res/layout/activity_issue_detail.xml
@@ -19,6 +19,16 @@
             android:layout_height="wrap_content"
             android:background="?attr/primaryBackgroundColor">
 
+            <ImageView
+                android:id="@+id/issuePrState"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/ic_issue"
+                android:paddingStart="0dp"
+                android:paddingEnd="8dp"
+                android:visibility="gone"
+                android:contentDescription="@string/generalImgContentText" />
+
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 10192bf5..04a2448f 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -50,4 +50,7 @@
     <color name="retroThemeColorPrimary">#6200EE</color>
     <color name="retroThemeColorSecondary">#03DAC6</color>
 
+    <color name="iconPrMergedColor">#a333c8</color>
+    <color name="iconIssuePrClosedColor">#db2828</color>
+
 </resources>