From f19327431f924f0699ae4de27aa3136ae773f7e0 Mon Sep 17 00:00:00 2001
From: M M Arif <mmarif@swatian.com>
Date: Wed, 2 Oct 2019 22:24:02 +0500
Subject: [PATCH] fix bugs since 2.1.0 release

---
 app/build.gradle                                      |  4 ++--
 .../org/mian/gitnex/adapters/MilestonesAdapter.java   |  1 +
 .../org/mian/gitnex/adapters/ReposListAdapter.java    | 11 ++++++++---
 .../org/mian/gitnex/fragments/RepoInfoFragment.java   |  7 +------
 app/src/main/res/drawable/progress_bar.xml            | 10 +++++-----
 app/src/main/res/layout/milestones_list.xml           |  2 +-
 fastlane/metadata/android/en-US/changelogs/61.txt     |  6 ++++++
 7 files changed, 24 insertions(+), 17 deletions(-)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/61.txt

diff --git a/app/build.gradle b/app/build.gradle
index 06c5293a..44c4e7e1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "org.mian.gitnex"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 60
-        versionName "2.1.0"
+        versionCode 61
+        versionName "2.1.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
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 239e2c75..c69d4062 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/MilestonesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/MilestonesAdapter.java
@@ -237,6 +237,7 @@ public class MilestonesAdapter extends RecyclerView.Adapter<MilestonesAdapter.Mi
 
             if (currentItem.getOpen_issues() == 0) {
                 holder.msProgress.setProgress(100);
+                holder.msProgress.setOnClickListener(new ClickListener(mCtx.getResources().getString(R.string.milestoneCompletion, 100), mCtx));
             }
             else {
                 int msCompletion = 100 * currentItem.getClosed_issues() / (currentItem.getOpen_issues() + currentItem.getClosed_issues());
diff --git a/app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java
index 239d5f5c..2432f44d 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java
@@ -181,9 +181,14 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo
                 .endConfig()
                 .buildRoundRect(firstCharacter, color, 3);
 
-        if (!currentItem.getAvatar_url().equals("")) {
-            Picasso.get().load(currentItem.getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.image);
-        } else {
+        if (currentItem.getAvatar_url() != null) {
+            if (!currentItem.getAvatar_url().equals("")) {
+                Picasso.get().load(currentItem.getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.image);
+            } else {
+                holder.image.setImageDrawable(drawable);
+            }
+        }
+        else {
             holder.image.setImageDrawable(drawable);
         }
 
diff --git a/app/src/main/java/org/mian/gitnex/fragments/RepoInfoFragment.java b/app/src/main/java/org/mian/gitnex/fragments/RepoInfoFragment.java
index c3fab270..f495118a 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/RepoInfoFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/RepoInfoFragment.java
@@ -247,12 +247,7 @@ public class RepoInfoFragment extends Fragment {
                             repoRepoUrlInfo.setText(repoInfo.getHtml_url());
                             repoForksCountInfo.setText(repoInfo.getForks_count());
 
-                            if(repoInfo.getHas_issues()) {
-                                tinyDb.putBoolean("hasIssues", repoInfo.getHas_issues());
-                            }
-                            else {
-                                tinyDb.putBoolean("hasIssues", true);
-                            }
+                            tinyDb.putBoolean("hasIssues", repoInfo.getHas_issues());
 
                             switch (timeFormat) {
                                 case "pretty": {
diff --git a/app/src/main/res/drawable/progress_bar.xml b/app/src/main/res/drawable/progress_bar.xml
index 3a724587..49ed5a6c 100644
--- a/app/src/main/res/drawable/progress_bar.xml
+++ b/app/src/main/res/drawable/progress_bar.xml
@@ -4,8 +4,8 @@
 
     <item
         android:id="@android:id/background"
-        android:top="4dp"
-        android:bottom="4dp"
+        android:top="2dp"
+        android:bottom="2dp"
         android:right="1dp"
         android:left="1dp">
         <shape>
@@ -16,12 +16,12 @@
 
     <item
         android:id="@android:id/progress"
-        android:top="1dp"
-        android:bottom="1dp"
+        android:top="3dp"
+        android:bottom="3dp"
         android:left="1dp"
         android:right="1dp">
 
-        <scale android:scaleWidth="100%" android:scaleHeight="80%">
+        <scale android:scaleWidth="100%">
             <shape>
                 <corners android:radius="15dp" />
             </shape>
diff --git a/app/src/main/res/layout/milestones_list.xml b/app/src/main/res/layout/milestones_list.xml
index a7ec2a11..ab9f79d9 100644
--- a/app/src/main/res/layout/milestones_list.xml
+++ b/app/src/main/res/layout/milestones_list.xml
@@ -67,7 +67,7 @@
             style="@style/Widget.AppCompat.ProgressBar.Horizontal"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="82"
+            android:layout_weight="80"
             android:progress="50"
             android:layout_marginTop="2dp"
             android:progressDrawable="@drawable/progress_bar"
diff --git a/fastlane/metadata/android/en-US/changelogs/61.txt b/fastlane/metadata/android/en-US/changelogs/61.txt
new file mode 100644
index 00000000..5d5caf18
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/61.txt
@@ -0,0 +1,6 @@
+Bugfix: crash when repo avatar in not present in api nodes. old Gitea instances
+Bugfix: Milestone progress bar fix
+Bugfix: Create new issue enable/disable fix
+
+For more, check the release notes.
+https://gitea.com/mmarif/GitNex/releases
\ No newline at end of file