Improved controls of search view

Faltenreich · Oct 11, 2020 · 60b2c0a · 60b2c0a
1 parent 2495e63
commit 60b2c0a
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 3 deletions.
diff --git a/app/src/main/kotlin/com/faltenreich/release/domain/release/discover/DiscoverFragment.kt b/app/src/main/kotlin/com/faltenreich/release/domain/release/discover/DiscoverFragment.kt
@@ -3,6 +3,7 @@ package com.faltenreich.release.domain.release.discover
 import android.os.Bundle
 import android.view.MenuItem
 import android.view.View
+import androidx.activity.OnBackPressedCallback
 import androidx.constraintlayout.motion.widget.MotionLayout
 import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
@@ -21,6 +22,7 @@ import com.faltenreich.release.domain.release.list.ReleaseProvider
 import com.faltenreich.release.domain.release.search.SearchListAdapter
 import com.faltenreich.release.framework.android.fragment.BaseFragment
 import com.faltenreich.release.framework.android.view.hideKeyboard
+import com.faltenreich.release.framework.android.view.showKeyboard
 import com.faltenreich.release.framework.skeleton.SkeletonFactory
 import kotlinx.android.synthetic.main.fragment_discover.*
 import org.threeten.bp.LocalDate
@@ -39,6 +41,7 @@ class DiscoverFragment : BaseFragment(R.layout.fragment_discover, R.menu.main),
     }
 
     private lateinit var searchListAdapter: SearchListAdapter
+    private lateinit var onBackPressedCallback: OnBackPressedCallback
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -104,10 +107,18 @@ class DiscoverFragment : BaseFragment(R.layout.fragment_discover, R.menu.main),
         searchView.doOnTextChanged { text, _, _, _ -> viewModel.query = text?.toString() }
         searchView.setOnClickListener { motionLayout.transitionToEnd() }
         searchButton.setOnClickListener {
-            // TODO: Toggle depending on state
-            motionLayout.transitionToStart()
+            if (searchView.hasFocus()) motionLayout.transitionToStart()
+            else motionLayout.transitionToEnd()
         }
 
+        onBackPressedCallback = object : OnBackPressedCallback(true) {
+            override fun handleOnBackPressed() {
+                if (searchView.hasFocus()) motionLayout.transitionToStart()
+            }
+        }
+        onBackPressedCallback.isEnabled = false
+        requireActivity().onBackPressedDispatcher.addCallback(viewLifecycleOwner, onBackPressedCallback)
+
         motionLayout.setTransitionListener(object : MotionLayout.TransitionListener {
 
             override fun onTransitionStarted(motionLayout: MotionLayout?, startId: Int, endId: Int) = Unit
@@ -118,11 +129,16 @@ class DiscoverFragment : BaseFragment(R.layout.fragment_discover, R.menu.main),
                 when (currentId) {
                     R.id.start -> {
                         searchButton.icon = ContextCompat.getDrawable(context, R.drawable.ic_search)
+                        searchView.text = null
                         searchView.hideKeyboard()
                         view?.requestFocus()
+                        onBackPressedCallback.isEnabled = false
                     }
                     R.id.end -> {
                         searchButton.icon = ContextCompat.getDrawable(context, R.drawable.ic_arrow_back)
+                        searchView.requestFocus()
+                        searchView.showKeyboard()
+                        onBackPressedCallback.isEnabled = true
                     }
                 }
             }

diff --git a/app/src/main/res/layout/fragment_discover.xml b/app/src/main/res/layout/fragment_discover.xml
@@ -65,7 +65,7 @@
         app:cardBackgroundColor="?backgroundColorSecondary"
         app:cardCornerRadius="8dp"
         app:layout_constraintBottom_toBottomOf="@id/topBar"
-        app:layout_constraintEnd_toEndOf="@id/topBar"
+        app:layout_constraintEnd_toStartOf="@id/clearButton"
         app:layout_constraintStart_toStartOf="@id/topBar"
         app:layout_constraintTop_toTopOf="@id/topBar" />
 

diff --git a/app/src/main/res/xml/motion_discover.xml b/app/src/main/res/xml/motion_discover.xml
@@ -18,6 +18,9 @@
             app:layout_constraintEnd_toEndOf="@id/topBar"
             app:layout_constraintStart_toStartOf="@id/topBar"
             app:layout_constraintTop_toTopOf="@id/topBar" />
+        <Constraint android:id="@+id/clearButton">
+            <PropertySet android:visibility="gone" />
+        </Constraint>
     </ConstraintSet>
 
     <ConstraintSet android:id="@+id/end">
@@ -29,6 +32,9 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
+        <Constraint android:id="@+id/clearButton">
+            <PropertySet android:visibility="visible" />
+        </Constraint>
     </ConstraintSet>
 
 </MotionScene>