From 1e165054142813c4b5e51af6cc2c8aa4e43afc44 Mon Sep 17 00:00:00 2001
From: M M Arif <mmarif@swatian.com>
Date: Sun, 11 Jun 2023 11:56:05 +0500
Subject: [PATCH] Implement Tabs and Spaces identation

---
 .../gitnex/activities/CodeEditorActivity.java | 21 +++++++++++++++++--
 .../SettingsCodeEditorActivity.java           |  3 +++
 .../res/menu/files_switch_branches_menu.xml   |  4 ++--
 app/src/main/res/values/gitea_version.xml     |  4 ++--
 4 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/mian/gitnex/activities/CodeEditorActivity.java b/app/src/main/java/org/mian/gitnex/activities/CodeEditorActivity.java
index 3776430b..34060ad4 100644
--- a/app/src/main/java/org/mian/gitnex/activities/CodeEditorActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CodeEditorActivity.java
@@ -73,8 +73,25 @@ public class CodeEditorActivity extends BaseActivity {
 		binding.codeView.setLineNumberTextSize(32f);
 
 		// Setup Auto indenting feature
-		binding.codeView.setTabLength(4);
-		binding.codeView.setEnableAutoIndentation(true);
+		if (tinyDB.getInt("ceIndentationId") == 0) {
+			binding.codeView.setEnableAutoIndentation(true);
+			switch (tinyDB.getInt("ceIndentationTabsId")) {
+				case 0:
+					binding.codeView.setTabLength(2);
+					break;
+				case 1:
+					binding.codeView.setTabLength(4);
+					break;
+				case 2:
+					binding.codeView.setTabLength(6);
+					break;
+				case 3:
+					binding.codeView.setTabLength(8);
+					break;
+			}
+		} else {
+			binding.codeView.setEnableAutoIndentation(false);
+		}
 
 		// Set up the language and theme with SyntaxManager helper class
 		currentLanguage.applyTheme(this, binding.codeView, currentTheme);
diff --git a/app/src/main/java/org/mian/gitnex/activities/SettingsCodeEditorActivity.java b/app/src/main/java/org/mian/gitnex/activities/SettingsCodeEditorActivity.java
index 3f003cec..3a045bc2 100644
--- a/app/src/main/java/org/mian/gitnex/activities/SettingsCodeEditorActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/SettingsCodeEditorActivity.java
@@ -35,6 +35,7 @@ public class SettingsCodeEditorActivity extends BaseActivity {
 
 		// color selector dialog
 		colorList = getResources().getStringArray(R.array.ceColors);
+		colorSelectedChoice = tinyDB.getInt("ceColorId");
 		activitySettingsCodeEditorBinding.ceColorSelected.setText(colorList[colorSelectedChoice]);
 
 		activitySettingsCodeEditorBinding.ceColorSelectionFrame.setOnClickListener(
@@ -66,6 +67,7 @@ public class SettingsCodeEditorActivity extends BaseActivity {
 
 		// indentation selector dialog
 		indentationList = getResources().getStringArray(R.array.ceIndentation);
+		indentationSelectedChoice = tinyDB.getInt("ceIndentationId");
 		activitySettingsCodeEditorBinding.indentationSelected.setText(
 				indentationList[indentationSelectedChoice]);
 
@@ -107,6 +109,7 @@ public class SettingsCodeEditorActivity extends BaseActivity {
 		}
 
 		indentationTabsList = getResources().getStringArray(R.array.ceIndentationTabsWidth);
+		indentationTabsSelectedChoice = tinyDB.getInt("ceIndentationTabsId");
 		activitySettingsCodeEditorBinding.indentationTabsSelected.setText(
 				indentationTabsList[indentationTabsSelectedChoice]);
 
diff --git a/app/src/main/res/menu/files_switch_branches_menu.xml b/app/src/main/res/menu/files_switch_branches_menu.xml
index 6f7b5b13..eca8693f 100644
--- a/app/src/main/res/menu/files_switch_branches_menu.xml
+++ b/app/src/main/res/menu/files_switch_branches_menu.xml
@@ -7,13 +7,13 @@
         android:icon="@drawable/ic_branch"
         android:orderInCategory="1"
         android:title="@string/strSwitchBranches"
-        app:showAsAction="ifRoom|withText" />
+        app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/branchCommits"
         android:icon="@drawable/ic_commit"
         android:orderInCategory="2"
         android:title="@string/commitTitle"
-        app:showAsAction="ifRoom|withText" />
+        app:showAsAction="ifRoom" />
 
 </menu>
diff --git a/app/src/main/res/values/gitea_version.xml b/app/src/main/res/values/gitea_version.xml
index 79dc468f..009662c6 100644
--- a/app/src/main/res/values/gitea_version.xml
+++ b/app/src/main/res/values/gitea_version.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="versionLow" translatable="false">1.17</string>
-    <string name="versionHigh" translatable="false">1.19</string>
+    <string name="versionLow" translatable="false">1.18</string>
+    <string name="versionHigh" translatable="false">1.20</string>
 
 </resources>