From 9ba4b17c0d0732f01db82099264ba478a3e7bab4 Mon Sep 17 00:00:00 2001
From: rimthekid <farbod@nigge.rs>
Date: Tue, 8 Feb 2022 13:28:50 +0400
Subject: [PATCH 1/3] settings fragment

---
 app/build.gradle                              |  1 +
 .../com/github/libretube/ChannelFragment.kt   | 29 ++++++++++---------
 .../java/com/github/libretube/LoginDialog.kt  |  4 +--
 .../java/com/github/libretube/MainActivity.kt |  3 +-
 .../java/com/github/libretube/Settings.kt     | 10 +++++++
 app/src/main/res/navigation/nav.xml           |  4 +++
 app/src/main/res/xml/settings.xml             | 14 +++++++++
 7 files changed, 47 insertions(+), 18 deletions(-)
 create mode 100644 app/src/main/java/com/github/libretube/Settings.kt
 create mode 100644 app/src/main/res/xml/settings.xml

diff --git a/app/build.gradle b/app/build.gradle
index 0e063ce46..24a9bac54 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -41,6 +41,7 @@ dependencies {
     implementation 'androidx.navigation:navigation-fragment-ktx:2.4.0'
     implementation 'androidx.navigation:navigation-ui-ktx:2.4.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation("androidx.preference:preference-ktx:1.2.0")
 
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
diff --git a/app/src/main/java/com/github/libretube/ChannelFragment.kt b/app/src/main/java/com/github/libretube/ChannelFragment.kt
index 7a91275a9..439500a5d 100644
--- a/app/src/main/java/com/github/libretube/ChannelFragment.kt
+++ b/app/src/main/java/com/github/libretube/ChannelFragment.kt
@@ -53,6 +53,21 @@ class ChannelFragment : Fragment() {
         recyclerView.layoutManager = LinearLayoutManager(context)
 
         fetchChannel(view)
+        val scrollView = view.findViewById<ScrollView>(R.id.channel_scrollView)
+        scrollView.viewTreeObserver
+            .addOnScrollChangedListener {
+                if (scrollView.getChildAt(0).bottom
+                    == (scrollView.height + scrollView.scrollY)) {
+                    //scroll view is at bottom
+                    if(nextPage!=null && !isLoading){
+                        isLoading=true
+                        fetchNextPage()
+                    }
+
+                } else {
+                    //scroll view is not at bottom
+                }
+            }
 
     }
 
@@ -81,21 +96,7 @@ class ChannelFragment : Fragment() {
                     Picasso.get().load(response.avatarUrl).into(channelImage)
                     channelAdapter = ChannelAdapter(response.relatedStreams!!.toMutableList())
                     view.findViewById<RecyclerView>(R.id.channel_recView).adapter = channelAdapter
-                    val scrollView = view.findViewById<ScrollView>(R.id.channel_scrollView)
-                    scrollView.viewTreeObserver
-                        .addOnScrollChangedListener {
-                            if (scrollView.getChildAt(0).bottom
-                                == (scrollView.height + scrollView.scrollY)) {
-                                //scroll view is at bottom
-                                if(nextPage!=null && !isLoading){
-                                    isLoading=true
-                                    fetchNextPage()
-                                }
 
-                            } else {
-                                //scroll view is not at bottom
-                            }
-                        }
                 }
             }
         }
diff --git a/app/src/main/java/com/github/libretube/LoginDialog.kt b/app/src/main/java/com/github/libretube/LoginDialog.kt
index 7e91142dc..d18d86ff7 100644
--- a/app/src/main/java/com/github/libretube/LoginDialog.kt
+++ b/app/src/main/java/com/github/libretube/LoginDialog.kt
@@ -64,7 +64,7 @@ class LoginDialog : DialogFragment() {
                 }
                 if (response.error!= null){
                     Toast.makeText(context, response.error, Toast.LENGTH_SHORT).show()
-                }else{
+                }else if(response.token!=null){
                     Toast.makeText(context,R.string.loggedIn, Toast.LENGTH_SHORT).show()
                     dialog?.dismiss()
                 }
@@ -91,7 +91,7 @@ class LoginDialog : DialogFragment() {
                 }
                 if (response.error!= null){
                 Toast.makeText(context, response.error, Toast.LENGTH_SHORT).show()
-                }else{
+                }else if(response.token!=null){
                     Toast.makeText(context,R.string.registered, Toast.LENGTH_SHORT).show()
                     dialog?.dismiss()
                 }
diff --git a/app/src/main/java/com/github/libretube/MainActivity.kt b/app/src/main/java/com/github/libretube/MainActivity.kt
index a0dc61bd3..e2b55b576 100644
--- a/app/src/main/java/com/github/libretube/MainActivity.kt
+++ b/app/src/main/java/com/github/libretube/MainActivity.kt
@@ -28,8 +28,6 @@ class MainActivity : AppCompatActivity() {
     lateinit var bottomNavigationView: BottomNavigationView
     lateinit var toolbar: Toolbar
     lateinit var navController : NavController
-
-    var f = false
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -57,6 +55,7 @@ class MainActivity : AppCompatActivity() {
 
         toolbar.setNavigationOnClickListener{
             //settings fragment stuff
+            navController.navigate(R.id.settings)
             true
         }
 
diff --git a/app/src/main/java/com/github/libretube/Settings.kt b/app/src/main/java/com/github/libretube/Settings.kt
new file mode 100644
index 000000000..48d92b703
--- /dev/null
+++ b/app/src/main/java/com/github/libretube/Settings.kt
@@ -0,0 +1,10 @@
+package com.github.libretube
+
+import android.os.Bundle
+import androidx.preference.PreferenceFragmentCompat
+
+class Settings : PreferenceFragmentCompat() {
+    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+        setPreferencesFromResource(R.xml.settings, rootKey)
+    }
+}
diff --git a/app/src/main/res/navigation/nav.xml b/app/src/main/res/navigation/nav.xml
index 803933ff9..918b24dd7 100644
--- a/app/src/main/res/navigation/nav.xml
+++ b/app/src/main/res/navigation/nav.xml
@@ -54,4 +54,8 @@
             android:name="playlist_id"
             app:argType="string" />
     </fragment>
+    <fragment
+        android:id="@+id/settings"
+        android:name="com.github.libretube.Settings"
+        android:label="Settings" />
 </navigation>
\ No newline at end of file
diff --git a/app/src/main/res/xml/settings.xml b/app/src/main/res/xml/settings.xml
new file mode 100644
index 000000000..ba7093668
--- /dev/null
+++ b/app/src/main/res/xml/settings.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <androidx.preference.SwitchPreferenceCompat
+        app:key="notifications"
+        app:title="Enable message notifications"/>
+
+    <androidx.preference.Preference
+        app:key="feedback"
+        app:title="Send feedback"
+        app:summary="Report technical issues or suggest new features"/>
+
+</androidx.preference.PreferenceScreen>
\ No newline at end of file

From a829ed03c7959c40c1ea0f6174ff20f4b6dacd9f Mon Sep 17 00:00:00 2001
From: alefvanoon <alefvanoon@tuta.io>
Date: Tue, 8 Feb 2022 17:54:32 +0330
Subject: [PATCH 2/3] Changing gradlew permissions

---
 gradlew | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 gradlew

diff --git a/gradlew b/gradlew
old mode 100644
new mode 100755

From dd3e2b00cd157889239601d2cef3375385340903 Mon Sep 17 00:00:00 2001
From: rimthekid <farbod@nigge.rs>
Date: Tue, 8 Feb 2022 18:27:13 +0400
Subject: [PATCH 3/3] settings

---
 .../com/github/libretube/ChannelFragment.kt   |   2 -
 .../main/java/com/github/libretube/Home.kt    |   4 +-
 .../java/com/github/libretube/LoginDialog.kt  |  53 ++-
 .../java/com/github/libretube/MainActivity.kt |   3 +
 .../com/github/libretube/RetrofitInstance.kt  |   8 +-
 .../com/github/libretube/SearchFragment.kt    |   2 +-
 .../java/com/github/libretube/Settings.kt     |  16 +
 .../com/github/libretube/Subscriptions.kt     |   8 +-
 .../com/github/libretube/obj/SearchItem.kt    |   3 +-
 app/src/main/res/layout/dialog_logout.xml     |  30 ++
 app/src/main/res/values/array.xml             | 401 ++++++++++++++++++
 app/src/main/res/values/strings.xml           |   7 +
 app/src/main/res/xml/settings.xml             |  31 +-
 13 files changed, 538 insertions(+), 30 deletions(-)
 create mode 100644 app/src/main/res/layout/dialog_logout.xml
 create mode 100644 app/src/main/res/values/array.xml

diff --git a/app/src/main/java/com/github/libretube/ChannelFragment.kt b/app/src/main/java/com/github/libretube/ChannelFragment.kt
index 439500a5d..2f3cfbbe9 100644
--- a/app/src/main/java/com/github/libretube/ChannelFragment.kt
+++ b/app/src/main/java/com/github/libretube/ChannelFragment.kt
@@ -64,8 +64,6 @@ class ChannelFragment : Fragment() {
                         fetchNextPage()
                     }
 
-                } else {
-                    //scroll view is not at bottom
                 }
             }
 
diff --git a/app/src/main/java/com/github/libretube/Home.kt b/app/src/main/java/com/github/libretube/Home.kt
index c45442550..28bd5ce16 100644
--- a/app/src/main/java/com/github/libretube/Home.kt
+++ b/app/src/main/java/com/github/libretube/Home.kt
@@ -8,6 +8,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.ProgressBar
 import androidx.lifecycle.lifecycleScope
+import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 
@@ -51,7 +52,8 @@ class Home : Fragment() {
         fun run() {
             lifecycleScope.launchWhenCreated {
                 val response = try {
-                    RetrofitInstance.api.getTrending("US")
+                    val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext())
+                    RetrofitInstance.api.getTrending(sharedPreferences.getString("region", "US")!!)
                 }catch(e: IOException) {
                     println(e)
                     Log.e(TAG, "IOException, you might not have internet connection")
diff --git a/app/src/main/java/com/github/libretube/LoginDialog.kt b/app/src/main/java/com/github/libretube/LoginDialog.kt
index d18d86ff7..de47771fc 100644
--- a/app/src/main/java/com/github/libretube/LoginDialog.kt
+++ b/app/src/main/java/com/github/libretube/LoginDialog.kt
@@ -1,6 +1,7 @@
 package com.github.libretube
 
 import android.app.Dialog
+import android.content.Context
 import android.content.DialogInterface
 import android.os.Bundle
 import android.util.Log
@@ -11,6 +12,7 @@ import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
 import androidx.lifecycle.lifecycleScope
+import androidx.preference.PreferenceManager
 import com.github.libretube.adapters.TrendingAdapter
 import com.github.libretube.obj.Login
 import retrofit2.HttpException
@@ -27,22 +29,35 @@ class LoginDialog : DialogFragment() {
             val builder = AlertDialog.Builder(it)
             // Get the layout inflater
             val inflater = requireActivity().layoutInflater;
-
-            // Inflate and set the layout for the dialog
-            // Pass null as the parent view because its going in the dialog layout
-            val view = inflater.inflate(R.layout.dialog_login, null)
-            username=view.findViewById(R.id.username)
-            password=view.findViewById(R.id.password)
-            view.findViewById<Button>(R.id.login).setOnClickListener {
-                val login = Login(username.text.toString(),password.text.toString())
-                login(login)
-            }
-            view.findViewById<Button>(R.id.register).setOnClickListener {
-                val login = Login(username.text.toString(),password.text.toString())
-                register(login)
+            val sharedPref = context?.getSharedPreferences("token", Context.MODE_PRIVATE)
+            val token = sharedPref?.getString("token","")
+            var view: View
+            Log.e("dafaq",token!!)
+            if(token!=""){
+                view = inflater.inflate(R.layout.dialog_logout, null)
+                view.findViewById<Button>(R.id.logout).setOnClickListener {
+                    Toast.makeText(context,R.string.loggedout, Toast.LENGTH_SHORT).show()
+                    val sharedPref = context?.getSharedPreferences("token",Context.MODE_PRIVATE)
+                    with (sharedPref!!.edit()) {
+                        putString("token","")
+                        apply()
+                    }
+                    dialog?.dismiss()
+                }
+            }else{
+                view = inflater.inflate(R.layout.dialog_login, null)
+                username=view.findViewById(R.id.username)
+                password=view.findViewById(R.id.password)
+                view.findViewById<Button>(R.id.login).setOnClickListener {
+                    val login = Login(username.text.toString(),password.text.toString())
+                    login(login)
+                }
+                view.findViewById<Button>(R.id.register).setOnClickListener {
+                    val login = Login(username.text.toString(),password.text.toString())
+                    register(login)
+                }
             }
             builder.setView(view)
-                // Add action buttons
             builder.create()
         } ?: throw IllegalStateException("Activity cannot be null")
     }
@@ -66,6 +81,11 @@ class LoginDialog : DialogFragment() {
                     Toast.makeText(context, response.error, Toast.LENGTH_SHORT).show()
                 }else if(response.token!=null){
                     Toast.makeText(context,R.string.loggedIn, Toast.LENGTH_SHORT).show()
+                    val sharedPref = context?.getSharedPreferences("token",Context.MODE_PRIVATE)
+                    with (sharedPref!!.edit()) {
+                        putString("token",response.token)
+                        apply()
+                    }
                     dialog?.dismiss()
                 }
 
@@ -93,6 +113,11 @@ class LoginDialog : DialogFragment() {
                 Toast.makeText(context, response.error, Toast.LENGTH_SHORT).show()
                 }else if(response.token!=null){
                     Toast.makeText(context,R.string.registered, Toast.LENGTH_SHORT).show()
+                    val sharedPref = context?.getSharedPreferences("token",Context.MODE_PRIVATE)
+                    with (sharedPref!!.edit()) {
+                        putString("token",response.token)
+                        apply()
+                    }
                     dialog?.dismiss()
                 }
 
diff --git a/app/src/main/java/com/github/libretube/MainActivity.kt b/app/src/main/java/com/github/libretube/MainActivity.kt
index e2b55b576..d2fba1f71 100644
--- a/app/src/main/java/com/github/libretube/MainActivity.kt
+++ b/app/src/main/java/com/github/libretube/MainActivity.kt
@@ -20,6 +20,7 @@ import androidx.navigation.findNavController
 import androidx.navigation.ui.NavigationUI
 import androidx.navigation.ui.NavigationUI.onNavDestinationSelected
 import androidx.navigation.ui.setupWithNavController
+import androidx.preference.PreferenceManager
 import com.google.android.exoplayer2.ExoPlayer
 import com.google.android.material.color.DynamicColors
 import java.lang.Exception
@@ -30,6 +31,8 @@ class MainActivity : AppCompatActivity() {
     lateinit var navController : NavController
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this)
+        RetrofitInstance.url=sharedPreferences.getString("instance", "https://pipedapi.kavin.rocks/")!!
 
         DynamicColors.applyToActivitiesIfAvailable(application)
 
diff --git a/app/src/main/java/com/github/libretube/RetrofitInstance.kt b/app/src/main/java/com/github/libretube/RetrofitInstance.kt
index 6ec8380dd..d18305b4f 100644
--- a/app/src/main/java/com/github/libretube/RetrofitInstance.kt
+++ b/app/src/main/java/com/github/libretube/RetrofitInstance.kt
@@ -1,12 +1,18 @@
 package com.github.libretube
 
+import android.content.Context
+import android.util.Log
+import androidx.preference.PreferenceManager
+import kotlinx.coroutines.withContext
 import retrofit2.Retrofit
 import retrofit2.converter.jackson.JacksonConverterFactory
+import kotlin.coroutines.coroutineContext
 
 object RetrofitInstance {
+    lateinit var url: String
     val api: PipedApi by lazy {
         Retrofit.Builder()
-            .baseUrl("https://pipedapi.kavin.rocks/")
+            .baseUrl(url)
             .addConverterFactory(JacksonConverterFactory.create())
             .build()
             .create(PipedApi::class.java)
diff --git a/app/src/main/java/com/github/libretube/SearchFragment.kt b/app/src/main/java/com/github/libretube/SearchFragment.kt
index edd9a243a..53aabffed 100644
--- a/app/src/main/java/com/github/libretube/SearchFragment.kt
+++ b/app/src/main/java/com/github/libretube/SearchFragment.kt
@@ -96,7 +96,7 @@ class SearchFragment : Fragment() {
                 RetrofitInstance.api.getSearchResults(query, "all")
             } catch (e: IOException) {
                 println(e)
-                Log.e(TAG, "IOException, you might not have internet connection")
+                Log.e(TAG, "IOException, you might not have internet connection "+e.toString())
                 return@launchWhenCreated
             } catch (e: HttpException) {
                 Log.e(TAG, "HttpException, unexpected response")
diff --git a/app/src/main/java/com/github/libretube/Settings.kt b/app/src/main/java/com/github/libretube/Settings.kt
index 48d92b703..0b736554f 100644
--- a/app/src/main/java/com/github/libretube/Settings.kt
+++ b/app/src/main/java/com/github/libretube/Settings.kt
@@ -1,10 +1,26 @@
 package com.github.libretube
 
 import android.os.Bundle
+import android.util.Log
+import androidx.preference.ListPreference
+import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
+import androidx.preference.SwitchPreferenceCompat
 
 class Settings : PreferenceFragmentCompat() {
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         setPreferencesFromResource(R.xml.settings, rootKey)
+        val instance = findPreference<ListPreference>("instance")
+        instance?.setOnPreferenceChangeListener { preference, newValue ->
+            RetrofitInstance.url=newValue.toString()
+            true
+        }
+        val login = findPreference<Preference>("login_register")
+        login?.setOnPreferenceClickListener {
+            val newFragment = LoginDialog()
+            newFragment.show(childFragmentManager,"fuck")
+            true
+        }
+
     }
 }
diff --git a/app/src/main/java/com/github/libretube/Subscriptions.kt b/app/src/main/java/com/github/libretube/Subscriptions.kt
index afd75b6db..91638549f 100644
--- a/app/src/main/java/com/github/libretube/Subscriptions.kt
+++ b/app/src/main/java/com/github/libretube/Subscriptions.kt
@@ -1,7 +1,9 @@
 package com.github.libretube
 
+import android.content.Context
 import android.media.Image
 import android.os.Bundle
+import android.util.Log
 import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
@@ -41,11 +43,9 @@ class Subscriptions : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        view.findViewById<ImageView>(R.id.boogh).setOnClickListener {
-            val newFragment = LoginDialog()
-            newFragment.show(childFragmentManager,"fuck")
+        val sharedPref = context?.getSharedPreferences("token", Context.MODE_PRIVATE)
+        Log.e("dafaq",sharedPref?.getString("token","")!!)
 
-        }
     }
 
     companion object {
diff --git a/app/src/main/java/com/github/libretube/obj/SearchItem.kt b/app/src/main/java/com/github/libretube/obj/SearchItem.kt
index da7943f31..030c9a297 100644
--- a/app/src/main/java/com/github/libretube/obj/SearchItem.kt
+++ b/app/src/main/java/com/github/libretube/obj/SearchItem.kt
@@ -4,6 +4,7 @@ data class SearchItem(
     var url: String?,
     var thumbnail: String?,
     var uploaderName: String?,
+    var uploaded: String?,
     //Video only attributes
     var title: String?,
     var uploaderUrl: String?,
@@ -19,5 +20,5 @@ data class SearchItem(
     var videos: Long? = -1,
     var verified: Boolean? = null
 ){
-    constructor() : this("","","","","","","",0,0,null)
+    constructor() : this("","","","","","","","",0,0,null)
 }
diff --git a/app/src/main/res/layout/dialog_logout.xml b/app/src/main/res/layout/dialog_logout.xml
new file mode 100644
index 000000000..f8108a5f2
--- /dev/null
+++ b/app/src/main/res/layout/dialog_logout.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+    <ImageView
+        android:src="@drawable/ic_libretube_foreground"
+        android:layout_width="match_parent"
+        android:layout_height="64dp"
+        android:scaleType="center"
+        android:background="#CD5757"
+        android:contentDescription="@string/app_name" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/already_logged_in"
+        android:padding="8dp"
+        android:layout_margin="8dp"
+        />
+        <Button
+            android:id="@+id/logout"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/logout"
+            android:padding="8dp"
+            android:layout_margin="8dp"
+            android:layout_gravity="center"/>
+
+</LinearLayout>
diff --git a/app/src/main/res/values/array.xml b/app/src/main/res/values/array.xml
new file mode 100644
index 000000000..0359e51d1
--- /dev/null
+++ b/app/src/main/res/values/array.xml
@@ -0,0 +1,401 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="instances">
+        <item>piped.tokhmi.xyz</item>
+        <item>piped.kavin.rocks</item>
+    </string-array>
+    <string-array name="instancesValue">
+        <item>https://pipedapi.tokhmi.xyz/</item>
+        <item>https://pipedapi.kavin.rocks/</item>
+    </string-array>
+    <string-array name="regions">
+        <item>Afghanistan</item>
+        <item>Albania</item>
+        <item>Algeria</item>
+        <item>Andorra</item>
+        <item>Angola</item>
+        <item>Antigua and Barbuda</item>
+        <item>Argentina</item>
+        <item>Armenia</item>
+        <item>Australia</item>
+        <item>Austria</item>
+        <item>Azerbaijan</item>
+        <item>Bahamas</item>
+        <item>Bahrain</item>
+        <item>Bangladesh</item>
+        <item>Barbados</item>
+        <item>Belarus</item>
+        <item>Belgium</item>
+        <item>Belize</item>
+        <item>Benin</item>
+        <item>Bhutan</item>
+        <item>Bolivia (Plurinational State of)</item>
+        <item>Bosnia and Herzegovina</item>
+        <item>Botswana</item>
+        <item>Brazil</item>
+        <item>Brunei Darussalam</item>
+        <item>Bulgaria</item>
+        <item>Burkina Faso</item>
+        <item>Burundi</item>
+        <item>Cabo Verde</item>
+        <item>Cambodia</item>
+        <item>Cameroon</item>
+        <item>Canada</item>
+        <item>Central African Republic</item>
+        <item>Chad</item>
+        <item>Chile</item>
+        <item>China</item>
+        <item>Colombia</item>
+        <item>Comoros</item>
+        <item>Congo</item>
+        <item>Congo, Democratic Republic of the</item>
+        <item>Costa Rica</item>
+        <item>Côte d\'Ivoire</item>
+        <item>Croatia</item>
+        <item>Cuba</item>
+        <item>Cyprus</item>
+        <item>Czechia</item>
+        <item>Denmark</item>
+        <item>Djibouti</item>
+        <item>Dominica</item>
+        <item>Dominican Republic</item>
+        <item>Ecuador</item>
+        <item>Egypt</item>
+        <item>El Salvador</item>
+        <item>Equatorial Guinea</item>
+        <item>Eritrea</item>
+        <item>Estonia</item>
+        <item>Eswatini</item>
+        <item>Ethiopia</item>
+        <item>Fiji</item>
+        <item>Finland</item>
+        <item>France</item>
+        <item>Gabon</item>
+        <item>Gambia</item>
+        <item>Georgia</item>
+        <item>Germany</item>
+        <item>Ghana</item>
+        <item>Greece</item>
+        <item>Grenada</item>
+        <item>Guatemala</item>
+        <item>Guinea</item>
+        <item>Guinea-Bissau</item>
+        <item>Guyana</item>
+        <item>Haiti</item>
+        <item>Honduras</item>
+        <item>Hungary</item>
+        <item>Iceland</item>
+        <item>India</item>
+        <item>Indonesia</item>
+        <item>Iran (Islamic Republic of)</item>
+        <item>Iraq</item>
+        <item>Ireland</item>
+        <item>Israel</item>
+        <item>Italy</item>
+        <item>Jamaica</item>
+        <item>Japan</item>
+        <item>Jordan</item>
+        <item>Kazakhstan</item>
+        <item>Kenya</item>
+        <item>Kiribati</item>
+        <item>Korea (Democratic People\'s Republic of)</item>
+        <item>Korea, Republic of</item>
+        <item>Kuwait</item>
+        <item>Kyrgyzstan</item>
+        <item>Lao People\'s Democratic Republic</item>
+        <item>Latvia</item>
+        <item>Lebanon</item>
+        <item>Lesotho</item>
+        <item>Liberia</item>
+        <item>Libya</item>
+        <item>Liechtenstein</item>
+        <item>Lithuania</item>
+        <item>Luxembourg</item>
+        <item>Madagascar</item>
+        <item>Malawi</item>
+        <item>Malaysia</item>
+        <item>Maldives</item>
+        <item>Mali</item>
+        <item>Malta</item>
+        <item>Marshall Islands</item>
+        <item>Mauritania</item>
+        <item>Mauritius</item>
+        <item>Mexico</item>
+        <item>Micronesia (Federated States of)</item>
+        <item>Moldova, Republic of</item>
+        <item>Monaco</item>
+        <item>Mongolia</item>
+        <item>Montenegro</item>
+        <item>Morocco</item>
+        <item>Mozambique</item>
+        <item>Myanmar</item>
+        <item>Namibia</item>
+        <item>Nauru</item>
+        <item>Nepal</item>
+        <item>Netherlands</item>
+        <item>New Zealand</item>
+        <item>Nicaragua</item>
+        <item>Niger</item>
+        <item>Nigeria</item>
+        <item>North Macedonia</item>
+        <item>Norway</item>
+        <item>Oman</item>
+        <item>Pakistan</item>
+        <item>Palau</item>
+        <item>Panama</item>
+        <item>Papua New Guinea</item>
+        <item>Paraguay</item>
+        <item>Peru</item>
+        <item>Philippines</item>
+        <item>Poland</item>
+        <item>Portugal</item>
+        <item>Qatar</item>
+        <item>Romania</item>
+        <item>Russian Federation</item>
+        <item>Rwanda</item>
+        <item>Saint Kitts and Nevis</item>
+        <item>Saint Lucia</item>
+        <item>Saint Vincent and the Grenadines</item>
+        <item>Samoa</item>
+        <item>San Marino</item>
+        <item>Sao Tome and Principe</item>
+        <item>Saudi Arabia</item>
+        <item>Senegal</item>
+        <item>Serbia</item>
+        <item>Seychelles</item>
+        <item>Sierra Leone</item>
+        <item>Singapore</item>
+        <item>Slovakia</item>
+        <item>Slovenia</item>
+        <item>Solomon Islands</item>
+        <item>Somalia</item>
+        <item>South Africa</item>
+        <item>South Sudan</item>
+        <item>Spain</item>
+        <item>Sri Lanka</item>
+        <item>Sudan</item>
+        <item>Suriname</item>
+        <item>Sweden</item>
+        <item>Switzerland</item>
+        <item>Syrian Arab Republic</item>
+        <item>Tajikistan</item>
+        <item>Tanzania, United Republic of</item>
+        <item>Thailand</item>
+        <item>Timor-Leste</item>
+        <item>Togo</item>
+        <item>Tonga</item>
+        <item>Trinidad and Tobago</item>
+        <item>Tunisia</item>
+        <item>Turkey</item>
+        <item>Turkmenistan</item>
+        <item>Tuvalu</item>
+        <item>Uganda</item>
+        <item>Ukraine</item>
+        <item>United Arab Emirates</item>
+        <item>United Kingdom of Great Britain and Northern Ireland</item>
+        <item>United States of America</item>
+        <item>Uruguay</item>
+        <item>Uzbekistan</item>
+        <item>Vanuatu</item>
+        <item>Venezuela (Bolivarian Republic of)</item>
+        <item>Viet Nam</item>
+        <item>Yemen</item>
+        <item>Zambia</item>
+        <item>Zimbabwe</item>
+    </string-array>
+    <string-array name="regionsValue">
+        <item>AF</item>
+        <item>AL</item>
+        <item>DZ</item>
+        <item>AD</item>
+        <item>AO</item>
+        <item>AG</item>
+        <item>AR</item>
+        <item>AM</item>
+        <item>AU</item>
+        <item>AT</item>
+        <item>AZ</item>
+        <item>BS</item>
+        <item>BH</item>
+        <item>BD</item>
+        <item>BB</item>
+        <item>BY</item>
+        <item>BE</item>
+        <item>BZ</item>
+        <item>BJ</item>
+        <item>BT</item>
+        <item>BO</item>
+        <item>BA</item>
+        <item>BW</item>
+        <item>BR</item>
+        <item>BN</item>
+        <item>BG</item>
+        <item>BF</item>
+        <item>BI</item>
+        <item>CV</item>
+        <item>KH</item>
+        <item>CM</item>
+        <item>CA</item>
+        <item>CF</item>
+        <item>TD</item>
+        <item>CL</item>
+        <item>CN</item>
+        <item>CO</item>
+        <item>KM</item>
+        <item>CG</item>
+        <item>CD</item>
+        <item>CR</item>
+        <item>CI</item>
+        <item>HR</item>
+        <item>CU</item>
+        <item>CY</item>
+        <item>CZ</item>
+        <item>DK</item>
+        <item>DJ</item>
+        <item>DM</item>
+        <item>DO</item>
+        <item>EC</item>
+        <item>EG</item>
+        <item>SV</item>
+        <item>GQ</item>
+        <item>ER</item>
+        <item>EE</item>
+        <item>SZ</item>
+        <item>ET</item>
+        <item>FJ</item>
+        <item>FI</item>
+        <item>FR</item>
+        <item>GA</item>
+        <item>GM</item>
+        <item>GE</item>
+        <item>DE</item>
+        <item>GH</item>
+        <item>GR</item>
+        <item>GD</item>
+        <item>GT</item>
+        <item>GN</item>
+        <item>GW</item>
+        <item>GY</item>
+        <item>HT</item>
+        <item>HN</item>
+        <item>HU</item>
+        <item>IS</item>
+        <item>IN</item>
+        <item>ID</item>
+        <item>IR</item>
+        <item>IQ</item>
+        <item>IE</item>
+        <item>IL</item>
+        <item>IT</item>
+        <item>JM</item>
+        <item>JP</item>
+        <item>JO</item>
+        <item>KZ</item>
+        <item>KE</item>
+        <item>KI</item>
+        <item>KP</item>
+        <item>KR</item>
+        <item>KW</item>
+        <item>KG</item>
+        <item>LA</item>
+        <item>LV</item>
+        <item>LB</item>
+        <item>LS</item>
+        <item>LR</item>
+        <item>LY</item>
+        <item>LI</item>
+        <item>LT</item>
+        <item>LU</item>
+        <item>MG</item>
+        <item>MW</item>
+        <item>MY</item>
+        <item>MV</item>
+        <item>ML</item>
+        <item>MT</item>
+        <item>MH</item>
+        <item>MR</item>
+        <item>MU</item>
+        <item>MX</item>
+        <item>FM</item>
+        <item>MD</item>
+        <item>MC</item>
+        <item>MN</item>
+        <item>ME</item>
+        <item>MA</item>
+        <item>MZ</item>
+        <item>MM</item>
+        <item>NA</item>
+        <item>NR</item>
+        <item>NP</item>
+        <item>NL</item>
+        <item>NZ</item>
+        <item>NI</item>
+        <item>NE</item>
+        <item>NG</item>
+        <item>MK</item>
+        <item>NO</item>
+        <item>OM</item>
+        <item>PK</item>
+        <item>PW</item>
+        <item>PA</item>
+        <item>PG</item>
+        <item>PY</item>
+        <item>PE</item>
+        <item>PH</item>
+        <item>PL</item>
+        <item>PT</item>
+        <item>QA</item>
+        <item>RO</item>
+        <item>RU</item>
+        <item>RW</item>
+        <item>KN</item>
+        <item>LC</item>
+        <item>VC</item>
+        <item>WS</item>
+        <item>SM</item>
+        <item>ST</item>
+        <item>SA</item>
+        <item>SN</item>
+        <item>RS</item>
+        <item>SC</item>
+        <item>SL</item>
+        <item>SG</item>
+        <item>SK</item>
+        <item>SI</item>
+        <item>SB</item>
+        <item>SO</item>
+        <item>ZA</item>
+        <item>SS</item>
+        <item>ES</item>
+        <item>LK</item>
+        <item>SD</item>
+        <item>SR</item>
+        <item>SE</item>
+        <item>CH</item>
+        <item>SY</item>
+        <item>TJ</item>
+        <item>TZ</item>
+        <item>TH</item>
+        <item>TL</item>
+        <item>TG</item>
+        <item>TO</item>
+        <item>TT</item>
+        <item>TN</item>
+        <item>TR</item>
+        <item>TM</item>
+        <item>TV</item>
+        <item>UG</item>
+        <item>UA</item>
+        <item>AE</item>
+        <item>GB</item>
+        <item>US</item>
+        <item>UY</item>
+        <item>UZ</item>
+        <item>VU</item>
+        <item>VE</item>
+        <item>VN</item>
+        <item>YE</item>
+        <item>ZM</item>
+        <item>ZW</item>
+    </string-array>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8c5aaae28..5ed12f887 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -12,7 +12,14 @@
     <string name="password">Password</string>
     <string name="login">Login</string>
     <string name="register">Register</string>
+    <string name="logout">Logout</string>
     <string name="cancel">Cancel</string>
     <string name="loggedIn">Logged in successfully!</string>
+    <string name="loggedout">Logged out successfully!</string>
     <string name="registered">Registered successfully! You may now subscribe to channels you want.</string>
+    <string name="already_logged_in">You are already logged in, you may logout of your account.</string>
+    <string name="instances">Choose an instance</string>
+    <string name="customInstance">Add a custom instance</string>
+    <string name="region">Choose a region</string>
+    <string name="login_register">Login/Register</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/settings.xml b/app/src/main/res/xml/settings.xml
index ba7093668..61a6abd8b 100644
--- a/app/src/main/res/xml/settings.xml
+++ b/app/src/main/res/xml/settings.xml
@@ -3,12 +3,31 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <androidx.preference.SwitchPreferenceCompat
-        app:key="notifications"
-        app:title="Enable message notifications"/>
+        app:key="darkMode"
+        app:title="Toggle dark mode"
+        app:isPreferenceVisible="false"/>
+    <ListPreference
+        app:key="region"
+        app:title="@string/region"
+        app:entries="@array/regions"
+        app:entryValues="@array/regionsValue"
+        app:defaultValue="US"
+        app:useSimpleSummaryProvider="true"
+        />
 
+    <ListPreference
+        app:key="instance"
+        app:title="@string/instances"
+        app:entries="@array/instances"
+        app:entryValues="@array/instancesValue"
+        app:defaultValue="https://pipedapi.kavin.rocks/"
+        app:useSimpleSummaryProvider="true"/>
+    <androidx.preference.EditTextPreference
+    app:key="customInstance"
+    app:title="@string/customInstance"
+        app:isPreferenceVisible="false"/>
     <androidx.preference.Preference
-        app:key="feedback"
-        app:title="Send feedback"
-        app:summary="Report technical issues or suggest new features"/>
-
+        app:key="login_register"
+        app:title="@string/login_register"
+        />
 </androidx.preference.PreferenceScreen>
\ No newline at end of file