commit 05c20dadd9ef85ae57d6f49b84935fd43bebbf6d
Author: Leszek Koltunski <leszek@koltunski.pl>
Date:   Mon Oct 4 14:17:41 2021 +0200

    Simplifications

diff --git a/src/main/java/org/distorted/main/RubikActivity.java b/src/main/java/org/distorted/main/RubikActivity.java
index 523fdc4f..ee4466a0 100644
--- a/src/main/java/org/distorted/main/RubikActivity.java
+++ b/src/main/java/org/distorted/main/RubikActivity.java
@@ -260,7 +260,6 @@ public class RubikActivity extends TwistyActivity
       BlockController.onResume();
       RubikSurfaceView view = findViewById(R.id.rubikSurfaceView);
       view.onResume();
-      view.initialize();
       restorePreferences();
       ScreenList.setScreen(this);
       unblockEverything();
diff --git a/src/main/java/org/distorted/main/RubikSurfaceView.java b/src/main/java/org/distorted/main/RubikSurfaceView.java
index bf98653f..008a2019 100644
--- a/src/main/java/org/distorted/main/RubikSurfaceView.java
+++ b/src/main/java/org/distorted/main/RubikSurfaceView.java
@@ -29,14 +29,11 @@ import android.view.MotionEvent;
 
 import com.google.firebase.crashlytics.FirebaseCrashlytics;
 
-import org.distorted.library.main.DistortedScreen;
 import org.distorted.library.type.Static4D;
 
 import org.distorted.objectlib.helpers.ObjectSurfaceView;
-import org.distorted.objectlib.helpers.TwistyActivity;
 import org.distorted.objectlib.main.ObjectControl;
 import org.distorted.objectlib.main.ObjectPreRender;
-import org.distorted.objectlib.main.Movement;
 
 import org.distorted.screens.ScreenList;
 
@@ -120,20 +117,6 @@ public class RubikSurfaceView extends GLSurfaceView implements ObjectSurfaceView
         }
       }
 
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-    public void setMovement(Movement movement)
-      {
-      mObjectController.setMovement(movement);
-      }
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-    public void setQuat()
-      {
-      mObjectController.setQuat();
-      }
-
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
     public Static4D getQuat()
@@ -143,22 +126,10 @@ public class RubikSurfaceView extends GLSurfaceView implements ObjectSurfaceView
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-    public TwistyActivity getActivity()
-      {
-      return (TwistyActivity)getContext();
-      }
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-    public DistortedScreen getScreen()
-      {
-      return mRenderer.getScreen();
-      }
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-    public void initialize()
+    @Override
+    public void onResume()
       {
+      super.onResume();
       mObjectController.initialize();
       }
 
diff --git a/src/main/java/org/distorted/tutorials/TutorialActivity.java b/src/main/java/org/distorted/tutorials/TutorialActivity.java
index 4d90cbf5..84033f94 100644
--- a/src/main/java/org/distorted/tutorials/TutorialActivity.java
+++ b/src/main/java/org/distorted/tutorials/TutorialActivity.java
@@ -34,6 +34,7 @@ import com.google.firebase.analytics.FirebaseAnalytics;
 
 import org.distorted.library.main.DistortedLibrary;
 
+import org.distorted.library.main.DistortedScreen;
 import org.distorted.objectlib.main.ObjectPreRender;
 import org.distorted.objectlib.main.ObjectType;
 import org.distorted.objectlib.main.TwistyObject;
@@ -205,7 +206,6 @@ public class TutorialActivity extends TwistyActivity
       BlockController.onResume();
       TutorialSurfaceView view = findViewById(R.id.tutorialSurfaceView);
       view.onResume();
-      view.initialize();
       restorePreferences();
 
       if( mWebView!=null ) mWebView.onResume();
@@ -290,6 +290,15 @@ public class TutorialActivity extends TwistyActivity
       return view.getPreRender();
       }
 
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+    public DistortedScreen getScreen()
+      {
+      TutorialSurfaceView view = findViewById(R.id.tutorialSurfaceView);
+      TutorialRenderer renderer = view.getRenderer();
+      return renderer.getScreen();
+      }
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
     public boolean isLocked()
diff --git a/src/main/java/org/distorted/tutorials/TutorialObjectStateActioner.java b/src/main/java/org/distorted/tutorials/TutorialObjectStateActioner.java
index 69866858..9700d628 100644
--- a/src/main/java/org/distorted/tutorials/TutorialObjectStateActioner.java
+++ b/src/main/java/org/distorted/tutorials/TutorialObjectStateActioner.java
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-// Copyright 2019 Leszek Koltunski                                                               //
+// Copyright 2021 Leszek Koltunski                                                               //
 //                                                                                               //
 // This file is part of Magic Cube.                                                              //
 //                                                                                               //
diff --git a/src/main/java/org/distorted/tutorials/TutorialSurfaceView.java b/src/main/java/org/distorted/tutorials/TutorialSurfaceView.java
index 8831464a..a9832fa8 100644
--- a/src/main/java/org/distorted/tutorials/TutorialSurfaceView.java
+++ b/src/main/java/org/distorted/tutorials/TutorialSurfaceView.java
@@ -29,13 +29,8 @@ import android.view.MotionEvent;
 
 import com.google.firebase.crashlytics.FirebaseCrashlytics;
 
-import org.distorted.library.main.DistortedScreen;
-import org.distorted.library.type.Static4D;
-
 import org.distorted.objectlib.main.ObjectControl;
 import org.distorted.objectlib.helpers.ObjectSurfaceView;
-import org.distorted.objectlib.helpers.TwistyActivity;
-import org.distorted.objectlib.main.Movement;
 import org.distorted.objectlib.main.ObjectPreRender;
 
 import static org.distorted.objectlib.main.ObjectControl.MODE_ROTATE;
@@ -122,43 +117,10 @@ public class TutorialSurfaceView extends GLSurfaceView implements ObjectSurfaceV
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-    public void setMovement(Movement movement)
-      {
-      mObjectController.setMovement(movement);
-      }
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-    public void setQuat()
-      {
-      mObjectController.setQuat();
-      }
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-    public Static4D getQuat()
-      {
-      return mObjectController.getQuat();
-      }
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-    public TwistyActivity getActivity()
-      {
-      return (TwistyActivity)getContext();
-      }
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-    public DistortedScreen getScreen()
-      {
-      return mRenderer.getScreen();
-      }
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-    public void initialize()
+    @Override
+    public void onResume()
       {
+      super.onResume();
       mObjectController.initialize();
       }