From bd5fc9025147db1436a527b09bd816ee000a1347 Mon Sep 17 00:00:00 2001 From: proletarius101 Date: Fri, 22 Jan 2021 23:25:37 +0800 Subject: [PATCH] Change coloring scheme to Material Theming --- app/src/github/AndroidManifest.xml | 2 +- app/src/main/AndroidManifest.xml | 2 +- .../java/eu/faircode/email/ActivityBase.java | 75 ++-- .../java/eu/faircode/email/ActivityMain.java | 4 +- .../eu/faircode/email/AdapterContact.java | 6 +- .../eu/faircode/email/AdapterMessage.java | 12 +- .../faircode/email/FragmentDialogTheme.java | 2 + .../eu/faircode/email/FragmentMessages.java | 8 +- .../email/FragmentOptionsDisplay.java | 6 +- .../main/java/eu/faircode/email/Helper.java | 2 +- .../java/eu/faircode/email/HtmlHelper.java | 12 +- .../java/eu/faircode/email/StyleHelper.java | 20 +- app/src/main/res/drawable/scroll_thumb.xml | 2 +- .../main/res/drawable/scroll_thumb_popup.xml | 2 +- .../res/layout/fragment_legend_messages.xml | 2 +- app/src/main/res/layout/fragment_setup.xml | 2 +- .../res/layout/include_message_compact.xml | 2 +- .../res/layout/include_message_normal.xml | 2 +- app/src/main/res/layout/item_account.xml | 2 +- app/src/main/res/layout/item_folder.xml | 2 +- .../res/layout/item_folder_unselectable.xml | 2 +- app/src/main/res/layout/item_identity.xml | 2 +- app/src/main/res/values-night/themes.xml | 209 +++++++++ app/src/main/res/values/colors.xml | 28 +- app/src/main/res/values/styles.xml | 423 +----------------- app/src/main/res/values/themes.xml | 231 ++++++++++ 26 files changed, 548 insertions(+), 514 deletions(-) create mode 100644 app/src/main/res/values-night/themes.xml create mode 100644 app/src/main/res/values/themes.xml diff --git a/app/src/github/AndroidManifest.xml b/app/src/github/AndroidManifest.xml index 7a84bb7fab..939064c2e1 100644 --- a/app/src/github/AndroidManifest.xml +++ b/app/src/github/AndroidManifest.xml @@ -108,7 +108,7 @@ android:resizeableActivity="true" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" - android:theme="@style/AppThemeBlueOrangeLight"> + android:theme="@style/AppThemeBlueOrange"> diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e42c94b56..6f7ef4c9d4 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -108,7 +108,7 @@ android:resizeableActivity="true" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" - android:theme="@style/AppThemeBlueOrangeLight"> + android:theme="@style/AppThemeBlueOrange"> diff --git a/app/src/main/java/eu/faircode/email/ActivityBase.java b/app/src/main/java/eu/faircode/email/ActivityBase.java index 461658d737..c8884e7754 100644 --- a/app/src/main/java/eu/faircode/email/ActivityBase.java +++ b/app/src/main/java/eu/faircode/email/ActivityBase.java @@ -43,6 +43,7 @@ import android.widget.Toast; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatDelegate; import androidx.core.content.FileProvider; import androidx.documentfile.provider.DocumentFile; import androidx.lifecycle.Lifecycle; @@ -103,48 +104,50 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc switch (theme) { // Light case "light": + AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO); case "blue_orange_light": - setTheme(R.style.AppThemeBlueOrangeLight); + setTheme(R.style.AppThemeBlueOrange); break; case "orange_blue_light": - setTheme(R.style.AppThemeOrangeBlueLight); + setTheme(R.style.AppThemeOrangeBlue); break; case "yellow_purple_light": - setTheme(R.style.AppThemeYellowPurpleLight); + setTheme(R.style.AppThemeYellowPurple); break; case "purple_yellow_light": - setTheme(R.style.AppThemePurpleYellowLight); + setTheme(R.style.AppThemePurpleYellow); break; case "red_green_light": - setTheme(R.style.AppThemeRedGreenLight); + setTheme(R.style.AppThemeRedGreen); break; case "green_red_light": - setTheme(R.style.AppThemeGreenRedLight); + setTheme(R.style.AppThemeGreenRed); break; // Dark case "dark": + AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES); case "blue_orange_dark": - setTheme(R.style.AppThemeBlueOrangeDark); + setTheme(R.style.AppThemeBlueOrange); break; case "orange_blue_dark": - setTheme(R.style.AppThemeOrangeBlueDark); + setTheme(R.style.AppThemeOrangeBlue); break; case "yellow_purple_dark": - setTheme(R.style.AppThemeYellowPurpleDark); + setTheme(R.style.AppThemeYellowPurple); break; case "purple_yellow_dark": - setTheme(R.style.AppThemePurpleYellowDark); + setTheme(R.style.AppThemePurpleYellow); break; case "red_green_dark": - setTheme(R.style.AppThemeRedGreenDark); + setTheme(R.style.AppThemeRedGreen); break; case "green_red_dark": - setTheme(R.style.AppThemeGreenRedDark); + setTheme(R.style.AppThemeGreenRed); break; // Black @@ -169,10 +172,10 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc // Grey case "grey_light": - setTheme(R.style.AppThemeGreySteelBlueLight); + setTheme(R.style.AppThemeGreySteelBlue); break; case "grey_dark": - setTheme(R.style.AppThemeGreySteelBlueDark); + setTheme(R.style.AppThemeGreySteelBlue); break; // Black @@ -186,69 +189,67 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc // System case "system": + // `Set by Battery Saver` for Q above (inclusive), `Use system default` for Q below + // https://medium.com/androiddevelopers/appcompat-v23-2-daynight-d10f90c83e94 + if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.P) { + AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_AUTO_BATTERY); + } else { + AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM); + } case "blue_orange_system": setTheme(night - ? R.style.AppThemeBlueOrangeDark : R.style.AppThemeBlueOrangeLight); + ? R.style.AppThemeBlueOrange : R.style.AppThemeBlueOrange); break; case "blue_orange_system_black": setTheme(night - ? R.style.AppThemeBlueOrangeBlack : R.style.AppThemeBlueOrangeLight); + ? R.style.AppThemeBlueOrangeBlack : R.style.AppThemeBlueOrange); break; case "orange_blue_system": setTheme(night - ? R.style.AppThemeOrangeBlueDark : R.style.AppThemeOrangeBlueLight); + ? R.style.AppThemeOrangeBlue : R.style.AppThemeOrangeBlue); break; case "orange_blue_system_black": setTheme(night - ? R.style.AppThemeOrangeBlueBlack : R.style.AppThemeOrangeBlueLight); + ? R.style.AppThemeOrangeBlueBlack : R.style.AppThemeOrangeBlue); break; case "yellow_purple_system": setTheme(night - ? R.style.AppThemeYellowPurpleDark : R.style.AppThemeYellowPurpleLight); + ? R.style.AppThemeYellowPurple : R.style.AppThemeYellowPurple); break; case "yellow_purple_system_black": setTheme(night - ? R.style.AppThemeYellowPurpleBlack : R.style.AppThemeYellowPurpleLight); + ? R.style.AppThemeYellowPurpleBlack : R.style.AppThemeYellowPurple); break; case "purple_yellow_system": setTheme(night - ? R.style.AppThemePurpleYellowDark : R.style.AppThemePurpleYellowLight); + ? R.style.AppThemePurpleYellow : R.style.AppThemePurpleYellow); break; case "purple_yellow_system_black": setTheme(night - ? R.style.AppThemePurpleYellowBlack : R.style.AppThemePurpleYellowLight); + ? R.style.AppThemePurpleYellowBlack : R.style.AppThemePurpleYellow); break; case "red_green_system": setTheme(night - ? R.style.AppThemeRedGreenDark : R.style.AppThemeRedGreenLight); + ? R.style.AppThemeRedGreen : R.style.AppThemeRedGreen); break; case "red_green_system_black": setTheme(night - ? R.style.AppThemeRedGreenBlack : R.style.AppThemeRedGreenLight); + ? R.style.AppThemeRedGreenBlack : R.style.AppThemeRedGreen); break; case "green_red_system": setTheme(night - ? R.style.AppThemeGreenRedDark : R.style.AppThemeGreenRedLight); + ? R.style.AppThemeGreenRed : R.style.AppThemeGreenRed); break; case "green_red_system_black": setTheme(night - ? R.style.AppThemeGreenRedBlack : R.style.AppThemeGreenRedLight); + ? R.style.AppThemeGreenRedBlack : R.style.AppThemeGreenRed); break; case "grey_system": setTheme(night - ? R.style.AppThemeGreySteelBlueDark : R.style.AppThemeGreySteelBlueLight); + ? R.style.AppThemeGreySteelBlue : R.style.AppThemeGreySteelBlue); break; } - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - boolean dark = Helper.isDarkTheme(this); - Window window = getWindow(); - View view = window.getDecorView(); - int flags = view.getSystemUiVisibility(); - if (dark) - flags &= ~View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR; - view.setSystemUiVisibility(flags); - } } prefs.registerOnSharedPreferenceChangeListener(this); @@ -259,7 +260,7 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc if (navbar_colorize) { Window window = getWindow(); if (window != null) - window.setNavigationBarColor(Helper.resolveColor(this, R.attr.colorPrimaryDark)); + window.setNavigationBarColor(Helper.resolveColor(this, R.attr.colorPrimary)); } super.onCreate(savedInstanceState); diff --git a/app/src/main/java/eu/faircode/email/ActivityMain.java b/app/src/main/java/eu/faircode/email/ActivityMain.java index fd8cc5c007..f319078412 100644 --- a/app/src/main/java/eu/faircode/email/ActivityMain.java +++ b/app/src/main/java/eu/faircode/email/ActivityMain.java @@ -41,7 +41,7 @@ public class ActivityMain extends ActivityBase implements FragmentManager.OnBack getSupportFragmentManager().addOnBackStackChangedListener(this); if (!Log.isSupportedDevice() && Helper.isPlayStoreInstall()) { - setTheme(R.style.AppThemeBlueOrangeLight); + setTheme(R.style.AppThemeBlueOrange); super.onCreate(savedInstanceState); setContentView(R.layout.activity_unsupported); return; @@ -181,7 +181,7 @@ public class ActivityMain extends ActivityBase implements FragmentManager.OnBack else prefs.edit().putBoolean("compact", true).apply(); - setTheme(R.style.AppThemeBlueOrangeLight); + setTheme(R.style.AppThemeBlueOrange); super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); diff --git a/app/src/main/java/eu/faircode/email/AdapterContact.java b/app/src/main/java/eu/faircode/email/AdapterContact.java index f5415d82eb..0d28a9e903 100644 --- a/app/src/main/java/eu/faircode/email/AdapterContact.java +++ b/app/src/main/java/eu/faircode/email/AdapterContact.java @@ -74,7 +74,7 @@ public class AdapterContact extends RecyclerView.Adapter 0; - int color = (message.color == null || !pro ? colorAccent : message.color); + int color = (message.color == null || !pro ? colorSecondary : message.color); int tint = (flagged ? color : textColorSecondary); if (!Objects.equals(ibFlagged.getTag(), flagged)) { @@ -2279,7 +2279,7 @@ public class AdapterMessage extends RecyclerView.Adapter 1 ? View.VISIBLE : View.GONE); } @@ -3990,7 +3990,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. : MenuItem.SHOW_AS_ACTION_NEVER); MenuItemCompat.setIconTintList(menuFilter, folder && filter_active ? - ColorStateList.valueOf(Helper.resolveColor(getContext(), R.attr.colorAccent)) : null); + ColorStateList.valueOf(Helper.resolveColor(getContext(), R.attr.colorSecondary)) : null); menuFilter.setIcon(folder && filter_active ? R.drawable.twotone_filter_alt_24 : R.drawable.twotone_filter_list_24); MenuItem menuSearch = menu.findItem(R.id.menu_search); diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java index 9035db2d67..d4675d35d1 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java @@ -289,7 +289,7 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer public void onCheckedChanged(CompoundButton compoundButton, boolean checked) { prefs.edit().putBoolean("navbar_colorize", checked).apply(); setNavigationBarColor( - checked ? Helper.resolveColor(getContext(), R.attr.colorPrimaryDark) : Color.BLACK); + checked ? Helper.resolveColor(getContext(), R.attr.colorPrimaryVariant) : Color.BLACK); } }); @@ -371,7 +371,7 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer public void onClick(View v) { Context context = getContext(); int editTextColor = Helper.resolveColor(context, android.R.attr.editTextColor); - int highlightColor = prefs.getInt("highlight_color", Helper.resolveColor(context, R.attr.colorAccent)); + int highlightColor = prefs.getInt("highlight_color", Helper.resolveColor(context, R.attr.colorSecondary)); ColorPickerDialogBuilder builder = ColorPickerDialogBuilder .with(context) @@ -393,7 +393,7 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer @Override public void onClick(DialogInterface dialog, int which) { prefs.edit().remove("highlight_color").apply(); - btnHighlightColor.setColor(Helper.resolveColor(context, R.attr.colorAccent)); + btnHighlightColor.setColor(Helper.resolveColor(context, R.attr.colorSecondary)); } }); diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java index d1fccd1407..ffb6502c2c 100644 --- a/app/src/main/java/eu/faircode/email/Helper.java +++ b/app/src/main/java/eu/faircode/email/Helper.java @@ -645,7 +645,7 @@ public class Helper { CustomTabsIntent.Builder builder = new CustomTabsIntent.Builder(); builder.setDefaultColorSchemeParams(new CustomTabColorSchemeParams.Builder() .setToolbarColor(resolveColor(context, R.attr.colorPrimary)) - .setSecondaryToolbarColor(resolveColor(context, R.attr.colorPrimaryDark)) + .setSecondaryToolbarColor(resolveColor(context, R.attr.colorPrimaryVariant)) .build()); builder.setColorScheme(Helper.isDarkTheme(context) ? CustomTabsIntent.COLOR_SCHEME_DARK diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java index ff4df978d9..d6197b0a90 100644 --- a/app/src/main/java/eu/faircode/email/HtmlHelper.java +++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java @@ -1841,14 +1841,14 @@ public class HtmlHelper { } static Spanned highlightHeaders(Context context, String headers) { - int colorAccent = Helper.resolveColor(context, R.attr.colorAccent); + int colorSecondary = Helper.resolveColor(context, R.attr.colorSecondary); SpannableStringBuilder ssb = new SpannableStringBuilder(headers); int index = 0; for (String line : headers.split("\n")) { if (line.length() > 0 && !Character.isWhitespace(line.charAt(0))) { int colon = line.indexOf(':'); if (colon > 0) - ssb.setSpan(new ForegroundColorSpan(colorAccent), index, index + colon, 0); + ssb.setSpan(new ForegroundColorSpan(colorSecondary), index, index + colon, 0); } index += line.length() + 1; } @@ -1939,7 +1939,7 @@ public class HtmlHelper { boolean monospaced_pre = prefs.getBoolean("monospaced_pre", false); final int colorPrimary = Helper.resolveColor(context, R.attr.colorPrimary); - final int colorAccent = Helper.resolveColor(context, R.attr.colorAccent); + final int colorSecondary = Helper.resolveColor(context, R.attr.colorSecondary); final int colorSeparator = Helper.resolveColor(context, R.attr.colorSeparator); final int dp3 = Helper.dp2pixels(context, 3); final int dp6 = Helper.dp2pixels(context, 6); @@ -2315,9 +2315,9 @@ public class HtmlHelper { parent = parent.parent(); if (parent == null || "ul".equals(parent.tagName())) if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) - setSpan(ssb, new BulletSpan(dp6, colorAccent), start, ssb.length()); + setSpan(ssb, new BulletSpan(dp6, colorSecondary), start, ssb.length()); else - setSpan(ssb, new BulletSpan(dp6, colorAccent, dp3), start, ssb.length()); + setSpan(ssb, new BulletSpan(dp6, colorSecondary, dp3), start, ssb.length()); else { // https://developer.mozilla.org/en-US/docs/Web/HTML/Element/ol int index = 0; @@ -2333,7 +2333,7 @@ public class HtmlHelper { } } - setSpan(ssb, new NumberSpan(dp6, colorAccent, textSize, index), start, ssb.length()); + setSpan(ssb, new NumberSpan(dp6, colorSecondary, textSize, index), start, ssb.length()); } break; case "pre": diff --git a/app/src/main/java/eu/faircode/email/StyleHelper.java b/app/src/main/java/eu/faircode/email/StyleHelper.java index bc96914454..e839944218 100644 --- a/app/src/main/java/eu/faircode/email/StyleHelper.java +++ b/app/src/main/java/eu/faircode/email/StyleHelper.java @@ -267,7 +267,7 @@ public class StyleHelper { private boolean setList(MenuItem item) { Context context = etBody.getContext(); - int colorAccent = Helper.resolveColor(context, R.attr.colorAccent); + int colorSecondary = Helper.resolveColor(context, R.attr.colorSecondary); int dp3 = Helper.dp2pixels(context, 3); int dp6 = Helper.dp2pixels(context, 6); @@ -292,11 +292,11 @@ public class StyleHelper { Log.i("Insert " + i + "..." + (j + 1) + " size=" + end); if (item.getItemId() == R.id.menu_style_list_bullets) if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) - t.setSpan(new BulletSpan(dp6, colorAccent), i, j + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE | Spanned.SPAN_PARAGRAPH); + t.setSpan(new BulletSpan(dp6, colorSecondary), i, j + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE | Spanned.SPAN_PARAGRAPH); else - t.setSpan(new BulletSpan(dp6, colorAccent, dp3), i, j + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE | Spanned.SPAN_PARAGRAPH); + t.setSpan(new BulletSpan(dp6, colorSecondary, dp3), i, j + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE | Spanned.SPAN_PARAGRAPH); else - t.setSpan(new NumberSpan(dp6, colorAccent, textSize, index++), i, j + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE | Spanned.SPAN_PARAGRAPH); + t.setSpan(new NumberSpan(dp6, colorSecondary, textSize, index++), i, j + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE | Spanned.SPAN_PARAGRAPH); i = j + 1; } @@ -509,14 +509,14 @@ public class StyleHelper { } else if (NumberSpan.class.isAssignableFrom(type)) { NumberSpan n = (NumberSpan) span; int dp6 = Helper.dp2pixels(context, 6); - int colorAccent = Helper.resolveColor(context, R.attr.colorAccent); - return (T) new NumberSpan(dp6, colorAccent, n.getTextSize(), n.getIndex() + 1); + int colorSecondary = Helper.resolveColor(context, R.attr.colorSecondary); + return (T) new NumberSpan(dp6, colorSecondary, n.getTextSize(), n.getIndex() + 1); } else if (BulletSpan.class.isAssignableFrom(type)) { BulletSpan b = (BulletSpan) span; if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) { int dp6 = Helper.dp2pixels(context, 6); - int colorAccent = Helper.resolveColor(context, R.attr.colorAccent); - return (T) new BulletSpan(dp6, colorAccent); + int colorSecondary = Helper.resolveColor(context, R.attr.colorSecondary); + return (T) new BulletSpan(dp6, colorSecondary); } else return (T) new BulletSpan(b.getGapWidth(), b.getColor(), b.getBulletRadius()); @@ -526,7 +526,7 @@ public class StyleHelper { static void renumber(Editable text, boolean clean, Context context) { int dp6 = Helper.dp2pixels(context, 6); - int colorAccent = Helper.resolveColor(context, R.attr.colorAccent); + int colorSecondary = Helper.resolveColor(context, R.attr.colorSecondary); Log.i("Renumber clean=" + clean + " text=" + text); @@ -557,7 +557,7 @@ public class StyleHelper { NumberSpan ns = (NumberSpan) span; if (index != ns.getIndex()) { - NumberSpan clone = new NumberSpan(dp6, colorAccent, ns.getTextSize(), index); + NumberSpan clone = new NumberSpan(dp6, colorSecondary, ns.getTextSize(), index); text.removeSpan(span); text.setSpan(clone, start, end, flags); } diff --git a/app/src/main/res/drawable/scroll_thumb.xml b/app/src/main/res/drawable/scroll_thumb.xml index cacdbf5781..9e26167e14 100644 --- a/app/src/main/res/drawable/scroll_thumb.xml +++ b/app/src/main/res/drawable/scroll_thumb.xml @@ -2,7 +2,7 @@ - + diff --git a/app/src/main/res/drawable/scroll_thumb_popup.xml b/app/src/main/res/drawable/scroll_thumb_popup.xml index 5c0bd046dd..5571377978 100644 --- a/app/src/main/res/drawable/scroll_thumb_popup.xml +++ b/app/src/main/res/drawable/scroll_thumb_popup.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_legend_messages.xml b/app/src/main/res/layout/fragment_legend_messages.xml index 9f2885c422..7c250fb909 100644 --- a/app/src/main/res/layout/fragment_legend_messages.xml +++ b/app/src/main/res/layout/fragment_legend_messages.xml @@ -40,7 +40,7 @@ android:layout_height="wrap_content" android:contentDescription="@string/title_legend_thread" android:padding="12dp" - android:tint="?attr/colorAccent" + android:tint="?attr/colorSecondary" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/ivThread" app:srcCompat="@drawable/twotone_message_24" /> diff --git a/app/src/main/res/layout/fragment_setup.xml b/app/src/main/res/layout/fragment_setup.xml index c4b69eafcb..a28d02b71e 100644 --- a/app/src/main/res/layout/fragment_setup.xml +++ b/app/src/main/res/layout/fragment_setup.xml @@ -54,7 +54,7 @@ android:layout_width="0dp" android:layout_height="0dp" android:alpha="0.1" - android:background="?attr/colorAccent" + android:background="?attr/colorSecondary" app:layout_constraintBottom_toTopOf="@id/vSeparatorAccount" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/include_message_compact.xml b/app/src/main/res/layout/include_message_compact.xml index 1fcee0fbee..b2d4f91288 100644 --- a/app/src/main/res/layout/include_message_compact.xml +++ b/app/src/main/res/layout/include_message_compact.xml @@ -8,7 +8,7 @@ android:id="@+id/vwColor" android:layout_width="6dp" android:layout_height="0dp" - android:background="?attr/colorAccent" + android:background="?attr/colorSecondary" app:layout_constraintBottom_toBottomOf="@+id/paddingBottom" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/include_message_normal.xml b/app/src/main/res/layout/include_message_normal.xml index a3a4251e6b..491779ec6a 100644 --- a/app/src/main/res/layout/include_message_normal.xml +++ b/app/src/main/res/layout/include_message_normal.xml @@ -7,7 +7,7 @@ android:id="@+id/vwColor" android:layout_width="6dp" android:layout_height="0dp" - android:background="?attr/colorAccent" + android:background="?attr/colorSecondary" app:layout_constraintBottom_toBottomOf="@+id/paddingBottom" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/item_account.xml b/app/src/main/res/layout/item_account.xml index c9f7b9cbec..b7b4031f3b 100644 --- a/app/src/main/res/layout/item_account.xml +++ b/app/src/main/res/layout/item_account.xml @@ -19,7 +19,7 @@ android:id="@+id/vwColor" android:layout_width="6dp" android:layout_height="0dp" - android:background="?attr/colorAccent" + android:background="?attr/colorSecondary" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/item_folder.xml b/app/src/main/res/layout/item_folder.xml index c22652d7fd..10f414d68f 100644 --- a/app/src/main/res/layout/item_folder.xml +++ b/app/src/main/res/layout/item_folder.xml @@ -20,7 +20,7 @@ android:id="@+id/vwColor" android:layout_width="6dp" android:layout_height="0dp" - android:background="?attr/colorAccent" + android:background="?attr/colorSecondary" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/item_folder_unselectable.xml b/app/src/main/res/layout/item_folder_unselectable.xml index a27fbd5b0b..9996321e39 100644 --- a/app/src/main/res/layout/item_folder_unselectable.xml +++ b/app/src/main/res/layout/item_folder_unselectable.xml @@ -17,7 +17,7 @@ android:id="@+id/vwColor" android:layout_width="6dp" android:layout_height="0dp" - android:background="?attr/colorAccent" + android:background="?attr/colorSecondary" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/item_identity.xml b/app/src/main/res/layout/item_identity.xml index fd47b25682..f21d35d16c 100644 --- a/app/src/main/res/layout/item_identity.xml +++ b/app/src/main/res/layout/item_identity.xml @@ -19,7 +19,7 @@ android:id="@+id/vwColor" android:layout_width="6dp" android:layout_height="0dp" - android:background="?attr/colorAccent" + android:background="?attr/colorSecondary" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml new file mode 100644 index 0000000000..aeed29bf03 --- /dev/null +++ b/app/src/main/res/values-night/themes.xml @@ -0,0 +1,209 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 8cd92aa02f..5d8c6ea552 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -58,68 +58,68 @@ #039be5 #006db3 - #ffb300 + #ffb300 #c68400 #ffb300 #c68400 - #039be5 + #039be5 #fdd835 #c6a700 - #8e24aa + #8e24aa #8e24aa #5c007a - #f9a825 + #f9a825 #e53935 #ab000d - #43a047 + #43a047 #43a047 #00701a - #e53935 + #e53935 #01579b #002f6c - #ffb300 + #ffb300 #ff6f00 #c43e00 - #4fc3f7 + #4fc3f7 #f57f17 #bc5100 - #ba68c8 + #ba68c8 #4a148c #12005e - #fdd835 + #fdd835 #b71c1c #7f0000 - #81c784 + #81c784 #1b5e20 #003300 - #e57373 + #e57373 #424242 #1b1b1b - #ff8f00 + #ff8f00 #212121 @@ -129,7 +129,7 @@ #424242 #1b1b1b - #90a4ae + #90a4ae #62757f #c1d5e0 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 7be8cc2e53..595cdcd257 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,414 +1,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file