commit e4f656d1b6a133c0271d0576c678d8df30730631
Author: Leszek Koltunski <leszek@koltunski.pl>
Date:   Tue Oct 5 12:52:20 2021 +0200

    Simplifications

diff --git a/src/main/java/org/distorted/helpers/MovesController.java b/src/main/java/org/distorted/helpers/MovesController.java
index c5dae639..4fe3daa0 100644
--- a/src/main/java/org/distorted/helpers/MovesController.java
+++ b/src/main/java/org/distorted/helpers/MovesController.java
@@ -97,16 +97,14 @@ public class MovesController implements MovesFinished
         {
         Move move   = mMoves.remove(numMoves-1);
         int axis    = move.mAxis;
-        int row     = (1<<move.mRow);
         int angle   = move.mAngle;
-        int duration= Math.abs(angle)*MILLIS_PER_DEGREE;
 
         if( angle!=0 )
           {
           mCanPrevMove = false;
           mControl = act.getControl();
           mControl.blockTouch(BlockController.MOVES_PLACE_0);
-          mControl.addRotation(this, axis, row, -angle, duration);
+          mControl.addRotation(this, axis, (1<<move.mRow), -angle, MILLIS_PER_DEGREE);
           }
         else
           {
diff --git a/src/main/java/org/distorted/main/RubikActivity.java b/src/main/java/org/distorted/main/RubikActivity.java
index 99a9683d..a5cbc381 100644
--- a/src/main/java/org/distorted/main/RubikActivity.java
+++ b/src/main/java/org/distorted/main/RubikActivity.java
@@ -415,11 +415,11 @@ public class RubikActivity extends TwistyActivity
 
         if( oldObject!=null )
           {
-          ObjectType oldList = oldObject.getObjectType();
+          ObjectType oldType = oldObject.getObjectType();
           float fps = view.getRenderer().getFPS();
           fps = (int)(fps+0.5f);
           StringBuilder name = new StringBuilder();
-          name.append(oldList.name());
+          name.append(oldType.name());
           name.append(' ');
           name.append(fps);
           name.append(" --> ");
diff --git a/src/main/java/org/distorted/patterns/RubikPattern.java b/src/main/java/org/distorted/patterns/RubikPattern.java
index fd000cfc..ad878971 100644
--- a/src/main/java/org/distorted/patterns/RubikPattern.java
+++ b/src/main/java/org/distorted/patterns/RubikPattern.java
@@ -335,14 +335,11 @@ public class RubikPattern
           int axis      = moves[curMove-1][0];
 		      int rowBitmap = moves[curMove-1][1];
 		      int bareAngle = moves[curMove-1][2];
-		      int basicAngle= control.getObject().getBasicAngle()[axis];
-          int angle     = bareAngle*(360/basicAngle);
-          int duration  = Math.abs(angle)*MILLIS_PER_DEGREE;
 
-          if( angle!=0 )
+          if( bareAngle!=0 )
             {
             mCanRotate = false;
-            control.addRotation(this, axis, rowBitmap, angle, duration);
+            control.addRotation(this, axis, rowBitmap, bareAngle, MILLIS_PER_DEGREE);
             }
           else
             {
@@ -376,14 +373,11 @@ public class RubikPattern
           int axis      = moves[curMove][0];
 		      int rowBitmap = moves[curMove][1];
 		      int bareAngle = moves[curMove][2];
-		      int basicAngle= control.getObject().getBasicAngle()[axis];
-          int angle     = bareAngle*(360/basicAngle);
-          int duration  = Math.abs(angle)*MILLIS_PER_DEGREE;
 
-          if( angle!=0 )
+          if( bareAngle!=0 )
             {
             mCanRotate = false;
-            control.addRotation(this, axis, rowBitmap, -angle, duration);
+            control.addRotation(this, axis, rowBitmap, -bareAngle, MILLIS_PER_DEGREE);
             }
           else
             {
diff --git a/src/main/java/org/distorted/screens/RubikScreenSolution.java b/src/main/java/org/distorted/screens/RubikScreenSolution.java
index e8c38eb7..e51263c4 100644
--- a/src/main/java/org/distorted/screens/RubikScreenSolution.java
+++ b/src/main/java/org/distorted/screens/RubikScreenSolution.java
@@ -203,14 +203,11 @@ public class RubikScreenSolution extends RubikScreenAbstract implements MovesFin
         int axis      = mMoves[mCurrMove-1][0];
 		    int rowBitmap = mMoves[mCurrMove-1][1];
 		    int bareAngle = mMoves[mCurrMove-1][2];
-		    int basicAngle= control.getObject().getBasicAngle()[axis];
-        int angle     = bareAngle*(360/basicAngle);
-        int duration  = Math.abs(angle)*MILLIS_PER_DEGREE;
 
-        if( angle!=0 )
+        if( bareAngle!=0 )
           {
           mCanRotate = false;
-          control.addRotation(this, axis, rowBitmap, angle, duration);
+          control.addRotation(this, axis, rowBitmap, bareAngle, MILLIS_PER_DEGREE);
           }
         else
           {
@@ -242,14 +239,11 @@ public class RubikScreenSolution extends RubikScreenAbstract implements MovesFin
         int axis      = mMoves[mCurrMove][0];
 		    int rowBitmap = mMoves[mCurrMove][1];
 		    int bareAngle = mMoves[mCurrMove][2];
-        int basicAngle= control.getObject().getBasicAngle()[axis];
-        int angle     = bareAngle*(360/basicAngle);
-        int duration  = Math.abs(angle)*MILLIS_PER_DEGREE;
 
-        if( angle!=0 )
+        if( bareAngle!=0 )
           {
           mCanRotate = false;
-          control.addRotation(this, axis, rowBitmap, -angle, duration);
+          control.addRotation(this, axis, rowBitmap, -bareAngle, MILLIS_PER_DEGREE);
           }
         else
           {