From 28de5e76ea12d0c1ff5a3b143807534cd8921104 Mon Sep 17 00:00:00 2001 From: Hayri Bakici <3295340+hayribakici@users.noreply.github.com> Date: Fri, 22 Dec 2023 03:19:34 +0100 Subject: [PATCH] feat(theme): new themes: Darcula and Gruvbox (#138) Co-authored-by: Joshua Kuestersteffen Co-authored-by: Klaus-Hendrik Wolf --- .../com/sduduzog/slimlauncher/MainActivity.kt | 2 ++ .../res/layout/customise_apps_fragment.xml | 2 +- .../layout/customize_app_drawer_fragment.xml | 3 +- .../customize_quick_buttons_fragment.xml | 1 + app/src/main/res/layout/options_fragment.xml | 2 +- app/src/main/res/values-de/strings.xml | 2 ++ app/src/main/res/values-fr/strings.xml | 2 ++ app/src/main/res/values-it/strings.xml | 2 ++ app/src/main/res/values-nb/strings.xml | 2 ++ app/src/main/res/values-night/styles.xml | 2 ++ app/src/main/res/values-nl/strings.xml | 2 ++ app/src/main/res/values-notnight/styles.xml | 2 ++ app/src/main/res/values-zh-rCN/strings.xml | 2 ++ app/src/main/res/values-zh-rTW/strings.xml | 2 ++ app/src/main/res/values/attrs.xml | 3 +- app/src/main/res/values/colors.xml | 16 ++++++++++ app/src/main/res/values/strings.xml | 2 ++ app/src/main/res/values/styles.xml | 29 +++++++++++++++++++ 18 files changed, 74 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/sduduzog/slimlauncher/MainActivity.kt b/app/src/main/java/com/sduduzog/slimlauncher/MainActivity.kt index 2ca15457..e27c633c 100644 --- a/app/src/main/java/com/sduduzog/slimlauncher/MainActivity.kt +++ b/app/src/main/java/com/sduduzog/slimlauncher/MainActivity.kt @@ -140,6 +140,8 @@ class MainActivity : AppCompatActivity(), 4 -> R.style.AppCandyTheme 5 -> R.style.AppPinkTheme 6 -> R.style.AppThemeLight + 7 -> R.style.AppDarculaTheme + 8 -> R.style.AppGruvBoxDarkTheme else -> R.style.AppTheme } } diff --git a/app/src/main/res/layout/customise_apps_fragment.xml b/app/src/main/res/layout/customise_apps_fragment.xml index 0baa35b7..fa70326f 100644 --- a/app/src/main/res/layout/customise_apps_fragment.xml +++ b/app/src/main/res/layout/customise_apps_fragment.xml @@ -12,7 +12,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/_16sdp" - android:layout_marginLeft="@dimen/_16sdp" + android:textColor="?headerTextColor" android:layout_marginTop="@dimen/_8sdp" android:text="@string/options_fragment_customise_apps" android:textAppearance="@style/TextAppearance.AppCompat" diff --git a/app/src/main/res/layout/customize_app_drawer_fragment.xml b/app/src/main/res/layout/customize_app_drawer_fragment.xml index 68d37ed4..9663608b 100644 --- a/app/src/main/res/layout/customize_app_drawer_fragment.xml +++ b/app/src/main/res/layout/customize_app_drawer_fragment.xml @@ -16,6 +16,7 @@ android:layout_marginTop="32dp" android:layout_marginEnd="@dimen/_16sdp" android:layout_marginRight="@dimen/_16sdp" + android:textColor="?headerTextColor" android:text="@string/customize_app_drawer_fragment_visible_apps" android:textAppearance="@style/TextAppearance.AppCompat" android:textSize="@dimen/font_size_customize_options" @@ -48,6 +49,6 @@ android:textAppearance="@style/TextAppearance.AppCompat" android:textSize="@dimen/font_size_customize_options" app:layout_constraintStart_toStartOf="parent" + android:textColor="?switchTextColor" app:layout_constraintTop_toBottomOf="@id/customize_app_drawer_fragment_search_options" /> - \ No newline at end of file diff --git a/app/src/main/res/layout/customize_quick_buttons_fragment.xml b/app/src/main/res/layout/customize_quick_buttons_fragment.xml index 5b4d24c1..224abf94 100644 --- a/app/src/main/res/layout/customize_quick_buttons_fragment.xml +++ b/app/src/main/res/layout/customize_quick_buttons_fragment.xml @@ -14,6 +14,7 @@ android:layout_marginStart="@dimen/_16sdp" android:layout_marginTop="@dimen/_8sdp" android:text="@string/options_fragment_customize_quick_buttons" + android:textColor="?headerTextColor" android:textAppearance="@style/TextAppearance.AppCompat" android:textSize="@dimen/font_size_customize_title" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/options_fragment.xml b/app/src/main/res/layout/options_fragment.xml index a419bb71..e99a4aca 100644 --- a/app/src/main/res/layout/options_fragment.xml +++ b/app/src/main/res/layout/options_fragment.xml @@ -18,11 +18,11 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/_16sdp" - android:layout_marginLeft="@dimen/_16sdp" android:layout_marginTop="@dimen/_8sdp" android:stateListAnimator="@xml/animate_scale" android:text="@string/main_fragment_options" android:textAppearance="@style/TextAppearance.AppCompat" + android:textColor="?headerTextColor" android:textSize="@dimen/font_size_customize_title" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index f35ce78b..458ed5f7 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -8,6 +8,8 @@ Candy Pastell Mittag + Vlad + Groovig diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 77c62ad9..de122802 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -7,6 +7,8 @@ Candy Pastel Midi + Vlad + Groovy diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index ff4c9510..e316121f 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -7,6 +7,8 @@ Caramella Pastello Mezzogiorno + Vlad + Groovy diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 0e480bd2..d9006fec 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -12,6 +12,8 @@ Godteri Pastell Middag + Vlad + Groovy diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml index fc076295..a74ae7ed 100644 --- a/app/src/main/res/values-night/styles.xml +++ b/app/src/main/res/values-night/styles.xml @@ -2,6 +2,8 @@ + + + + + \ No newline at end of file