diff --git a/app/build.gradle b/app/build.gradle
index 0178e2b..f5c6a7a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -58,17 +58,17 @@ dependencies {
// AndroidX
def navigationVersion = "2.3.5"
- implementation "androidx.activity:activity-ktx:1.3.1"
- implementation 'androidx.appcompat:appcompat:1.3.1'
- implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
- implementation 'androidx.core:core-ktx:1.6.0'
+ implementation "androidx.activity:activity-ktx:1.4.0"
+ implementation 'androidx.appcompat:appcompat:1.4.0'
+ implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
+ implementation 'androidx.core:core-ktx:1.7.0'
implementation "androidx.navigation:navigation-fragment-ktx:$navigationVersion"
implementation "androidx.navigation:navigation-ui-ktx:$navigationVersion"
implementation 'androidx.preference:preference-ktx:1.1.1'
- implementation 'com.google.android.material:material:1.4.0'
+ implementation 'com.google.android.material:material:1.6.0-alpha01'
// Gson
- implementation 'com.google.code.gson:gson:2.8.8'
+ implementation 'com.google.code.gson:gson:2.8.9'
// OpenStreetMap
implementation 'org.osmdroid:osmdroid-android:6.1.11'
diff --git a/app/src/main/java/org/y20k/trackbook/Trackbook.kt b/app/src/main/java/org/y20k/trackbook/Trackbook.kt
index ca70c6e..29a09eb 100644
--- a/app/src/main/java/org/y20k/trackbook/Trackbook.kt
+++ b/app/src/main/java/org/y20k/trackbook/Trackbook.kt
@@ -19,6 +19,7 @@
package org.y20k.trackbook
import android.app.Application
+import com.google.android.material.color.DynamicColors
import org.y20k.trackbook.helpers.AppThemeHelper
import org.y20k.trackbook.helpers.LogHelper
import org.y20k.trackbook.helpers.PreferencesHelper
@@ -39,6 +40,7 @@ class Trackbook: Application() {
override fun onCreate() {
super.onCreate()
LogHelper.v(TAG, "Trackbook application started.")
+ DynamicColors.applyToActivitiesIfAvailable(this);
// initialize single sharedPreferences object when app is launched
initPreferences()
// set Dark / Light theme state
diff --git a/app/src/main/java/org/y20k/trackbook/TrackerService.kt b/app/src/main/java/org/y20k/trackbook/TrackerService.kt
index 097145b..c74cd34 100644
--- a/app/src/main/java/org/y20k/trackbook/TrackerService.kt
+++ b/app/src/main/java/org/y20k/trackbook/TrackerService.kt
@@ -168,6 +168,7 @@ class TrackerService: Service(), SensorEventListener {
if (trackingState == Keys.STATE_TRACKING_ACTIVE) stopTracking()
// remove notification
stopForeground(true)
+ notificationManager.cancel(Keys.TRACKER_SERVICE_NOTIFICATION_ID) // this call was not necessary prior to Android 12
// stop listening for changes in shared preferences
PreferencesHelper.unregisterPreferenceChangeListener(
sharedPreferenceChangeListener
@@ -268,6 +269,7 @@ class TrackerService: Service(), SensorEventListener {
trackingState = Keys.STATE_TRACKING_NOT
PreferencesHelper.saveTrackingState(trackingState)
stopForeground(true)
+ notificationManager.cancel(Keys.TRACKER_SERVICE_NOTIFICATION_ID) // this call was not necessary prior to Android 12
}
diff --git a/app/src/main/java/org/y20k/trackbook/dialogs/RenameTrackDialog.kt b/app/src/main/java/org/y20k/trackbook/dialogs/RenameTrackDialog.kt
index 542f3f2..4fb92b2 100644
--- a/app/src/main/java/org/y20k/trackbook/dialogs/RenameTrackDialog.kt
+++ b/app/src/main/java/org/y20k/trackbook/dialogs/RenameTrackDialog.kt
@@ -45,7 +45,7 @@ class RenameTrackDialog (private var renameTrackListener: RenameTrackListener) {
/* Construct and show dialog */
fun show(context: Context, trackName: String) {
// prepare dialog builder
- val builder: MaterialAlertDialogBuilder = MaterialAlertDialogBuilder(context)
+ val builder: MaterialAlertDialogBuilder = MaterialAlertDialogBuilder(context, R.style.AlertDialogTheme)
// get input field
val inflater = LayoutInflater.from(context)
diff --git a/app/src/main/java/org/y20k/trackbook/ui/MapFragmentLayoutHolder.kt b/app/src/main/java/org/y20k/trackbook/ui/MapFragmentLayoutHolder.kt
index 1b51066..273f41f 100644
--- a/app/src/main/java/org/y20k/trackbook/ui/MapFragmentLayoutHolder.kt
+++ b/app/src/main/java/org/y20k/trackbook/ui/MapFragmentLayoutHolder.kt
@@ -186,15 +186,15 @@ data class MapFragmentLayoutHolder(private var context: Context, private var mar
fun updateRecordingButton(trackingState: Int) {
when (trackingState) {
Keys.STATE_TRACKING_NOT -> {
- recordingButton.setImageResource(R.drawable.ic_fiber_manual_record_white_24dp)
+ recordingButton.setImageResource(R.drawable.ic_fiber_manual_record_inactive_24dp)
recordingButtonSubMenu.isGone = true
}
Keys.STATE_TRACKING_ACTIVE -> {
- recordingButton.setImageResource(R.drawable.ic_fiber_manual_record_red_24dp)
+ recordingButton.setImageResource(R.drawable.ic_fiber_manual_record_active_24dp)
recordingButtonSubMenu.isGone = true
}
Keys.STATE_TRACKING_STOPPED -> {
- recordingButton.setImageResource(R.drawable.ic_save_white_24dp)
+ recordingButton.setImageResource(R.drawable.ic_save_24dp)
}
}
}
diff --git a/app/src/main/res/drawable/ic_clear_white_24dp.xml b/app/src/main/res/drawable/ic_clear_24dp.xml
similarity index 85%
rename from app/src/main/res/drawable/ic_clear_white_24dp.xml
rename to app/src/main/res/drawable/ic_clear_24dp.xml
index 27ca255..ab1ca32 100755
--- a/app/src/main/res/drawable/ic_clear_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_clear_24dp.xml
@@ -5,5 +5,5 @@
android:viewportHeight="24.0">
+ android:fillColor="@color/recording_button_icon" />
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 df07973..5cff9e5 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_fiber_manual_record_red_24dp.xml b/app/src/main/res/drawable/ic_fiber_manual_record_active_24dp.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_fiber_manual_record_red_24dp.xml
rename to app/src/main/res/drawable/ic_fiber_manual_record_active_24dp.xml
diff --git a/app/src/main/res/drawable/ic_fiber_manual_record_white_24dp.xml b/app/src/main/res/drawable/ic_fiber_manual_record_inactive_24dp.xml
similarity index 82%
rename from app/src/main/res/drawable/ic_fiber_manual_record_white_24dp.xml
rename to app/src/main/res/drawable/ic_fiber_manual_record_inactive_24dp.xml
index d734aef..dac3cd5 100755
--- a/app/src/main/res/drawable/ic_fiber_manual_record_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_fiber_manual_record_inactive_24dp.xml
@@ -5,5 +5,5 @@
android:viewportHeight="24.0">
+ android:fillColor="@color/recording_button_icon" />
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 95a2828..e45a2d9 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
@@ -8,6 +8,6 @@
android:fillColor="@color/trackbook_blue"
android:pathData="M48,48m-48,0a48,48 0,1 1,96 0a48,48 0,1 1,-96 0"/>
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 b470e56..a0cd6c9 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
@@ -8,6 +8,6 @@
android:fillColor="@color/trackbook_red"
android:pathData="M48,48m-48,0a48,48 0,1 1,96 0a48,48 0,1 1,-96 0"/>
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 079ca2b..167fd8a 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_notebook_black_24dp.xml b/app/src/main/res/drawable/ic_notebook_black_24dp.xml
index d3d8e2a..a2fa8cc 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 f1017e0..3039151 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 4c1ec9c..06afdcc 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 cecebba..7ba08f2 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_stopped_48dp.xml b/app/src/main/res/drawable/ic_notification_icon_large_tracking_stopped_48dp.xml
index 7d270c1..4e00800 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
@@ -7,6 +7,6 @@
android:fillColor="@color/trackbook_blue"
android:pathData="M96,96m-96,0a96,96 0,1 1,192 0a96,96 0,1 1,-192 0"/>
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 e481483..ead54bc 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 31439c3..32936e2 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_save_24dp.xml b/app/src/main/res/drawable/ic_save_24dp.xml
index 14e3ad6..6a82063 100644
--- a/app/src/main/res/drawable/ic_save_24dp.xml
+++ b/app/src/main/res/drawable/ic_save_24dp.xml
@@ -1,9 +1,9 @@
-
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+
diff --git a/app/src/main/res/drawable/ic_save_to_storage_24dp.xml b/app/src/main/res/drawable/ic_save_to_storage_24dp.xml
new file mode 100644
index 0000000..14e3ad6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_save_to_storage_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_save_white_24dp.xml b/app/src/main/res/drawable/ic_save_white_24dp.xml
deleted file mode 100755
index 1f1ec00..0000000
--- a/app/src/main/res/drawable/ic_save_white_24dp.xml
+++ /dev/null
@@ -1,9 +0,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 48597cc..dccef4a 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/selector_bottom_navigation.xml b/app/src/main/res/drawable/selector_bottom_navigation.xml
index 1c4350c..abd6c3c 100755
--- a/app/src/main/res/drawable/selector_bottom_navigation.xml
+++ b/app/src/main/res/drawable/selector_bottom_navigation.xml
@@ -1,5 +1,9 @@
-
-
+
+
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 39039c1..4179584 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -7,7 +7,7 @@
android:layout_height="match_parent"
tools:context=".MainActivity">
-
+ app:srcCompat="@drawable/ic_save_24dp"
+ app:tint="@color/recording_button_icon" />
@@ -79,30 +80,29 @@
android:clickable="true"
android:contentDescription="@string/descr_fab_sub_menu_button_clear"
android:focusable="true"
- app:backgroundTint="@color/trackbook_blue"
+ app:backgroundTint="@color/recording_button_background"
app:fabSize="mini"
app:layout_constraintBottom_toTopOf="@+id/fab_sub_menu_button_resume"
app:layout_constraintEnd_toEndOf="@+id/fab_sub_menu_button_resume"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="@+id/fab_sub_menu_button_resume"
- app:srcCompat="@drawable/ic_clear_white_24dp"
- app:tint="@color/trackbook_white" />
+ app:srcCompat="@drawable/ic_clear_24dp"
+ app:tint="@color/recording_button_icon" />
+ app:srcCompat="@drawable/ic_fiber_manual_record_inactive_24dp"
+ app:tint="@color/recording_button_icon" />
@@ -193,6 +192,7 @@
android:layout_marginStart="16dp"
android:layout_marginBottom="16dp"
android:clickable="true"
+ android:contentDescription="@string/descr_fab_location"
android:focusable="true"
android:src="@drawable/ic_current_location_24dp"
app:backgroundTint="@color/location_button_background"
diff --git a/app/src/main/res/layout/track_statistics.xml b/app/src/main/res/layout/track_statistics.xml
index 3f898c6..34a390c 100755
--- a/app/src/main/res/layout/track_statistics.xml
+++ b/app/src/main/res/layout/track_statistics.xml
@@ -71,7 +71,7 @@
app:layout_constraintBottom_toBottomOf="@+id/statistics_track_name_headline"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/statistics_track_name_headline"
- app:srcCompat="@drawable/ic_save_24dp" />
+ app:srcCompat="@drawable/ic_save_to_storage_24dp" />
+
+
+
+
+
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index bb77abe..72fe9ad 100755
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -3,30 +3,31 @@
- @color/trackbook_grey_darker
+ @color/trackbook_neutral_very_dark
+ @color/trackbook_neutral_black
+ @color/trackbook_neutral_darker
- @color/trackbook_black
- @color/trackbook_grey_light
+ @color/trackbook_neutral_medium_light
@color/trackbook_blue
- @color/trackbook_white
- @color/trackbook_grey_dark
+ @color/trackbook_neutral_white
+ @color/trackbook_neutral_darker
- @color/trackbook_white
- @color/trackbook_black
+ @color/trackbook_neutral_white
+ @color/trackbook_neutral_black
- @color/trackbook_white
- @color/trackbook_grey_very_light
+ @color/trackbook_neutral_white
+ @color/trackbook_neutral_very_light
- @color/trackbook_white
- @color/trackbook_grey_very_light
+ @color/trackbook_neutral_white
+ @color/trackbook_neutral_very_light
@color/trackbook_blue
- @color/trackbook_grey_dark
+ @color/trackbook_neutral_darker
@color/trackbook_red
@color/trackbook_black_85percent
- @color/trackbook_black
- @color/trackbook_grey_dark
+ @color/trackbook_neutral_black
+ @color/trackbook_neutral_darker
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index 3d8a687..10d25fe 100755
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -2,14 +2,9 @@
-
diff --git a/app/src/main/res/values-v31/colors.xml b/app/src/main/res/values-v31/colors.xml
new file mode 100644
index 0000000..a76990f
--- /dev/null
+++ b/app/src/main/res/values-v31/colors.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+ @android:color/system_neutral1_600
+ @android:color/system_neutral1_800
+ @android:color/system_neutral1_900
+
+ @android:color/system_neutral1_300
+ @android:color/system_neutral1_100
+ @android:color/system_neutral1_50
+ @android:color/system_neutral1_10
+
+ @android:color/system_accent1_100
+ @android:color/system_accent1_50
+ @android:color/system_accent1_600
+
+ @android:color/system_neutral1_1000
+ @android:color/system_neutral1_0
+
+
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 0faeba3..5e2ab01 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -3,49 +3,59 @@
- @color/trackbook_grey_very_light
- @color/trackbook_white
+ @color/trackbook_neutral_very_light
+ @color/trackbook_neutral_white
+ @color/trackbook_neutral_very_light
- @color/trackbook_grey_light
+ @color/trackbook_neutral_medium_light
@color/trackbook_blue
- @color/trackbook_grey_dark
- @color/trackbook_white
+ @color/trackbook_neutral_darker
+ @color/trackbook_neutral_white
- @color/trackbook_grey
- @color/trackbook_white
+ @color/trackbook_neutral_dark
+ @color/trackbook_neutral_white
- @color/trackbook_grey_dark
- @color/trackbook_grey
+ @color/trackbook_neutral_darker
+ @color/trackbook_neutral_dark
- @color/trackbook_grey
- @color/trackbook_grey_light
+ @color/trackbook_neutral_dark
+ @color/trackbook_neutral_medium_light
@color/trackbook_blue
- @color/trackbook_white
+ @color/trackbook_accent_intense
+ @color/trackbook_neutral_very_dark
+
+ @color/trackbook_neutral_white
@color/trackbook_red
@color/trackbook_white_85percent
- @color/trackbook_white
- @color/trackbook_grey_lighter
+ @color/trackbook_neutral_white
+ @color/trackbook_neutral_light
-
- #FF595959
- #FF7D7D7D
- #FFDADADA
- #FFF2F2F2
- #FF414141
- #FF2D2D2D
+
+ #FF595959
+ #FF414141
+ #FF2D2D2D
+
+ #FF7D7D7D
+ #FFDADADA
+ #FFF2F2F2
+ #FFFAFAFA
+
+ #FFEADDFF
+ #FFF4EEFF
+ #FF625b71
+
+ #FF121212
+ #FFFFFFFF
#FFDC3D33
#FFCA2D23
- #FF121212
- #FFFFFFFF
#00ffffff
-
#FF3C98DB
#FF4CAF50
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 18a5c15..859ae04 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -113,9 +113,10 @@
Mapping of current track
Mapping of last track
Start recording button
- Save button
- Clear button
- Resume button
+ Save recording
+ Clear recording
+ Resume recording
+ Center on current location
Mark as starred button
Start Recording
Stop Recording
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 724e360..fe69fc1 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -2,29 +2,17 @@
-
-
-
-
-
-
diff --git a/build.gradle b/build.gradle
index f77b3fb..37ebfc8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@
buildscript {
ext {
- kotlin_version = '1.5.31'
+ kotlin_version = '1.6.10'
navigation_version = '2.3.3'
}
repositories {
@@ -10,7 +10,7 @@ buildscript {
mavenCentral()
}
dependencies {
- classpath 'com.android.tools.build:gradle:7.0.3'
+ classpath 'com.android.tools.build:gradle:7.0.4'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$navigation_version"