jahruz67/Bible-Daily
1
0
Fork 0
mirror of https://github.com/jahruz67/Bible-Daily.git synced 2026-08-08 18:14:05 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

feat: implement dark mode support in SettingsActivity with adaptive color helpers

Browse Source
This commit is contained in:
jahruz67
2026-07-25 14:13:15 -07:00
parent 782ede4254
commit 1cd8b82b72
1 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/bibliadiaria/app/SettingsActivity.java
+20 -12
View File
@@ -37,6 +37,7 @@ public class SettingsActivity extends Activity {
private static final int COLOR_ACCENT = Color.rgb(0, 107, 90); private static final int COLOR_ACCENT = Color.rgb(0, 107, 90);
private static final int COLOR_WARM = Color.rgb(217, 75, 61); private static final int COLOR_WARM = Color.rgb(217, 75, 61);
private boolean isDarkMode;
private ExecutorService executor; private ExecutorService executor;
private TextView statusText; private TextView statusText;
private TextView installedVersionText; private TextView installedVersionText;
@@ -52,12 +53,13 @@ public class SettingsActivity extends Activity {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
getWindow().setStatusBarColor(COLOR_BACKGROUND); getWindow().setStatusBarColor(bg());
getWindow().setNavigationBarColor(COLOR_BACKGROUND); getWindow().setNavigationBarColor(bg());
} }
executor = Executors.newSingleThreadExecutor(); executor = Executors.newSingleThreadExecutor();
isEnglish = UpdateManager.isEnglish(this); isEnglish = UpdateManager.isEnglish(this);
isDarkMode = UpdateManager.isDarkMode(this);
setContentView(createScreen()); setContentView(createScreen());
updateInstalledVersionText(); updateInstalledVersionText();
} }
@@ -72,7 +74,7 @@ public class SettingsActivity extends Activity {
private View createScreen() { private View createScreen() {
FrameLayout root = new FrameLayout(this); FrameLayout root = new FrameLayout(this);
root.setBackgroundColor(COLOR_BACKGROUND); root.setBackgroundColor(bg());
ScrollView scrollView = new ScrollView(this); ScrollView scrollView = new ScrollView(this);
scrollView.setFillViewport(true); scrollView.setFillViewport(true);
@@ -88,7 +90,7 @@ public class SettingsActivity extends Activity {
content.addView(createTopBar()); content.addView(createTopBar());
TextView title = textView("Settings", 34, COLOR_INK, Typeface.BOLD); TextView title = textView("Settings", 34, ink(), Typeface.BOLD);
title.setIncludeFontPadding(false); title.setIncludeFontPadding(false);
LinearLayout.LayoutParams titleParams = new LinearLayout.LayoutParams( LinearLayout.LayoutParams titleParams = new LinearLayout.LayoutParams(
ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT,
@@ -175,11 +177,11 @@ public class SettingsActivity extends Activity {
LinearLayout copy = new LinearLayout(this); LinearLayout copy = new LinearLayout(this);
copy.setOrientation(LinearLayout.VERTICAL); copy.setOrientation(LinearLayout.VERTICAL);
TextView title = textView("Language", 20, COLOR_INK, Typeface.BOLD); TextView title = textView("Language", 20, ink(), Typeface.BOLD);
title.setIncludeFontPadding(false); title.setIncludeFontPadding(false);
copy.addView(title); copy.addView(title);
TextView subtitle = textView("Select the language for daily readings", 14, COLOR_MUTED, Typeface.NORMAL); TextView subtitle = textView("Select the language for daily readings", 14, muted(), Typeface.NORMAL);
LinearLayout.LayoutParams subtitleParams = new LinearLayout.LayoutParams( LinearLayout.LayoutParams subtitleParams = new LinearLayout.LayoutParams(
ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT,
ViewGroup.LayoutParams.WRAP_CONTENT ViewGroup.LayoutParams.WRAP_CONTENT
@@ -212,11 +214,11 @@ public class SettingsActivity extends Activity {
LinearLayout copy = new LinearLayout(this); LinearLayout copy = new LinearLayout(this);
copy.setOrientation(LinearLayout.VERTICAL); copy.setOrientation(LinearLayout.VERTICAL);
TextView title = textView("Voice", 20, COLOR_INK, Typeface.BOLD); TextView title = textView("Voice", 20, ink(), Typeface.BOLD);
title.setIncludeFontPadding(false); title.setIncludeFontPadding(false);
copy.addView(title); copy.addView(title);
voiceSubtitleText = textView("", 14, COLOR_MUTED, Typeface.NORMAL); voiceSubtitleText = textView("", 14, muted(), Typeface.NORMAL);
LinearLayout.LayoutParams subtitleParams = new LinearLayout.LayoutParams( LinearLayout.LayoutParams subtitleParams = new LinearLayout.LayoutParams(
ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT,
ViewGroup.LayoutParams.WRAP_CONTENT ViewGroup.LayoutParams.WRAP_CONTENT
@@ -246,11 +248,11 @@ public class SettingsActivity extends Activity {
LinearLayout card = createCard(); LinearLayout card = createCard();
card.setOrientation(LinearLayout.VERTICAL); card.setOrientation(LinearLayout.VERTICAL);
TextView title = textView("Version", 20, COLOR_INK, Typeface.BOLD); TextView title = textView("Version", 20, ink(), Typeface.BOLD);
title.setIncludeFontPadding(false); title.setIncludeFontPadding(false);
card.addView(title); card.addView(title);
installedVersionText = textView("", 15, COLOR_MUTED, Typeface.BOLD); installedVersionText = textView("", 15, muted(), Typeface.BOLD);
LinearLayout.LayoutParams installedParams = new LinearLayout.LayoutParams( LinearLayout.LayoutParams installedParams = new LinearLayout.LayoutParams(
ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT,
ViewGroup.LayoutParams.WRAP_CONTENT ViewGroup.LayoutParams.WRAP_CONTENT
@@ -258,7 +260,7 @@ public class SettingsActivity extends Activity {
installedParams.setMargins(0, dp(10), 0, 0); installedParams.setMargins(0, dp(10), 0, 0);
card.addView(installedVersionText, installedParams); card.addView(installedVersionText, installedParams);
statusText = textView("Ready to check for updates.", 15, COLOR_MUTED, Typeface.NORMAL); statusText = textView("Ready to check for updates.", 15, muted(), Typeface.NORMAL);
statusText.setLineSpacing(dp(3), 1.1f); statusText.setLineSpacing(dp(3), 1.1f);
LinearLayout.LayoutParams statusParams = new LinearLayout.LayoutParams( LinearLayout.LayoutParams statusParams = new LinearLayout.LayoutParams(
ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT,
@@ -374,7 +376,7 @@ public class SettingsActivity extends Activity {
private LinearLayout createCard() { private LinearLayout createCard() {
LinearLayout card = new LinearLayout(this); LinearLayout card = new LinearLayout(this);
card.setPadding(dp(18), dp(16), dp(18), dp(16)); card.setPadding(dp(18), dp(16), dp(18), dp(16));
card.setBackground(roundedRect(COLOR_CARD, dp(8), Color.rgb(229, 232, 230), dp(1))); card.setBackground(roundedRect(card(), dp(8), Color.rgb(229, 232, 230), dp(1)));
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
card.setElevation(dp(1)); card.setElevation(dp(1));
} }
@@ -416,6 +418,12 @@ public class SettingsActivity extends Activity {
return drawable; return drawable;
} }
// --- Dark mode aware color helpers ---
private int bg() { return isDarkMode ? COLOR_BG_DARK : COLOR_BG_LIGHT; }
private int card() { return isDarkMode ? COLOR_CARD_DARK : COLOR_CARD_LIGHT; }
private int ink() { return isDarkMode ? COLOR_INK_DARK : COLOR_INK_LIGHT; }
private int muted() { return isDarkMode ? COLOR_MUTED_DARK : COLOR_MUTED_LIGHT; }
private int dp(int value) { private int dp(int value) {
return Math.round(value * getResources().getDisplayMetrics().density); return Math.round(value * getResources().getDisplayMetrics().density);
} }