From 24b72059a62d66b8b414007f222c7e048c04e1dc Mon Sep 17 00:00:00 2001
From: Bnyro <yannick.fehler@web.de>
Date: Sat, 4 Jun 2022 12:41:05 +0200
Subject: [PATCH] noInternetActivity settings btn and fixes

---
 .../main/java/com/github/libretube/MainActivity.kt |  5 +++++
 .../java/com/github/libretube/SettingsActivity.kt  | 13 +++++++++++++
 app/src/main/res/layout/activity_nointernet.xml    | 14 ++++++++++++--
 app/src/main/res/values/colors.xml                 |  2 +-
 4 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/github/libretube/MainActivity.kt b/app/src/main/java/com/github/libretube/MainActivity.kt
index 791a23e86..6381140af 100644
--- a/app/src/main/java/com/github/libretube/MainActivity.kt
+++ b/app/src/main/java/com/github/libretube/MainActivity.kt
@@ -18,6 +18,7 @@ import android.view.WindowInsetsController
 import android.view.WindowManager
 import android.view.inputmethod.InputMethodManager
 import android.widget.Button
+import android.widget.ImageView
 import android.widget.LinearLayout
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
@@ -79,6 +80,10 @@ class MainActivity : AppCompatActivity() {
             findViewById<Button>(R.id.retry_button).setOnClickListener {
                 recreate()
             }
+            findViewById<ImageView>(R.id.noInternet_settingsImageView).setOnClickListener {
+                val intent = Intent(this, SettingsActivity::class.java)
+                startActivity(intent)
+            }
         } else {
             setContentView(R.layout.activity_main)
             requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
diff --git a/app/src/main/java/com/github/libretube/SettingsActivity.kt b/app/src/main/java/com/github/libretube/SettingsActivity.kt
index 8ac5f602e..b6884c606 100644
--- a/app/src/main/java/com/github/libretube/SettingsActivity.kt
+++ b/app/src/main/java/com/github/libretube/SettingsActivity.kt
@@ -156,6 +156,19 @@ class SettingsActivity :
 
         override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
             setPreferencesFromResource(R.xml.settings, rootKey)
+
+            val region = findPreference<Preference>("region")
+            region?.setOnPreferenceChangeListener { _, _ ->
+                requireMainActivityRestart = true
+                true
+            }
+
+            val language = findPreference<ListPreference>("language")
+            language?.setOnPreferenceChangeListener { _, _ ->
+                restartMainActivity(requireContext())
+                true
+            }
+
             val instance = findPreference<ListPreference>("instance")
             fetchInstance()
             instance?.setOnPreferenceChangeListener { _, newValue ->
diff --git a/app/src/main/res/layout/activity_nointernet.xml b/app/src/main/res/layout/activity_nointernet.xml
index 2efa97b9a..431d36a3f 100644
--- a/app/src/main/res/layout/activity_nointernet.xml
+++ b/app/src/main/res/layout/activity_nointernet.xml
@@ -4,6 +4,15 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <ImageView
+        android:id="@+id/noInternet_settingsImageView"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        android:layout_margin="16dp"
+        android:src="@drawable/ic_settings"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
     <ImageView
         android:id="@+id/noInternet_imageView"
         android:layout_width="200dp"
@@ -16,7 +25,7 @@
         app:srcCompat="@drawable/ic_wifi_off" />
 
     <TextView
-        android:id="@+id/textView"
+        android:id="@+id/noInternet_textView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/noInternet"
@@ -32,5 +41,6 @@
         android:text="@string/retry"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textView" />
+        app:layout_constraintTop_toBottomOf="@+id/noInternet_textView" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index d4e541457..1dc5339b1 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -44,6 +44,6 @@
 
     <color name="purple_dark_accentLight">#7E57C2</color>
     <color name="purple_dark_accentDark">#311B92</color>
-    <color name="purple_dark_background">#050409</color>
+    <color name="purple_dark_background">#1D0B20</color>
 
 </resources>
\ No newline at end of file