Fix and refine

w2sv · w2sv · commit a47ec616d755 · 2022-05-18T22:42:19.000+02:00
diff --git a/app/src/main/java/com/autocrop/activities/cropping/fragments/cropping/CroppingFragment.kt b/app/src/main/java/com/autocrop/activities/cropping/fragments/cropping/CroppingFragment.kt
@@ -68,7 +68,7 @@ class CroppingFragment
         else
             // delay briefly to assure progress bar having reached 100% before UI change
             Handler(Looper.getMainLooper()).postDelayed(
-                { castedActivity.replaceCurrentFragmentWith(CroppingFailedFragment()) },
+                { typedActivity.replaceCurrentFragmentWith(CroppingFailedFragment()) },
                 resources.getInteger(R.integer.small_delay).toLong()
             )
     }
diff --git a/app/src/main/java/com/autocrop/activities/cropping/fragments/croppingfailed/CroppingFailedFragment.kt b/app/src/main/java/com/autocrop/activities/cropping/fragments/croppingfailed/CroppingFailedFragment.kt
@@ -12,7 +12,7 @@ class CroppingFailedFragment
         super.onViewCreated(view, savedInstanceState)
         
         binding.croppingUnsuccessfulGotItButton.setOnClickListener {
-            castedActivity.returnToMainActivity()
+            typedActivity.returnToMainActivity()
         }
     }
 }
diff --git a/app/src/main/java/com/autocrop/activities/examination/fragments/apptitle/AppTitleFragment.kt b/app/src/main/java/com/autocrop/activities/examination/fragments/apptitle/AppTitleFragment.kt
@@ -12,6 +12,6 @@ class AppTitleFragment
     override fun onViewCreatedCore(savedInstanceState: Bundle?) {
         binding.appTitleTextView.animate(
             listOf(Techniques.Shake, Techniques.Wobble, Techniques.Wave, Techniques.Tada).random()
-        ){castedActivity.returnToMainActivity()}
+        ){typedActivity.returnToMainActivity()}
     }
 }
diff --git a/app/src/main/java/com/autocrop/activities/examination/fragments/saveall/SaveAllFragment.kt b/app/src/main/java/com/autocrop/activities/examination/fragments/saveall/SaveAllFragment.kt
@@ -12,13 +12,13 @@ class SaveAllFragment :
     ExaminationActivityFragment<ExaminationFragmentSaveallBinding>(ExaminationFragmentSaveallBinding::class.java) {
 
     /**
-     * Launch async [processRemainingCropBundles] task, call [castedActivity].invokeSubsequentFragment
+     * Launch async [processRemainingCropBundles] task, call [typedActivity].invokeSubsequentFragment
      * onPostExecute
      */
     override fun onViewCreatedCore(savedInstanceState: Bundle?) {
         lifecycleScope.executeAsyncTask(
             { processRemainingCropBundles(BooleanUserPreferences.deleteScreenshots)},
-            { castedActivity.invokeSubsequentFragment() }
+            { typedActivity.invokeSubsequentFragment() }
         )
     }
 
diff --git a/app/src/main/java/com/autocrop/activities/examination/fragments/sreenshotdeletionquery/ScreenshotDeletionQueryFragment.kt b/app/src/main/java/com/autocrop/activities/examination/fragments/sreenshotdeletionquery/ScreenshotDeletionQueryFragment.kt
@@ -42,7 +42,7 @@ class ScreenshotDeletionQueryFragment :
         // launch appTitleFragment after small delay for UX smoothness
         Handler(Looper.getMainLooper()).postDelayed(
             {
-                castedActivity.replaceCurrentFragmentWith(AppTitleFragment(), true)
+                typedActivity.replaceCurrentFragmentWith(AppTitleFragment(), true)
             },
             resources.getInteger(R.integer.small_delay).toLong()
         )
diff --git a/app/src/main/java/com/autocrop/activities/examination/fragments/viewpager/ViewPagerFragment.kt b/app/src/main/java/com/autocrop/activities/examination/fragments/viewpager/ViewPagerFragment.kt
@@ -76,7 +76,7 @@ class ViewPagerFragment:
         adapter = CropPagerAdapter(
             this,
             viewModel,
-            castedActivity::invokeSubsequentFragment
+            typedActivity::invokeSubsequentFragment
         )
 
         registerOnPageChangeCallback(
diff --git a/app/src/main/java/com/autocrop/activities/examination/fragments/viewpager/views/ButtonToolbar.kt b/app/src/main/java/com/autocrop/activities/examination/fragments/viewpager/views/ButtonToolbar.kt
@@ -6,11 +6,14 @@ import android.view.View
 import androidx.appcompat.widget.AppCompatButton
 import androidx.appcompat.widget.Toolbar
 import androidx.core.view.children
+import androidx.lifecycle.LifecycleOwner
 import com.autocrop.activities.examination.ExaminationActivity
 import com.autocrop.activities.examination.fragments.saveall.SaveAllFragment
 import com.autocrop.activities.examination.fragments.viewpager.dialogs.CropEntiretyProcedureDialog
 import com.autocrop.activities.examination.fragments.viewpager.dialogs.DiscardAllConfirmationDialog
 import com.autocrop.activities.examination.fragments.viewpager.dialogs.SaveAllConfirmationDialog
+import com.autocrop.uielements.view.ParentActivityRetriever
+import com.autocrop.uielements.view.ParentActivityRetrievingView
 
 class ButtonToolbar(context: Context, attr: AttributeSet):
     Toolbar(context, attr){
@@ -25,40 +28,38 @@ class ButtonToolbar(context: Context, attr: AttributeSet):
 }
 
 abstract class CropEntiretyRegardingButton(context: Context, attr: AttributeSet, private val dialogClass: CropEntiretyProcedureDialog):
-    AppCompatButton(context, attr){
+    AppCompatButton(context, attr),
+    ParentActivityRetriever<ExaminationActivity> by ParentActivityRetrievingView(context){
 
     init {
-        examinationActivity.supportFragmentManager.setFragmentResultListener(
+        fragmentActivity.supportFragmentManager.setFragmentResultListener(
             dialogClass.resultKey,
-            examinationActivity
+            activity as LifecycleOwner
         )
         {_, _ -> dialogResultListener()}
     }
 
     override fun setOnClickListener(l: OnClickListener?) {
         super.setOnClickListener{
             dialogClass
-                .show(examinationActivity.supportFragmentManager)
+                .show(fragmentActivity.supportFragmentManager)
         }
     }
 
     protected abstract fun dialogResultListener()
-
-    protected val examinationActivity: ExaminationActivity
-        get() = (context as ExaminationActivity)
 }
 
 class DiscardAllButton(context: Context, attr: AttributeSet):
     CropEntiretyRegardingButton(context, attr, DiscardAllConfirmationDialog()){
 
     override fun dialogResultListener(){
-        examinationActivity.invokeSubsequentFragment()
+        typedActivity.invokeSubsequentFragment()
     }
 }
 
 class SaveAllButton(context: Context, attr: AttributeSet):
     CropEntiretyRegardingButton(context, attr, SaveAllConfirmationDialog()){
 
     override fun dialogResultListener() =
-        examinationActivity.replaceCurrentFragmentWith(SaveAllFragment(), true)
+        typedActivity.replaceCurrentFragmentWith(SaveAllFragment(), true)
 }
diff --git a/app/src/main/java/com/autocrop/activities/main/fragments/flowfield/FlowFieldFragment.kt b/app/src/main/java/com/autocrop/activities/main/fragments/flowfield/FlowFieldFragment.kt
@@ -90,7 +90,7 @@ class FlowFieldFragment:
     }
 
     private fun invokeAboutFragment() =
-        castedActivity.replaceCurrentFragmentWith(AboutFragment(), false)
+        typedActivity.replaceCurrentFragmentWith(AboutFragment(), false)
 
     private fun goToPlayStoreListing() =
         try{
@@ -115,17 +115,18 @@ class FlowFieldFragment:
      * then launch [selectImages] if all granted
      */
     private fun setImageSelectionButtonOnClickListener() = binding.imageSelectionButton.setOnClickListener {
-        ifPermissionsGranted {
+        requestWritePermissionOrRun {
             selectImages()
         }
     }
 
-    private val ifPermissionsGranted = PermissionsHandler(
-        requireActivity(),
-        arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE),
-        "You'll have to permit media file access in order for the app to save generated crops",
-        "Go to app settings and grant media file access in order for the app to save generated crops"
-    )
+    private val requestWritePermissionOrRun: PermissionsHandler =
+        PermissionsHandler(
+            this,
+            arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE),
+            "You'll have to permit media file access in order for the app to save generated crops",
+            "Go to app settings and grant media file access in order for the app to save generated crops"
+        )
 
     @Suppress("DEPRECATION")
     private fun selectImages() =
@@ -143,22 +144,17 @@ class FlowFieldFragment:
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
 
-        if (resultCode == RESULT_OK) {
-            when (requestCode) {
-                IntentCode.IMAGE_SELECTION.ordinal -> {
-                    startActivity(
-                        Intent(
-                            requireActivity(),
-                            CroppingActivity::class.java
-                        )
-                            .putParcelableArrayListExtra(
-                                IntentExtraIdentifier.SELECTED_IMAGE_URIS,
-                                ArrayList(data?.clipDataItems()!!.map { it.uri })
-                            )
+        if (resultCode == RESULT_OK && requestCode == IntentCode.IMAGE_SELECTION.ordinal)
+            startActivity(
+                Intent(
+                    requireActivity(),
+                    CroppingActivity::class.java
+                )
+                    .putParcelableArrayListExtra(
+                        IntentExtraIdentifier.SELECTED_IMAGE_URIS,
+                        ArrayList(data?.clipDataItems()!!.map { it.uri })
                     )
-                }
-            }
-        }
+            )
     }
 
     private enum class IntentCode {
diff --git a/app/src/main/java/com/autocrop/activities/main/fragments/flowfield/views/CropSharingButton.kt b/app/src/main/java/com/autocrop/activities/main/fragments/flowfield/views/CropSharingButton.kt
@@ -1,27 +1,30 @@
 package com.autocrop.activities.main.fragments.flowfield.views
 
-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.activities.main.MainActivity
+import com.autocrop.uielements.view.ParentActivityRetriever
+import com.autocrop.uielements.view.ParentActivityRetrievingView
 import com.autocrop.uielements.view.animate
 import com.autocrop.uielements.view.show
 import com.autocrop.utilsandroid.MimeTypes
 import com.daimajia.androidanimations.library.Techniques
 import com.w2sv.autocrop.R
 
-class CropSharingButton(context: Context, attrs: AttributeSet)
-    : AppCompatImageButton(context, attrs){
+class CropSharingButton(context: Context, attrs: AttributeSet):
+    AppCompatImageButton(context, attrs),
+    ParentActivityRetriever<MainActivity> by ParentActivityRetrievingView(context){
 
     /**
      * If CROP_SAVING_URIS available from previous ExaminationActivity cycle show and
      * setOnClickListener
      */
     init {
-        (context as Activity).intent.extras?.getParcelableArrayList<Uri>(IntentExtraIdentifier.CROP_SAVING_URIS)?.let {
+        activity.intent.extras?.getParcelableArrayList<Uri>(IntentExtraIdentifier.CROP_SAVING_URIS)?.let {
             show()
             setOnClickListener(it)
         }
diff --git a/app/src/main/java/com/autocrop/uicontroller/fragment/ApplicationFragment.kt b/app/src/main/java/com/autocrop/uicontroller/fragment/ApplicationFragment.kt
@@ -3,22 +3,26 @@ package com.autocrop.uicontroller.fragment
 import android.app.Activity
 import android.os.Bundle
 import android.view.View
-import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import androidx.viewbinding.ViewBinding
 import com.autocrop.uicontroller.ViewModelHolder
-import com.autocrop.utils.BlankFun
+import com.autocrop.utilsandroid.TypedActivityRetriever
 
 abstract class ApplicationFragment<A: Activity, VB: ViewBinding, VM: ViewModel>(
     viewModelClass: Class<VM>,
     bindingClass: Class<VB>):
         ViewBoundFragment<VB>(bindingClass),
-        ViewModelHolder<VM> {
+        ViewModelHolder<VM>,
+        TypedActivityRetriever<A>{
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?){
+        postponeEnterTransition()
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) = withPostponedEnterTransition {
         super.onViewCreated(view, savedInstanceState)
         onViewCreatedCore(savedInstanceState)
+
+        startPostponedEnterTransition()
     }
 
     open fun onViewCreatedCore(savedInstanceState: Bundle?){}
@@ -27,17 +31,11 @@ abstract class ApplicationFragment<A: Activity, VB: ViewBinding, VM: ViewModel>(
      * Retyped [androidx.fragment.app.Fragment.requireActivity]
      */
     @Suppress("UNCHECKED_CAST")
-    val castedActivity: A by lazy {
+    override val typedActivity: A by lazy {
         requireActivity() as A
     }
 
     override val sharedViewModel: VM by lazy {
         ViewModelProvider(requireActivity())[viewModelClass]
     }
-}
-
-private inline fun Fragment.withPostponedEnterTransition(f: BlankFun){
-    postponeEnterTransition()
-    f()
-    startPostponedEnterTransition()
 }
diff --git a/app/src/main/java/com/autocrop/uielements/view/ParentActivityRetrievingView.kt b/app/src/main/java/com/autocrop/uielements/view/ParentActivityRetrievingView.kt
@@ -0,0 +1,27 @@
+package com.autocrop.uielements.view
+
+import android.app.Activity
+import android.content.Context
+import androidx.fragment.app.FragmentActivity
+import com.autocrop.utilsandroid.TypedActivityRetriever
+
+interface ParentActivityRetriever<A: Activity>
+    : TypedActivityRetriever<A> {
+
+    val activity: Activity
+    val fragmentActivity: FragmentActivity
+}
+
+@Suppress("UNCHECKED_CAST")
+class ParentActivityRetrievingView<A: Activity>(private val context: Context)
+    : ParentActivityRetriever<A> {
+
+    override val activity: Activity
+        get() = context as Activity
+
+    override val fragmentActivity: FragmentActivity
+        get() = context as FragmentActivity
+
+    override val typedActivity: A
+        get() = context as A
+}
diff --git a/app/src/main/java/com/autocrop/utilsandroid/ImageFileIO.kt b/app/src/main/java/com/autocrop/utilsandroid/ImageFileIO.kt
@@ -14,7 +14,6 @@ import timber.log.Timber
 import java.io.File
 import java.io.FileOutputStream
 import java.io.OutputStream
-import java.lang.NullPointerException
 
 object MimeTypes{
     const val IMAGE = "image/*"
diff --git a/app/src/main/java/com/autocrop/utilsandroid/PermissionsHandler.kt b/app/src/main/java/com/autocrop/utilsandroid/PermissionsHandler.kt
@@ -5,15 +5,14 @@ import android.content.Intent
 import android.content.pm.PackageManager
 import android.net.Uri
 import android.provider.Settings
-import androidx.activity.ComponentActivity
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.fragment.app.Fragment
 import com.w2sv.autocrop.R
 import de.mateware.snacky.Snacky
 import timber.log.Timber
 
 class PermissionsHandler(
-    private val activity: ComponentActivity,
+    private val fragment: Fragment,
     private val requiredPermissions: Array<String>,
     private val snackbarMessageOnPermissionDenial: String,
     private val snackbarMessageOnRequestSuppression: String){
@@ -24,15 +23,15 @@ class PermissionsHandler(
      */
     private val pendingPermissions: List<String>
         get() = requiredPermissions.filter {
-            nonRedundantManifestPermissions.contains(it) && !activity.permissionGranted(it)
+            nonRedundantManifestPermissions.contains(it) && !fragment.requireActivity().permissionGranted(it)
         }
 
     /**
      * Returns the permissions declared within package Manifest actually required by the api,
      * that is whose maxSdkVersion (also manually declared in Manifest) <= Build version
      */
     private val nonRedundantManifestPermissions: Array<String> by lazy {
-        activity.run {
+        fragment.requireContext().run {
             packageManager.getPackageInfo(packageName, PackageManager.GET_PERMISSIONS)
                 .requestedPermissions ?: arrayOf()
         }
@@ -50,7 +49,7 @@ class PermissionsHandler(
             permissionRequestContract.launch(pendingPermissions.toTypedArray())
         }
 
-    private val permissionRequestContract = activity.registerForActivityResult(
+    private val permissionRequestContract = fragment.registerForActivityResult(
         ActivityResultContracts.RequestMultiplePermissions()
     ){ onRequestPermissionsResult(it) }
 
@@ -65,7 +64,7 @@ class PermissionsHandler(
      */
     private fun onRequestPermissionsResult(permission2Granted: Map<String, Boolean>){
         if (permission2Granted.values.any { !it }){
-            activity.run {
+            fragment.requireActivity().run {
                 if (shouldShowRequestPermissionRationale)
                     permissionDeniedSnacky()
                 else
@@ -82,7 +81,7 @@ class PermissionsHandler(
     }
 
     private val shouldShowRequestPermissionRationale: Boolean
-        get() = activity.shouldShowRequestPermissionRationale(pendingPermissions[0])
+        get() = fragment.shouldShowRequestPermissionRationale(pendingPermissions[0])
 
     private fun Activity.permissionDeniedSnacky(): Snacky.Builder =
         snacky(
@@ -97,10 +96,10 @@ class PermissionsHandler(
         )
             .setActionText("Settings")
             .setActionClickListener {
-                activity.startActivity(
+                fragment.startActivity(
                     Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
                         .apply {
-                            data = Uri.fromParts("package", activity.packageName, null)
+                            data = Uri.fromParts("package", fragment.requireContext().packageName, null)
                         }
                 )
             }
diff --git a/app/src/main/java/com/autocrop/utilsandroid/TypedActivityRetriever.kt b/app/src/main/java/com/autocrop/utilsandroid/TypedActivityRetriever.kt

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ class CroppingFragment`
`68`	`68`	`else`
`69`	`69`	`// delay briefly to assure progress bar having reached 100% before UI change`
`70`	`70`	`Handler(Looper.getMainLooper()).postDelayed(`
`71`		`- { castedActivity.replaceCurrentFragmentWith(CroppingFailedFragment()) },`
	`71`	`+ { typedActivity.replaceCurrentFragmentWith(CroppingFailedFragment()) },`
`72`	`72`	`resources.getInteger(R.integer.small_delay).toLong()`
`73`	`73`	`)`
`74`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ class CroppingFailedFragment`
`12`	`12`	`super.onViewCreated(view, savedInstanceState)`
`13`	`13`
`14`	`14`	`binding.croppingUnsuccessfulGotItButton.setOnClickListener {`
`15`		`- castedActivity.returnToMainActivity()`
	`15`	`+ typedActivity.returnToMainActivity()`
`16`	`16`	`}`
`17`	`17`	`}`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,6 @@ class AppTitleFragment`
`12`	`12`	`override fun onViewCreatedCore(savedInstanceState: Bundle?) {`
`13`	`13`	`binding.appTitleTextView.animate(`
`14`	`14`	`listOf(Techniques.Shake, Techniques.Wobble, Techniques.Wave, Techniques.Tada).random()`
`15`		`- ){castedActivity.returnToMainActivity()}`
	`15`	`+ ){typedActivity.returnToMainActivity()}`
`16`	`16`	`}`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,13 +12,13 @@ class SaveAllFragment :`
`12`	`12`	`ExaminationActivityFragment<ExaminationFragmentSaveallBinding>(ExaminationFragmentSaveallBinding::class.java) {`
`13`	`13`
`14`	`14`	`/**`
`15`		`- * Launch async [processRemainingCropBundles] task, call [castedActivity].invokeSubsequentFragment`
	`15`	`+ * Launch async [processRemainingCropBundles] task, call [typedActivity].invokeSubsequentFragment`
`16`	`16`	`* onPostExecute`
`17`	`17`	`*/`
`18`	`18`	`override fun onViewCreatedCore(savedInstanceState: Bundle?) {`
`19`	`19`	`lifecycleScope.executeAsyncTask(`
`20`	`20`	`{ processRemainingCropBundles(BooleanUserPreferences.deleteScreenshots)},`
`21`		`- { castedActivity.invokeSubsequentFragment() }`
	`21`	`+ { typedActivity.invokeSubsequentFragment() }`
`22`	`22`	`)`
`23`	`23`	`}`
`24`	`24`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ class ScreenshotDeletionQueryFragment :`
`42`	`42`	`// launch appTitleFragment after small delay for UX smoothness`
`43`	`43`	`Handler(Looper.getMainLooper()).postDelayed(`
`44`	`44`	`{`
`45`		`- castedActivity.replaceCurrentFragmentWith(AppTitleFragment(), true)`
	`45`	`+ typedActivity.replaceCurrentFragmentWith(AppTitleFragment(), true)`
`46`	`46`	`},`
`47`	`47`	`resources.getInteger(R.integer.small_delay).toLong()`
`48`	`48`	`)`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ class ViewPagerFragment:`
`76`	`76`	`adapter = CropPagerAdapter(`
`77`	`77`	`this,`
`78`	`78`	`viewModel,`
`79`		`- castedActivity::invokeSubsequentFragment`
	`79`	`+ typedActivity::invokeSubsequentFragment`
`80`	`80`	`)`
`81`	`81`
`82`	`82`	`registerOnPageChangeCallback(`