From 74373d478b7c71da8bb497279e4a177db7a5e0b7 Mon Sep 17 00:00:00 2001 From: Rahul Patel Date: Mon, 26 Aug 2024 20:03:41 +0530 Subject: [PATCH] MainActivity: Handle E2E with a different approach --- .../java/com/aurora/store/MainActivity.kt | 19 +++++++++++++------ .../store/data/activity/InstallActivity.kt | 2 -- .../view/ui/onboarding/OnboardingFragment.kt | 9 --------- .../view/ui/search/SearchResultsFragment.kt | 15 --------------- 4 files changed, 13 insertions(+), 32 deletions(-) diff --git a/app/src/main/java/com/aurora/store/MainActivity.kt b/app/src/main/java/com/aurora/store/MainActivity.kt index f2aa6942c..9b3d47ba5 100644 --- a/app/src/main/java/com/aurora/store/MainActivity.kt +++ b/app/src/main/java/com/aurora/store/MainActivity.kt @@ -29,6 +29,7 @@ import androidx.appcompat.app.AppCompatActivity import androidx.core.graphics.ColorUtils import androidx.core.view.ViewCompat import androidx.core.view.WindowInsetsCompat +import androidx.core.view.updatePadding import androidx.lifecycle.lifecycleScope import androidx.navigation.FloatingWindow import androidx.navigation.fragment.NavHostFragment @@ -71,20 +72,26 @@ class MainActivity : AppCompatActivity() { MigrationReceiver.runMigrationsIfRequired(this) enableEdgeToEdge() + super.onCreate(savedInstanceState) applyThemeAccent() B = ActivityMainBinding.inflate(layoutInflater) - setContentView(B.root) - // Adjust root view's paddings for edgeToEdge display - ViewCompat.setOnApplyWindowInsetsListener(B.root) { root, windowInsets -> - val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()) - root.setPadding(insets.left, insets.top, insets.right, 0) - windowInsets + ViewCompat.setOnApplyWindowInsetsListener(B.root) { view, windowInsets -> + val statusBarInset = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()) + val navigationBarInset = + windowInsets.getInsets(WindowInsetsCompat.Type.navigationBars()) + + view.updatePadding(0, statusBarInset.top, 0, navigationBarInset.bottom) + + WindowInsetsCompat.CONSUMED } + + setContentView(B.root) + val navHostFragment = supportFragmentManager.findFragmentById(R.id.nav_host_fragment) as NavHostFragment val navController = navHostFragment.navController diff --git a/app/src/main/java/com/aurora/store/data/activity/InstallActivity.kt b/app/src/main/java/com/aurora/store/data/activity/InstallActivity.kt index 68248c718..9b762510c 100644 --- a/app/src/main/java/com/aurora/store/data/activity/InstallActivity.kt +++ b/app/src/main/java/com/aurora/store/data/activity/InstallActivity.kt @@ -3,7 +3,6 @@ package com.aurora.store.data.activity import android.content.pm.PackageInstaller.SessionCallback import android.os.Bundle import android.util.Log -import androidx.activity.enableEdgeToEdge import androidx.appcompat.app.AppCompatActivity import androidx.core.content.IntentCompat import com.aurora.Constants @@ -23,7 +22,6 @@ class InstallActivity : AppCompatActivity() { private lateinit var sessionCallback: SessionCallback override fun onCreate(savedInstanceState: Bundle?) { - enableEdgeToEdge() super.onCreate(savedInstanceState) val download = 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 689c2adf8..86bd5ca95 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 @@ -21,8 +21,6 @@ package com.aurora.store.view.ui.onboarding import android.os.Bundle import android.view.View -import androidx.core.view.ViewCompat -import androidx.core.view.WindowInsetsCompat import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.lifecycle.Lifecycle @@ -82,13 +80,6 @@ class OnboardingFragment : BaseFragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - // Adjust layout margins for edgeToEdge display - ViewCompat.setOnApplyWindowInsetsListener(binding.layoutBottom) { layout, windowInsets -> - val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()) - layout.setPadding(0, 0, 0, insets.bottom) - windowInsets - } - val isDefaultPrefLoaded = Preferences.getBoolean(requireContext(), PREFERENCE_DEFAULT) if (!isDefaultPrefLoaded) { save(PREFERENCE_DEFAULT, true) 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 8ffae4e1a..a5d4d4d1e 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 @@ -27,12 +27,8 @@ import android.text.Editable import android.text.TextWatcher import android.view.KeyEvent import android.view.View -import android.view.ViewGroup import android.view.inputmethod.EditorInfo import android.widget.TextView -import androidx.core.view.ViewCompat -import androidx.core.view.WindowInsetsCompat -import androidx.core.view.updateLayoutParams import androidx.fragment.app.viewModels import androidx.navigation.fragment.findNavController import com.aurora.extensions.accentColor @@ -74,17 +70,6 @@ class SearchResultsFragment : BaseFragment(), override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - // Adjust FAB margins for edgeToEdge display - ViewCompat.setOnApplyWindowInsetsListener(binding.filterFab) { filterFab, windowInsets -> - val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()) - filterFab.updateLayoutParams { - leftMargin = insets.left - bottomMargin = insets.bottom - rightMargin = insets.right - } - WindowInsetsCompat.CONSUMED - } - sharedPreferences = Preferences.getPrefs(view.context) sharedPreferences.registerOnSharedPreferenceChangeListener(this)