Added solarized theme

pull/199/head
M66B 3 years ago
parent 7efb30037f
commit a2cae71ca5

@ -178,6 +178,11 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc
setTheme(R.style.AppThemeGreySteelBlueDark); setTheme(R.style.AppThemeGreySteelBlueDark);
break; break;
// Solarized
case "solarized":
setTheme(R.style.AppThemeSolarized);
break;
// Black // Black
case "black": case "black":
setTheme(R.style.AppThemeBlack); setTheme(R.style.AppThemeBlack);

@ -969,7 +969,9 @@ public class FragmentCompose extends FragmentBase {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
boolean cards = prefs.getBoolean("cards", true); boolean cards = prefs.getBoolean("cards", true);
if (cards && !Helper.isDarkTheme(getContext())) String theme = prefs.getString("theme", null);
if (cards &&
(!Helper.isDarkTheme(getContext())) || "solarized".equals(theme))
view.setBackgroundColor(Helper.resolveColor(getContext(), R.attr.colorCardBackground)); view.setBackgroundColor(Helper.resolveColor(getContext(), R.attr.colorCardBackground));
//boolean beige = prefs.getBoolean("beige", true); //boolean beige = prefs.getBoolean("beige", true);

@ -146,12 +146,17 @@ public class FragmentDialogTheme extends FragmentDialogBase {
case "purple_yellow_black": case "purple_yellow_black":
rgTheme.check(R.id.rbThemeYellowPurple); rgTheme.check(R.id.rbThemeYellowPurple);
break; break;
case "grey_system": case "grey_system":
case "grey_light": case "grey_light":
case "grey_dark": case "grey_dark":
rgTheme.check(R.id.rbThemeGrey); rgTheme.check(R.id.rbThemeGrey);
break; break;
case "solarized":
rgTheme.check(R.id.rbThemeSolarized);
break;
case "black": case "black":
rgTheme.check(R.id.rbThemeBlack); rgTheme.check(R.id.rbThemeBlack);
break; break;
@ -221,6 +226,8 @@ public class FragmentDialogTheme extends FragmentDialogBase {
else else
editor.putString("theme", editor.putString("theme",
"grey" + (dark ? "_dark" : "_light")).apply(); "grey" + (dark ? "_dark" : "_light")).apply();
} else if (checkedRadioButtonId == R.id.rbThemeSolarized) {
editor.putString("theme", "solarized").apply();
} else if (checkedRadioButtonId == R.id.rbThemeBlack) { } else if (checkedRadioButtonId == R.id.rbThemeBlack) {
editor.putString("theme", "black").apply(); editor.putString("theme", "black").apply();
} else if (checkedRadioButtonId == R.id.rbThemeBlackAndWhite) { } else if (checkedRadioButtonId == R.id.rbThemeBlackAndWhite) {

@ -62,6 +62,14 @@
android:text="@string/title_setup_theme_grey" android:text="@string/title_setup_theme_grey"
android:textAppearance="@style/TextAppearance.AppCompat.Medium" /> android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
<RadioButton
android:id="@+id/rbThemeSolarized"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="6dp"
android:text="@string/title_setup_theme_solarized"
android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
<RadioButton <RadioButton
android:id="@+id/rbThemeBlack" android:id="@+id/rbThemeBlack"
android:layout_width="wrap_content" android:layout_width="wrap_content"

@ -133,6 +133,11 @@
<color name="greyAccentDark">#62757f</color> <color name="greyAccentDark">#62757f</color>
<color name="greyAccentLight">#c1d5e0</color> <color name="greyAccentLight">#c1d5e0</color>
<!-- https://github.com/altercation/solarized -->
<color name="solarizedPrimary">#073642</color>
<color name="solarizedPrimaryDark">#002b36</color>
<color name="solarizedAccent">#268bd2</color>
<!-- default: #323232 --> <!-- default: #323232 -->
<color name="design_snackbar_background_color" tools:override="true">#222</color> <color name="design_snackbar_background_color" tools:override="true">#222</color>

@ -258,6 +258,7 @@
<string name="title_setup_theme_grey">Grey</string> <string name="title_setup_theme_grey">Grey</string>
<string name="title_setup_theme_black">Black</string> <string name="title_setup_theme_black">Black</string>
<string name="title_setup_theme_black_and_white">Black and white</string> <string name="title_setup_theme_black_and_white">Black and white</string>
<string name="title_setup_theme_solarized" translatable="false">Solarized</string>
<string name="title_setup_theme_reverse">Swap colors</string> <string name="title_setup_theme_reverse">Swap colors</string>
<string name="title_setup_theme_light">Light</string> <string name="title_setup_theme_light">Light</string>

@ -397,6 +397,26 @@
<item name="colorDrawerBackground">@color/black</item> <item name="colorDrawerBackground">@color/black</item>
</style> </style>
<style name="AppThemeSolarized" parent="AppThemeBaseDark">
<item name="themeName">black</item>
<item name="colorPrimary">@color/solarizedPrimary</item>
<item name="colorPrimaryDark">@color/solarizedPrimaryDark</item>
<item name="colorAccent">@color/solarizedAccent</item>
<item name="colorUnreadHighlight">@color/solarizedAccent</item>
<item name="colorFabBackground">@color/solarizedAccent</item>
<item name="colorInfoForeground">@color/white</item>
<item name="colorInfoBackground">@color/solarizedPrimary</item>
<item name="android:textColorLink">@color/solarizedAccent</item>
<item name="colorCardBackground">@color/solarizedPrimaryDark</item>
<item name="android:windowBackground">@drawable/black_background</item>
<item name="colorDrawerBackground">@color/black</item>
</style>
<style name="Theme.AppCompat.Translucent" parent="Theme.AppCompat.NoActionBar"> <style name="Theme.AppCompat.Translucent" parent="Theme.AppCompat.NoActionBar">
<item name="android:background">@color/transparent</item> <item name="android:background">@color/transparent</item>
<item name="android:windowNoTitle">true</item> <item name="android:windowNoTitle">true</item>

Loading…
Cancel
Save