Fix redo logic

burhanrashid52 · Feb 28, 2024 · 8648773 · 8648773
1 parent 685c82b
commit 8648773
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/photoeditor/src/main/java/ja/burhanrashid52/photoeditor/DrawingView.kt b/photoeditor/src/main/java/ja/burhanrashid52/photoeditor/DrawingView.kt
@@ -163,6 +163,9 @@ class DrawingView @JvmOverloads constructor(
         }
         viewChangeListener?.apply {
             onStopDrawing()
+            if(redoShapes.isNotEmpty()) {
+                redoShapes.clear()
+            }
             onViewAdd(this@DrawingView)
         }
     }

diff --git a/photoeditor/src/main/java/ja/burhanrashid52/photoeditor/GraphicManager.kt b/photoeditor/src/main/java/ja/burhanrashid52/photoeditor/GraphicManager.kt
@@ -23,6 +23,10 @@ internal class GraphicManager(
         mPhotoEditorView.addView(view, params)
         mViewState.addAddedView(view)
 
+        if(mViewState.redoViewsCount > 0) {
+            mViewState.clearRedoViews()
+        }
+
         onPhotoEditorListener?.onAddViewListener(
             graphic.viewType,
             mViewState.addedViewsCount
@@ -75,7 +79,8 @@ internal class GraphicManager(
                 mViewState.redoViewsCount - 1
             )
             if (redoView is DrawingView) {
-                return redoView.redo() && (mViewState.redoViewsCount != 0)
+                val result = redoView.redo()
+                return result || (mViewState.redoViewsCount != 0)
             } else {
                 mViewState.popRedoView()
                 mPhotoEditorView.addView(redoView)