commit 7214ddf115db859204421a442ac0051f83a7f5a0
Author: leszek <leszek@koltunski.pl>
Date:   Mon Jun 10 11:40:55 2024 +0200

    Make the default UI color scheme be GREEN
    Up versino to 2.1.0
    About dialog: new & todo

diff --git a/build.gradle b/build.gradle
index 34983127..771025cf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,8 +15,8 @@ android {
         applicationId "org.distorted.magic"
         minSdkVersion 21
         targetSdkVersion 34
-        versionCode 91
-        versionName "2.0.2"
+        versionCode 92
+        versionName "2.1.0"
     }
 
     buildTypes {
diff --git a/src/main/java/org/distorted/dialogs/RubikDialogAbout.java b/src/main/java/org/distorted/dialogs/RubikDialogAbout.java
index 0cc1dddc..494903ab 100644
--- a/src/main/java/org/distorted/dialogs/RubikDialogAbout.java
+++ b/src/main/java/org/distorted/dialogs/RubikDialogAbout.java
@@ -33,15 +33,15 @@ import org.distorted.main.R;
 public class RubikDialogAbout extends RubikDialogAbstract
   {
   private static final String WHATS_NEW =
-      "1. Support for Penrose Cubes.\n" +
-      "2. Support for adjustable colors and shapes of stickers.";
+      "1. Support for color themes in the UI.\n" +
+      "2. Support for barrel-shaped puzzles.\n" +
+      "3. Fix for Penrose Cubes: correctly detect solved state.";
 
   private static final String WHATS_COMING =
       "1. Support for sticker modes (Tartan Cube, Shepherd's Cube, etc).\n" +
-      "2. Support for color themes in the UI.\n" +
-      "3. Algorithmic solvers. (sub-optimal solvers for larger puzzles such as the 4x4)\n" +
-      "4. iOS version (no time for this, anyone can help? Code is open-source)\n" +
-      "5. More objects:\n    - Ghost Cubes\n    - more Mixups\n    - Barrels\n";
+      "2. Algorithmic solvers. (sub-optimal solvers for larger puzzles such as the 4x4)\n" +
+      "3. iOS version (no time for this, anyone can help? Code is open-source)\n" +
+      "5. More objects:\n    - Ghost Cubes\n    - more Mixups\n    - more Barrels\n";
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/main/java/org/distorted/helpers/BaseActivity.java b/src/main/java/org/distorted/helpers/BaseActivity.java
index 80d8c49d..16dd6b9c 100644
--- a/src/main/java/org/distorted/helpers/BaseActivity.java
+++ b/src/main/java/org/distorted/helpers/BaseActivity.java
@@ -29,9 +29,9 @@ import org.distorted.main.R;
 
 public class BaseActivity extends AppCompatActivity
 {
-    protected static final int THEME_GREY  = 0;
+    protected static final int THEME_GREEN = 0;
     protected static final int THEME_BLUE  = 1;
-    protected static final int THEME_GREEN = 2;
+    protected static final int THEME_GREY  = 2;
     protected static final int THEME_PINK  = 3;
     protected static final int THEME_ORANGE= 4;
 
@@ -57,23 +57,12 @@ public class BaseActivity extends AppCompatActivity
     protected void onCreate(Bundle savedState)
       {
       mPreferences = PreferenceManager.getDefaultSharedPreferences(this);
-      mCurrentTheme = mPreferences.getInt("theme",THEME_GREY);
+      mCurrentTheme = mPreferences.getInt("theme",THEME_GREEN);
 
       mDensity = getResources().getDisplayMetrics().density;
 
       switch(mCurrentTheme)
         {
-        case THEME_BLUE  : setTheme(R.style.BlueTheme);
-                           mVeryDarkC= R.color.veryDarkBlue;
-                           mDarkC    = R.color.darkBlue;
-                           mNormalC  = R.color.normalBlue;
-                           mMediumC  = R.color.mediumBlue;
-                           mLightC   = R.color.lightBlue;
-                           mPassedC  = R.color.passedBlue;
-                           mDarkT    = R.color.transDBlue;
-                           mLightT   = R.color.transLBlue;
-                           mSelectC  = R.color.selectBlue;
-                           break;
         case THEME_GREEN : setTheme(R.style.GreenTheme);
                            mVeryDarkC= R.color.veryDarkGreen;
                            mDarkC    = R.color.darkGreen;
@@ -85,6 +74,17 @@ public class BaseActivity extends AppCompatActivity
                            mLightT   = R.color.transLGreen;
                            mSelectC  = R.color.selectGreen;
                            break;
+        case THEME_BLUE  : setTheme(R.style.BlueTheme);
+                           mVeryDarkC= R.color.veryDarkBlue;
+                           mDarkC    = R.color.darkBlue;
+                           mNormalC  = R.color.normalBlue;
+                           mMediumC  = R.color.mediumBlue;
+                           mLightC   = R.color.lightBlue;
+                           mPassedC  = R.color.passedBlue;
+                           mDarkT    = R.color.transDBlue;
+                           mLightT   = R.color.transLBlue;
+                           mSelectC  = R.color.selectBlue;
+                           break;
         case THEME_GREY  : setTheme(R.style.GreyTheme);
                            mVeryDarkC= R.color.veryDarkGrey;
                            mDarkC    = R.color.darkGrey;
diff --git a/src/main/java/org/distorted/main/MainSettingsPopup.java b/src/main/java/org/distorted/main/MainSettingsPopup.java
index baf71011..d408a5bf 100644
--- a/src/main/java/org/distorted/main/MainSettingsPopup.java
+++ b/src/main/java/org/distorted/main/MainSettingsPopup.java
@@ -156,9 +156,9 @@ public class MainSettingsPopup implements AdapterView.OnItemSelectedListener
     Resources res = act.getResources();
     mThemeNames = new String[5];
 
-    mThemeNames[0] = res.getString(R.string.theme_grey);
+    mThemeNames[0] = res.getString(R.string.theme_green);
     mThemeNames[1] = res.getString(R.string.theme_blue);
-    mThemeNames[2] = res.getString(R.string.theme_green);
+    mThemeNames[2] = res.getString(R.string.theme_grey);
     mThemeNames[3] = res.getString(R.string.theme_pink);
     mThemeNames[4] = res.getString(R.string.theme_orange);
     }