Copy changes and cleanup

25 files changed, 30 insertions, 49 deletions

diff --git a/app/src/main/java/app/olauncher/data/Constants.kt b/app/src/main/java/app/olauncher/data/Constants.kt
index 48bd148..cabfa45 100644
--- a/app/src/main/java/app/olauncher/data/Constants.kt
+++ b/app/src/main/java/app/olauncher/data/Constants.kt
@@ -103,6 +103,7 @@ object Constants {
     const val URL_OLAUNCHER_PRO = "https://play.google.com/store/apps/details?id=app.prolauncher"
     const val URL_PLAY_STORE_DEV = "https://play.google.com/store/apps/dev?id=7198807840081074933"
     const val URL_TWITTER_TANUJ = "https://x.com/tanujnotes"
+    const val URL_INSTA_TANUJ = "https://instagram.com/tanuj_notes"
     const val URL_WALLPAPERS = "https://gist.githubusercontent.com/tanujnotes/85e2d0343ace71e76615ac346fbff82b/raw"
     const val URL_NTS = "https://play.google.com/store/apps/details?id=com.makenotetoself"
     const val URL_PENTASTIC = "https://play.google.com/store/apps/details?id=app.pentastic"
diff --git a/app/src/main/java/app/olauncher/helper/Extensions.kt b/app/src/main/java/app/olauncher/helper/Extensions.kt
index ad1c2f4..6ec12f6 100644
--- a/app/src/main/java/app/olauncher/helper/Extensions.kt
+++ b/app/src/main/java/app/olauncher/helper/Extensions.kt
@@ -14,6 +14,7 @@ import android.net.Uri
 import android.os.Build
 import android.os.UserHandle
 import android.provider.Settings
+import android.telephony.TelephonyManager
 import android.view.View
 import android.view.WindowManager
 import android.view.inputmethod.InputMethodManager
@@ -22,6 +23,7 @@ import app.olauncher.BuildConfig
 import app.olauncher.R
 import app.olauncher.data.Constants
 import java.util.Calendar
+import java.util.Locale
 
 fun View.hideKeyboard() {
     this.clearFocus()
@@ -122,6 +124,15 @@ fun Context.isPackageInstalled(packageName: String, userHandle: UserHandle = and
     return activityInfo.isNotEmpty()
 }
 
+fun Context.isCountryIn(): Boolean {
+    val country = runCatching {
+        val telephonyManager = getSystemService(Context.TELEPHONY_SERVICE) as? TelephonyManager
+        telephonyManager?.simCountryIso?.takeIf { it.isNotBlank() }
+            ?: telephonyManager?.networkCountryIso?.takeIf { it.isNotBlank() }
+    }.getOrNull() ?: Locale.getDefault().country
+    return country.equals("IN", ignoreCase = true)
+}
+
 @RequiresApi(Build.VERSION_CODES.Q)
 fun Context.appUsagePermissionGranted(): Boolean {
     val appOpsManager = getSystemService(Context.APP_OPS_SERVICE) as AppOpsManager
diff --git a/app/src/main/java/app/olauncher/ui/SettingsFragment.kt b/app/src/main/java/app/olauncher/ui/SettingsFragment.kt
index 658913c..94ea7e4 100644
--- a/app/src/main/java/app/olauncher/ui/SettingsFragment.kt
+++ b/app/src/main/java/app/olauncher/ui/SettingsFragment.kt
@@ -32,6 +32,7 @@ import app.olauncher.helper.getColorFromAttr
 import app.olauncher.helper.isAccessServiceEnabled
 import app.olauncher.helper.isDarkThemeOn
 import app.olauncher.helper.isEinkDisplay
+import app.olauncher.helper.isCountryIn
 import app.olauncher.helper.isOlauncherDefault
 import app.olauncher.helper.isTablet
 import app.olauncher.helper.openAppInfo
@@ -52,6 +53,7 @@ class SettingsFragment : Fragment(), View.OnClickListener, View.OnLongClickListe
     private var _binding: FragmentSettingsBinding? = null
     private val binding get() = _binding!!
     private val showPentastic = System.currentTimeMillis() % 2 == 0L
+    private var showInstagram = false
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         _binding = FragmentSettingsBinding.inflate(inflater, container, false)
@@ -85,6 +87,8 @@ class SettingsFragment : Fragment(), View.OnClickListener, View.OnLongClickListe
         populateSwipeApps()
         populateSwipeDownAction()
         populateActionHints()
+        showInstagram = requireContext().isCountryIn()
+        if (showInstagram) binding.twitter.text = getString(R.string.instagram)
         initClickListeners()
         initObservers()
 
@@ -169,7 +173,9 @@ class SettingsFragment : Fragment(), View.OnClickListener, View.OnLongClickListe
                 requireActivity().rateApp()
             }
 
-            R.id.twitter -> requireContext().openUrl(Constants.URL_TWITTER_TANUJ)
+            R.id.twitter -> requireContext().openUrl(
+                if (showInstagram) Constants.URL_INSTA_TANUJ else 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 -> {
diff --git a/app/src/main/res/layout-land/fragment_settings.xml b/app/src/main/res/layout-land/fragment_settings.xml
index 5bd84c2..895993f 100644
--- a/app/src/main/res/layout-land/fragment_settings.xml
+++ b/app/src/main/res/layout-land/fragment_settings.xml
@@ -922,13 +922,13 @@
                 android:orientation="horizontal">
 
                 <TextView
-                    android:id="@+id/twitter"
+                    android:id="@+id/privacy"
                     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/privacy" />
 
                 <TextView
                     android:id="@+id/share"
@@ -958,13 +958,13 @@
                     android:text="@string/github" />
 
                 <TextView
-                    android:id="@+id/privacy"
+                    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/privacy" />
+                    android:text="@string/x_twitter" />
 
             </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index a461d0e..f73549f 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -950,14 +950,14 @@
                 android:orientation="horizontal">
 
                 <TextView
-                    android:id="@+id/twitter"
+                    android:id="@+id/privacy"
                     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/privacy" />
 
                 <TextView
                     android:id="@+id/share"
@@ -990,14 +990,14 @@
                     android:text="@string/github" />
 
                 <TextView
-                    android:id="@+id/privacy"
+                    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/privacy" />
+                    android:text="@string/x_twitter" />
             </LinearLayout>
 
             <TextView
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 7b9d318..8cbc4db 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -110,8 +110,6 @@
     <string name="close">يغلق</string>
     <string name="not_now">ليس الآن</string>
     <string name="public_roadmap">خارطة طريق Olauncher العامة</string>
-    <string name="instagram">انستغرام</string>
-    <string name="twitter">تويتر</string>
     <string name="roadmap">خريطة الطريق</string>
     <string name="date">تاريخ</string>
     <string name="date_only">التاريخ فقط</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index ef4e6ad..1e8f6ec 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -111,8 +111,6 @@
     <string name="close">Schließen</string>
     <string name="not_now">Nicht jetzt</string>
     <string name="public_roadmap">Öffentliche Olauncher-Roadmap</string>
-    <string name="instagram">Instagram</string>
-    <string name="twitter">Twitter</string>
     <string name="roadmap">Roadmap</string>
     <string name="date">Datum</string>
     <string name="date_only">Nur Datum</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index a1649c7..7d39322 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -78,8 +78,6 @@
     <string name="close">Cerrar</string>
     <string name="not_now">Ahora no</string>
     <string name="public_roadmap">Hoja de ruta pública de Olauncher</string>
-    <string name="instagram">Instagram</string>
-    <string name="twitter">Twitter</string>
     <string name="roadmap">Hoja de ruta</string>
     <string name="date">Fecha</string>
     <string name="date_only">Solo fecha</string>
diff --git a/app/src/main/res/values-es-rUS/strings.xml b/app/src/main/res/values-es-rUS/strings.xml
index 33e2352..56b7979 100644
--- a/app/src/main/res/values-es-rUS/strings.xml
+++ b/app/src/main/res/values-es-rUS/strings.xml
@@ -77,8 +77,6 @@
     <string name="close">Cerrar</string>
     <string name="not_now">Ahora no</string>
     <string name="public_roadmap">Objetivos de Olauncher</string>
-    <string name="instagram">Instagram</string>
-    <string name="twitter">Twitter</string>
     <string name="roadmap">Objetivos</string>
     <string name="date">Fecha</string>
     <string name="date_only">Sólo fecha</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index f70571d..cb65121 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -77,8 +77,6 @@
     <string name="close">Fermer</string>
     <string name="not_now">Plus tard</string>
     <string name="public_roadmap">Feuille de route publique d\'Olauncher</string>
-    <string name="instagram">Instagram</string>
-    <string name="twitter">Twitter</string>
     <string name="roadmap">Feuille de route</string>
     <string name="date">Date</string>
     <string name="date_only">Date uniquement</string>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index f7d21ba..65f2f93 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -69,8 +69,6 @@
     <string name="close">סגירה</string>
     <string name="not_now">לא כעת</string>
     <string name="public_roadmap">Olauncher public roadmap</string>
-    <string name="instagram">אינסטגרם</string>
-    <string name="twitter">המפתח</string>
     <string name="roadmap">Roadmap</string>
     <string name="date">תאריך</string>
     <string name="date_only">תאריך בלבד</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index a083d2b..9400303 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -77,8 +77,6 @@
     <string name="close">Zatvori</string>
     <string name="not_now">Ne sad</string>
     <string name="public_roadmap">Javni plan razvoja Olaunchera</string>
-    <string name="instagram">Instagram</string>
-    <string name="twitter">Twitter</string>
     <string name="roadmap">Plan razvoja</string>
     <string name="date">Datum</string>
     <string name="date_only">Samo datum</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 6498f10..2d03847 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -80,8 +80,6 @@
     <string name="close">Bezárás</string>
     <string name="not_now">Később</string>
     <string name="public_roadmap">Olauncher nyilvános ütemterv</string>
-    <string name="instagram">Instagram</string>
-    <string name="twitter">A fejlesztő</string>
     <string name="roadmap">Ütemterv</string>
     <string name="date">Dátum</string>
     <string name="date_only">Csak dátum</string>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 24de0ec..e152ffa 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -77,8 +77,6 @@
     <string name="close">Tutup</string>
     <string name="not_now">Tidak sekarang</string>
     <string name="public_roadmap">Peta jalan publik Olauncher</string>
-    <string name="instagram">Instagram</string>
-    <string name="twitter">Twitter</string>
     <string name="roadmap">Peta jalan</string>
     <string name="date">Tanggal</string>
     <string name="date_only">Tanggal saja</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 1080795..1ede6c3 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -78,8 +78,6 @@
     <string name="close">chiudi</string>
     <string name="not_now">Non ora</string>
     <string name="public_roadmap">Roadmap pubblica di Olauncher</string>
-    <string name="instagram">Instagram</string>
-    <string name="twitter">Twitter</string>
     <string name="roadmap">Roadmap</string>
     <string name="date">Data</string>
     <string name="date_only">Solo data</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 4a0df92..800dfee 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -110,8 +110,6 @@
     <string name="close">閉じる</string>
     <string name="not_now">今はやめろ</string>
     <string name="public_roadmap">Olauncher の公開ロードマップ</string>
-    <string name="instagram">インスタグラム</string>
-    <string name="twitter">ツイッター</string>
     <string name="roadmap">ロードマップ</string>
     <string name="date">日にち</string>
     <string name="date_only">日付のみ</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 40bce3f..39e7845 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -79,8 +79,6 @@
     <string name="close">Sluiten</string>
     <string name="not_now">Niet nu</string>
     <string name="public_roadmap">Openbare roadmap van Olauncher</string>
-    <string name="instagram">Instagram</string>
-    <string name="twitter">Ontwikkelaar</string>
     <string name="roadmap">Routekaart</string>
     <string name="date">Datum</string>
     <string name="date_only">Alleen datum</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 3f10f79..65dc839 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -109,8 +109,6 @@
     <string name="close">Zamknij</string>
     <string name="not_now">Nie teraz</string>
     <string name="public_roadmap">Publiczna mapa drogowa Olauncher</string>
-    <string name="instagram">Instagram</string>
-    <string name="twitter">Twitter</string>
     <string name="roadmap">Mapa drogowa</string>
     <string name="date">Data</string>
     <string name="date_only">Tylko data</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index f78162b..c0d7658 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -77,8 +77,6 @@
     <string name="close">Fechar</string>
     <string name="not_now">Agora não</string>
     <string name="public_roadmap">Roteiro público do Olauncher</string>
-    <string name="instagram">Instagram</string>
-    <string name="twitter">Twitter</string>
     <string name="roadmap">Roteiro</string>
     <string name="date">Data</string>
     <string name="date_only">Apenas data</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 4337139..a37f487 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -78,8 +78,6 @@
     <string name="close">Закрыть</string>
     <string name="not_now">Не сейчас</string>
     <string name="public_roadmap">Публичная дорожная карта Olauncher</string>
-    <string name="instagram">Instagram</string>
-    <string name="twitter">Twitter</string>
     <string name="roadmap">Дорожная карта</string>
     <string name="date">Дата</string>
     <string name="date_only">Только дата</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index a115136..e9eac45 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -77,8 +77,6 @@
     <string name="close">Stäng</string>
     <string name="not_now">Inte nu</string>
     <string name="public_roadmap">Olaunchers offentliga färdplan</string>
-    <string name="instagram">Instagram</string>
-    <string name="twitter">Utvecklare</string>
     <string name="roadmap">Färdplan</string>
     <string name="date">Datum</string>
     <string name="date_only">Endast datum</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index d8842b9..cdf8128 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -111,8 +111,6 @@
     <string name="close">Kapat</string>
     <string name="not_now">Şimdi değil</string>
     <string name="public_roadmap">Olauncher Yol Çizelgesi</string>
-    <string name="instagram">Instagram</string>
-    <string name="twitter">Twitter</string>
     <string name="roadmap">Yol Çizelgesi</string>
     <string name="date">Tarih</string>
     <string name="date_only">Sadece tarih</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 1398ea2..e7c6fa8 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -78,8 +78,6 @@
     <string name="close">Закрити</string>
     <string name="not_now">Не зараз</string>
     <string name="public_roadmap">Публічна дорожня карта Olauncher</string>
-    <string name="instagram">Instagram</string>
-    <string name="twitter">Twitter</string>
     <string name="roadmap">Дорожня карта</string>
     <string name="date">Дата</string>
     <string name="date_only">Толільки дата</string>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index dcec508..7918a26 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -112,8 +112,6 @@
     <string name="close">关闭</string>
     <string name="not_now">暂时不要</string>
     <string name="public_roadmap">Olauncher 公共路线图</string>
-    <string name="instagram">Instagram</string>
-    <string name="twitter">推特</string>
     <string name="roadmap">路线图</string>
     <string name="date">日期</string>
     <string name="date_only">仅限日期</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index dd3c1ed..52b186a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -20,6 +20,9 @@
     <string name="time_spent_min" translatable="false"><b>%1$sm</b></string>
     <string name="time_spent_hour" translatable="false">%1$sh %2$sm</string>
 
+    <string name="x_twitter" translatable="false">X/Twitter</string>
+    <string name="instagram" translatable="false">Instagram</string>
+
     <string name="app">App</string>
     <string name="set_as_default_launcher">Set as default launcher</string>
     <string name="set_as_default_launcher_u"><u>Set as default launcher</u></string>
@@ -99,8 +102,6 @@
     <string name="close">Close</string>
     <string name="not_now">Not now</string>
     <string name="public_roadmap">Olauncher public roadmap</string>
-    <string name="instagram">Instagram</string>
-    <string name="twitter">Developer</string>
     <string name="roadmap">Roadmap</string>
     <string name="date">Date</string>
     <string name="date_only">Date only</string>