commit 919b830e0cab7c6de0f93bdbddb5588f2ff30b9e
Author: Leszek Koltunski <leszek@koltunski.pl>
Date:   Sun Jan 22 23:55:28 2023 +0100

    Some improvements to blocking, mostly to the names of variables.

diff --git a/src/main/java/org/distorted/bandaged/BandagedPlayLibInterface.java b/src/main/java/org/distorted/bandaged/BandagedPlayLibInterface.java
index db7888d0..59b100cf 100644
--- a/src/main/java/org/distorted/bandaged/BandagedPlayLibInterface.java
+++ b/src/main/java/org/distorted/bandaged/BandagedPlayLibInterface.java
@@ -96,9 +96,9 @@ public class BandagedPlayLibInterface implements ObjectLibInterface
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-  private void reportUIProblem(int place, long pause, long resume, long time)
+  private void reportScramblingProblem(int place, long pause, long resume, long time)
     {
-    String error = "UI BLOCK "+place+" blocked for "+time;
+    String error = "SCRAMBLING BLOCK "+place+" blocked for "+time;
 
     if( BuildConfig.DEBUG )
        {
@@ -116,9 +116,9 @@ public class BandagedPlayLibInterface implements ObjectLibInterface
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-  private void reportTouchProblem(int place, long pause, long resume, long time)
+  private void reportRotationProblem(int place, long pause, long resume, long time)
     {
-    String error = "TOUCH BLOCK "+place+" blocked for "+time;
+    String error = "ROTATION BLOCK "+place+" blocked for "+time;
 
     if( BuildConfig.DEBUG )
        {
@@ -160,9 +160,9 @@ public class BandagedPlayLibInterface implements ObjectLibInterface
     {
     switch(type)
       {
-      case BlockController.TYPE_UI    : reportUIProblem(place,pause,resume,time); break;
-      case BlockController.TYPE_TOUCH : reportTouchProblem(place,pause,resume,time); break;
-      case BlockController.TYPE_THREAD: reportThreadProblem(place,pause,resume,time); break;
+      case BlockController.TYPE_SCRAMBLING: reportScramblingProblem(place,pause,resume,time); break;
+      case BlockController.TYPE_ROTATION  : reportRotationProblem(place,pause,resume,time); break;
+      case BlockController.TYPE_THREAD    : reportThreadProblem(place,pause,resume,time); break;
       }
     }
 
diff --git a/src/main/java/org/distorted/config/ConfigObjectLibInterface.java b/src/main/java/org/distorted/config/ConfigObjectLibInterface.java
index 38d31719..8066d0c5 100644
--- a/src/main/java/org/distorted/config/ConfigObjectLibInterface.java
+++ b/src/main/java/org/distorted/config/ConfigObjectLibInterface.java
@@ -58,9 +58,9 @@ public class ConfigObjectLibInterface implements ObjectLibInterface
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-  private void reportUIProblem(int place, long pause, long resume, long time)
+  private void reportScramblingProblem(int place, long pause, long resume, long time)
     {
-    String error = "UI BLOCK "+place+" blocked for "+time;
+    String error = "SCRAMBLING BLOCK "+place+" blocked for "+time;
 
     if( BuildConfig.DEBUG )
        {
@@ -78,9 +78,9 @@ public class ConfigObjectLibInterface implements ObjectLibInterface
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-  private void reportTouchProblem(int place, long pause, long resume, long time)
+  private void reportRotationProblem(int place, long pause, long resume, long time)
     {
-    String error = "TOUCH BLOCK "+place+" blocked for "+time;
+    String error = "ROTATION BLOCK "+place+" blocked for "+time;
 
     if( BuildConfig.DEBUG )
        {
@@ -122,9 +122,9 @@ public class ConfigObjectLibInterface implements ObjectLibInterface
     {
     switch(type)
       {
-      case BlockController.TYPE_UI    : reportUIProblem(place,pause,resume,time); break;
-      case BlockController.TYPE_TOUCH : reportTouchProblem(place,pause,resume,time); break;
-      case BlockController.TYPE_THREAD: reportThreadProblem(place,pause,resume,time); break;
+      case BlockController.TYPE_SCRAMBLING: reportScramblingProblem(place,pause,resume,time); break;
+      case BlockController.TYPE_ROTATION  : reportRotationProblem(place,pause,resume,time); break;
+      case BlockController.TYPE_THREAD    : reportThreadProblem(place,pause,resume,time); break;
       }
     }
 }
diff --git a/src/main/java/org/distorted/config/ConfigScreen.java b/src/main/java/org/distorted/config/ConfigScreen.java
index a246809e..182d75ec 100644
--- a/src/main/java/org/distorted/config/ConfigScreen.java
+++ b/src/main/java/org/distorted/config/ConfigScreen.java
@@ -81,7 +81,7 @@ public class ConfigScreen
         @Override
         public void onClick(View v)
           {
-          if( act.getControl().isUINotBlocked() && mObjectOrdinal!=ordinal )
+          if( mObjectOrdinal!=ordinal )
             {
             mObjectOrdinal = ordinal;
             act.changeObject(mObjectOrdinal);
@@ -136,13 +136,10 @@ public class ConfigScreen
           setupObjectWindow(act,width,height);
           }
 
-        if( act.getControl().isUINotBlocked())
-          {
-          int rowCount = Math.min(mMaxRowCount,mRowCount);
-          View popupView = mObjectPopup.getContentView();
-          popupView.setSystemUiVisibility(RubikActivity.FLAGS);
-          displayPopup(act,view,mObjectPopup,mObjectSize*mColCount,mObjectSize*rowCount+5*margin,margin,margin);
-          }
+        int rowCount = Math.min(mMaxRowCount,mRowCount);
+        View popupView = mObjectPopup.getContentView();
+        popupView.setSystemUiVisibility(RubikActivity.FLAGS);
+        displayPopup(act,view,mObjectPopup,mObjectSize*mColCount,mObjectSize*rowCount+5*margin,margin,margin);
         }
       });
     }
diff --git a/src/main/java/org/distorted/helpers/MovesController.java b/src/main/java/org/distorted/helpers/MovesController.java
index 6dca97b5..a8d7983a 100644
--- a/src/main/java/org/distorted/helpers/MovesController.java
+++ b/src/main/java/org/distorted/helpers/MovesController.java
@@ -134,7 +134,7 @@ public class MovesController implements MovesFinished
   public void onActionFinished(final long effectID)
     {
     mCanPrevMove = true;
-    mControl.unblockTouch();
+    mControl.unblockRotation();
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/main/java/org/distorted/main/RubikObjectLibInterface.java b/src/main/java/org/distorted/main/RubikObjectLibInterface.java
index a3e111e3..c9ff8b48 100644
--- a/src/main/java/org/distorted/main/RubikObjectLibInterface.java
+++ b/src/main/java/org/distorted/main/RubikObjectLibInterface.java
@@ -328,9 +328,9 @@ public class RubikObjectLibInterface implements ObjectLibInterface, ListenerOver
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-  private void reportUIProblem(int place, long pause, long resume, long time)
+  private void reportScramblingProblem(int place, long pause, long resume, long time)
     {
-    String error = "UI BLOCK "+place+" blocked for "+time;
+    String error = "SCRAMBLING BLOCK "+place+" blocked for "+time;
 
     if( BuildConfig.DEBUG )
        {
@@ -348,9 +348,9 @@ public class RubikObjectLibInterface implements ObjectLibInterface, ListenerOver
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-  private void reportTouchProblem(int place, long pause, long resume, long time)
+  private void reportRotationProblem(int place, long pause, long resume, long time)
     {
-    String error = "TOUCH BLOCK "+place+" blocked for "+time;
+    String error = "ROTATION BLOCK "+place+" blocked for "+time;
 
     if( BuildConfig.DEBUG )
        {
@@ -392,9 +392,9 @@ public class RubikObjectLibInterface implements ObjectLibInterface, ListenerOver
     {
     switch(type)
       {
-      case BlockController.TYPE_UI    : reportUIProblem(place,pause,resume,time); break;
-      case BlockController.TYPE_TOUCH : reportTouchProblem(place,pause,resume,time); break;
-      case BlockController.TYPE_THREAD: reportThreadProblem(place,pause,resume,time); break;
+      case BlockController.TYPE_SCRAMBLING: reportScramblingProblem(place,pause,resume,time); break;
+      case BlockController.TYPE_ROTATION  : reportRotationProblem(place,pause,resume,time); break;
+      case BlockController.TYPE_THREAD    : reportThreadProblem(place,pause,resume,time); break;
       }
     }
 
diff --git a/src/main/java/org/distorted/screens/RubikScreenPlay.java b/src/main/java/org/distorted/screens/RubikScreenPlay.java
index d182b818..5f7ffd44 100644
--- a/src/main/java/org/distorted/screens/RubikScreenPlay.java
+++ b/src/main/java/org/distorted/screens/RubikScreenPlay.java
@@ -141,13 +141,10 @@ public class RubikScreenPlay extends RubikScreenBase implements RubikNetwork.Upd
           setupObjectWindow(act,width,height);
           }
 
-        if( act.getControl().isUINotBlocked())
-          {
-          int rowCount = Math.min(mMaxRowCount,mRowCount);
-          View popupView = mObjectPopup.getContentView();
-          popupView.setSystemUiVisibility(RubikActivity.FLAGS);
-          displayPopup(act,view,mObjectPopup,mObjectSize*mColCount,mObjectSize*rowCount+5*margin,margin,margin);
-          }
+        int rowCount = Math.min(mMaxRowCount,mRowCount);
+        View popupView = mObjectPopup.getContentView();
+        popupView.setSystemUiVisibility(RubikActivity.FLAGS);
+        displayPopup(act,view,mObjectPopup,mObjectSize*mColCount,mObjectSize*rowCount+5*margin,margin,margin);
         }
       });
     }
@@ -171,13 +168,10 @@ public class RubikScreenPlay extends RubikScreenBase implements RubikNetwork.Upd
           setupMenuWindow(act,width,height);
           }
 
-        if( act.getControl().isUINotBlocked())
-          {
-          View popupView = mMenuPopup.getContentView();
-          popupView.setSystemUiVisibility(RubikActivity.FLAGS);
-          setupLevelButtonVisibilityAndColor(act);
-          displayPopup(act,view,mMenuPopup,mMenuLayoutWidth,mMenuLayoutHeight,(int)(-mMenuLayoutWidth/2 + width/6),0);
-          }
+        View popupView = mMenuPopup.getContentView();
+        popupView.setSystemUiVisibility(RubikActivity.FLAGS);
+        setupLevelButtonVisibilityAndColor(act);
+        displayPopup(act,view,mMenuPopup,mMenuLayoutWidth,mMenuLayoutHeight,(int)(-mMenuLayoutWidth/2 + width/6),0);
         }
       });
     }
@@ -215,7 +209,7 @@ public class RubikScreenPlay extends RubikScreenBase implements RubikNetwork.Upd
         @Override
         public void onClick(View v)
           {
-          if( obj!=null && act.getControl().isUINotBlocked() && ScreenList.getCurrentScreen()==ScreenList.PLAY )
+          if( obj!=null && act.getControl().isScramblingAndSolvingNotBlocked() && ScreenList.getCurrentScreen()==ScreenList.PLAY )
             {
             if( obj.isFree() )
               {
@@ -498,7 +492,7 @@ public class RubikScreenPlay extends RubikScreenBase implements RubikNetwork.Upd
           {
           ObjectControl control = act.getControl();
 
-          if(control.isUINotBlocked())
+          if( control.isScramblingAndSolvingNotBlocked() )
             {
             if( mMenuPopup!=null ) mMenuPopup.dismiss();
 
diff --git a/src/main/java/org/distorted/tutorials/TutorialObjectLibInterface.java b/src/main/java/org/distorted/tutorials/TutorialObjectLibInterface.java
index 1e98656a..051c1387 100644
--- a/src/main/java/org/distorted/tutorials/TutorialObjectLibInterface.java
+++ b/src/main/java/org/distorted/tutorials/TutorialObjectLibInterface.java
@@ -67,9 +67,9 @@ public class TutorialObjectLibInterface implements ObjectLibInterface
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-  private void reportUIProblem(int place, long pause, long resume, long time)
+  private void reportScramblingProblem(int place, long pause, long resume, long time)
     {
-    String error = "UI BLOCK "+place+" blocked for "+time;
+    String error = "SCRAMBLING BLOCK "+place+" blocked for "+time;
 
     if( BuildConfig.DEBUG )
        {
@@ -87,9 +87,9 @@ public class TutorialObjectLibInterface implements ObjectLibInterface
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-  private void reportTouchProblem(int place, long pause, long resume, long time)
+  private void reportRotationProblem(int place, long pause, long resume, long time)
     {
-    String error = "TOUCH BLOCK "+place+" blocked for "+time;
+    String error = "ROTATION BLOCK "+place+" blocked for "+time;
 
     if( BuildConfig.DEBUG )
        {
@@ -131,9 +131,9 @@ public class TutorialObjectLibInterface implements ObjectLibInterface
     {
     switch(type)
       {
-      case BlockController.TYPE_UI    : reportUIProblem(place,pause,resume,time); break;
-      case BlockController.TYPE_TOUCH : reportTouchProblem(place,pause,resume,time); break;
-      case BlockController.TYPE_THREAD: reportThreadProblem(place,pause,resume,time); break;
+      case BlockController.TYPE_SCRAMBLING: reportScramblingProblem(place,pause,resume,time); break;
+      case BlockController.TYPE_ROTATION  : reportRotationProblem(place,pause,resume,time); break;
+      case BlockController.TYPE_THREAD    : reportThreadProblem(place,pause,resume,time); break;
       }
     }