commit 33f6abfd82f314331240afce0c37f79b0f9028c5
Author: Leszek Koltunski <leszek@koltunski.pl>
Date:   Tue Oct 5 22:53:27 2021 +0200

    Remove the 'setupObject()' redundant API.

diff --git a/src/main/java/org/distorted/dialogs/RubikDialogPatternView.java b/src/main/java/org/distorted/dialogs/RubikDialogPatternView.java
index fff0fc14..e2774513 100644
--- a/src/main/java/org/distorted/dialogs/RubikDialogPatternView.java
+++ b/src/main/java/org/distorted/dialogs/RubikDialogPatternView.java
@@ -26,6 +26,7 @@ import android.view.View;
 import android.widget.ExpandableListView;
 import android.widget.FrameLayout;
 
+import org.distorted.objectlib.main.ObjectControl;
 import org.distorted.objectlib.main.ObjectType;
 
 import org.distorted.main.R;
@@ -66,6 +67,7 @@ public class RubikDialogPatternView extends FrameLayout
     super(act);
 
     final RubikActivity ract = (RubikActivity)getContext();
+    final ObjectControl control = ract.getControl();
 
     mTab = position;
     mDialog = dialog;
@@ -94,9 +96,10 @@ public class RubikDialogPatternView extends FrameLayout
         {
         RubikPattern pattern = RubikPattern.getInstance();
         int[][] moves   = pattern.reInitialize(mTab, groupPosition, childPosition);
-        ObjectType list = RubikPatternList.getObject(mTab);
+        ObjectType object = RubikPatternList.getObject(mTab);
 
-        ract.setupObject(list, moves);
+        control.changeObject(object);
+        control.initializeObject(moves);
 
         ScreenList.switchScreen(ract, ScreenList.PATT);
         RubikScreenPattern state = (RubikScreenPattern) ScreenList.PATT.getScreenClass();
diff --git a/src/main/java/org/distorted/main/RubikActivity.java b/src/main/java/org/distorted/main/RubikActivity.java
index ba14f3e0..f27fa171 100644
--- a/src/main/java/org/distorted/main/RubikActivity.java
+++ b/src/main/java/org/distorted/main/RubikActivity.java
@@ -443,15 +443,6 @@ public class RubikActivity extends AppCompatActivity
       control.changeObject(newObject);
       }
 
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-    public void setupObject(ObjectType object, int[][] moves)
-      {
-      RubikSurfaceView view = findViewById(R.id.rubikSurfaceView);
-      ObjectControl control = view.getObjectControl();
-      control.setupObject(object,moves);
-      }
-
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
     public static int getDrawableSize()
diff --git a/src/main/java/org/distorted/screens/RubikScreenSolver.java b/src/main/java/org/distorted/screens/RubikScreenSolver.java
index fc453c31..4fc3a3e6 100644
--- a/src/main/java/org/distorted/screens/RubikScreenSolver.java
+++ b/src/main/java/org/distorted/screens/RubikScreenSolver.java
@@ -85,7 +85,9 @@ public class RubikScreenSolver extends RubikScreenAbstract
 
     ObjectType currentObject= ImplementedSolversList.getObject(0);
 
-    act.setupObject(currentObject,null);
+    control.changeObject(currentObject);
+    control.solveOnly();
+
     RubikScreenPlay play = (RubikScreenPlay) ScreenList.PLAY.getScreenClass();
     play.setObject(act, currentObject);