Revision 7214ddf1
Added by Leszek Koltunski 5 months ago
| build.gradle | ||
|---|---|---|
| 15 | 15 |
applicationId "org.distorted.magic" |
| 16 | 16 |
minSdkVersion 21 |
| 17 | 17 |
targetSdkVersion 34 |
| 18 |
versionCode 91
|
|
| 19 |
versionName "2.0.2"
|
|
| 18 |
versionCode 92
|
|
| 19 |
versionName "2.1.0"
|
|
| 20 | 20 |
} |
| 21 | 21 |
|
| 22 | 22 |
buildTypes {
|
| src/main/java/org/distorted/dialogs/RubikDialogAbout.java | ||
|---|---|---|
| 33 | 33 |
public class RubikDialogAbout extends RubikDialogAbstract |
| 34 | 34 |
{
|
| 35 | 35 |
private static final String WHATS_NEW = |
| 36 |
"1. Support for Penrose Cubes.\n" + |
|
| 37 |
"2. Support for adjustable colors and shapes of stickers."; |
|
| 36 |
"1. Support for color themes in the UI.\n" + |
|
| 37 |
"2. Support for barrel-shaped puzzles.\n" + |
|
| 38 |
"3. Fix for Penrose Cubes: correctly detect solved state."; |
|
| 38 | 39 |
|
| 39 | 40 |
private static final String WHATS_COMING = |
| 40 | 41 |
"1. Support for sticker modes (Tartan Cube, Shepherd's Cube, etc).\n" + |
| 41 |
"2. Support for color themes in the UI.\n" + |
|
| 42 |
"3. Algorithmic solvers. (sub-optimal solvers for larger puzzles such as the 4x4)\n" + |
|
| 43 |
"4. iOS version (no time for this, anyone can help? Code is open-source)\n" + |
|
| 44 |
"5. More objects:\n - Ghost Cubes\n - more Mixups\n - Barrels\n"; |
|
| 42 |
"2. Algorithmic solvers. (sub-optimal solvers for larger puzzles such as the 4x4)\n" + |
|
| 43 |
"3. iOS version (no time for this, anyone can help? Code is open-source)\n" + |
|
| 44 |
"5. More objects:\n - Ghost Cubes\n - more Mixups\n - more Barrels\n"; |
|
| 45 | 45 |
|
| 46 | 46 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 47 | 47 |
|
| src/main/java/org/distorted/helpers/BaseActivity.java | ||
|---|---|---|
| 29 | 29 |
|
| 30 | 30 |
public class BaseActivity extends AppCompatActivity |
| 31 | 31 |
{
|
| 32 |
protected static final int THEME_GREY = 0;
|
|
| 32 |
protected static final int THEME_GREEN = 0;
|
|
| 33 | 33 |
protected static final int THEME_BLUE = 1; |
| 34 |
protected static final int THEME_GREEN = 2;
|
|
| 34 |
protected static final int THEME_GREY = 2;
|
|
| 35 | 35 |
protected static final int THEME_PINK = 3; |
| 36 | 36 |
protected static final int THEME_ORANGE= 4; |
| 37 | 37 |
|
| ... | ... | |
| 57 | 57 |
protected void onCreate(Bundle savedState) |
| 58 | 58 |
{
|
| 59 | 59 |
mPreferences = PreferenceManager.getDefaultSharedPreferences(this); |
| 60 |
mCurrentTheme = mPreferences.getInt("theme",THEME_GREY);
|
|
| 60 |
mCurrentTheme = mPreferences.getInt("theme",THEME_GREEN);
|
|
| 61 | 61 |
|
| 62 | 62 |
mDensity = getResources().getDisplayMetrics().density; |
| 63 | 63 |
|
| 64 | 64 |
switch(mCurrentTheme) |
| 65 | 65 |
{
|
| 66 |
case THEME_BLUE : setTheme(R.style.BlueTheme); |
|
| 67 |
mVeryDarkC= R.color.veryDarkBlue; |
|
| 68 |
mDarkC = R.color.darkBlue; |
|
| 69 |
mNormalC = R.color.normalBlue; |
|
| 70 |
mMediumC = R.color.mediumBlue; |
|
| 71 |
mLightC = R.color.lightBlue; |
|
| 72 |
mPassedC = R.color.passedBlue; |
|
| 73 |
mDarkT = R.color.transDBlue; |
|
| 74 |
mLightT = R.color.transLBlue; |
|
| 75 |
mSelectC = R.color.selectBlue; |
|
| 76 |
break; |
|
| 77 | 66 |
case THEME_GREEN : setTheme(R.style.GreenTheme); |
| 78 | 67 |
mVeryDarkC= R.color.veryDarkGreen; |
| 79 | 68 |
mDarkC = R.color.darkGreen; |
| ... | ... | |
| 85 | 74 |
mLightT = R.color.transLGreen; |
| 86 | 75 |
mSelectC = R.color.selectGreen; |
| 87 | 76 |
break; |
| 77 |
case THEME_BLUE : setTheme(R.style.BlueTheme); |
|
| 78 |
mVeryDarkC= R.color.veryDarkBlue; |
|
| 79 |
mDarkC = R.color.darkBlue; |
|
| 80 |
mNormalC = R.color.normalBlue; |
|
| 81 |
mMediumC = R.color.mediumBlue; |
|
| 82 |
mLightC = R.color.lightBlue; |
|
| 83 |
mPassedC = R.color.passedBlue; |
|
| 84 |
mDarkT = R.color.transDBlue; |
|
| 85 |
mLightT = R.color.transLBlue; |
|
| 86 |
mSelectC = R.color.selectBlue; |
|
| 87 |
break; |
|
| 88 | 88 |
case THEME_GREY : setTheme(R.style.GreyTheme); |
| 89 | 89 |
mVeryDarkC= R.color.veryDarkGrey; |
| 90 | 90 |
mDarkC = R.color.darkGrey; |
| src/main/java/org/distorted/main/MainSettingsPopup.java | ||
|---|---|---|
| 156 | 156 |
Resources res = act.getResources(); |
| 157 | 157 |
mThemeNames = new String[5]; |
| 158 | 158 |
|
| 159 |
mThemeNames[0] = res.getString(R.string.theme_grey);
|
|
| 159 |
mThemeNames[0] = res.getString(R.string.theme_green);
|
|
| 160 | 160 |
mThemeNames[1] = res.getString(R.string.theme_blue); |
| 161 |
mThemeNames[2] = res.getString(R.string.theme_green);
|
|
| 161 |
mThemeNames[2] = res.getString(R.string.theme_grey);
|
|
| 162 | 162 |
mThemeNames[3] = res.getString(R.string.theme_pink); |
| 163 | 163 |
mThemeNames[4] = res.getString(R.string.theme_orange); |
| 164 | 164 |
} |
Also available in: Unified diff
Make the default UI color scheme be GREEN
Up versino to 2.1.0
About dialog: new & todo