Rename res files

Author: w2sv

.idea/workspace.xml

@@ -118,7 +118,7 @@ internal class MainActivityTest {
 
             @BeforeEach
             fun openDrawer(){
-                if (!onView(withId(R.menu.fragment_flowfield)).isDisplayed())
+                if (!onView(withId(R.menu.flowfield)).isDisplayed())
                     retryFlakyAction {
                         toggleButton.perform(ViewActions.click())
                     }

app/src/androidTest/java/com/autocrop/activities/main/MainActivityTest.kt

@@ -56,7 +56,7 @@
         </activity>
 
         <activity
-            android:name="com.autocrop.activities.cropping.CroppingActivity" />
+            android:name="com.autocrop.activities.cropping.CropActivity" />
 
         <activity
             android:name="com.autocrop.activities.examination.ExaminationActivity" />

app/src/main/AndroidManifest.xml

@@ -5,20 +5,20 @@ import android.os.Build
 import androidx.activity.OnBackPressedCallback
 import androidx.lifecycle.ViewModelProvider
 import com.autocrop.activities.IntentExtraIdentifier
-import com.autocrop.activities.cropping.fragments.cropping.CroppingFragment
+import com.autocrop.activities.cropping.fragments.cropping.CropFragment
 import com.autocrop.activities.cropping.fragments.croppingfailed.CroppingFailedFragment
 import com.autocrop.ui.controller.activity.ApplicationActivity
 import com.autocrop.ui.controller.activity.startMainActivity
 import com.autocrop.utils.android.BackPressHandler
 import com.autocrop.utils.android.extensions.snacky
 
-class CroppingActivity :
-    ApplicationActivity<CroppingFragment, CroppingActivityViewModel>(
-        CroppingFragment::class.java,
-        CroppingActivityViewModel::class) {
+class CropActivity :
+    ApplicationActivity<CropFragment, CropActivityViewModel>(
+        CropFragment::class.java,
+        CropActivityViewModel::class) {
 
     override fun viewModelFactory(): ViewModelProvider.Factory =
-            CroppingActivityViewModelFactory(
+            CropActivityViewModelFactory(
                 uris = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU)
                     intent.getParcelableArrayListExtra(IntentExtraIdentifier.SELECTED_IMAGE_URIS, Uri::class.java)!!
                 else
@@ -34,7 +34,7 @@ class CroppingActivity :
         override fun handleOnBackPressed() {
             when (currentFragment()){
                 is CroppingFailedFragment -> startMainActivity()
-                is CroppingFragment -> handleBackPress()
+                is CropFragment -> handleBackPress()
                 else -> Unit
             }
         }

app/src/main/java/com/autocrop/activities/cropping/CroppingActivity.kt renamed to app/src/main/java/com/autocrop/activities/cropping/CropActivity.kt

@@ -5,7 +5,7 @@ import androidx.lifecycle.ViewModel
 import com.autocrop.dataclasses.CropBundle
 import com.autocrop.utils.android.livedata.IncrementableIntLiveData
 
-class CroppingActivityViewModel(val uris: ArrayList<Uri>): ViewModel(){
+class CropActivityViewModel(val uris: ArrayList<Uri>): ViewModel(){
     val nSelectedImages: Int = uris.size
 
     val nDismissedImages: Int get() = nSelectedImages - cropBundles.size

app/src/main/java/com/autocrop/activities/cropping/CroppingActivityViewModel.kt renamed to app/src/main/java/com/autocrop/activities/cropping/CropActivityViewModel.kt

@@ -4,11 +4,11 @@ import android.net.Uri
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 
-class CroppingActivityViewModelFactory(private val uris: ArrayList<Uri>)
+class CropActivityViewModelFactory(private val uris: ArrayList<Uri>)
     : ViewModelProvider.NewInstanceFactory() {
 
     @Suppress("UNCHECKED_CAST")
-    override fun <T : ViewModel> create(modelClass: Class<T>): T = CroppingActivityViewModel(
+    override fun <T : ViewModel> create(modelClass: Class<T>): T = CropActivityViewModel(
         uris
     ) as T
 }

app/src/main/java/com/autocrop/activities/cropping/CroppingActivityViewModelFactory.kt renamed to app/src/main/java/com/autocrop/activities/cropping/CropActivityViewModelFactory.kt

@@ -0,0 +1,12 @@
+package com.autocrop.activities.cropping.fragments
+
+import androidx.viewbinding.ViewBinding
+import com.autocrop.activities.cropping.CropActivity
+import com.autocrop.activities.cropping.CropActivityViewModel
+import com.autocrop.ui.controller.fragment.ApplicationFragment
+
+abstract class CropActivityFragment<VB: ViewBinding>(bindingClass: Class<VB>)
+    : ApplicationFragment<CropActivity, VB, CropActivityViewModel>(
+        CropActivityViewModel::class,
+        bindingClass
+    )

app/src/main/java/com/autocrop/activities/cropping/fragments/CropActivityFragment.kt

@@ -0,0 +1,12 @@
+package com.autocrop.activities.cropping.fragments
+
+import android.content.Context
+import com.autocrop.activities.cropping.CropActivity
+import com.autocrop.activities.cropping.CropActivityViewModel
+import com.autocrop.retriever.viewmodel.ContextBasedViewModelRetriever
+
+class CropActivityViewModelRetriever(context: Context):
+    ContextBasedViewModelRetriever<CropActivityViewModel, CropActivity>(
+        context,
+        CropActivityViewModel::class.java
+    )