From 283a4b232388ac1e4f957a002479da02c3515e70 Mon Sep 17 00:00:00 2001 From: Christine Coenen Date: Fri, 18 Aug 2023 15:44:22 +0200 Subject: [PATCH] Remove SearchView --- .../code/zapp/app/main/MainActivity.kt | 23 ++++--------------- app/src/main/res/layout/activity_main.xml | 9 -------- 2 files changed, 5 insertions(+), 27 deletions(-) diff --git a/app/src/main/java/de/christinecoenen/code/zapp/app/main/MainActivity.kt b/app/src/main/java/de/christinecoenen/code/zapp/app/main/MainActivity.kt index d3089063..5071552d 100644 --- a/app/src/main/java/de/christinecoenen/code/zapp/app/main/MainActivity.kt +++ b/app/src/main/java/de/christinecoenen/code/zapp/app/main/MainActivity.kt @@ -22,8 +22,6 @@ import com.google.android.material.appbar.AppBarLayout import com.google.android.material.appbar.AppBarLayout.LayoutParams.SCROLL_FLAG_ENTER_ALWAYS import com.google.android.material.appbar.AppBarLayout.LayoutParams.SCROLL_FLAG_NO_SCROLL import com.google.android.material.appbar.AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL -import com.google.android.material.search.SearchView -import com.google.android.material.search.SearchView.TransitionListener import de.christinecoenen.code.zapp.R import de.christinecoenen.code.zapp.app.settings.repository.SettingsRepository import de.christinecoenen.code.zapp.databinding.ActivityMainBinding @@ -43,15 +41,6 @@ class MainActivity : AppCompatActivity(), MenuProvider { private val requestPermissionLauncher = registerForActivityResult(ActivityResultContracts.RequestPermission()) {} - private val searchViewTransitionListener = - TransitionListener { _, _, newState -> - if (newState == SearchView.TransitionState.SHOWN) { - binding.bottomNavigation.isVisible = false - } else if (newState == SearchView.TransitionState.HIDDEN) { - binding.bottomNavigation.isVisible = true - } - } - override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -80,12 +69,7 @@ class MainActivity : AppCompatActivity(), MenuProvider { binding.bottomNavigation.setupWithNavController(navController) - binding.searchView.addTransitionListener(searchViewTransitionListener) - searchViewTransitionListener.onStateChanged( - binding.searchView, - binding.searchView.currentTransitionState, - binding.searchView.currentTransitionState - ) + binding.searchbar.setOnClickListener { onSearchBarClick() } addMenuProvider(this) @@ -131,7 +115,6 @@ class MainActivity : AppCompatActivity(), MenuProvider { override fun onDestroy() { super.onDestroy() - binding.searchView.removeTransitionListener(searchViewTransitionListener) navController.removeOnDestinationChangedListener(::onDestinationChanged) _binding = null } @@ -148,6 +131,10 @@ class MainActivity : AppCompatActivity(), MenuProvider { return navController.navigateUp(appBarConfiguration) || super.onSupportNavigateUp() } + private fun onSearchBarClick() { + + } + private fun requestPermissions() { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { if (ContextCompat.checkSelfPermission( diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 977c92db..40981358 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -40,15 +40,6 @@ - - - -