From c493b4fa77e377af99f6d6cb6c4762b1d0fb36d8 Mon Sep 17 00:00:00 2001 From: X1nto Date: Tue, 2 Jun 2020 17:26:40 +0400 Subject: [PATCH] resource cleanup --- .../vanced/manager/core/base/BaseFragment.kt | 2 +- .../com/vanced/manager/core/fragments/Home.kt | 30 +++++--- .../manager/core/fragments/LanguageInstall.kt | 1 + .../ChosenPreferenceDialogFragment.kt | 1 + .../manager/ui/fragments/HomeFragment.kt | 2 +- .../manager/ui/fragments/HomeViewModel.kt | 40 ----------- .../manager/ui/fragments/SettingsFragment.kt | 2 +- app/src/main/res/drawable-nodpi/logo.png | Bin 33002 -> 0 bytes .../res/drawable/ic_assignment_black_24dp.xml | 9 --- .../main/res/drawable/ic_home_black_24dp.xml | 10 --- .../res/drawable/ic_language_black_24dp.xml | 9 --- .../drawable/ic_navigate_next_black_24dp.xml | 9 --- app/src/main/res/layout/fragment_about.xml | 4 -- .../layout/fragment_chosen_preferences.xml | 2 - app/src/main/res/layout/fragment_home.xml | 3 - .../res/layout/fragment_microg_changelog.xml | 1 - .../main/res/layout/fragment_update_check.xml | 2 - .../res/layout/fragment_vanced_changelog.xml | 1 - .../fragment_vanced_language_selection.xml | 13 ---- .../fragment_vanced_theme_selection.xml | 12 ---- .../fragment_vanced_variant_selection.xml | 68 ------------------ .../main/res/layout/include_about_header.xml | 2 - .../main/res/layout/include_about_sources.xml | 1 - .../layout/include_language_scrollview.xml | 25 ------- app/src/main/res/layout/include_microg.xml | 3 - .../main/res/layout/include_network_error.xml | 1 - .../main/res/layout/include_useful_links.xml | 2 - app/src/main/res/layout/include_vanced.xml | 3 - .../main/res/layout/include_vanced_medias.xml | 3 - app/src/main/res/menu/bottom_nav_menu.xml | 13 ---- .../main/res/navigation/mobile_navigation.xml | 3 - app/src/main/res/values-ar/strings.xml | 9 --- app/src/main/res/values-fr/strings.xml | 9 --- app/src/main/res/values-hi/strings.xml | 1 - app/src/main/res/values-ka/strings.xml | 9 --- app/src/main/res/values-pt-rPT/strings.xml | 9 --- app/src/main/res/values-tr/strings.xml | 9 --- app/src/main/res/values-uk/strings.xml | 9 --- app/src/main/res/values/arrays.xml | 4 +- app/src/main/res/values/colors.xml | 3 - app/src/main/res/values/dimens.xml | 6 -- app/src/main/res/values/resources.xml | 3 - app/src/main/res/values/strings.xml | 9 --- 43 files changed, 29 insertions(+), 328 deletions(-) delete mode 100644 app/src/main/java/com/vanced/manager/ui/fragments/HomeViewModel.kt delete mode 100644 app/src/main/res/drawable-nodpi/logo.png delete mode 100644 app/src/main/res/drawable/ic_assignment_black_24dp.xml delete mode 100755 app/src/main/res/drawable/ic_home_black_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_language_black_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_navigate_next_black_24dp.xml delete mode 100644 app/src/main/res/layout/fragment_vanced_variant_selection.xml delete mode 100644 app/src/main/res/menu/bottom_nav_menu.xml 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 f94c72a49bbfac590791ea61da273f644c3f318c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 33002 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 hUKy)e64BdmZ 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�ECD%)(i(>33r($bTlTD-Y&#%T3cuI_a-O3uZe1pzaH-SPBs zQA<`ngQwdBiI?SG?k@k6k2VZy7M;fH*j8wY_kj-l@_kz%TbW! z%C)*&^S&=alg!yMaza{F8Pi_fx2s^|tn&nGluTKVl&wqTJcF*jC0N_f7**UkV_fms zX4l;rb*2kN5Oev}A%?SMx+kxyTc=32q?{;Ge^D|Vw+!Mkh%0m&McmkcLO7dhQp8R1 zv!47h!OuqgSl}m~D$T_+%-=47rc4avSu^k*62e1-Et2N?6^xfrd5|HluSpr>MvfGk zfBL%ccXOx_acr?HSD9s~iB|v?EHa9 zUSgR1EifQQhEUz2CLIv|X{6wO;XEP*S?^Mn!sIj+&KoQwuAM8bH%Q80@C<2piqI`? z=P(N=$6{Y^^W`CohUGO=&K49<66Pc8xwXN#WEmu|UY~i<{^YjQs|@qI(486FtV;it z!Y(eIA{A1bcMbb7GIOKCc!>RO{Mr>#XN(EAOTivlLB$A}DcvK*br#DcX*^D_L6h^|=?gpuv#8YRt?^NxGCSwY|3n_tu9Szf3=yTeR|pdHW>c5$tiXH6f$ zpP*RQtr~{U4rSt&A&qh^`l#cKK400qPryJJi$J>$%u%;;_Rlz89AhU&=e(hXguL} zF+!hFrYiY0vrQ+Pgo$S#djp+#Rc>)TMMc$3He19x4oLUio5$rseRE^w_PqQ##OOj< zuBEI6EyUM5_pbQv8q=!yg~14RImi%M-44&U;$&K_G+KICf?@gr+A-@MG+%Uhw2 z^lK436?Y}ix-KmlagZiDMTm&xpC+H`9X)4XAg**h3iJ$GX++Ewi6EHP*!2VarhJ~< zPa|A-Dsrpwf^)J`m}F%0qJ>=D>s2Z33sGGG^>XATxrW^Fv;XCE({vXj(TYp_Mu`56 z2eelNdvc#OSEVHQAv?%q!JawM*L=1c6MUlq<(cbdpB?m^M&cww($PlTP{+}8;?X&x z?D6vhA%=DZ+^icIaIB4u_?LCF&kMEkF^idayJlMpiQ{~U1LkNl$?Q!_b7c2nnToYX z=6SjWiV!dGw7H7 z;KiNfv7hfU38~QBux9(b+<8Pd0EoK2kGIf9r+T4XD{G1SG$*|~==9wcB2s3UpS8ur zuGKbf(PFM0A>LuWXy1J+g+7S(cbjgYJTq8IarurP@wFQ$hefk)wDH{KXYpc1?USLi zUHh2W*Y1~D)n&hPw+Im?k5|!|U!%7=swo9zD`)HI>CZkR>w5l8J&~}0e9ioJj{T{{ z3-c8&#hRb+-(xW+|88o*B4X$mre0>bDz4#Pzj%2}9FIT4ZO)pdDWSNmh@P22K(#|- zJ{J;rx@LzG3C1Y>bt&)7BHNBxR~-F=w(}bjs;a~M#Is}#{WSjIgH>sR-_vK*(Laqz z>Awi~M#9=Gx$#zi5>IZ?sqNWyO`Cy8OJ}qbCiRhApHL{UaZV$$drs~ZtCXM34R$*b-zkS zDrR4?F8O$y)x?tJ!=jJ8KE5d_%kXI7CPslxiJ7Yut~Mu#WxRCz_47!n=IY_737s9O z=E}`CEk;ihtZ5j=feX*3-`clR>7{$Q;Kr_E*t~xCl+M;CDon8qE~;@{?=!yNcJw&( zRXMX>t2x~@gGu>#YxGOW#AFZNTmWq&Sf-z1eO475?y-x|Z>;Yh(ixk(dIr5b@VP0K faH;(>+l5#t-uuq2bj>BmN`$GQxk2VSmlOX7lXrXY 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