From 23ad56b18908bd9513ceeed722b0fe0a5fb272d0 Mon Sep 17 00:00:00 2001 From: Aayush Gupta Date: Mon, 24 Jul 2023 23:19:00 +0530 Subject: [PATCH 01/14] mobile_navigation: Relocate global actions on top Signed-off-by: Aayush Gupta --- .../main/res/navigation/mobile_navigation.xml | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml index 10bcc8694..62b2ae3e2 100644 --- a/app/src/main/res/navigation/mobile_navigation.xml +++ b/app/src/main/res/navigation/mobile_navigation.xml @@ -23,6 +23,27 @@ android:id="@+id/mobile_navigation" app:startDestination="@id/splashFragment"> + + + + + + + - - - - - - - From a8f5f27fb4059a68f6adcab92de6fbeb110d3834 Mon Sep 17 00:00:00 2001 From: Aayush Gupta Date: Mon, 24 Jul 2023 23:48:20 +0530 Subject: [PATCH 02/14] TOSSheet: Migrate to navigation components Signed-off-by: Aayush Gupta --- .../main/java/com/aurora/store/MainActivity.kt | 12 ------------ .../view/ui/onboarding/OnboardingFragment.kt | 4 ++++ .../com/aurora/store/view/ui/sheets/TOSSheet.kt | 15 +++------------ app/src/main/res/navigation/mobile_navigation.xml | 5 +++++ 4 files changed, 12 insertions(+), 24 deletions(-) diff --git a/app/src/main/java/com/aurora/store/MainActivity.kt b/app/src/main/java/com/aurora/store/MainActivity.kt index cb29b5e0c..f7c9d6738 100644 --- a/app/src/main/java/com/aurora/store/MainActivity.kt +++ b/app/src/main/java/com/aurora/store/MainActivity.kt @@ -58,14 +58,12 @@ import com.aurora.store.util.Log import com.aurora.store.util.Preferences import com.aurora.store.view.ui.sheets.NetworkDialogSheet import com.aurora.store.view.ui.sheets.SelfUpdateSheet -import com.aurora.store.view.ui.sheets.TOSSheet import com.aurora.store.viewmodel.MainViewModel import com.bumptech.glide.load.resource.bitmap.RoundedCorners import com.google.android.material.bottomnavigation.BottomNavigationView import com.google.android.material.elevation.SurfaceColors import com.google.gson.Gson import com.google.gson.GsonBuilder -import kotlinx.coroutines.flow.drop import kotlinx.coroutines.launch import java.lang.reflect.Modifier @@ -159,16 +157,6 @@ class MainActivity : AppCompatActivity(), NetworkProvider.NetworkListener { attachDrawer() attachSearch() - if (!Preferences.getBoolean(this, Preferences.PREFERENCE_TOS_READ)) { - runOnUiThread { - if (!supportFragmentManager.isDestroyed) { - val sheet = TOSSheet.newInstance() - sheet.isCancelable = false - sheet.show(supportFragmentManager, TOSSheet.TAG) - } - } - } - /*Check only if download to external storage is enabled*/ if (Preferences.getBoolean(this, Preferences.PREFERENCE_DOWNLOAD_EXTERNAL)) { if (isRAndAbove()) { diff --git a/app/src/main/java/com/aurora/store/view/ui/onboarding/OnboardingFragment.kt b/app/src/main/java/com/aurora/store/view/ui/onboarding/OnboardingFragment.kt index aab5517d7..310018185 100644 --- a/app/src/main/java/com/aurora/store/view/ui/onboarding/OnboardingFragment.kt +++ b/app/src/main/java/com/aurora/store/view/ui/onboarding/OnboardingFragment.kt @@ -75,6 +75,10 @@ class OnboardingFragment : Fragment(R.layout.fragment_onboarding) { binding.btnBackward.setOnClickListener { moveBackward() } + + if (!Preferences.getBoolean(view.context, Preferences.PREFERENCE_TOS_READ)) { + findNavController().navigate(R.id.TOSSheet) + } } override fun onDestroyView() { diff --git a/app/src/main/java/com/aurora/store/view/ui/sheets/TOSSheet.kt b/app/src/main/java/com/aurora/store/view/ui/sheets/TOSSheet.kt index db0ba243a..afe03f3ca 100644 --- a/app/src/main/java/com/aurora/store/view/ui/sheets/TOSSheet.kt +++ b/app/src/main/java/com/aurora/store/view/ui/sheets/TOSSheet.kt @@ -34,18 +34,9 @@ class TOSSheet : BaseBottomSheet() { private lateinit var B: SheetTosBinding - companion object { - - const val TAG = "TOSSheet" - - @JvmStatic - fun newInstance(): TOSSheet { - return TOSSheet().apply { - arguments = Bundle().apply { - - } - } - } + override fun onStart() { + super.onStart() + isCancelable = false } override fun onCreateContentView( diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml index 62b2ae3e2..abd062a3c 100644 --- a/app/src/main/res/navigation/mobile_navigation.xml +++ b/app/src/main/res/navigation/mobile_navigation.xml @@ -336,4 +336,9 @@ app:popUpTo="@id/mobile_navigation" app:popUpToInclusive="true" /> + From d5d77cbdc1cbc0d1f392f723888815886bcbe7d7 Mon Sep 17 00:00:00 2001 From: Aayush Gupta Date: Fri, 4 Aug 2023 17:02:14 +0800 Subject: [PATCH 03/14] AppMenuSheet: Migrate to navigation components Signed-off-by: Aayush Gupta --- .../view/ui/all/InstalledAppsFragment.kt | 17 -------- .../view/ui/all/PurchasedAppsFragment.kt | 17 -------- .../store/view/ui/commons/BaseFragment.kt | 4 ++ .../store/view/ui/sheets/AppMenuSheet.kt | 40 +++++++------------ .../store/view/ui/updates/UpdatesFragment.kt | 17 -------- .../main/res/navigation/mobile_navigation.xml | 12 ++++++ 6 files changed, 30 insertions(+), 77 deletions(-) diff --git a/app/src/main/java/com/aurora/store/view/ui/all/InstalledAppsFragment.kt b/app/src/main/java/com/aurora/store/view/ui/all/InstalledAppsFragment.kt index d56c4a307..8ae8185a1 100644 --- a/app/src/main/java/com/aurora/store/view/ui/all/InstalledAppsFragment.kt +++ b/app/src/main/java/com/aurora/store/view/ui/all/InstalledAppsFragment.kt @@ -24,7 +24,6 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.lifecycle.ViewModelProvider -import com.aurora.Constants import com.aurora.gplayapi.data.models.App import com.aurora.store.R import com.aurora.store.databinding.FragmentUpdatesBinding @@ -32,7 +31,6 @@ import com.aurora.store.view.epoxy.views.app.AppListViewModel_ import com.aurora.store.view.epoxy.views.HeaderViewModel_ import com.aurora.store.view.epoxy.views.shimmer.AppListViewShimmerModel_ import com.aurora.store.view.ui.commons.BaseFragment -import com.aurora.store.view.ui.sheets.AppMenuSheet import com.aurora.store.viewmodel.all.InstalledViewModel class InstalledAppsFragment : BaseFragment() { @@ -112,19 +110,4 @@ class InstalledAppsFragment : BaseFragment() { } } } - - private fun openAppMenuSheet(app: App) { - val fragment = childFragmentManager.findFragmentByTag(AppMenuSheet.TAG) - if (fragment != null) - childFragmentManager.beginTransaction().remove(fragment) - - AppMenuSheet().apply { - arguments = Bundle().apply { - putString(Constants.STRING_EXTRA, gson.toJson(app)) - } - }.show( - childFragmentManager, - AppMenuSheet.TAG - ) - } } diff --git a/app/src/main/java/com/aurora/store/view/ui/all/PurchasedAppsFragment.kt b/app/src/main/java/com/aurora/store/view/ui/all/PurchasedAppsFragment.kt index da532c779..9410e20aa 100644 --- a/app/src/main/java/com/aurora/store/view/ui/all/PurchasedAppsFragment.kt +++ b/app/src/main/java/com/aurora/store/view/ui/all/PurchasedAppsFragment.kt @@ -24,7 +24,6 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.lifecycle.ViewModelProvider -import com.aurora.Constants import com.aurora.gplayapi.data.models.App import com.aurora.store.R import com.aurora.store.databinding.FragmentUpdatesBinding @@ -33,7 +32,6 @@ import com.aurora.store.view.epoxy.views.app.AppListViewModel_ import com.aurora.store.view.epoxy.views.HeaderViewModel_ import com.aurora.store.view.epoxy.views.shimmer.AppListViewShimmerModel_ import com.aurora.store.view.ui.commons.BaseFragment -import com.aurora.store.view.ui.sheets.AppMenuSheet import com.aurora.store.viewmodel.all.PurchasedViewModel class PurchasedAppsFragment : BaseFragment() { @@ -126,19 +124,4 @@ class PurchasedAppsFragment : BaseFragment() { } } } - - private fun openAppMenuSheet(app: App) { - val fragment = childFragmentManager.findFragmentByTag(AppMenuSheet.TAG) - if (fragment != null) - childFragmentManager.beginTransaction().remove(fragment) - - AppMenuSheet().apply { - arguments = Bundle().apply { - putString(Constants.STRING_EXTRA, gson.toJson(app)) - } - }.show( - childFragmentManager, - AppMenuSheet.TAG - ) - } } diff --git a/app/src/main/java/com/aurora/store/view/ui/commons/BaseFragment.kt b/app/src/main/java/com/aurora/store/view/ui/commons/BaseFragment.kt index df2d0cae5..291631305 100644 --- a/app/src/main/java/com/aurora/store/view/ui/commons/BaseFragment.kt +++ b/app/src/main/java/com/aurora/store/view/ui/commons/BaseFragment.kt @@ -93,4 +93,8 @@ open class BaseFragment : Fragment { ) ) } + + fun openAppMenuSheet(app: App) { + findNavController().navigate(MobileNavigationDirections.actionGlobalAppMenuSheet(app)) + } } diff --git a/app/src/main/java/com/aurora/store/view/ui/sheets/AppMenuSheet.kt b/app/src/main/java/com/aurora/store/view/ui/sheets/AppMenuSheet.kt index d56746741..e1ac5722b 100644 --- a/app/src/main/java/com/aurora/store/view/ui/sheets/AppMenuSheet.kt +++ b/app/src/main/java/com/aurora/store/view/ui/sheets/AppMenuSheet.kt @@ -33,31 +33,30 @@ import android.view.ViewGroup import androidx.activity.result.contract.ActivityResultContracts import androidx.core.content.ContextCompat import androidx.fragment.app.viewModels -import com.aurora.Constants +import androidx.navigation.fragment.navArgs import com.aurora.extensions.isRAndAbove -import com.aurora.gplayapi.data.models.App +import com.aurora.extensions.openInfo +import com.aurora.extensions.toast import com.aurora.store.R import com.aurora.store.data.event.BusEvent import com.aurora.store.data.installer.AppInstaller import com.aurora.store.data.providers.BlacklistProvider import com.aurora.store.databinding.SheetAppMenuBinding import com.aurora.store.util.PackageUtil -import com.aurora.extensions.openInfo -import com.aurora.extensions.toast import com.aurora.store.viewmodel.sheets.SheetsViewModel import org.greenrobot.eventbus.EventBus class AppMenuSheet : BaseBottomSheet() { private lateinit var B: SheetAppMenuBinding - private lateinit var app: App private val viewModel: SheetsViewModel by viewModels() + private val args: AppMenuSheetArgs by navArgs() private val startForPermissions = registerForActivityResult(ActivityResultContracts.RequestPermission()) { if (it) { - viewModel.copyApk(requireContext(), app.packageName) + viewModel.copyApk(requireContext(), args.app.packageName) } else { toast(R.string.permissions_denied) } @@ -74,20 +73,9 @@ class AppMenuSheet : BaseBottomSheet() { override fun onContentViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - if (arguments != null) { - val bundle = arguments - val stringExtra = bundle!!.getString(Constants.STRING_EXTRA) - app = gson.fromJson(stringExtra, App::class.java) - setupNavigationView() - } else { - dismissAllowingStateLoss() - } - } - - private fun setupNavigationView() { val blacklistProvider = BlacklistProvider.with(requireContext()) - val isBlacklisted: Boolean = blacklistProvider.isBlacklisted(app.packageName) + val isBlacklisted: Boolean = blacklistProvider.isBlacklisted(args.app.packageName) with(B.navigationView) { //Switch strings for Add/Remove Blacklist @@ -100,7 +88,7 @@ class AppMenuSheet : BaseBottomSheet() { ) //Show/Hide actions based on installed status - val installed = PackageUtil.isInstalled(requireContext(), app.packageName) + val installed = PackageUtil.isInstalled(requireContext(), args.app.packageName) menu.findItem(R.id.action_uninstall).isVisible = installed menu.findItem(R.id.action_local).isVisible = installed @@ -109,15 +97,15 @@ class AppMenuSheet : BaseBottomSheet() { R.id.action_blacklist -> { if (isBlacklisted) { - blacklistProvider.whitelist(app.packageName) + blacklistProvider.whitelist(args.app.packageName) requireContext().toast(R.string.toast_apk_whitelisted) } else { - blacklistProvider.blacklist(app.packageName) + blacklistProvider.blacklist(args.app.packageName) requireContext().toast(R.string.toast_apk_blacklisted) } EventBus.getDefault() - .post(BusEvent.Blacklisted(app.packageName, "")) + .post(BusEvent.Blacklisted(args.app.packageName, "")) } R.id.action_local -> { @@ -126,11 +114,11 @@ class AppMenuSheet : BaseBottomSheet() { R.id.action_uninstall -> { AppInstaller.getInstance(requireContext()) - .getPreferredInstaller().uninstall(app.packageName) + .getPreferredInstaller().uninstall(args.app.packageName) } R.id.action_info -> { - requireContext().openInfo(app.packageName) + requireContext().openInfo(args.app.packageName) } } dismissAllowingStateLoss() @@ -144,7 +132,7 @@ class AppMenuSheet : BaseBottomSheet() { if (!Environment.isExternalStorageManager()) { startActivity(Intent(Settings.ACTION_MANAGE_ALL_FILES_ACCESS_PERMISSION)) } else { - viewModel.copyApk(requireContext(), app.packageName) + viewModel.copyApk(requireContext(), args.app.packageName) } } else { if (ContextCompat.checkSelfPermission( @@ -152,7 +140,7 @@ class AppMenuSheet : BaseBottomSheet() { Manifest.permission.WRITE_EXTERNAL_STORAGE ) == PackageManager.PERMISSION_GRANTED ) { - viewModel.copyApk(requireContext(), app.packageName) + viewModel.copyApk(requireContext(), args.app.packageName) } else { startForPermissions.launch(Manifest.permission.WRITE_EXTERNAL_STORAGE) } diff --git a/app/src/main/java/com/aurora/store/view/ui/updates/UpdatesFragment.kt b/app/src/main/java/com/aurora/store/view/ui/updates/UpdatesFragment.kt index 3609f70a7..37fd2c3fc 100644 --- a/app/src/main/java/com/aurora/store/view/ui/updates/UpdatesFragment.kt +++ b/app/src/main/java/com/aurora/store/view/ui/updates/UpdatesFragment.kt @@ -34,7 +34,6 @@ import android.view.ViewGroup import androidx.activity.result.contract.ActivityResultContracts import androidx.core.content.ContextCompat import androidx.lifecycle.ViewModelProvider -import com.aurora.Constants import com.aurora.extensions.isRAndAbove import com.aurora.extensions.toast import com.aurora.gplayapi.data.models.App @@ -51,7 +50,6 @@ import com.aurora.store.view.epoxy.views.app.AppUpdateViewModel_ import com.aurora.store.view.epoxy.views.app.NoAppViewModel_ import com.aurora.store.view.epoxy.views.shimmer.AppListViewShimmerModel_ import com.aurora.store.view.ui.commons.BaseFragment -import com.aurora.store.view.ui.sheets.AppMenuSheet import com.aurora.store.viewmodel.all.UpdatesViewModel import com.tonyodev.fetch2.AbstractFetchGroupListener import com.tonyodev.fetch2.Download @@ -331,19 +329,4 @@ class UpdatesFragment : BaseFragment() { ) } } - - private fun openAppMenuSheet(app: App) { - val fragment = childFragmentManager.findFragmentByTag(AppMenuSheet.TAG) - if (fragment != null) - childFragmentManager.beginTransaction().remove(fragment) - - AppMenuSheet().apply { - arguments = Bundle().apply { - putString(Constants.STRING_EXTRA, gson.toJson(app)) - } - }.show( - childFragmentManager, - AppMenuSheet.TAG - ) - } } diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml index abd062a3c..c7789e19a 100644 --- a/app/src/main/res/navigation/mobile_navigation.xml +++ b/app/src/main/res/navigation/mobile_navigation.xml @@ -44,6 +44,9 @@ + + + + From 5c8b9c6d54f057371e93e44fc70cf153cf22a7c7 Mon Sep 17 00:00:00 2001 From: Aayush Gupta Date: Fri, 4 Aug 2023 18:12:41 +0800 Subject: [PATCH 04/14] AppPeekDialogSheet: Migrate to navigation components Signed-off-by: Aayush Gupta --- .../view/ui/commons/CategoryBrowseFragment.kt | 5 +- .../view/ui/sheets/AppPeekDialogSheet.kt | 52 ++++--------------- .../main/res/navigation/mobile_navigation.xml | 11 ++++ 3 files changed, 24 insertions(+), 44 deletions(-) diff --git a/app/src/main/java/com/aurora/store/view/ui/commons/CategoryBrowseFragment.kt b/app/src/main/java/com/aurora/store/view/ui/commons/CategoryBrowseFragment.kt index 2e392b828..74ba487cf 100644 --- a/app/src/main/java/com/aurora/store/view/ui/commons/CategoryBrowseFragment.kt +++ b/app/src/main/java/com/aurora/store/view/ui/commons/CategoryBrowseFragment.kt @@ -34,7 +34,6 @@ import com.aurora.store.databinding.ActivityGenericRecyclerBinding import com.aurora.store.view.custom.recycler.EndlessRecyclerOnScrollListener import com.aurora.store.view.epoxy.controller.CategoryCarouselController import com.aurora.store.view.epoxy.controller.GenericCarouselController -import com.aurora.store.view.ui.sheets.AppPeekDialogSheet import com.aurora.store.viewmodel.subcategory.SubCategoryClusterViewModel @@ -135,6 +134,8 @@ class CategoryBrowseFragment : BaseFragment(R.layout.activity_generic_recycler), } override fun onAppLongClick(app: App) { - AppPeekDialogSheet.newInstance(app).show(childFragmentManager, "APDS") + findNavController().navigate( + CategoryBrowseFragmentDirections.actionCategoryBrowseFragmentToAppPeekDialogSheet(app) + ) } } diff --git a/app/src/main/java/com/aurora/store/view/ui/sheets/AppPeekDialogSheet.kt b/app/src/main/java/com/aurora/store/view/ui/sheets/AppPeekDialogSheet.kt index 8617650d2..32b190e08 100644 --- a/app/src/main/java/com/aurora/store/view/ui/sheets/AppPeekDialogSheet.kt +++ b/app/src/main/java/com/aurora/store/view/ui/sheets/AppPeekDialogSheet.kt @@ -23,71 +23,39 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import com.aurora.Constants -import com.aurora.gplayapi.data.models.App +import androidx.navigation.fragment.navArgs +import com.aurora.extensions.load import com.aurora.store.R import com.aurora.store.databinding.SheetAppPeekBinding import com.aurora.store.util.CommonUtil -import com.aurora.extensions.load import com.bumptech.glide.load.resource.bitmap.RoundedCorners class AppPeekDialogSheet : BaseBottomSheet() { lateinit var B: SheetAppPeekBinding - lateinit var app: App - private var rawApp = String() - - companion object { - @JvmStatic - fun newInstance(app: App): AppPeekDialogSheet { - return AppPeekDialogSheet().apply { - arguments = Bundle().apply { - putString(Constants.STRING_EXTRA, gson.toJson(app)) - } - } - } - } + private val args: AppPeekDialogSheetArgs by navArgs() override fun onCreateContentView( inflater: LayoutInflater, container: ViewGroup, savedInstanceState: Bundle? - ): View? { + ): View { B = SheetAppPeekBinding.inflate(inflater, container, false) - val bundle = arguments - if (bundle != null) { - rawApp = bundle.getString(Constants.STRING_EXTRA, "") - if (rawApp.isNotEmpty()) { - app = gson.fromJson(rawApp, App::class.java) - if (app.packageName.isNotEmpty()) { - draw() - } else { - dismissAllowingStateLoss() - } - } else { - dismissAllowingStateLoss() - } - } - return B.root } override fun onContentViewCreated(view: View, savedInstanceState: Bundle?) { - - } - - private fun draw() { - B.txtLine1.text = app.displayName - B.imgIcon.load(app.iconArtwork.url) { + B.txtLine1.text = args.app.displayName + B.imgIcon.load(args.app.iconArtwork.url) { transform(RoundedCorners(25)) } - B.txtLine2.text = app.developerName + B.txtLine2.text = args.app.developerName B.txtLine3.text = String.format( requireContext().getString(R.string.app_list_rating), - CommonUtil.addSiPrefix(app.size), - app.labeledRating, - if (app.isFree) + CommonUtil.addSiPrefix(args.app.size), + args.app.labeledRating, + if (args.app.isFree) "Free" else "Paid" diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml index c7789e19a..cf7c6ef38 100644 --- a/app/src/main/res/navigation/mobile_navigation.xml +++ b/app/src/main/res/navigation/mobile_navigation.xml @@ -197,6 +197,9 @@ + + + + From e1dda57471dbcd9a67d501d42ce08478643a4f07 Mon Sep 17 00:00:00 2001 From: Aayush Gupta Date: Fri, 4 Aug 2023 18:16:26 +0800 Subject: [PATCH 05/14] FilterSheet: Migrate to navigation components Signed-off-by: Aayush Gupta --- .../store/view/ui/search/SearchResultsFragment.kt | 3 +-- .../aurora/store/view/ui/sheets/FilterSheet.kt | 15 --------------- app/src/main/res/navigation/mobile_navigation.xml | 5 +++++ 3 files changed, 6 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/com/aurora/store/view/ui/search/SearchResultsFragment.kt b/app/src/main/java/com/aurora/store/view/ui/search/SearchResultsFragment.kt index c7c6d1544..2a06f0a06 100644 --- a/app/src/main/java/com/aurora/store/view/ui/search/SearchResultsFragment.kt +++ b/app/src/main/java/com/aurora/store/view/ui/search/SearchResultsFragment.kt @@ -48,7 +48,6 @@ import com.aurora.store.view.epoxy.views.app.AppListViewModel_ import com.aurora.store.view.epoxy.views.app.NoAppViewModel_ import com.aurora.store.view.epoxy.views.shimmer.AppListViewShimmerModel_ import com.aurora.store.view.ui.commons.BaseFragment -import com.aurora.store.view.ui.sheets.FilterSheet import com.aurora.store.viewmodel.search.SearchResultViewModel import com.google.android.material.snackbar.Snackbar import com.google.android.material.textfield.TextInputEditText @@ -112,7 +111,7 @@ class SearchResultsFragment : BaseFragment(R.layout.fragment_search_result), // Filter binding.filterFab.setOnClickListener { - FilterSheet.newInstance().show(childFragmentManager, FilterSheet.TAG) + findNavController().navigate(R.id.filterSheet) } VM.liveData.observe(viewLifecycleOwner) { diff --git a/app/src/main/java/com/aurora/store/view/ui/sheets/FilterSheet.kt b/app/src/main/java/com/aurora/store/view/ui/sheets/FilterSheet.kt index 1dffbca7e..12e41d109 100644 --- a/app/src/main/java/com/aurora/store/view/ui/sheets/FilterSheet.kt +++ b/app/src/main/java/com/aurora/store/view/ui/sheets/FilterSheet.kt @@ -27,7 +27,6 @@ import com.aurora.store.R import com.aurora.store.data.Filter import com.aurora.store.data.providers.FilterProvider import com.aurora.store.databinding.SheetFilterBinding -import com.aurora.store.util.Log import com.google.android.material.chip.Chip class FilterSheet : BaseBottomSheet() { @@ -35,20 +34,6 @@ class FilterSheet : BaseBottomSheet() { private lateinit var B: SheetFilterBinding private lateinit var filter: Filter - companion object { - - const val TAG = "FilterSheet" - - @JvmStatic - fun newInstance(): FilterSheet { - return FilterSheet().apply { - arguments = Bundle().apply { - - } - } - } - } - override fun onCreateContentView( inflater: LayoutInflater, container: ViewGroup, diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml index cf7c6ef38..581b68c0f 100644 --- a/app/src/main/res/navigation/mobile_navigation.xml +++ b/app/src/main/res/navigation/mobile_navigation.xml @@ -364,4 +364,9 @@ android:name="app" app:argType="com.aurora.gplayapi.data.models.App" /> + From 7847a10007fa3eb72cf98119b12e6d78a8f15fbe Mon Sep 17 00:00:00 2001 From: Aayush Gupta Date: Mon, 7 Aug 2023 10:56:47 +0530 Subject: [PATCH 06/14] ManualDownloadSheet: Migrate to navigation component Signed-off-by: Aayush Gupta --- .../view/ui/details/AppDetailsFragment.kt | 8 +-- .../view/ui/sheets/ManualDownloadSheet.kt | 51 +++++-------------- .../main/res/navigation/mobile_navigation.xml | 12 +++++ 3 files changed, 30 insertions(+), 41 deletions(-) diff --git a/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsFragment.kt b/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsFragment.kt index 7c5f8f482..febbff23f 100644 --- a/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsFragment.kt +++ b/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsFragment.kt @@ -91,7 +91,6 @@ import com.aurora.store.view.epoxy.views.details.ScreenshotView import com.aurora.store.view.epoxy.views.details.ScreenshotViewModel_ import com.aurora.store.view.ui.commons.BaseFragment import com.aurora.store.view.ui.sheets.InstallErrorDialogSheet -import com.aurora.store.view.ui.sheets.ManualDownloadSheet import com.aurora.store.view.ui.sheets.PermissionBottomSheet import com.aurora.store.viewmodel.details.AppDetailsViewModel import com.aurora.store.viewmodel.details.DetailsClusterViewModel @@ -384,9 +383,10 @@ class AppDetailsFragment : BaseFragment(R.layout.fragment_details) { } R.id.menu_download_manual -> { - val sheet = ManualDownloadSheet.newInstance(app) - sheet.isCancelable = false - sheet.show(childFragmentManager, ManualDownloadSheet.TAG) + findNavController().navigate( + AppDetailsFragmentDirections + .actionAppDetailsFragmentToManualDownloadSheet(app) + ) } R.id.menu_download_manager -> { diff --git a/app/src/main/java/com/aurora/store/view/ui/sheets/ManualDownloadSheet.kt b/app/src/main/java/com/aurora/store/view/ui/sheets/ManualDownloadSheet.kt index adf71c1b1..61ad8d563 100644 --- a/app/src/main/java/com/aurora/store/view/ui/sheets/ManualDownloadSheet.kt +++ b/app/src/main/java/com/aurora/store/view/ui/sheets/ManualDownloadSheet.kt @@ -26,10 +26,9 @@ import android.view.View import android.view.ViewGroup import androidx.fragment.app.viewModels import androidx.lifecycle.lifecycleScope -import com.aurora.Constants +import androidx.navigation.fragment.navArgs import com.aurora.extensions.load import com.aurora.extensions.toast -import com.aurora.gplayapi.data.models.App import com.aurora.store.R import com.aurora.store.databinding.SheetManualDownloadBinding import com.aurora.store.viewmodel.sheets.SheetsViewModel @@ -40,25 +39,9 @@ import kotlinx.coroutines.launch class ManualDownloadSheet : BaseBottomSheet() { private lateinit var B: SheetManualDownloadBinding - private lateinit var app: App private val viewModel: SheetsViewModel by viewModels() - - companion object { - - const val TAG = "ManualDownloadSheet" - - @JvmStatic - fun newInstance( - app: App - ): ManualDownloadSheet { - return ManualDownloadSheet().apply { - arguments = Bundle().apply { - putString(Constants.STRING_APP, gson.toJson(app)) - } - } - } - } + private val args: ManualDownloadSheetArgs by navArgs() override fun onCreateContentView( inflater: LayoutInflater, @@ -71,17 +54,11 @@ class ManualDownloadSheet : BaseBottomSheet() { override fun onContentViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - val bundle = arguments - bundle?.let { - val rawApp = bundle.getString(Constants.STRING_APP, "{}") - app = gson.fromJson(rawApp, App::class.java) - if (app.packageName.isNotEmpty()) { - inflateData() - attachActions() - } else { - dismissAllowingStateLoss() - } - } + + isCancelable = false + + inflateData() + attachActions() } override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { @@ -99,17 +76,17 @@ class ManualDownloadSheet : BaseBottomSheet() { } private fun inflateData() { - B.imgIcon.load(app.iconArtwork.url) { + B.imgIcon.load(args.app.iconArtwork.url) { placeholder(R.drawable.bg_placeholder) transform(RoundedCorners(32)) } - B.txtLine1.text = app.displayName - B.txtLine2.text = app.packageName - B.txtLine3.text = ("${app.versionName} (${app.versionCode})") + B.txtLine1.text = args.app.displayName + B.txtLine2.text = args.app.packageName + B.txtLine3.text = ("${args.app.versionName} (${args.app.versionCode})") - B.versionCodeLayout.hint = "${app.versionCode}" - B.versionCodeLayout.editText?.setText("${app.versionCode}") + B.versionCodeLayout.hint = "${args.app.versionCode}" + B.versionCodeLayout.editText?.setText("${args.app.versionCode}") } private fun attachActions() { @@ -118,7 +95,7 @@ class ManualDownloadSheet : BaseBottomSheet() { if (customVersionString.isEmpty()) B.versionCodeInp.error = "Enter version code" else { - viewModel.purchase(requireContext(), app, customVersionString.toInt()) + viewModel.purchase(requireContext(), args.app, customVersionString.toInt()) } } diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml index 581b68c0f..bec258699 100644 --- a/app/src/main/res/navigation/mobile_navigation.xml +++ b/app/src/main/res/navigation/mobile_navigation.xml @@ -186,6 +186,9 @@ app:argType="com.aurora.gplayapi.data.models.App" app:nullable="true" android:defaultValue="@null" /> + + + + From f8da331da8c825ee4baa87741562086ef610d3b4 Mon Sep 17 00:00:00 2001 From: Aayush Gupta Date: Mon, 7 Aug 2023 11:18:10 +0530 Subject: [PATCH 07/14] PermissionBottomSheet: Migrate to navigation components Signed-off-by: Aayush Gupta --- .../view/ui/details/AppDetailsFragment.kt | 8 +++-- .../view/ui/sheets/PermissionBottomSheet.kt | 35 +++---------------- .../main/res/navigation/mobile_navigation.xml | 11 ++++++ 3 files changed, 21 insertions(+), 33 deletions(-) diff --git a/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsFragment.kt b/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsFragment.kt index febbff23f..1252ed740 100644 --- a/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsFragment.kt +++ b/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsFragment.kt @@ -91,7 +91,6 @@ import com.aurora.store.view.epoxy.views.details.ScreenshotView import com.aurora.store.view.epoxy.views.details.ScreenshotViewModel_ import com.aurora.store.view.ui.commons.BaseFragment import com.aurora.store.view.ui.sheets.InstallErrorDialogSheet -import com.aurora.store.view.ui.sheets.PermissionBottomSheet import com.aurora.store.viewmodel.details.AppDetailsViewModel import com.aurora.store.viewmodel.details.DetailsClusterViewModel import com.bumptech.glide.load.resource.bitmap.RoundedCorners @@ -1163,8 +1162,11 @@ class AppDetailsFragment : BaseFragment(R.layout.fragment_details) { private fun inflateAppPermission(B: LayoutDetailsPermissionsBinding, app: App) { B.headerPermission.addClickListener { if (app.permissions.size > 0) { - PermissionBottomSheet.newInstance(app) - .show(childFragmentManager, PermissionBottomSheet.TAG) + findNavController().navigate( + AppDetailsFragmentDirections.actionAppDetailsFragmentToPermissionBottomSheet( + app + ) + ) } } B.txtPermissionCount.text = ("${app.permissions.size} permissions") diff --git a/app/src/main/java/com/aurora/store/view/ui/sheets/PermissionBottomSheet.kt b/app/src/main/java/com/aurora/store/view/ui/sheets/PermissionBottomSheet.kt index 0a41ea15b..b8ae18746 100644 --- a/app/src/main/java/com/aurora/store/view/ui/sheets/PermissionBottomSheet.kt +++ b/app/src/main/java/com/aurora/store/view/ui/sheets/PermissionBottomSheet.kt @@ -27,10 +27,9 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.LinearLayout -import com.aurora.Constants +import androidx.navigation.fragment.navArgs import com.aurora.extensions.hide import com.aurora.extensions.show -import com.aurora.gplayapi.data.models.App import com.aurora.store.R import com.aurora.store.databinding.SheetPermissionsBinding import com.aurora.store.view.custom.layouts.PermissionGroup @@ -39,24 +38,9 @@ import java.util.* class PermissionBottomSheet : BaseBottomSheet() { private lateinit var B: SheetPermissionsBinding - private lateinit var app: App private lateinit var packageManager: PackageManager - companion object { - - const val TAG = "PermissionBottomSheet" - - @JvmStatic - fun newInstance( - app: App - ): PermissionBottomSheet { - return PermissionBottomSheet().apply { - arguments = Bundle().apply { - putString(Constants.STRING_APP, gson.toJson(app)) - } - } - } - } + private val args: PermissionBottomSheetArgs by navArgs() override fun onCreateContentView( inflater: LayoutInflater, @@ -69,16 +53,7 @@ class PermissionBottomSheet : BaseBottomSheet() { override fun onContentViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - val bundle = arguments - bundle?.let { - val rawApp = bundle.getString(Constants.STRING_APP, "{}") - app = gson.fromJson(rawApp, App::class.java) - if (app.packageName.isNotEmpty()) { - inflateData() - } else { - dismissAllowingStateLoss() - } - } + inflateData() } private fun inflateData() { @@ -86,7 +61,7 @@ class PermissionBottomSheet : BaseBottomSheet() { val permissionGroupWidgets: MutableMap = HashMap() - for (permissionName in app.permissions) { + for (permissionName in args.app.permissions) { val permissionInfo = getPermissionInfo(permissionName) ?: continue val permissionGroupInfo = getPermissionGroupInfo(permissionInfo) @@ -162,4 +137,4 @@ class PermissionBottomSheet : BaseBottomSheet() { } return permissionGroupInfo } -} \ No newline at end of file +} diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml index bec258699..8cea5d6d9 100644 --- a/app/src/main/res/navigation/mobile_navigation.xml +++ b/app/src/main/res/navigation/mobile_navigation.xml @@ -189,6 +189,9 @@ + + + + From 687446d00b8674a0adb6e8e4ed68310da5b37735 Mon Sep 17 00:00:00 2001 From: Aayush Gupta Date: Mon, 7 Aug 2023 11:53:36 +0530 Subject: [PATCH 08/14] DownloadMenuSheet: Migrate to navigation components Signed-off-by: Aayush Gupta --- .../model/{Download.kt => DownloadFile.kt} | 7 ++- .../view/ui/downloads/DownloadFragment.kt | 20 ++------- .../store/view/ui/sheets/DownloadMenuSheet.kt | 44 ++++++------------- .../main/res/navigation/mobile_navigation.xml | 15 ++++++- 4 files changed, 35 insertions(+), 51 deletions(-) rename app/src/main/java/com/aurora/store/data/model/{Download.kt => DownloadFile.kt} (89%) diff --git a/app/src/main/java/com/aurora/store/data/model/Download.kt b/app/src/main/java/com/aurora/store/data/model/DownloadFile.kt similarity index 89% rename from app/src/main/java/com/aurora/store/data/model/Download.kt rename to app/src/main/java/com/aurora/store/data/model/DownloadFile.kt index 309e3c5cb..01a1e2ac3 100644 --- a/app/src/main/java/com/aurora/store/data/model/Download.kt +++ b/app/src/main/java/com/aurora/store/data/model/DownloadFile.kt @@ -19,9 +19,12 @@ package com.aurora.store.data.model +import android.os.Parcelable import com.tonyodev.fetch2.Download +import kotlinx.parcelize.Parcelize -data class DownloadFile(val download: Download) { +@Parcelize +data class DownloadFile(val download: Download) : Parcelable { override fun hashCode(): Int { return download.id @@ -33,4 +36,4 @@ data class DownloadFile(val download: Download) { else -> false } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/aurora/store/view/ui/downloads/DownloadFragment.kt b/app/src/main/java/com/aurora/store/view/ui/downloads/DownloadFragment.kt index d8545d009..1773c5015 100644 --- a/app/src/main/java/com/aurora/store/view/ui/downloads/DownloadFragment.kt +++ b/app/src/main/java/com/aurora/store/view/ui/downloads/DownloadFragment.kt @@ -32,7 +32,6 @@ import com.aurora.store.util.Preferences import com.aurora.store.view.epoxy.views.DownloadViewModel_ import com.aurora.store.view.epoxy.views.app.NoAppViewModel_ import com.aurora.store.view.ui.commons.BaseFragment -import com.aurora.store.view.ui.sheets.DownloadMenuSheet import com.tonyodev.fetch2.AbstractFetchListener import com.tonyodev.fetch2.BuildConfig import com.tonyodev.fetch2.Download @@ -208,21 +207,8 @@ class DownloadFragment : BaseFragment(R.layout.fragment_download) { } private fun openDownloadMenuSheet(downloadFile: DownloadFile) { - with(downloadFile) { - val fragment = childFragmentManager.findFragmentByTag(DownloadMenuSheet.TAG) - if (fragment != null) - childFragmentManager.beginTransaction().remove(fragment).commitAllowingStateLoss() - - DownloadMenuSheet().apply { - arguments = Bundle().apply { - putInt(DownloadMenuSheet.DOWNLOAD_ID, download.id) - putInt(DownloadMenuSheet.DOWNLOAD_STATUS, download.status.value) - putString(DownloadMenuSheet.DOWNLOAD_URL, download.url) - } - }.show( - childFragmentManager, - DownloadMenuSheet.TAG - ) - } + findNavController().navigate( + DownloadFragmentDirections.actionDownloadFragmentToDownloadMenuSheet(downloadFile) + ) } } diff --git a/app/src/main/java/com/aurora/store/view/ui/sheets/DownloadMenuSheet.kt b/app/src/main/java/com/aurora/store/view/ui/sheets/DownloadMenuSheet.kt index 7492ea119..0cd80a262 100644 --- a/app/src/main/java/com/aurora/store/view/ui/sheets/DownloadMenuSheet.kt +++ b/app/src/main/java/com/aurora/store/view/ui/sheets/DownloadMenuSheet.kt @@ -23,6 +23,7 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import androidx.navigation.fragment.navArgs import com.aurora.store.R import com.aurora.store.data.downloader.DownloadManager import com.aurora.store.databinding.SheetDownloadMenuBinding @@ -30,16 +31,15 @@ import com.aurora.extensions.copyToClipBoard import com.aurora.extensions.toast import com.tonyodev.fetch2.Fetch import com.tonyodev.fetch2.Status +import kotlin.properties.Delegates class DownloadMenuSheet : BaseBottomSheet() { private lateinit var B: SheetDownloadMenuBinding private lateinit var fetch: Fetch - private var downloadId = 0 - private var status = 0 - private var url: String? = null - + private val args: DownloadMenuSheetArgs by navArgs() + private var status by Delegates.notNull() override fun onCreateContentView( inflater: LayoutInflater, @@ -57,19 +57,8 @@ class DownloadMenuSheet : BaseBottomSheet() { .with(requireContext()) .getFetchInstance() - if (arguments != null) { - val bundle = arguments - if (bundle != null) { - downloadId = bundle.getInt(DOWNLOAD_ID) - status = bundle.getInt(DOWNLOAD_STATUS) - url = bundle.getString(DOWNLOAD_URL) - attachNavigation() - } else { - dismissAllowingStateLoss() - } - } else { - dismissAllowingStateLoss() - } + status = args.downloadFile.download.status.value + attachNavigation() } private fun attachNavigation() { @@ -89,22 +78,22 @@ class DownloadMenuSheet : BaseBottomSheet() { setNavigationItemSelectedListener { item -> when (item.itemId) { R.id.action_copy -> { - requireContext().copyToClipBoard(url) + requireContext().copyToClipBoard(args.downloadFile.download.url) requireContext().toast(requireContext().getString(R.string.toast_clipboard_copied)) } R.id.action_pause -> { - fetch.pause(downloadId) + fetch.pause(args.downloadFile.download.id) } R.id.action_resume -> if (status == Status.FAILED.value || status == Status.CANCELLED.value) { - fetch.retry(downloadId) + fetch.retry(args.downloadFile.download.id) } else { - fetch.resume(downloadId) + fetch.resume(args.downloadFile.download.id) } R.id.action_cancel -> { - fetch.cancel(downloadId) + fetch.cancel(args.downloadFile.download.id) } R.id.action_clear -> { - fetch.delete(downloadId) + fetch.delete(args.downloadFile.download.id) } } dismissAllowingStateLoss() @@ -112,11 +101,4 @@ class DownloadMenuSheet : BaseBottomSheet() { } } } - - companion object { - const val TAG = "DOWNLOAD_MENU_SHEET" - const val DOWNLOAD_ID = "DOWNLOAD_ID" - const val DOWNLOAD_STATUS = "DOWNLOAD_STATUS" - const val DOWNLOAD_URL = "DOWNLOAD_URL" - } -} \ No newline at end of file +} diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml index 8cea5d6d9..afb5b6bbb 100644 --- a/app/src/main/res/navigation/mobile_navigation.xml +++ b/app/src/main/res/navigation/mobile_navigation.xml @@ -158,7 +158,11 @@ android:id="@+id/downloadFragment" android:name="com.aurora.store.view.ui.downloads.DownloadFragment" android:label="@string/title_download_manager" - tools:layout="@layout/fragment_download" /> + tools:layout="@layout/fragment_download" > + + + + + From 850f5def320d258bf09e97534d1796007b1649b7 Mon Sep 17 00:00:00 2001 From: Aayush Gupta Date: Mon, 7 Aug 2023 13:55:05 +0530 Subject: [PATCH 09/14] DeviceMiuiSheet: Migrate to navigation components Signed-off-by: Aayush Gupta --- .../store/view/ui/onboarding/InstallerFragment.kt | 10 +++++++--- .../aurora/store/view/ui/sheets/DeviceMiuiSheet.kt | 14 -------------- app/src/main/res/navigation/mobile_navigation.xml | 8 ++++++++ 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/com/aurora/store/view/ui/onboarding/InstallerFragment.kt b/app/src/main/java/com/aurora/store/view/ui/onboarding/InstallerFragment.kt index f8a0486ae..cc5b82a47 100644 --- a/app/src/main/java/com/aurora/store/view/ui/onboarding/InstallerFragment.kt +++ b/app/src/main/java/com/aurora/store/view/ui/onboarding/InstallerFragment.kt @@ -24,6 +24,7 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import androidx.navigation.fragment.findNavController import com.aurora.extensions.isMIUI import com.aurora.extensions.isMiuiOptimizationDisabled import com.aurora.extensions.isOAndAbove @@ -42,7 +43,6 @@ import com.aurora.store.util.Preferences.PREFERENCE_INSTALLER_ID import com.aurora.store.util.save import com.aurora.store.view.epoxy.views.preference.InstallerViewModel_ import com.aurora.store.view.ui.commons.BaseFragment -import com.aurora.store.view.ui.sheets.DeviceMiuiSheet import com.google.gson.reflect.TypeToken import rikka.shizuku.Shizuku import java.nio.charset.StandardCharsets @@ -140,7 +140,9 @@ class InstallerFragment : BaseFragment() { } if (isMIUI() && !isMiuiOptimizationDisabled()) { - DeviceMiuiSheet.newInstance().show(childFragmentManager, DeviceMiuiSheet.TAG) + findNavController().navigate( + OnboardingFragmentDirections.actionOnboardingFragmentToDeviceMiuiSheet() + ) } } @@ -148,7 +150,9 @@ class InstallerFragment : BaseFragment() { when (installerId) { 0 -> { if (isMIUI() && !isMiuiOptimizationDisabled()) { - DeviceMiuiSheet.newInstance().show(childFragmentManager, DeviceMiuiSheet.TAG) + findNavController().navigate( + OnboardingFragmentDirections.actionOnboardingFragmentToDeviceMiuiSheet() + ) } this.installerId = installerId save(PREFERENCE_INSTALLER_ID, installerId) diff --git a/app/src/main/java/com/aurora/store/view/ui/sheets/DeviceMiuiSheet.kt b/app/src/main/java/com/aurora/store/view/ui/sheets/DeviceMiuiSheet.kt index 220b2878b..0278fed8c 100644 --- a/app/src/main/java/com/aurora/store/view/ui/sheets/DeviceMiuiSheet.kt +++ b/app/src/main/java/com/aurora/store/view/ui/sheets/DeviceMiuiSheet.kt @@ -35,20 +35,6 @@ class DeviceMiuiSheet : BaseBottomSheet() { private lateinit var B: SheetDeviceMiuiBinding - companion object { - - const val TAG = "DeviceMiuiSheet" - - @JvmStatic - fun newInstance(): DeviceMiuiSheet { - return DeviceMiuiSheet().apply { - arguments = Bundle().apply { - - } - } - } - } - override fun onCreateContentView( inflater: LayoutInflater, container: ViewGroup, diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml index afb5b6bbb..e33edf671 100644 --- a/app/src/main/res/navigation/mobile_navigation.xml +++ b/app/src/main/res/navigation/mobile_navigation.xml @@ -351,6 +351,9 @@ app:launchSingleTop="true" app:popUpTo="@id/mobile_navigation" app:popUpToInclusive="true" /> + + From 9e4d14ac6ea7e673ad27bc9f46e1b00d822214e2 Mon Sep 17 00:00:00 2001 From: Aayush Gupta Date: Mon, 7 Aug 2023 14:05:55 +0530 Subject: [PATCH 10/14] DeviceHuaweiSheet: Drop unused sheet Not required since https://gitlab.com/AuroraOSS/AuroraStore/-/commit/69567dfaa02205370850746e723e40e7765031f4 Signed-off-by: Aayush Gupta --- .../store/view/ui/sheets/DeviceHuaweiSheet.kt | 102 ---------------- app/src/main/res/drawable/ic_huawei_logo.xml | 33 ------ .../main/res/layout/sheet_device_huawei.xml | 110 ------------------ app/src/main/res/values-ar/strings.xml | 6 +- app/src/main/res/values-ast/strings.xml | 6 +- app/src/main/res/values-az/strings.xml | 6 +- app/src/main/res/values-bg/strings.xml | 6 +- app/src/main/res/values-bn/strings.xml | 3 +- app/src/main/res/values-ca/strings.xml | 6 +- app/src/main/res/values-ckb/strings.xml | 3 +- app/src/main/res/values-cs/strings.xml | 6 +- app/src/main/res/values-da/strings.xml | 6 +- app/src/main/res/values-de/strings.xml | 6 +- app/src/main/res/values-el/strings.xml | 6 +- app/src/main/res/values-eo/strings.xml | 4 +- app/src/main/res/values-es/strings.xml | 6 +- app/src/main/res/values-eu/strings.xml | 6 +- app/src/main/res/values-fa/strings.xml | 6 +- app/src/main/res/values-fi/strings.xml | 4 - app/src/main/res/values-fr/strings.xml | 4 - app/src/main/res/values-gl/strings.xml | 6 +- app/src/main/res/values-he/strings.xml | 6 +- app/src/main/res/values-hi/strings.xml | 6 +- app/src/main/res/values-hr/strings.xml | 6 +- app/src/main/res/values-ht/strings.xml | 3 +- app/src/main/res/values-hu/strings.xml | 6 +- app/src/main/res/values-id/strings.xml | 6 +- app/src/main/res/values-it/strings.xml | 6 +- app/src/main/res/values-ja/strings.xml | 6 +- app/src/main/res/values-kab/strings.xml | 3 +- app/src/main/res/values-kmr/strings.xml | 6 +- app/src/main/res/values-ko/strings.xml | 3 +- app/src/main/res/values-lt/strings.xml | 5 +- app/src/main/res/values-lv/strings.xml | 6 +- app/src/main/res/values-ml/strings.xml | 3 +- app/src/main/res/values-nb-rNO/strings.xml | 6 +- app/src/main/res/values-nl/strings.xml | 4 - app/src/main/res/values-pa/strings.xml | 6 +- app/src/main/res/values-pl/strings.xml | 6 +- app/src/main/res/values-pt-rBR/strings.xml | 6 +- app/src/main/res/values-pt/strings.xml | 6 +- app/src/main/res/values-ro/strings.xml | 6 +- app/src/main/res/values-ru/strings.xml | 6 +- app/src/main/res/values-sc/strings.xml | 6 +- app/src/main/res/values-si/strings.xml | 6 +- app/src/main/res/values-sl/strings.xml | 6 +- app/src/main/res/values-so/strings.xml | 6 +- app/src/main/res/values-sq/strings.xml | 6 +- app/src/main/res/values-sr/strings.xml | 6 +- app/src/main/res/values-sv/strings.xml | 6 +- app/src/main/res/values-ta/strings.xml | 6 +- app/src/main/res/values-tr/strings.xml | 6 +- app/src/main/res/values-uk/strings.xml | 6 +- app/src/main/res/values-vi/strings.xml | 6 +- app/src/main/res/values-yue/strings.xml | 3 +- app/src/main/res/values-zh-rCN/strings.xml | 6 +- app/src/main/res/values-zh-rTW/strings.xml | 6 +- app/src/main/res/values/strings.xml | 4 - 58 files changed, 51 insertions(+), 492 deletions(-) delete mode 100644 app/src/main/java/com/aurora/store/view/ui/sheets/DeviceHuaweiSheet.kt delete mode 100644 app/src/main/res/drawable/ic_huawei_logo.xml delete mode 100644 app/src/main/res/layout/sheet_device_huawei.xml diff --git a/app/src/main/java/com/aurora/store/view/ui/sheets/DeviceHuaweiSheet.kt b/app/src/main/java/com/aurora/store/view/ui/sheets/DeviceHuaweiSheet.kt deleted file mode 100644 index 3237de820..000000000 --- a/app/src/main/java/com/aurora/store/view/ui/sheets/DeviceHuaweiSheet.kt +++ /dev/null @@ -1,102 +0,0 @@ -/* - * Aurora Store - * Copyright (C) 2021, Rahul Kumar Patel - * - * Aurora Store is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * Aurora Store is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Aurora Store. If not, see . - * - */ - -package com.aurora.store.view.ui.sheets - -import android.os.Build -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import com.aurora.extensions.load -import com.aurora.extensions.toast -import com.aurora.gplayapi.DeviceManager -import com.aurora.store.R -import com.aurora.store.data.providers.SpoofProvider -import com.aurora.store.databinding.SheetDeviceHuaweiBinding -import com.bumptech.glide.load.resource.bitmap.CircleCrop -import java.util.* - -class DeviceHuaweiSheet : BaseBottomSheet() { - - private lateinit var B: SheetDeviceHuaweiBinding - - companion object { - - const val TAG = "DeviceHuaweiSheet" - - @JvmStatic - fun newInstance(): DeviceHuaweiSheet { - return DeviceHuaweiSheet().apply { - arguments = Bundle().apply { - - } - } - } - } - - override fun onCreateContentView( - inflater: LayoutInflater, - container: ViewGroup, - savedInstanceState: Bundle? - ): View { - B = SheetDeviceHuaweiBinding.inflate(inflater, container, false) - - inflateData() - attachAction() - - return B.root - } - - override fun onContentViewCreated(view: View, savedInstanceState: Bundle?) { - - } - - private fun inflateData() { - B.imgIcon.load(R.drawable.ic_huawei_logo) { - transform(CircleCrop()) - } - } - - private fun attachAction() { - B.btnPrimary.setOnClickListener { - applySpoof() - } - - B.btnSecondary.setOnClickListener { - dismissAllowingStateLoss() - } - } - - private fun applySpoof() { - val properties: Properties? = when (Build.VERSION.SDK_INT) { - 30, 29 -> DeviceManager.loadProperties("op_8_pro.properties") - 28 -> DeviceManager.loadProperties("nk_9.properties") - 27 -> DeviceManager.loadProperties("mi_8_se.properties") - 26 -> DeviceManager.loadProperties("op_3.properties") - else -> DeviceManager.loadProperties("op_x.properties") - } - - properties?.let { - SpoofProvider(requireContext()).setSpoofDeviceProperties(it) - toast(R.string.toast_spoof_applied) - dismissAllowingStateLoss() - } - } -} diff --git a/app/src/main/res/drawable/ic_huawei_logo.xml b/app/src/main/res/drawable/ic_huawei_logo.xml deleted file mode 100644 index a4f627970..000000000 --- a/app/src/main/res/drawable/ic_huawei_logo.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/layout/sheet_device_huawei.xml b/app/src/main/res/layout/sheet_device_huawei.xml deleted file mode 100644 index e2042a367..000000000 --- a/app/src/main/res/layout/sheet_device_huawei.xml +++ /dev/null @@ -1,110 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 0536acf5d..639931cdc 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -81,7 +81,6 @@ تحديث جديد متوفر الرجاء تعطيل تحسينات MIUI للسماح بالتثبيتات، وإلا يمكنك اختيار مثبت الجذر أو الخدمات. تم الكشف عن جهاز MIUI! - تم الكشف عن جهاز هواوي! شروط الخدمة الرخصة اخلاء المسؤوليه @@ -198,8 +197,6 @@ اختياريا يمكنك اختيار المثبت الأصلي، ولكن بعد ذلك لا يمكنك تثبيت التطبيقات المجمعة (تقسيم) APKs، لذلك الخيار لك. ثبت خدمات أورورا 1.0.9 أو أعلى، أو تغيير المثبت. سترى ميزات وأخطاء جديدة قبل أن يراها المستخدمون. قدم ملاحظاتك للمطورين لمساعدتهم على التحسين من جودة تطبيقاتهم. - يبدو أنك تستخدم جهاز Huawei، نظرًا للحظر الذي فرضته Google مؤخرًا على اجهزة هواوي ، فقد لا تتمكن من تسجيل الدخول. - نقترح عليك استخدام محاكاة تحايلية للجهاز في حالة كون جهازك من اجهزة Huawei الحديثه. هل ترغب في تطبيق المحاكاة التحايلية الآن؟ BHIM - UPI تم تطبيق المحاكاة التحايلية للجهاز . جلسات التثبيت القديمة التي تم التخلي عنها @@ -221,7 +218,6 @@ أضف إلى القائمة السوداء القائمة السوداء رجوع - تطبيق قبول تسجيل الخروج من Aurora تسجيل الدخول باستخدام @@ -351,4 +347,4 @@ تم رفض الوصول! هل تستخدم VPN أو Tor؟ لا يمكن الوصول إلى الخادم فشل إنشاء جلسة عمل، رمز الخطأ: %1$d - \ No newline at end of file + diff --git a/app/src/main/res/values-ast/strings.xml b/app/src/main/res/values-ast/strings.xml index 4f14a493c..0e1a5a282 100644 --- a/app/src/main/res/values-ast/strings.xml +++ b/app/src/main/res/values-ast/strings.xml @@ -45,7 +45,6 @@ ¿Quies xunite al programa Beta\? Nun contién anuncios Nun hai nengún anovamientu disponible - Preséu de Huawei Quita les aplicaciones de F-Droid de les llistes Peñerar les aplicaciones de F-Droid Aplicaciones ya xuegos de mio @@ -115,7 +114,6 @@ F-Droid Blacklist Valoración ya reseñes - Aplicar Inorar la versión Peñeres Free @@ -274,8 +272,6 @@ Esperando pola confirmación del usuariu Disclaimer Términos del serviciu - Paez qu\'uses un preséu de Huawei. Pola mor de les torgues de recién de Google, ye posible que nun puedas ser a aniciar la sesión. - Suxerímoste qu\'uses una suplantación nel casu de tener un preséu Huawei recién. ¿Quies aplicar la suplantación agora\? ¡Detectóse MIUI! L\'instalador de la sesión nun pue instalar aplicaciones pola mor de les optimizaciones de MIUI. Desactiva les optimizaciones de MIUI pa permitir les instalaciones, sinón pues escoyer l\'instalador root o\'l de los servicios d\'Aurora. @@ -324,4 +320,4 @@ %1$s • API %2$s Required permissions were denied. Please grant them in order to continue the action Buscar aplicaciones ya xuegos - \ No newline at end of file + diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml index 5ce6b0223..6ca01c9c4 100644 --- a/app/src/main/res/values-az/strings.xml +++ b/app/src/main/res/values-az/strings.xml @@ -83,7 +83,6 @@ Tənzimləmələr Buferə yapışdırıldı İcazə verildi - Siz Huawei cihazından istifadə edirsiniz, Google tərəfindən son qadağalar səbəbindən daxil olmaya bilərsiniz. İstəkə bağlı olaraq, Yerli quraşdırıcını seçə bilərsiniz, lakin sonra birləşdirilmiş (bölünmüş) APK-ları quraşdıra bilməzsiniz, buna görə seçim sizindir. Hesab qurucu MIUI Optimizasiyasına görə tətbiqləri quraşdıra bilmir. Mavi @@ -120,7 +119,6 @@ ... ilə daxil olun Aurora-dan çıxın Qəbul edin - Tətbiq edin Geri Qara siyahı Qara siyahıya əlavə edin @@ -177,8 +175,6 @@ İmtina edirəm Lisenziya Xidmət Şərtləri - Huawei aşkarlandı! - Ən son Huawei cihazınız varsa, cihaz hiyləsindən istifadə etməyi təklif edirik. İndi hiylə tətbiq etmək istəyirsiniz\? MIUI aşkar edildi! Quraşdırmalara icazə vermək üçün MIUI optimallaşdırmasını deaktiv edin, əks halda Kök və ya Xidmətlər quraşdırıcısını seçə bilərsiniz. Yeni yeniləmə mövcuddur @@ -307,4 +303,4 @@ %1$dd %2$ds qalıb Bildirişlər Shizuku quraşdırıcısı - \ No newline at end of file + diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 01143df58..8530251e9 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -31,7 +31,6 @@ Влизане чрез Излизане от Aurora Приемане - Прилагане Назад Черен списък Добавяне към черен списък @@ -133,7 +132,6 @@ Изчистването е завършено тракер(и), намерени в Пауза на всички - Huawei открит! Не съдържа тракери Списък на промените Напускане @@ -210,7 +208,6 @@ Невалиден или повреден APK Успешно инсталиранe Условия за ползване - Изглежда, че използвате устройство Huawei, поради скорошни забрани от Google може да не успеете да влезете. Програмата за инсталиране на сесии не може да инсталира приложения поради MIUI оптимизации. Общо известие Aurora Store изисква следните разрешения @@ -277,7 +274,6 @@ Не можа да се създаде сесия Деактивирайте MIUI оптимизациите, за да позволите инсталации, в противен случай можете да изберете Root или Services installer. Мениджър на външно съхранение - Предлагаме ви да използвате устройство spoof, в случай че имате скорошно устройство Huawei. Искате ли да приложите spoof сега\? Налична е нова актуализация Не можете да инсталирате пакетни (разделени) приложения чрез Native Installer. Променете инсталатора си на Session, Services или Root. Бързо известяване @@ -337,4 +333,4 @@ %1$d налична актуализация %1$s, %2$s и %3$s %1$s, %2$s, %3$s и %4$d още - \ No newline at end of file + diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml index 1a1262cf6..c3adc1092 100644 --- a/app/src/main/res/values-bn/strings.xml +++ b/app/src/main/res/values-bn/strings.xml @@ -74,7 +74,6 @@ বাতিল অবরোধ তালিকা পিছনে - আবেদন গুগল অরোরা সহায়তা দলে যোগ দাও আলোচনা বা পরামর্শের জন্য। - \ No newline at end of file + diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index ff5999cd5..16f5a73ed 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -25,7 +25,6 @@ Telegram Obteniu el codi font de l\'Aurora Store des d\'Aurora OSS a GitLab. Dona a través de PayPal - Aplicar Anònim (insegur) Google Heu tancat la sessió @@ -165,9 +164,6 @@ Avís Llicència Termes del servei - Huawei detectat! - Sembla que utilitzeu un dispositiu Huawei, a causa de les prohibicions recents de Google, és possible que no pugueu iniciar la sessió. - Us recomanem que utilitzeu la falsificació de dispositiu en cas que tingueu un dispositiu Huawei recent. Vol aplicar la falsificació ara\? S\'ha detectat MIUI! L\'instal·lador de sessions no pot instal·lar aplicacions a causa de les optimitzacions MIUI. Deshabiliteu les optimitzacions MIUI per permetre les instal·lacions, en cas contrari podeu triar l\'instal·lador root o serveis. @@ -304,4 +300,4 @@ Descarregant • %1$d / %2$d • %3$s Notificacions Instal·lador de Shizuku - \ No newline at end of file + diff --git a/app/src/main/res/values-ckb/strings.xml b/app/src/main/res/values-ckb/strings.xml index 9b974fd02..12d31adef 100644 --- a/app/src/main/res/values-ckb/strings.xml +++ b/app/src/main/res/values-ckb/strings.xml @@ -68,7 +68,6 @@ زیادکردن بۆ لیستی ڕەش لیستی ڕەش گەڕانەوە - جێبەجێکردن ڕازیم دەرچوون لە ئەرۆرا چونەژوورەوە لەڕێی @@ -81,4 +80,4 @@ ڕیکلامی هەیە تۆماری گۆڕانکاری بەردەست نییە تۆماری گۆڕانکاری - \ No newline at end of file + diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index a46651c82..161b28818 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -121,9 +121,6 @@ Pro povolení instalací, deaktivujte optimalizaci MIUI, v opačném případě si můžete vybrat mezi Root instalátor nebo Services instalátor. Relační instalátor nelze použít z důvodu optimalizací MIUI. Zjištěno MIUI! - Pokud máte zařízení Huawei, doporučujeme použít device spoof. Chcete to udělat hned teď\? - Zdá se, že používáte zařízení Huawei. Z důvodu nedávných zákazů Google se možná nebudete moci přihlásit. - Huawei detekován! Všeobecné smluvní podmínky Licence Varování @@ -241,7 +238,6 @@ Obnovit Zrušit Zpět - Použít Přijmout Odhlásit se z Aurory Přihlaste se pomocí @@ -351,4 +347,4 @@ Server je nedostupný Nepodařilo se načíst hlášení o soukromí Interní chyba! Zkuste to prosím znovu za chvíli - \ No newline at end of file + diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index b3b0cde4e..ee1e6596f 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -24,7 +24,6 @@ Deaktiver Eksporter Alle - Udfør Kontroller Filtre Installerer @@ -106,7 +105,6 @@ Installationen blev blokeret Licens Tjenestevilkår - Det ser ud til, at du bruger en Huawei enhed, et bredt forbud fra Google kan muligvis forhindre dig i at logge på. MIUI opdaget! Du kan vælge at bruge Native installationsmuligheden, men så kan du ikke installere medfølgende (split) APK-er. Du kan ikke installere medfølgende (split) app via Native installatøren. Skift din installatør til Session, Services eller Root. @@ -174,8 +172,6 @@ Succesfuldt installeret Venter på brugerbekræftelse Ansvarsfraskrivelse - Huawei opdaget! - Vi forslår, at du bruger enhedsforfalskning, hvis du har en nyere Huawei enhed. Vil du aktivere forfalskning\? Session-installatøren kan ikke installere apps pga. MIUI Optimering. Slå venligst MIUI optimering fra for at tillade installationer. Alternativt kan du bruge Root eller Services installationsmulighederne. Ny opdatering tilgængelig @@ -295,4 +291,4 @@ Tjeneste som downloader apps i baggrunden Downloader app i baggrund Slå download af app i baggrunden til - \ No newline at end of file + diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 838131cd4..1c8dbce64 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -75,7 +75,6 @@ Infos zur App Erfordert GSF Anwenden - Anwenden Gerätevortäuschung angewendet Berechtigung gewährt Entwickleroptionen in den Geräteeinstellungen aktivieren, um sie zu öffnen. @@ -146,9 +145,6 @@ Um Installationen zu ermöglichen, bitte die MIUI-Optimierungen deaktivieren oder die Root- oder Services-Installationsmethode auswählen. Die Sitzungs-Installation kann aufgrund von MIUI-Optimierungen keine Apps installieren. MIUI erkannt! - Es wird empfohlen, bei einem aktuellen Huawei-Gerät die Gerätevortäuschung zu verwenden. Soll das Vortäuschen jetzt angewendet werden\? - Anscheinend wird ein Huawei-Gerät verwendet. Aufgrund der jüngsten Einschränkungen durch Google ist eine Anmeldung eventuell nicht möglich. - Huawei erkannt! Nutzungsbedingungen Lizenz Haftungsausschluss @@ -352,4 +348,4 @@ Interner Fehler! Bitte versuche es nach einiger Zeit erneut. Sitzung konnte nicht erstellt werden, Fehlercode: %1$d Server nicht erreichbar - \ No newline at end of file + diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 5aa03c1d1..90b14a2d7 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -36,7 +36,6 @@ Προσθήκη στη μαύρη λίστα Μαύρη λίστα Επιστροφή - Εφαρμογή Αποδοχή Αποσυνδεθείτε Συνδεθείτε χρησιμοποιώντας @@ -150,9 +149,6 @@ Πέντε Αναμονή για επιβεβαίωση χρήστη Αποποίηση ευθυνών - Εντοπίστηκε Huawei! - Φαίνεται ότι χρησιμοποιείτε συσκευή Huawei, λόγω των πρόσφατων απαγορεύσεων από την Google ενδέχεται να μην μπορείτε να συνδεθείτε. - Σας προτείνουμε να χρησιμοποιήσετε πλαστογράφηση συσκευής σε περίπτωση που έχετε πρόσφατη συσκευή Huawei. Θέλετε να κάνετε πλαστογράφηση τώρα; Εντοπίστηκε MIUI! Το πρόγραμμα εγκατάστασης δεν μπορεί να εγκαταστήσει εφαρμογές λόγω βελτιστοποιήσεων της MIUI. Γρήγορη ειδοποίηση @@ -295,4 +291,4 @@ Ανώνυμος (μη ασφαλές) Εγκατάσταση Διαχειριστή εφαρμογών ή άλλαξε το πρόγραμμα εγκατάστασης. Εξαναγκασμός εκκαθάρισης συνεδριάσεων - \ No newline at end of file + diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index 49b032063..0257c9362 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -37,7 +37,6 @@ Kontroli Nuligi Reen - Apliki Akcepti Elsaluti el Aurora Ensaluti per @@ -112,7 +111,6 @@ Atendas uzantan konfirmon Malgarantio Permesilo - Huawei detektita! MIUI detektita! Nova ĝisdatigo disponeblas Rapida sciigo @@ -187,4 +185,4 @@ Ĉu aniĝi betan programon\? Sen permesoj Akiri la Aurora Store fontkodon el Aurora OSS ĉe GitLab. - \ No newline at end of file + diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index d4b999b54..6c2ef339a 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -99,9 +99,6 @@ Por favor, desactive las optimizaciones de MIUI para permitir las instalaciones, de lo contrario puede elegir el instalador de root o de los servicios. El instalador de sesión no puede instalar aplicaciones debido a las optimizaciones de MIUI. ¡MIUI detectado! - Le sugerimos que utilice la simulación de dispositivo en caso de que tenga un dispositivo Huawei reciente. ¿Desea aplicar la simulación ahora\? - Parece que utiliza un dispositivo Huawei, debido a las recientes prohibiciones de Google es posible que no pueda iniciar sesión. - ¡Huawei detectado! Términos del servicio Licencia Descargo de responsabilidad @@ -223,7 +220,6 @@ Añadir a la lista negra Lista negra Atrás - Aplicar Cerrar sesión de Aurora Iniciar sesión con Ha cerrado la sesión @@ -351,4 +347,4 @@ No se ha podido obtener el informe de privacidad ¡Acceso denegado! ¿Estás usando una VPN o Tor\? Fallo al generar la sesión, código de error: %1$d - \ No newline at end of file + diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index 04160c94f..6695f0ec0 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -105,9 +105,6 @@ Berezko instalatzailea ere aukera dezakezu, baina holan egiten baduzu, ezin izango dituzu zatitutako APK-ak instalatu. Zurea da erabakia. Mesedez desaktibatu MIUI-ren optimizazioak edo aukeratu root edo zerbitzu instalatzailea. Miui aurkitu da! - Huawei gailua badaukazu simulazioa erabil dezazun iradokitzen dizugu. Egin nahi al duzu oraintxe bertan\? - Huawei gailua erabiltzen ari zarela dirudi. Google-ek egindako debekuak direla medio, ezinezkoa izan dezakezu saoia hastea. - Huawei detektatuta! Zerbitzuaren baldintzak Lizentzia Abisua @@ -225,7 +222,6 @@ Zerrenda beltzan sartu Zerrenda beltza Atzera - Aplikatu Onartu Auroraren saioa itxi Saioa hasi hau erabiliz @@ -331,4 +327,4 @@ Azken saioa ezabatuta Saioa egiaztatzen %1$s • API %2$s - \ No newline at end of file + diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index b8cc6cd24..118c45089 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -121,7 +121,6 @@ دانلودها تلگرام کد منبع فروشگاه آرورا را از Aurora OSS در گیت‌لب دریافت نمایید. - اعمال فیلترها BHIM - UPI حمایت از طریق UPI @@ -201,7 +200,6 @@ نصب کننده مناسب را انتخاب کنید موارد اضافی در لیست سفید قرار گرفت - هوآوی شناسایی شد! پیکربندی دستگاه صادر نشد شبکه سازی مطمئن شوید که مجددا وارد سیستم شده اید و برنامه را مجددا راه اندازی کرده اید تا تغییرات اعمال شوند. @@ -254,9 +252,7 @@ در حساب های ناشناس در دسترس نیست ارزیابی شده دانلود برنامه پس زمینه - به نظر می رسد شما از یک دستگاه هواوی استفاده می کنید، به دلیل ممنوعیت های اخیر توسط Google ممکن است نتوانید وارد شوید. فضای حافظه ناکافی - پیشنهاد می کنیم در صورتی که اخیراً دستگاه هوآوی دارید، از پارامتر جعل دستگاه استفاده کنید. آیا می خواهید اکنون پارامتر جعلی را اعمال کنید؟ در صورت تمایل می توانید نصب کننده بومی را انتخاب کنید، اما پس از آن نمی توانید APKs های همراه (تقسیم شده) را نصب کنید، بنابراین انتخاب با شماست. حال شما چطور است؟ لطفاً شرایط خدمات ما را بخوانید و آن را برای استفاده از فروشگاه آرورا بپذیرید. @@ -343,4 +339,4 @@ بررسی به روز رسانی خودکار %1$s، %2$s، %3$s و %4$d بیشتر بررسی خودکار و اطلاع رسانی برای به روز رسانی های جدید برنامه به صورت دوره ای - \ No newline at end of file + diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 64cf5f74b..191e93bd6 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -57,7 +57,6 @@ Riittämätön muistitila Virheellinen tai vioittunut APK Käyttäjän vahvistusta odotetaan - Huawei havaittu! Käyttöehdot Lisenssi Uusi päivitys saatavilla @@ -179,7 +178,6 @@ Poista käytöstä Kiellä Tyhjennä - Käytä Anonyymi Liity Auroran tukiryhmään keskusteluja tai ehdotuksia varten. Arvioitu @@ -265,8 +263,6 @@ Ota MIUI-optimoinnit pois käytöstä hyväksyäksesi asennukset tai valitse Root- tai Services-asentaja. Sessioasentaja ei voi asentaa sovelluksia MIUI:n optimoinneista johtuen. MIUI havaittu! - Suosittelemme, että asetat laitehuijauksen, jos sinulla on melko tuore Huawein laite. Haluatko ottaa huijauksen käyttöön nyt\? - Näytät käyttävän Huawei-merkkistä laitetta. Googlen viimeaikaisten käyttöestojen vuoksi et välttämättä pysty kirjautumaan. Vastuuvapauslauseke Löytyi ristiriitainen asennuspaketti Asenna ensin Aurora Services ja anna kaikki käyttöoikeudet. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 5f04ba55e..a53f79b01 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -18,9 +18,6 @@ Avertissement En attente de confirmation de l’utilisateur MIUI détecté ! - Nous vous suggérons d’utiliser l’usurpation d’appareil si vous possédez un appareil Huawei récent. Souhaitez-vous appliquer l’usurpation maintenant \? - Vous semblez utiliser un appareil Huawei, en raison des récentes interdictions de Google, vous ne pourrez peut-être pas vous connecter. - Huawei détecté ! Conditions d’utilisation Licence Notification rapide @@ -149,7 +146,6 @@ Ajouter à la liste noire Liste noire Retour - Appliquer Se déconnecter d’Aurora Se connecter via Sombre diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index be38584bf..fce14cd48 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -88,8 +88,6 @@ Por favor, desactive as optimizacións MIUI para permitir instalacións. Caso contrario escolla os instaladores root ou de servizo. O instalador de sesión non pode instalar aplicacións debido ás Optimizacións MIUI. MIUI detectado! - Parece que está a utilizar un dispositivo Huawei. Podería non conseguir inciar sesión debido á recente prohibición de Google. - Huawei detectado! Condicións do servizo Licenza Aviso @@ -193,7 +191,6 @@ Engadir á lista negra Lista negra Volver - Aplicar Aceptar Fechar sesión Iniciar sesión con @@ -278,7 +275,6 @@ Copiado na área de transferencia Xestionar disfrace Asegúrese de volver a iniciar sesión para aplicar o disfrace - Suxerimos que empregue un disfrace no caso de ter un Huawei. Desexa aplicar o disfrace agora\? Top da clasificación Instalador XA. Anónimo (inseguro) @@ -351,4 +347,4 @@ %1$d actualización dispoñíbel %1$s, %2$s, %3$s e %4$d máis Fallo ao xerar a sesión, código de erro: %1$d - \ No newline at end of file + diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml index 7fdbc8c97..e27fe27b5 100644 --- a/app/src/main/res/values-he/strings.xml +++ b/app/src/main/res/values-he/strings.xml @@ -107,7 +107,6 @@ המובילים בתשלום הועתק ללוח מתבצעת הערכה - זוהה מכשיר מתוצרת Huawei! עמודי \"בשבילך\" עזיבה הרשאות @@ -118,7 +117,6 @@ ברשימת החסימה הגדרות ברשימת ההתרה - החלה ניקוי התנתקות קדימה @@ -201,7 +199,6 @@ הפעלה לא מאובטחת בעילום שם התאמה אישית מותקן - נראה שיש לך מכשיר Huawei, בשל החרם האחרון של Google על החברה ייתכן שלא תהיה לך אפשרות להיכנס לחשבון. התקנה באמצעות Root לא היה ניתן להוריד את הקבצים בעילום שם (לא מאובטח) @@ -238,7 +235,6 @@ בחר שיטה להתקנות APK מתקין נתיב נעשה שימוש באחסון חיצוני בשביל הורדות, ייצוא, וכו\'. - אנו מציעים לך להשתמש ב\'זיוף מכשיר\' אם יש לך מכשיר עדכני של וואווי. האם אתה רוצה להחיל את הזיוף עכשיו\? בבקשה, השבת את האופטימיזציה של שיאומי כדי לאשר התקנות, אחרת אתה יכול לבחור מתקין רוט, או שירותי אורורה. קוד הגרסה שביקשת לא זמין. וודא שאתה מתחבר מחדש ומפעיל מחדש את האפליקציה כדי להחיל א ת השינויים. @@ -272,4 +268,4 @@ התראות כלליות התקן אוטומטית אפליקציות לאחר ההורדה זיוף המכשיר הוחל. - \ No newline at end of file + diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 34b5687dd..4fe091267 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -12,7 +12,6 @@ ब्लॉकसूची में डालें ब्लॉकसूची वापस जाएं - लागू करें मानें अरोरा से लॉगआउट हो लॉगइन इस्तेमाल करके @@ -202,7 +201,6 @@ डेवलपर प्रोफाइल अज्ञात खाते पर नहीं मौजूद परस्पर विरोधी पैकेज मौजूद हैं - हुआवेई मिला! ऑरोरा स्टोर से ऐप इंस्टॉल करने की अनुमति दें डाउनलोड होने पर अपने आप एपीके इंस्टॉल करें फ्यूशिया @@ -257,10 +255,8 @@ सत्र नहीं बना सके नाकाफी मेमरी जगह सफलतापूर्वक इंस्टॉल किया - लगता है आप हुआवेई का डिवाइस इस्तेमाल कर रहे हैं, गूगल के हाल के बैन की वजह से आप शायद लॉगइन नहीं कर पाएंगे। यूज़र सत्यापन का इंतज़ार कर रहे कृपया, इंस्टॉल करने के लिए शाओमी ऑपटीमाइज़ेशन अक्षम करें, या फिर आप रूट या सेवा इंस्टॉलर चुन सकते हैं। - हमारी सलाह है की अगर आपके पास हुआवेई का डिवाइस हैं तो आप डिवाइस मखौटा इस्तेमाल करें। क्या आप अभी मखौटा लगाना चाहेंगे\? हमने अरोरा स्टोर के सेवा के नियम पढ़ लिए है। सत्र इंस्टॉलर शाओमी ऑपटीमाइज़ेशन की वजह से ऐप इंस्टॉल नहीं कर सका। आप मूल इंस्टॉलर भी चुन सकते हैं, लेकिन तब आप बंडल (स्प्लिट) एपीके इंस्टॉल नहीं कर पाएंगे, चुनना आपको है। @@ -351,4 +347,4 @@ उफ़, आपकी दर सीमित है सर्वर पहुँच योग्य नहीं सत्र, त्रुटि कोड उत्पन्न करने में विफल: %1$d - \ No newline at end of file + diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 639b9ab6e..32c002740 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -61,7 +61,6 @@ Dodaj u nepoželjne Nepoželjni Natrag - Primijeni Prihvati Odjavi se iz Aurore Prijavi se, koristeći @@ -199,9 +198,6 @@ Za instaliranje deaktiviraj MIUI optimizaciju ili odaberi instalaciju Administrator ili Usluge. Instalacija sesija ne može instalirati programe zbog MIUI optimizacije. Otkriven je MIUI! - Predlažemo da koristiš simuliranje uređaja ako imaš noviji Huawei uređaj. Želiš li sada primijeniti simuliranje uređaja\? - Čini se da koristiš Huawei uređaj. Zbog nedavnih Googleovih zabrana možda se nećeš moći prijaviti. - Otkriven je Huawei! Uvjeti usluge Licenca Izjava o odricanju odgovornosti @@ -331,4 +327,4 @@ Konfiguracija uređaja je uvezena Uvezi Nije bilo moguće uvesti konfiguraciju uređaja - \ No newline at end of file + diff --git a/app/src/main/res/values-ht/strings.xml b/app/src/main/res/values-ht/strings.xml index 13cb7e167..350a31814 100644 --- a/app/src/main/res/values-ht/strings.xml +++ b/app/src/main/res/values-ht/strings.xml @@ -65,7 +65,6 @@ Ajoute nan lis nwa Lis nwa Retounen - Aplike Aksepte Konèkte avèk Ou se dekonekte @@ -101,4 +100,4 @@ Kont Aplikasyon yo Enfomasyon - \ No newline at end of file + diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 5239f4d5f..59c7afb76 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -58,7 +58,6 @@ Hozzáadás a tiltólistához Tiltólista Vissza - Alkalmaz Elfogadom Kijelentkezés az Aurorából Bejelentkezés ezzel @@ -102,9 +101,6 @@ Kérünk, tiltsd le a MIUI optimalizálást a telepítések engedélyezéséhez, vagy válaszd a root vagy Szolgáltatások telepítési módszert. A munkemeneti telepítő nem képes alkalmazásokat telepíteni a MIUI optimalizálás miatt. MIUI észlelve! - Javasoljuk, hogy használd az eszközhamisítást abban az esetben, ha újabb Huawei készüléked van. Szeretnéd most alkalmazni a hamisítást\? - Úgy tűnik, hogy Huawei eszközt használsz. A Google legutóbbi tiltásai miatt előfordulhat, hogy nem fogsz tudni bejelentkezni. - Huawei észlelve! Felhasználási feltételek Licensz Jogi nyilatkozat @@ -351,4 +347,4 @@ Shizuku telepítő Azta! Minden rendben. Az utolsó munkamenet törölve - \ No newline at end of file + diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index a33342b64..58d9746ad 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -27,7 +27,6 @@ Tambahkan ke daftar blokir Daftar blokir Kembali - Terapkan Bergabunglah di grup dukungan Aurora untuk diskusi dan saran. Telegram Keluar @@ -161,7 +160,6 @@ Pemasangan gagal Layanan Aurora tersedia dan siap dipasang. Tidak ada akses Root. Berikan aksesnya atau ubah pemasang. - Huawei terdeteksi! Ketentuan layanan Lisensi Penyanggahan @@ -262,7 +260,6 @@ Anda juga dapat memilih Pemasang asli, tetapi Anda tidak akan dapat menginstal APK yang dibundel (terpisah), jadi pilihan ada di tangan Anda. Harap nonaktifkan optimisasi MIUI untuk mengizinkan pemasangan, jika tidak, Anda dapat memilih pemasang Root atau Layanan. Pemasang sesi tidak dapat memasang aplikasi karena Optimisasi MIUI. - Kami sarankan untuk menggunakan spoof perangkat jika Anda memiliki perangkat Huawei terbaru. Apakah Anda ingin menerapkan spoof sekarang\? Pasang layanan Aurora 1.0.9 atau lebih baru atau ubah pemasang. Sedang tren Berbayar teratas @@ -270,7 +267,6 @@ Pemasang Aksen Aurora Store memerlukan izin sebagai berikut - Sepertinya Anda menggunakan perangkat Huawei, karena pelarangan baru dari Google Anda tidak dapat masuk. Atur layanan Aurora dan berikan seluruh izin terlebih dahulu. Pengunduhan Gagal Tidak dapat mengekspor konfigurasi perangkat @@ -351,4 +347,4 @@ Gagal mengambil laporan privasi Server tidak dapat dijangkau Gagal membuat sesi, kode error: %1$d - \ No newline at end of file + diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index ca938da0c..fcb61c668 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -69,7 +69,6 @@ Dipendente da GSF Applicazioni con annunci Applica - Applica Controllo della presenza di traccianti… Dati forniti da Exodus Non contiene traccianti @@ -223,9 +222,6 @@ Si prega di disabilitare le ottimizzazioni MIUI per consentire le installazioni, altrimenti è possibile scegliere l’installatore Root o Servizi. Non è possibile installare le applicazioni tramite l’installatore di sessione a causa delle ottimizzazioni MIUI. Dispositivo MIUI rilevato! - Ti suggeriamo di usare la simulazione del dispositivo in caso tu abbia un dispositivo Huawei recente. Vuoi applicare la simulazione ora\? - Sembra che tu stia usando un dispositivo Huawei: a causa dei recenti divieti di Google è possibile che tu non riesca ad accedere. - Dispositivo Huawei rilevato! Termini di servizio Licenza Avvertenza @@ -343,4 +339,4 @@ È disponibile una nuova versione di %1$s %1$s e %2$s %1$s, %2$s , %3$s e %4$d più - \ No newline at end of file + diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 3ed8f9aae..0a569ef12 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -47,9 +47,6 @@ インストールするにはMIUI optimizationを無効化するか、RootあるいはServiceインストーラを選択してください。 MIUI Optimizationのためセッションインストーラでアプリをインストールできません。 MIUI検出！ - 最近のファーウェイ製端末を使用している場合、端末偽装をおすすめします。偽装しますか？ - ファーウェイ検出！ - ファーウェイ製端末を使用しているようです。最近のGoogleの規制によりログインできない可能性があります。 利用規約 ライセンス 免責 @@ -167,7 +164,6 @@ ブラックリストに加える ブラックリスト 戻る - 適用 承認 Auroraからログアウトする 端末 @@ -351,4 +347,4 @@ プライバシーレポートの取得に失敗しました アクセスが拒否されました。VPNまたはTorを使用していませんか？ セッションの生成に失敗しました。エラーコード : %1$d - \ No newline at end of file + diff --git a/app/src/main/res/values-kab/strings.xml b/app/src/main/res/values-kab/strings.xml index 8cd7218a1..2afd6b48d 100644 --- a/app/src/main/res/values-kab/strings.xml +++ b/app/src/main/res/values-kab/strings.xml @@ -21,7 +21,6 @@ Telegram Google Ffeɣ seg Aurora - Snes Tuɣalin Rnu ɣer tebdart taberkant Sesfex @@ -65,4 +64,4 @@ Yettwasefsex Yettwasider-d Akk - \ No newline at end of file + diff --git a/app/src/main/res/values-kmr/strings.xml b/app/src/main/res/values-kmr/strings.xml index 6d0caf1f1..cddc38326 100644 --- a/app/src/main/res/values-kmr/strings.xml +++ b/app/src/main/res/values-kmr/strings.xml @@ -143,9 +143,6 @@ Ji kerema xwe, optimîzasyonên MIUI-yê nehêlin ku destûrê bidin sazkirinê, nexwe hûn dikarin sazkerê Root an Xizmetan hilbijêrin. Sazkerê danişînê ji ber Optîmîzasyonên MIUI nikare sepanan saz bike. MIUI kifş kir! - Em pêşniyar dikin ku hûn hacetê amûrekê Huawei-yê vê dawiyê bikar bînin ku hûn qelpezanî alavê bikar bînin. Ma hûn dixwazin nuha hîleyan bikin\? - Hûn xuya dikin ku hûn amûrek Huawei bikar tînin, ji ber qedexeyên vê dawiyê yên Google dibe ku hûn nekarin têkevin. - Huawei tesbît kirin! Mercên karûbar Lîsans Destkêşname @@ -220,7 +217,6 @@ Zêdekirin nav Lîsteya Reş Lîsteya reş Paş - Bikaranîn Baweranîn ji Aurora-yê derkeve Bikaranîna têketinê @@ -277,4 +273,4 @@ Hûn nikarin bi navgîniya Sazkerê Xwecihî sepanên hevgirtî (parvekirî) saz bikin. Sazkerê xwe bi Danişîn, Xizmet an Rehê biguherînin. Sepaneke lihevhatî nehat dîtin Kontrol bike - \ No newline at end of file + diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 79afa241c..e4371a5ab 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -44,7 +44,6 @@ 다음을 사용하여 로그인 오로라에서 로그아웃 받아들이다 - 적용 검사 지우기 닫기 @@ -133,4 +132,4 @@ 별 5개 별 1개 별 3개 - \ No newline at end of file + diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index fadce09c9..6a2e95835 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -10,7 +10,6 @@ F-Droid GitLab Telegram - Taikyti Atgal Eksportuoti Taikyti @@ -103,8 +102,6 @@ Privatumas Yra konfliktuojantis paketas Nesuderinama programėlė - Atrodo, kad naudojatės „Huawei“ įrenginiu. Dėl neseniai įsigaliojusių „Google“ draudimų, jums gali nepavykti prisijungti. - Aptiktas „Huawei“! Atsiuntimai Tamsus X Diegimo programa @@ -268,4 +265,4 @@ Purpurinė Žalia Šviesiai mėlyna - \ No newline at end of file + diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml index 43aa2c70a..86242ccca 100644 --- a/app/src/main/res/values-lv/strings.xml +++ b/app/src/main/res/values-lv/strings.xml @@ -55,7 +55,6 @@ Ethereum Telegram Pievienoties Beta programmai\? - Apstiprināt Pauzēt Publicēt Restartēt @@ -113,7 +112,6 @@ Nepietiek atmiņas Veiksmīgi uzstādīts Gaida lietotāja apstiprinājumu - Šķiet, ka tiek izmantota Huawei ierīce, tāpēc neseno Google aizliegumu dēļ, iespējams, nevarēs pieteikties. Pieejams jauns atjauninājums Ātrā notifikācija Izvēlaties @@ -181,7 +179,6 @@ Apturēt visas Turpināt visas Brīdinājums - Huawei detektēts! Ģenerālā notifikācija Papildus Aurora Store ir nepieciešamas šādas atļaujas @@ -314,7 +311,6 @@ Automātiska atjauninājumu pārbaudīšana Automātiski un regulāri pārbauda un paziņo par jauniem lietotņu atjauninājumiem Ārējās krātuves pārvaldnieks - Mēs iesakām izmantot ierīces atdarināšanu gadījumā, ja tiek izmantota nesena Huawei ierīce. Vai tagad pielietot atdarināšanu\? Lai saglabātu lejupielādes (APK un OBB), jāizgūst un jāievieto ierīces konfigurācijas no ārējās krātuves. Paziņojumi Notiekoša lejupielāde @@ -343,4 +339,4 @@ %1$s • API %2$s Nepieciešamās atļaujas tika noraidītas. Lūgums tās nodrošināt, lai turpinātu darbību Meklēt lietotnes un spēles - \ No newline at end of file + diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml index 11e4baeac..e583da8d6 100644 --- a/app/src/main/res/values-ml/strings.xml +++ b/app/src/main/res/values-ml/strings.xml @@ -49,7 +49,6 @@ സുവർണ്ണ കുറിച്ച് ഇളം നീല - പ്രയോഗിക്കുക നീല എന്റെ പ്രയോഗങ്ങളും കളികളും - \ No newline at end of file + diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index 1cdc9a962..a22d3fbf2 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -34,7 +34,6 @@ Velkommen Drakter Tilganger - Huawei oppdaget! Tjenestevilkår Lisens Ansvarsfraskrivelse @@ -125,7 +124,6 @@ Legg til i svartelisten Svartelist Tilbake - Bruk Godta Logg inn med Du er utlogget @@ -189,8 +187,6 @@ Aurora Store krever følgende tillatelser Ny oppdatering tilgjengelig MIUI oppdaget! - Vi foreslår at du bruker enhetspoof i tilfelle du har en nylig Huawei-enhet. Ønsker du å bruke spoof nå\? - Det ser ut til at du bruker en Huawei-enhet. På grunn av nylige forbud fra Google kan du kanskje ikke logge inn. Venter på brukerbekreftelse Installert Motstridende pakke eksisterer @@ -283,4 +279,4 @@ AM installatør. Installer App Manager eller endre installasjonsprogrammet. Anonym (usikkert) - \ No newline at end of file + diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 1a8e12864..d417ddfe2 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -19,12 +19,10 @@ Doneer met Bitcoin (BTC) Doneer met UPI U moet eerst de servicevoorwaarden lezen markeren. - U lijkt een Huawei apparaat te gebruiken, vanwege de recente verbanningen van Google zou u mogelijk niet kunnen inloggen. Geen root toegang. Geef het of verander de installateur. Verkrijg de Aurora Store broncode van Aurora OSS op GitLab. Haal de Aurora Store op F-Droid. Top hitlijsten - We adviseren u om apparaat vervalsing te gebruiken in het geval dat u een recent Huawei apparaat heeft. Wenst u deze vervalsing nu toe te passen\? Zoek Overig Applicatie bundel opslaan @@ -148,7 +146,6 @@ Schakel alstublieft MIUI optimalisatie uit voor het accepteren van installaties, kies anders Root of Service installatie. Session installateur kan geen apps installeren door MIUI Optimalisaties. MIUI gedetecteerd! - Huawei gedetecteerd! Servicevoorwaarden Licentie Waarschuwing @@ -256,7 +253,6 @@ Kijk na Afbreken Terug - Voeg toe Log uit van Aurora Login met Google diff --git a/app/src/main/res/values-pa/strings.xml b/app/src/main/res/values-pa/strings.xml index 3a1e31d39..3f0bc6c08 100644 --- a/app/src/main/res/values-pa/strings.xml +++ b/app/src/main/res/values-pa/strings.xml @@ -133,9 +133,6 @@ ਤੁਸੀਂ ਨੇਟਿਵ ਇੰਸਟਾਲਰ ਵੀ ਵਰਤ ਸਕਦੇ ਹੋ, ਪਰ ਉਸ ਜ਼ਰੀਏ ਤੁਸੀਂ split/bundled APK ਇੰਸਟਾਲ ਨਹੀਂ ਕਰ ਸਕਦੇ। ਸੋ ਫੈਸਲਾ ਤੁਹਾਡਾ ਹੈ ਤੁਸੀਂ ਕਿਸ ਇੰਸਟਾਲੇਸ਼ਨ ਵਿਧੀ ਨਾਲ ਜਾਣਾ ਚਾਹੁੰਦੇ ਹੋ। MIUI Optimizations ਕਾਰਨ ਤੁਸੀਂ ਸੈਸ਼ਨ ਐਪ ਇੰਸਟਾਲੇਸ਼ਨ ਵਿਧੀ ਜ਼ਰੀਏ ਐਪਸ ਇੰਸਟਾਲ ਨਹੀਂ ਕਰ ਸਕਦੇ। ਇਹ ਇੱਕ MIUI ਦਾ ਫੋਨ ਹੈ ! - ਜੇਕਰ ਤੁਹਾਡੇ ਕੋਲ ਨਵਾਂ Huawei ਦਾ ਫੋਨ ਹੈ ਤਾਂ ਸਾਡਾ ਸੁਝਾਅ ਹੈ ਕਿ ਤੁਸੀਂ ਡੀਵਾਇਸ ਧੋਖਾ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਜਾ ਕੇ ਫੋਨ ਮਾਡਲ ਨੂੰ ਬਦਲੋ। ਕੀ ਤੁਸੀਂ ਹੁਣੇ ਇਸ ਸੈਟਿੰਗ ਨੂੰ ਚਾਲੂ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ \? - ਇਹ ਇੱਕ Huawei ਦਾ ਫੋਨ ਲੱਗ ਰਿਹਾ ਹੈ, ਹਾਲ ਹੀ ਵਿੱਚ ਗੂਗਲ ਵਲੋਂ ਇਸ ਕੰਪਨੀ ਦੇ ਫੋਨ ਬੈਨ ਕਰ ਦਿੱਤੇ ਗਏ ਹਨ ਜਿਸ ਕਾਰਨ ਤੁਸੀਂ ਸ਼ਾਇਦ ਲੌਗ-ਇਨ ਨਾ ਕਰ ਪਾਓ। - ਇਹ ਇੱਕ Huawei ਦਾ ਫੋਨ ਹੈ ! ਸੇਵਾ ਦੀਆਂ ਸ਼ਰਤਾਂ ਲਾਈਸੈਂਸ ਬੇਦਾਅਵਾ @@ -256,7 +253,6 @@ ਬਲੈਕ ਲਿਸਟ ਵਿੱਚ ਸ਼ਾਮਿਲ ਕਰੋ ਬਲੈਕ ਲਿਸਟ ਪਿੱਛੇ - ਲਾਗੂ ਕਰੋ ਮੈਂ ਸਹਿਮਤ ਹਾਂ ਲੌਗ-ਆਊਟ ਕਰੋ ਕਿਰਪਾ ਕਰਕੇ ਲੌਗ-ਇਨ ਕਰਨ ਦਾ ਜ਼ਰੀਆ ਚੁਣੋ @@ -351,4 +347,4 @@ ਖੋਜ ਨਤੀਜੇ ਅੰਦਰੂਨੀ ਗਲਤੀ! ਕਿਰਪਾ ਕਰਕੇ ਕੁਝ ਸਮੇਂ ਬਾਅਦ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ ਸੈਸ਼ਨ ਬਣਾਉਣ ਵਿੱਚ ਅਸਫਲ, ਗਲਤੀ ਕੋਡ: %1$d - \ No newline at end of file + diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 645c196ad..2a16229a7 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -68,7 +68,6 @@ Dodaj do czarnej listy Czarna lista Wstecz - Zastosuj Akceptuj Wyloguj się z Aurory Zaloguj się za pomocą konta @@ -99,7 +98,6 @@ Zgoda udzielona Udziel zgody Wyłącz optymalizację MIUI, aby zezwolić na instalacje, w przeciwnym razie wybierz instalator root lub usługi Aurora. - Jeśli posiadasz jeden z nowszych modeli urządzenia firmy Huawei, sugerujemy skorzystać z opcji podmiany urządzenia. Czy chcesz teraz użyć funkcji podmiany urządzenia\? Opcjonalnie możesz wybrać natywny instalator, ale wtedy nie będziesz w stanie instalować pakietów APK (podzielonych), więc wybór należy do Ciebie. Zastosowano podmianę urządzenia. Przyznano uprawnienie @@ -200,8 +198,6 @@ Dostępna jest nowa aktualizacja Instalator sesji nie będzie mógł instalować aplikacji z powodu włączonej optymalizacji MIUI. Wykryto MIUI! - Wygląda na to, że używasz urządzenia firmy Huawei. Z powodu ograniczeń nałożonych przez Google, możesz nie być w stanie zalogować się do usług Google. - Wykryto Huawei! Warunki świadczenia usługi Licencja Zrzeczenie się odpowiedzialności @@ -351,4 +347,4 @@ Nie udało się wygenerować sesji, kod błędu: %1$d Wyniki wyszukiwania Nie udało się pobrać raportu prywatności - \ No newline at end of file + diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 43fb631ac..8320135a4 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -83,9 +83,6 @@ Por favor, desative as Otimizações MIUI para permitir as instalações, caso contrário, você pode escolher o instalador Root ou Serviços. O instalador de sessão não pode instalar aplicativos devido a Otimizações MIUI. MIUI detectado! - Sugerimos que você use a Simulação de dispositivo caso tenha um dispositivo Huawei recente. Você deseja aplicar a Simulação agora\? - Parece que você está usando um dispositivo Huawei, devido a recentes banimentos do Google, você pode não conseguir fazer o login. - Huawei detectado! Termos de serviço Licença Isenção de responsabilidade @@ -193,7 +190,6 @@ Cancelar Lista de bloqueio Voltar - Aplicar Aceitar Você está desconectado Anônimo @@ -351,4 +347,4 @@ Ops, você está com limite de taxa Servidor inalcançável Falhou em gerar sessão, código de erro: %1$d - \ No newline at end of file + diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index fa667122d..c5b991324 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -150,9 +150,6 @@ Opcionalmente, poderá escolher o instalador nativo, mas este não permite instalar conjuntos de APKs. Desative as otimizações MIUI para permitir instalações. Caso contrário, escolha os instaladores root ou de serviço. MIUI detetado! - Sugerimos que use um disfarce, caso possua um dispositivo Huawei recente. Deseja aplicar um disfarce agora\? - Parece que utiliza um dispositivo Huawei. Poderá não conseguir iniciar sessão devido à recente proibição da Google. - Huawei detetado! Termos do serviço Licença Isenção de responsabilidade @@ -268,7 +265,6 @@ Adicionar à lista negra Lista negra Recuar - Aplicar Aceitar Terminar sessão Iniciar sessão com @@ -343,4 +339,4 @@ A procurar atualizações Verificação automática de atualizações Procurar e notificar se existirem novas versões das aplicações - \ No newline at end of file + diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 89d796541..904d2302f 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -14,7 +14,6 @@ Consultă forumul XDA Aurora Store pentru discuții sau sugestii. Anonim Forum - Aplică Se salvează pachetul aplicației Întrerupe Jurnalul modificărilor @@ -52,8 +51,6 @@ Pozitiv Trei Instalare eșuată - Se pare că utilizezi un dispozitiv Huawei, din cauza interdicțiilor recente ale Google, este posibil să nu te poți conecta. - Îți sugerăm să utilizezi falsificarea dispozitivului în cazul în care ai un dispozitiv Huawei recent. Vrei să aplici falsificarea acum\? MIUI detectat! Programul de instalare a sesiunii nu poate instala aplicații din cauza optimizărilor MIUI. Dezactivează optimizările MIUI pentru a permite instalările, altfel poți alege programul de instalare Root sau Servicii. @@ -165,7 +162,6 @@ Termeni și condiții Există un pachet conflictual Licență - Huawei detectat! Aurora Store necesită următoarele permisiuni Accent Selectează ceea ce îți place @@ -343,4 +339,4 @@ %1$s și %2$s %1$s, %2$s, %3$s și încă %4$d %1$s, %2$s și %3$s - \ No newline at end of file + diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 6201c1e48..fb357f0e1 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -131,7 +131,6 @@ Убедитесь, что перезашли в аккаунт для применения подмены устройства Выберите целевой профиль для установки приложений. Работает только с методом root-установки Установка с помощью сессии (Android 5+) - Вам предлагается использовать подмену устройства, если у вас одна из новых моделей Huawei. Включить функцию подмены сейчас\? Условия предоставления услуг Положительный Отрицательный @@ -234,8 +233,6 @@ Отключите оптимизацию MIUI, чтобы разрешить установку. В ином случае вы можете выбрать root-установщик или сервисы Aurora. Установщик сеанса не может устанавливать приложения из-за оптимизации MIUI. Обнаружен MIUI! - Похоже, вы используете устройство Huawei, из-за недавних запретов Google вы не можете войти в аккаунт. - Обнаружен Huawei! Лицензия Отказ от ответственности Ожидание подтверждения пользователя @@ -250,7 +247,6 @@ Игнорировать версию Разное Применить - Применить Покупка приложений недоступна для анонимных аккаунтов. Незащищенный анонимный сеанс Убедитесь, что выполнили новый вход и перезапустили приложение для применения изменений. @@ -351,4 +347,4 @@ Не удалось создать сессию, код ошибки: %1$d Не удалось получить отчет о конфиденциальности Доступ запрещен! Вы используете VPN или Tor\? - \ No newline at end of file + diff --git a/app/src/main/res/values-sc/strings.xml b/app/src/main/res/values-sc/strings.xml index d4c6a61a4..f41123df3 100644 --- a/app/src/main/res/values-sc/strings.xml +++ b/app/src/main/res/values-sc/strings.xml @@ -7,7 +7,6 @@ Ses istadu iscollegadu Intra impreende Essi dae Aurora - Àplica In segus Annanghe a sa lista niedda Verìfica @@ -65,9 +64,6 @@ Creatzione de sa sessione fallida Esistit unu pachete in cunflitu Tretu in memòria chi non bastat - Huawei agatadu! - Paret chi tue sias impreende unu dispositivu Huawei. Pro neghe de sos blocos reghentes de Google podet dare chi non ti siat permìtidu de intrare. - Ti cussigiamus de impreare sa simulatzione de dispositivu s\'in casu tèngias unu dispositivu Huawei reghente. Boles impreare sa simulatzione como\? MIUI agatadu! S\'installadore de sessione non podet installare aplicatziones pro neghe de sas otimizatziones de MIUI. Inabìlita sas otimizatziones pro permìtere s\'installatzione, si nono podet isseberare s\'installadore de raighina o de sos servìtzios. @@ -296,4 +292,4 @@ Biaitu Disskord Frùsia Informatziones - \ No newline at end of file + diff --git a/app/src/main/res/values-si/strings.xml b/app/src/main/res/values-si/strings.xml index 56e91321d..f4fb9921d 100644 --- a/app/src/main/res/values-si/strings.xml +++ b/app/src/main/res/values-si/strings.xml @@ -12,7 +12,6 @@ වසන්න අවලංගු ආපසු - යොදන්න පිළිගන්න ගූගල් නිර්නාමික @@ -27,8 +26,6 @@ අවසර ඔබ කැමති දෑ තෝරන්න ක්‍ෂණික දැනුම්දීම - ඔබ හුආවෙයි උපාංගයක් භාවිතා කරන බව පෙනේ, ගූගල් විසින් මෑතකදී කරන ලද තහනම හේතුවෙන් ඔබට පූරනය වීමට නොහැකි විය හැකිය. - හුආවෙයි අනාවරණය විය! සේවාවේ නියම බලපත්‍රය වියාචනය @@ -239,7 +236,6 @@ අවුරෝරා සේවා 1.0.9 හෝ ඉහළ ස්ථාපනය, හෝ ස්ථාපකය වෙනස් කරන්න. අනනුකූල යෙදුමකි MIUI අනාවරණය විය! - ඔබ සතුව මෑත හුආවේ උපාංගයක් තිබෙන බැවින් උපාංග රැවටීම භාවිතයට යෝජනා කරන්නෙමු. එය දැන් යොදනවාද\?\? ඔබ යෙදුම යළිි ඇරඹූ පසු මෙම සැකසුම් යෙදෙනු ඇත පොදු දැනුම්දීම සුදුසු ස්ථාපකයක් තෝරන්න @@ -343,4 +339,4 @@ %1$s, %2$s හා %3$s %1$s හා %2$s %1$s, %2$s, %3$s හා තවත් %4$d - \ No newline at end of file + diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index e506c3bec..7b63f211b 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -24,7 +24,6 @@ Trenutno ste odjavljeni Odjavite se iz Aurora Strinjam se - Uporabi Nazaj Črni seznam Dodaj na črni seznam @@ -112,9 +111,6 @@ Zavrnitev odgovornosti Licenca Pogoji storitve - Videti je, da uporabljate napravo Huawei, zaradi nedavnih prepovedi Googla se morda ne boste mogli prijaviti. - Zaznana je naprava Huawei! - Predlagamo, da uporabite pretvarjanje, če imate novejšo napravo Huawei. Želite zdaj uporabiti pretvarjanje\? Zaznan je MIUI! Nameščanje s sejo ne more namestiti aplikacij zaradi optimizacij MIUI. Izberete lahko izvorni namestitveni program, vendar s tem ne morete namestiti svežnjev (razdeljenih) APK-jev. Izbira je vaša. @@ -158,4 +154,4 @@ Namestitev je bila blokirana Čakam na potrditev uporabnika Prosimo, izključite optimizacije MIUI, da omogočite nameščanje ali uporabite nameščanje s servisom ali korensko nameščanje. - \ No newline at end of file + diff --git a/app/src/main/res/values-so/strings.xml b/app/src/main/res/values-so/strings.xml index a88520cef..afbe0fdea 100644 --- a/app/src/main/res/values-so/strings.xml +++ b/app/src/main/res/values-so/strings.xml @@ -25,7 +25,6 @@ Xaqiiji inaad dib usoo gasho akoonka si uu iska-dhigdhigidu u hirgalo Iska-dhigida aalada waa la hirgaliyay. Maamulaha iska-dhigaha - Waxaan kuusoo jeedinaynaa inaad isticmaasho iska-dhidhigaha aallada lacala hadaad haysato Huawei noocyadii dambe. Ma rabtaa inaad iska-dhigiga hadda fuliso\? Liberapay Laxanibay Maamulaha xannibaada @@ -157,8 +156,6 @@ Fadlan xidh MIUI Optimizations si kushubidu ushaqayso, hadiikale waxaad dooran kartaa Root ama Adeega kushubaha. Kushubuhan kuma shubi karo wax app ah ayadooy ugu wacantahay MIUI Optimizations. Waxaad isticmaalaysaa MIUI! - Waxay umuuqataa inaad isticmaalayso aallad Huawei ah, ayadooy ugu wacantahay xannibaad ay Google kusoo rogtay, ma gali kartid akoonka. - Huawei ayaad isticmaalaysaa! Shuruudaha adeega Laysan Afeef @@ -266,7 +263,6 @@ Hubi Kanoqo Kanoqo - Fulli Aqbal Kabax Aurora Gal adoo isticmaalaya @@ -280,4 +276,4 @@ Ugu deeq xaga PayPal PayPal Noqo taageere xaga Liberapay - \ No newline at end of file + diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml index 54e069b13..00dcc2298 100644 --- a/app/src/main/res/values-sq/strings.xml +++ b/app/src/main/res/values-sq/strings.xml @@ -34,7 +34,6 @@ Bëni hyrjen duke përdorur Dil nga Aurora Pranoje - Aplikoje Mbprasht Listë bllokimesh Shtoje në Listë Bllokimesh @@ -151,9 +150,6 @@ Klauzolë Licencë Kushte shërbimi - U pikas Huawei! - Duket sikur po përdorni një pajisje Huawei, për shkak dëbimesh të fundit nga Google, mund të mos jeni në gjendje të bëni hyrjen. - Sugjerojmë të përdorni maskim pajisjeje, në rast se keni një pajisje Huawei nga të fundit. Doni të aplikohet maskim tani\? U pikas MIUI! Instaluesi i sesionit s’mund të instalojë aplikacione, për shkak Optimizimesh MIUI. Ju lutemi, çaktivizoni optimizimet MIUI, që të lejohen instalime, ndryshe mund të zgjidhni instalues Rrënjë ose Shërbimesh. @@ -295,4 +291,4 @@ Anonime (jo e sigurt) Instalues AM. Instaloni Përgjegjës Aplikacionesh, ose ndryshoni instaluesin. - \ No newline at end of file + diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index dfb76845b..b455561f2 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -105,9 +105,6 @@ Молимо вас, онемогућите MIUI оптимизацију да бисте дозволили инсталације, у супротном можете да изаберете Root или инсталатор услуга. Инсталатор сесије не може да инсталира апликације због MIUI оптимизација. Откривен MIUI! - Предлажемо вам да користите подваљавање уређаја у случају да имате новији Huawei уређај. Да ли желите да примените подваљавање уређаја сада\? - Изгледа да користите Huawei уређај, због недавних забрана од стране Google-а можда нећете моћи да се пријавите. - Откривен Huawei! Услови коришћења Лиценца Изјава о одрицању одговорности @@ -226,7 +223,6 @@ Додај на црну листу Црна листа Назад - Примени Прихвати Одјава из Ауроре Пријави се користећи @@ -277,4 +273,4 @@ Конфигурација уређаја је успешно извезена Омогућите за проверу ажурирања за онемогућене апликације Проширена ажурирања - \ No newline at end of file + diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 51aa4fd57..bf643cd90 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -92,8 +92,6 @@ Snabb avisering Ny uppdatering tillgänglig MIUI upptäckt! - Du verkar använda en Huawei-enhet, på grund av de senaste bannlysningarna från Google så kanske du inte kan logga in. - Huawei upptäckt! Tjänstevillkor Licens Väntar på användarens bekräftelse @@ -201,7 +199,6 @@ Lägg till i Svartlista Svartlista Bakåt - Verkställ Acceptera Logga ut från Aurora Du är utloggad @@ -259,7 +256,6 @@ Påtvinga rensning av installations-sessioner Skicka in Alternativt kan du välja Inbyggt installationsprogram, men då kan du inte installera buntade (delade) APK-filer, så valet är ditt. - Vi föreslår att du använder enhetsförfalskning om du skulle ha den senaste Huawei-enheten. Vill du verkställa förfalskning nu\? Ställ in Aurora-tjänster och godkänn alla åtkomster först. Snälla du, inaktivera MIUI-optimeringar för att tillåta installationer, annars kan du välja Root eller installationsprogrammet för Tjänster. Anonymt (osäkert) @@ -296,4 +292,4 @@ Aktivera utvecklingsinställningarna från enhetens inställningar för att öppna dem. Enhetsförfalskning tillämpades. Aktiverar app-nedladdningar i bakgrunden - \ No newline at end of file + diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index b39c5ec04..38975da0f 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -41,7 +41,6 @@ வடிகட்டிகள் ஏற்றுமதி பின்செல்க - விண்ணப்பிக்கவும் ஏற்றுக்கொள் அரோராவிலிருந்து வெளியேறவும் பயன்படுத்தி உள்நுழையவும் @@ -67,7 +66,6 @@ Ethereum (ETH) வழியாக நன்கொடை அளிக்கவும் ஈத்யூரம் வெண்பட்டியல் - நீங்கள் Huawei சாதனத்தைப் பயன்படுத்துவதாகத் தெரிகிறது, Google இன் அண்மை தடைகள் காரணமாக உங்களால் உள்நுழைய முடியாமல் போகலாம். நிறுவல் நீக்கு எல்லாம் புதுப்பி பீட்டா திட்டம் @@ -89,9 +87,7 @@ நிறுவல் தடுக்கப்பட்டது செல்லாத அல்லது சிதைந்த APK வெற்றிகரமாக நிறுவப்பட்டது - Huawei கண்டறியப்பட்டது! ஒன்று - உங்களிடம் சமீபத்திய Huawei சாதனம் இருந்தால், டிவைஸ் ஸ்பூப் பயன்படுத்துமாறு பரிந்துரைக்கிறோம். நீங்கள் இப்போது ஸ்பூஃப் விண்ணப்பிக்க விரும்புகிறீர்களா\? நிறுவல்களை அனுமதிக்க, MIUI மேம்படுத்தல்களை முடக்கவும், இல்லையெனில் நீங்கள் ரூட் அல்லது சேவைகள் நிறுவியை தேர்வு செய்யலாம். பொறுப்புத்துறப்பு விருப்பமாக நீங்கள் நேட்டிவ் இன்ஸ்டாலரைத் தேர்வு செய்யலாம், ஆனால் நீங்கள் தொகுக்கப்பட்ட (பிளவு) APKகளை நிறுவ முடியாது, எனவே தேர்வு உங்களுடையது. @@ -295,4 +291,4 @@ டிசுகார்டு நீலம் கரு நீலம் ஃபியூசியா - \ No newline at end of file + diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 2253e9255..c9506db7e 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -10,7 +10,6 @@ Kara Liste Kara listeye ekle Geri - Uygula Kabul et Aurora\'dan çıkış yap Şununla giriş yap @@ -151,9 +150,6 @@ Lütfen kurulumlara izin vermek için MIUI iyileştirmelerini devre dışı bırakın, ya da Kök veya Hizmetler kurucusunu seçebilirsiniz. Oturum kurucu, MIUI iyileştirmeleri nedeniyle uygulamaları kuramıyor. MIUI algılandı! - Güncel Huawei modellerinde kandırıcıyı kullanmanı öneriyoruz. Kandırıcıyı kullanmak ister misin\? - Huawei kullanıyorsunuz gibi görünüyor, Google\'ın kısıtlamalarından dolayı giriş yapamayabilirsiniz. - Huawei algılandı! Hizmet koşulları Lisans Sorumluluk reddi @@ -351,4 +347,4 @@ Gizlilik raporu alınamadı Erişim reddedildi! VPN veya Tor kullanıyor musunuz\? Dahili hata! Lütfen bir süre sonra tekrar deneyin - \ No newline at end of file + diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 7a1030e47..b870c7dd6 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -98,7 +98,6 @@ Додати до чорного списку Чорний список Назад - Застосувати Погодитись Вийти з Aurora Увійти за допомогою @@ -235,9 +234,6 @@ Вимкніть оптимізацію MIUI, щоб дозволити встановлення, інакше ви можете вибрати встановлювач Root або Services. Встановлювач Android не може встановлювати застосунки через оптимізацію MIUI. Виявлено MIUI! - Ми радимо користуватися функцією підміни пристрою, якщо у вас новіший пристрій Huawei. Ви хочете застосувати функцію підміни зараз\? - Здається, ви користуєтеся пристроєм Huawei, через нещодавні заборони Google ви не зможете ввійти в систему. - Виявлено Huawei! Умови надання послуг Ліцензія Відмова від відповідальності @@ -351,4 +347,4 @@ Не вдалося згенерувати сеанс, код помилки: %1$d Внутрішня помилка! Повторіть спробу трохи згодом Сервер недоступний - \ No newline at end of file + diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 14cdcca17..ba6baec2a 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -63,7 +63,6 @@ Thêm vào Danh sách đen Danh sách đen Trở về - Áp dụng Chấp nhận Đăng xuất khỏi Aurora Đăng nhập bằng @@ -195,12 +194,9 @@ Vui lòng tắt tối ưu hóa MIUI để có thể cài đặt, nếu không, bạn có thể chọn trình cài đặt Root hoặc Trình cài đặt dịch vụ. Trình cài đặt phiên không thể cài đặt ứng dụng do có Tối ưu hóa MIUI. Đã phát hiện MIUI! - Chúng tôi đề xuất bạn sử dụng giả mạo thiết bị trong trường hợp bạn đang dùng Huawei. Bạn có muốn áp dụng giả mạo ngay bây giờ\? Chọn những gì bạn thích Aurora Store yêu cầu các quyền sau Chọn trình cài đặt tương thích - Có vẻ bạn đang dùng thiết bị của Huawei, do lệnh cấm gần đây của Google bạn có thể sẽ không đăng nhập được. - Đã phát hiện Huawei! Điều khoản dịch vụ Giấy phép Từ chối trách nhiệm @@ -343,4 +339,4 @@ Có phiên bản mới cho %1$s Kiểm tra cập nhật tự động Mở kết quả tìm kiếm trong tab tùy chỉnh của trình duyệt - \ No newline at end of file + diff --git a/app/src/main/res/values-yue/strings.xml b/app/src/main/res/values-yue/strings.xml index 1a62d26ae..7f2ffbf98 100644 --- a/app/src/main/res/values-yue/strings.xml +++ b/app/src/main/res/values-yue/strings.xml @@ -8,7 +8,6 @@ 您已經登出咗 登出 Aurora 接受 - 套用 返轉頭 取消 檢查 @@ -209,4 +208,4 @@ 粉紅 橙色 Shizuku 未安裝或者未設定好。 - \ No newline at end of file + diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 525ec9831..d5c357200 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -117,7 +117,6 @@ 通过 UPI 捐款 BHIM - UPI PayPal - 应用 禁用 拒绝 复制链接 @@ -235,9 +234,6 @@ 请禁用 MIUI 优化以允许安装，否则，您可以选择 Root 或 Services 安装程序。 由于 MIUI 优化，会话安装程序 (Session) 无法安装应用。 检测到 MIUI！ - 如果您有最近的华为设备，我们建议您使用设备伪装。立即使用伪装吗？ - 您似乎正在使用华为设备，由于 Google 最近的禁令，您可能无法登录。 - 检测到华为设备！ 服务条款 许可证 免责声明 @@ -351,4 +347,4 @@ 啊偶，你被限制速率了 服务器不可达 未能生成会话，错误码：%1$d - \ No newline at end of file + diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 195c54817..055f6cc69 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -44,7 +44,6 @@ 加入黑名單 黑名單 返回 - 套用 接受 登出 Aurora 登入通過 @@ -192,9 +191,6 @@ 另外你可以選原生安裝器，但如此你就無法安裝分裂的 APK 了，所以由你決定。 請禁用 MIUI 最佳化以允許安裝，另外你可以選 Root 或者 Aurora 服務安裝器。 偵測到 MIUI！ - 由於你用著華為電話，我們建議你使用設備偽裝，你想不想？ - 你好似用著華為裝置，由於 Google 的禁令，你可能無法登入。 - 偵測到華為！ 服務條款 授權執照 免責聲明 @@ -343,4 +339,4 @@ 登入並享用。 紅色 有更新可用 - \ No newline at end of file + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 36e4ff84b..c8a6b954c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -46,7 +46,6 @@ Log in using Log out from Aurora "Accept" - "Apply" "Back" "Blacklist" "Add to Blacklist" @@ -176,9 +175,6 @@ "Disclaimer" "License" "Terms of service" - "Huawei detected!" - "You seem to be using a Huawei device, due to recent bans by Google you may not be able to login." - "We suggest you to use device spoof in case you have a recent Huawei device. Do you wish to apply spoof now?" "MIUI detected!" "Session installer can not install apps due to MIUI Optimizations." "Please, disable MIUI optimizations to allow installations, otherwise you can choose Root or Services installer." From 6e11229f4910a3a59c5bb1c3878d7ccdd9fa9eca Mon Sep 17 00:00:00 2001 From: Aayush Gupta Date: Mon, 7 Aug 2023 15:49:15 +0530 Subject: [PATCH 11/14] InstallErrorDialogSheet: Migrate to navigation components Signed-off-by: Aayush Gupta --- .../view/ui/details/AppDetailsFragment.kt | 17 ++--- .../view/ui/sheets/InstallErrorDialogSheet.kt | 64 +++---------------- .../main/res/navigation/mobile_navigation.xml | 21 ++++++ 3 files changed, 37 insertions(+), 65 deletions(-) diff --git a/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsFragment.kt b/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsFragment.kt index 1252ed740..647c39707 100644 --- a/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsFragment.kt +++ b/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsFragment.kt @@ -90,7 +90,6 @@ import com.aurora.store.view.epoxy.views.details.ReviewViewModel_ import com.aurora.store.view.epoxy.views.details.ScreenshotView import com.aurora.store.view.epoxy.views.details.ScreenshotViewModel_ import com.aurora.store.view.ui.commons.BaseFragment -import com.aurora.store.view.ui.sheets.InstallErrorDialogSheet import com.aurora.store.viewmodel.details.AppDetailsViewModel import com.aurora.store.viewmodel.details.DetailsClusterViewModel import com.bumptech.glide.load.resource.bitmap.RoundedCorners @@ -221,16 +220,14 @@ class AppDetailsFragment : BaseFragment(R.layout.fragment_details) { } is InstallerEvent.Failed -> { - if (app.packageName == event.packageName) { - InstallErrorDialogSheet.newInstance( + findNavController().navigate( + AppDetailsFragmentDirections.actionAppDetailsFragmentToInstallErrorDialogSheet( app, - event.packageName, - event.error, - event.extra - ).show(childFragmentManager, "SED") - attachActions() - updateActionState(State.IDLE) - } + event.packageName ?: "", + event.error ?: "", + event.extra ?: "" + ) + ) } else -> { diff --git a/app/src/main/java/com/aurora/store/view/ui/sheets/InstallErrorDialogSheet.kt b/app/src/main/java/com/aurora/store/view/ui/sheets/InstallErrorDialogSheet.kt index 77f814298..58c9c27e2 100644 --- a/app/src/main/java/com/aurora/store/view/ui/sheets/InstallErrorDialogSheet.kt +++ b/app/src/main/java/com/aurora/store/view/ui/sheets/InstallErrorDialogSheet.kt @@ -23,11 +23,10 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import com.aurora.Constants +import androidx.navigation.fragment.navArgs import com.aurora.extensions.copyToClipBoard import com.aurora.extensions.load import com.aurora.extensions.toast -import com.aurora.gplayapi.data.models.App import com.aurora.store.R import com.aurora.store.databinding.SheetInstallErrorBinding import com.bumptech.glide.load.resource.bitmap.CircleCrop @@ -36,35 +35,7 @@ class InstallErrorDialogSheet : BaseBottomSheet() { private lateinit var B: SheetInstallErrorBinding - private lateinit var app: App - private lateinit var title: String - private lateinit var error: String - private lateinit var extra: String - - private var rawApp = String() - - companion object { - private const val DIALOG_TITLE = "DIALOG_TITLE" - private const val DIALOG_ERROR = "DIALOG_ERROR" - private const val DIALOG_EXTRA = "DIALOG_EXTRA" - - @JvmStatic - fun newInstance( - app: App, - title: String?, - error: String?, - extra: String? - ): InstallErrorDialogSheet { - return InstallErrorDialogSheet().apply { - arguments = Bundle().apply { - putString(Constants.STRING_EXTRA, gson.toJson(app)) - putString(DIALOG_TITLE, title) - putString(DIALOG_ERROR, error) - putString(DIALOG_EXTRA, extra) - } - } - } - } + private val args: InstallErrorDialogSheetArgs by navArgs() override fun onCreateContentView( inflater: LayoutInflater, @@ -72,22 +43,7 @@ class InstallErrorDialogSheet : BaseBottomSheet() { savedInstanceState: Bundle? ): View { B = SheetInstallErrorBinding.inflate(inflater, container, false) - - val bundle = arguments - bundle?.let { - rawApp = bundle.getString(Constants.STRING_EXTRA, "{}") - app = gson.fromJson(rawApp, App::class.java) - title = bundle.getString(DIALOG_TITLE, "") - error = bundle.getString(DIALOG_ERROR, "") - extra = bundle.getString(DIALOG_EXTRA, "") - - if (app.packageName.isNotEmpty()) { - inflateData() - } else { - dismissAllowingStateLoss() - } - } - + inflateData() attachAction() return B.root @@ -98,13 +54,13 @@ class InstallErrorDialogSheet : BaseBottomSheet() { } private fun inflateData() { - B.imgIcon.load(app.iconArtwork.url) { + B.imgIcon.load(args.app.iconArtwork.url) { transform(CircleCrop()) } - B.txtLine1.text = app.displayName - B.txtLine2.text = error - B.txtLine3.text = extra + B.txtLine1.text = args.app.displayName + B.txtLine2.text = args.error + B.txtLine3.text = args.extra } private fun attachAction() { @@ -113,10 +69,8 @@ class InstallErrorDialogSheet : BaseBottomSheet() { } B.btnSecondary.setOnClickListener { - if (::extra.isInitialized) { - requireContext().copyToClipBoard(extra) - requireContext().toast(R.string.toast_clipboard_copied) - } + requireContext().copyToClipBoard(args.extra) + requireContext().toast(R.string.toast_clipboard_copied) } } } diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml index e33edf671..77b48523c 100644 --- a/app/src/main/res/navigation/mobile_navigation.xml +++ b/app/src/main/res/navigation/mobile_navigation.xml @@ -196,6 +196,9 @@ + + + + + + + From 0030e959d15b713c490e74e11dbb7b4fc87a2e3e Mon Sep 17 00:00:00 2001 From: Aayush Gupta Date: Mon, 7 Aug 2023 20:49:43 +0530 Subject: [PATCH 12/14] Drop dependency upon Merlin Use ConnectivityManager to monitor network status. This does takes away the ability to auto-retry requests when network is restored but we can look into that later on. Signed-off-by: Aayush Gupta --- app/build.gradle | 4 - .../com/aurora/store/AuroraApplication.kt | 19 --- .../java/com/aurora/store/MainActivity.kt | 66 +++++------ .../aurora/store/data/model/NetworkStatus.kt | 6 + .../store/data/providers/NetworkProvider.kt | 111 +++++++----------- .../store/viewmodel/BaseAndroidViewModel.kt | 25 +--- settings.gradle | 4 +- 7 files changed, 81 insertions(+), 154 deletions(-) create mode 100644 app/src/main/java/com/aurora/store/data/model/NetworkStatus.kt diff --git a/app/build.gradle b/app/build.gradle index 0d71e4b11..7aa5fee4c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -155,9 +155,6 @@ dependencies { implementation "com.airbnb.android:epoxy:$epoxy_version" kapt "com.airbnb.android:epoxy-processor:$epoxy_version" - //Merlin - implementation "com.novoda:merlin:1.2.1" - //HTTP Clients implementation "com.squareup.okhttp3:okhttp:4.11.0" @@ -176,7 +173,6 @@ dependencies { //Browser implementation 'androidx.browser:browser:1.5.0' - //Shizuku def shizuku_version = '13.1.1' compileOnly "dev.rikka.hidden:stub:4.2.0" diff --git a/app/src/main/java/com/aurora/store/AuroraApplication.kt b/app/src/main/java/com/aurora/store/AuroraApplication.kt index a64276b52..cb118f149 100644 --- a/app/src/main/java/com/aurora/store/AuroraApplication.kt +++ b/app/src/main/java/com/aurora/store/AuroraApplication.kt @@ -28,7 +28,6 @@ import androidx.appcompat.app.AppCompatDelegate import com.aurora.Constants import com.aurora.extensions.isPAndAbove import com.aurora.store.data.downloader.DownloadManager -import com.aurora.store.data.providers.NetworkProvider import com.aurora.store.data.receiver.PackageManagerReceiver import com.aurora.store.data.service.NotificationService import com.aurora.store.util.CommonUtil @@ -71,27 +70,9 @@ class AuroraApplication : Application() { //Register broadcast receiver for package install/uninstall registerReceiver(packageManagerReceiver, PackageUtil.getFilter()) - NetworkProvider - .with(this) - .bind() - CommonUtil.cleanupInstallationSessions(applicationContext) } - override fun onTerminate() { - NetworkProvider - .with(this) - .unbind() - super.onTerminate() - } - - override fun onLowMemory() { - NetworkProvider - .with(this) - .unbind() - super.onLowMemory() - } - private fun createNotificationChannel() { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { val notificationManager = getSystemService(NOTIFICATION_SERVICE) as NotificationManager diff --git a/app/src/main/java/com/aurora/store/MainActivity.kt b/app/src/main/java/com/aurora/store/MainActivity.kt index f7c9d6738..ed183dabf 100644 --- a/app/src/main/java/com/aurora/store/MainActivity.kt +++ b/app/src/main/java/com/aurora/store/MainActivity.kt @@ -39,7 +39,9 @@ import androidx.appcompat.app.AppCompatActivity import androidx.core.content.ContextCompat import androidx.core.graphics.ColorUtils import androidx.core.view.GravityCompat +import androidx.lifecycle.Lifecycle import androidx.lifecycle.lifecycleScope +import androidx.lifecycle.repeatOnLifecycle import androidx.navigation.NavController import androidx.navigation.NavDestination import androidx.navigation.fragment.NavHostFragment @@ -50,6 +52,7 @@ import androidx.navigation.ui.setupWithNavController import com.aurora.Constants import com.aurora.extensions.* import com.aurora.gplayapi.data.models.AuthData +import com.aurora.store.data.model.NetworkStatus import com.aurora.store.data.model.SelfUpdate import com.aurora.store.data.providers.AuthProvider import com.aurora.store.data.providers.NetworkProvider @@ -68,7 +71,7 @@ import kotlinx.coroutines.launch import java.lang.reflect.Modifier -class MainActivity : AppCompatActivity(), NetworkProvider.NetworkListener { +class MainActivity : AppCompatActivity() { private lateinit var B: ActivityMainBinding private lateinit var navController: NavController @@ -92,32 +95,6 @@ class MainActivity : AppCompatActivity(), NetworkProvider.NetworkListener { private lateinit var appConfig: AppBarConfiguration - override fun onConnected() { - runOnUiThread { - if (!supportFragmentManager.isDestroyed) { - val fragment = supportFragmentManager.findFragmentByTag(NetworkDialogSheet.TAG) - fragment?.let { - supportFragmentManager.beginTransaction().remove(fragment) - .commitAllowingStateLoss() - } - } - } - } - - override fun onDisconnected() { - runOnUiThread { - if (!supportFragmentManager.isDestroyed) { - supportFragmentManager.beginTransaction() - .add(NetworkDialogSheet.newInstance(), NetworkDialogSheet.TAG) - .commitAllowingStateLoss() - } - } - } - - override fun onReconnected() { - - } - companion object { @JvmStatic private fun matchDestination( @@ -142,6 +119,31 @@ class MainActivity : AppCompatActivity(), NetworkProvider.NetworkListener { setContentView(B.root) + this.lifecycleScope.launch { + NetworkProvider(this@MainActivity).networkStatus.collect { + when(it) { + NetworkStatus.AVAILABLE -> { + if (!supportFragmentManager.isDestroyed) { + val fragment = supportFragmentManager + .findFragmentByTag(NetworkDialogSheet.TAG) + fragment?.let { + supportFragmentManager.beginTransaction() + .remove(fragment) + .commitAllowingStateLoss() + } + } + } + NetworkStatus.LOST -> { + if (!supportFragmentManager.isDestroyed) { + supportFragmentManager.beginTransaction() + .add(NetworkDialogSheet.newInstance(), NetworkDialogSheet.TAG) + .commitAllowingStateLoss() + } + } + } + } + } + authData = AuthProvider.with(this).getAuthData() // Toolbar @@ -290,14 +292,4 @@ class MainActivity : AppCompatActivity(), NetworkProvider.NetworkListener { sheet.show(supportFragmentManager, SelfUpdateSheet.TAG) } } - - override fun onStart() { - super.onStart() - NetworkProvider.addListener(this) - } - - override fun onStop() { - NetworkProvider.removeListener(this) - super.onStop() - } } diff --git a/app/src/main/java/com/aurora/store/data/model/NetworkStatus.kt b/app/src/main/java/com/aurora/store/data/model/NetworkStatus.kt new file mode 100644 index 000000000..b5c687b26 --- /dev/null +++ b/app/src/main/java/com/aurora/store/data/model/NetworkStatus.kt @@ -0,0 +1,6 @@ +package com.aurora.store.data.model + +enum class NetworkStatus { + AVAILABLE, + LOST +} diff --git a/app/src/main/java/com/aurora/store/data/providers/NetworkProvider.kt b/app/src/main/java/com/aurora/store/data/providers/NetworkProvider.kt index 4d7150cf1..268b3c9ef 100644 --- a/app/src/main/java/com/aurora/store/data/providers/NetworkProvider.kt +++ b/app/src/main/java/com/aurora/store/data/providers/NetworkProvider.kt @@ -20,82 +20,57 @@ package com.aurora.store.data.providers import android.content.Context -import com.aurora.store.data.SingletonHolder -import com.aurora.store.util.Log -import com.novoda.merlin.Merlin +import android.net.ConnectivityManager +import android.net.Network +import android.net.NetworkCapabilities +import android.net.NetworkRequest +import android.util.Log +import com.aurora.extensions.isMAndAbove +import com.aurora.store.data.model.NetworkStatus +import kotlinx.coroutines.DelicateCoroutinesApi +import kotlinx.coroutines.GlobalScope +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.flow.launchIn -class NetworkProvider(var context: Context) { +@OptIn(DelicateCoroutinesApi::class) +class NetworkProvider(context: Context) { - companion object : SingletonHolder(::NetworkProvider) { + private val TAG = NetworkProvider::class.java.simpleName - private var networkListeners: MutableList = mutableListOf() + private val _networkStatus = MutableStateFlow(NetworkStatus.AVAILABLE) + val networkStatus = _networkStatus.asStateFlow() - fun addListener(networkListener: NetworkListener) { - Log.i("Network-Provider added to ${networkListener.javaClass.simpleName}") - networkListeners.add(networkListener) - } + private val connectivityManager = + context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager - fun removeListener(networkListener: NetworkListener) { - Log.i("Network-Provider removed from ${networkListener.javaClass.simpleName}") - networkListeners.remove(networkListener) - } + init { + networkStatus.launchIn(GlobalScope) + + // Monitor network + connectivityManager.registerNetworkCallback(getNetworkRequest(), + object : ConnectivityManager.NetworkCallback() { + override fun onAvailable(network: Network) { + super.onAvailable(network) + Log.d(TAG, "Network available!") + _networkStatus.value = NetworkStatus.AVAILABLE + } + + override fun onLost(network: Network) { + super.onLost(network) + Log.d(TAG, "Network unavailable!") + _networkStatus.value = NetworkStatus.LOST + } + }) } - private var merlin: Merlin = Merlin.Builder() - .withAllCallbacks() - .build(context) + private fun getNetworkRequest(): NetworkRequest { + val networkRequest = NetworkRequest.Builder() + .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) - private var isDisconnected = true - - fun bind() { - merlin.bind() - - merlin.registerConnectable { - if (isDisconnected) { - isDisconnected = false - onReConnected() - } else { - onConnected() - } + if (isMAndAbove()) { + networkRequest.addCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED) } - - merlin.registerDisconnectable { - isDisconnected = true - onDisconnected() - } - } - - fun unbind() { - networkListeners.clear() - merlin.unbind() - Log.i("Network-Provider destroyed") - } - - private fun onConnected() { - Log.i("Network-Provider connected") - isDisconnected = false - networkListeners.forEach { - it.onConnected() - } - } - - private fun onReConnected() { - Log.i("Network-Provider reconnected") - networkListeners.forEach { - it.onReconnected() - } - } - - private fun onDisconnected() { - Log.e("Network-Provider disconnected") - networkListeners.forEach { - it.onDisconnected() - } - } - - interface NetworkListener { - fun onConnected() - fun onDisconnected() - fun onReconnected() + return networkRequest.build() } } diff --git a/app/src/main/java/com/aurora/store/viewmodel/BaseAndroidViewModel.kt b/app/src/main/java/com/aurora/store/viewmodel/BaseAndroidViewModel.kt index 7501f9675..239412364 100644 --- a/app/src/main/java/com/aurora/store/viewmodel/BaseAndroidViewModel.kt +++ b/app/src/main/java/com/aurora/store/viewmodel/BaseAndroidViewModel.kt @@ -33,10 +33,7 @@ import java.lang.reflect.Modifier import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach -abstract class BaseAndroidViewModel(application: Application) : AndroidViewModel(application), - NetworkProvider.NetworkListener { - - private lateinit var networkListener: NetworkProvider.NetworkListener +abstract class BaseAndroidViewModel(application: Application) : AndroidViewModel(application) { val responseCode = HttpClient.getPreferredClient().responseCode @@ -51,26 +48,12 @@ abstract class BaseAndroidViewModel(application: Application) : AndroidViewModel requestState = RequestState.Init - NetworkProvider.addListener(this) - // Start collecting response code for requests responseCode.launchIn(viewModelScope) } abstract fun observe() - override fun onConnected() { - - } - - override fun onDisconnected() { - - } - - override fun onReconnected() { - redoLastNetworkTask() - } - private fun redoLastNetworkTask() { when (requestState) { RequestState.Pending -> { @@ -81,10 +64,4 @@ abstract class BaseAndroidViewModel(application: Application) : AndroidViewModel } } } - - override fun onCleared() { - Log.i("${javaClass.simpleName} Destroyed") - NetworkProvider.removeListener(this) - super.onCleared() - } } diff --git a/settings.gradle b/settings.gradle index 86276b882..d90c9ec0f 100644 --- a/settings.gradle +++ b/settings.gradle @@ -29,7 +29,7 @@ dependencyResolutionManagement { repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories { google() - jcenter() // Required for com.novoda:merlin:1.2.0 + jcenter() // Required for androidx.tonyodev.fetch2 mavenCentral() maven { name 'JitPack' @@ -42,4 +42,4 @@ dependencyResolutionManagement { } } include ':app' -rootProject.name = "AuroraStore4" \ No newline at end of file +rootProject.name = "AuroraStore4" From bd7f31858c76b607ddbbfc730bbd212d0e9b3f36 Mon Sep 17 00:00:00 2001 From: Aayush Gupta Date: Tue, 8 Aug 2023 12:09:10 +0530 Subject: [PATCH 13/14] NetworkDialogSheet: Show option to check internet connectivity instead Signed-off-by: Aayush Gupta --- .../view/ui/sheets/NetworkDialogSheet.kt | 20 +++++++++++-- app/src/main/res/layout/sheet_network.xml | 29 ++++++++++--------- app/src/main/res/values-ar/strings.xml | 1 - app/src/main/res/values-ast/strings.xml | 1 - app/src/main/res/values-az/strings.xml | 1 - app/src/main/res/values-bg/strings.xml | 1 - app/src/main/res/values-ca/strings.xml | 1 - app/src/main/res/values-ckb/strings.xml | 1 - app/src/main/res/values-cs/strings.xml | 1 - app/src/main/res/values-da/strings.xml | 1 - app/src/main/res/values-de/strings.xml | 1 - app/src/main/res/values-el/strings.xml | 1 - app/src/main/res/values-eo/strings.xml | 1 - app/src/main/res/values-es/strings.xml | 1 - app/src/main/res/values-eu/strings.xml | 1 - app/src/main/res/values-fa/strings.xml | 1 - app/src/main/res/values-fi/strings.xml | 1 - app/src/main/res/values-fr/strings.xml | 1 - app/src/main/res/values-gl/strings.xml | 1 - app/src/main/res/values-he/strings.xml | 1 - app/src/main/res/values-hi/strings.xml | 1 - app/src/main/res/values-hr/strings.xml | 1 - app/src/main/res/values-hu/strings.xml | 1 - app/src/main/res/values-id/strings.xml | 1 - app/src/main/res/values-it/strings.xml | 1 - app/src/main/res/values-ja/strings.xml | 1 - app/src/main/res/values-kmr/strings.xml | 1 - app/src/main/res/values-ko/strings.xml | 1 - app/src/main/res/values-lv/strings.xml | 1 - app/src/main/res/values-nb-rNO/strings.xml | 1 - app/src/main/res/values-nl/strings.xml | 1 - app/src/main/res/values-pa/strings.xml | 1 - app/src/main/res/values-pl/strings.xml | 1 - app/src/main/res/values-pt-rBR/strings.xml | 1 - app/src/main/res/values-pt/strings.xml | 1 - app/src/main/res/values-ro/strings.xml | 1 - app/src/main/res/values-ru/strings.xml | 1 - app/src/main/res/values-sc/strings.xml | 1 - app/src/main/res/values-si/strings.xml | 1 - app/src/main/res/values-sl/strings.xml | 1 - app/src/main/res/values-so/strings.xml | 1 - app/src/main/res/values-sq/strings.xml | 1 - app/src/main/res/values-sr/strings.xml | 1 - app/src/main/res/values-sv/strings.xml | 1 - app/src/main/res/values-ta/strings.xml | 1 - app/src/main/res/values-tr/strings.xml | 1 - app/src/main/res/values-uk/strings.xml | 1 - app/src/main/res/values-vi/strings.xml | 1 - app/src/main/res/values-yue/strings.xml | 1 - app/src/main/res/values-zh-rCN/strings.xml | 1 - app/src/main/res/values-zh-rTW/strings.xml | 1 - app/src/main/res/values/strings.xml | 2 +- 52 files changed, 35 insertions(+), 65 deletions(-) diff --git a/app/src/main/java/com/aurora/store/view/ui/sheets/NetworkDialogSheet.kt b/app/src/main/java/com/aurora/store/view/ui/sheets/NetworkDialogSheet.kt index e9ebaeea5..73e8563fb 100644 --- a/app/src/main/java/com/aurora/store/view/ui/sheets/NetworkDialogSheet.kt +++ b/app/src/main/java/com/aurora/store/view/ui/sheets/NetworkDialogSheet.kt @@ -19,14 +19,21 @@ package com.aurora.store.view.ui.sheets +import android.content.ActivityNotFoundException +import android.content.Intent import android.os.Bundle +import android.provider.Settings +import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import com.aurora.extensions.isQAndAbove import com.aurora.store.databinding.SheetNetworkBinding class NetworkDialogSheet : BaseBottomSheet() { + private val TAG = NetworkDialogSheet::class.java.simpleName + lateinit var B: SheetNetworkBinding companion object { @@ -52,7 +59,16 @@ class NetworkDialogSheet : BaseBottomSheet() { override fun onContentViewCreated(view: View, savedInstanceState: Bundle?) { B.btnAction.setOnClickListener { - dismissAllowingStateLoss() + if (isQAndAbove()) { + startActivity(Intent(Settings.Panel.ACTION_INTERNET_CONNECTIVITY)) + } else { + try { + startActivity(Intent(Settings.ACTION_WIRELESS_SETTINGS)) + } catch (exception: ActivityNotFoundException) { + Log.i(TAG, "Unable to launch wireless settings") + startActivity(Intent(Settings.ACTION_SETTINGS)) + } + } } } -} \ No newline at end of file +} diff --git a/app/src/main/res/layout/sheet_network.xml b/app/src/main/res/layout/sheet_network.xml index 9b308d5b4..25bf6b749 100644 --- a/app/src/main/res/layout/sheet_network.xml +++ b/app/src/main/res/layout/sheet_network.xml @@ -17,7 +17,7 @@ ~ --> - + android:layout_marginTop="@dimen/margin_xlarge" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:srcCompat="@drawable/ic_network" + app:tint="?android:attr/colorControlNormal" /> + android:textAlignment="center" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/img" /> - \ No newline at end of file + android:text="@string/check_connectivity" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/txt_warning" /> + diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 639931cdc..319bd37a4 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -129,7 +129,6 @@ تحديث معلومات التطبيق إلغاء التثبيت - حاول لاحقا مشاركة البحث إستئناف diff --git a/app/src/main/res/values-ast/strings.xml b/app/src/main/res/values-ast/strings.xml index 0e1a5a282..91c30b9c0 100644 --- a/app/src/main/res/values-ast/strings.xml +++ b/app/src/main/res/values-ast/strings.xml @@ -166,7 +166,6 @@ Reaniciar Siguir Buscar - Try later Uninstall App Info Whitelist diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml index 6ca01c9c4..842536310 100644 --- a/app/src/main/res/values-az/strings.xml +++ b/app/src/main/res/values-az/strings.xml @@ -33,7 +33,6 @@ Paylaşın Davam edin Paylaşın - Daha sonra cəhd edin Silin Tətbiq Məlumatı Beta proqramına qoşulsun\? diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 8530251e9..aaaff49cb 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -103,7 +103,6 @@ Подобни и свързани приложения Инсталация Рестартиране - Опитайте по-късно Присъединяване Следващо Информация за приложението diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 16f5a73ed..5af807862 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -120,7 +120,6 @@ Publicar Cercar Compartir - Provar més tard Desinstal·lar Informació de l\'aplicació Actualitzar diff --git a/app/src/main/res/values-ckb/strings.xml b/app/src/main/res/values-ckb/strings.xml index 12d31adef..4d3be5b3c 100644 --- a/app/src/main/res/values-ckb/strings.xml +++ b/app/src/main/res/values-ckb/strings.xml @@ -24,7 +24,6 @@ نوێکردنەوە زانیاری بەرنامە سڕینەوە - دواتر هەوڵبدە بڵاوکردنەوە گەڕان بەردەوامبون diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 161b28818..494b9d87d 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -195,7 +195,6 @@ Aktualizovat vše Informace o aplikaci Odinstalovat - Zkuste to později Sdílet Vyhledávání Pokračuj diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index ee1e6596f..eb5c5b76c 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -63,7 +63,6 @@ Næste Genstart Genoptag - Prøv senere Afinstaller Opdater Du er en betatester diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 1c8dbce64..d685bbd89 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -215,7 +215,6 @@ XDA Entwickler-Forum Der Aurora-Support-Gruppe für Diskussionen oder Vorschläge beitreten Deinstallieren - Später versuchen Teilen Suchen Fortsetzen diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 90b14a2d7..2098e5663 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -118,7 +118,6 @@ Ενημέρωση Πληροφορίες εφαρμογής Απεγκατάσταση - Δοκιμάστε αργότερα Κοινοποίηση Αναζήτηση Συνέχεια diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index 0257c9362..9b195d093 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -69,7 +69,6 @@ Ĝisdatigi Aplikaĵa informo Malinstali - Klopodi poste Kunigi Serĉi Malpaŭzigi diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 6c2ef339a..54a995a3d 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -179,7 +179,6 @@ Actualizar Información de aplicación Desinstalar - Inténtalo más tarde Compartir Buscar Reanudar diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index 6695f0ec0..94031e8bd 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -178,7 +178,6 @@ Eguneratu Aplikazioaren informazioa Desinstalatu - Saiatu geroago Konpartitu Bilatu Jarraitu diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index 118c45089..4907172c6 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -103,7 +103,6 @@ بروز رسانی شما ویژگیهای جدید و ایرادات را زودتر از بقیه میبینید. به توسعه دهندگان آنها را اطلاع دهید تا به آنها جهت بهبود برنامه کمک کنید. برنامه های تبلیغ دار - بعدا امتحان نمایید باز کردن اتریوم شروع مجدد diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 191e93bd6..89cfb2a6a 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -144,7 +144,6 @@ Päivitä Sovelluksen tiedot Poista asennus - Yritä myöhemmin Jaa Hae Jatka diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index a53f79b01..5998c267a 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -105,7 +105,6 @@ Mettre à jour Infos de l’appli Désinstaller - Essayer plus tard Partager Rechercher Reprendre diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index fce14cd48..0257d41d9 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -153,7 +153,6 @@ Actualizar Información da aplicación Desinstalar - Ténteo máis tarde Compartillar Continuar Reiniciar diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml index e27fe27b5..a3a9eaa17 100644 --- a/app/src/main/res/values-he/strings.xml +++ b/app/src/main/res/values-he/strings.xml @@ -168,7 +168,6 @@ מנהל אחסון חיצוני היישום לא נמצא ההתקנה נכשלה - נא לנסות שוב מאוחר יותר עוקבנים נמצאו מחכה בתור מחיקת קובצי ה־APK לאחר ההתקנה diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 4fe091267..94553a2a7 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -81,7 +81,6 @@ इच्छासूची में जोड़ें ब्लैकलिस्ट में डाला ज़बरदस्ती सब साफ करें - बाद में कोशिश करें आपके लिए ऐप नहीं खरीदा गया विज्ञापन हैं diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 32c002740..990abf097 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -17,7 +17,6 @@ Aktualiziraj Podaci programa Deinstaliraj - Pokušaj kasnije Dijeli Traži Nastavi diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 59c7afb76..c121d42cd 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -18,7 +18,6 @@ Frissítés Alkalmazásinformáció Eltávolítás - Próbáld újra később Megosztás Keresés Folytatás diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index 58d9746ad..c50742691 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -68,7 +68,6 @@ Perbarui Info Aplikasi Copot Pemasangan - Coba nanti Berbagi Cari Lanjutkan diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index fcb61c668..26bd1ac71 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -97,7 +97,6 @@ Aggiorna tutte Aggiorna Disinstalla - Prova più tardi Condividi Cerca Riprendi diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 0a569ef12..b229a5730 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -120,7 +120,6 @@ 更新 情報 アンインストール - 後で 共有 検索 再スタート diff --git a/app/src/main/res/values-kmr/strings.xml b/app/src/main/res/values-kmr/strings.xml index cddc38326..803750c69 100644 --- a/app/src/main/res/values-kmr/strings.xml +++ b/app/src/main/res/values-kmr/strings.xml @@ -27,7 +27,6 @@ Nûve bikin Agahdariya Sepanê Rakirin - Piştra biceribîne Parveke Lê gerrîn Dîsa vekirin diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index e4371a5ab..331e731b0 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -78,7 +78,6 @@ 재개 검색 공유 - 나중에 시도 제거 앱 정보 업데이트 diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml index 86242ccca..4c5ec0c12 100644 --- a/app/src/main/res/values-lv/strings.xml +++ b/app/src/main/res/values-lv/strings.xml @@ -60,7 +60,6 @@ Restartēt Turpināt Dalīties - Mēģināt vēlāk Noņemt Lietotnes informācija Atjaunināt diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index a22d3fbf2..1c7b8fce6 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -84,7 +84,6 @@ Oppgrader alle Programinfo Avinstaller - Prøv igjen senere Del Søk Fortsett diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index d417ddfe2..058f90c7f 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -214,7 +214,6 @@ Werk bij App Informatie Deïnstalleren - Later opnieuw proberen Deel Hervat Herstart diff --git a/app/src/main/res/values-pa/strings.xml b/app/src/main/res/values-pa/strings.xml index 3f0bc6c08..95623bb62 100644 --- a/app/src/main/res/values-pa/strings.xml +++ b/app/src/main/res/values-pa/strings.xml @@ -208,7 +208,6 @@ ਅੱਪਡੇਟ ਐਪ ਬਾਰੇ ਜਾਣਕਾਰੀ ਅਨਇੰਸਟਾਲ - ਕੁੱਝ ਦੇਰ ਬਾਅਦ ਕੋਸ਼ਿਸ਼ ਕਰੋ ਸਾਂਝਾ ਕਰੋ ਐਪਸ ਤੇ ਗੇਮਜ਼ ਖੋਜੋ ਚਾਲੂ ਕਰੋ diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 2a16229a7..7d95fe5bc 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -27,7 +27,6 @@ Aktualizuj O aplikacji Odinstaluj - Spróbuj później Udostępnij Szukaj Wznów diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 8320135a4..d5e05cfbc 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -151,7 +151,6 @@ Atualizar Informações do App Desinstalar - Tentar depois Compartilhar Pesquisar Retomar diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index c5b991324..a4da71336 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -223,7 +223,6 @@ Atualizar Informações da aplicação Desinstalar - Tentar mais tarde Partilhar Pesquisar Retomar diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 904d2302f..b2eec0a1e 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -24,7 +24,6 @@ Reia Căutare Distribuie - Încearcă mai târziu Dezinstalează Informații despre aplicație Actualizează diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index fb357f0e1..3193a5cd0 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -119,7 +119,6 @@ Вы увидите новые функции и ошибки раньше остальных. Оставляйте свои отзывы разработчикам, чтобы помочь им улучшить работу. Войти в программу бета-тестирования\? Вы бета-тестер - Попробуйте позже Бета-тестирование Добавить в белый список Белый список diff --git a/app/src/main/res/values-sc/strings.xml b/app/src/main/res/values-sc/strings.xml index f41123df3..f67d51cd0 100644 --- a/app/src/main/res/values-sc/strings.xml +++ b/app/src/main/res/values-sc/strings.xml @@ -22,7 +22,6 @@ In suspesu Pùblica Chirca - Torra a proare prus a tardu Annanghe a sa lista de sos disìgios Programma Beta Pigare parte a su programma beta\? diff --git a/app/src/main/res/values-si/strings.xml b/app/src/main/res/values-si/strings.xml index f4fb9921d..97b436009 100644 --- a/app/src/main/res/values-si/strings.xml +++ b/app/src/main/res/values-si/strings.xml @@ -57,7 +57,6 @@ යාවත්කාලය යෙදුමේ තොරතුරු අස්ථාපනය - පසුව උත්සාහ කරන්න බෙදාගන්න සොයන්න නැවත අරඹන්න diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index 7b63f211b..bc3ee3e3f 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -47,7 +47,6 @@ V teku Objavi Nadaljuj - Poskusi kasneje Odstrani Informacije Posodobi diff --git a/app/src/main/res/values-so/strings.xml b/app/src/main/res/values-so/strings.xml index afbe0fdea..c127bcbf0 100644 --- a/app/src/main/res/values-so/strings.xml +++ b/app/src/main/res/values-so/strings.xml @@ -225,7 +225,6 @@ Wada cusboonaysii Cusboonaysii Faahfaahinta Appka - Hadhow iskuday La wadaag Raadi Dib usoobilow diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml index 00dcc2298..f8b804ea1 100644 --- a/app/src/main/res/values-sq/strings.xml +++ b/app/src/main/res/values-sq/strings.xml @@ -78,7 +78,6 @@ Rimerre Kërko Ndajeni - Provoni më vonë Çinstaloje Hollësi Aplikacioni Përditësoje diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index b455561f2..6f37fc8f4 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -180,7 +180,6 @@ Ажурирај Више о апликацији Деинсталирај - Пробај касније Објави Претражи Настави diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index bf643cd90..c7961a21c 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -158,7 +158,6 @@ Uppdatera Info om app Avinstallera - Försök igen senare Dela Sök Återuppta diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index 38975da0f..be8bb042c 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -135,7 +135,6 @@ மறுதுவக்கு வழங்கப்பட்டது இடுகையிடு - பின்னர் முயல் பயன்பாட்டுத் தகவல் புதுப்பிப்புகள் விருப்பப்பட்டியலில் சேர் diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index c9506db7e..10df4b9f2 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -224,7 +224,6 @@ Güncelle Uygulama Bilgisi Kaldır - Daha sonra dene Paylaş Ara Sürdür diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index b870c7dd6..1882a42c9 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -53,7 +53,6 @@ Оновити Відомості про застосунок Видалити - Спробувати пізніше Поділитися Пошук Продовжити diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index ba6baec2a..3523aa0e0 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -20,7 +20,6 @@ Cập nhật Thông tin ứng dụng Gỡ cài đặt - Thử lại sau Chia sẻ Tìm kiếm Tiếp tục diff --git a/app/src/main/res/values-yue/strings.xml b/app/src/main/res/values-yue/strings.xml index 7f2ffbf98..7bcb66d0e 100644 --- a/app/src/main/res/values-yue/strings.xml +++ b/app/src/main/res/values-yue/strings.xml @@ -186,7 +186,6 @@ 退出 仲要等等 發表 - 遲啲再試過啦 個 app 詳細 要有 GSF 至得 報名要啲時間處理，您可以轉頭返嚟再睇過個狀態吖。 diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index d5c357200..307d088f5 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -61,7 +61,6 @@ 更新 应用信息 卸载 - 稍后再试 分享 搜索 发布 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 055f6cc69..6f375fa05 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -265,7 +265,6 @@ 更新 應用程式資訊 解除安裝 - 稍後再試 保存 App bundle（程式捆包） 更多選項 開發者討論串 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c8a6b954c..be076520f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -91,7 +91,6 @@ "Resume" "Search" "Share" - "Try later" "Uninstall" "App Info" "Update" @@ -366,4 +365,5 @@ Oops, You are rate limited Server unreachable Failed to generate session, error code: %1$d + Check internet connectivity From 982e5740387a09b9feceda6788b8fc18fa029c75 Mon Sep 17 00:00:00 2001 From: Aayush Gupta Date: Tue, 8 Aug 2023 12:13:27 +0530 Subject: [PATCH 14/14] MainActivity: Only show NetworkDialogSheet if onboarding is complete Signed-off-by: Aayush Gupta --- app/src/main/java/com/aurora/store/MainActivity.kt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/aurora/store/MainActivity.kt b/app/src/main/java/com/aurora/store/MainActivity.kt index ed183dabf..8f7cb3317 100644 --- a/app/src/main/java/com/aurora/store/MainActivity.kt +++ b/app/src/main/java/com/aurora/store/MainActivity.kt @@ -45,6 +45,7 @@ import androidx.lifecycle.repeatOnLifecycle import androidx.navigation.NavController import androidx.navigation.NavDestination import androidx.navigation.fragment.NavHostFragment +import androidx.navigation.fragment.findNavController import androidx.navigation.ui.AppBarConfiguration import androidx.navigation.ui.navigateUp import androidx.navigation.ui.setupActionBarWithNavController @@ -123,7 +124,7 @@ class MainActivity : AppCompatActivity() { NetworkProvider(this@MainActivity).networkStatus.collect { when(it) { NetworkStatus.AVAILABLE -> { - if (!supportFragmentManager.isDestroyed) { + if (!supportFragmentManager.isDestroyed && isIntroDone()) { val fragment = supportFragmentManager .findFragmentByTag(NetworkDialogSheet.TAG) fragment?.let { @@ -134,7 +135,7 @@ class MainActivity : AppCompatActivity() { } } NetworkStatus.LOST -> { - if (!supportFragmentManager.isDestroyed) { + if (!supportFragmentManager.isDestroyed && isIntroDone()) { supportFragmentManager.beginTransaction() .add(NetworkDialogSheet.newInstance(), NetworkDialogSheet.TAG) .commitAllowingStateLoss() @@ -292,4 +293,8 @@ class MainActivity : AppCompatActivity() { sheet.show(supportFragmentManager, SelfUpdateSheet.TAG) } } + + private fun isIntroDone(): Boolean { + return Preferences.getBoolean(this@MainActivity, Preferences.PREFERENCE_INTRO) + } }