From dfb87a840a0b0f98cb74bfdd82bf69922398d2c8 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sat, 5 Feb 2022 12:17:21 +0100
Subject: [PATCH] updating commons

---
 app/build.gradle                                          | 8 +++++++-
 app/src/fdroid/res/values/bools.xml                       | 4 ++++
 .../filemanager/pro/activities/MainActivity.kt            | 7 ++++++-
 3 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 app/src/fdroid/res/values/bools.xml

diff --git a/app/build.gradle b/app/build.gradle
index 02380a4d..9d7e8c01 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -46,6 +46,12 @@ android {
         }
     }
 
+    flavorDimensions "variants"
+    productFlavors {
+        core {}
+        fdroid {}
+    }
+
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
     }
@@ -57,7 +63,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.github.SimpleMobileTools:Simple-Commons:d39bf6263d'
+    implementation 'com.github.SimpleMobileTools:Simple-Commons:4d36cc84e9'
     implementation 'com.github.Stericson:RootTools:df729dcb13'
     implementation 'com.github.Stericson:RootShell:1.6'
     implementation 'com.alexvasilkov:gesture-views:2.5.2'
diff --git a/app/src/fdroid/res/values/bools.xml b/app/src/fdroid/res/values/bools.xml
new file mode 100644
index 00000000..e966e656
--- /dev/null
+++ b/app/src/fdroid/res/values/bools.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="show_donate_in_about">true</bool>
+</resources>
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/MainActivity.kt
index c5bb53e4..3868289f 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/MainActivity.kt
@@ -200,7 +200,7 @@ class MainActivity : SimpleActivity() {
             R.id.stop_showing_hidden -> tryToggleTemporarilyShowHidden()
             R.id.increase_column_count -> increaseColumnCount()
             R.id.reduce_column_count -> reduceColumnCount()
-            R.id.settings -> startActivity(Intent(applicationContext, SettingsActivity::class.java))
+            R.id.settings -> launchSettings()
             R.id.about -> launchAbout()
             else -> return super.onOptionsItemSelected(item)
         }
@@ -598,6 +598,11 @@ class MainActivity : SimpleActivity() {
         }
     }
 
+    private fun launchSettings() {
+        hideKeyboard()
+        startActivity(Intent(applicationContext, SettingsActivity::class.java))
+    }
+
     private fun launchAbout() {
         val licenses = LICENSE_GLIDE or LICENSE_PATTERN or LICENSE_REPRINT or LICENSE_GESTURE_VIEWS