upstream-mirrors/OpenTracks
1
0
Fork 1
mirror of https://codeberg.org/OpenTracksApp/OpenTracks.git synced 2026-10-02 17:43:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Material3: less customizing for day mode.

Browse Source
This commit is contained in:
Dennis Guse
2023-06-19 17:14:09 +02:00
parent 0691524dfa
commit 5c17c8ffcf
3 changed files with 19 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/res/layout/track_stopped.xml
+2
View File
@@ -184,6 +184,7 @@
android:orientation="vertical"
app:layout_constraintGuide_percent="0.5" />
<!-- TOOD Use MaterialDesign buttons instead of ImageView -->
<ImageView
android:id="@+id/discard_button"
android:layout_width="32dp"
@@ -193,6 +194,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/resume_button"
app:layout_constraintTop_toTopOf="parent"
app:tint="?attr/colorOnBackground"
app:srcCompat="@drawable/ic_delete_forever_24dp" />
<ImageView
src/main/res/values/themes_custom.xml
+9 -26
View File
@@ -16,42 +16,21 @@ limitations under the License.
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<style name="ThemeCustom" parent="Theme.Material3.DayNight.NoActionBar">
<item name="colorPrimary">@color/opentracks_primary_color</item>
<item name="colorOnPrimary">@color/opentracks_on_primary_color</item>
<item name="colorPrimary">@color/opentracks_secondary_color</item>
<item name="colorSecondary">@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">@color/opentracks_primary_variant_color</item>
<item name="android:colorBackground">@android:color/white</item>
<item name="colorOnBackground">@android:color/black</item>
<item name="android:activatedBackgroundIndicator">@drawable/activated_background</item>
<item name="android:statusBarColor">?attr/colorSurfaceBright</item>
<item name="android:windowLightStatusBar">true</item>
<item name="android:navigationBarColor">?attr/colorSurfaceContainer</item>
<!-- Snackbar -->
<item name="snackbarStyle">@style/MaterialSnackbarTheme</item>
<item name="snackbarButtonStyle">@style/MaterialSnackbarTextButtonTheme</item>
<item name="snackbarTextViewStyle">@style/MaterialSnackbarTextViewTheme</item>
<!-- Linear progress indicator -->
<item name="linearProgressIndicatorStyle">@style/OpenTracksLinearProgressIndicator</item>
<!-- Bottom bar -->
<item name="bottomAppBarStyle">@style/Widget.Material3.BottomAppBar</item>
<!-- Floating buttons -->
<item name="bottomAppBarStyle">@style/Widget.OpenTracks.BottomAppBar</item>
<item name="floatingActionButtonStyle">@style/Widget.OpenTracks.FloatingActionButton</item>
<item name="windowActionModeOverlay">true</item>
</style>
<style name="OpenTracksLinearProgressIndicator" parent="Widget.Material3.LinearProgressIndicator">
<item name="indicatorColor">?attr/colorSecondary</item>
</style>
<style name="SplashTheme" parent="Theme.SplashScreen">
@@ -61,6 +40,10 @@ limitations under the License.
<item name="postSplashScreenTheme">@style/ThemeCustom</item>
</style>
<style name="Widget.OpenTracks.BottomAppBar" parent="Widget.Material3.BottomAppBar">
<item name="backgroundTint">?attr/colorSurfaceContainer</item>
</style>
<style name="Widget.OpenTracks.FloatingActionButton" parent="Widget.MaterialComponents.FloatingActionButton">
<item name="fabCustomSize">64dp</item>
</style>
src/main/res/values/type.xml
+8 -7
View File
@@ -1,28 +1,29 @@
<?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>
<style name="TextAppearance.OpenTracks.PrimaryHeader" parent="TextAppearance.Material3.LabelLarge">
<item name="android:textColor">?attr/colorPrimary</item>
<item name="android:layout_marginTop">8dp</item>
<item name="android:textStyle">bold</item>
<item name="android:textAllCaps">true</item>
<item name="android:singleLine">true</item>
</style>
<style name="TextAppearance.OpenTracks.SecondaryHeader" parent="TextAppearance.MaterialComponents.Subtitle2">
<style name="TextAppearance.OpenTracks.SecondaryHeader" parent="TextAppearance.Material3.LabelSmall">
<item name="android:layout_marginTop">8dp</item>
<item name="android:textAllCaps">true</item>
<item name="android:singleLine">true</item>
</style>
<style name="TextAppearance.OpenTracks.HiddenHeader" parent="TextAppearance.MaterialComponents.Subtitle1">
<style name="TextAppearance.OpenTracks.HiddenHeader" parent="TextAppearance.Material3.LabelLarge">
<item name="android:textColor">@color/light_gray</item>
<item name="android:layout_marginTop">8dp</item>
<item name="android:textAllCaps">true</item>
<item name="android:singleLine">true</item>
</style>
<style name="TextAppearance.OpenTracks.PrimaryValue" parent="TextAppearance.MaterialComponents.Headline4">
<style name="TextAppearance.OpenTracks.PrimaryValue" parent="TextAppearance.Material3.DisplaySmall">
<item name="android:textColor">?attr/colorOnBackground</item>
<item name="android:layout_gravity">center</item>
<item name="android:textStyle">bold</item>
@@ -31,7 +32,7 @@
<item name="android:layout_marginBottom">8dp</item>
</style>
<style name="TextAppearance.OpenTracks.SecondaryValue" parent="TextAppearance.MaterialComponents.Headline5">
<style name="TextAppearance.OpenTracks.SecondaryValue" parent="TextAppearance.Material3.DisplaySmall">
<item name="android:textColor">?attr/colorOnBackground</item>
<item name="android:layout_gravity">center</item>
<item name="android:textStyle">bold</item>
@@ -40,7 +41,7 @@
<item name="android:layout_marginBottom">8dp</item>
</style>
<style name="TextAppearance.OpenTracks.HiddenValue" parent="TextAppearance.MaterialComponents.Headline4">
<style name="TextAppearance.OpenTracks.HiddenValue" parent="TextAppearance.Material3.DisplaySmall">
<item name="android:textColor">@color/light_gray</item>
<item name="android:layout_gravity">center</item>
<item name="android:textStyle">bold</item>