Polish ComparisonFragment further

Author: w2sv

app/src/main/kotlin/com/w2sv/autocrop/ui/ViewBoundAppFragment.kt

@@ -1,6 +1,7 @@
 package com.w2sv.autocrop.ui
 
 import android.content.Context
+import androidx.annotation.CallSuper
 import androidx.navigation.fragment.findNavController
 import androidx.viewbinding.ViewBinding
 import com.w2sv.autocrop.ui.util.registerOnBackPressedHandler
@@ -12,6 +13,7 @@ abstract class ViewBoundAppFragment<VB : ViewBinding>(bindingClass: Class<VB>) :
     protected val navController by threadUnsafeLazy { findNavController() }
     open val onBackPressed: (() -> Unit)? = null
 
+    @CallSuper
     override fun onAttach(context: Context) {
         super.onAttach(context)
 

app/src/main/kotlin/com/w2sv/autocrop/ui/screen/comparison/ComparisonFragment.kt

@@ -41,7 +41,6 @@ class ComparisonFragment : ViewBoundAppFragment<ComparisonBinding>(ComparisonBin
     override fun onAttach(context: Context) {
         super.onAttach(context)
         hideSystemBars()
-
         sharedElementEnterTransition = cropEnterTransition(context)
         registerOnBackPressedHandler(::onBack)
     }
@@ -71,7 +70,7 @@ class ComparisonFragment : ViewBoundAppFragment<ComparisonBinding>(ComparisonBin
         binding.apply {
             initializeScreenshotViewAndCropViewScaleAndPositioning()
             initializeCropView()
-            setOnTouchEventListeners()
+            setOnTouchEventListener()
             backButton.setOnClickListener { onBack() }
 
             viewModel.fadeOutTextArgs.collectLatestOn(lifecycleScope) {
@@ -109,25 +108,13 @@ class ComparisonFragment : ViewBoundAppFragment<ComparisonBinding>(ComparisonBin
     }
 
     @SuppressLint("ClickableViewAccessibility")
-    private fun ComparisonBinding.setOnTouchEventListeners() {
-        root.setOnTouchListener { v, event ->
-            val insets = ViewCompat.getRootWindowInsets(root)
-            val statusBarHeight = insets?.getInsetsIgnoringVisibility(WindowInsetsCompat.Type.statusBars())?.top
-                ?: 0
-            val navBarHeight = insets?.getInsetsIgnoringVisibility(WindowInsetsCompat.Type.navigationBars())?.bottom
-                ?: 0
-
-            // Ignore touches in system bar areas
-            val y = event.y.toInt()
-            if (y < statusBarHeight || y > root.height - navBarHeight) {
-                return@setOnTouchListener false
-            }
-
+    private fun ComparisonBinding.setOnTouchEventListener() {
+        root.setOnTouchListenerIgnoringSystemBarAreas { view, event ->
             when (event.actionMasked) {
                 ACTION_DOWN -> {
                     viewModel.setImageType(ImageType.Original)
                     // Lets accessibility services know the view was clicked, which enables those services to react to it
-                    v.performClick()
+                    view.performClick()
                     true
                 }
 
@@ -148,6 +135,25 @@ class ComparisonFragment : ViewBoundAppFragment<ComparisonBinding>(ComparisonBin
     }
 }
 
+@SuppressLint("ClickableViewAccessibility")
+private fun View.setOnTouchListenerIgnoringSystemBarAreas(listener: View.OnTouchListener) {
+    setOnTouchListener { view, event ->
+        val insets = ViewCompat.getRootWindowInsets(view)
+        val statusBarHeight = insets?.getInsetsIgnoringVisibility(WindowInsetsCompat.Type.statusBars())?.top
+            ?: 0
+        val navBarHeight = insets?.getInsetsIgnoringVisibility(WindowInsetsCompat.Type.navigationBars())?.bottom
+            ?: 0
+
+        // Ignore touches in system bar areas
+        val y = event.y.toInt()
+        if (y < statusBarHeight || y > view.height - navBarHeight) {
+            return@setOnTouchListener false
+        }
+
+        listener.onTouch(view, event)
+    }
+}
+
 private fun Transition.onTransitionEnd(callback: () -> Unit): Transition =
     addListener(
         object : TransitionListenerAdapter() {