Remove crop sharing from home screen

Author: w2sv

app/src/main/kotlin/com/w2sv/autocrop/model/CropBundleIOResults.kt

@@ -21,7 +21,7 @@ data class CropBundleIOResults(
     val anyCropsSaved: Boolean
         get() = cropUris.isNotEmpty()
 
-    fun getNotificationText(resources: Resources): CharSequence =
+    fun notificationMessage(resources: Resources): CharSequence =
         if (nSavedCrops == 0)
             "Discarded all crops"
         else

app/src/main/kotlin/com/w2sv/autocrop/ui/screen/home/HomeScreenFragment.kt

@@ -17,21 +17,17 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.viewModelScope
-import com.daimajia.androidanimations.library.Techniques
-import com.w2sv.androidutils.view.show
 import com.w2sv.androidutils.widget.showToast
 import com.w2sv.autocrop.AppFragment
 import com.w2sv.autocrop.R
 import com.w2sv.autocrop.databinding.HomeScreenBinding
-import com.w2sv.autocrop.ui.util.animate
 import com.w2sv.autocrop.ui.util.fadeIn
 import com.w2sv.autocrop.ui.util.fadeInAnimationComposer
 import com.w2sv.autocrop.ui.util.fadeOut
 import com.w2sv.autocrop.ui.util.onHalfwayFinished
 import com.w2sv.autocrop.ui.util.resolution
 import com.w2sv.autocrop.util.getMediaUri
 import com.w2sv.common.AppPermissionHandler
-import com.w2sv.cropbundle.io.IMAGE_MIME_TYPE_MEDIA_STORE_IDENTIFIER
 import com.w2sv.domain.repository.PermissionRepository
 import com.w2sv.flowfield.PerlinNoiseFlowFieldSketch
 import dagger.hilt.android.AndroidEntryPoint
@@ -67,14 +63,23 @@ class HomeScreenFragment :
 
             drawerLayout.onDrawerSlide(viewModel::setDrawerSlideOffset)
 
-            showLayoutElements()
-
             navigationViewToggleButton.setOnClickListener { drawerLayout.toggleDrawer() }
             imageSelectionButton.setOnClickListener { launchImageSelection() }
-            shareCropsButton.setOnClickListener { shareCrops() }
             foregroundElementsToggleButton.setOnClickListener { viewModel.toggleFullFlowFieldDisplay() }
 
             with(viewModel) {
+                if (!fadedInForegroundOnEntry) {
+                    foregroundLayout
+                        .fadeInAnimationComposer(duration = 3500L)
+                        .onHalfwayFinished(lifecycleScope) {
+                            viewModel.fadedInForegroundOnEntry = true
+                            viewModel.cropBundleIoResults?.notificationMessage(resources)?.let {
+                                requireContext().showToast(it)
+                            }
+                        }
+                        .play()
+                }
+
                 fullFlowFieldDisplay.observe(viewLifecycleOwner) { hideForeground ->
                     if (hideForeground) {
                         drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED)
@@ -94,47 +99,6 @@ class HomeScreenFragment :
         }
     }
 
-    private fun HomeScreenBinding.showLayoutElements() {
-        val anyCropsSaved = viewModel.cropBundleIoResults?.anyCropsSaved == true
-
-        when (viewModel.fadedInForegroundOnEntry) {
-            true -> if (anyCropsSaved) {
-                shareCropsButton.show()
-            }
-
-            false -> {
-                foregroundLayout
-                    .fadeInAnimationComposer(duration = 3500L)
-                    .onHalfwayFinished(lifecycleScope) {
-                        viewModel.fadedInForegroundOnEntry = true
-                        viewModel.showIOResultsNotificationIfApplicable(requireContext())
-
-                        if (anyCropsSaved) {
-                            with(shareCropsButton) {
-                                show()
-                                animate(Techniques.RotateInUpLeft)
-                            }
-                        }
-                    }
-                    .play()
-            }
-        }
-    }
-
-    private fun shareCrops() {
-        startActivity(
-            Intent.createChooser(
-                Intent(Intent.ACTION_SEND_MULTIPLE)
-                    .putExtra(
-                        Intent.EXTRA_STREAM,
-                        viewModel.cropBundleIoResults!!.cropUris
-                    )
-                    .setType(IMAGE_MIME_TYPE_MEDIA_STORE_IDENTIFIER),
-                null
-            )
-        )
-    }
-
     /**
      * ActivityCallContractHandlers
      */
@@ -255,7 +219,6 @@ private fun HomeScreenBinding.affectDrawerAssociatedViewsOnSlide(slideOffset: Fl
 
     val associatedButtonAlpha = 1 - slideOffset
     imageSelectionButton.alpha = associatedButtonAlpha
-    shareCropsButton.alpha = associatedButtonAlpha
     foregroundElementsToggleButton.alpha = associatedButtonAlpha
 }
 

app/src/main/kotlin/com/w2sv/autocrop/ui/screen/home/HomeScreenViewModel.kt

@@ -3,7 +3,6 @@ package com.w2sv.autocrop.ui.screen.home
 import android.content.ContentResolver
 import android.content.Context
 import android.content.Intent
-import android.content.res.Resources
 import android.net.Uri
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
@@ -26,26 +25,13 @@ class HomeScreenViewModel @Inject constructor(
     savedStateHandle: SavedStateHandle,
     private val preferencesRepository: PreferencesRepository,
     //        cancelledSSLFromNotification: ScreenshotListener.CancelledFromNotification,
-    @ApplicationContext context: Context,
-    private val resources: Resources
+    @ApplicationContext context: Context
 ) : androidx.lifecycle.ViewModel() {
 
     val cropBundleIoResults: CropBundleIOResults? = savedStateHandle[CropBundleIOResults.EXTRA]
 
     var fadedInForegroundOnEntry = false
 
-    /**
-     * IO Results Notification
-     */
-
-    fun showIOResultsNotificationIfApplicable(
-        context: Context
-    ) {
-        cropBundleIoResults?.let {
-            context.showToast(it.getNotificationText(resources))
-        }
-    }
-
     val fullFlowFieldDisplay: LiveData<Boolean> get() = _fullFlowFieldDisplay
     private val _fullFlowFieldDisplay = MutableLiveData(false)
 
@@ -64,6 +50,17 @@ class HomeScreenViewModel @Inject constructor(
         .mapState { cropSaveDirPathIdentifier(it, context) }
         .asLiveData()
 
+    val cropSaveDirTreeUri = preferencesRepository.cropSaveDirTreeUri
+
+    fun setCropSaveDirTreeUri(treeUri: Uri, contentResolver: ContentResolver) {
+        contentResolver
+            .takePersistableUriPermission(
+                treeUri,
+                Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION
+            )
+        viewModelScope.launch { preferencesRepository.saveCropSaveDirTreeUri(treeUri) }
+    }
+
     //        val screenshotListenerRunning: LiveData<Boolean> get() = _screenshotListenerRunning
     //        private val _screenshotListenerRunning = MutableLiveData(context.isServiceRunning<ScreenshotListener>())
     //
@@ -76,15 +73,4 @@ class HomeScreenViewModel @Inject constructor(
     //                setScreenshotListenerRunning(false)
     //            }
     //        }
-
-    fun setCropSaveDirTreeUri(treeUri: Uri, contentResolver: ContentResolver) {
-        contentResolver
-            .takePersistableUriPermission(
-                treeUri,
-                Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION
-            )
-        viewModelScope.launch { preferencesRepository.saveCropSaveDirTreeUri(treeUri) }
-    }
-
-    val cropSaveDirTreeUri = preferencesRepository.cropSaveDirTreeUri
 }

app/src/main/kotlin/com/w2sv/autocrop/ui/screen/pager/CropPagerScreenFragment.kt

@@ -2,7 +2,6 @@ package com.w2sv.autocrop.ui.screen.pager
 
 import android.os.Bundle
 import android.view.View
-import android.widget.PopupMenu
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.coroutineScope
@@ -25,14 +24,11 @@ import com.w2sv.autocrop.ui.screen.pager.dialog.cropsaving.CropsProcedureDialogF
 import com.w2sv.autocrop.ui.screen.pager.dialog.recrop.RecropDialogFragment
 import com.w2sv.autocrop.ui.screen.pager.model.CropProcedure
 import com.w2sv.autocrop.ui.screen.pager.view.CropPagerWrapper
-import com.w2sv.autocrop.ui.util.nonNullValue
-import com.w2sv.autocrop.ui.util.KEEP_MENU_ITEM_OPEN_ON_CLICK
 import com.w2sv.autocrop.ui.util.VisualizationMethod
 import com.w2sv.autocrop.ui.util.animate
 import com.w2sv.autocrop.ui.util.currentViewHolder
-import com.w2sv.autocrop.ui.util.makeOnClickPersistent
+import com.w2sv.autocrop.ui.util.nonNullValue
 import com.w2sv.autocrop.ui.util.notifyCurrentItemChanged
-import com.w2sv.autocrop.ui.util.toggleCheck
 import com.w2sv.autocrop.ui.util.visualize
 import com.w2sv.autocrop.util.containsSingularElement
 import com.w2sv.autocrop.util.launchAfterShortDelay
@@ -175,7 +171,6 @@ class CropPagerScreenFragment :
 
             buildList {
                 add(currentCropLayout)
-                add(popupMenuButton)
                 if (!viewModel.dataSet.containsSingularElement) {
                     add(allCropsButtonsWLabel)
                 }
@@ -228,37 +223,6 @@ class CropPagerScreenFragment :
                 )
             )
         }
-        popupMenuButton.setOnClickListener {
-            with(PopupMenu(requireContext(), it)) {
-                menuInflater.inflate(
-                    R.menu.crop_pager,
-                    menu
-                )
-                menu
-                    .apply {
-                        findItem(R.id.crop_pager_item_auto_scroll)
-                            .apply {
-                                isCheckable = true
-                                isChecked = viewModel.doAutoScroll.value
-                                makeOnClickPersistent(requireContext())
-                            }
-                        setOnMenuItemClickListener { item ->
-                            when (item.itemId) {
-                                R.id.crop_pager_item_auto_scroll -> {
-                                    item.toggleCheck { newValue ->
-                                        viewModel.saveDoAutoScroll(newValue)
-                                    }
-
-                                    KEEP_MENU_ITEM_OPEN_ON_CLICK
-                                }
-
-                                else -> true
-                            }
-                        }
-                    }
-                show()
-            }
-        }
     }
 
     private fun showCropProcedureDialog() {

app/src/main/res/layout/crop_pager.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
@@ -19,7 +20,8 @@
             android:layout_height="wrap_content"
             android:background="@drawable/shape_rounded_rectangle_w_button_background"
             android:paddingVertical="@dimen/margin_button_row"
-            android:visibility="invisible">
+            android:visibility="invisible"
+            tools:visibility="visible">
 
             <androidx.appcompat.widget.AppCompatImageButton
                 android:id="@+id/discard_all_button"
@@ -76,21 +78,8 @@
 
             android:text="@string/fraction"
             android:textColor="@color/crop_pager_text"
-            android:textSize="@dimen/text_size_medium" />
-
-        <Space
-            android:layout_width="@dimen/margin_large"
-            android:layout_height="0dp" />
-
-        <androidx.appcompat.widget.AppCompatImageButton
-            android:id="@+id/popup_menu_button"
-            android:layout_width="26dp"
-            android:layout_height="26dp"
-            android:layout_gravity="center_vertical"
-            android:background="@drawable/ic_dot_menu_24"
-            android:backgroundTint="@color/crop_pager_text"
-            android:contentDescription="@string/open_popup_menu"
-            android:visibility="invisible" />
+            android:textSize="@dimen/text_size_medium"
+            tools:text="9/12" />
 
     </LinearLayout>
 
@@ -147,7 +136,8 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:gravity="center_vertical"
-            android:visibility="invisible">
+            android:visibility="invisible"
+            tools:visibility="visible">
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/discarding_statistics_tv"
@@ -156,7 +146,8 @@
 
                 android:text="@string/discarding_statistics"
                 android:textColor="@color/crop_pager_text"
-                android:textSize="@dimen/text_size_small" />
+                android:textSize="@dimen/text_size_small"
+                tools:text="Removed 11%=8kb"/>
 
             <Space
                 android:layout_width="0dp"

app/src/main/res/layout/home_screen.xml

@@ -66,17 +66,6 @@
                     android:textAppearance="@style/TextAppearance.AppCompat.Body1"
                     android:textColor="@color/image_selection_button" />
 
-                <androidx.appcompat.widget.AppCompatImageButton
-                    android:id="@+id/share_crops_button"
-                    android:layout_width="@dimen/size_image_button"
-                    android:layout_height="@dimen/size_image_button"
-                    android:layout_alignParentBottom="true"
-                    android:layout_centerHorizontal="true"
-                    android:layout_marginBottom="70dp"
-                    android:background="@drawable/ic_share_24"
-                    android:visibility="invisible"
-                    tools:visibility="visible" />
-
             </RelativeLayout>
 
         </LinearLayout>
@@ -93,7 +82,7 @@
             android:theme="@style/NavigationView"
             app:headerLayout="@layout/navigation_view_header"
             app:itemIconTint="@color/highlight"
-            app:menu="@menu/flowfield" />
+            app:menu="@menu/home_screen_navigation" />
 
     </androidx.drawerlayout.widget.DrawerLayout>