From 252a5b7b51d0aac3de3a4e669643bb70c10f2d95 Mon Sep 17 00:00:00 2001 From: oliexdev Date: Sat, 22 Jul 2023 09:54:32 +0200 Subject: [PATCH] switch to material3 themes --- android_app/app/src/main/AndroidManifest.xml | 3 +- .../health/openscale/gui/MainActivity.java | 2 +- .../gui/measurement/ChartActionBarView.java | 1 - .../gui/slides/AppIntroActivity.java | 2 +- .../app/src/main/res/layout/drawer_header.xml | 2 +- .../ic_launcher_openscale_light_round.xml | 2 +- .../ic_launcher_openscale_pro_round.xml | 2 +- .../ic_launcher_openscale_round.xml | 2 +- .../app/src/main/res/values-night/themes.xml | 69 +++++++++++++++++++ .../app/src/main/res/values/colors.xml | 68 ++++++++++++++++-- .../app/src/main/res/values/styles.xml | 69 ------------------- .../app/src/main/res/values/themes.xml | 69 +++++++++++++++++++ 12 files changed, 207 insertions(+), 84 deletions(-) create mode 100644 android_app/app/src/main/res/values-night/themes.xml delete mode 100644 android_app/app/src/main/res/values/styles.xml create mode 100644 android_app/app/src/main/res/values/themes.xml diff --git a/android_app/app/src/main/AndroidManifest.xml b/android_app/app/src/main/AndroidManifest.xml index b8316c09..96d07d99 100644 --- a/android_app/app/src/main/AndroidManifest.xml +++ b/android_app/app/src/main/AndroidManifest.xml @@ -7,7 +7,7 @@ - + @@ -32,7 +32,6 @@ android:theme="@style/AppTheme" > diff --git a/android_app/app/src/main/java/com/health/openscale/gui/MainActivity.java b/android_app/app/src/main/java/com/health/openscale/gui/MainActivity.java index 6188c64d..6e57cc35 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/MainActivity.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/MainActivity.java @@ -166,7 +166,7 @@ public class MainActivity extends AppCompatActivity if (Build.VERSION.SDK_INT >= 29) { AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES); } else { - setTheme(R.style.AppTheme_Dark); + setTheme(R.style.AppTheme); } } diff --git a/android_app/app/src/main/java/com/health/openscale/gui/measurement/ChartActionBarView.java b/android_app/app/src/main/java/com/health/openscale/gui/measurement/ChartActionBarView.java index 2a027f52..2591f106 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/measurement/ChartActionBarView.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/measurement/ChartActionBarView.java @@ -61,7 +61,6 @@ public class ChartActionBarView extends HorizontalScrollView { actionBarView = new LinearLayout(getContext()); actionBarView.setOrientation(LinearLayout.HORIZONTAL); - actionBarView.setBackgroundColor(ColorUtil.COLOR_BLACK); measurementViews = MeasurementView.getMeasurementList( getContext(), MeasurementView.DateTimeOrder.NONE); diff --git a/android_app/app/src/main/java/com/health/openscale/gui/slides/AppIntroActivity.java b/android_app/app/src/main/java/com/health/openscale/gui/slides/AppIntroActivity.java index 09a9d8df..b10b0f9c 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/slides/AppIntroActivity.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/slides/AppIntroActivity.java @@ -28,7 +28,7 @@ public class AppIntroActivity extends AppIntro { protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setBarColor(getResources().getColor(R.color.blue_normal)); + setBarColor(getResources().getColor(R.color.seed)); setSkipButtonEnabled(true); diff --git a/android_app/app/src/main/res/layout/drawer_header.xml b/android_app/app/src/main/res/layout/drawer_header.xml index df2a6016..61f8718f 100644 --- a/android_app/app/src/main/res/layout/drawer_header.xml +++ b/android_app/app/src/main/res/layout/drawer_header.xml @@ -3,7 +3,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" - android:background="@color/blue_pressed"> + android:background="@color/seed"> - + \ No newline at end of file diff --git a/android_app/app/src/main/res/mipmap-anydpi-v26/ic_launcher_openscale_pro_round.xml b/android_app/app/src/main/res/mipmap-anydpi-v26/ic_launcher_openscale_pro_round.xml index 30c5fb26..e7598baa 100644 --- a/android_app/app/src/main/res/mipmap-anydpi-v26/ic_launcher_openscale_pro_round.xml +++ b/android_app/app/src/main/res/mipmap-anydpi-v26/ic_launcher_openscale_pro_round.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/android_app/app/src/main/res/mipmap-anydpi-v26/ic_launcher_openscale_round.xml b/android_app/app/src/main/res/mipmap-anydpi-v26/ic_launcher_openscale_round.xml index d74da2c5..7f9eab96 100644 --- a/android_app/app/src/main/res/mipmap-anydpi-v26/ic_launcher_openscale_round.xml +++ b/android_app/app/src/main/res/mipmap-anydpi-v26/ic_launcher_openscale_round.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/android_app/app/src/main/res/values-night/themes.xml b/android_app/app/src/main/res/values-night/themes.xml new file mode 100644 index 00000000..cde54cca --- /dev/null +++ b/android_app/app/src/main/res/values-night/themes.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/android_app/app/src/main/res/values/colors.xml b/android_app/app/src/main/res/values/colors.xml index 0f72b761..36651546 100644 --- a/android_app/app/src/main/res/values/colors.xml +++ b/android_app/app/src/main/res/values/colors.xml @@ -1,12 +1,68 @@ - @android:color/holo_blue_dark - @android:color/holo_blue_light - #cccccc + #0099cc + #004C68 + #FFFFFF + #C3E8FF + #001E2C + #4E616D + #FFFFFF + #006685 + #091E28 + #006685 + #FFFFFF + #BFE9FF + #001F2A + #BA1A1A + #FFDAD6 + #FFFFFF + #410002 + #FBFCFE + #191C1E + #FBFCFE + #191C1E + #DCE3E9 + #41484D + #71787D + #F0F1F3 + #2E3133 + #78D1FF + #000000 + #006689 + #C0C7CD + #000000 - #000000 - @android:color/holo_blue_light - #000000 + + #000000 + #006689 + #004C68 + #C3E8FF + #B5C9D7 + #20333D + #364955 + #D1E5F3 + #6DD2FF + #003547 + #004D65 + #BFE9FF + #FFB4AB + #93000A + #690005 + #FFDAD6 + #191C1E + #E1E2E5 + #191C1E + #E1E2E5 + #41484D + #C0C7CD + #8A9297 + #191C1E + #E1E2E5 + #006689 + #000000 + #78D1FF + #41484D + #000000 #555555 diff --git a/android_app/app/src/main/res/values/styles.xml b/android_app/app/src/main/res/values/styles.xml deleted file mode 100644 index eb42aaa3..00000000 --- a/android_app/app/src/main/res/values/styles.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/android_app/app/src/main/res/values/themes.xml b/android_app/app/src/main/res/values/themes.xml new file mode 100644 index 00000000..8ab6c709 --- /dev/null +++ b/android_app/app/src/main/res/values/themes.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +