Minor changes in settings page

19 files changed, 60 insertions, 33 deletions

diff --git a/app/src/main/java/app/olauncher/ui/SettingsFragment.kt b/app/src/main/java/app/olauncher/ui/SettingsFragment.kt
index efba600..6710614 100644
--- a/app/src/main/java/app/olauncher/ui/SettingsFragment.kt
+++ b/app/src/main/java/app/olauncher/ui/SettingsFragment.kt
@@ -130,7 +130,7 @@ class SettingsFragment : Fragment(), View.OnClickListener, View.OnLongClickListe
             R.id.notifications -> updateSwipeDownAction(Constants.SwipeDownAction.NOTIFICATIONS)
             R.id.search -> updateSwipeDownAction(Constants.SwipeDownAction.SEARCH)
 
-            R.id.about -> {
+            R.id.aboutOlauncher -> {
                 prefs.aboutClicked = true
                 requireContext().openUrl(Constants.URL_ABOUT_OLAUNCHER)
             }
@@ -142,6 +142,7 @@ class SettingsFragment : Fragment(), View.OnClickListener, View.OnLongClickListe
             }
 
             R.id.twitter -> requireContext().openUrl(Constants.URL_TWITTER_TANUJ)
+            R.id.github -> requireContext().openUrl(Constants.URL_OLAUNCHER_GITHUB)
             R.id.privacy -> requireContext().openUrl(Constants.URL_OLAUNCHER_PRIVACY)
             R.id.footer -> requireContext().openUrl(Constants.URL_PLAY_STORE_DEV)
         }
@@ -172,6 +173,7 @@ class SettingsFragment : Fragment(), View.OnClickListener, View.OnLongClickListe
         binding.scrollLayout.setOnClickListener(this)
         binding.appInfo.setOnClickListener(this)
         binding.setLauncher.setOnClickListener(this)
+        binding.aboutOlauncher.setOnClickListener(this)
         binding.autoShowKeyboard.setOnClickListener(this)
         binding.toggleLock.setOnClickListener(this)
         binding.homeAppsNum.setOnClickListener(this)
@@ -201,10 +203,10 @@ class SettingsFragment : Fragment(), View.OnClickListener, View.OnLongClickListe
         binding.closeAccessibility.setOnClickListener(this)
         binding.notWorking.setOnClickListener(this)
 
-        binding.about.setOnClickListener(this)
         binding.share.setOnClickListener(this)
         binding.rate.setOnClickListener(this)
         binding.twitter.setOnClickListener(this)
+        binding.github.setOnClickListener(this)
         binding.privacy.setOnClickListener(this)
         binding.footer.setOnClickListener(this)
 
@@ -575,18 +577,7 @@ class SettingsFragment : Fragment(), View.OnClickListener, View.OnLongClickListe
     }
 
     private fun populateActionHints() {
-//        when (prefs.toShowHintCounter) {
-//            Constants.HINT_RATE_US -> {
-//                viewModel.showDialog.postValue(Constants.Dialog.RATE)
-//                binding.rate.setCompoundDrawablesWithIntrinsicBounds(0, android.R.drawable.arrow_down_float, 0, 0)
-//                binding.scrollView.post {
-//                    binding.scrollView.fullScroll(View.FOCUS_DOWN)
-//                }
-//            }
-//        }
         if (viewModel.isOlauncherDefault.value != true) return
-        if (prefs.aboutClicked.not() && prefs.toShowHintCounter < Constants.HINT_RATE_US)
-            binding.about.setCompoundDrawablesWithIntrinsicBounds(0, android.R.drawable.arrow_down_float, 0, 0)
         if (prefs.rateClicked.not() && prefs.toShowHintCounter > Constants.HINT_RATE_US && prefs.toShowHintCounter < Constants.HINT_RATE_US + 10)
             binding.rate.setCompoundDrawablesWithIntrinsicBounds(0, android.R.drawable.arrow_down_float, 0, 0)
     }
diff --git a/app/src/main/res/layout-land/fragment_settings.xml b/app/src/main/res/layout-land/fragment_settings.xml
index 5e5cca0..49e697d 100644
--- a/app/src/main/res/layout-land/fragment_settings.xml
+++ b/app/src/main/res/layout-land/fragment_settings.xml
@@ -69,6 +69,16 @@
                     android:layout_marginBottom="8dp"
                     android:text="@string/set_as_default_launcher" />
 
+                <TextView
+                    android:id="@+id/aboutOlauncher"
+                    style="@style/TextSmall"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="8dp"
+                    android:layout_marginTop="12dp"
+                    android:layout_marginBottom="8dp"
+                    android:text="@string/about_olauncher" />
+
             </LinearLayout>
 
             <LinearLayout
@@ -863,22 +873,22 @@
                 android:orientation="horizontal">
 
                 <TextView
-                    android:id="@+id/about"
+                    android:id="@+id/twitter"
                     style="@style/TextSmall"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="8dp"
                     android:padding="10dp"
-                    android:text="@string/about" />
+                    android:text="@string/twitter" />
 
                 <TextView
-                    android:id="@+id/twitter"
+                    android:id="@+id/share"
                     style="@style/TextSmall"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="8dp"
                     android:padding="10dp"
-                    android:text="@string/twitter" />
+                    android:text="@string/share" />
 
                 <TextView
                     android:id="@+id/rate"
@@ -890,13 +900,13 @@
                     android:text="@string/rate" />
 
                 <TextView
-                    android:id="@+id/share"
+                    android:id="@+id/github"
                     style="@style/TextSmall"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="8dp"
                     android:padding="10dp"
-                    android:text="@string/share" />
+                    android:text="@string/github" />
 
                 <TextView
                     android:id="@+id/privacy"
@@ -917,8 +927,9 @@
                 android:layout_gravity="center_horizontal"
                 android:gravity="center"
                 android:letterSpacing="0.03"
-                android:padding="10dp"
-                android:text="@string/olauncher_pro" />
+                android:padding="12dp"
+                android:text="@string/olauncher_pro"
+                android:textSize="18sp" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index 5d2b919..d012bb3 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -69,6 +69,16 @@
                     android:layout_marginBottom="8dp"
                     android:text="@string/set_as_default_launcher" />
 
+                <TextView
+                    android:id="@+id/aboutOlauncher"
+                    style="@style/TextSmall"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="8dp"
+                    android:layout_marginTop="12dp"
+                    android:layout_marginBottom="8dp"
+                    android:text="@string/about_olauncher" />
+
             </LinearLayout>
 
             <LinearLayout
@@ -880,24 +890,24 @@
                 android:orientation="horizontal">
 
                 <TextView
-                    android:id="@+id/about"
+                    android:id="@+id/twitter"
                     style="@style/TextSmall"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
                     android:maxLines="1"
                     android:padding="10dp"
-                    android:text="@string/about" />
+                    android:text="@string/twitter" />
 
                 <TextView
-                    android:id="@+id/twitter"
+                    android:id="@+id/share"
                     style="@style/TextSmall"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
                     android:maxLines="1"
                     android:padding="10dp"
-                    android:text="@string/twitter" />
+                    android:text="@string/share" />
 
                 <TextView
                     android:id="@+id/rate"
@@ -910,22 +920,20 @@
                     android:text="@string/rate" />
 
                 <TextView
-                    android:id="@+id/share"
+                    android:id="@+id/github"
                     style="@style/TextSmall"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginEnd="1dp"
                     android:ellipsize="end"
                     android:maxLines="1"
                     android:padding="10dp"
-                    android:text="@string/share" />
+                    android:text="@string/github" />
 
                 <TextView
                     android:id="@+id/privacy"
                     style="@style/TextSmall"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginEnd="1dp"
                     android:ellipsize="end"
                     android:maxLines="1"
                     android:padding="10dp"
@@ -938,9 +946,10 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
-                android:letterSpacing="0.02"
-                android:padding="10dp"
-                android:text="@string/olauncher_pro" />
+                android:letterSpacing="0.03"
+                android:padding="12dp"
+                android:text="@string/olauncher_pro"
+                android:textSize="18sp" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 1b1c6b8..cb319a0 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -110,4 +110,5 @@
     <string name="swipe_left_app_enabled">انتقاد اليسار التطبيق تمكين</string>
     <string name="swipe_right_app_enabled">انتقاد الحق التطبيق تمكين</string>
     <string name="are_you_using_your_phone_or_is_your_phone_using_you">هل تستخدم هاتفك أم أن هاتفك يستخدمك؟</string>
+    <string name="about_olauncher">عن Olauncher</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 5ab4f73..8e5edd3 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -114,4 +114,5 @@
     <string name="swipe_left_app_disabled">App nach links wischen deaktiviert</string>
     <string name="swipe_right_app_disabled">App nach rechts wischen deaktiviert</string>
     <string name="are_you_using_your_phone_or_is_your_phone_using_you">Benutzen Sie Ihr Telefon, oder nutzt Ihr Telefon Sie?</string>
+    <string name="about_olauncher">Um Olauncher</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index b1c64d1..0e834bb 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -114,4 +114,5 @@
     <string name="adapter_show">Mostrar</string>
     <string name="adapter_hide">Ocultar</string>
     <string name="are_you_using_your_phone_or_is_your_phone_using_you">¿Estás usando tu teléfono, o tu teléfono te está usando a ti?</string>
+    <string name="about_olauncher">Acerca de Olauncher</string>
 </resources>
diff --git a/app/src/main/res/values-es-rUS/strings.xml b/app/src/main/res/values-es-rUS/strings.xml
index 08d751e..2ea1c14 100644
--- a/app/src/main/res/values-es-rUS/strings.xml
+++ b/app/src/main/res/values-es-rUS/strings.xml
@@ -111,4 +111,5 @@
     <string name="adapter_show">demostrar</string>
     <string name="adapter_hide">esconder</string>
     <string name="are_you_using_your_phone_or_is_your_phone_using_you">¿Estás usando tu teléfono, o tu teléfono te está usando a ti?</string>
+    <string name="about_olauncher">Acerca de Olauncher</string>
 </resources>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index c5250cd..0c6e661 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -116,4 +116,5 @@
     <string name="adapter_show">Afficher</string>
     <string name="adapter_hide">Masquer</string>
     <string name="are_you_using_your_phone_or_is_your_phone_using_you">Utilisez-vous votre téléphone, ou votre téléphone vous utilise-t-il?</string>
+    <string name="about_olauncher">À propos Olauncher</string>
 </resources>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index de0d3b6..12612bb 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -111,4 +111,5 @@
     <string name="adapter_show">memperlihatkan</string>
     <string name="adapter_hide">bersembunyi</string>
     <string name="are_you_using_your_phone_or_is_your_phone_using_you">Apakah Anda menggunakan ponsel Anda, atau ponsel Anda menggunakan Anda?</string>
+    <string name="about_olauncher">Tentang Olauncher</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index b938074..09e6544 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -114,4 +114,5 @@
     <string name="adapter_show">mostra</string>
     <string name="adapter_hide">nascondi</string>
     <string name="are_you_using_your_phone_or_is_your_phone_using_you">Stai usando il tuo telefono o è il tuo telefono che sta usando te?</string>
+    <string name="about_olauncher">Info Olauncher</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 7a4673f..6298b41 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -112,4 +112,5 @@
     <string name="swipe_left_app_disabled">左にスワイプするとアプリが無効になります</string>
     <string name="swipe_right_app_disabled">アプリを右にスワイプすると無効になります</string>
     <string name="are_you_using_your_phone_or_is_your_phone_using_you">あなたは電話を使っていますか、それともあなたの電話があなたを使っていますか？</string>
+    <string name="about_olauncher">アバウト Olauncher</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 3156506..98a1961 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -111,4 +111,5 @@
     <string name="swipe_left_app_disabled">Aplikacja Przesuń w lewo wyłączona</string>
     <string name="swipe_right_app_disabled">Aplikacja Przesuń w prawo jest wyłączona</string>
     <string name="are_you_using_your_phone_or_is_your_phone_using_you">Czy używasz telefonu, czy telefon używa ciebie?</string>
+    <string name="about_olauncher">O Olauncher</string>
 </resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index b4ed105..0de5241 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -114,4 +114,5 @@
     <string name="adapter_show">Mostrar</string>
     <string name="adapter_hide">Esconder</string>
     <string name="are_you_using_your_phone_or_is_your_phone_using_you">Você está usando seu telefone ou seu telefone está usando você?</string>
+    <string name="about_olauncher">Sobre Olauncher</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index d556495..2c831de 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -114,4 +114,5 @@
     <string name="adapter_show">Показать</string>
     <string name="adapter_hide">Скрыть</string>
     <string name="are_you_using_your_phone_or_is_your_phone_using_you">Вы используете свой телефон, или ваш телефон использует вас?</string>
+    <string name="about_olauncher">О нас Olauncher</string>
 </resources>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index c27535e..07d7b50 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -126,4 +126,5 @@
     <string name="adapter_show">Visa</string>
     <string name="adapter_hide">Dölj</string>
     <string name="are_you_using_your_phone_or_is_your_phone_using_you">Använder du din telefon, eller använder din telefon dig?</string>
+    <string name="about_olauncher">Om Olauncher</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index f7284eb..149642b 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -114,4 +114,5 @@
     <string name="swipe_left_app_disabled">Sola kaydırma uygulaması devre dışı bırakıldı</string>
     <string name="swipe_right_app_disabled">Sağa kaydırma uygulaması devre dışı bırakıldı</string>
     <string name="are_you_using_your_phone_or_is_your_phone_using_you">Sen mi telefonunu kullanıyorsun yoksa telefon mu seni kullanıyor?</string>
+    <string name="about_olauncher">Hakkında Olauncher</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index afa9068..b143fe5 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -114,4 +114,5 @@
     <string name="adapter_show">Показати</string>
     <string name="adapter_hide">Приховати</string>
     <string name="are_you_using_your_phone_or_is_your_phone_using_you">Ви користуєтеся своїм телефоном, чи ваш телефон використовує вас?</string>
+    <string name="about_olauncher">Про нас Olauncher</string>
 </resources>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 4c4e747..0d8720d 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -114,4 +114,5 @@
     <string name="swipe_left_app_disabled">向左滑动应用程序已禁用</string>
     <string name="swipe_right_app_disabled">向右滑动应用程序已禁用</string>
     <string name="are_you_using_your_phone_or_is_your_phone_using_you">是你在用手机，还是手机在用你？</string>
+    <string name="about_olauncher">关于 Olauncher</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5b9e7da..3c639b1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,7 +2,7 @@
     <string name="app_name" translatable="false">Olauncher</string>
     <string name="github" translatable="false">Github</string>
     <string name="lock_layout_description" translatable="false">lock layout description to be used a unique id to lock screen</string>
-    <string name="olauncher_pro" translatable="false"><u>Olauncher PRO</u></string>
+    <string name="olauncher_pro" translatable="false"><u>Olauncher Pro</u></string>
     <string name="day_battery" formatted="false" translatable="false">%s, %d%%</string>
     <string name="tag_0" translatable="false">0</string>
     <string name="tag_1" translatable="false">1</string>
@@ -127,4 +127,5 @@
     <string name="adapter_show">Show</string>
     <string name="adapter_hide">Hide</string>
     <string name="are_you_using_your_phone_or_is_your_phone_using_you">Are you using your phone, or is your phone using you?</string>
+    <string name="about_olauncher">About Olauncher</string>
 </resources>
\ No newline at end of file