commit aa6221650d595e3420b0a7553648fe7ebff06bde Author: Leszek Koltunski Date: Sat Jan 21 11:31:39 2023 +0100 Finally fix the 'impossible records' bug! Thanks for a bug report from Jacob Powell - if one, during scrambling, minimized the app and re-entered it, the UI lock got removed (by a call to 'unblockEverything' from RubikActivity's onResume) and one could then keep solving the object mid-scramble. Simply remove the 'unblockEverything' call from onResume. diff --git a/src/main/java/org/distorted/bandaged/BandagedCreatorActivity.java b/src/main/java/org/distorted/bandaged/BandagedCreatorActivity.java index 9ebc61c0..8359cf73 100644 --- a/src/main/java/org/distorted/bandaged/BandagedCreatorActivity.java +++ b/src/main/java/org/distorted/bandaged/BandagedCreatorActivity.java @@ -326,19 +326,9 @@ public class BandagedCreatorActivity extends AppCompatActivity public static int getDrawableSize() { - if( mScreenHeight<1000 ) - { - return 0; - } - if( mScreenHeight<1600 ) - { - return 1; - } - if( mScreenHeight<1900 ) - { - return 2; - } - + if( mScreenHeight<1000 ) return 0; + if( mScreenHeight<1600 ) return 1; + if( mScreenHeight<1900 ) return 2; return 3; } diff --git a/src/main/java/org/distorted/bandaged/BandagedPlayActivity.java b/src/main/java/org/distorted/bandaged/BandagedPlayActivity.java index 6fc8b727..6e6a2d03 100644 --- a/src/main/java/org/distorted/bandaged/BandagedPlayActivity.java +++ b/src/main/java/org/distorted/bandaged/BandagedPlayActivity.java @@ -39,9 +39,6 @@ public class BandagedPlayActivity extends AppCompatActivity private static final float RATIO_BAR = 0.10f; private static final float RATIO_INSET= 0.09f; - public static final float DIALOG_BUTTON_SIZE = 0.06f; - public static final float MENU_BIG_TEXT_SIZE = 0.05f; - public static final int FLAGS = View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION @@ -52,7 +49,7 @@ public class BandagedPlayActivity extends AppCompatActivity private int mCurrentApiVersion; private BandagedPlayScreen mScreen; private String mObjectName; - private int mHeightLowerBar, mHeightUpperBar; + private int mHeightUpperBar; /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -83,7 +80,6 @@ public class BandagedPlayActivity extends AppCompatActivity private void computeBarHeights() { int barHeight = (int)(mScreenHeight*RATIO_BAR); - mHeightLowerBar = barHeight; mHeightUpperBar = barHeight; LinearLayout layoutTop = findViewById(R.id.upperBar); @@ -93,7 +89,7 @@ public class BandagedPlayActivity extends AppCompatActivity paramsTop.height = mHeightUpperBar; layoutTop.setLayoutParams(paramsTop); ViewGroup.LayoutParams paramsBot = layoutBot.getLayoutParams(); - paramsBot.height = mHeightLowerBar; + paramsBot.height = barHeight; layoutBot.setLayoutParams(paramsBot); } @@ -252,23 +248,6 @@ public class BandagedPlayActivity extends AppCompatActivity /////////////////////////////////////////////////////////////////////////////////////////////////// // PUBLIC API -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void changeObject(String name) - { - mObjectName = name; - BandagedPlayView view = findViewById(R.id.bandagedPlayView); - ObjectControl control = view.getObjectControl(); - changeIfDifferent(name,control); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public int getHeightBar() - { - return mHeightLowerBar; - } - /////////////////////////////////////////////////////////////////////////////////////////////////// public int getScreenWidthInPixels() @@ -302,19 +281,9 @@ public class BandagedPlayActivity extends AppCompatActivity public static int getDrawableSize() { - if( mScreenHeight<1000 ) - { - return 0; - } - if( mScreenHeight<1600 ) - { - return 1; - } - if( mScreenHeight<1900 ) - { - return 2; - } - + if( mScreenHeight<1000 ) return 0; + if( mScreenHeight<1600 ) return 1; + if( mScreenHeight<1900 ) return 2; return 3; } diff --git a/src/main/java/org/distorted/bandaged/BandagedPlayScreen.java b/src/main/java/org/distorted/bandaged/BandagedPlayScreen.java index a48d88ef..b735d647 100644 --- a/src/main/java/org/distorted/bandaged/BandagedPlayScreen.java +++ b/src/main/java/org/distorted/bandaged/BandagedPlayScreen.java @@ -53,8 +53,6 @@ public class BandagedPlayScreen @Override public void onClick(View v) { - ObjectControl control = act.getControl(); - if( control!=null ) control.unblockEverything(); act.finish(); } }); @@ -156,14 +154,6 @@ public class BandagedPlayScreen layoutUpper.addView(layoutRightU); } -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void setLockState(final BandagedPlayActivity act) - { - boolean locked = act.getControl().retLocked(); - mLockController.setState(act,locked); - } - /////////////////////////////////////////////////////////////////////////////////////////////////// public void reddenLock(final BandagedPlayActivity act) diff --git a/src/main/java/org/distorted/config/ConfigActivity.java b/src/main/java/org/distorted/config/ConfigActivity.java index 1e7928f7..1e40ebff 100644 --- a/src/main/java/org/distorted/config/ConfigActivity.java +++ b/src/main/java/org/distorted/config/ConfigActivity.java @@ -35,9 +35,6 @@ public class ConfigActivity extends AppCompatActivity private static final int ACTIVITY_NUMBER = 2; private static final float RATIO_BAR = 0.10f; - public static final float DIALOG_BUTTON_SIZE = 0.06f; - public static final float MENU_BIG_TEXT_SIZE = 0.05f; - public static final int FLAGS = View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION diff --git a/src/main/java/org/distorted/config/ConfigScreen.java b/src/main/java/org/distorted/config/ConfigScreen.java index 622f1273..a246809e 100644 --- a/src/main/java/org/distorted/config/ConfigScreen.java +++ b/src/main/java/org/distorted/config/ConfigScreen.java @@ -21,7 +21,6 @@ import android.widget.ScrollView; import android.widget.TextView; import org.distorted.helpers.PopupCreator; -import org.distorted.objectlib.main.ObjectControl; import org.distorted.helpers.TransparentImageButton; import org.distorted.main.R; @@ -113,8 +112,6 @@ public class ConfigScreen @Override public void onClick(View v) { - ObjectControl control = act.getControl(); - if( control!=null ) control.unblockEverything(); act.finish(); } }); diff --git a/src/main/java/org/distorted/main/RubikActivity.java b/src/main/java/org/distorted/main/RubikActivity.java index f34dcfd3..3f79f03b 100644 --- a/src/main/java/org/distorted/main/RubikActivity.java +++ b/src/main/java/org/distorted/main/RubikActivity.java @@ -76,13 +76,8 @@ public class RubikActivity extends AppCompatActivity public static final float PATTERN_CHILD_TEXT = 0.02f; public static final float SCORES_LEVEL_TEXT = 0.035f; public static final float SCORES_ITEM_TEXT = 0.030f; - public static final float DIALOG_BUTTON_SIZE = 0.06f; - public static final float BIG_TEXT_SIZE = 0.05f; - public static final float SMALL_TEXT_SIZE = 0.035f; public static final float TAB_WIDTH = 0.066f; public static final float TAB_HEIGHT = 0.066f; - public static final float TAB_TEXT_SIZE = 0.033f; - public static final float TAB_BUTTON_SIZE = 0.040f; public static final float POPUP_PADDING = 0.028f; public static final float POPUP_MARGIN = 0.016f; @@ -262,7 +257,6 @@ public class RubikActivity extends AppCompatActivity SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this); restorePreferences(preferences,mJustStarted); ScreenList.setScreen(this); - unblockEverything(); restoreMoves(preferences); if( mJustStarted ) @@ -621,19 +615,9 @@ public class RubikActivity extends AppCompatActivity public static int getDrawableSize() { - if( mScreenHeight<1000 ) - { - return 0; - } - if( mScreenHeight<1600 ) - { - return 1; - } - if( mScreenHeight<1900 ) - { - return 2; - } - + if( mScreenHeight<1000 ) return 0; + if( mScreenHeight<1600 ) return 1; + if( mScreenHeight<1900 ) return 2; return 3; } @@ -692,30 +676,6 @@ public class RubikActivity extends AppCompatActivity return view.isVertical(); } -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void blockEverything(int place) - { - RubikSurfaceView view = findViewById(R.id.rubikSurfaceView); - ObjectControl control = view.getObjectControl(); - control.blockEverything(place); - - RubikScreenPlay play = (RubikScreenPlay) ScreenList.PLAY.getScreenClass(); - play.setLockState(this); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void unblockEverything() - { - RubikSurfaceView view = findViewById(R.id.rubikSurfaceView); - ObjectControl control = view.getObjectControl(); - control.unblockEverything(); - - RubikScreenPlay play = (RubikScreenPlay) ScreenList.PLAY.getScreenClass(); - play.setLockState(this); - } - /////////////////////////////////////////////////////////////////////////////////////////////////// public void switchTutorial(String url, int objectOrdinal) diff --git a/src/main/java/org/distorted/overlays/OverlayStars.java b/src/main/java/org/distorted/overlays/OverlayStars.java index 672fd1b4..0bf959bb 100644 --- a/src/main/java/org/distorted/overlays/OverlayStars.java +++ b/src/main/java/org/distorted/overlays/OverlayStars.java @@ -249,7 +249,7 @@ public class OverlayStars extends OverlayGeneric implements EffectListener MeshQuad mesh = new MeshQuad(); DistortedEffects effects = new DistortedEffects(); - float scaleM = mHeight*0.24f; + float scaleM = mHeight*0.22f; Static3D moveM= new Static3D(0,0,1); MatrixEffectMove move = new MatrixEffectMove(moveM); MatrixEffectScale scale= new MatrixEffectScale(scaleM); diff --git a/src/main/java/org/distorted/purchase/PurchaseActivity.java b/src/main/java/org/distorted/purchase/PurchaseActivity.java index 20cea9bd..68ce93d4 100644 --- a/src/main/java/org/distorted/purchase/PurchaseActivity.java +++ b/src/main/java/org/distorted/purchase/PurchaseActivity.java @@ -40,9 +40,6 @@ public class PurchaseActivity extends AppCompatActivity private static final float RATIO_LBAR = 0.10f; private static final float RATIO_VIEW = 0.50f; - public static final float DIALOG_BUTTON_SIZE = 0.06f; - public static final float MENU_BIG_TEXT_SIZE = 0.05f; - public static final int FLAGS = View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION @@ -283,19 +280,9 @@ public class PurchaseActivity extends AppCompatActivity public static int getDrawableSize() { - if( mScreenHeight<1000 ) - { - return 0; - } - if( mScreenHeight<1600 ) - { - return 1; - } - if( mScreenHeight<1900 ) - { - return 2; - } - + if( mScreenHeight<1000 ) return 0; + if( mScreenHeight<1600 ) return 1; + if( mScreenHeight<1900 ) return 2; return 3; } diff --git a/src/main/java/org/distorted/purchase/PurchaseScreen.java b/src/main/java/org/distorted/purchase/PurchaseScreen.java index 945b6e35..e7fc91ca 100644 --- a/src/main/java/org/distorted/purchase/PurchaseScreen.java +++ b/src/main/java/org/distorted/purchase/PurchaseScreen.java @@ -15,7 +15,6 @@ import android.widget.LinearLayout; import org.distorted.helpers.TransparentImageButton; import org.distorted.main.R; import org.distorted.main.RubikActivity; -import org.distorted.objectlib.main.ObjectControl; /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -44,12 +43,7 @@ public class PurchaseScreen @Override public void onClick(View v) { - if( !mBlocked ) - { - ObjectControl control = act.getControl(); - if( control!=null ) control.unblockEverything(); - act.finish(); - } + if( !mBlocked ) act.finish(); } }); } diff --git a/src/main/java/org/distorted/purchase/PurchaseScreenPane.java b/src/main/java/org/distorted/purchase/PurchaseScreenPane.java index ec365975..69db335d 100644 --- a/src/main/java/org/distorted/purchase/PurchaseScreenPane.java +++ b/src/main/java/org/distorted/purchase/PurchaseScreenPane.java @@ -24,7 +24,6 @@ import org.distorted.external.RubikScores; import org.distorted.library.main.DistortedScreen; import org.distorted.main.R; import org.distorted.objectlib.json.JsonReader; -import org.distorted.objectlib.main.ObjectControl; import org.distorted.objects.RubikObject; import org.distorted.objects.RubikObjectList; import org.distorted.overlays.DataStars; @@ -281,8 +280,6 @@ public class PurchaseScreenPane implements ListenerOverlay String upperName = mObject.getUpperName(); int ordinal = RubikObjectList.getOrdinal(upperName); RubikObjectList.setCurrObject(ordinal); - ObjectControl control = act.getControl(); - if( control!=null ) control.unblockEverything(); act.finish(); } } diff --git a/src/main/java/org/distorted/tutorials/TutorialActivity.java b/src/main/java/org/distorted/tutorials/TutorialActivity.java index cbc69d27..23d04359 100644 --- a/src/main/java/org/distorted/tutorials/TutorialActivity.java +++ b/src/main/java/org/distorted/tutorials/TutorialActivity.java @@ -44,7 +44,6 @@ public class TutorialActivity extends AppCompatActivity private static final int ACTIVITY_NUMBER = 1; public static final float BAR_RATIO = 0.17f; - public static final float DIALOG_BUTTON_SIZE = 0.06f; public static final int FLAGS = View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN @@ -281,19 +280,9 @@ public class TutorialActivity extends AppCompatActivity public static int getDrawableSize() { - if( mScreenHeight<1000 ) - { - return 0; - } - if( mScreenHeight<1600 ) - { - return 1; - } - if( mScreenHeight<1900 ) - { - return 2; - } - + if( mScreenHeight<1000 ) return 0; + if( mScreenHeight<1600 ) return 1; + if( mScreenHeight<1900 ) return 2; return 3; } diff --git a/src/main/java/org/distorted/tutorials/TutorialScreen.java b/src/main/java/org/distorted/tutorials/TutorialScreen.java index 30a7b0d9..d048073f 100644 --- a/src/main/java/org/distorted/tutorials/TutorialScreen.java +++ b/src/main/java/org/distorted/tutorials/TutorialScreen.java @@ -127,8 +127,6 @@ public class TutorialScreen @Override public void onClick(View v) { - ObjectControl control = act.getControl(); - if( control!=null ) control.unblockEverything(); act.finish(); } });