diff --git a/app/src/main/java/com/vanced/manager/core/base/BaseFragment.kt b/app/src/main/java/com/vanced/manager/core/base/BaseFragment.kt index f427e5cb..01ae5c0f 100644 --- a/app/src/main/java/com/vanced/manager/core/base/BaseFragment.kt +++ b/app/src/main/java/com/vanced/manager/core/base/BaseFragment.kt @@ -53,7 +53,7 @@ open class BaseFragment : Fragment() { @SuppressLint("SdCardPath") fun isRootVancedInstalled(): Boolean { - val file = File("/data/data/com.google.android.youtube/shared_prefs/youtube_vanced.xml") + val file = File("/data/data/com.google.android.youtube/shared_prefs/", "youtube_vanced.xml") return activity?.packageManager?.let { isPackageInstalled("com.google.android.youtube", it 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 e2db1cf8..1562fa0e 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 @@ -68,7 +68,14 @@ open class Home : BaseFragment() { } catch (e: Exception) { Log.d("VMCache", "Unable to delete cacheDir") } - view.findNavController().navigate(R.id.toInstallThemeFragment) + if (prefs.getBoolean("valuesModified", false)) { + val loadBar = view.findViewById(R.id.vanced_progress) + val dlText = view.findViewById(R.id.vanced_downloading) + val loadCircle = view.findViewById(R.id.vanced_installing) + downloadArch(loadBar!!, dlText!!, loadCircle!!) + prefs.edit().putBoolean("isInstalling", false).apply() + } else + view.findNavController().navigate(R.id.toInstallThemeFragment) } else { Toast.makeText(activity, "Please wait until installation finishes", Toast.LENGTH_SHORT).show() } @@ -118,18 +125,25 @@ open class Home : BaseFragment() { microgsettingsbtn.visibility = View.INVISIBLE microguninstallbtn.visibility = View.INVISIBLE microgVerText.text = getString(R.string.unavailable) - vancedinstallbtn.isEnabled = PreferenceManager.getDefaultSharedPreferences(activity).getString("vanced_variant", "Nonroot") != "Nonroot" - if (!vancedinstallbtn.isEnabled) { - vancedinstallbtn.setBackgroundColor(R.attr.colorDisabled) - vancedinstallbtn.setTextColor(R.attr.colorDisabledVariant) - } + vancedinstallbtn.visibility = + if (PreferenceManager.getDefaultSharedPreferences(activity).getString("vanced_variant", "Nonroot") == "Nonroot") + View.GONE + else + View.VISIBLE } val vancedVerText = view.findViewById(R.id.vanced_installed_version) if (vancedStatus!!) { - val vancedVer = pm.getPackageInfo("com.vanced.android.youtube", 0).versionName + val vancedVer = + if (PreferenceManager.getDefaultSharedPreferences(activity).getString("vanced_variant", "Nonroot") == "Root") + pm.getPackageInfo("com.google.android.youtube", 0).versionName + else + pm.getPackageInfo("com.vanced.android.youtube", 0).versionName vanceduninstallbtn.setOnClickListener { - uninstallApk("com.vanced.android.youtube") + if (PreferenceManager.getDefaultSharedPreferences(activity).getString("vanced_variant", "Nonroot") == "Root") + uninstallApk("com.vanced.android.youtube") + else + uninstallApk("com.google.android.youtube") } vancedVerText.text = vancedVer } else { diff --git a/app/src/main/java/com/vanced/manager/core/fragments/LanguageInstall.kt b/app/src/main/java/com/vanced/manager/core/fragments/LanguageInstall.kt index af8e381d..db7616b6 100644 --- a/app/src/main/java/com/vanced/manager/core/fragments/LanguageInstall.kt +++ b/app/src/main/java/com/vanced/manager/core/fragments/LanguageInstall.kt @@ -28,6 +28,7 @@ open class LanguageInstall : BaseFragment() { val selectedButton = view.findViewById(selectedLangId) prefs?.edit()?.putString("lang", selectedButton.tag.toString())?.apply() prefs?.edit()?.putBoolean("isInstalling", true)?.apply() + prefs?.edit()?.putBoolean("valuesModified", true)?.apply() view.findNavController().navigate(R.id.action_installTo_homeFragment) } 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 a5b8887d..ddb24ad8 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 @@ -43,6 +43,7 @@ class ChosenPreferenceDialogFragment : DialogFragment() { resetbtn.setOnClickListener { prefs?.edit()?.putString("theme", "dark")?.apply() prefs?.edit()?.putString("lang", "en")?.apply() + prefs?.edit()?.putBoolean("valuesModified", false)?.apply() dismiss() } 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 2b3ef840..242d12d8 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 @@ -48,7 +48,7 @@ class HomeFragment : Home() { val variantPref = getDefaultSharedPreferences(activity).getString("vanced_variant", "Nonroot") val microgWrapper = view.findViewById(R.id.home_microg_wrapper) - if (variantPref == "root") { + if (variantPref == "Root") { activity?.runOnUiThread { microgWrapper.visibility = View.GONE } diff --git a/app/src/main/java/com/vanced/manager/ui/fragments/HomeViewModel.kt b/app/src/main/java/com/vanced/manager/ui/fragments/HomeViewModel.kt deleted file mode 100644 index dd988f95..00000000 --- a/app/src/main/java/com/vanced/manager/ui/fragments/HomeViewModel.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.vanced.manager.ui.fragments - -/* -import android.app.Activity -import android.app.Application -import android.content.pm.PackageManager -import androidx.lifecycle.AndroidViewModel -import androidx.lifecycle.ViewModel -import com.dezlum.codelabs.getjson.GetJson -import com.google.gson.JsonObject - -class HomeViewModel(application: Application): AndroidViewModel(application) { - - private val pm: PackageManager? = Activity().packageManager - - //we need to check whether these apps are installed or not - val microgStatus: Boolean? = pm?.let { isPackageInstalled("com.mgoogle.android.gms", it) } - val vancedStatus: Boolean? = pm?.let { isPackageInstalled("com.vanced.android.youtube", it) } - - private fun isPackageInstalled(packageName: String, packageManager: PackageManager): Boolean { - return try { - packageManager.getPackageInfo(packageName, 0) - true - } catch (e: PackageManager.NameNotFoundException) { - false - } - } - - val microgInstalledTxt: String? = pm?.getPackageInfo("com.mgoogle.android.gms", 0)?.versionName - val vancedInstalledTxt: String? = pm?.getPackageInfo("com.vanced.android.youtube", 0)?.versionName - - - val isConnected: Boolean = GetJson().isConnected(getApplication()) - private val vancedVer: JsonObject = GetJson().AsJSONObject("https://x1nto.github.io/VancedFiles/vanced.json") - private val microgVer: JsonObject = GetJson().AsJSONObject("https://x1nto.github.io/VancedFiles/microg.json") - val vancedLatestTxt: String? = vancedVer.get("version").asString - val microgLatestTxt: String? = microgVer.get("version").asString - -} - */ diff --git a/app/src/main/java/com/vanced/manager/ui/fragments/SettingsFragment.kt b/app/src/main/java/com/vanced/manager/ui/fragments/SettingsFragment.kt index c9101810..0444cf9f 100644 --- a/app/src/main/java/com/vanced/manager/ui/fragments/SettingsFragment.kt +++ b/app/src/main/java/com/vanced/manager/ui/fragments/SettingsFragment.kt @@ -41,7 +41,7 @@ class SettingsFragment : PreferenceFragmentCompat() { installMode?.summary = preferenceScreen.sharedPreferences.getString("vanced_variant", "Nonroot") installMode?.setOnPreferenceChangeListener{ _, _ -> when (installMode.value) { - "Root" -> { + "Nonroot" -> { if (!Shell.rootAccess()) { preferenceScreen.sharedPreferences.edit().putString("vanced_variant", "Nonroot").apply() } diff --git a/app/src/main/res/drawable-nodpi/logo.png b/app/src/main/res/drawable-nodpi/logo.png deleted file mode 100644 index f94c72a4..00000000 Binary files a/app/src/main/res/drawable-nodpi/logo.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_assignment_black_24dp.xml b/app/src/main/res/drawable/ic_assignment_black_24dp.xml deleted file mode 100644 index 17090a4e..00000000 --- a/app/src/main/res/drawable/ic_assignment_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_home_black_24dp.xml b/app/src/main/res/drawable/ic_home_black_24dp.xml deleted file mode 100755 index 54f031f1..00000000 --- a/app/src/main/res/drawable/ic_home_black_24dp.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_language_black_24dp.xml b/app/src/main/res/drawable/ic_language_black_24dp.xml deleted file mode 100644 index 9b5e2c86..00000000 --- a/app/src/main/res/drawable/ic_language_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_navigate_next_black_24dp.xml b/app/src/main/res/drawable/ic_navigate_next_black_24dp.xml deleted file mode 100644 index 24835127..00000000 --- a/app/src/main/res/drawable/ic_navigate_next_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml index c622cea2..39049491 100644 --- a/app/src/main/res/layout/fragment_about.xml +++ b/app/src/main/res/layout/fragment_about.xml @@ -17,27 +17,23 @@ android:orientation="vertical"> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 4eabe7ea..27311f62 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -25,7 +25,6 @@ tools:visibility="visible"/> diff --git a/app/src/main/res/layout/fragment_vanced_changelog.xml b/app/src/main/res/layout/fragment_vanced_changelog.xml index 972754a8..b8ad2473 100644 --- a/app/src/main/res/layout/fragment_vanced_changelog.xml +++ b/app/src/main/res/layout/fragment_vanced_changelog.xml @@ -7,7 +7,6 @@ tools:context=".ui.fragments.VancedChangelogFragment"> - - diff --git a/app/src/main/res/layout/fragment_vanced_theme_selection.xml b/app/src/main/res/layout/fragment_vanced_theme_selection.xml index 3f0e48aa..9fffcb26 100644 --- a/app/src/main/res/layout/fragment_vanced_theme_selection.xml +++ b/app/src/main/res/layout/fragment_vanced_theme_selection.xml @@ -16,7 +16,6 @@ android:orientation="vertical"> @@ -36,7 +35,6 @@ android:fontFamily="@font/exo_semibold"/> - - diff --git a/app/src/main/res/layout/fragment_vanced_variant_selection.xml b/app/src/main/res/layout/fragment_vanced_variant_selection.xml deleted file mode 100644 index 5ba5769a..00000000 --- a/app/src/main/res/layout/fragment_vanced_variant_selection.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/include_about_header.xml b/app/src/main/res/layout/include_about_header.xml index 4e22d073..73db7ddd 100644 --- a/app/src/main/res/layout/include_about_header.xml +++ b/app/src/main/res/layout/include_about_header.xml @@ -7,7 +7,6 @@ app:cardCornerRadius="8dp"> diff --git a/app/src/main/res/layout/include_vanced.xml b/app/src/main/res/layout/include_vanced.xml index 09b4952b..48b5490e 100644 --- a/app/src/main/res/layout/include_vanced.xml +++ b/app/src/main/res/layout/include_vanced.xml @@ -26,7 +26,6 @@ diff --git a/app/src/main/res/menu/bottom_nav_menu.xml b/app/src/main/res/menu/bottom_nav_menu.xml deleted file mode 100644 index 6fcf320d..00000000 --- a/app/src/main/res/menu/bottom_nav_menu.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml index d8404e46..fb2268f1 100644 --- a/app/src/main/res/navigation/mobile_navigation.xml +++ b/app/src/main/res/navigation/mobile_navigation.xml @@ -3,7 +3,6 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" - android:id="@+id/mobile_navigation" app:startDestination="@id/home_fragment"> اغلق "عناصر ناأبة " - عناصر ناأبة مرحبا اهلا - وبس! "معاومات @@ -18,19 +16,15 @@ اعادات - صفحة Braveصفحة برايف "معلومات التغير " تثبيت مثبتة آخر: جار التحميل… - ن/أ اتصاا الشبكة غير متاح - Redditرددت تحديث روابط المفيدة Vanced على توصيل اجتماعي فانسد على توصيل اجتماعي - موقع الموقع رسمي لفانسد ادعمنا بتريق تنزيل بريف @@ -58,12 +52,9 @@ اختر اللغة المفضلة لفانسد لاحظة: اذا قمت تثبيت بأي لغة غير الانجليزية، سيكون اللغة الانجليزية مثبتة بللغة اضافية اختر موضوع اللون المفضلة لفانسد - اختر بديل مفضلة لفانسد نهاية ابيض + اسود ابيض + داكن - غيز-جذر - جذر ثانية diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index c78ef083..dfc9e393 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -3,9 +3,7 @@ Fermer - Je sais pas comment mais vous avez installé Vanced Manager sur une version Android non supportée. L\'application va se fermer. Bienvenue - Oups! À propos @@ -14,19 +12,15 @@ Paramètres - Navigateur Brave Journal des modifications Installer Version installée: Dernière version: Chargement… - N/A Connection réseau indisponible - Reddit Mettre à jour Liens utiles Vanced sur les Résaux Sociaux - Site web Le site web officiel de Vanced Supporte nous en téléchargeant Brave @@ -53,12 +47,9 @@ Choisir votre langue préférée pour Vanced Note: si vous installer autre chose que l\'anglais, l\'anglais sera toujours installé en langue additionnelle Choisis le thème de Vanced - Choisis la variante de Vanced Terminer Clair + Sombre Clair + Noir - Non rooté - Rooté Suivant diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 13435759..a276c93d 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -3,7 +3,6 @@ बंद करे कृपया सुनिश्चित करें कि आपने vanced.app, Vanced Discord सर्वर या GitHub से ऐप डाउनलोड किया है - मुझे नहीं पता कि आपने असमर्थित Android संस्करण पर कैसे संभवत: Vanced Manager स्थापित किया है। ऐप अब बंद हो जाएगा स्वागत हे diff --git a/app/src/main/res/values-ka/strings.xml b/app/src/main/res/values-ka/strings.xml index 53c8bcee..e3160af9 100644 --- a/app/src/main/res/values-ka/strings.xml +++ b/app/src/main/res/values-ka/strings.xml @@ -4,9 +4,7 @@ დახურვა გთხოვთ დარწმუნდით რომ აპი გადმოწერეთ vanced.app-იდან, Vanced Discord სერვერიდან ან GitHub-იდან - არ ვიცი როგორ მაგრამ თქვენ როგორღაც დააყენეთ Vanced Manager-ი ძველ Android-ის ვერსიაზე. აპი დაიხურება მოგესალმებით - უფს! შესახებ @@ -15,21 +13,17 @@ პარამეტრები - Brave Browser ცვლილებები ინსტალაცია დაინსტალირებული: დაინსტალირებულია უახლესი: იტვირთება… - N/A კავშირი არ არის - Reddit ხელმიუწვდომელია განახლება საჭირო ლინკები Vanced სოციალურ ქსელებზე - Website Vanced-ის ოფიციალური ვებსაიტი დაგვიჭირეთ მხარი Brave-ის გადმოწერით @@ -57,12 +51,9 @@ აირჩიეთ სასურველი ენა Vanced-ისთვის შენიშვნა: თუ თქვენ აირჩევთ სხვა ენას გარდა ინგლისურისა, ინგლისური მაინც იქნება დაყენებული როგორც დამატებითი ენა აირჩიეთ სასურველი თემა Vanced-ისთვის - აირჩიეთ სასურველი ვარიანტი Vanced-სთვის დასრულება ღია + შავი ღია + მუქი - Non-root - Root შემდეგი diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 7e476511..6d139c0b 100755 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -4,9 +4,7 @@ Fechar Verifique se você baixou o aplicativo do vanced.app, Vanced Discord ou GitHub - Não sei como, mas você provavelmente instalou o Vanced Manager na versão Android não suportada. O aplicativo será fechado agora Bem-Vindo - Whoops! Sobre @@ -15,19 +13,15 @@ Configurações - Navegador Brave Notas de Lançamento Instalar Instalado: Mais Recente: Carregando… - N/A Conexão de rede indisponível - Reddit Atualizar Links Importantes Vanced nas Redes Sociais - Website Site oficial do Vanced @@ -55,12 +49,9 @@ Escolhe tua língua preferida para o Vanced Nota: Se você instalar algo diferente de Inglês, Inglês será instalado como um idioma adicional Escolhe teu tema preferido para o Vanced - Escolhe tua variação preferida para o Vanced Terminar Claro + Preto Claro + Escuro - Não Roteado - Roteado Próximo diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 7030c3d9..2c726862 100755 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -4,9 +4,7 @@ Kapat Lütfen, uygulamayı vanced.app\'den, Vanced Discord sunucu\'sundan veya GitHub\'dan indirdiğinize emin olun. - Vanced Manager bir şekilde desteklenmeyen bir Android sürümüne kurulmuş. Şimdi uygulama kapanacak. Hoşgeldin - Hay Aksi! Hakkında @@ -15,19 +13,15 @@ Ayarlar - Brave Tarayıcısı Değişim Kaydı Yüklemek Yüklendi: En Son: Yükleniyor… - Kullanılamaz Ağ bağlantısı yok - Reddit Güncellemek Faydalı Bağlantılar Sosyal Medyada Vanced - Web Sitesi Vanced\'in resmi web sitesi Brave Tarayıcısı\'nı indirerek bizi destekleyebilirsiniz @@ -55,12 +49,9 @@ Vanced için tercih ettiğiniz dili seçin Uyarı: Eğer İngilizceden farklı bir dil yüklerseniz, İngilizce yine de ikinci dil olarak yüklü kalacaktır Vanced için tercih ettiğiniz temayı seçin - Tercih ettiğiniz Vanced varyantını seçin Bitir Aydınlık + Siyah Aydınlık + Karanlık - Rootlanmamış - Root Sonraki diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index ea0d79e2..f31cbc2e 100755 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -4,9 +4,7 @@ Закрити Будь ласка, переконайтеся,що ви завантажили додаток з vanced.app,Vanced діскорд серверу або з GitHub - Ви,напевно,встановили Vanced Manager на непідтримувану версію Андроїда.Додаток зараз закриється Ласкаво просимо - "Уупс!" Про нас @@ -15,19 +13,15 @@ Налаштування - Brave Браузер Список змін Встановити Встановлено: Найновіші: Завантаження… - Недоступно Немає з\'єднання з мережею - Reddit Оновлення Корисні сторінки Vanced в соціальних мережах - Веб-сайт Офіційний веб-сайт Vanced Підтримай нас завантаживши браузер Brave @@ -55,12 +49,9 @@ Виберіть вашу головну мову для Vanced Примітка: Якщо ви встановите що-небудь, крім Англійської, Англійська мова все одно буде встановлена як додаткова мова Виберіть вашу головну тему для Vanced - Виберіть вашу версію для Vanced Завершити Світла + Чорна Світла + Темна - Не рут - Рут Наступна diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index 150f8ae4..86891951 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -30,8 +30,8 @@ - non-root - root + Non-root + Root diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 2b0fa0d3..ebab9427 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,8 +1,6 @@ - #ffffff #673AB7 - #8B0B0B #FF2600 #7289DA #1DA1F2 @@ -11,7 +9,6 @@ #17191A #000000 - #ffffff #CC0047 diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 696089e5..2f8f953f 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -1,14 +1,8 @@ - 16dp - 16dp - 2dp - 4dp 8dp 12dp 16dp - 32dp - 48dp diff --git a/app/src/main/res/values/resources.xml b/app/src/main/res/values/resources.xml index 4900774a..ce586d04 100644 --- a/app/src/main/res/values/resources.xml +++ b/app/src/main/res/values/resources.xml @@ -2,9 +2,6 @@ Vanced Manager - Discord - Telegram - Twitter Vanced MicroG diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 27f18cbf..739ce60a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -4,9 +4,7 @@ Close Please make sure you downloaded app from vanced.app, Vanced Discord server or GitHub - I don\'t know how but you probably installed Vanced Manager on unsupported Android version. The app will now close Welcome - Whoops! About @@ -15,21 +13,17 @@ Settings - Brave Browser Changelogs Install Installed: Installed Latest: Loading… - N/A Network connection unavailable - Reddit Unavailable Update Useful Links Vanced on Social Media - Website The official website of Vanced Support us by downloading Brave @@ -57,12 +51,9 @@ Choose your preferred language for Vanced Note: if you install anything other than English, English will still be installed as an additional language Choose your preferred theme for Vanced - Choose your preferred variant for Vanced Finish Light + Black Light + Dark - Non-root - Root Next