From 6791bbae60a53c5348b545c77221e0df1d35145e Mon Sep 17 00:00:00 2001
From: Tobias <tobias.bielefeld@gmail.com>
Date: Mon, 24 Jun 2024 18:41:47 +0200
Subject: [PATCH] Add option to close app after starting the search

---
 .../java/de/tobiasbielefeld/searchbar/SharedData.java     | 8 ++++++++
 .../de/tobiasbielefeld/searchbar/ui/MainActivity.java     | 4 ++++
 app/src/main/res/values-de/strings.xml                    | 3 ++-
 app/src/main/res/values-es-rAR/strings.xml                | 6 +++++-
 app/src/main/res/values-es/strings.xml                    | 6 +++++-
 app/src/main/res/values-fr/strings.xml                    | 4 +++-
 app/src/main/res/values-it/strings.xml                    | 4 ++++
 app/src/main/res/values-ja/strings.xml                    | 4 ++++
 app/src/main/res/values-tr/strings.xml                    | 4 ++++
 app/src/main/res/values-zh-rCN/strings.xml                | 4 ++++
 app/src/main/res/values/bool.xml                          | 1 +
 app/src/main/res/values/strings-changelog.xml             | 1 +
 app/src/main/res/values/strings-non-translatable.xml      | 1 +
 app/src/main/res/values/strings.xml                       | 3 +++
 app/src/main/res/xml/pref_settings.xml                    | 8 ++++++++
 metadata/en/changelogs/13.txt                             | 1 +
 16 files changed, 58 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/de/tobiasbielefeld/searchbar/SharedData.java b/app/src/main/java/de/tobiasbielefeld/searchbar/SharedData.java
index cec194d..4c75806 100644
--- a/app/src/main/java/de/tobiasbielefeld/searchbar/SharedData.java
+++ b/app/src/main/java/de/tobiasbielefeld/searchbar/SharedData.java
@@ -55,11 +55,13 @@ public class SharedData {
     public static String PREF_ORIENTATION;
     public static String PREF_STATUS_BAR;
     public static String PREF_LANGUAGE;
+    public static String PREF_CLOSE_AFTER_SEARCH;
 
     public static String DEFAULT_SEARCH_URL;
     public static String DEFAULT_ORIENTATION;
     public static boolean DEFAULT_STATUS_BAR;
     public static boolean DEFAULT_DARK_THEME;
+    public static boolean DEFAULT_CLOSE_AFTER_SEARCH;
     public static int DEFAULT_THEME;
     public static int DEFAULT_SEARCH_SELECTED_INDEX;
     public static boolean DEFAULT_HIDE_APP_ICON;
@@ -88,6 +90,7 @@ public static void reinitializeData(Context context){
             PREF_THEME = res.getString(R.string.pref_key_theme);
             PREF_CUSTOM_SEARCH_URL = res.getString(R.string.pref_key_custom_search_url);
             PREF_HIDE_APP_ICON = res.getString(R.string.pref_key_hide_app_icon);
+            PREF_CLOSE_AFTER_SEARCH = res.getString(R.string.pref_key_close_after_search);
 
             DEFAULT_SEARCH_SELECTED_INDEX = res.getInteger(R.integer.default_search_engine_v2);
             DEFAULT_SEARCH_URL = res.getStringArray(R.array.search_engine_uris)[DEFAULT_SEARCH_SELECTED_INDEX];
@@ -96,6 +99,7 @@ public static void reinitializeData(Context context){
             DEFAULT_DARK_THEME = res.getBoolean(R.bool.default_dark_theme);
             DEFAULT_THEME = res.getInteger(R.integer.default_theme);
             DEFAULT_HIDE_APP_ICON = res.getBoolean(R.bool.default_hide_app_icon);
+            DEFAULT_CLOSE_AFTER_SEARCH = res.getBoolean(R.bool.default_close_after_search);
         }
     }
 
@@ -132,6 +136,10 @@ public static int getSavedOrientation() {
         return Integer.parseInt(getSavedString(PREF_ORIENTATION, "1"));
     }
 
+    public static boolean getSavedCloseAfterSearch() {
+        return getSavedBoolean(PREF_CLOSE_AFTER_SEARCH, DEFAULT_CLOSE_AFTER_SEARCH);
+    }
+
     public static void logText(String text){
         Log.e("hey",text);
     }
diff --git a/app/src/main/java/de/tobiasbielefeld/searchbar/ui/MainActivity.java b/app/src/main/java/de/tobiasbielefeld/searchbar/ui/MainActivity.java
index cfed7fc..fa2fe2b 100644
--- a/app/src/main/java/de/tobiasbielefeld/searchbar/ui/MainActivity.java
+++ b/app/src/main/java/de/tobiasbielefeld/searchbar/ui/MainActivity.java
@@ -175,6 +175,10 @@ public void startSearch() {
 
         searchText.setSelection(0, searchText.length());                                            //select all text to allow for easy delete or modification on resume
         records.add(text);                                                                          //move search term to front of history
+
+        if (getSavedCloseAfterSearch()) {
+            finish();
+        }
     }
 
     /**
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 3df6c66..e010d9c 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -41,7 +41,8 @@
 <string name="settings_change_theme_dark">"Dunkel"</string>
 <string name="settings_change_theme_light">"Hell"</string>
 <string name="settings_change_theme_default">"System Einstellungen folgen"</string>
-
+    <string name="settings_close_after_search_title">App schließen, nachdem die Suche gestartet wurde</string>
+    <string name="settings_close_after_search_text">Die App wird nicht erneut geöffnet, wenn im Browser auf „Zurück“ geklickt wird.</string>
 <!-- About -->
 <string name="activity_about">"Über"</string>
 <string name="about_description">"Zeige Informationen über die Anwendung wie Lizenzen und Änderungen"</string>
diff --git a/app/src/main/res/values-es-rAR/strings.xml b/app/src/main/res/values-es-rAR/strings.xml
index 5dd15da..9956f92 100644
--- a/app/src/main/res/values-es-rAR/strings.xml
+++ b/app/src/main/res/values-es-rAR/strings.xml
@@ -79,7 +79,11 @@
   <string name="settings_change_theme_light">Luz</string>
       
   <string name="settings_change_theme_default">Seguir la configuración del sistema</string>
-      
+
+  <string name="settings_close_after_search_title">Cerrar la aplicación después de iniciar la búsqueda</string>
+
+  <string name="settings_close_after_search_text">La aplicación no se abrirá nuevamente cuando presiones Atrás desde tu navegador</string>
+
   <!--About-->
       
   <string name="activity_about">Acerca de</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 5dd15da..9956f92 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -79,7 +79,11 @@
   <string name="settings_change_theme_light">Luz</string>
       
   <string name="settings_change_theme_default">Seguir la configuración del sistema</string>
-      
+
+  <string name="settings_close_after_search_title">Cerrar la aplicación después de iniciar la búsqueda</string>
+
+  <string name="settings_close_after_search_text">La aplicación no se abrirá nuevamente cuando presiones Atrás desde tu navegador</string>
+
   <!--About-->
       
   <string name="activity_about">Acerca de</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 734308a..1a5ddff 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -54,8 +54,10 @@
 <string name="settings_change_theme_dark">Sombre</string>
 <string name="settings_change_theme_light">Lumière</string>
 <string name="settings_change_theme_default">Suivre les paramètres du système</string>
+<string name="settings_close_after_search_title">Fermer l\'application après avoir lancé la recherche</string>
+<string name="settings_close_after_search_text">L\'application ne s\'ouvrira pas lorsque vous reviendrez de votre navigateur</string>
 
-<!-- languages -->
+    <!-- languages -->
 <string name="settings_language_default">"Langue par défaut"</string>
 <string name="settings_language_english">"Anglais"</string>
 <string name="settings_language_french">"Français"</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 904373f..64af5b2 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -118,6 +118,10 @@
       
   <string name="about_sliding_tabs_usage">Utilizzato per le schede nella sezione \"Informazioni sul gioco\" schermo</string>
 
+  <string name="settings_close_after_search_title">Chiudi l\'app dopo aver avviato la ricerca</string>
+
+  <string name="settings_close_after_search_text">L\'app non si aprirà più quando premi Indietro dal browser</string>
+
   <!-- languages -->
       
   <string name="settings_language_default">Lingua di default</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index c97b13c..8cc2113 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -118,6 +118,10 @@
       
   <string name="about_sliding_tabs_usage">「ゲームについて」画面のタブに使用されます</string>
 
+  <string name="settings_close_after_search_title">検索を開始したらアプリを閉じる</string>
+
+  <string name="settings_close_after_search_text">ブラウザから戻るを押してもアプリは再び開きません</string>
+
   <!-- languages -->
       
   <string name="settings_language_default">既定の言語</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 70d9714..e5a27c9 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -118,6 +118,10 @@
       
   <string name="about_sliding_tabs_usage">\"Oyun hakkında\" bölümündeki sekmeler için kullanılır; ekran</string>
 
+  <string name="settings_close_after_search_title">Aramayı başlattıktan sonra uygulamayı kapatın</string>
+
+  <string name="settings_close_after_search_text">Tarayıcınızdan geri tuşuna bastığınızda uygulama tekrar açılmıyor</string>
+
   <!-- languages -->
       
   <string name="settings_language_default">Varsayılan dil</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 429fd08..8ff53f9 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -118,6 +118,10 @@
       
   <string name="about_sliding_tabs_usage">用于“关于游戏”屏幕中的选项卡</string>
 
+  <string name="settings_close_after_search_title">开始搜索后关闭应用程序</string>
+
+  <string name="settings_close_after_search_text">当您从浏览器中按“返回”时，应用程序将不会再次打开</string>
+
   <!-- languages -->
       
   <string name="settings_language_default">默认语言</string>
diff --git a/app/src/main/res/values/bool.xml b/app/src/main/res/values/bool.xml
index 39a3da2..6e574f0 100644
--- a/app/src/main/res/values/bool.xml
+++ b/app/src/main/res/values/bool.xml
@@ -3,4 +3,5 @@
     <bool name="default_status_bar">false</bool>
     <bool name="default_dark_theme">false</bool>
     <bool name="default_hide_app_icon">false</bool>
+    <bool name="default_close_after_search">false</bool>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings-changelog.xml b/app/src/main/res/values/strings-changelog.xml
index 0b9dec9..4c7707f 100644
--- a/app/src/main/res/values/strings-changelog.xml
+++ b/app/src/main/res/values/strings-changelog.xml
@@ -2,6 +2,7 @@
 <resources>
 
     <string name="changelog_10_1" translatable="false">Add small delay to showing the keyboard to fix it not showing at all</string>
+    <string name="changelog_10_2" translatable="false">Add option to close app after starting the search</string>
 
     <string name="changelog_9_1" translatable="false">Use white as app background in light mode again</string>
 
diff --git a/app/src/main/res/values/strings-non-translatable.xml b/app/src/main/res/values/strings-non-translatable.xml
index 03d862d..0311f48 100644
--- a/app/src/main/res/values/strings-non-translatable.xml
+++ b/app/src/main/res/values/strings-non-translatable.xml
@@ -25,6 +25,7 @@
     <string name="pref_key_hide_status_bar" translatable="false">pref_key_hide_status_bar</string>
     <string name="pref_key_custom_search_url" translatable="false">pref_key_custom_search_url</string>
     <string name="pref_key_hide_app_icon" translatable="false">pref_key_hide_app_icon</string>
+    <string name="pref_key_close_after_search" translatable="false">pref_key_close_after_search</string>
 
     <string name="about_app_github_link" translatable="false"><a href="https://github.com/TobiasBielefeld/Simple-Search">GitHub</a></string>
     <string name="about_app_license_link" translatable="false"><a href="https://www.gnu.org/licenses/gpl.html">GPL 3.0+</a></string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fbf8050..734e5c5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -44,6 +44,9 @@
     <string name="settings_change_theme_light">"Light"</string>
     <string name="settings_change_theme_default">"Follow system settings"</string>
 
+    <string name="settings_close_after_search_title">"Close app after starting search"</string>
+    <string name="settings_close_after_search_text">"App will not open again when you press back from your browser"</string>
+
     <!--About-->
     <string name="activity_about">About</string>
     <string name="about_description">Show information about the app like licenses and changelog</string>
diff --git a/app/src/main/res/xml/pref_settings.xml b/app/src/main/res/xml/pref_settings.xml
index 2266fae..93b3238 100644
--- a/app/src/main/res/xml/pref_settings.xml
+++ b/app/src/main/res/xml/pref_settings.xml
@@ -64,6 +64,14 @@
             app:entries="@array/pref_search_engine_titles"
             app:entryValues="@array/pref_search_engine_values"/>
 
+        <SwitchPreferenceCompat
+            app:iconSpaceReserved="false"
+            app:singleLineTitle="false"
+            app:defaultValue="@bool/default_close_after_search"
+            app:key="@string/pref_key_close_after_search"
+            app:title="@string/settings_close_after_search_title"
+            app:summary="@string/settings_close_after_search_text"/>
+
         <SwitchPreferenceCompat
             app:iconSpaceReserved="false"
             app:singleLineTitle="false"
diff --git a/metadata/en/changelogs/13.txt b/metadata/en/changelogs/13.txt
index 3e64f1c..8381c36 100644
--- a/metadata/en/changelogs/13.txt
+++ b/metadata/en/changelogs/13.txt
@@ -1 +1,2 @@
 * Add small delay to showing the keyboard to fix it not showing at all
+* Add option to close app after starting the search