diff --git a/app/src/main/java/com/vanced/manager/core/fragments/Home.kt b/app/src/main/java/com/vanced/manager/core/fragments/Home.kt index 9a1240bb..6693d75a 100644 --- a/app/src/main/java/com/vanced/manager/core/fragments/Home.kt +++ b/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") diff --git a/app/src/main/java/com/vanced/manager/ui/core/SlidingNestedScrollView.kt b/app/src/main/java/com/vanced/manager/ui/core/SlidingSwipeRefreshLayout.kt similarity index 84% rename from app/src/main/java/com/vanced/manager/ui/core/SlidingNestedScrollView.kt rename to app/src/main/java/com/vanced/manager/ui/core/SlidingSwipeRefreshLayout.kt index 9492e41b..144591fe 100644 --- a/app/src/main/java/com/vanced/manager/ui/core/SlidingNestedScrollView.kt +++ b/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!!, diff --git a/app/src/main/java/com/vanced/manager/ui/core/SplashScreenActivity.kt b/app/src/main/java/com/vanced/manager/ui/core/SplashScreenActivity.kt index 303e681b..7d2b5f83 100644 --- a/app/src/main/java/com/vanced/manager/ui/core/SplashScreenActivity.kt +++ b/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)) diff --git a/app/src/main/java/com/vanced/manager/ui/fragments/ChosenPreferenceDialogFragment.kt b/app/src/main/java/com/vanced/manager/ui/fragments/ChosenPreferenceDialogFragment.kt index e105f45e..983653a9 100644 --- a/app/src/main/java/com/vanced/manager/ui/fragments/ChosenPreferenceDialogFragment.kt +++ b/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() + 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 { diff --git a/app/src/main/java/com/vanced/manager/ui/fragments/HomeFragment.kt b/app/src/main/java/com/vanced/manager/ui/fragments/HomeFragment.kt index e42f2fda..55e81536 100644 --- a/app/src/main/java/com/vanced/manager/ui/fragments/HomeFragment.kt +++ b/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") } } diff --git a/app/src/main/java/com/vanced/manager/ui/fragments/VancedChangelogFragment.kt b/app/src/main/java/com/vanced/manager/ui/fragments/VancedChangelogFragment.kt index 850407ac..e64445e0 100644 --- a/app/src/main/java/com/vanced/manager/ui/fragments/VancedChangelogFragment.kt +++ b/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(R.id.vanced_changelog).text = changelog } } diff --git a/app/src/main/java/com/vanced/manager/ui/fragments/VancedLanguageSelectionFragment.kt b/app/src/main/java/com/vanced/manager/ui/fragments/VancedLanguageSelectionFragment.kt index 6cfbf6cb..5046ffe3 100644 --- a/app/src/main/java/com/vanced/manager/ui/fragments/VancedLanguageSelectionFragment.kt +++ b/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) } } diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 8eaa6c41..43d4254e 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -12,14 +12,14 @@ - - - + - + \ No newline at end of file