Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-28 03:46:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added solarized light theme

Browse Source
This commit is contained in:
M66B
2021-06-27 08:13:56 +02:00
parent ab4d527d73
commit 513ef8a854
24 changed files with 109 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
app/src/main/java/eu/faircode/email/FragmentDialogTheme.java
View File

@@ -1,6 +1,7 @@
package eu.faircode.email;
import android.app.Dialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.SharedPreferences;
import android.graphics.Paint;
@@ -15,6 +16,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.widget.SwitchCompat;
import androidx.core.content.ContextCompat;
import androidx.preference.PreferenceManager;
public class FragmentDialogTheme extends FragmentDialogBase {
@@ -28,19 +30,20 @@ public class FragmentDialogTheme extends FragmentDialogBase {
private void eval() {
int checkedId = rgTheme.getCheckedRadioButtonId();
boolean grey = (checkedId == R.id.rbThemeGrey);
boolean colored = (grey ||
boolean solarized = (checkedId == R.id.rbThemeSolarized);
boolean colored = (grey || solarized ||
checkedId == R.id.rbThemeBlueOrange ||
checkedId == R.id.rbThemeRedGreen ||
checkedId == R.id.rbThemeYellowPurple);
int optionId = rgThemeOptions.getCheckedRadioButtonId();
swReverse.setEnabled(colored && !grey);
swReverse.setEnabled(colored && !grey && !solarized);
rgThemeOptions.setEnabled(colored);
for (int i = 0; i < rgThemeOptions.getChildCount(); i++)
rgThemeOptions.getChildAt(i).setEnabled(colored);
swBlack.setEnabled(colored && !grey && optionId != R.id.rbThemeLight);
swBlack.setEnabled(colored && !grey && !solarized && optionId != R.id.rbThemeLight);
tvSystem.setEnabled(colored && optionId == R.id.rbThemeSystem);
}
@@ -154,6 +157,9 @@ public class FragmentDialogTheme extends FragmentDialogBase {
break;
case "solarized":
case "solarized_light":
case "solarized_dark":
case "solarized_system":
rgTheme.check(R.id.rbThemeSolarized);
break;
@@ -227,7 +233,11 @@ public class FragmentDialogTheme extends FragmentDialogBase {
editor.putString("theme",
"grey" + (dark ? "_dark" : "_light")).apply();
} else if (checkedRadioButtonId == R.id.rbThemeSolarized) {
editor.putString("theme", "solarized").apply();
if (system)
editor.putString("theme", "solarized_system").apply();
else
editor.putString("theme",
"solarized" + (dark ? "_dark" : "_light")).apply();
} else if (checkedRadioButtonId == R.id.rbThemeBlack) {
editor.putString("theme", "black").apply();
} else if (checkedRadioButtonId == R.id.rbThemeBlackAndWhite) {
@@ -240,4 +250,23 @@ public class FragmentDialogTheme extends FragmentDialogBase {
.setNegativeButton(android.R.string.cancel, null)
.create();
}
static void setBackground(Context context, View view, boolean compose) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean cards = prefs.getBoolean("cards", true);
boolean beige = prefs.getBoolean("beige", true);
String theme = prefs.getString("theme", "blue_orange_system");
boolean dark = Helper.isDarkTheme(context);
boolean solarized = (theme != null && theme.startsWith("solarized"));
if (compose) {
if (cards && (!dark || solarized))
view.setBackgroundColor(Helper.resolveColor(context, R.attr.colorCardBackground));
} else {
if (cards && !dark && !solarized)
view.setBackgroundColor(ContextCompat.getColor(context, beige
? R.color.lightColorBackground_cards_beige
: R.color.lightColorBackground_cards));
}
}
}