From c981ec2f16ea7554669a2e3ae50eed3ab92dfb3d Mon Sep 17 00:00:00 2001
From: M M Arif <mmarif@swatian.com>
Date: Sat, 14 Mar 2020 14:22:50 +0000
Subject: [PATCH] Fixes for 2.4 release (#281)

Fix unnecessary reset for repositories

merge screen background color

Merge branch 'master' into fixes-2.4

Add bottom margin for smaller devices

Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/281
---
 .../org/mian/gitnex/fragments/MyRepositoriesFragment.java    | 5 ++++-
 .../org/mian/gitnex/fragments/RepositoriesByOrgFragment.java | 5 ++++-
 .../mian/gitnex/fragments/StarredRepositoriesFragment.java   | 5 ++++-
 app/src/main/res/layout/activity_merge_pull_request.xml      | 2 +-
 app/src/main/res/layout/layout_settings_languages.xml        | 1 +
 5 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/mian/gitnex/fragments/MyRepositoriesFragment.java b/app/src/main/java/org/mian/gitnex/fragments/MyRepositoriesFragment.java
index b5f0f7da..d4aea2aa 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/MyRepositoriesFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/MyRepositoriesFragment.java
@@ -161,7 +161,10 @@ public class MyRepositoriesFragment extends Fragment {
         final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
         final String userLogin =  tinyDb.getString("userLogin");
 
-        MyRepositoriesViewModel.loadMyReposList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), userLogin, getContext(),  pageSize, resultLimit);
+        if(tinyDb.getBoolean("repoCreated")) {
+            MyRepositoriesViewModel.loadMyReposList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), userLogin, getContext(),  pageSize, resultLimit);
+            tinyDb.putBoolean("repoCreated", false);
+        }
 
     }
 
diff --git a/app/src/main/java/org/mian/gitnex/fragments/RepositoriesByOrgFragment.java b/app/src/main/java/org/mian/gitnex/fragments/RepositoriesByOrgFragment.java
index d20bd67d..13271806 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/RepositoriesByOrgFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/RepositoriesByOrgFragment.java
@@ -119,7 +119,10 @@ public class RepositoriesByOrgFragment extends Fragment {
         final String loginUid = tinyDb.getString("loginUid");
         final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
 
-        RepositoriesByOrgViewModel.loadOrgRepos(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), orgName, getContext(), pageSize, resultLimit);
+        if(tinyDb.getBoolean("repoCreated")) {
+            RepositoriesByOrgViewModel.loadOrgRepos(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), orgName, getContext(), pageSize, resultLimit);
+            tinyDb.putBoolean("repoCreated", false);
+        }
 
     }
 
diff --git a/app/src/main/java/org/mian/gitnex/fragments/StarredRepositoriesFragment.java b/app/src/main/java/org/mian/gitnex/fragments/StarredRepositoriesFragment.java
index dfeb53c0..25cf1794 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/StarredRepositoriesFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/StarredRepositoriesFragment.java
@@ -153,7 +153,10 @@ public class StarredRepositoriesFragment extends Fragment {
         final String loginUid = tinyDb.getString("loginUid");
         final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
 
-        StarredRepositoriesViewModel.loadStarredReposList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), getContext(), pageSize, resultLimit);
+        if(tinyDb.getBoolean("repoCreated")) {
+            StarredRepositoriesViewModel.loadStarredReposList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), getContext(), pageSize, resultLimit);
+            tinyDb.putBoolean("repoCreated", false);
+        }
 
     }
 
diff --git a/app/src/main/res/layout/activity_merge_pull_request.xml b/app/src/main/res/layout/activity_merge_pull_request.xml
index 5280ca28..2607e54b 100644
--- a/app/src/main/res/layout/activity_merge_pull_request.xml
+++ b/app/src/main/res/layout/activity_merge_pull_request.xml
@@ -57,7 +57,7 @@
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/backgroundColor">
+        android:background="?attr/primaryBackgroundColor">
 
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/layout_settings_languages.xml b/app/src/main/res/layout/layout_settings_languages.xml
index cae6160c..4ef8364b 100644
--- a/app/src/main/res/layout/layout_settings_languages.xml
+++ b/app/src/main/res/layout/layout_settings_languages.xml
@@ -54,6 +54,7 @@
             android:layout_marginEnd="4dp"
             android:autoLink="web"
             android:layout_marginTop="20dp"
+            android:layout_marginBottom="30dp"
             android:text="@string/settingsHelpTranslateText"
             android:textColor="@color/lightBlue"/>