Reload Activity on Back Pressed

app/src/main/java/com/github/libretube/MainActivity.kt

@@ -27,7 +27,6 @@ import com.google.android.material.bottomnavigation.BottomNavigationView
 import androidx.navigation.findNavController
 import androidx.navigation.ui.setupWithNavController
 import androidx.preference.PreferenceManager
-import com.github.libretube.SettingsActivity
 import com.google.android.material.color.DynamicColors
 import java.lang.Exception
 import java.util.*
@@ -101,7 +100,7 @@ class MainActivity : AppCompatActivity() {
         toolbar.title= appName
 
         toolbar.setNavigationOnClickListener{
-            //settings fragment stuff
+            //settings activity stuff
             val intent = Intent(this, SettingsActivity::class.java)
             startActivity(intent)
             true

app/src/main/java/com/github/libretube/Settings.kt

@@ -1,290 +0,0 @@
-package com.github.libretube
-
-import android.Manifest
-import android.content.ContentResolver
-import android.content.Context
-import android.content.Intent
-import android.content.pm.PackageManager
-import android.net.Uri
-import android.os.Build
-import android.os.Bundle
-import android.os.LocaleList
-import android.text.TextUtils
-import android.util.Log
-import android.widget.Toast
-import androidx.activity.result.ActivityResultLauncher
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.appcompat.app.AppCompatDelegate
-import androidx.core.app.ActivityCompat
-import androidx.core.content.ContextCompat
-import androidx.core.os.LocaleListCompat
-import androidx.fragment.app.Fragment
-import androidx.lifecycle.lifecycleScope
-import androidx.preference.ListPreference
-import androidx.preference.Preference
-import androidx.preference.PreferenceFragmentCompat
-import org.json.JSONArray
-import org.json.JSONObject
-import org.json.JSONTokener
-import retrofit2.HttpException
-import java.io.IOException
-import java.io.InputStream
-import java.util.*
-import java.util.zip.ZipEntry
-import java.util.zip.ZipInputStream
-import kotlin.collections.ArrayList
-
-
-class Settings : PreferenceFragmentCompat() {
-    val TAG = "Settings"
-
-    companion object {
-        lateinit var getContent: ActivityResultLauncher<String>
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        getContent = registerForActivityResult(ActivityResultContracts.GetContent()) { uri: Uri? ->
-
-            if (uri != null) {
-                try {
-                    // Open a specific media item using ParcelFileDescriptor.
-                    val resolver: ContentResolver =
-                        requireActivity()
-                            .contentResolver
-
-                    // "rw" for read-and-write;
-                    // "rwt" for truncating or overwriting existing file contents.
-                    //val readOnlyMode = "r"
-                    // uri - I have got from onActivityResult
-                    val type = resolver.getType(uri)
-
-                    var inputStream: InputStream? = resolver.openInputStream(uri)
-                    val channels = ArrayList<String>()
-                    if(type == "application/json"){
-                        val json = inputStream?.bufferedReader()?.readLines()?.get(0)
-                        val jsonObject = JSONTokener(json).nextValue() as JSONObject
-                        Log.e(TAG,jsonObject.getJSONArray("subscriptions").toString())
-                        for (i in 0 until jsonObject.getJSONArray("subscriptions").length()) {
-                            var url = jsonObject.getJSONArray("subscriptions").getJSONObject(i).getString("url")
-                            url = url.replace("https://www.youtube.com/channel/","")
-                            Log.e(TAG,url)
-                            channels.add(url)
-                        }
-                    }else {
-                        if (type == "application/zip") {
-                            val zis = ZipInputStream(inputStream)
-                            var entry: ZipEntry? = zis.nextEntry
-                            while (entry != null) {
-                                if (entry.name.endsWith(".csv")) {
-                                    inputStream = zis
-                                    break
-                                }
-                                entry = zis.nextEntry
-                            }
-                        }
-
-                        inputStream?.bufferedReader()?.readLines()?.forEach {
-                            if (it.isNotBlank()) {
-                                val channelId = it.substringBefore(",")
-                                if (channelId.length == 24)
-                                    channels.add(channelId)
-                            }
-                        }
-                    }
-                    inputStream?.close()
-
-                    subscribe(channels)
-                } catch (e: Exception) {
-                    Log.e(TAG, e.toString())
-                    Toast.makeText(
-                        context,
-                        R.string.error,
-                        Toast.LENGTH_SHORT
-                    ).show()
-                }
-            }
-
-
-        }
-        super.onCreate(savedInstanceState)
-    }
-
-    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-        setPreferencesFromResource(R.xml.settings, rootKey)
-        val instance = findPreference<ListPreference>("instance")
-        fetchInstance()
-        instance?.setOnPreferenceChangeListener { _, newValue ->
-            RetrofitInstance.url = newValue.toString()
-            RetrofitInstance.lazyMgr.reset()
-            val sharedPref = context?.getSharedPreferences("token", Context.MODE_PRIVATE)
-            if (sharedPref?.getString("token", "") != "") {
-                with(sharedPref!!.edit()) {
-                    putString("token", "")
-                    apply()
-                }
-                Toast.makeText(context, R.string.loggedout, Toast.LENGTH_SHORT).show()
-            }
-            true
-        }
-
-        val login = findPreference<Preference>("login_register")
-        login?.setOnPreferenceClickListener {
-            val newFragment = LoginDialog()
-            newFragment.show(childFragmentManager, "Login")
-            true
-        }
-
-        val importFromYt = findPreference<Preference>("import_from_yt")
-        importFromYt?.setOnPreferenceClickListener {
-            val sharedPref = context?.getSharedPreferences("token", Context.MODE_PRIVATE)
-            val token = sharedPref?.getString("token", "")!!
-            //check StorageAccess
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-                Log.d("myz", "" + Build.VERSION.SDK_INT)
-                if (ContextCompat.checkSelfPermission(
-                        this.requireContext(),
-                        Manifest.permission.READ_EXTERNAL_STORAGE
-                    )
-                    != PackageManager.PERMISSION_GRANTED
-                ) {
-                    ActivityCompat.requestPermissions(
-                        this.requireActivity(), arrayOf(
-                            Manifest.permission.READ_EXTERNAL_STORAGE,
-                            Manifest.permission.MANAGE_EXTERNAL_STORAGE
-                        ), 1
-                    ) //permission request code is just an int
-                } else if (token != "") {
-                    getContent.launch("*/*")
-                } else {
-                    Toast.makeText(context, R.string.login_first, Toast.LENGTH_SHORT).show()
-                }
-            } else {
-                if (ActivityCompat.checkSelfPermission(
-                        requireContext(),
-                        Manifest.permission.READ_EXTERNAL_STORAGE
-                    ) != PackageManager.PERMISSION_GRANTED || ActivityCompat.checkSelfPermission(
-                        requireContext(),
-                        Manifest.permission.WRITE_EXTERNAL_STORAGE
-                    ) != PackageManager.PERMISSION_GRANTED
-                ) {
-                    ActivityCompat.requestPermissions(
-                        this.requireActivity(),
-                        arrayOf(
-                            Manifest.permission.READ_EXTERNAL_STORAGE,
-                            Manifest.permission.WRITE_EXTERNAL_STORAGE
-                        ),
-                        1
-                    )
-                } else if (token != "") {
-                    getContent.launch("*/*")
-                } else {
-                    Toast.makeText(context, R.string.login_first, Toast.LENGTH_SHORT).show()
-                }
-            }
-            true
-        }
-
-        val themeToggle = findPreference<ListPreference>("theme_togglee")
-        themeToggle?.setOnPreferenceChangeListener { _, newValue ->
-            when (newValue.toString()) {
-                "A" -> AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM)
-                "L" -> AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
-                "D" -> AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES)
-            }
-            true
-        }
-
-        val changeLanguage = findPreference<ListPreference>("language")
-        changeLanguage?.setOnPreferenceChangeListener { _, _ ->
-            val refresh = Intent(context, MainActivity::class.java)
-            startActivity(refresh)
-            true
-        }
-
-        val about = findPreference<Preference>("about")
-        about?.setOnPreferenceClickListener {
-            val uri = Uri.parse("https://libre-tube.github.io/")
-            val intent = Intent(Intent.ACTION_VIEW).setData(uri)
-            startActivity(intent)
-            true
-        }
-    }
-
-    private fun fetchInstance() {
-        lifecycleScope.launchWhenCreated {
-            val response = try {
-                RetrofitInstance.api.getInstances("https://instances.tokhmi.xyz/")
-            } catch (e: IOException) {
-                println(e)
-                Log.e("settings", "IOException, you might not have internet connection")
-                return@launchWhenCreated
-            } catch (e: HttpException) {
-                Log.e("settings", "HttpException, unexpected response $e")
-                return@launchWhenCreated
-            } catch (e: Exception) {
-                Log.e("settings", e.toString())
-                return@launchWhenCreated
-            }
-            val listEntries: MutableList<String> = ArrayList()
-            val listEntryValues: MutableList<String> = ArrayList()
-            for (item in response) {
-                listEntries.add(item.name!!)
-                listEntryValues.add(item.api_url!!)
-            }
-            val entries = listEntries.toTypedArray<CharSequence>()
-            val entryValues = listEntryValues.toTypedArray<CharSequence>()
-            runOnUiThread {
-                val instance = findPreference<ListPreference>("instance")
-                instance?.entries = entries
-                instance?.entryValues = entryValues
-                instance?.summaryProvider =
-                    Preference.SummaryProvider<ListPreference> { preference ->
-                        val text = preference.entry
-                        if (TextUtils.isEmpty(text)) {
-                            "kavin.rocks (Official)"
-                        } else {
-                            text
-                        }
-                    }
-            }
-        }
-    }
-
-    private fun Fragment?.runOnUiThread(action: () -> Unit) {
-        this ?: return
-        if (!isAdded) return // Fragment not attached to an Activity
-        activity?.runOnUiThread(action)
-    }
-
-
-    private fun subscribe(channels: List<String>) {
-        fun run() {
-            lifecycleScope.launchWhenCreated {
-                val response = try {
-                    val sharedPref = context?.getSharedPreferences("token", Context.MODE_PRIVATE)
-                    RetrofitInstance.api.importSubscriptions(
-                        false,
-                        sharedPref?.getString("token", "")!!,
-                        channels
-                    )
-                } catch (e: IOException) {
-                    Log.e(TAG, "IOException, you might not have internet connection")
-                    return@launchWhenCreated
-                } catch (e: HttpException) {
-                    Log.e(TAG, "HttpException, unexpected response$e")
-                    return@launchWhenCreated
-                }
-                if (response.message == "ok") {
-                    Toast.makeText(
-                        context,
-                        R.string.importsuccess,
-                        Toast.LENGTH_SHORT
-                    ).show()
-                }
-            }
-        }
-        run()
-    }
-}
-
-

app/src/main/java/com/github/libretube/SettingsActivity.kt

@@ -11,6 +11,7 @@ import android.os.Build
 import android.os.Bundle
 import android.text.TextUtils
 import android.util.Log
+import android.view.View
 import android.widget.Toast
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
@@ -37,6 +38,10 @@ class SettingsActivity : AppCompatActivity(),
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        overridePendingTransition(50, 50);
+        val view = this.findViewById<View>(android.R.id.content)
+        view.setAlpha(0F);
+        view.animate().alpha(1F).setDuration(300);
         setContentView(R.layout.activity_settings)
         if (savedInstanceState == null) {
             supportFragmentManager
@@ -305,9 +310,11 @@ class SettingsActivity : AppCompatActivity(),
         }
     }
 
-    override fun onDestroy() {
+    override fun onBackPressed() {
-        super.onDestroy()
         PreferenceManager.getDefaultSharedPreferences(this)
             .unregisterOnSharedPreferenceChangeListener(this)
+        intent = Intent(this, MainActivity::class.java)
+        startActivity(intent)
     }
+
 }

app/src/main/res/navigation/nav.xml

@@ -46,6 +46,6 @@
     </fragment>
     <fragment
         android:id="@+id/settings"
-        android:name="com.github.libretube.Settings"
+        android:name="com.github.libretube.SettingsActivity$SettingsFragment"
         android:label="Settings" />
 </navigation>

app/src/main/res/values/strings.xml

@@ -64,8 +64,8 @@
     <string name="darkTheme">Dark Theme</string>
     <string name="subscribers">%1$s subscribers</string>
     <string name="settings">Settings</string>
-    <string name="locationSettings">Location</string>
+    <string name="location">Location</string>
-    <string name="instanceSettings">Instance</string>
+    <string name="instance">Instance</string>
-    <string name="themingSettings">Theming</string>
+    <string name="customization">Customization</string>
     <string name="website">Website</string>
 </resources>

app/src/main/res/xml/settings.xml

@@ -2,7 +2,7 @@
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <PreferenceCategory app:title="@string/locationSettings">
+    <PreferenceCategory app:title="@string/location">
 
     <ListPreference
         app:key="region"
@@ -27,7 +27,7 @@
     </PreferenceCategory>
 
 
-    <PreferenceCategory app:title="@string/instanceSettings">
+    <PreferenceCategory app:title="@string/instance">
 
     <ListPreference
         app:key="instance"
@@ -60,7 +60,7 @@
     </PreferenceCategory>
 
 
-    <PreferenceCategory app:title="@string/themingSettings">
+    <PreferenceCategory app:title="@string/customization">
 
     <ListPreference
         app:title="@string/app_theme"