From cbbcbbe2135b3f53ec0e0f313f69553222032874 Mon Sep 17 00:00:00 2001
From: w2sv <zangenbergjanek@googlemail.com>
Date: Mon, 9 Jan 2023 17:08:09 +0100
Subject: [PATCH] Update androidTest dependencies; Clean up

---
 .../fragments/flowfield/FlowFieldFragment.kt  | 27 ++++++++-----------
 .../res/layout-land/fragment_flowfield.xml    |  3 ++-
 .../main/res/layout/fragment_flowfield.xml    |  3 ++-
 gradle/libs.versions.toml                     |  6 ++---
 4 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/app/src/main/kotlin/com/w2sv/autocrop/activities/main/fragments/flowfield/FlowFieldFragment.kt b/app/src/main/kotlin/com/w2sv/autocrop/activities/main/fragments/flowfield/FlowFieldFragment.kt
index 391187f7..79a36ee4 100644
--- a/app/src/main/kotlin/com/w2sv/autocrop/activities/main/fragments/flowfield/FlowFieldFragment.kt
+++ b/app/src/main/kotlin/com/w2sv/autocrop/activities/main/fragments/flowfield/FlowFieldFragment.kt
@@ -172,19 +172,19 @@ class FlowFieldFragment :
     }
 
     private fun ViewModel.setLiveDataObservers() {
-        hideForegroundLive.observe(viewLifecycleOwner) {
-            if (it) {
-                requireActivity().hideSystemBars()
-                with(binding.foregroundLayout) {
+        hideForegroundLive.observe(viewLifecycleOwner) { hideForeground ->
+            binding.highAlphaForegroundLayout.let {
+                if (hideForeground) {
+                    requireActivity().hideSystemBars()
                     if (lifecycle.currentState == Lifecycle.State.STARTED)
-                        hide()
+                        it.hide()
                     else
-                        foregroundToggleAnimation = fadeOut()
+                        foregroundToggleAnimation = it.fadeOut()
+                }
+                else {
+                    requireActivity().showSystemBars()
+                    foregroundToggleAnimation = it.fadeIn()
                 }
-            }
-            else {
-                requireActivity().showSystemBars()
-                foregroundToggleAnimation = binding.foregroundLayout.fadeIn()
             }
         }
     }
@@ -194,12 +194,7 @@ class FlowFieldFragment :
             ?: false
 
         if (!viewModel.fadedInButtons) {
-            fadeIn(
-                binding.navigationViewToggleButton,
-                binding.imageSelectionButton,
-                binding.foregroundToggleButton,
-                duration = resources.getLong(R.integer.duration_flowfield_buttons_fade_in)
-            )
+            binding.foregroundLayout.fadeIn(resources.getLong(R.integer.duration_flowfield_buttons_fade_in))
 
             if (savedAnyCrops)
                 lifecycleScope.launchDelayed(resources.getLong(R.integer.duration_flowfield_buttons_half_faded_in)) {
diff --git a/app/src/main/res/layout-land/fragment_flowfield.xml b/app/src/main/res/layout-land/fragment_flowfield.xml
index 6181c73a..fdef0105 100644
--- a/app/src/main/res/layout-land/fragment_flowfield.xml
+++ b/app/src/main/res/layout-land/fragment_flowfield.xml
@@ -16,6 +16,7 @@
         android:layout_height="match_parent">
 
         <RelativeLayout
+            android:id="@+id/foreground_layout"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
@@ -32,7 +33,7 @@
                 android:backgroundTint="@color/low_alpha_gray" />
 
             <RelativeLayout
-                android:id="@+id/foreground_layout"
+                android:id="@+id/high_alpha_foreground_layout"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
 
diff --git a/app/src/main/res/layout/fragment_flowfield.xml b/app/src/main/res/layout/fragment_flowfield.xml
index 283d4de3..18f0c5fd 100644
--- a/app/src/main/res/layout/fragment_flowfield.xml
+++ b/app/src/main/res/layout/fragment_flowfield.xml
@@ -16,6 +16,7 @@
         android:layout_height="match_parent">
 
         <RelativeLayout
+            android:id="@+id/foreground_layout"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
@@ -32,7 +33,7 @@
                 android:backgroundTint="@color/low_alpha_gray" />
 
             <RelativeLayout
-                android:id="@+id/foreground_layout"
+                android:id="@+id/high_alpha_foreground_layout"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 8c8eae85..5a359b8c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -35,7 +35,7 @@ lottie = 'com.airbnb.android:lottie:5.2.0'
 
 ## unitTest
 junit5 = 'org.junit.jupiter:junit-jupiter:5.9.1'
-androidx-junit = 'androidx.test.ext:junit:1.1.4'
+androidx-junit = 'androidx.test.ext:junit:1.1.5'
 
 ## androidTest
 androidx-testrunner = 'androidx.test:runner:1.5.1'
@@ -45,8 +45,8 @@ junit5-mannodermaus-runner = 'de.mannodermaus.junit5:android-test-runner:1.3.0'
 junit5-params = 'org.junit.jupiter:junit-jupiter-params:5.9.1'
 
 # espresso
-androidx-espresso-core = 'androidx.test.espresso:espresso-core:3.5.0'
-androidx-espresso-intents = 'androidx.test.espresso:espresso-intents:3.5.0'
+androidx-espresso-core = 'androidx.test.espresso:espresso-core:3.5.1'
+androidx-espresso-intents = 'androidx.test.espresso:espresso-intents:3.5.1'
 
 [bundles]
 unitTest = ["junit5", "androidx-junit"]