Hide foreground button

Author: w2sv

.idea/assetWizardSettings.xml

@@ -10,7 +10,7 @@
 import processing.core.PVector;
 
 class FlowField {
-    private static final Map<Pair<Integer, Integer>, Float> xOffCache = new HashMap<>();
+    private final Map<Pair<Integer, Integer>, Float> xOffCache = new HashMap<>();
 
     private float zOff = 0;
 

app/src/main/java/com/w2sv/autocrop/flowfield/FlowField.java

@@ -13,7 +13,7 @@
 public class Sketch extends PApplet {
 
     static class Config{
-        static final int N_PARTICLES = 400;
+        static final int N_PARTICLES = 600;
         static final int ALPHA_DROP_PERIOD = 350;
         static final int PARTICLE_START_VELOCITY_LOW = 1;
         static final int PARTICLE_START_VELOCITY_HIGH = 3;

app/src/main/java/com/w2sv/autocrop/flowfield/Sketch.java

@@ -6,6 +6,7 @@ import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import android.os.Bundle
+import android.view.MotionEvent
 import androidx.activity.OnBackPressedCallback
 import androidx.activity.viewModels
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
@@ -23,6 +24,7 @@ import com.w2sv.autocrop.activities.main.fragments.flowfield.FlowFieldFragment
 import com.w2sv.autocrop.screenshotlistening.ScreenshotListener
 import com.w2sv.autocrop.utils.extensions.getParcelable
 import dagger.hilt.android.AndroidEntryPoint
+import timber.log.Timber
 
 @AndroidEntryPoint
 class MainActivity : ApplicationActivity() {

app/src/main/kotlin/com/w2sv/autocrop/activities/main/MainActivity.kt

@@ -13,6 +13,7 @@ import androidx.core.text.buildSpannedString
 import androidx.core.text.color
 import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.viewModels
+import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.SavedStateHandle
@@ -23,9 +24,12 @@ import com.w2sv.androidutils.BackPressListener
 import com.w2sv.androidutils.extensions.getColoredIcon
 import com.w2sv.androidutils.extensions.getLong
 import com.w2sv.androidutils.extensions.getThemedColor
+import com.w2sv.androidutils.extensions.hide
+import com.w2sv.androidutils.extensions.hideSystemBars
 import com.w2sv.androidutils.extensions.launchDelayed
 import com.w2sv.androidutils.extensions.postValue
 import com.w2sv.androidutils.extensions.show
+import com.w2sv.androidutils.extensions.showSystemBars
 import com.w2sv.androidutils.extensions.uris
 import com.w2sv.autocrop.R
 import com.w2sv.autocrop.activities.ApplicationFragment
@@ -42,6 +46,7 @@ import com.w2sv.autocrop.screenshotlistening.ScreenshotListener
 import com.w2sv.autocrop.ui.SnackbarData
 import com.w2sv.autocrop.ui.animate
 import com.w2sv.autocrop.ui.fadeIn
+import com.w2sv.autocrop.ui.fadeOut
 import com.w2sv.autocrop.utils.extensions.snackyBuilder
 import com.w2sv.autocrop.utils.getMediaUri
 import com.w2sv.permissionhandler.PermissionHandler
@@ -113,6 +118,8 @@ class FlowFieldFragment :
 
         val liveCropSaveDirIdentifier: LiveData<String> = MutableLiveData(cropSaveDirPreferences.pathIdentifier)
 
+        var liveShowingFlowField: LiveData<Boolean> = MutableLiveData(false)
+
         val backPressHandler = BackPressListener(
             viewModelScope,
             context.resources.getLong(R.integer.duration_backpress_confirmation_window)
@@ -155,6 +162,25 @@ class FlowFieldFragment :
         }
 
         binding.setOnClickListeners()
+        viewModel.setLiveDataObservers()
+    }
+
+    private fun ViewModel.setLiveDataObservers() {
+        liveShowingFlowField.observe(viewLifecycleOwner) {
+            if (it) {
+                requireActivity().hideSystemBars()
+                with(binding.foregroundLayout) {
+                    if (lifecycle.currentState == Lifecycle.State.STARTED)
+                        hide()
+                    else
+                        fadeOut()
+                }
+            }
+            else {
+                requireActivity().showSystemBars()
+                binding.foregroundLayout.fadeIn()
+            }
+        }
     }
 
     private fun showLayoutElements() {
@@ -203,6 +229,15 @@ class FlowFieldFragment :
                 )
             )
         }
+        showFlowfieldButton.setOnClickListener {
+            viewModel.liveShowingFlowField.postValue(true)
+        }
+        relativeLayout.setOnClickListener {
+            with(viewModel.liveShowingFlowField) {
+                if (value == true)
+                    postValue(false)
+            }
+        }
     }
 
     // $$$$$$$$$$$$$$$$$$

app/src/main/kotlin/com/w2sv/autocrop/activities/main/fragments/flowfield/FlowFieldFragment.kt

@@ -29,6 +29,7 @@ class FlowFieldDrawerLayout(context: Context, attributeSet: AttributeSet) : Draw
                     val alphaOverlaidButtons = 1 - slideOffset
                     imageSelectionButton.alpha = alphaOverlaidButtons
                     shareCropsButton.alpha = alphaOverlaidButtons
+                    showFlowfieldButton.alpha = alphaOverlaidButtons
                 }
             }
         )

app/src/main/kotlin/com/w2sv/autocrop/activities/main/fragments/flowfield/views/FlowFieldDrawerLayout.kt

@@ -4,7 +4,6 @@ import android.view.View
 import com.daimajia.androidanimations.library.Techniques
 import com.daimajia.androidanimations.library.YoYo
 import com.w2sv.androidutils.extensions.getLong
-import com.w2sv.androidutils.extensions.remove
 import com.w2sv.androidutils.extensions.show
 import com.w2sv.autocrop.R
 
@@ -33,15 +32,27 @@ fun crossFade(fadeOut: View, fadeIn: View, duration: Long? = null) {
     fadeIn.fadeIn(duration)
 }
 
+fun fadeIn(vararg view: View, duration: Long? = null){
+    view.forEach {
+        it.fadeIn(duration)
+    }
+}
+
+fun fadeOut(vararg view: View, duration: Long? = null){
+    view.forEach {
+        it.fadeOut(duration)
+    }
+}
+
 fun View.fadeIn(duration: Long? = null): YoYo.YoYoString =
     apply {
         show()
     }
         .animate(Techniques.FadeIn, duration)
 
-fun View.fadeOut(duration: Long? = null, delay: Long = 0): YoYo.YoYoString =
+fun View.fadeOut(duration: Long? = null, delay: Long = 0, onEndVisibility: Int = View.GONE): YoYo.YoYoString =
     animationComposer(Techniques.FadeOut, duration, delay)
         .onEnd {
-            remove()
+            visibility = onEndVisibility
         }
         .playOn(this)

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

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,6.5c3.79,0 7.17,2.13 8.82,5.5 -1.65,3.37 -5.02,5.5 -8.82,5.5S4.83,15.37 3.18,12C4.83,8.63 8.21,6.5 12,6.5m0,-2C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,9.5c1.38,0 2.5,1.12 2.5,2.5s-1.12,2.5 -2.5,2.5 -2.5,-1.12 -2.5,-2.5 1.12,-2.5 2.5,-2.5m0,-2c-2.48,0 -4.5,2.02 -4.5,4.5s2.02,4.5 4.5,4.5 4.5,-2.02 4.5,-4.5 -2.02,-4.5 -4.5,-4.5z" />
+</vector>