commit 427ba5bfc270905c266444b2b665ba368f6bae6a
Author: leszek <leszek@koltunski.pl>
Date:   Fri Mar 8 15:48:07 2024 +0100

    progress with configurable stickers

diff --git a/src/main/java/org/distorted/config/ConfigActivity.java b/src/main/java/org/distorted/config/ConfigActivity.java
index 8eeed09c..05dc481f 100644
--- a/src/main/java/org/distorted/config/ConfigActivity.java
+++ b/src/main/java/org/distorted/config/ConfigActivity.java
@@ -223,6 +223,14 @@ public class ConfigActivity extends AppCompatActivity
       return view.getRenderer();
       }
 
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+    public void recreateColors()
+      {
+      ObjectControl control = getControl();
+      control.recreateColors();
+      }
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
     public void recreateStickers(int borders, int corners)
diff --git a/src/main/java/org/distorted/config/ConfigRenderer.java b/src/main/java/org/distorted/config/ConfigRenderer.java
index 633dd342..fb488271 100644
--- a/src/main/java/org/distorted/config/ConfigRenderer.java
+++ b/src/main/java/org/distorted/config/ConfigRenderer.java
@@ -45,6 +45,7 @@ public class ConfigRenderer implements GLSurfaceView.Renderer, DistortedLibrary.
    private boolean mResettingObject, mInitialPhase, mEffectApplied;
    private long mStartTime;
    private final Static1D mAngle;
+   private long mRotateID;
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -89,10 +90,19 @@ public class ConfigRenderer implements GLSurfaceView.Renderer, DistortedLibrary.
 
          MatrixEffectRotate effect = new MatrixEffectRotate(mAngle, axis, center );
          object.applyEffect(effect,0);
+         mRotateID = effect.getID();
          }
 
        boolean done = continueResetting(time);
-       if( done ) mResettingObject = false;
+       if( done )
+         {
+         mResettingObject = false;
+         mEffectApplied   = false;
+
+         ObjectControl control = mView.getObjectControl();
+         TwistyObject object = control.getObject();
+         object.removeEffect(mRotateID);
+         }
        }
      }
 
diff --git a/src/main/java/org/distorted/config/ConfigScreenPane.java b/src/main/java/org/distorted/config/ConfigScreenPane.java
index 9fae821f..c565a016 100644
--- a/src/main/java/org/distorted/config/ConfigScreenPane.java
+++ b/src/main/java/org/distorted/config/ConfigScreenPane.java
@@ -240,7 +240,6 @@ public class ConfigScreenPane
 
       @Override
       public void onStartTrackingTouch(SeekBar seekBar) {}
-
       @Override
       public void onStopTrackingTouch(SeekBar seekBar)
         {
@@ -281,6 +280,7 @@ public class ConfigScreenPane
     configLayoutL.setLayoutParams(paramsLayoutL);
 
     createColorGrid(act, width, height);
+    configLayoutL.removeAllViews();
     configLayoutL.addView(mGrid);
     }
 }
diff --git a/src/main/java/org/distorted/config/ConfigSurfaceView.java b/src/main/java/org/distorted/config/ConfigSurfaceView.java
index 64ad0cf3..2f5e7cb1 100644
--- a/src/main/java/org/distorted/config/ConfigSurfaceView.java
+++ b/src/main/java/org/distorted/config/ConfigSurfaceView.java
@@ -70,6 +70,7 @@ public class ConfigSurfaceView extends GLSurfaceView
     void resetObject()
       {
       ConfigActivity act = (ConfigActivity)getContext();
+      act.recreateColors();
       act.recreateStickers(ConfigScreenPane.DEFAULT_BORDERS,ConfigScreenPane.DEFAULT_CORNERS);
       act.resetUI();
       }