rename Memento

jkwiecien · Apr 9, 2021 · 1293b8f · 1293b8f
1 parent fb529e8
commit 1293b8f
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 23 deletions.
diff --git a/library/src/main/java/pl/aprilapps/easyphotopicker/EasyImage.kt b/library/src/main/java/pl/aprilapps/easyphotopicker/EasyImage.kt
@@ -17,7 +17,7 @@ class EasyImage private constructor(
         private val allowMultiple: Boolean,
         private val chooserType: ChooserType,
         private val copyImagesToPublicGalleryFolder: Boolean,
-        private val memento: Memento
+        private val easyImageStateHandler: EasyImageStateHandler
 ) {
 
     private var lastCameraFile: MediaFile? = null
@@ -30,13 +30,13 @@ class EasyImage private constructor(
         fun onCanceled(source: MediaSource)
     }
 
-    interface Memento {
-        fun restore(): Bundle
-        fun save(state: Bundle?)
+    interface EasyImageStateHandler {
+        fun restoreEasyImageState(): Bundle
+        fun saveEasyImageState(state: Bundle?)
 
-        companion object NOOP : Memento {
-            override fun restore() = Bundle()
-            override fun save(state: Bundle?) {}
+        companion object DefaultStateHandler : EasyImageStateHandler {
+            override fun restoreEasyImageState() = Bundle()
+            override fun saveEasyImageState(state: Bundle?) {}
         }
     }
 
@@ -292,16 +292,16 @@ class EasyImage private constructor(
         }
     }
 
-    private fun save(){
-        memento.save(
-            Bundle().apply{
-                putParcelable(KEY_LAST_CAMERA_FILE, lastCameraFile)
-            }
+    private fun save() {
+        easyImageStateHandler.saveEasyImageState(
+                Bundle().apply {
+                    putParcelable(KEY_LAST_CAMERA_FILE, lastCameraFile)
+                }
         )
     }
 
-    private fun restore(){
-        memento.restore().apply {
+    private fun restore() {
+        easyImageStateHandler.restoreEasyImageState().apply {
             lastCameraFile = lastCameraFile ?: getParcelable(KEY_LAST_CAMERA_FILE) as MediaFile?
         }
     }
@@ -326,7 +326,7 @@ class EasyImage private constructor(
         private var allowMultiple = false
         private var chooserType: ChooserType = ChooserType.CAMERA_AND_DOCUMENTS
         private var copyImagesToPublicGalleryFolder: Boolean = false
-        private var memento: Memento = Memento.NOOP
+        private var easyImageStateHandler: EasyImageStateHandler = EasyImageStateHandler.DefaultStateHandler
 
         fun setChooserTitle(chooserTitle: String): Builder {
             this.chooserTitle = chooserTitle
@@ -353,8 +353,8 @@ class EasyImage private constructor(
             return this
         }
 
-        fun setMemento(memento: Memento): Builder {
-            this.memento = memento
+        fun setStateHandler(easyImageStateHandler: EasyImageStateHandler): Builder {
+            this.easyImageStateHandler = easyImageStateHandler
             return this
         }
 
@@ -366,7 +366,7 @@ class EasyImage private constructor(
                     chooserType = chooserType,
                     allowMultiple = allowMultiple,
                     copyImagesToPublicGalleryFolder = copyImagesToPublicGalleryFolder,
-                    memento = memento
+                    easyImageStateHandler = easyImageStateHandler
             )
         }
     }

diff --git a/sample/src/main/java/pl/aprilapps/easyphotopicker/sample/MainActivity.java b/sample/src/main/java/pl/aprilapps/easyphotopicker/sample/MainActivity.java
@@ -23,7 +23,7 @@
 import pl.aprilapps.easyphotopicker.MediaFile;
 import pl.aprilapps.easyphotopicker.MediaSource;
 
-public class MainActivity extends AppCompatActivity implements EasyImage.Memento {
+public class MainActivity extends AppCompatActivity implements EasyImage.EasyImageStateHandler {
 
     private static final String PHOTOS_KEY = "easy_image_photos_list";
     private static final String STATE_KEY = "easy_image_state";
@@ -53,7 +53,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         if (savedInstanceState != null) {
             photos = savedInstanceState.getParcelableArrayList(PHOTOS_KEY);
-            easyImageState = savedInstanceState.getParcelable(STATE_KEY);
+             = savedInstanceState.getParcelable(STATE_KEY);
         }
 
         imagesAdapter = new ImagesAdapter(this, photos);
@@ -68,7 +68,7 @@ protected void onCreate(Bundle savedInstanceState) {
                 .setChooserType(ChooserType.CAMERA_AND_GALLERY)
                 .setFolderName("EasyImage sample")
                 .allowMultiple(true)
-                .setMemento(this)
+                .setStateHandler(this)
                 .build();
 
         checkGalleryAppAvailability();
@@ -142,12 +142,12 @@ public void onClick(View view) {
     private Bundle easyImageState = new Bundle();
 
     @Override @NonNull
-    public Bundle restore() {
+    public Bundle restoreEasyImageState() {
         return easyImageState;
     }
 
     @Override
-    public void save(Bundle state) {
+    public void saveEasyImageState(Bundle state) {
         easyImageState = state;
     }