karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Migrate to Material3 design.

Browse Source 
Fixes #1586.
This commit is contained in:
Dennis Guse
2023-06-09 22:53:52 +02:00
parent dbd64a8075
commit 9f1ea4d745
39 changed files with 288 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/res/values/colors.xml
-6
View File
@@ -22,12 +22,6 @@ limitations under the License.
<color name="opentracks_secondary_transparent">#55FF6D00</color>
<color name="opentracks_on_secondary_color">@android:color/white</color>
<color name="opentracks_surface_day_background_color">#f5f5f5</color>
<color name="opentracks_surface_day_on_background_color">@android:color/black</color>
<color name="opentracks_surface_night_background_color">@android:color/black</color>
<color name="opentracks_surface_night_on_background_color">@android:color/white</color>
<!-- Chart colors -->
<color name="chart_cadence_border">#FFF128F3</color> <!-- pink -->
<color name="chart_cadence_fill">#40F128F3</color> <!-- transparent pink -->
src/main/res/values/styles.xml
+4 -4
View File
@@ -16,7 +16,7 @@ limitations under the License.
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<!-- bottom buttons bar -->
<style name="BottomButton" parent="Widget.MaterialComponents.Button.TextButton">
<style name="BottomButton" parent="Widget.Material3.Button.TextButton">
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_weight">1</item>
<item name="android:layout_width">0dp</item>
@@ -70,19 +70,19 @@ limitations under the License.
</style>
<!-- Snackbar -->
<style name="MaterialSnackbarTheme" parent="@style/Widget.MaterialComponents.Snackbar">
<style name="MaterialSnackbarTheme" parent="@style/Widget.Material3.Snackbar">
<item name="materialThemeOverlay">@style/ThemeOverlay.OpenTracks.Snackbar</item>
<item name="actionTextColorAlpha">1</item>
<item name="backgroundTint">@android:color/holo_red_dark</item>
</style>
<style name="MaterialSnackbarTextButtonTheme" parent="@style/Widget.MaterialComponents.Button.TextButton.Snackbar">
<style name="MaterialSnackbarTextButtonTheme" parent="@style/Widget.Material3.Button.TextButton.Snackbar">
<item name="android:textColor">@android:color/white</item>
<item name="android:textSize">14sp</item>
</style>
<style name="MaterialSnackbarTextViewTheme" parent="@style/Widget.MaterialComponents.Snackbar.TextView">
<style name="MaterialSnackbarTextViewTheme" parent="@style/Widget.Material3.Snackbar.TextView">
<item name="android:textColor">@android:color/white</item>
<item name="android:textAppearance">?textAppearanceLabelMedium</item>
<item name="android:textSize">14sp</item>
src/main/res/values/themes_custom.xml
+5 -10
View File
@@ -15,26 +15,21 @@ limitations under the License.
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<style name="ThemeCustom" parent="Theme.MaterialComponents.DayNight.NoActionBar">
<style name="ThemeCustom" parent="Theme.Material3.DayNight.NoActionBar">
<item name="colorPrimary">@color/opentracks_primary_color</item>
<item name="colorPrimaryVariant">@color/opentracks_primary_variant_color</item>
<item name="colorOnPrimary">@color/opentracks_on_primary_color</item>
<item name="colorSecondary">@color/opentracks_secondary_color</item>
<item name="colorSecondaryVariant">@color/opentracks_secondary_color</item>
<item name="colorOnSecondary">@color/opentracks_on_secondary_color</item>
<item name="colorError">@color/red_dark</item>
<item name="colorOnError">@android:color/white</item>
<item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
<item name="android:statusBarColor">@color/opentracks_primary_variant_color</item>
<item name="android:colorBackground">@android:color/white</item>
<item name="colorOnBackground">@android:color/black</item>
<item name="colorSurface">@color/opentracks_surface_day_background_color</item>
<item name="colorOnSurface">@color/opentracks_surface_day_on_background_color</item>
<item name="android:activatedBackgroundIndicator">@drawable/activated_background</item>
<!-- Snackbar -->
@@ -46,16 +41,16 @@ limitations under the License.
<item name="linearProgressIndicatorStyle">@style/OpenTracksLinearProgressIndicator</item>
<!-- Bottom bar -->
<item name="bottomAppBarStyle">@style/Widget.MaterialComponents.BottomAppBar.Colored</item>
<item name="bottomAppBarStyle">@style/Widget.Material3.BottomAppBar</item>
<!-- Floating buttons -->
<item name="floatingActionButtonStyle">@style/Widget.OpenTracks.FloatingActionButton</item>
<item name="android:windowActionModeOverlay">true</item>
<item name="windowActionModeOverlay">true</item>
</style>
<style name="OpenTracksLinearProgressIndicator" parent="Widget.MaterialComponents.LinearProgressIndicator">
<style name="OpenTracksLinearProgressIndicator" parent="Widget.Material3.LinearProgressIndicator">
<item name="indicatorColor">?attr/colorSecondary</item>
</style>
src/main/res/values/type.xml
+1 -5
View File
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- migrate MaterialComponents to Material3 -->
<resources>
<style name="TextAppearance.OpenTracks.PrimaryHeader" parent="TextAppearance.MaterialComponents.Subtitle1">
<item name="android:textColor">?attr/colorSecondary</item>
@@ -52,9 +53,4 @@
<item name="android:textColor">?attr/colorOnBackground</item>
<item name="android:singleLine">true</item>
</style>
<style name="TextAppearance.OpenTracks.OnBottomBarText" parent="TextAppearance.MaterialComponents.Headline6">
<item name="android:textColor">?attr/colorOnPrimary</item>
<item name="android:singleLine">true</item>
</style>
</resources>