voussoir/trkpt
1
0
Fork 0
Code Issues Projects Releases Packages Activity

color scheme update

Browse source
This commit is contained in:
y20k 2022-04-06 14:45:38 +02:00
parent dd54c6dcf3
commit 109876af74
No known key found for this signature in database
GPG key ID: 824D4259F41FAFF6
39 changed files with 189 additions and 177 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/org/y20k/trackbook/helpers/MapOverlayHelper.kt
View file

@ -40,7 +40,6 @@ import org.y20k.trackbook.core.WayPoint
import java.text.DecimalFormat import java.text.DecimalFormat
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
import java.util.* import java.util.*
import kotlin.collections.ArrayList
/* /*
@ -96,8 +95,8 @@ class MapOverlayHelper (private var markerListener: MarkerListener) {
/* Creates icon overlay for track */ /* Creates icon overlay for track */
fun createTrackOverlay(context: Context, track: Track, trackingState: Int): SimpleFastPointOverlay { fun createTrackOverlay(context: Context, track: Track, trackingState: Int): SimpleFastPointOverlay {
// get marker color // get marker color
val color = if (trackingState == Keys.STATE_TRACKING_ACTIVE) context.getColor(R.color.trackbook_red) val color = if (trackingState == Keys.STATE_TRACKING_ACTIVE) context.getColor(R.color.default_red)
else context.getColor(R.color.trackbook_blue) else context.getColor(R.color.default_blue)
// gather points for overlay // gather points for overlay
val points: MutableList<IGeoPoint> = mutableListOf() val points: MutableList<IGeoPoint> = mutableListOf()
track.wayPoints.forEach { wayPoint -> track.wayPoints.forEach { wayPoint ->

4
app/src/main/java/org/y20k/trackbook/ui/TrackFragmentLayoutHolder.kt
View file

@ -265,13 +265,11 @@ data class TrackFragmentLayoutHolder(private var context: Context, private var m
override fun onStateChanged(bottomSheet: View, newState: Int) { override fun onStateChanged(bottomSheet: View, newState: Int) {
when (newState) { when (newState) {
BottomSheetBehavior.STATE_EXPANDED -> { BottomSheetBehavior.STATE_EXPANDED -> {
statisticsSheet.background = context.getDrawable(R.drawable.shape_statistics_background_expanded)
trackManagementViews.isVisible = true trackManagementViews.isVisible = true
shareButton.isGone = true shareButton.isGone = true
// bottomSheet.setPadding(0,24,0,0) // bottomSheet.setPadding(0,24,0,0)
} }
else -> { else -> {
statisticsSheet.background = context.getDrawable(R.drawable.shape_statistics_background_collapsed)
trackManagementViews.isGone = true trackManagementViews.isGone = true
shareButton.isVisible = true shareButton.isVisible = true
// bottomSheet.setPadding(0,0,0,0) // 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) { override fun onSlide(bottomSheet: View, slideOffset: Float) {
if (slideOffset < 0.125f) { if (slideOffset < 0.125f) {
statisticsSheet.background = context.getDrawable(R.drawable.shape_statistics_background_collapsed)
trackManagementViews.isGone = true trackManagementViews.isGone = true
shareButton.isVisible = true shareButton.isVisible = true
} else { } else {
statisticsSheet.background = context.getDrawable(R.drawable.shape_statistics_background_expanded)
trackManagementViews.isVisible = true trackManagementViews.isVisible = true
shareButton.isGone = true shareButton.isGone = true
} }

2
app/src/main/res/drawable/ic_compass_needle_black_24dp.xml
View file

@ -4,6 +4,6 @@
android:viewportWidth="24.0" android:viewportWidth="24.0"
android:viewportHeight="24.0"> android:viewportHeight="24.0">
<path <path
android:fillColor="@color/trackbook_neutral_black" android:fillColor="@color/default_neutral_darker"
android:pathData="M21,3L3,10.53v0.98l6.84,2.65L12.48,21h0.98L21,3z"/> android:pathData="M21,3L3,10.53v0.98l6.84,2.65L12.48,21h0.98L21,3z"/>
</vector> </vector>

4
app/src/main/res/drawable/ic_marker_location_blue_24dp.xml
View file

@ -5,9 +5,9 @@
android:width="24dp"> android:width="24dp">
<path <path
android:fillAlpha="0.33" android:fillAlpha="0.33"
android:fillColor="@color/trackbook_blue" android:fillColor="@color/default_blue"
android:pathData="M48,48m-48,0a48,48 0,1 1,96 0a48,48 0,1 1,-96 0"/> android:pathData="M48,48m-48,0a48,48 0,1 1,96 0a48,48 0,1 1,-96 0"/>
<path <path
android:fillColor="@color/trackbook_blue" android:fillColor="@color/default_blue"
android:pathData="M48,48m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0"/> android:pathData="M48,48m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0"/>
</vector> </vector>

4
app/src/main/res/drawable/ic_marker_location_blue_grey_24dp.xml
View file

@ -5,9 +5,9 @@
android:width="24dp"> android:width="24dp">
<path <path
android:fillAlpha="0.33" android:fillAlpha="0.33"
android:fillColor="@color/trackbook_blue" android:fillColor="@color/default_blue"
android:pathData="M48,48m-48,0a48,48 0,1 1,96 0a48,48 0,1 1,-96 0"/> android:pathData="M48,48m-48,0a48,48 0,1 1,96 0a48,48 0,1 1,-96 0"/>
<path <path
android:fillColor="@color/trackbook_neutral_medium_light" android:fillColor="@color/default_neutral_medium_light"
android:pathData="M48,48m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0"/> android:pathData="M48,48m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0"/>
</vector> </vector>

4
app/src/main/res/drawable/ic_marker_location_red_24dp.xml
View file

@ -5,9 +5,9 @@
android:width="24dp"> android:width="24dp">
<path <path
android:fillAlpha="0.33" android:fillAlpha="0.33"
android:fillColor="@color/trackbook_red" android:fillColor="@color/default_red"
android:pathData="M48,48m-48,0a48,48 0,1 1,96 0a48,48 0,1 1,-96 0"/> android:pathData="M48,48m-48,0a48,48 0,1 1,96 0a48,48 0,1 1,-96 0"/>
<path <path
android:fillColor="@color/trackbook_red" android:fillColor="@color/default_red"
android:pathData="M48,48m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0"/> android:pathData="M48,48m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0"/>
</vector> </vector>

4
app/src/main/res/drawable/ic_marker_location_red_grey_24dp.xml
View file

@ -5,9 +5,9 @@
android:width="24dp"> android:width="24dp">
<path <path
android:fillAlpha="0.33" android:fillAlpha="0.33"
android:fillColor="@color/trackbook_red" android:fillColor="@color/default_red"
android:pathData="M48,48m-48,0a48,48 0,1 1,96 0a48,48 0,1 1,-96 0"/> android:pathData="M48,48m-48,0a48,48 0,1 1,96 0a48,48 0,1 1,-96 0"/>
<path <path
android:fillColor="@color/trackbook_neutral_medium_light" android:fillColor="@color/default_neutral_medium_light"
android:pathData="M48,48m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0"/> android:pathData="M48,48m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0"/>
</vector> </vector>

4
app/src/main/res/drawable/ic_marker_track_end_blue_48dp.xml
View file

@ -4,9 +4,9 @@
android:viewportWidth="48" android:viewportWidth="48"
android:viewportHeight="48"> android:viewportHeight="48">
<path <path
android:fillColor="@color/trackbook_blue" android:fillColor="@color/default_blue"
android:pathData="M24,24m-6,0a6,6 0,1 1,12 0a6,6 0,1 1,-12 0" /> android:pathData="M24,24m-6,0a6,6 0,1 1,12 0a6,6 0,1 1,-12 0" />
<path <path
android:fillColor="@color/trackbook_red" android:fillColor="@color/default_red"
android:pathData="M24,0C19.356,0 15.6,3.756 15.6,8.4 15.6,14.7 24,24 24,24 24,24 32.4,14.7 32.4,8.4 32.4,3.756 28.644,0 24,0ZM24,11.4c-1.656,0 -3,-1.344 -3,-3 0,-1.656 1.344,-3 3,-3 1.656,0 3,1.344 3,3 0,1.656 -1.344,3 -3,3z" /> android:pathData="M24,0C19.356,0 15.6,3.756 15.6,8.4 15.6,14.7 24,24 24,24 24,24 32.4,14.7 32.4,8.4 32.4,3.756 28.644,0 24,0ZM24,11.4c-1.656,0 -3,-1.344 -3,-3 0,-1.656 1.344,-3 3,-3 1.656,0 3,1.344 3,3 0,1.656 -1.344,3 -3,3z" />
</vector> </vector>

4
app/src/main/res/drawable/ic_marker_track_end_starred_blue_36dp.xml
View file

@ -3,8 +3,8 @@
android:width="36dp" android:width="36dp"
android:viewportHeight="144" android:viewportHeight="144"
android:viewportWidth="144"> android:viewportWidth="144">
<path android:fillColor="@color/trackbook_blue" <path android:fillColor="@color/default_blue"
android:pathData="M72,95.08 L96.72,110 90.16,81.88 112,62.96 83.24,60.52 72,34 60.76,60.52 32,62.96 53.84,81.88 47.28,110Z" android:strokeWidth="16.9412"/> android:pathData="M72,95.08 L96.72,110 90.16,81.88 112,62.96 83.24,60.52 72,34 60.76,60.52 32,62.96 53.84,81.88 47.28,110Z" android:strokeWidth="16.9412"/>
<path android:fillColor="@color/trackbook_red" <path android:fillColor="@color/default_red"
android:pathData="M72.02,0C58.088,0 46.82,11.268 46.82,25.2 46.82,44.1 72.02,72 72.02,72c0,0 25.2,-27.9 25.2,-46.8C97.22,11.268 85.952,0 72.02,0ZM72.02,34.2c-4.968,0 -9,-4.032 -9,-9 0,-4.968 4.032,-9 9,-9 4.968,0 9,4.032 9,9 0,4.968 -4.032,9 -9,9z" android:strokeWidth="3.60001"/> android:pathData="M72.02,0C58.088,0 46.82,11.268 46.82,25.2 46.82,44.1 72.02,72 72.02,72c0,0 25.2,-27.9 25.2,-46.8C97.22,11.268 85.952,0 72.02,0ZM72.02,34.2c-4.968,0 -9,-4.032 -9,-9 0,-4.968 4.032,-9 9,-9 4.968,0 9,4.032 9,9 0,4.968 -4.032,9 -9,9z" android:strokeWidth="3.60001"/>
</vector> </vector>

4
app/src/main/res/drawable/ic_marker_track_end_starred_blue_48dp.xml
View file

@ -4,10 +4,10 @@
android:viewportWidth="48" android:viewportWidth="48"
android:viewportHeight="48"> android:viewportHeight="48">
<path <path
android:fillColor="@color/trackbook_blue" android:fillColor="@color/default_blue"
android:pathData="M24,28.3275 L28.635,31.125 27.405,25.8525 31.5,22.305 26.1075,21.8475 24,16.875 21.8925,21.8475 16.5,22.305l4.095,3.5475 -1.23,5.2725z" /> android:pathData="M24,28.3275 L28.635,31.125 27.405,25.8525 31.5,22.305 26.1075,21.8475 24,16.875 21.8925,21.8475 16.5,22.305l4.095,3.5475 -1.23,5.2725z" />
<path <path
android:fillColor="@color/trackbook_red" android:fillColor="@color/default_red"
android:pathData="M24,0C19.356,0 15.6,3.756 15.6,8.4 15.6,14.7 24,24 24,24 24,24 32.4,14.7 32.4,8.4 32.4,3.756 28.644,0 24,0ZM24,11.4c-1.656,0 -3,-1.344 -3,-3 0,-1.656 1.344,-3 3,-3 1.656,0 3,1.344 3,3 0,1.656 -1.344,3 -3,3z" /> android:pathData="M24,0C19.356,0 15.6,3.756 15.6,8.4 15.6,14.7 24,24 24,24 24,24 32.4,14.7 32.4,8.4 32.4,3.756 28.644,0 24,0ZM24,11.4c-1.656,0 -3,-1.344 -3,-3 0,-1.656 1.344,-3 3,-3 1.656,0 3,1.344 3,3 0,1.656 -1.344,3 -3,3z" />
</vector> </vector>

2
app/src/main/res/drawable/ic_marker_track_location_blue_24dp.xml
View file

@ -5,6 +5,6 @@
android:width="24dp"> android:width="24dp">
<path <path
android:fillColor="@color/trackbook_blue" android:fillColor="@color/default_blue"
android:pathData="M48,48m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0"/> android:pathData="M48,48m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0"/>
</vector> </vector>

2
app/src/main/res/drawable/ic_marker_track_location_grey_24dp.xml
View file

@ -5,6 +5,6 @@
android:width="24dp"> android:width="24dp">
<path <path
android:fillColor="@color/trackbook_neutral_medium_light" android:fillColor="@color/default_neutral_medium_light"
android:pathData="M48,48m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0"/> android:pathData="M48,48m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0"/>
</vector> </vector>

2
app/src/main/res/drawable/ic_marker_track_location_red_24dp.xml
View file

@ -5,6 +5,6 @@
android:width="24dp"> android:width="24dp">
<path <path
android:fillColor="@color/trackbook_red" android:fillColor="@color/default_red"
android:pathData="M48,48m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0"/> android:pathData="M48,48m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0"/>
</vector> </vector>

4
app/src/main/res/drawable/ic_marker_track_start_blue_48dp.xml
View file

@ -4,9 +4,9 @@
android:viewportWidth="48" android:viewportWidth="48"
android:viewportHeight="48"> android:viewportHeight="48">
<path <path
android:fillColor="@color/trackbook_blue" android:fillColor="@color/default_blue"
android:pathData="M24,24m-6,0a6,6 0,1 1,12 0a6,6 0,1 1,-12 0" /> android:pathData="M24,24m-6,0a6,6 0,1 1,12 0a6,6 0,1 1,-12 0" />
<path <path
android:fillColor="@color/trackbook_green" android:fillColor="@color/default_green"
android:pathData="M24,0C19.356,0 15.6,3.756 15.6,8.4 15.6,14.7 24,24 24,24 24,24 32.4,14.7 32.4,8.4 32.4,3.756 28.644,0 24,0ZM24,11.4c-1.656,0 -3,-1.344 -3,-3 0,-1.656 1.344,-3 3,-3 1.656,0 3,1.344 3,3 0,1.656 -1.344,3 -3,3z" /> android:pathData="M24,0C19.356,0 15.6,3.756 15.6,8.4 15.6,14.7 24,24 24,24 24,24 32.4,14.7 32.4,8.4 32.4,3.756 28.644,0 24,0ZM24,11.4c-1.656,0 -3,-1.344 -3,-3 0,-1.656 1.344,-3 3,-3 1.656,0 3,1.344 3,3 0,1.656 -1.344,3 -3,3z" />
</vector> </vector>

4
app/src/main/res/drawable/ic_marker_track_start_starred_blue_48dp.xml
View file

@ -4,10 +4,10 @@
android:viewportWidth="48" android:viewportWidth="48"
android:viewportHeight="48"> android:viewportHeight="48">
<path <path
android:fillColor="@color/trackbook_blue" android:fillColor="@color/default_blue"
android:pathData="M24,28.3275 L28.635,31.125 27.405,25.8525 31.5,22.305 26.1075,21.8475 24,16.875 21.8925,21.8475 16.5,22.305l4.095,3.5475 -1.23,5.2725z" /> android:pathData="M24,28.3275 L28.635,31.125 27.405,25.8525 31.5,22.305 26.1075,21.8475 24,16.875 21.8925,21.8475 16.5,22.305l4.095,3.5475 -1.23,5.2725z" />
<path <path
android:fillColor="@color/trackbook_green" android:fillColor="@color/default_green"
android:pathData="M24,0C19.356,0 15.6,3.756 15.6,8.4 15.6,14.7 24,24 24,24 24,24 32.4,14.7 32.4,8.4 32.4,3.756 28.644,0 24,0ZM24,11.4c-1.656,0 -3,-1.344 -3,-3 0,-1.656 1.344,-3 3,-3 1.656,0 3,1.344 3,3 0,1.656 -1.344,3 -3,3z" /> android:pathData="M24,0C19.356,0 15.6,3.756 15.6,8.4 15.6,14.7 24,24 24,24 24,24 32.4,14.7 32.4,8.4 32.4,3.756 28.644,0 24,0ZM24,11.4c-1.656,0 -3,-1.344 -3,-3 0,-1.656 1.344,-3 3,-3 1.656,0 3,1.344 3,3 0,1.656 -1.344,3 -3,3z" />
</vector> </vector>

4
app/src/main/res/drawable/ic_notebook_black_24dp.xml
View file

@ -4,9 +4,9 @@
android:height="24dp" android:height="24dp"
android:width="24dp"> android:width="24dp">
<path <path
android:fillColor="@color/trackbook_neutral_black" android:fillColor="@color/default_neutral_darker"
android:pathData="M44,12.99L20.69,8.74L5.12,5.89C2.29,5.38 0,7.44 0,10.49v67.38c0,3.06 2.29,5.96 5.12,6.47l15.57,2.85l22.19,4.05L44,91.46V12.99z"/> android:pathData="M44,12.99L20.69,8.74L5.12,5.89C2.29,5.38 0,7.44 0,10.49v67.38c0,3.06 2.29,5.96 5.12,6.47l15.57,2.85l22.19,4.05L44,91.46V12.99z"/>
<path <path
android:fillColor="@color/trackbook_neutral_black" android:fillColor="@color/default_neutral_darker"
android:pathData="M90.88,5.89L75.31,8.74L53.12,12.79L52,12.99v78.46l23.31,-4.26l15.57,-2.85c2.83,-0.52 5.12,-3.41 5.12,-6.47V10.49C96,7.44 93.71,5.38 90.88,5.89z"/> android:pathData="M90.88,5.89L75.31,8.74L53.12,12.79L52,12.99v78.46l23.31,-4.26l15.57,-2.85c2.83,-0.52 5.12,-3.41 5.12,-6.47V10.49C96,7.44 93.71,5.38 90.88,5.89z"/>
</vector> </vector>

2
app/src/main/res/drawable/ic_notification_action_resume_36dp.xml
View file

@ -4,6 +4,6 @@
android:viewportWidth="24.0" android:viewportWidth="24.0"
android:width="36dp"> android:width="36dp">
<path <path
android:fillColor="@color/trackbook_neutral_black" android:fillColor="@color/default_neutral_darker"
android:pathData="M12,12m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0"/> android:pathData="M12,12m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0"/>
</vector> </vector>

2
app/src/main/res/drawable/ic_notification_action_show_36dp.xml
View file

@ -4,6 +4,6 @@
android:viewportWidth="24.0" android:viewportWidth="24.0"
android:width="36dp"> android:width="36dp">
<path <path
android:fillColor="@color/trackbook_neutral_black" android:fillColor="@color/default_neutral_darker"
android:pathData="M12,4.5C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zM12,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3z"/> android:pathData="M12,4.5C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zM12,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3z"/>
</vector> </vector>

2
app/src/main/res/drawable/ic_notification_action_stop_24dp.xml
View file

@ -4,6 +4,6 @@
android:viewportWidth="24.0" android:viewportWidth="24.0"
android:width="36dp"> android:width="36dp">
<path <path
android:fillColor="@color/trackbook_neutral_black" android:fillColor="@color/default_neutral_darker"
android:pathData="M6,6h12v12H6z"/> android:pathData="M6,6h12v12H6z"/>
</vector> </vector>

4
app/src/main/res/drawable/ic_notification_icon_large_tracking_active_48dp.xml
View file

@ -4,9 +4,9 @@
android:viewportWidth="192.0" android:viewportWidth="192.0"
android:width="48dp" > android:width="48dp" >
<path <path
android:fillColor="@color/trackbook_blue" android:fillColor="@color/default_blue"
android:pathData="M96,96m-96,0a96,96 0,1 1,192 0a96,96 0,1 1,-192 0"/> android:pathData="M96,96m-96,0a96,96 0,1 1,192 0a96,96 0,1 1,-192 0"/>
<path <path
android:fillColor="@color/trackbook_red_dark" android:fillColor="@color/default_red_dark"
android:pathData="M48,96a48,46.5 0,1 0,96 0a48,46.5 0,1 0,-96 0z"/> android:pathData="M48,96a48,46.5 0,1 0,96 0a48,46.5 0,1 0,-96 0z"/>
</vector> </vector>

4
app/src/main/res/drawable/ic_notification_icon_large_tracking_stopped_48dp.xml
View file

@ -4,9 +4,9 @@
android:viewportWidth="192.0" android:viewportWidth="192.0"
android:width="48dp" > android:width="48dp" >
<path <path
android:fillColor="@color/trackbook_blue" android:fillColor="@color/default_blue"
android:pathData="M96,96m-96,0a96,96 0,1 1,192 0a96,96 0,1 1,-192 0"/> android:pathData="M96,96m-96,0a96,96 0,1 1,192 0a96,96 0,1 1,-192 0"/>
<path <path
android:fillColor="@color/trackbook_neutral_white" android:fillColor="@color/default_neutral_white"
android:pathData="M48,96a48,46.5 0,1 0,96 0a48,46.5 0,1 0,-96 0z"/> android:pathData="M48,96a48,46.5 0,1 0,96 0a48,46.5 0,1 0,-96 0z"/>
</vector> </vector>

4
app/src/main/res/drawable/ic_notification_icon_small_24dp.xml
View file

@ -4,9 +4,9 @@
android:height="24dp" android:height="24dp"
android:width="24dp"> android:width="24dp">
<path <path
android:fillColor="@color/trackbook_neutral_white" android:fillColor="@color/default_neutral_white"
android:pathData="M44,12.99L20.69,8.74L5.12,5.89C2.29,5.38 0,7.44 0,10.49v67.38c0,3.06 2.29,5.96 5.12,6.47l15.57,2.85l22.19,4.05L44,91.46V12.99z"/> android:pathData="M44,12.99L20.69,8.74L5.12,5.89C2.29,5.38 0,7.44 0,10.49v67.38c0,3.06 2.29,5.96 5.12,6.47l15.57,2.85l22.19,4.05L44,91.46V12.99z"/>
<path <path
android:fillColor="@color/trackbook_neutral_white" android:fillColor="@color/default_neutral_white"
android:pathData="M90.88,5.89L75.31,8.74L53.12,12.79L52,12.99v78.46l23.31,-4.26l15.57,-2.85c2.83,-0.52 5.12,-3.41 5.12,-6.47V10.49C96,7.44 93.71,5.38 90.88,5.89z"/> android:pathData="M90.88,5.89L75.31,8.74L53.12,12.79L52,12.99v78.46l23.31,-4.26l15.57,-2.85c2.83,-0.52 5.12,-3.41 5.12,-6.47V10.49C96,7.44 93.71,5.38 90.88,5.89z"/>
</vector> </vector>

2
app/src/main/res/drawable/ic_remove_circle_24dp.xml
View file

@ -4,6 +4,6 @@
android:viewportWidth="24.0" android:viewportWidth="24.0"
android:viewportHeight="24.0"> android:viewportHeight="24.0">
<path <path
android:fillColor="@color/trackbook_neutral_white" android:fillColor="@color/default_neutral_white"
android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM17,13L7,13v-2h10v2z"/> android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM17,13L7,13v-2h10v2z"/>
</vector> </vector>

2
app/src/main/res/drawable/ic_settings_black_24dp.xml
View file

@ -4,6 +4,6 @@
android:viewportWidth="24" android:viewportWidth="24"
android:viewportHeight="24"> android:viewportHeight="24">
<path <path
android:fillColor="@color/trackbook_neutral_black" android:fillColor="@color/default_neutral_darker"
android:pathData="M19.1,12.9a2.8,2.8 0,0 0,0.1 -0.9,2.8 2.8,0 0,0 -0.1,-0.9l2.1,-1.6a0.7,0.7 0,0 0,0.1 -0.6L19.4,5.5a0.7,0.7 0,0 0,-0.6 -0.2l-2.4,1a6.5,6.5 0,0 0,-1.6 -0.9l-0.4,-2.6a0.5,0.5 0,0 0,-0.5 -0.4H10.1a0.5,0.5 0,0 0,-0.5 0.4L9.3,5.4a5.6,5.6 0,0 0,-1.7 0.9l-2.4,-1a0.4,0.4 0,0 0,-0.5 0.2l-2,3.4c-0.1,0.2 0,0.4 0.2,0.6l2,1.6a2.8,2.8 0,0 0,-0.1 0.9,2.8 2.8,0 0,0 0.1,0.9L2.8,14.5a0.7,0.7 0,0 0,-0.1 0.6l1.9,3.4a0.7,0.7 0,0 0,0.6 0.2l2.4,-1a6.5,6.5 0,0 0,1.6 0.9l0.4,2.6a0.5,0.5 0,0 0,0.5 0.4h3.8a0.5,0.5 0,0 0,0.5 -0.4l0.3,-2.6a5.6,5.6 0,0 0,1.7 -0.9l2.4,1a0.4,0.4 0,0 0,0.5 -0.2l2,-3.4c0.1,-0.2 0,-0.4 -0.2,-0.6ZM12,15.6A3.6,3.6 0,1 1,15.6 12,3.6 3.6,0 0,1 12,15.6Z"/> android:pathData="M19.1,12.9a2.8,2.8 0,0 0,0.1 -0.9,2.8 2.8,0 0,0 -0.1,-0.9l2.1,-1.6a0.7,0.7 0,0 0,0.1 -0.6L19.4,5.5a0.7,0.7 0,0 0,-0.6 -0.2l-2.4,1a6.5,6.5 0,0 0,-1.6 -0.9l-0.4,-2.6a0.5,0.5 0,0 0,-0.5 -0.4H10.1a0.5,0.5 0,0 0,-0.5 0.4L9.3,5.4a5.6,5.6 0,0 0,-1.7 0.9l-2.4,-1a0.4,0.4 0,0 0,-0.5 0.2l-2,3.4c-0.1,0.2 0,0.4 0.2,0.6l2,1.6a2.8,2.8 0,0 0,-0.1 0.9,2.8 2.8,0 0,0 0.1,0.9L2.8,14.5a0.7,0.7 0,0 0,-0.1 0.6l1.9,3.4a0.7,0.7 0,0 0,0.6 0.2l2.4,-1a6.5,6.5 0,0 0,1.6 0.9l0.4,2.6a0.5,0.5 0,0 0,0.5 0.4h3.8a0.5,0.5 0,0 0,0.5 -0.4l0.3,-2.6a5.6,5.6 0,0 0,1.7 -0.9l2.4,1a0.4,0.4 0,0 0,0.5 -0.2l2,-3.4c0.1,-0.2 0,-0.4 -0.2,-0.6ZM12,15.6A3.6,3.6 0,1 1,15.6 12,3.6 3.6,0 0,1 12,15.6Z"/>
</vector> </vector>

2
app/src/main/res/drawable/ic_star_blue_24dp.xml
View file

@ -4,6 +4,6 @@
android:viewportWidth="24.0" android:viewportWidth="24.0"
android:viewportHeight="24.0"> android:viewportHeight="24.0">
<path <path
android:fillColor="@color/trackbook_blue" android:fillColor="@color/default_blue"
android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"/> android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"/>
</vector> </vector>

2
app/src/main/res/drawable/ic_star_red_24dp.xml
View file

@ -4,6 +4,6 @@
android:viewportWidth="24.0" android:viewportWidth="24.0"
android:viewportHeight="24.0"> android:viewportHeight="24.0">
<path <path
android:fillColor="@color/trackbook_red" android:fillColor="@color/default_red"
android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"/> android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"/>
</vector> </vector>

6
app/src/main/res/drawable/selector_bottom_navigation.xml
View file

@ -1,9 +1,11 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:state_checked="true"
android:color="@color/default_green" />
<item <item
android:state_checked="false" android:state_checked="false"
android:color="@color/bottom_navigation_element" /> android:color="@color/bottom_navigation_element" />
<item <item
android:state_checked="true" android:color="@color/bottom_navigation_element" />
android:color="@color/bottom_navigation_element_selected" />
</selector> </selector>

2
app/src/main/res/drawable/shape_statistics_background_expanded.xml → app/src/main/res/drawable/shape_statistics_background.xml
View file

@ -10,7 +10,7 @@
<shape <shape
android:shape="rectangle"> android:shape="rectangle">
<solid android:color="@color/statistic_sheet_background_expanded" /> <solid android:color="@color/statistic_sheet_background" />
<corners android:topLeftRadius="20dp" android:topRightRadius="20dp" /> <corners android:topLeftRadius="20dp" android:topRightRadius="20dp" />
<stroke android:width="1dp" android:color="@color/statistic_sheet_background_border"/> <stroke android:width="1dp" android:color="@color/statistic_sheet_background_border"/>

21
app/src/main/res/drawable/shape_statistics_background_collapsed.xml
View file

@ -1,21 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:top="0dp"
android:left="-2dp"
android:right="-2dp"
android:bottom="-2dp">
<shape
android:shape="rectangle">
<solid android:color="@color/statistic_sheet_background_collapsed" />
<corners android:topLeftRadius="20dp" android:topRightRadius="20dp" />
<stroke android:width="1dp" android:color="@color/statistic_sheet_background_border"/>
</shape>
</item>
</layer-list>

2
app/src/main/res/layout/activity_main.xml
View file

@ -25,6 +25,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/bottom_navigation_background" android:background="@color/bottom_navigation_background"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:itemTextColor="@color/bottom_navigation_element"
app:itemIconTint="@color/bottom_navigation_element"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:menu="@menu/menu_bottom_navigation" /> app:menu="@menu/menu_bottom_navigation" />

2
app/src/main/res/layout/element_track.xml
View file

@ -52,7 +52,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="4dp" android:layout_marginEnd="4dp"
android:backgroundTint="@color/trackbook_transparent" android:backgroundTint="@color/default_transparent"
android:contentDescription="@string/descr_mark_starred_button" android:contentDescription="@string/descr_mark_starred_button"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"

11
app/src/main/res/layout/fragment_map.xml
View file

@ -28,7 +28,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:contentDescription="@string/descr_button_save" android:contentDescription="@string/descr_button_save"
app:backgroundTint="@color/trackbook_green" app:backgroundTint="@color/recording_management_buttons_background"
app:fabSize="mini" app:fabSize="mini"
app:layout_constraintBottom_toBottomOf="@+id/main_button" app:layout_constraintBottom_toBottomOf="@+id/main_button"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@ -36,7 +36,7 @@
app:layout_constraintStart_toEndOf="@+id/main_button" app:layout_constraintStart_toEndOf="@+id/main_button"
app:layout_constraintTop_toTopOf="@+id/main_button" app:layout_constraintTop_toTopOf="@+id/main_button"
app:srcCompat="@drawable/ic_save_24dp" app:srcCompat="@drawable/ic_save_24dp"
app:tint="@null" /> <!-- necessary hack: to be able to change icon color programmatically --> app:tint="@color/recording_management_buttons_icon" />
<!-- BUTTON CLEAR --> <!-- BUTTON CLEAR -->
<com.google.android.material.floatingactionbutton.FloatingActionButton <com.google.android.material.floatingactionbutton.FloatingActionButton
@ -53,7 +53,7 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/main_button" app:layout_constraintTop_toTopOf="@+id/main_button"
app:srcCompat="@drawable/ic_delete_24dp" app:srcCompat="@drawable/ic_delete_24dp"
app:tint="@null" /> <!-- necessary hack: to be able to change icon color programmatically --> app:tint="@color/recording_management_buttons_icon" />
<!-- MAIN BUTTON --> <!-- MAIN BUTTON -->
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
@ -63,12 +63,13 @@
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
android:contentDescription="@string/descr_button_start" android:contentDescription="@string/descr_button_start"
android:text="@string/button_start" android:text="@string/button_start"
android:textColor="@color/recording_management_buttons_icon"
app:backgroundTint="@color/recording_management_buttons_background" app:backgroundTint="@color/recording_management_buttons_background"
app:icon="@drawable/ic_fiber_manual_record_inactive_24dp" app:icon="@drawable/ic_fiber_manual_record_inactive_24dp"
app:iconTint="@color/recording_management_buttons_icon"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent" />
app:tint="@null" /> <!-- necessary hack: to be able to change icon color programmatically -->
<!-- CURRENT LOCATION BUTTON --> <!-- CURRENT LOCATION BUTTON -->
<com.google.android.material.floatingactionbutton.FloatingActionButton <com.google.android.material.floatingactionbutton.FloatingActionButton

2
app/src/main/res/layout/fragment_track.xml
View file

@ -26,7 +26,7 @@
android:layout_width="@dimen/bottom_sheet_width" android:layout_width="@dimen/bottom_sheet_width"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:background="@drawable/shape_statistics_background_collapsed" android:background="@drawable/shape_statistics_background"
app:behavior_hideable="false" app:behavior_hideable="false"
app:behavior_peekHeight="54dp" app:behavior_peekHeight="54dp"
app:gestureInsetBottomIgnored="true" app:gestureInsetBottomIgnored="true"

6
app/src/main/res/layout/track_statistics.xml
View file

@ -44,7 +44,7 @@
android:id="@+id/delete_button" android:id="@+id/delete_button"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:backgroundTint="@color/trackbook_transparent" android:backgroundTint="@color/default_transparent"
android:contentDescription="@string/descr_statistics_sheet_delete_button" android:contentDescription="@string/descr_statistics_sheet_delete_button"
app:layout_constraintBottom_toBottomOf="@+id/edit_button" app:layout_constraintBottom_toBottomOf="@+id/edit_button"
app:layout_constraintEnd_toStartOf="@+id/save_button" app:layout_constraintEnd_toStartOf="@+id/save_button"
@ -55,7 +55,7 @@
android:id="@+id/edit_button" android:id="@+id/edit_button"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:backgroundTint="@color/trackbook_transparent" android:backgroundTint="@color/default_transparent"
android:contentDescription="@string/descr_statistics_sheet_edit_button" android:contentDescription="@string/descr_statistics_sheet_edit_button"
app:layout_constraintBottom_toBottomOf="@+id/statistics_track_name_headline" app:layout_constraintBottom_toBottomOf="@+id/statistics_track_name_headline"
app:layout_constraintEnd_toStartOf="@+id/delete_button" app:layout_constraintEnd_toStartOf="@+id/delete_button"
@ -66,7 +66,7 @@
android:id="@+id/save_button" android:id="@+id/save_button"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:backgroundTint="@color/trackbook_transparent" android:backgroundTint="@color/default_transparent"
android:contentDescription="@string/descr_statistics_sheet_save_button" android:contentDescription="@string/descr_statistics_sheet_save_button"
android:visibility="visible" android:visibility="visible"
app:layout_constraintBottom_toBottomOf="@+id/statistics_track_name_headline" app:layout_constraintBottom_toBottomOf="@+id/statistics_track_name_headline"

33
app/src/main/res/values-night-v31/colors.xml
View file

@ -1,6 +1,37 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<!-- NIGHT THEME COLORS --> <!-- NIGHT THEME COLORS -->
<!-- app colors -->
<color name="app_window_background">@android:color/system_neutral1_900</color> <!-- android:colorBackground / colorSurface -->
<color name="status_bar_background">@android:color/system_neutral1_900</color> <!-- android:colorBackground / colorSurface -->
<color name="dialog_background">@android:color/system_neutral2_700</color> <!-- colorSurfaceVariant -->
<color name="app_onboarding_icons">@android:color/system_neutral1_100</color> <!-- colorOnBackground / colorOnSurface-->
<color name="toolbar_background">@android:color/system_neutral1_800</color> <!-- colorSurfaceInverse, Light Theme-->
<!-- bottom navigation -->
<color name="bottom_navigation_background">@android:color/system_neutral1_900</color> <!-- android:colorBackground / colorSurface -->
<color name="bottom_navigation_element">@android:color/system_neutral2_200</color> <!-- colorOnSurfaceVariant -->
<color name="bottom_navigation_element_selected">@android:color/system_accent1_200</color> <!-- colorPrimary -->
<!-- text & icons -->
<color name="text_default">@android:color/system_neutral1_100</color> <!-- colorOnBackground / colorOnSurface-->
<color name="text_lightweight">@android:color/system_neutral2_200</color> <!-- colorOnSurfaceVariant -->
<color name="text_outline_default">@android:color/system_neutral1_900</color> <!-- android:colorBackground / colorSurface -->
<color name="icon_default">@android:color/system_neutral1_100</color> <!-- colorOnBackground / colorOnSurface-->
<color name="icon_lightweight">@android:color/system_neutral2_200</color> <!-- colorOnSurfaceVariant -->
<color name="icon_star_selected">@android:color/system_accent1_200</color> <!-- colorPrimary -->
<color name="location_button_icon">@android:color/system_neutral1_100</color> <!-- colorOnBackground / colorOnSurface-->
<color name="location_button_background">@android:color/system_neutral1_900</color> <!-- android:colorBackground / colorSurface -->
<color name="recording_management_buttons_background">@android:color/system_accent1_200</color> <!-- colorPrimary -->
<color name="recording_management_buttons_icon">@android:color/system_accent1_800</color> <!-- colorOnPrimary -->
<!-- list -->
<color name="list_card_background">@android:color/system_neutral2_700</color> <!-- colorSurfaceVariant -->
<color name="list_card_delete_background">#fff2b8b5</color> <!-- colorError -->
<!-- statistics sheet -->
<color name="statistic_sheet_background">@android:color/system_neutral1_900</color> <!-- android:colorBackground / colorSurface -->
<color name="statistic_sheet_background_border">@android:color/system_neutral2_700</color> <!-- colorSurfaceVariant -->
</resources> </resources>

53
app/src/main/res/values-night/colors.xml
View file

@ -1,35 +1,36 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<!-- NIGHT THEME COLORS --> <!-- NIGHT THEME COLORS -->
<color name="app_window_background">@color/trackbook_neutral_very_dark</color> <!-- app colors -->
<color name="bottom_navigation_background">@color/trackbook_neutral_black</color> <color name="app_window_background">#ff1c1b1f</color> <!-- android:colorBackground / colorSurface -->
<color name="status_bar_background">@color/trackbook_neutral_black</color> <color name="status_bar_background">#ff1c1b1f</color> <!-- android:colorBackground / colorSurface -->
<color name="dialog_background">@color/trackbook_neutral_darker</color> <color name="dialog_background">#ff49454f</color> <!-- colorSurfaceVariant -->
<color name="app_onboarding_icons">#ffe6e1e5</color> <!-- colorOnBackground / colorOnSurface-->
<color name="toolbar_background">#ff313033</color> <!-- colorSurfaceInverse, Light Theme-->
<color name="bottom_navigation_element">@color/trackbook_neutral_medium_light</color> <!-- bottom navigation -->
<color name="bottom_navigation_element_selected">@color/trackbook_blue</color> <color name="bottom_navigation_background">#ff1c1b1f</color> <!-- android:colorBackground / colorSurface -->
<color name="bottom_navigation_element">#ffcac4d0</color> <!-- colorOnSurfaceVariant -->
<color name="bottom_navigation_element_selected">#ffd0bcff</color> <!-- colorPrimary -->
<color name="fab_button_card_text">@color/trackbook_neutral_white</color> <!-- text & icons -->
<color name="fab_button_card_background">@color/trackbook_neutral_darker</color> <color name="text_default">#ffe6e1e5</color> <!-- colorOnBackground / colorOnSurface-->
<color name="text_lightweight">#ffcac4d0</color> <!-- colorOnSurfaceVariant -->
<color name="text_outline_default">#ff1c1b1f</color> <!-- android:colorBackground / colorSurface -->
<color name="icon_default">#ffe6e1e5</color> <!-- colorOnBackground / colorOnSurface-->
<color name="icon_lightweight">#ffcac4d0</color> <!-- colorOnSurfaceVariant -->
<color name="icon_star_selected">#ffd0bcff</color> <!-- colorPrimary -->
<color name="location_button_icon">#ffe6e1e5</color> <!-- colorOnBackground / colorOnSurface-->
<color name="location_button_background">#ff1c1b1f</color> <!-- android:colorBackground / colorSurface -->
<color name="recording_management_buttons_background">#ffd0bcff</color> <!-- colorPrimary -->
<color name="recording_management_buttons_icon">#ff381e72</color> <!-- colorOnPrimary -->
<color name="location_button_icon">@color/trackbook_neutral_white</color> <!-- list -->
<color name="location_button_background">@color/trackbook_neutral_black</color> <color name="list_card_background">#ff49454f</color> <!-- colorSurfaceVariant -->
<color name="list_card_delete_background">#fff2b8b5</color> <!-- colorError -->
<color name="text_default">@color/trackbook_neutral_white</color>
<color name="text_lightweight">@color/trackbook_neutral_very_light</color>
<color name="text_outline_default">@color/trackbook_neutral_darker</color>
<color name="icon_default">@color/trackbook_neutral_white</color>
<color name="icon_lightweight">@color/trackbook_neutral_very_light</color>
<color name="icon_star_selected">@color/trackbook_blue</color>
<color name="list_card_background">@color/trackbook_neutral_darker</color>
<color name="list_card_delete_background">@color/trackbook_red</color>
<color name="statistic_sheet_background_expanded">@color/trackbook_black_85percent</color>
<color name="statistic_sheet_background_collapsed">@color/trackbook_neutral_black</color>
<color name="statistic_sheet_background_border">@color/trackbook_neutral_darker</color>
<!-- statistics sheet -->
<color name="statistic_sheet_background">#ff1c1b1f</color> <!-- android:colorBackground / colorSurface -->
<color name="statistic_sheet_background_border">#ff49454f</color> <!-- colorSurfaceVariant -->
</resources> </resources>

42
app/src/main/res/values-v31/colors.xml
View file

@ -1,23 +1,37 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<!-- DAY THEME COLORS --> <!-- DAY THEME COLORS -->
<!-- ADAPTIVE BASE COLORS - Android 12 - https://developer.android.com/reference/android/R.color#system_accent1_0 --> <!-- app colors -->
<color name="trackbook_neutral_dark">@android:color/system_neutral1_600</color> <color name="app_window_background">@android:color/system_neutral2_100</color> <!-- colorSurfaceVariant -->
<color name="trackbook_neutral_darker">@android:color/system_neutral1_800</color> <color name="status_bar_background">@android:color/system_neutral1_10</color> <!-- android:colorBackground / colorSurface -->
<color name="trackbook_neutral_very_dark">@android:color/system_neutral1_900</color> <color name="dialog_background">@android:color/system_neutral1_10</color> <!-- android:colorBackground / colorSurface -->
<color name="app_onboarding_icons">@android:color/system_neutral1_900</color> <!-- colorOnBackground / colorOnSurface-->
<color name="toolbar_background">@android:color/system_neutral1_10</color> <!-- android:colorBackground / colorSurface -->
<color name="trackbook_neutral_medium_light">@android:color/system_neutral1_300</color> <!-- bottom navigation -->
<color name="trackbook_neutral_light">@android:color/system_neutral1_100</color> <color name="bottom_navigation_background">@android:color/system_neutral1_10</color> <!-- android:colorBackground / colorSurface -->
<color name="trackbook_neutral_lighter">@android:color/system_neutral1_50</color> <color name="bottom_navigation_element">@android:color/system_neutral2_700</color> <!-- colorOnSurfaceVariant -->
<color name="trackbook_neutral_very_light">@android:color/system_neutral1_10</color> <color name="bottom_navigation_element_selected">@android:color/system_accent1_600</color> <!-- colorPrimary -->
<color name="trackbook_accent_intense">@android:color/system_accent1_100</color> <!-- colorPrimary - Light Theme --> <!-- text & icons -->
<color name="trackbook_accent_light">@android:color/system_accent1_50</color> <color name="text_default">@android:color/system_neutral1_900</color> <!-- colorOnBackground / colorOnSurface-->
<color name="trackbook_accent_dimmed">@android:color/system_accent1_600</color> <!-- colorSecondary - Light Theme --> <color name="text_lightweight">@android:color/system_neutral2_700</color> <!-- colorOnSurfaceVariant -->
<color name="text_outline_default">@android:color/system_neutral1_10</color> <!-- android:colorBackground / colorSurface -->
<color name="icon_default">@android:color/system_neutral1_900</color> <!-- colorOnBackground / colorOnSurface-->
<color name="icon_lightweight">@android:color/system_neutral2_700</color> <!-- colorOnSurfaceVariant -->
<color name="icon_star_selected">@android:color/system_accent1_600</color> <!-- colorPrimary -->
<color name="location_button_icon">@android:color/system_neutral1_900</color> <!-- colorOnBackground / colorOnSurface-->
<color name="location_button_background">@android:color/system_neutral1_10</color> <!-- android:colorBackground / colorSurface -->
<color name="recording_management_buttons_background">@android:color/system_accent1_600</color> <!-- colorPrimary -->
<color name="recording_management_buttons_icon">@android:color/system_neutral1_0</color> <!-- colorOnPrimary-->
<color name="trackbook_neutral_black">@android:color/system_neutral1_1000</color> <!-- list -->
<color name="trackbook_neutral_white">@android:color/system_neutral1_0</color> <color name="list_card_background">@android:color/system_neutral1_10</color> <!-- android:colorBackground / colorSurface -->
<color name="list_card_delete_background">#ffb3261e</color> <!-- colorError -->
<!-- statistics sheet -->
<color name="statistic_sheet_background">@android:color/system_neutral1_10</color> <!-- android:colorBackground / colorSurface -->
<color name="statistic_sheet_background_border">@android:color/system_neutral2_100</color> <!-- colorSurfaceVariant -->
</resources> </resources>

99
app/src/main/res/values/colors.xml
View file

@ -1,69 +1,52 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<!-- DAY THEME COLORS --> <!-- DAY THEME COLORS -->
<color name="app_window_background">@color/trackbook_neutral_very_light</color> <!-- app colors -->
<color name="bottom_navigation_background">@color/trackbook_neutral_white</color> <color name="app_window_background">#ffe7e0ec</color> <!-- colorSurfaceVariant -->
<color name="status_bar_background">@color/trackbook_neutral_white</color> <color name="status_bar_background">#fffffbfe</color> <!-- android:colorBackground / colorSurface -->
<color name="dialog_background">@color/trackbook_neutral_very_light</color> <color name="dialog_background">#fffffbfe</color> <!-- android:colorBackground / colorSurface -->
<color name="app_onboarding_icons">#ff1c1b1f</color> <!-- colorOnBackground / colorOnSurface-->
<color name="toolbar_background">#fffffbfe</color> <!-- android:colorBackground / colorSurface -->
<color name="bottom_navigation_element">@color/trackbook_neutral_medium_light</color> <!-- bottom navigation -->
<color name="bottom_navigation_element_selected">@color/trackbook_blue</color> <color name="bottom_navigation_background">#fffffbfe</color> <!-- android:colorBackground / colorSurface -->
<color name="bottom_navigation_element">#ff49454f</color> <!-- colorOnSurfaceVariant -->
<color name="bottom_navigation_element_selected">#ff6750a4</color> <!-- colorPrimary -->
<color name="fab_button_card_text">@color/trackbook_neutral_darker</color> <!-- text & icons -->
<color name="fab_button_card_background">@color/trackbook_neutral_white</color> <color name="text_default">#ff1c1b1f</color> <!-- colorOnBackground / colorOnSurface-->
<color name="text_lightweight">#ff49454f</color> <!-- colorOnSurfaceVariant -->
<color name="text_outline_default">#fffffbfe</color> <!-- android:colorBackground / colorSurface -->
<color name="icon_default">#ff1c1b1f</color> <!-- colorOnBackground / colorOnSurface-->
<color name="icon_lightweight">#ff49454f</color> <!-- colorOnSurfaceVariant -->
<color name="icon_star_selected">#ff6750a4</color> <!-- colorPrimary -->
<color name="location_button_icon">#ff1c1b1f</color> <!-- colorOnBackground / colorOnSurface-->
<color name="location_button_background">#fffffbfe</color> <!-- android:colorBackground / colorSurface -->
<color name="recording_management_buttons_background">#ff6750a4</color> <!-- colorPrimary -->
<color name="recording_management_buttons_icon">#ffffffff</color> <!-- colorOnPrimary-->
<color name="location_button_icon">@color/trackbook_neutral_dark</color> <!-- list -->
<color name="location_button_background">@color/trackbook_neutral_white</color> <color name="list_card_background">#fffffbfe</color> <!-- android:colorBackground / colorSurface -->
<color name="list_card_delete_background">#ffb3261e</color> <!-- colorError -->
<color name="text_default">@color/trackbook_neutral_darker</color> <!-- statistics sheet -->
<color name="text_lightweight">@color/trackbook_neutral_dark</color> <color name="statistic_sheet_background">#fffffbfe</color> <!-- android:colorBackground / colorSurface -->
<color name="text_outline_default">@color/trackbook_neutral_white</color> <color name="statistic_sheet_background_border">#ffe7e0ec</color> <!-- colorSurfaceVariant -->
<!-- DEFAULT COLORS -->
<color name="icon_default">@color/trackbook_neutral_dark</color> <color name="default_neutral_white">#ffffffff</color> <!-- system_accent1_0 -->
<color name="icon_lightweight">@color/trackbook_neutral_medium_light</color> <color name="default_neutral_lighter">#ffe6e1e5</color> <!-- system_neutral1_100 -->
<color name="icon_star_selected">@color/trackbook_blue</color> <color name="default_neutral_medium_light">#ff7d7d7d</color> <!-- system_neutral1_300 todo check -->
<color name="default_neutral_dark">#ff595959</color> <!-- system_neutral1_600 todo check-->
<color name="recording_management_buttons_background">@color/trackbook_accent_intense</color> <color name="default_neutral_darker">#ff1c1b1f</color> <!-- system_neutral1_900-->
<color name="recording_management_buttons_icon">@color/trackbook_neutral_very_dark</color> <!-- transparency -->
<color name="default_neutral_lighter_85percent">#d9e6e1e5</color> <!-- 85% system_neutral1_100 -->
<color name="list_card_background">@color/trackbook_neutral_white</color> <color name="default_neutral_darker_85percent">#d91c1b1f</color> <!-- 85% system_neutral1_900 -->
<color name="list_card_delete_background">@color/trackbook_red</color> <color name="default_transparent">#00ffffff</color>
<color name="default_red">#FFDC3D33</color> <!-- Slightly muted variant of -> Material Design 2: Red 600 -->
<color name="statistic_sheet_background_expanded">@color/trackbook_white_85percent</color> <color name="default_red_dark">#FFCA2D23</color>
<color name="statistic_sheet_background_collapsed">@color/trackbook_neutral_white</color> <color name="default_blue">#FF3C98DB</color>
<color name="statistic_sheet_background_border">@color/trackbook_neutral_light</color> <color name="default_green">#FF4CAF50</color>
<!-- BASE COLOR NAMES -->
<color name="trackbook_neutral_dark">#FF595959</color> <!-- derived from recommended dark theme surface color -->
<color name="trackbook_neutral_darker">#FF414141</color>
<color name="trackbook_neutral_very_dark">#FF2D2D2D</color>
<color name="trackbook_neutral_medium_light">#FF7D7D7D</color>
<color name="trackbook_neutral_light">#FFDADADA</color>
<color name="trackbook_neutral_lighter">#FFF2F2F2</color>
<color name="trackbook_neutral_very_light">#FFFAFAFA</color>
<color name="trackbook_accent_intense">#FFEADDFF</color> <!-- colorPrimary - Light Theme -->
<color name="trackbook_accent_light">#FFF4EEFF</color>
<color name="trackbook_accent_dimmed">#FF625b71</color> <!-- colorSecondary - Light Theme -->
<color name="trackbook_neutral_black">#FF121212</color> <!-- Material Design recommended dark theme surface color -->
<color name="trackbook_neutral_white">#FFFFFFFF</color>
<color name="trackbook_red">#FFDC3D33</color> <!-- Slightly muted variant of -> Material Design 2: Red 600 -->
<color name="trackbook_red_dark">#FFCA2D23</color>
<color name="trackbook_transparent">#00ffffff</color>
<color name="trackbook_blue">#FF3C98DB</color>
<color name="trackbook_green">#FF4CAF50</color>
<color name="trackbook_white_85percent">#D9FFFFFF</color>
<color name="trackbook_black_85percent">#D9121212</color>
</resources> </resources>

4
app/src/main/res/values/styles.xml
View file

@ -3,6 +3,10 @@
<!-- Base application theme. --> <!-- Base application theme. -->
<style name="AppTheme" parent="Theme.Material3.DayNight.NoActionBar"> <style name="AppTheme" parent="Theme.Material3.DayNight.NoActionBar">
<!-- colorPrimary is used in dialog buttons for example -->
<item name="colorPrimary">@color/default_neutral_darker</item>
<!-- Do not use primary colored elevation overlays to present a visual hierarchy - TO COLORFUL --> <!-- Do not use primary colored elevation overlays to present a visual hierarchy - TO COLORFUL -->
<item name="elevationOverlayEnabled">false</item> <item name="elevationOverlayEnabled">false</item>