Implemented #2

Color theme, font, background and monochrome icons can now be set
independently.
This commit is contained in:
Josia Pietsch 2024-09-10 19:50:00 +02:00
parent 870ee56b88
commit 99acdba262
Signed by: jrpie
GPG key ID: E70B571D66986A2D
45 changed files with 350 additions and 197 deletions

View file

@ -7,4 +7,9 @@
<color name="darkTheme_background_color">#000</color>
<color name="darkTheme_accent_color">#444</color>
<color name="darkTheme_text_color">#fff</color>
<color name="lightTheme_background_color">#fff</color>
<color name="lightTheme_accent_color">#5555ff</color>
<color name="lightTheme_text_color">#000</color>
</resources>

View file

@ -44,11 +44,26 @@
- Settings : Theme
-
-->
<string name="settings_theme_theme_key" translatable="false">theme</string>
<string name="settings_theme_wallpaper_key" translatable="false">settings.theme.wallpaper</string>
<string name="settings_theme_dominant_key" translatable="false">custom_dominant</string>
<string name="settings_theme_vibrant_key" translatable="false">custom_vibrant</string>
<string name="settings_theme_color_theme_key" translatable="false">theme.color_theme</string>
<string-array name="settings_theme_color_theme_values" translatable="false">
<item>DEFAULT</item>
<item>DARK</item>
<!--<item>light</item>-->
</string-array>
<string name="settings_theme_background_key" translatable="false">theme.background</string>
<string-array name="settings_theme_background_values" translatable="false">
<item>TRANSPARENT</item>
<item>DIM</item>
<item>BLUR</item>
<item>SOLID</item>
</string-array>
<string name="settings_theme_wallpaper_key" translatable="false">theme.wallpaper</string>
<string name="settings_theme_font_key" translatable="false">theme.font</string>
<string-array name="settings_theme_font_values" translatable="false">
<item>HACK</item>
<item>SYSTEM_DEFAULT</item>
</string-array>
<string name="settings_theme_monochrome_icons_key" translatable="false">theme.monochrome_icons</string>
<!--
-
- Settings : Clock

View file

@ -63,11 +63,25 @@
<string name="settings_launcher_section_appearance">Appearance</string>
<string name="settings_theme_theme">Theme</string>
<string-array name="settings_launcher_theme_spinner_items">
<string name="settings_theme_color_theme">Color theme</string>
<string-array name="settings_theme_color_theme_items">
<item>Default</item>
<item>Dark</item>
<!--<item>Light</item>-->
</string-array>
<string name="settings_theme_background">Background (app list and setting)</string>
<string-array name="settings_theme_background_items">
<item>Transparent</item>
<item>Dim</item>
<item>Blur</item>
<item>Solid</item>
</string-array>
<string name="settings_theme_font" translatable="false">Font</string>
<string-array name="settings_theme_font_items">
<item>Hack</item>
<item>System default</item>
</string-array>
<string name="settings_theme_monochrome_icons">Monochrome app icons</string>
<string name="settings_theme_dominant">Dominant color</string>
<string name="settings_theme_vibrant">Vibrant color</string>

View file

@ -1,43 +1,73 @@
<resources>
<!-- Base theme for Launcher
This does not define the actual style of launcher,
as the style / colors etc are dynamically generated.
This is more like a fallback- theme that may partially be used by older apis.
-->
<!-- Base theme for Launcher -->
<style name="launcherBaseTheme" parent="Theme.AppCompat.Light.NoActionBar">
<item name="colorPrimary">@color/finnmglasTheme_background_color</item>
<item name="colorPrimaryDark">@color/finnmglasTheme_background_color</item>
<item name="colorAccent">@color/finnmglasTheme_accent_color</item>
<item name="android:colorBackground">@color/finnmglasTheme_background_color</item>
<item name="android:textColor">@color/finnmglasTheme_text_color</item>
<item name="android:textColorSecondary">?android:textColor</item>
<item name="android:textColorPrimary">?android:textColor</item>
<item name="android:textColorHint">?android:textColor</item>
<item name="android:buttonStyle">@style/Widget.AppCompat.Button.Colored</item>
<item name="colorButtonNormal">?colorAccent</item>
<!--<item name="android:popupMenuStyle">@style/PopupMenuCustom</item>-->
<item name="android:windowDisablePreview">true</item>
<item name="android:windowAnimationStyle">@style/WindowFadeTransition</item>
</style>
<style name="colorThemeDark">
<item name="colorPrimary">@color/darkTheme_background_color</item>
<item name="colorPrimaryDark">@color/darkTheme_background_color</item>
<item name="colorAccent">@color/darkTheme_accent_color</item>
<item name="android:colorBackground">@color/darkTheme_background_color</item>
<item name="android:textColor">@color/darkTheme_text_color</item>
</style>
<style name="colorThemeDefault">
<item name="colorPrimary">@color/finnmglasTheme_background_color</item>
<item name="colorPrimaryDark">@color/finnmglasTheme_background_color</item>
<item name="colorAccent">@color/finnmglasTheme_accent_color</item>
<item name="android:colorBackground">@color/finnmglasTheme_background_color</item>
<item name="android:textColor">@color/finnmglasTheme_text_color</item>
</style>
<style name="colorThemeLight">
<item name="colorPrimary">@color/lightTheme_background_color</item>
<item name="colorPrimaryDark">@color/lightTheme_background_color</item>
<item name="colorAccent">@color/lightTheme_accent_color</item>
<item name="android:colorBackground">@color/lightTheme_background_color</item>
<item name="android:textColor">@color/lightTheme_text_color</item>
</style>
<style name="backgroundWallpaper">
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:navigationBarColor">@android:color/transparent</item>
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowShowWallpaper">true</item>
<item name="colorAccent">#555</item>
<item name="android:textColor">#ffffff</item>
<item name="android:textColorSecondary">@color/finnmglasTheme_text_color</item>
<item name="android:textColorPrimary">@color/finnmglasTheme_text_color</item>
<item name="android:textColorHint">?android:textColor</item>
<item name="android:fontFamily">@font/hack</item>
<item name="android:buttonStyle">@style/Widget.AppCompat.Button.Colored</item>
<item name="colorButtonNormal">?colorAccent</item>
<item name="android:popupMenuStyle">@style/PopupMenuCustom</item>
<item name="android:windowDisablePreview">true</item>
<item name="android:windowAnimationStyle">@style/WindowFadeTransition</item>
</style>
<style name="backgroundSolid">
</style>
<style name="fontSystemDefault">
<!--<item name="android:textSize">18sp</item>-->
</style>
<style name="fontHack">
<item name="android:fontFamily">@font/hack</item>
<!--<item name="android:textSize">18sp</item>-->
</style>
<style name="PopupMenuCustom" parent="@android:style/Widget.PopupMenu">
<item name="android:popupBackground">#252827</item>