Polish

Author: w2sv

app/src/main/java/com/autocrop/activities/IntentExtraIdentifier.kt

@@ -6,7 +6,7 @@ object IntentExtraIdentifier {
 
     val N_SAVED_CROPS_WITH_N_DELETED_SCREENSHOTS = intentExtraIdentifier("n_saved_crops")
     val CROP_WRITE_DIR_PATH = intentExtraIdentifier("crop_write_dir_path")
-    val CROP_WRITE_URIS = intentExtraIdentifier("crop_write_uris")
+    val CROP_SAVING_URIS = intentExtraIdentifier("crop_saving_uris")
 
     private fun intentExtraIdentifier(name: String): String = "com.autocrop.$name"
 }

app/src/main/java/com/autocrop/activities/examination/ExaminationActivity.kt

@@ -106,10 +106,10 @@ class ExaminationActivity :
                             IntentExtraIdentifier.CROP_WRITE_DIR_PATH,
                             sharedViewModel.cropWriteDirIdentifier()
                         )
-                    if (sharedViewModel.cropWriteUris.isNotEmpty())
+                    if (sharedViewModel.cropSavingUris.isNotEmpty())
                         putParcelableArrayListExtra(
-                            IntentExtraIdentifier.CROP_WRITE_URIS,
-                            ArrayList(sharedViewModel.cropWriteUris)
+                            IntentExtraIdentifier.CROP_SAVING_URIS,
+                            ArrayList(sharedViewModel.cropSavingUris)
                         )
                 }
         )

app/src/main/java/com/autocrop/activities/examination/ExaminationActivityViewModel.kt

@@ -22,7 +22,7 @@ class ExaminationActivityViewModel(private val validSaveDirDocumentUri: Uri?)
         get() = _nDeletedScreenshots
     private var _nDeletedScreenshots = 0
 
-    val cropWriteUris = mutableListOf<Uri>()
+    val cropSavingUris = mutableListOf<Uri>()
 
     fun processCropBundle(cropBundlesPosition: Int, deleteScreenshot: Boolean, context: Context){
         val (savingResult, deletionResult) = context.processCropBundle(
@@ -32,7 +32,7 @@ class ExaminationActivityViewModel(private val validSaveDirDocumentUri: Uri?)
         )
         with(savingResult){
             if (first)
-                cropWriteUris.add(second)
+                cropSavingUris.add(second)
         }
         deletionResult?.second?.let {
             deletionQueryScreenshotUris.add(it)

app/src/main/java/com/autocrop/activities/main/fragments/flowfield/CropSharingButton.kt

@@ -0,0 +1,39 @@
+package com.autocrop.activities.main.fragments.flowfield
+
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.util.AttributeSet
+import androidx.appcompat.widget.AppCompatImageButton
+import com.autocrop.activities.IntentExtraIdentifier
+import com.autocrop.uielements.view.show
+import com.autocrop.utils.android.MimeTypes
+
+class CropSharingButton(context: Context, attrs: AttributeSet)
+    : AppCompatImageButton(context, attrs){
+
+    init {
+        (context as Activity).intent.extras?.getParcelableArrayList<Uri>(IntentExtraIdentifier.CROP_SAVING_URIS)?.let {
+            show()
+            setCropSharingButtonOnClickListener(it)
+        }
+    }
+
+    /**
+     * [show] and setOnClickListener
+     */
+    private fun setCropSharingButtonOnClickListener(cropWriteUris: ArrayList<Uri>) =
+        setOnClickListener {
+            context.startActivity(
+                Intent.createChooser(
+                    Intent().apply {
+                        action = Intent.ACTION_SEND_MULTIPLE
+                        putParcelableArrayListExtra(Intent.EXTRA_STREAM, cropWriteUris)
+                        type = MimeTypes.IMAGE
+                    },
+                    null
+                )
+            )
+        }
+}

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

@@ -15,7 +15,6 @@ import com.autocrop.activities.cropping.CroppingActivity
 import com.autocrop.activities.main.fragments.MainActivityFragment
 import com.autocrop.global.CropFileSaveDestinationPreferences
 import com.autocrop.uicontroller.fragment.ActivityRootFragment
-import com.autocrop.uielements.view.show
 import com.autocrop.utils.android.*
 import com.autocrop.utils.numericallyInflected
 import com.w2sv.autocrop.R
@@ -42,35 +41,17 @@ class FlowFieldFragment:
         setMenuInflationButtonOnClickListener()
         flowFieldBinding.setCaptureButton(binding.flowfieldCaptureButton, permissionsHandler)
 
-        requireActivity().intent.extras?.getParcelableArrayList<Uri>(IntentExtraIdentifier.CROP_WRITE_URIS)?.let {
-            setCropSharingButton(it)
-        }
-
-        // display CropIOResultSnackbar
+        // display CropIOResultSnackbar upon activity entry
         if (savedInstanceState == null)
             displayActivityEntrySnackbar()
     }
 
-    private fun setCropSharingButton(cropWriteUris: ArrayList<Uri>){
-        with(binding.cropSharingButton){
-            show()
-            setOnClickListener {
-                startActivity(
-                    Intent.createChooser(Intent().apply {
-                        action = Intent.ACTION_SEND_MULTIPLE
-                        putParcelableArrayListExtra(Intent.EXTRA_STREAM, cropWriteUris)
-                        type = MimeTypes.IMAGE
-                    },
-                    "Share crops"
-                    )
-                )
-            }
-        }
-    }
-
     private val nSavedCropsRetriever = IntentExtraRetriever<IntArray>(IntentExtraIdentifier.N_SAVED_CROPS_WITH_N_DELETED_SCREENSHOTS)
     private val cropWriteDirPathRetriever = IntentExtraRetriever<String>(IntentExtraIdentifier.CROP_WRITE_DIR_PATH)
 
+    /**
+     * Notifies as to IO results from previous ExaminationActivity cycle
+     */
     override fun displayActivityEntrySnackbar(){
         nSavedCropsRetriever(requireActivity().intent)?.let {
             val (nSavedCrops, nDeletedScreenshots) = it[0] to it[1]
@@ -95,9 +76,8 @@ class FlowFieldFragment:
     // Menu-related $
     //$$$$$$$$$$$$$$$
 
-    private fun setMenuInflationButtonOnClickListener() {
+    private fun setMenuInflationButtonOnClickListener() =
         binding.menuButton.setOnClickListener { popupMenu.show() }
-    }
 
     private val popupMenu: FlowFieldFragmentMenu by lazy {
         FlowFieldFragmentMenu(

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

@@ -129,7 +129,7 @@
 
         android:layout_alignParentBottom="true"
 
-        android:layout_marginBottom="90dp"
+        android:layout_marginBottom="70dp"
         android:layout_marginHorizontal="30dp"
 
         android:textSize="13sp"

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

@@ -50,7 +50,7 @@
 
     <!-- Crop Sharing -->
 
-    <ImageButton
+    <com.autocrop.activities.main.fragments.flowfield.CropSharingButton
         android:id="@+id/crop_sharing_button"
         android:layout_width="35dp"
         android:layout_height="35dp"