ui fixes

app/src/main/java/com/vanced/manager/core/fragments/Home.kt

@@ -17,16 +17,6 @@ import com.vanced.manager.utils.PackageHelper.uninstallApk
 
 open class Home : BaseFragment(), View.OnClickListener {
 
-    override fun onResume() {
-        super.onResume()
-        val prefs = activity?.getSharedPreferences("installPrefs", Context.MODE_PRIVATE)
-        val isInstalling = prefs?.getBoolean("isInstalling", false)
-        if (isInstalling!!) {
-            activity?.startService(Intent(activity, VancedDownloadService::class.java))
-            prefs.edit().putBoolean("isInstalling", false).apply()
-        }
-    }
-
     override fun onClick(v: View?) {
         val prefs = activity?.getSharedPreferences("installPrefs", Context.MODE_PRIVATE)
         val variant = getDefaultSharedPreferences(activity).getString("vanced_variant", "nonroot")

app/src/main/java/com/vanced/manager/ui/core/SlidingSwipeRefreshLayout.kt

@@ -2,9 +2,10 @@ package com.vanced.manager.ui.core
 
 import android.content.Context
 import android.util.AttributeSet
-import androidx.core.widget.NestedScrollView
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+
+open class SlidingSwipeRefreshLayout : SwipeRefreshLayout {
 
-open class SlidingNestedScrollView : NestedScrollView {
     constructor(context: Context?) : super(context!!)
     constructor(context: Context?, attrs: AttributeSet?) : super(
         context!!,

app/src/main/java/com/vanced/manager/ui/core/SplashScreenActivity.kt

@@ -3,13 +3,11 @@ package com.vanced.manager.ui.core
 import android.content.Intent
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import com.vanced.manager.R
 import com.vanced.manager.ui.MainActivity
 
 class SplashScreenActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        setTheme(R.style.SplashTheme)
         super.onCreate(savedInstanceState)
 
         startActivity(Intent(this@SplashScreenActivity, MainActivity::class.java))

app/src/main/java/com/vanced/manager/ui/fragments/ChosenPreferenceDialogFragment.kt

@@ -12,6 +12,7 @@ import androidx.databinding.DataBindingUtil
 import androidx.fragment.app.DialogFragment
 import com.vanced.manager.R
 import com.vanced.manager.databinding.FragmentChosenPreferencesBinding
+import java.util.*
 
 class ChosenPreferenceDialogFragment : DialogFragment() {
 
@@ -26,13 +27,21 @@ class ChosenPreferenceDialogFragment : DialogFragment() {
         return binding.root
     }
 
+    @ExperimentalStdlibApi
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
         val prefs = requireActivity().getSharedPreferences("installPrefs", Context.MODE_PRIVATE)
-
+        val langPrefs = prefs.getString("lang", "en")?.split(", ")?.toTypedArray()
+        val newPrefs = mutableListOf<String>()
+        if (langPrefs != null) {
+            for (lang in langPrefs) {
+                val loc = Locale(lang)
+                newPrefs.add(loc.getDisplayLanguage(loc).capitalize(Locale.ROOT))
+            }
+        }
         binding.chosenTheme.text = requireActivity().getString(R.string.chosen_theme, prefs.getString("theme", "dark"))
-        binding.chosenLang.text = requireActivity().getString(R.string.chosen_lang, prefs.getString("lang", "en"))
+        binding.chosenLang.text = requireActivity().getString(R.string.chosen_lang, newPrefs.joinToString())
 
         binding.chosenPrefsClose.setOnClickListener { dismiss() }
         binding.chosenPrefsReset.setOnClickListener {

app/src/main/java/com/vanced/manager/ui/fragments/HomeFragment.kt

@@ -125,8 +125,7 @@ class HomeFragment : Home(), View.OnClickListener {
                 MICROG_DOWNLOADED -> binding.includeMicrogLayout.microgInstalling.visibility = View.VISIBLE
                 VANCED_DOWNLOADED -> binding.includeVancedLayout.vancedInstalling.visibility = View.VISIBLE
                 REFRESH_HOME ->  {
-                    //viewModel.fetchData()
-                    binding.homeRefresh.isRefreshing = true
+                    viewModel.fetchData()
                     Log.d("VMRefresh", "Refreshing home page")
                 }
             }

app/src/main/java/com/vanced/manager/ui/fragments/VancedChangelogFragment.kt

@@ -25,10 +25,10 @@ class VancedChangelogFragment : Fragment() {
         super.onViewCreated(view, savedInstanceState)
         runBlocking {
             launch {
-                val vancedVersion = activity?.let { InternetTools.getJsonString("vanced.json", "version", it) }
+                val vancedVersion = activity?.let { InternetTools.getJsonString("vanced.json", "version", it).replace('.', '_') }
                 val baseUrl = PreferenceManager.getDefaultSharedPreferences(activity).getString("install_url", InternetTools.baseUrl)
 
-                val changelog = InternetTools.getObjectFromJson("$baseUrl/changelog/$vancedVersion.json", "message");
+                val changelog = InternetTools.getObjectFromJson("$baseUrl/changelog/$vancedVersion.json", "message")
                 view.findViewById<TextView>(R.id.vanced_changelog).text = changelog
             }
         }

app/src/main/java/com/vanced/manager/ui/fragments/VancedLanguageSelectionFragment.kt

@@ -1,6 +1,7 @@
 package com.vanced.manager.ui.fragments
 
 import android.content.Context
+import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -15,6 +16,7 @@ import androidx.preference.PreferenceManager
 import com.google.android.material.button.MaterialButton
 import com.google.android.material.checkbox.MaterialCheckBox
 import com.vanced.manager.R
+import com.vanced.manager.core.downloader.VancedDownloadService
 import com.vanced.manager.utils.InternetTools.baseUrl
 import com.vanced.manager.utils.JsonHelper.getJson
 import kotlinx.coroutines.*
@@ -47,9 +49,8 @@ class VancedLanguageSelectionFragment : Fragment() {
                         chosenLangs.add(lang)
                     }
                 }
-            val sharedPrefs = activity?.getSharedPreferences("installPrefs", Context.MODE_PRIVATE)?.edit()
-            sharedPrefs?.putString("lang", chosenLangs.joinToString())?.apply()
-            sharedPrefs?.putBoolean("isInstalling", true)?.apply()
+            activity?.getSharedPreferences("installPrefs", Context.MODE_PRIVATE)?.edit()?.putString("lang", chosenLangs.joinToString())?.apply()
+            activity?.startService(Intent(activity, VancedDownloadService::class.java))
             view.findNavController().navigate(R.id.action_installTo_homeFragment)
         }
     }

app/src/main/res/layout/fragment_home.xml

@@ -12,14 +12,14 @@
 
     </data>
 
-    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+    <com.vanced.manager.ui.core.SlidingSwipeRefreshLayout
         android:id="@+id/home_refresh"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         bind:refreshing="@{viewModel.fetching}"
         bind:onRefreshListener="@{()-> viewModel.fetchData()}">
 
-        <com.vanced.manager.ui.core.SlidingNestedScrollView
+        <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:animateLayoutChanges="true"
@@ -133,8 +133,8 @@
 
             </LinearLayout>
 
-        </com.vanced.manager.ui.core.SlidingNestedScrollView>
+        </androidx.core.widget.NestedScrollView>
 
-    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+    </com.vanced.manager.ui.core.SlidingSwipeRefreshLayout>
 
 </layout>