From e07ee1acebcfd22cabacd1d6941f2b299681b1a9 Mon Sep 17 00:00:00 2001
From: opyale <opyale@noreply.gitea.io>
Date: Tue, 7 Apr 2020 20:45:40 +0000
Subject: [PATCH] Enabling counter badges by default. (#378)

Merge remote-tracking branch 'remotes/main/master' into counter-badges

# Conflicts:
#	app/src/main/java/org/mian/gitnex/fragments/SettingsFragment.java

Moving to BaseActivity

Enabling counter badges by default.

Co-authored-by: opyale <example@example.com>
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/378
Reviewed-by: M M Arif <mmarif@swatian.com>
---
 .../mian/gitnex/activities/BaseActivity.java  |  6 +++++
 .../gitnex/fragments/SettingsFragment.java    | 24 +++++++++----------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java b/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java
index cd6fb798..731bfd44 100644
--- a/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java
@@ -60,6 +60,12 @@ public abstract class BaseActivity extends AppCompatActivity {
 
         }
 
+        // enabling counter badges by default
+        if(tinyDb.getString("enableCounterBadgesInit").isEmpty()) {
+            tinyDb.putBoolean("enableCounterBadges", true);
+            tinyDb.putString("enableCounterBadgesInit", "yes");
+        }
+
     }
 
     protected abstract int getLayoutResourceId();
diff --git a/app/src/main/java/org/mian/gitnex/fragments/SettingsFragment.java b/app/src/main/java/org/mian/gitnex/fragments/SettingsFragment.java
index d21214dd..c84ac9c4 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/SettingsFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/SettingsFragment.java
@@ -99,9 +99,9 @@ public class SettingsFragment extends Fragment {
 			homeScreenSelected.setText(tinyDb.getString("homeScreenStr"));
 		}
 
-		if(!tinyDb.getString("customFontStr").isEmpty()) {
-			customFontSelected.setText(tinyDb.getString("customFontStr"));
-		}
+        if(!tinyDb.getString("customFontStr").isEmpty()) {
+            customFontSelected.setText(tinyDb.getString("customFontStr"));
+        }
 
 		if(!tinyDb.getString("themeStr").isEmpty()) {
 			themeSelected.setText(tinyDb.getString("themeStr"));
@@ -167,16 +167,14 @@ public class SettingsFragment extends Fragment {
 		// counter badge switcher
 		counterBadgesSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {
 
-			if(isChecked) {
-				tinyDb.putBoolean("enableCounterBadges", true);
-				tinyDb.putString("enableCounterBadgesInit", "yes");
-				Toasty.info(getContext(), getResources().getString(R.string.settingsSave));
-			}
-			else {
-				tinyDb.putBoolean("enableCounterBadges", false);
-				tinyDb.putString("enableCounterBadgesInit", "yes");
-				Toasty.info(getContext(), getResources().getString(R.string.settingsSave));
-			}
+            if (isChecked) {
+                tinyDb.putBoolean("enableCounterBadges", true);
+                Toasty.info(getContext(), getResources().getString(R.string.settingsSave));
+            }
+            else {
+                tinyDb.putBoolean("enableCounterBadges", false);
+                Toasty.info(getContext(), getResources().getString(R.string.settingsSave));
+            }
 
 		});