From 109876af74f329f11de7ae2edf2b768cd9e2d14a Mon Sep 17 00:00:00 2001 From: y20k Date: Wed, 6 Apr 2022 14:45:38 +0200 Subject: [PATCH] color scheme update --- .../trackbook/helpers/MapOverlayHelper.kt | 5 +- .../trackbook/ui/TrackFragmentLayoutHolder.kt | 4 - .../drawable/ic_compass_needle_black_24dp.xml | 2 +- .../drawable/ic_marker_location_blue_24dp.xml | 4 +- .../ic_marker_location_blue_grey_24dp.xml | 4 +- .../drawable/ic_marker_location_red_24dp.xml | 4 +- .../ic_marker_location_red_grey_24dp.xml | 4 +- .../ic_marker_track_end_blue_48dp.xml | 4 +- .../ic_marker_track_end_starred_blue_36dp.xml | 4 +- .../ic_marker_track_end_starred_blue_48dp.xml | 4 +- .../ic_marker_track_location_blue_24dp.xml | 2 +- .../ic_marker_track_location_grey_24dp.xml | 2 +- .../ic_marker_track_location_red_24dp.xml | 2 +- .../ic_marker_track_start_blue_48dp.xml | 4 +- ...c_marker_track_start_starred_blue_48dp.xml | 4 +- .../res/drawable/ic_notebook_black_24dp.xml | 4 +- .../ic_notification_action_resume_36dp.xml | 2 +- .../ic_notification_action_show_36dp.xml | 2 +- .../ic_notification_action_stop_24dp.xml | 2 +- ...cation_icon_large_tracking_active_48dp.xml | 4 +- ...ation_icon_large_tracking_stopped_48dp.xml | 4 +- .../ic_notification_icon_small_24dp.xml | 4 +- .../res/drawable/ic_remove_circle_24dp.xml | 2 +- .../res/drawable/ic_settings_black_24dp.xml | 2 +- .../main/res/drawable/ic_star_blue_24dp.xml | 2 +- .../main/res/drawable/ic_star_red_24dp.xml | 2 +- .../drawable/selector_bottom_navigation.xml | 6 +- ...ed.xml => shape_statistics_background.xml} | 2 +- .../shape_statistics_background_collapsed.xml | 21 ---- app/src/main/res/layout/activity_main.xml | 2 + app/src/main/res/layout/element_track.xml | 2 +- app/src/main/res/layout/fragment_map.xml | 11 ++- app/src/main/res/layout/fragment_track.xml | 2 +- app/src/main/res/layout/track_statistics.xml | 6 +- app/src/main/res/values-night-v31/colors.xml | 33 ++++++- app/src/main/res/values-night/colors.xml | 53 +++++----- app/src/main/res/values-v31/colors.xml | 42 +++++--- app/src/main/res/values/colors.xml | 99 ++++++++----------- app/src/main/res/values/styles.xml | 4 + 39 files changed, 189 insertions(+), 177 deletions(-) rename app/src/main/res/drawable/{shape_statistics_background_expanded.xml => shape_statistics_background.xml} (97%) delete mode 100644 app/src/main/res/drawable/shape_statistics_background_collapsed.xml diff --git a/app/src/main/java/org/y20k/trackbook/helpers/MapOverlayHelper.kt b/app/src/main/java/org/y20k/trackbook/helpers/MapOverlayHelper.kt index 0d70261..f145c66 100644 --- a/app/src/main/java/org/y20k/trackbook/helpers/MapOverlayHelper.kt +++ b/app/src/main/java/org/y20k/trackbook/helpers/MapOverlayHelper.kt @@ -40,7 +40,6 @@ import org.y20k.trackbook.core.WayPoint import java.text.DecimalFormat import java.text.SimpleDateFormat import java.util.* -import kotlin.collections.ArrayList /* @@ -96,8 +95,8 @@ class MapOverlayHelper (private var markerListener: MarkerListener) { /* Creates icon overlay for track */ fun createTrackOverlay(context: Context, track: Track, trackingState: Int): SimpleFastPointOverlay { // get marker color - val color = if (trackingState == Keys.STATE_TRACKING_ACTIVE) context.getColor(R.color.trackbook_red) - else context.getColor(R.color.trackbook_blue) + val color = if (trackingState == Keys.STATE_TRACKING_ACTIVE) context.getColor(R.color.default_red) + else context.getColor(R.color.default_blue) // gather points for overlay val points: MutableList = mutableListOf() track.wayPoints.forEach { wayPoint -> diff --git a/app/src/main/java/org/y20k/trackbook/ui/TrackFragmentLayoutHolder.kt b/app/src/main/java/org/y20k/trackbook/ui/TrackFragmentLayoutHolder.kt index 9d649df..7125449 100644 --- a/app/src/main/java/org/y20k/trackbook/ui/TrackFragmentLayoutHolder.kt +++ b/app/src/main/java/org/y20k/trackbook/ui/TrackFragmentLayoutHolder.kt @@ -265,13 +265,11 @@ data class TrackFragmentLayoutHolder(private var context: Context, private var m override fun onStateChanged(bottomSheet: View, newState: Int) { when (newState) { BottomSheetBehavior.STATE_EXPANDED -> { - statisticsSheet.background = context.getDrawable(R.drawable.shape_statistics_background_expanded) trackManagementViews.isVisible = true shareButton.isGone = true // bottomSheet.setPadding(0,24,0,0) } else -> { - statisticsSheet.background = context.getDrawable(R.drawable.shape_statistics_background_collapsed) trackManagementViews.isGone = true shareButton.isVisible = true // bottomSheet.setPadding(0,0,0,0) @@ -280,11 +278,9 @@ data class TrackFragmentLayoutHolder(private var context: Context, private var m } override fun onSlide(bottomSheet: View, slideOffset: Float) { if (slideOffset < 0.125f) { - statisticsSheet.background = context.getDrawable(R.drawable.shape_statistics_background_collapsed) trackManagementViews.isGone = true shareButton.isVisible = true } else { - statisticsSheet.background = context.getDrawable(R.drawable.shape_statistics_background_expanded) trackManagementViews.isVisible = true shareButton.isGone = true } diff --git a/app/src/main/res/drawable/ic_compass_needle_black_24dp.xml b/app/src/main/res/drawable/ic_compass_needle_black_24dp.xml index 5cff9e5..f9985d9 100755 --- a/app/src/main/res/drawable/ic_compass_needle_black_24dp.xml +++ b/app/src/main/res/drawable/ic_compass_needle_black_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_marker_location_blue_24dp.xml b/app/src/main/res/drawable/ic_marker_location_blue_24dp.xml index 730c19e..0556d40 100755 --- a/app/src/main/res/drawable/ic_marker_location_blue_24dp.xml +++ b/app/src/main/res/drawable/ic_marker_location_blue_24dp.xml @@ -5,9 +5,9 @@ android:width="24dp"> diff --git a/app/src/main/res/drawable/ic_marker_location_blue_grey_24dp.xml b/app/src/main/res/drawable/ic_marker_location_blue_grey_24dp.xml index e45a2d9..108bc6b 100644 --- a/app/src/main/res/drawable/ic_marker_location_blue_grey_24dp.xml +++ b/app/src/main/res/drawable/ic_marker_location_blue_grey_24dp.xml @@ -5,9 +5,9 @@ android:width="24dp"> diff --git a/app/src/main/res/drawable/ic_marker_location_red_24dp.xml b/app/src/main/res/drawable/ic_marker_location_red_24dp.xml index 9c79b58..e11c57b 100755 --- a/app/src/main/res/drawable/ic_marker_location_red_24dp.xml +++ b/app/src/main/res/drawable/ic_marker_location_red_24dp.xml @@ -5,9 +5,9 @@ android:width="24dp"> diff --git a/app/src/main/res/drawable/ic_marker_location_red_grey_24dp.xml b/app/src/main/res/drawable/ic_marker_location_red_grey_24dp.xml index a0cd6c9..f49d46b 100644 --- a/app/src/main/res/drawable/ic_marker_location_red_grey_24dp.xml +++ b/app/src/main/res/drawable/ic_marker_location_red_grey_24dp.xml @@ -5,9 +5,9 @@ android:width="24dp"> diff --git a/app/src/main/res/drawable/ic_marker_track_end_blue_48dp.xml b/app/src/main/res/drawable/ic_marker_track_end_blue_48dp.xml index f4bbf32..b490715 100644 --- a/app/src/main/res/drawable/ic_marker_track_end_blue_48dp.xml +++ b/app/src/main/res/drawable/ic_marker_track_end_blue_48dp.xml @@ -4,9 +4,9 @@ android:viewportWidth="48" android:viewportHeight="48"> diff --git a/app/src/main/res/drawable/ic_marker_track_end_starred_blue_36dp.xml b/app/src/main/res/drawable/ic_marker_track_end_starred_blue_36dp.xml index 5e03ff1..a7f8a30 100644 --- a/app/src/main/res/drawable/ic_marker_track_end_starred_blue_36dp.xml +++ b/app/src/main/res/drawable/ic_marker_track_end_starred_blue_36dp.xml @@ -3,8 +3,8 @@ android:width="36dp" android:viewportHeight="144" android:viewportWidth="144"> - - diff --git a/app/src/main/res/drawable/ic_marker_track_end_starred_blue_48dp.xml b/app/src/main/res/drawable/ic_marker_track_end_starred_blue_48dp.xml index a9fc9aa..ed296cf 100644 --- a/app/src/main/res/drawable/ic_marker_track_end_starred_blue_48dp.xml +++ b/app/src/main/res/drawable/ic_marker_track_end_starred_blue_48dp.xml @@ -4,10 +4,10 @@ android:viewportWidth="48" android:viewportHeight="48"> diff --git a/app/src/main/res/drawable/ic_marker_track_location_blue_24dp.xml b/app/src/main/res/drawable/ic_marker_track_location_blue_24dp.xml index 8994111..d98f1f7 100755 --- a/app/src/main/res/drawable/ic_marker_track_location_blue_24dp.xml +++ b/app/src/main/res/drawable/ic_marker_track_location_blue_24dp.xml @@ -5,6 +5,6 @@ android:width="24dp"> diff --git a/app/src/main/res/drawable/ic_marker_track_location_grey_24dp.xml b/app/src/main/res/drawable/ic_marker_track_location_grey_24dp.xml index 167fd8a..bfa9eac 100755 --- a/app/src/main/res/drawable/ic_marker_track_location_grey_24dp.xml +++ b/app/src/main/res/drawable/ic_marker_track_location_grey_24dp.xml @@ -5,6 +5,6 @@ android:width="24dp"> diff --git a/app/src/main/res/drawable/ic_marker_track_location_red_24dp.xml b/app/src/main/res/drawable/ic_marker_track_location_red_24dp.xml index 29baa58..47cd227 100755 --- a/app/src/main/res/drawable/ic_marker_track_location_red_24dp.xml +++ b/app/src/main/res/drawable/ic_marker_track_location_red_24dp.xml @@ -5,6 +5,6 @@ android:width="24dp"> diff --git a/app/src/main/res/drawable/ic_marker_track_start_blue_48dp.xml b/app/src/main/res/drawable/ic_marker_track_start_blue_48dp.xml index 7d3ae59..e2c427b 100644 --- a/app/src/main/res/drawable/ic_marker_track_start_blue_48dp.xml +++ b/app/src/main/res/drawable/ic_marker_track_start_blue_48dp.xml @@ -4,9 +4,9 @@ android:viewportWidth="48" android:viewportHeight="48"> diff --git a/app/src/main/res/drawable/ic_marker_track_start_starred_blue_48dp.xml b/app/src/main/res/drawable/ic_marker_track_start_starred_blue_48dp.xml index d5a4540..285ca99 100644 --- a/app/src/main/res/drawable/ic_marker_track_start_starred_blue_48dp.xml +++ b/app/src/main/res/drawable/ic_marker_track_start_starred_blue_48dp.xml @@ -4,10 +4,10 @@ android:viewportWidth="48" android:viewportHeight="48"> diff --git a/app/src/main/res/drawable/ic_notebook_black_24dp.xml b/app/src/main/res/drawable/ic_notebook_black_24dp.xml index a2fa8cc..c01fced 100755 --- a/app/src/main/res/drawable/ic_notebook_black_24dp.xml +++ b/app/src/main/res/drawable/ic_notebook_black_24dp.xml @@ -4,9 +4,9 @@ android:height="24dp" android:width="24dp"> diff --git a/app/src/main/res/drawable/ic_notification_action_resume_36dp.xml b/app/src/main/res/drawable/ic_notification_action_resume_36dp.xml index 3039151..b506faa 100644 --- a/app/src/main/res/drawable/ic_notification_action_resume_36dp.xml +++ b/app/src/main/res/drawable/ic_notification_action_resume_36dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:width="36dp"> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_notification_action_show_36dp.xml b/app/src/main/res/drawable/ic_notification_action_show_36dp.xml index 06afdcc..bca848d 100644 --- a/app/src/main/res/drawable/ic_notification_action_show_36dp.xml +++ b/app/src/main/res/drawable/ic_notification_action_show_36dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:width="36dp"> diff --git a/app/src/main/res/drawable/ic_notification_action_stop_24dp.xml b/app/src/main/res/drawable/ic_notification_action_stop_24dp.xml index 7ba08f2..f65b6ba 100644 --- a/app/src/main/res/drawable/ic_notification_action_stop_24dp.xml +++ b/app/src/main/res/drawable/ic_notification_action_stop_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:width="36dp"> diff --git a/app/src/main/res/drawable/ic_notification_icon_large_tracking_active_48dp.xml b/app/src/main/res/drawable/ic_notification_icon_large_tracking_active_48dp.xml index 787e5cf..ef03a58 100755 --- a/app/src/main/res/drawable/ic_notification_icon_large_tracking_active_48dp.xml +++ b/app/src/main/res/drawable/ic_notification_icon_large_tracking_active_48dp.xml @@ -4,9 +4,9 @@ android:viewportWidth="192.0" android:width="48dp" > diff --git a/app/src/main/res/drawable/ic_notification_icon_large_tracking_stopped_48dp.xml b/app/src/main/res/drawable/ic_notification_icon_large_tracking_stopped_48dp.xml index 4e00800..9be872d 100755 --- a/app/src/main/res/drawable/ic_notification_icon_large_tracking_stopped_48dp.xml +++ b/app/src/main/res/drawable/ic_notification_icon_large_tracking_stopped_48dp.xml @@ -4,9 +4,9 @@ android:viewportWidth="192.0" android:width="48dp" > diff --git a/app/src/main/res/drawable/ic_notification_icon_small_24dp.xml b/app/src/main/res/drawable/ic_notification_icon_small_24dp.xml index ead54bc..e9fa392 100755 --- a/app/src/main/res/drawable/ic_notification_icon_small_24dp.xml +++ b/app/src/main/res/drawable/ic_notification_icon_small_24dp.xml @@ -4,9 +4,9 @@ android:height="24dp" android:width="24dp"> diff --git a/app/src/main/res/drawable/ic_remove_circle_24dp.xml b/app/src/main/res/drawable/ic_remove_circle_24dp.xml index 32936e2..86d8b07 100644 --- a/app/src/main/res/drawable/ic_remove_circle_24dp.xml +++ b/app/src/main/res/drawable/ic_remove_circle_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_settings_black_24dp.xml b/app/src/main/res/drawable/ic_settings_black_24dp.xml index dccef4a..503086f 100644 --- a/app/src/main/res/drawable/ic_settings_black_24dp.xml +++ b/app/src/main/res/drawable/ic_settings_black_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_star_blue_24dp.xml b/app/src/main/res/drawable/ic_star_blue_24dp.xml index 6ba138a..6af63e5 100644 --- a/app/src/main/res/drawable/ic_star_blue_24dp.xml +++ b/app/src/main/res/drawable/ic_star_blue_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_star_red_24dp.xml b/app/src/main/res/drawable/ic_star_red_24dp.xml index c30d723..63fb5b0 100644 --- a/app/src/main/res/drawable/ic_star_red_24dp.xml +++ b/app/src/main/res/drawable/ic_star_red_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/selector_bottom_navigation.xml b/app/src/main/res/drawable/selector_bottom_navigation.xml index abd6c3c..a79957d 100755 --- a/app/src/main/res/drawable/selector_bottom_navigation.xml +++ b/app/src/main/res/drawable/selector_bottom_navigation.xml @@ -1,9 +1,11 @@ + + android:color="@color/bottom_navigation_element" /> diff --git a/app/src/main/res/drawable/shape_statistics_background_expanded.xml b/app/src/main/res/drawable/shape_statistics_background.xml similarity index 97% rename from app/src/main/res/drawable/shape_statistics_background_expanded.xml rename to app/src/main/res/drawable/shape_statistics_background.xml index 682b9e8..ff187e6 100644 --- a/app/src/main/res/drawable/shape_statistics_background_expanded.xml +++ b/app/src/main/res/drawable/shape_statistics_background.xml @@ -10,7 +10,7 @@ - + diff --git a/app/src/main/res/drawable/shape_statistics_background_collapsed.xml b/app/src/main/res/drawable/shape_statistics_background_collapsed.xml deleted file mode 100644 index 3f75958..0000000 --- a/app/src/main/res/drawable/shape_statistics_background_collapsed.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 4179584..563b0d2 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -25,6 +25,8 @@ android:layout_height="wrap_content" android:background="@color/bottom_navigation_background" app:layout_constraintBottom_toBottomOf="parent" + app:itemTextColor="@color/bottom_navigation_element" + app:itemIconTint="@color/bottom_navigation_element" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:menu="@menu/menu_bottom_navigation" /> diff --git a/app/src/main/res/layout/element_track.xml b/app/src/main/res/layout/element_track.xml index 537e5ed..3bae159 100644 --- a/app/src/main/res/layout/element_track.xml +++ b/app/src/main/res/layout/element_track.xml @@ -52,7 +52,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="4dp" - android:backgroundTint="@color/trackbook_transparent" + android:backgroundTint="@color/default_transparent" android:contentDescription="@string/descr_mark_starred_button" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/fragment_map.xml b/app/src/main/res/layout/fragment_map.xml index bd37e4f..b4fd7b4 100644 --- a/app/src/main/res/layout/fragment_map.xml +++ b/app/src/main/res/layout/fragment_map.xml @@ -28,7 +28,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:contentDescription="@string/descr_button_save" - app:backgroundTint="@color/trackbook_green" + app:backgroundTint="@color/recording_management_buttons_background" app:fabSize="mini" app:layout_constraintBottom_toBottomOf="@+id/main_button" app:layout_constraintEnd_toEndOf="parent" @@ -36,7 +36,7 @@ app:layout_constraintStart_toEndOf="@+id/main_button" app:layout_constraintTop_toTopOf="@+id/main_button" app:srcCompat="@drawable/ic_save_24dp" - app:tint="@null" /> + app:tint="@color/recording_management_buttons_icon" /> + app:tint="@color/recording_management_buttons_icon" /> + app:layout_constraintStart_toStartOf="parent" /> - + + @android:color/system_neutral1_900 + @android:color/system_neutral1_900 + @android:color/system_neutral2_700 + @android:color/system_neutral1_100 + @android:color/system_neutral1_800 + + + @android:color/system_neutral1_900 + @android:color/system_neutral2_200 + @android:color/system_accent1_200 + + + @android:color/system_neutral1_100 + @android:color/system_neutral2_200 + @android:color/system_neutral1_900 + @android:color/system_neutral1_100 + @android:color/system_neutral2_200 + @android:color/system_accent1_200 + @android:color/system_neutral1_100 + @android:color/system_neutral1_900 + @android:color/system_accent1_200 + @android:color/system_accent1_800 + + + @android:color/system_neutral2_700 + #fff2b8b5 + + + @android:color/system_neutral1_900 + @android:color/system_neutral2_700 + diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index 5b57144..f2db7a4 100755 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -1,35 +1,36 @@ - - @color/trackbook_neutral_very_dark - @color/trackbook_neutral_black - @color/trackbook_neutral_black - @color/trackbook_neutral_darker + + #ff1c1b1f + #ff1c1b1f + #ff49454f + #ffe6e1e5 + #ff313033 - @color/trackbook_neutral_medium_light - @color/trackbook_blue + + #ff1c1b1f + #ffcac4d0 + #ffd0bcff - @color/trackbook_neutral_white - @color/trackbook_neutral_darker + + #ffe6e1e5 + #ffcac4d0 + #ff1c1b1f + #ffe6e1e5 + #ffcac4d0 + #ffd0bcff + #ffe6e1e5 + #ff1c1b1f + #ffd0bcff + #ff381e72 - @color/trackbook_neutral_white - @color/trackbook_neutral_black - - @color/trackbook_neutral_white - @color/trackbook_neutral_very_light - @color/trackbook_neutral_darker - - @color/trackbook_neutral_white - @color/trackbook_neutral_very_light - @color/trackbook_blue - - @color/trackbook_neutral_darker - @color/trackbook_red - - @color/trackbook_black_85percent - @color/trackbook_neutral_black - @color/trackbook_neutral_darker + + #ff49454f + #fff2b8b5 + + #ff1c1b1f + #ff49454f diff --git a/app/src/main/res/values-v31/colors.xml b/app/src/main/res/values-v31/colors.xml index a76990f..142a944 100644 --- a/app/src/main/res/values-v31/colors.xml +++ b/app/src/main/res/values-v31/colors.xml @@ -1,23 +1,37 @@ - - - @android:color/system_neutral1_600 - @android:color/system_neutral1_800 - @android:color/system_neutral1_900 + + @android:color/system_neutral2_100 + @android:color/system_neutral1_10 + @android:color/system_neutral1_10 + @android:color/system_neutral1_900 + @android:color/system_neutral1_10 - @android:color/system_neutral1_300 - @android:color/system_neutral1_100 - @android:color/system_neutral1_50 - @android:color/system_neutral1_10 + + @android:color/system_neutral1_10 + @android:color/system_neutral2_700 + @android:color/system_accent1_600 - @android:color/system_accent1_100 - @android:color/system_accent1_50 - @android:color/system_accent1_600 + + @android:color/system_neutral1_900 + @android:color/system_neutral2_700 + @android:color/system_neutral1_10 + @android:color/system_neutral1_900 + @android:color/system_neutral2_700 + @android:color/system_accent1_600 + @android:color/system_neutral1_900 + @android:color/system_neutral1_10 + @android:color/system_accent1_600 + @android:color/system_neutral1_0 - @android:color/system_neutral1_1000 - @android:color/system_neutral1_0 + + @android:color/system_neutral1_10 + #ffb3261e + + + @android:color/system_neutral1_10 + @android:color/system_neutral2_100 diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 9927e12..1587c46 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,69 +1,52 @@ - - @color/trackbook_neutral_very_light - @color/trackbook_neutral_white - @color/trackbook_neutral_white - @color/trackbook_neutral_very_light + + #ffe7e0ec + #fffffbfe + #fffffbfe + #ff1c1b1f + #fffffbfe - @color/trackbook_neutral_medium_light - @color/trackbook_blue + + #fffffbfe + #ff49454f + #ff6750a4 - @color/trackbook_neutral_darker - @color/trackbook_neutral_white + + #ff1c1b1f + #ff49454f + #fffffbfe + #ff1c1b1f + #ff49454f + #ff6750a4 + #ff1c1b1f + #fffffbfe + #ff6750a4 + #ffffffff - @color/trackbook_neutral_dark - @color/trackbook_neutral_white + + #fffffbfe + #ffb3261e - @color/trackbook_neutral_darker - @color/trackbook_neutral_dark - @color/trackbook_neutral_white + + #fffffbfe + #ffe7e0ec - - @color/trackbook_neutral_dark - @color/trackbook_neutral_medium_light - @color/trackbook_blue - - @color/trackbook_accent_intense - @color/trackbook_neutral_very_dark - - @color/trackbook_neutral_white - @color/trackbook_red - - @color/trackbook_white_85percent - @color/trackbook_neutral_white - @color/trackbook_neutral_light - - - - #FF595959 - #FF414141 - #FF2D2D2D - - #FF7D7D7D - #FFDADADA - #FFF2F2F2 - #FFFAFAFA - - #FFEADDFF - #FFF4EEFF - #FF625b71 - - #FF121212 - #FFFFFFFF - - #FFDC3D33 - #FFCA2D23 - - #00ffffff - - #FF3C98DB - - #FF4CAF50 - - #D9FFFFFF - #D9121212 + + #ffffffff + #ffe6e1e5 + #ff7d7d7d + #ff595959 + #ff1c1b1f + + #d9e6e1e5 + #d91c1b1f + #00ffffff + #FFDC3D33 + #FFCA2D23 + #FF3C98DB + #FF4CAF50 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 43c7433..3fd0e4f 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -3,6 +3,10 @@