From 676e540059e3c1700346cff4e415966e189ee085 Mon Sep 17 00:00:00 2001 From: Thomas Date: Tue, 13 Oct 2020 14:30:08 +0200 Subject: [PATCH] Dark/Light/Automatic theme --- app/src/{main => acad}/res/values/colors.xml | 4 -- app/src/acad/res/values/strings.xml | 10 ++++ app/src/full/res/color/bottom_nav_color.xml | 2 +- app/src/full/res/values/colors.xml | 12 +++++ app/src/full/res/values/strings.xml | 12 +++++ app/src/full/res/values/styles.xml | 21 --------- .../app/fedilab/fedilabtube/FedilabTube.java | 9 ++++ .../app/fedilab/fedilabtube/MainActivity.java | 12 +++-- .../fragment/SettingsFragment.java | 37 ++++++++++++++- .../fedilab/fedilabtube/helper/Helper.java | 6 ++- .../fedilabtube/helper/ThemeHelper.java | 46 +++++++++++++++++++ .../drawable/ic_baseline_color_lens_24.xml | 10 ++++ app/src/main/res/layout/activity_main.xml | 5 +- app/src/main/res/values-night/styles.xml | 28 +++++++++++ app/src/{acad => main}/res/values/styles.xml | 6 +++ app/src/main/res/xml/main_preferences.xml | 5 ++ 16 files changed, 190 insertions(+), 35 deletions(-) rename app/src/{main => acad}/res/values/colors.xml (71%) create mode 100644 app/src/full/res/values/colors.xml delete mode 100644 app/src/full/res/values/styles.xml create mode 100644 app/src/main/java/app/fedilab/fedilabtube/helper/ThemeHelper.java create mode 100644 app/src/main/res/drawable/ic_baseline_color_lens_24.xml create mode 100644 app/src/main/res/values-night/styles.xml rename app/src/{acad => main}/res/values/styles.xml (73%) diff --git a/app/src/main/res/values/colors.xml b/app/src/acad/res/values/colors.xml similarity index 71% rename from app/src/main/res/values/colors.xml rename to app/src/acad/res/values/colors.xml index db006a1..9fd2099 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/acad/res/values/colors.xml @@ -4,10 +4,6 @@ #4527A0 #9C27B0 - - #212529 - #000000 - #F2690D #bbF2690D #FAFAFA #2b90d9 diff --git a/app/src/acad/res/values/strings.xml b/app/src/acad/res/values/strings.xml index 2589934..00fc2e0 100644 --- a/app/src/acad/res/values/strings.xml +++ b/app/src/acad/res/values/strings.xml @@ -6,7 +6,17 @@ set_video_language_choice set_video_quality_choice set_video_cache_choice + set_theme_choice + + + Clair + Sombre + Automatique + + + Thème + Permet de changer le thème de l\'application La vidéo ne peut pas être fédérée ! Locale Locale diff --git a/app/src/full/res/color/bottom_nav_color.xml b/app/src/full/res/color/bottom_nav_color.xml index edcb7c2..662d3b2 100644 --- a/app/src/full/res/color/bottom_nav_color.xml +++ b/app/src/full/res/color/bottom_nav_color.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/full/res/values/colors.xml b/app/src/full/res/values/colors.xml new file mode 100644 index 0000000..2547404 --- /dev/null +++ b/app/src/full/res/values/colors.xml @@ -0,0 +1,12 @@ + + + #212529 + #000000 + #F2690D + #bbF2690D + #FAFAFA + #2b90d9 + #F44336 + + #F44336 + \ No newline at end of file diff --git a/app/src/full/res/values/strings.xml b/app/src/full/res/values/strings.xml index a3cd5f0..2da3caa 100644 --- a/app/src/full/res/values/strings.xml +++ b/app/src/full/res/values/strings.xml @@ -5,7 +5,11 @@ set_video_language_choice set_video_quality_choice set_video_cache_choice + set_theme_choice + + Theme + Allow to change app theme The video cannot be federated! Home Local @@ -245,6 +249,14 @@ Direct stream + + + Light + Dark + Automatic + + + High Medium diff --git a/app/src/full/res/values/styles.xml b/app/src/full/res/values/styles.xml deleted file mode 100644 index 97c4971..0000000 --- a/app/src/full/res/values/styles.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - + + + + +