From dc38bfecc191d7031d51a9ca0b3b01a32965d40e Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Mon, 12 Jun 2023 14:19:44 +0200
Subject: [PATCH 01/60] Migrate all dialogs to Material Design 3

---
 .../transportr/TransportrApplication.kt       |  3 ++
 .../locations/SpecialLocationFragment.kt      |  4 --
 .../grobox/transportr/map/DrawerActivity.kt   |  2 +-
 .../de/grobox/transportr/map/MapActivity.java |  2 +-
 .../grobox/transportr/ui/TimeDateFragment.kt  | 29 ++++++++-----
 .../transportr/ui/TransportrChangeLog.kt      | 42 ++++++++++++++++---
 .../main/res/layout/fragment_time_date.xml    | 13 +++---
 app/src/main/res/values-night/themes.xml      |  9 ----
 app/src/main/res/values/themes.xml            | 28 +------------
 9 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/app/src/main/java/de/grobox/transportr/TransportrApplication.kt b/app/src/main/java/de/grobox/transportr/TransportrApplication.kt
index 5e69126ca..91f92d6f6 100644
--- a/app/src/main/java/de/grobox/transportr/TransportrApplication.kt
+++ b/app/src/main/java/de/grobox/transportr/TransportrApplication.kt
@@ -19,6 +19,7 @@
 package de.grobox.transportr
 
 import android.app.Application
+import com.google.android.material.color.DynamicColors
 import com.mapbox.mapboxsdk.Mapbox
 import com.mapbox.services.android.telemetry.MapboxTelemetry
 
@@ -27,6 +28,8 @@ open class TransportrApplication : Application() {
         private set
 
     override fun onCreate() {
+        // TODO DynamicColors.applyToActivitiesIfAvailable(this)
+
         super.onCreate()
 
         Mapbox.getInstance(
diff --git a/app/src/main/java/de/grobox/transportr/favorites/locations/SpecialLocationFragment.kt b/app/src/main/java/de/grobox/transportr/favorites/locations/SpecialLocationFragment.kt
index c32d4e169..dfed216bc 100644
--- a/app/src/main/java/de/grobox/transportr/favorites/locations/SpecialLocationFragment.kt
+++ b/app/src/main/java/de/grobox/transportr/favorites/locations/SpecialLocationFragment.kt
@@ -62,10 +62,6 @@ abstract class SpecialLocationFragment : DialogFragment(), LocationView.Location
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         inject((activity!!.application as TransportrApplication).component)
-        setStyle(
-            STYLE_NO_TITLE,
-            R.style.SetHomeDialogTheme
-        )
     }
 
     protected abstract fun inject(component: AppComponent)
diff --git a/app/src/main/java/de/grobox/transportr/map/DrawerActivity.kt b/app/src/main/java/de/grobox/transportr/map/DrawerActivity.kt
index e41367845..7a60d88b0 100644
--- a/app/src/main/java/de/grobox/transportr/map/DrawerActivity.kt
+++ b/app/src/main/java/de/grobox/transportr/map/DrawerActivity.kt
@@ -88,7 +88,7 @@ internal abstract class DrawerActivity : TransportrActivity() {
                 },
                 DividerDrawerItem(),
                 getDrawerItem(R.string.drawer_changelog, R.drawable.ic_action_changelog) {
-                    TransportrChangeLog(this, settingsManager).fullLogDialog.show()
+                    TransportrChangeLog(this, settingsManager).getMaterialDialog(true).show()
                 },
                 getDrawerItem(R.string.drawer_contributors, R.drawable.ic_people) {
                     val intent = Intent(this, ContributorsActivity::class.java)
diff --git a/app/src/main/java/de/grobox/transportr/map/MapActivity.java b/app/src/main/java/de/grobox/transportr/map/MapActivity.java
index f8fd7c38d..ca67b2f07 100644
--- a/app/src/main/java/de/grobox/transportr/map/MapActivity.java
+++ b/app/src/main/java/de/grobox/transportr/map/MapActivity.java
@@ -236,7 +236,7 @@ protected void onNewIntent(Intent intent) {
 	private void checkAndShowChangelog() {
 		TransportrChangeLog cl = new TransportrChangeLog(this, getSettingsManager());
 		if (cl.isFirstRun() && !cl.isFirstRunEver()) {
-			cl.getLogDialog().show();
+			cl.getMaterialDialog(cl.isFirstRunEver()).show();
 		}
 	}
 
diff --git a/app/src/main/java/de/grobox/transportr/ui/TimeDateFragment.kt b/app/src/main/java/de/grobox/transportr/ui/TimeDateFragment.kt
index 0ded2f25e..b4e5f6f11 100755
--- a/app/src/main/java/de/grobox/transportr/ui/TimeDateFragment.kt
+++ b/app/src/main/java/de/grobox/transportr/ui/TimeDateFragment.kt
@@ -19,25 +19,24 @@
 
 package de.grobox.transportr.ui
 
-import android.app.DatePickerDialog
-import android.app.DatePickerDialog.OnDateSetListener
+import android.app.Dialog
 import android.os.Bundle
 import android.text.format.DateFormat.getDateFormat
 import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
 import android.view.ViewGroup
-import android.widget.DatePicker
 import android.widget.TimePicker
 import android.widget.TimePicker.OnTimeChangedListener
 import androidx.fragment.app.DialogFragment
+import com.google.android.material.datepicker.MaterialDatePicker
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import de.grobox.transportr.R
 import kotlinx.android.synthetic.main.fragment_time_date.*
 import java.util.*
 import java.util.Calendar.*
 
-class TimeDateFragment : DialogFragment(), OnDateSetListener, OnTimeChangedListener {
-
+class TimeDateFragment : DialogFragment(), OnTimeChangedListener {
     private var listener: TimeDateListener? = null
     private var departure: Boolean? = null // null means no departure/arrival selection will be possible
     private lateinit var calendar: Calendar
@@ -61,6 +60,11 @@ class TimeDateFragment : DialogFragment(), OnDateSetListener, OnTimeChangedListe
         }
     }
 
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        return MaterialAlertDialogBuilder(requireContext())
+            .show()
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -88,8 +92,13 @@ class TimeDateFragment : DialogFragment(), OnDateSetListener, OnTimeChangedListe
 
         // Date
         dateView.setOnClickListener {
-            DatePickerDialog(context!!, this@TimeDateFragment, calendar.get(YEAR), calendar.get(MONTH), calendar.get(DAY_OF_MONTH))
-                    .show()
+            MaterialDatePicker.Builder.datePicker()
+                .setSelection(calendar.timeInMillis)
+                .build()
+                .apply {
+                    addOnPositiveButtonClickListener(this@TimeDateFragment::onDateSet)
+                }
+                .show(childFragmentManager, null)
         }
         showDate(calendar)
 
@@ -149,10 +158,8 @@ class TimeDateFragment : DialogFragment(), OnDateSetListener, OnTimeChangedListe
         calendar.set(MINUTE, minute)
     }
 
-    override fun onDateSet(datePicker: DatePicker, year: Int, month: Int, day: Int) {
-        calendar.set(YEAR, year)
-        calendar.set(MONTH, month)
-        calendar.set(DAY_OF_MONTH, day)
+    private fun onDateSet(timeInMillis: Long) {
+        calendar.timeInMillis = timeInMillis
         showDate(calendar)
     }
 
diff --git a/app/src/main/java/de/grobox/transportr/ui/TransportrChangeLog.kt b/app/src/main/java/de/grobox/transportr/ui/TransportrChangeLog.kt
index 11c61b7e5..36bb3b675 100644
--- a/app/src/main/java/de/grobox/transportr/ui/TransportrChangeLog.kt
+++ b/app/src/main/java/de/grobox/transportr/ui/TransportrChangeLog.kt
@@ -20,28 +20,58 @@
 package de.grobox.transportr.ui
 
 import android.content.Context
-import android.os.Build
-import android.view.ContextThemeWrapper
-
+import android.graphics.Color
+import android.webkit.WebView
+import androidx.appcompat.app.AlertDialog
+import com.google.android.material.color.MaterialColors
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import de.cketti.library.changelog.ChangeLog
 import de.grobox.transportr.R
 import de.grobox.transportr.settings.SettingsManager
 
 
 class TransportrChangeLog(context: Context, settingsManager: SettingsManager) : ChangeLog(
-    ContextThemeWrapper(context, R.style.DialogTheme),
+    context,
     settingsManager.settings,
     theme(settingsManager.isDarkTheme)
 ) {
+    fun getMaterialDialog(full: Boolean): AlertDialog {
+        val wv = WebView(mContext)
+        wv.setBackgroundColor(Color.TRANSPARENT)
+        wv.loadDataWithBaseURL(null, getLog(full), "text/html", "UTF-8", null)
+
+        val builder = MaterialAlertDialogBuilder(mContext)
+        builder.setTitle(
+            mContext.resources.getString(
+                if (full) R.string.changelog_full_title else R.string.changelog_title
+            )
+        )
+            .setView(wv)
+            .setCancelable(false)
+            .setPositiveButton(
+                mContext.resources.getString(R.string.changelog_ok_button)
+            ) { _, _ ->
+                updateVersionInPreferences()
+            }
+
+        if (!full) {
+            builder.setNegativeButton(
+                R.string.changelog_show_full
+            ) { _, _ -> getMaterialDialog(true) }
+        }
+
+        return builder.create()
+    }
+
     companion object {
 
         private fun theme(dark: Boolean): String {
             return if (dark) {
                 // material dark
-                "body { color: #f3f3f3; font-size: 0.9em; background-color: #424242; } h1 { font-size: 1.3em; } ul { padding-left: 2em; }"
+                "body { color: #f3f3f3; font-size: 0.9em; } h1 { font-size: 1.3em; } ul { padding-left: 2em; }"
             } else {
                 // material light
-                "body { color: #202020; font-size: 0.9em; background-color: transparent; } h1 { font-size: 1.3em; } ul { padding-left: 2em; }"
+                "body { color: #202020; font-size: 0.9em; } h1 { font-size: 1.3em; } ul { padding-left: 2em; }"
             }
         }
 
diff --git a/app/src/main/res/layout/fragment_time_date.xml b/app/src/main/res/layout/fragment_time_date.xml
index 1d6ba4a49..9a521dc1b 100644
--- a/app/src/main/res/layout/fragment_time_date.xml
+++ b/app/src/main/res/layout/fragment_time_date.xml
@@ -7,7 +7,8 @@
 
 	<androidx.constraintlayout.widget.ConstraintLayout
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content">
+		android:layout_height="wrap_content"
+		android:paddingBottom="16dp">
 
 		<TimePicker
 			android:id="@+id/timePicker"
@@ -86,11 +87,9 @@
 
 		<Button
 			android:id="@+id/cancelButton"
-			style="@style/Widget.AppCompat.Button.Borderless.Colored"
+			style="@style/Widget.Material3.Button.TextButton"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_marginEnd="8dp"
-			android:layout_marginRight="8dp"
 			android:text="@string/cancel"
 			app:layout_constraintBottom_toBottomOf="@+id/okButton"
 			app:layout_constraintRight_toLeftOf="@+id/nowButton"
@@ -98,11 +97,9 @@
 
 		<Button
 			android:id="@+id/nowButton"
-			style="@style/Widget.AppCompat.Button.Borderless.Colored"
+			style="@style/Widget.Material3.Button.TextButton"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_marginEnd="8dp"
-			android:layout_marginRight="8dp"
 			android:text="@string/now"
 			app:layout_constraintBottom_toBottomOf="@+id/okButton"
 			app:layout_constraintRight_toLeftOf="@+id/okButton"
@@ -110,7 +107,7 @@
 
 		<Button
 			android:id="@+id/okButton"
-			style="@style/Widget.AppCompat.Button.Borderless.Colored"
+			style="@style/Widget.Material3.Button.TextButton"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_marginTop="16dp"
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 13cf411b2..64a13c3a5 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -28,13 +28,4 @@
 		<item name="material_drawer_header_selection_text">@color/material_drawer_dark_header_selection_text</item>
 	</style>
 
-	<style name="DialogDayNightTheme" parent="DialogBaseTheme">
-		<!-- Fix for broken background on ALL devices -->
-		<item name="android:windowBackground">@color/md_grey_800</item>
-	</style>
-
-	<style name="SetHomeDialogTheme" parent="DialogTheme">
-		<item name="colorControlNormal">@color/drawableTintDark</item>
-	</style>
-
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index d21281ec3..eb35ca606 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -3,7 +3,7 @@
 
     <!-- App Theme -->
 
-    <style name="AppBaseTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
+    <style name="AppBaseTheme" parent="Theme.Material3.DayNight.NoActionBar">
         <item name="colorPrimary">@color/primary</item>
         <item name="colorPrimaryDark">@color/primary_dark</item>
         <item name="colorAccent">@color/accent</item>
@@ -11,9 +11,6 @@
         <item name="android:windowAnimationStyle">@style/ActivityAnimation</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
         <item name="windowActionModeOverlay">true</item>
-        <item name="android:dialogTheme">@style/DialogTheme</item>
-        <item name="android:alertDialogTheme">@style/DialogTheme</item>
-        <item name="popupTheme">@style/ThemeOverlay.AppCompat.DayNight</item>
     </style>
 
     <style name="AppDayNightTheme" parent="AppBaseTheme">
@@ -36,27 +33,6 @@
         <item name="material_drawer_legacy_style">false</item> <!-- Enables legacy Material 1 style -->
     </style>
 
-    <style name="AppTheme" parent="AppDayNightTheme">
-    </style>
-
-    <!-- Dialog Theme -->
-    <style name="DialogBaseTheme" parent="Theme.AppCompat.DayNight.Dialog">
-        <item name="colorPrimary">@color/primary</item>
-        <item name="colorPrimaryDark">@color/primary_dark</item>
-        <item name="colorAccent">@color/accent</item>
-        <item name="android:windowAnimationStyle">@style/DialogAnimation</item>
-    </style>
-
-    <style name="DialogDayNightTheme" parent="DialogBaseTheme">
-    </style>
-
-    <style name="DialogTheme" parent="DialogDayNightTheme">
-    </style>
-
-
-    <!-- Dialog Theme without transparent window -->
-    <style name="SetHomeDialogTheme" parent="DialogTheme">
-        <item name="colorControlNormal">@color/drawableTintLight</item>
-    </style>
+    <style name="AppTheme" parent="AppDayNightTheme" />
 
 </resources>

From ca55a4e41de0d299ae292dbc190e1446ae892d9a Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Mon, 12 Jun 2023 15:53:34 +0200
Subject: [PATCH 02/60] Migrate colors and list items to Material design 3

---
 .../transportr/TransportrApplication.kt       |  2 +-
 .../departures/DepartureViewHolder.kt         | 19 ++++---
 .../transportr/trips/detail/LegViewHolder.kt  |  9 ++-
 .../transportr/trips/detail/TripDrawer.kt     |  6 +-
 .../transportr/trips/search/TripsFragment.kt  |  7 ++-
 .../transportr/utils/OnboardingBuilder.kt     |  6 +-
 app/src/main/res/color/selector_highlight.xml |  2 +-
 .../main/res/drawable/ic_action_calendar.xml  |  1 +
 .../ic_action_content_content_copy.xml        |  1 +
 .../res/drawable/ic_action_departures.xml     |  1 +
 .../res/drawable/ic_action_external_map.xml   |  1 +
 .../drawable/ic_action_navigation_refresh.xml |  1 +
 ...ic_action_navigation_unfold_more_white.xml |  1 +
 .../main/res/drawable/ic_action_settings.xml  |  1 +
 .../res/drawable/ic_action_social_share.xml   |  1 +
 app/src/main/res/drawable/ic_action_star.xml  |  1 +
 app/src/main/res/drawable/ic_add_shortcut.xml |  1 +
 app/src/main/res/drawable/ic_delete.xml       |  1 +
 .../main/res/drawable/ic_menu_directions.xml  |  1 +
 .../res/drawable/ic_menu_swap_location.xml    |  2 +-
 app/src/main/res/drawable/ic_mode_edit.xml    |  1 +
 .../main/res/drawable/ic_nearby_stations.xml  |  1 +
 app/src/main/res/drawable/ic_time.xml         |  1 +
 app/src/main/res/drawable/line_box.xml        |  2 +-
 .../selector_list_item_background.xml         | 15 +++--
 app/src/main/res/drawable/walk_box.xml        |  2 +-
 .../main/res/layout/activity_departures.xml   |  1 -
 app/src/main/res/layout/activity_map.xml      |  6 +-
 .../activity_pick_transport_network.xml       |  1 -
 .../main/res/layout/activity_trip_detail.xml  |  2 -
 app/src/main/res/layout/fragment_about.xml    |  5 +-
 .../res/layout/fragment_directions_form.xml   | 20 ++-----
 app/src/main/res/layout/fragment_map.xml      |  2 -
 .../res/layout/fragment_product_dialog.xml    |  2 +-
 .../res/layout/fragment_special_location.xml  |  4 +-
 .../main/res/layout/fragment_trip_detail.xml  |  5 --
 .../layout/list_item_contributor_group.xml    |  4 +-
 .../main/res/layout/list_item_departure.xml   | 12 ++--
 .../main/res/layout/list_item_favorite.xml    |  4 +-
 app/src/main/res/layout/list_item_leg.xml     | 12 ++--
 .../res/layout/list_item_special_favorite.xml |  4 +-
 app/src/main/res/layout/list_item_stop.xml    |  6 +-
 app/src/main/res/layout/list_item_trip.xml    | 15 +++--
 app/src/main/res/layout/toolbar.xml           |  2 -
 app/src/main/res/values-night/colors.xml      | 34 +++++++++++
 app/src/main/res/values-night/themes.xml      |  4 +-
 app/src/main/res/values-v23/themes.xml        | 23 ++++++++
 app/src/main/res/values/colors.xml            | 56 ++++++++++---------
 app/src/main/res/values/styles.xml            | 15 ++---
 app/src/main/res/values/themes.xml            | 36 +++++++++---
 50 files changed, 224 insertions(+), 138 deletions(-)
 create mode 100644 app/src/main/res/values-night/colors.xml
 create mode 100644 app/src/main/res/values-v23/themes.xml

diff --git a/app/src/main/java/de/grobox/transportr/TransportrApplication.kt b/app/src/main/java/de/grobox/transportr/TransportrApplication.kt
index 91f92d6f6..845c2342f 100644
--- a/app/src/main/java/de/grobox/transportr/TransportrApplication.kt
+++ b/app/src/main/java/de/grobox/transportr/TransportrApplication.kt
@@ -28,7 +28,7 @@ open class TransportrApplication : Application() {
         private set
 
     override fun onCreate() {
-        // TODO DynamicColors.applyToActivitiesIfAvailable(this)
+        DynamicColors.applyToActivitiesIfAvailable(this)
 
         super.onCreate()
 
diff --git a/app/src/main/java/de/grobox/transportr/departures/DepartureViewHolder.kt b/app/src/main/java/de/grobox/transportr/departures/DepartureViewHolder.kt
index 0c3f1221f..59400318c 100644
--- a/app/src/main/java/de/grobox/transportr/departures/DepartureViewHolder.kt
+++ b/app/src/main/java/de/grobox/transportr/departures/DepartureViewHolder.kt
@@ -23,22 +23,27 @@ import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
 import android.widget.TextView
-import androidx.cardview.widget.CardView
-import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
-import de.grobox.transportr.R
+import com.google.android.material.card.MaterialCardView
 import de.grobox.transportr.ui.LineView
 import de.grobox.transportr.utils.DateUtils.formatDelay
-import de.grobox.transportr.utils.DateUtils.formatTime
 import de.grobox.transportr.utils.DateUtils.formatRelativeTime
+import de.grobox.transportr.utils.DateUtils.formatTime
 import de.grobox.transportr.utils.TransportrUtils.getLocationName
 import de.schildbach.pte.dto.Departure
-import kotlinx.android.synthetic.main.list_item_departure.view.*
-import java.util.*
+import kotlinx.android.synthetic.main.list_item_departure.view.delay
+import kotlinx.android.synthetic.main.list_item_departure.view.departureTimeAbs
+import kotlinx.android.synthetic.main.list_item_departure.view.departureTimeRel
+import kotlinx.android.synthetic.main.list_item_departure.view.destinationView
+import kotlinx.android.synthetic.main.list_item_departure.view.line
+import kotlinx.android.synthetic.main.list_item_departure.view.lineNameView
+import kotlinx.android.synthetic.main.list_item_departure.view.messageView
+import kotlinx.android.synthetic.main.list_item_departure.view.positionView
+import java.util.Date
 
 internal class DepartureViewHolder(v: View) : RecyclerView.ViewHolder(v) {
 
-    private val card: CardView = v as CardView
+    private val card: MaterialCardView = v as MaterialCardView
     private val line: LineView = v.line
     private val lineName: TextView = v.lineNameView
     private val timeRel: TextView = v.departureTimeRel
diff --git a/app/src/main/java/de/grobox/transportr/trips/detail/LegViewHolder.kt b/app/src/main/java/de/grobox/transportr/trips/detail/LegViewHolder.kt
index 212520845..a62e85669 100644
--- a/app/src/main/java/de/grobox/transportr/trips/detail/LegViewHolder.kt
+++ b/app/src/main/java/de/grobox/transportr/trips/detail/LegViewHolder.kt
@@ -19,6 +19,7 @@
 
 package de.grobox.transportr.trips.detail
 
+import android.graphics.Color
 import android.text.Html.fromHtml
 import android.view.View
 import android.view.View.GONE
@@ -30,6 +31,7 @@ import androidx.annotation.ColorInt
 import androidx.core.content.ContextCompat.getColor
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.color.MaterialColors
 import com.google.common.base.Strings
 import com.google.common.base.Strings.isNullOrEmpty
 import de.grobox.transportr.R
@@ -194,9 +196,10 @@ internal class LegViewHolder(v: View, private val listener: LegClickListener, pr
         lineView.setWalk()
 
         // line color
-        fromCircle.setColorFilter(getColor(fromCircle.context, R.color.walking))
-        lineBar.setColorFilter(getColor(lineBar.context, R.color.walking))
-        toCircle.setColorFilter(getColor(toCircle.context, R.color.walking))
+        val color = MaterialColors.getColor(fromCircle.context, R.attr.colorSecondary, Color.TRANSPARENT)
+        fromCircle.setColorFilter(color)
+        lineBar.setColorFilter(color)
+        toCircle.setColorFilter(color)
 
         // show distance
         if (leg.distance > 0) {
diff --git a/app/src/main/java/de/grobox/transportr/trips/detail/TripDrawer.kt b/app/src/main/java/de/grobox/transportr/trips/detail/TripDrawer.kt
index 80c68a55c..ab0dafada 100644
--- a/app/src/main/java/de/grobox/transportr/trips/detail/TripDrawer.kt
+++ b/app/src/main/java/de/grobox/transportr/trips/detail/TripDrawer.kt
@@ -21,12 +21,14 @@ package de.grobox.transportr.trips.detail
 
 
 import android.content.Context
+import android.graphics.Color
 import android.graphics.PorterDuff.Mode.SRC_IN
 import android.graphics.PorterDuff.Mode.MULTIPLY
 import android.graphics.drawable.Drawable
 import android.graphics.drawable.LayerDrawable
 import androidx.annotation.ColorInt
 import androidx.core.content.ContextCompat
+import com.google.android.material.color.MaterialColors
 import com.mapbox.mapboxsdk.annotations.Icon
 import com.mapbox.mapboxsdk.annotations.PolylineOptions
 import com.mapbox.mapboxsdk.geometry.LatLng
@@ -138,10 +140,10 @@ internal class TripDrawer(context: Context) : MapDrawer(context) {
             return if (line?.style != null && line.style!!.backgroundColor != 0) {
                 line.style!!.backgroundColor
             } else {
-                ContextCompat.getColor(context, R.color.accent)
+                MaterialColors.getColor(context, R.attr.colorPrimary, Color.TRANSPARENT)
             }
         }
-        return ContextCompat.getColor(context, R.color.walking)
+        return MaterialColors.getColor(context, R.attr.colorSecondary, Color.TRANSPARENT)
     }
 
     @ColorInt
diff --git a/app/src/main/java/de/grobox/transportr/trips/search/TripsFragment.kt b/app/src/main/java/de/grobox/transportr/trips/search/TripsFragment.kt
index 73515cc2e..2bda8e541 100644
--- a/app/src/main/java/de/grobox/transportr/trips/search/TripsFragment.kt
+++ b/app/src/main/java/de/grobox/transportr/trips/search/TripsFragment.kt
@@ -20,6 +20,7 @@ package de.grobox.transportr.trips.search
 
 import android.annotation.SuppressLint
 import android.content.Intent
+import android.graphics.Color
 import android.os.Bundle
 import android.os.CountDownTimer
 import android.util.Pair
@@ -30,6 +31,7 @@ import android.widget.Button
 import android.widget.Toast
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
+import com.google.android.material.color.MaterialColors
 import com.omadahealth.github.swipyrefreshlayout.library.SwipyRefreshLayout.OnRefreshListener
 import com.omadahealth.github.swipyrefreshlayout.library.SwipyRefreshLayoutDirection
 import de.grobox.transportr.R
@@ -61,7 +63,7 @@ class TripsFragment : TransportrFragment(), OnRefreshListener, OnTripClickListen
         val v = inflater.inflate(R.layout.fragment_trips, container, false)
         component.inject(this)
 
-        viewModel = ViewModelProvider(activity!!, viewModelFactory).get(DirectionsViewModel::class.java)
+        viewModel = ViewModelProvider(requireActivity(), viewModelFactory).get(DirectionsViewModel::class.java)
 
         return v
     }
@@ -74,7 +76,8 @@ class TripsFragment : TransportrFragment(), OnRefreshListener, OnTripClickListen
 
         // Swipe to Refresh
         swipe.let {
-            it.setColorSchemeColors(R.color.accent)
+            val color = MaterialColors.getColor(context, R.attr.colorPrimary, Color.TRANSPARENT)
+            it.setColorSchemeColors(color)
             it.setDistanceToTriggerSync(getDragDistance(context))
             it.setOnRefreshListener(this)
         }
diff --git a/app/src/main/java/de/grobox/transportr/utils/OnboardingBuilder.kt b/app/src/main/java/de/grobox/transportr/utils/OnboardingBuilder.kt
index 7d02b02e6..9f6844450 100644
--- a/app/src/main/java/de/grobox/transportr/utils/OnboardingBuilder.kt
+++ b/app/src/main/java/de/grobox/transportr/utils/OnboardingBuilder.kt
@@ -20,8 +20,10 @@
 package de.grobox.transportr.utils
 
 import android.app.Activity
+import android.graphics.Color
 import androidx.core.content.ContextCompat
 import android.util.TypedValue
+import com.google.android.material.color.MaterialColors
 import de.grobox.transportr.R
 import uk.co.samuelwall.materialtaptargetprompt.MaterialTapTargetPrompt
 import uk.co.samuelwall.materialtaptargetprompt.extras.backgrounds.CirclePromptBackground
@@ -33,7 +35,7 @@ import uk.co.samuelwall.materialtaptargetprompt.extras.focals.RectanglePromptFoc
 class OnboardingBuilder(activity: Activity) : MaterialTapTargetPrompt.Builder(activity) {
 
     init {
-        backgroundColour = ContextCompat.getColor(activity, R.color.primary)
+        backgroundColour = MaterialColors.getColor(activity, R.attr.colorPrimary, Color.TRANSPARENT)
         promptBackground = RectanglePromptBackground()
         promptFocal = RectanglePromptFocal()
         setFocalPadding(R.dimen.buttonSize)
@@ -48,7 +50,7 @@ class OnboardingBuilder(activity: Activity) : MaterialTapTargetPrompt.Builder(ac
 class IconOnboardingBuilder(activity: Activity) : MaterialTapTargetPrompt.Builder(activity) {
 
     init {
-        backgroundColour = ContextCompat.getColor(activity, R.color.primary)
+        backgroundColour = MaterialColors.getColor(activity, R.attr.colorPrimary, Color.TRANSPARENT)
         promptBackground = CirclePromptBackground()
         promptFocal = CirclePromptFocal()
     }
diff --git a/app/src/main/res/color/selector_highlight.xml b/app/src/main/res/color/selector_highlight.xml
index 50f642aaa..be25d37ce 100644
--- a/app/src/main/res/color/selector_highlight.xml
+++ b/app/src/main/res/color/selector_highlight.xml
@@ -3,7 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
-        android:color="@color/holo_red_light"
+        android:color="?colorPrimary"
         android:state_activated="false" />
     <item
         android:color="@android:color/white"
diff --git a/app/src/main/res/drawable/ic_action_calendar.xml b/app/src/main/res/drawable/ic_action_calendar.xml
index 229d5412c..96f78dd33 100644
--- a/app/src/main/res/drawable/ic_action_calendar.xml
+++ b/app/src/main/res/drawable/ic_action_calendar.xml
@@ -1,6 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
 		android:width="24dp"
 		android:height="24dp"
+		android:tint="?colorControlNormal"
 		android:viewportHeight="24.0"
 		android:viewportWidth="24.0">
 	<path
diff --git a/app/src/main/res/drawable/ic_action_content_content_copy.xml b/app/src/main/res/drawable/ic_action_content_content_copy.xml
index 442a362ef..fd9da145b 100644
--- a/app/src/main/res/drawable/ic_action_content_content_copy.xml
+++ b/app/src/main/res/drawable/ic_action_content_content_copy.xml
@@ -1,6 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
+        android:tint="?colorControlNormal"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
diff --git a/app/src/main/res/drawable/ic_action_departures.xml b/app/src/main/res/drawable/ic_action_departures.xml
index d47f5c8e5..3fc786ef2 100644
--- a/app/src/main/res/drawable/ic_action_departures.xml
+++ b/app/src/main/res/drawable/ic_action_departures.xml
@@ -1,6 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
+        android:tint="?colorControlNormal"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
diff --git a/app/src/main/res/drawable/ic_action_external_map.xml b/app/src/main/res/drawable/ic_action_external_map.xml
index b9bacc8a6..170ef8c2e 100644
--- a/app/src/main/res/drawable/ic_action_external_map.xml
+++ b/app/src/main/res/drawable/ic_action_external_map.xml
@@ -1,6 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
+        android:tint="?colorControlNormal"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
diff --git a/app/src/main/res/drawable/ic_action_navigation_refresh.xml b/app/src/main/res/drawable/ic_action_navigation_refresh.xml
index b213ee071..36a8a7ae9 100644
--- a/app/src/main/res/drawable/ic_action_navigation_refresh.xml
+++ b/app/src/main/res/drawable/ic_action_navigation_refresh.xml
@@ -1,6 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
 		android:width="24dp"
 		android:height="24dp"
+		android:tint="?colorControlNormal"
 		android:viewportHeight="24.0"
 		android:viewportWidth="24.0">
 	<path
diff --git a/app/src/main/res/drawable/ic_action_navigation_unfold_more_white.xml b/app/src/main/res/drawable/ic_action_navigation_unfold_more_white.xml
index 46ba28c6d..3a5f1b3e3 100644
--- a/app/src/main/res/drawable/ic_action_navigation_unfold_more_white.xml
+++ b/app/src/main/res/drawable/ic_action_navigation_unfold_more_white.xml
@@ -1,6 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
 		android:width="24dp"
 		android:height="24dp"
+		android:tint="?colorControlNormal"
 		android:viewportHeight="24.0"
 		android:viewportWidth="24.0">
 	<path
diff --git a/app/src/main/res/drawable/ic_action_settings.xml b/app/src/main/res/drawable/ic_action_settings.xml
index ace746c40..d59462165 100644
--- a/app/src/main/res/drawable/ic_action_settings.xml
+++ b/app/src/main/res/drawable/ic_action_settings.xml
@@ -1,6 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
+        android:tint="?colorControlNormal"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
diff --git a/app/src/main/res/drawable/ic_action_social_share.xml b/app/src/main/res/drawable/ic_action_social_share.xml
index 2fa31782f..c4a106efe 100644
--- a/app/src/main/res/drawable/ic_action_social_share.xml
+++ b/app/src/main/res/drawable/ic_action_social_share.xml
@@ -1,6 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
 		android:width="24dp"
 		android:height="24dp"
+		android:tint="?colorControlNormal"
 		android:viewportHeight="24.0"
 		android:viewportWidth="24.0">
 	<path
diff --git a/app/src/main/res/drawable/ic_action_star.xml b/app/src/main/res/drawable/ic_action_star.xml
index 466d582f0..f7ded4420 100644
--- a/app/src/main/res/drawable/ic_action_star.xml
+++ b/app/src/main/res/drawable/ic_action_star.xml
@@ -1,6 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
 		android:width="24dp"
 		android:height="24dp"
+		android:tint="?colorControlNormal"
 		android:viewportHeight="24.0"
 		android:viewportWidth="24.0">
 	<path
diff --git a/app/src/main/res/drawable/ic_add_shortcut.xml b/app/src/main/res/drawable/ic_add_shortcut.xml
index c19e9aa13..6f06276df 100644
--- a/app/src/main/res/drawable/ic_add_shortcut.xml
+++ b/app/src/main/res/drawable/ic_add_shortcut.xml
@@ -1,6 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
+        android:tint="?colorControlNormal"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
diff --git a/app/src/main/res/drawable/ic_delete.xml b/app/src/main/res/drawable/ic_delete.xml
index 39e64d698..0e869fa90 100644
--- a/app/src/main/res/drawable/ic_delete.xml
+++ b/app/src/main/res/drawable/ic_delete.xml
@@ -1,6 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
+        android:tint="?colorControlNormal"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
diff --git a/app/src/main/res/drawable/ic_menu_directions.xml b/app/src/main/res/drawable/ic_menu_directions.xml
index 739dd20ee..6684b1a82 100644
--- a/app/src/main/res/drawable/ic_menu_directions.xml
+++ b/app/src/main/res/drawable/ic_menu_directions.xml
@@ -1,6 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
+        android:tint="?colorControlNormal"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
diff --git a/app/src/main/res/drawable/ic_menu_swap_location.xml b/app/src/main/res/drawable/ic_menu_swap_location.xml
index 695d59245..ce865edb6 100644
--- a/app/src/main/res/drawable/ic_menu_swap_location.xml
+++ b/app/src/main/res/drawable/ic_menu_swap_location.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:viewportHeight="96.0"
+<vector android:height="24dp" android:viewportHeight="96.0" android:tint="?colorControlNormal"
     android:viewportWidth="96.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#333333" android:pathData="M11.4,33.29c4.7,0.01 9.16,1.08 13.64,3.26c3.93,1.93 7.83,4.74 11.61,8.35c0.35,-0.38 0.7,-0.77 1.04,-1.16c1.49,-1.71 3.08,-3.38 4.74,-4.99c-3.79,-3.33 -7.64,-5.94 -11.73,-7.95c-5.96,-2.95 -12.55,-4.5 -19.12,-4.5c-0.63,0 -1.26,0.03 -1.87,0.05L8.49,26.41v7l1.35,-0.08C10.36,33.31 10.88,33.29 11.4,33.29z"/>
     <path android:fillColor="#333333" android:pathData="M65.19,37.48c1.23,-0.6 2.44,-1.11 3.66,-1.54v10.58L87.51,31.45L68.86,16.38v12c-3.2,0.76 -6.34,1.88 -9.32,3.36c-6.62,3.26 -12.7,8.12 -18.58,14.85c-5.12,5.87 -10.47,10.2 -15.92,12.87c-4.47,2.18 -8.94,3.25 -13.64,3.26c-0.52,0 -1.04,-0.02 -1.56,-0.05L8.49,62.59v7.01l1.22,0.06c0.61,0.03 1.23,0.05 1.87,0.05h0.07c6.49,0 13.07,-1.55 19.05,-4.5c6.62,-3.26 12.69,-8.11 18.57,-14.85C54.38,44.48 59.74,40.15 65.19,37.48z"/>
diff --git a/app/src/main/res/drawable/ic_mode_edit.xml b/app/src/main/res/drawable/ic_mode_edit.xml
index 2ab2fb753..f6b77b6f2 100644
--- a/app/src/main/res/drawable/ic_mode_edit.xml
+++ b/app/src/main/res/drawable/ic_mode_edit.xml
@@ -1,6 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
+        android:tint="?colorControlNormal"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
diff --git a/app/src/main/res/drawable/ic_nearby_stations.xml b/app/src/main/res/drawable/ic_nearby_stations.xml
index a5025aea6..8a2952235 100644
--- a/app/src/main/res/drawable/ic_nearby_stations.xml
+++ b/app/src/main/res/drawable/ic_nearby_stations.xml
@@ -1,6 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
+        android:tint="?colorControlNormal"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
diff --git a/app/src/main/res/drawable/ic_time.xml b/app/src/main/res/drawable/ic_time.xml
index 7fab7fdfa..e0b075def 100644
--- a/app/src/main/res/drawable/ic_time.xml
+++ b/app/src/main/res/drawable/ic_time.xml
@@ -1,6 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
 		android:width="24dp"
 		android:height="24dp"
+		android:tint="?colorControlNormal"
 		android:viewportHeight="24.0"
 		android:viewportWidth="24.0">
 	<path
diff --git a/app/src/main/res/drawable/line_box.xml b/app/src/main/res/drawable/line_box.xml
index 8caf390af..6a7c90c4f 100644
--- a/app/src/main/res/drawable/line_box.xml
+++ b/app/src/main/res/drawable/line_box.xml
@@ -4,7 +4,7 @@
     android:shape="rectangle" >
 
 	<solid
-	    android:color="#55FF0000" />
+	    android:color="?colorTertiary" />
 
 	<corners
 	    android:radius="@dimen/line_box_corner_radius" />
diff --git a/app/src/main/res/drawable/selector_list_item_background.xml b/app/src/main/res/drawable/selector_list_item_background.xml
index 58cc6c04c..eb0afb94f 100644
--- a/app/src/main/res/drawable/selector_list_item_background.xml
+++ b/app/src/main/res/drawable/selector_list_item_background.xml
@@ -4,13 +4,16 @@
     android:exitFadeDuration="@android:integer/config_shortAnimTime" >
 
     <item
-        android:drawable="@color/primary_dark"
-        android:state_pressed="true" />
+        android:state_pressed="true" >
+        <color android:color="?colorPrimary" />
+    </item>
     <item
-        android:drawable="@color/primary"
-        android:state_selected="true" />
+        android:state_selected="true" >
+        <color android:color="?colorPrimary" />
+    </item>
     <item
-        android:drawable="@color/accent"
-        android:state_activated="true" />
+        android:state_activated="true" >
+        <color android:color="?colorSecondary" />
+    </item>
 
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/walk_box.xml b/app/src/main/res/drawable/walk_box.xml
index ee19581a9..6154118b7 100644
--- a/app/src/main/res/drawable/walk_box.xml
+++ b/app/src/main/res/drawable/walk_box.xml
@@ -3,7 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <solid android:color="@color/walking"/>
+    <solid android:color="?colorSecondary"/>
 
     <corners
         android:radius="@dimen/line_box_corner_radius"/>
diff --git a/app/src/main/res/layout/activity_departures.xml b/app/src/main/res/layout/activity_departures.xml
index 0e09b508c..0b4196ea4 100644
--- a/app/src/main/res/layout/activity_departures.xml
+++ b/app/src/main/res/layout/activity_departures.xml
@@ -16,7 +16,6 @@
 
 		<androidx.appcompat.widget.Toolbar
 			android:id="@+id/toolbar"
-			style="@style/ToolbarStyle"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"/>
 
diff --git a/app/src/main/res/layout/activity_map.xml b/app/src/main/res/layout/activity_map.xml
index 2035a5620..7101631dc 100644
--- a/app/src/main/res/layout/activity_map.xml
+++ b/app/src/main/res/layout/activity_map.xml
@@ -12,7 +12,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"/>
 
-	<androidx.cardview.widget.CardView
+	<com.google.android.material.card.MaterialCardView
 		android:layout_width="match_parent"
 		android:layout_height="48dp"
 		android:layout_marginEnd="16dp"
@@ -45,7 +45,7 @@
 			app:hint="@string/search_hint"
 			app:showIcon="false"/>
 
-	</androidx.cardview.widget.CardView>
+	</com.google.android.material.card.MaterialCardView>
 
 	<com.google.android.material.floatingactionbutton.FloatingActionButton
 		android:id="@+id/directionsFab"
@@ -57,8 +57,6 @@
 		android:layout_marginRight="16dp"
 		android:clickable="true"
 		android:focusable="true"
-		android:tint="@color/md_white_1000"
-		app:backgroundTint="@color/primary"
 		app:behavior_autoHide="true"
 		app:fabSize="normal"
 		app:layout_anchor="@+id/bottomSheet"
diff --git a/app/src/main/res/layout/activity_pick_transport_network.xml b/app/src/main/res/layout/activity_pick_transport_network.xml
index b7e9b71ff..1e601da9f 100644
--- a/app/src/main/res/layout/activity_pick_transport_network.xml
+++ b/app/src/main/res/layout/activity_pick_transport_network.xml
@@ -25,7 +25,6 @@
 
 				<androidx.appcompat.widget.Toolbar
 					android:id="@+id/toolbar"
-					style="@style/ToolbarStyle"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"/>
 
diff --git a/app/src/main/res/layout/activity_trip_detail.xml b/app/src/main/res/layout/activity_trip_detail.xml
index 54ce5ff18..eeca077fd 100644
--- a/app/src/main/res/layout/activity_trip_detail.xml
+++ b/app/src/main/res/layout/activity_trip_detail.xml
@@ -26,8 +26,6 @@
 
 			<androidx.appcompat.widget.Toolbar
 				android:id="@+id/toolbar"
-				style="@style/ToolbarStyle"
-				android:theme="@style/ThemeOverlay.AppCompat.DayNight.ActionBar"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				app:layout_collapseMode="pin"/>
diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml
index 55cc947ec..90a7c717a 100644
--- a/app/src/main/res/layout/fragment_about.xml
+++ b/app/src/main/res/layout/fragment_about.xml
@@ -68,7 +68,7 @@
 			android:layout_marginStart="16dp"
 			android:layout_marginTop="16dp"
 			android:text="@string/about_warning_title"
-			android:textColor="@color/md_red_500"
+			android:textColor="?colorError"
 			android:textSize="16sp"
 			android:textStyle="bold"
 			app:layout_constraintStart_toStartOf="parent"
@@ -82,7 +82,7 @@
 			android:layout_marginStart="16dp"
 			android:layout_marginTop="8dp"
 			android:text="@string/about_warning_text"
-			android:textColor="@color/md_red_500"
+			android:textColor="?colorError"
 			android:textSize="16sp"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
@@ -104,7 +104,6 @@
 
 		<Button
 			android:id="@+id/websiteButton"
-			style="@style/Widget.AppCompat.Button.Colored"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_marginTop="16dp"
diff --git a/app/src/main/res/layout/fragment_directions_form.xml b/app/src/main/res/layout/fragment_directions_form.xml
index 2a876e5a2..d392b956d 100644
--- a/app/src/main/res/layout/fragment_directions_form.xml
+++ b/app/src/main/res/layout/fragment_directions_form.xml
@@ -12,7 +12,6 @@
 
 	<androidx.appcompat.widget.Toolbar
 		android:id="@+id/toolbar"
-		style="@style/ToolbarStyle"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
 		app:layout_constraintLeft_toLeftOf="parent"
@@ -29,7 +28,6 @@
 				android:layout_height="@dimen/buttonSize"
 				android:background="?selectableItemBackgroundBorderless"
 				android:contentDescription="@string/action_fav_trip"
-				android:tint="@color/md_white_1000"
 				android:visibility="gone"
 				app:layout_constraintEnd_toStartOf="@+id/swapIcon"
 				app:layout_constraintTop_toTopOf="@+id/viaIcon"
@@ -43,7 +41,6 @@
 				android:background="?selectableItemBackgroundBorderless"
 				android:contentDescription="@string/action_swap_locations"
 				android:src="@drawable/ic_menu_swap_location"
-				android:tint="@color/md_white_1000"
 				app:layout_constraintEnd_toStartOf="@+id/viaIcon"
 				app:layout_constraintTop_toTopOf="@+id/viaIcon"/>
 
@@ -62,7 +59,7 @@
 
 	</androidx.appcompat.widget.Toolbar>
 
-	<androidx.cardview.widget.CardView
+	<com.google.android.material.card.MaterialCardView
 		android:id="@+id/fromCard"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
@@ -80,9 +77,9 @@
 			android:layout_height="match_parent"
 			app:hint="@string/from"/>
 
-	</androidx.cardview.widget.CardView>
+	</com.google.android.material.card.MaterialCardView>
 
-	<androidx.cardview.widget.CardView
+	<com.google.android.material.card.MaterialCardView
 		android:id="@+id/viaCard"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
@@ -99,9 +96,9 @@
 			android:layout_height="match_parent"
 			app:hint="@string/via"/>
 
-	</androidx.cardview.widget.CardView>
+	</com.google.android.material.card.MaterialCardView>
 
-	<androidx.cardview.widget.CardView
+	<com.google.android.material.card.MaterialCardView
 		android:id="@+id/toCard"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
@@ -116,7 +113,7 @@
 			android:layout_height="match_parent"
 			app:hint="@string/to"/>
 
-	</androidx.cardview.widget.CardView>
+	</com.google.android.material.card.MaterialCardView>
 
 	<View
 		android:id="@+id/timeBackground"
@@ -150,7 +147,6 @@
 		android:paddingEnd="4dp"
 		android:paddingRight="4dp"
 		android:gravity="center"
-		android:textColor="@color/md_grey_300"
 		app:layout_constraintStart_toEndOf="@+id/timeIcon"
 		app:layout_constraintTop_toTopOf="@+id/timeIcon"
 		app:layout_constraintBottom_toBottomOf="@+id/timeIcon"
@@ -161,7 +157,6 @@
 		android:layout_width="wrap_content"
 		android:layout_height="24dp"
 		android:gravity="center"
-		android:textColor="@color/md_grey_300"
 		android:visibility="gone"
 		app:layout_constraintStart_toEndOf="@+id/departure"
 		app:layout_constraintEnd_toStartOf="@+id/timeBarrier"
@@ -175,7 +170,6 @@
 		android:layout_width="wrap_content"
 		android:layout_height="24dp"
 		android:gravity="center"
-		android:textColor="@color/md_grey_300"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toStartOf="@+id/timeBarrier"
 		app:layout_constraintStart_toEndOf="@+id/departure"
@@ -198,7 +192,6 @@
 		android:background="?selectableItemBackgroundBorderless"
 		android:contentDescription="@string/action_choose_products"
 		android:src="@drawable/product_bus"
-		android:tint="@color/md_white_1000"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintTop_toTopOf="@+id/timeIcon"/>
 
@@ -210,7 +203,6 @@
 		android:layout_marginLeft="16dp"
 		android:layout_marginStart="16dp"
 		android:layout_marginBottom="16dp"
-		app:tint="@color/md_grey_300"
 		app:layout_constraintStart_toStartOf="@+id/productsIcon"
 		app:layout_constraintEnd_toEndOf="@+id/productsIcon"
 		app:layout_constraintTop_toTopOf="@+id/productsIcon"
diff --git a/app/src/main/res/layout/fragment_map.xml b/app/src/main/res/layout/fragment_map.xml
index c1e9e90c5..25135825d 100644
--- a/app/src/main/res/layout/fragment_map.xml
+++ b/app/src/main/res/layout/fragment_map.xml
@@ -49,8 +49,6 @@
 		android:layout_margin="16dp"
 		android:clickable="true"
 		android:focusable="true"
-		android:tint="@color/fabForegroundInitial"
-		app:backgroundTint="@color/fabBackground"
 		app:behavior_autoHide="true"
 		app:elevation="4dp"
 		app:fabSize="normal"
diff --git a/app/src/main/res/layout/fragment_product_dialog.xml b/app/src/main/res/layout/fragment_product_dialog.xml
index 7fa7db0d7..099d98361 100644
--- a/app/src/main/res/layout/fragment_product_dialog.xml
+++ b/app/src/main/res/layout/fragment_product_dialog.xml
@@ -38,7 +38,7 @@
 		android:id="@+id/divider"
 		android:layout_width="0dp"
 		android:layout_height="1px"
-		android:background="@color/about_libraries_dividerLight_openSource"
+		android:background="?colorControlNormal"
 		app:layout_constraintBottom_toTopOf="@+id/okButton"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"/>
diff --git a/app/src/main/res/layout/fragment_special_location.xml b/app/src/main/res/layout/fragment_special_location.xml
index 6a77ecf48..7492423aa 100644
--- a/app/src/main/res/layout/fragment_special_location.xml
+++ b/app/src/main/res/layout/fragment_special_location.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView
+<com.google.android.material.card.MaterialCardView
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:layout_width="match_parent"
@@ -20,4 +20,4 @@
 
 	</de.grobox.transportr.locations.LocationView>
 
-</androidx.cardview.widget.CardView>
\ No newline at end of file
+</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_trip_detail.xml b/app/src/main/res/layout/fragment_trip_detail.xml
index 8e0624137..cbf23ec94 100644
--- a/app/src/main/res/layout/fragment_trip_detail.xml
+++ b/app/src/main/res/layout/fragment_trip_detail.xml
@@ -14,7 +14,6 @@
 
 		<androidx.appcompat.widget.Toolbar
 			android:id="@+id/toolbar"
-			style="@style/ToolbarStyle"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:visibility="gone"
@@ -27,7 +26,6 @@
 			android:layout_height="@dimen/mapPadding"
 			android:padding="8dp"
 			android:layout_marginTop="0dp"
-			android:background="@color/primary"
 			android:clickable="true"
 			android:focusable="true"
 			android:foreground="?selectableItemBackgroundBorderless"
@@ -41,7 +39,6 @@
 				android:id="@+id/fromTime"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:textColor="?android:textColorPrimary"
 				app:layout_constraintStart_toStartOf="parent"
 				app:layout_constraintTop_toTopOf="parent"
 				tools:text="12:23"/>
@@ -54,7 +51,6 @@
 				android:layout_marginStart="8dp"
 				android:ellipsize="middle"
 				android:singleLine="true"
-				android:textColor="?android:textColorPrimary"
 				app:layout_constraintEnd_toStartOf="@+id/barrierRight"
 				app:layout_constraintStart_toEndOf="@+id/fromTime"
 				app:layout_constraintBaseline_toBaselineOf="@+id/fromTime"
@@ -65,7 +61,6 @@
 				android:id="@+id/toTime"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:textColor="?android:textColorPrimary"
 				app:layout_constraintBottom_toBottomOf="parent"
 				app:layout_constraintStart_toStartOf="parent"
 				app:layout_constraintTop_toBottomOf="@+id/fromTime"
diff --git a/app/src/main/res/layout/list_item_contributor_group.xml b/app/src/main/res/layout/list_item_contributor_group.xml
index 9e1690dbd..9a85296c1 100644
--- a/app/src/main/res/layout/list_item_contributor_group.xml
+++ b/app/src/main/res/layout/list_item_contributor_group.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView
+<com.google.android.material.card.MaterialCardView
 	style="@style/ContributorsCard"
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -45,4 +45,4 @@
 
 	</androidx.constraintlayout.widget.ConstraintLayout>
 
-</androidx.cardview.widget.CardView>
+</com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/list_item_departure.xml b/app/src/main/res/layout/list_item_departure.xml
index 0081b815e..34d959f22 100644
--- a/app/src/main/res/layout/list_item_departure.xml
+++ b/app/src/main/res/layout/list_item_departure.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView
-	style="@style/CardView"
+<com.google.android.material.card.MaterialCardView
+	style="@style/FavoriteCard"
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
@@ -46,7 +46,7 @@
 			android:id="@+id/delay"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:textColor="@color/md_red_500"
+			android:textColor="?colorPrimary"
 			app:layout_constraintHorizontal_bias="1.0"
 			app:layout_constraintLeft_toLeftOf="parent"
 			app:layout_constraintRight_toRightOf="@+id/departureTimeAbs"
@@ -68,7 +68,7 @@
 			app:layout_constraintLeft_toLeftOf="@+id/guideline"
 			app:layout_constraintTop_toTopOf="parent"
 			tools:background="@drawable/line_box"
-			tools:backgroundTint="@color/about_libraries_accent"
+			tools:backgroundTint="?colorTertiary"
 			tools:drawableLeft="@drawable/product_bus"
 			tools:text="1337"/>
 
@@ -118,7 +118,7 @@
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
 			android:layout_marginTop="8dp"
-			android:textColor="@color/md_red_500"
+			android:textColor="?colorPrimary"
 			android:textSize="12sp"
 			app:layout_constraintLeft_toLeftOf="@+id/guideline"
 			app:layout_constraintRight_toRightOf="parent"
@@ -127,4 +127,4 @@
 
 	</androidx.constraintlayout.widget.ConstraintLayout>
 
-</androidx.cardview.widget.CardView>
+</com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/list_item_favorite.xml b/app/src/main/res/layout/list_item_favorite.xml
index bc3eb1e4f..0d4aa43a0 100644
--- a/app/src/main/res/layout/list_item_favorite.xml
+++ b/app/src/main/res/layout/list_item_favorite.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView
+<com.google.android.material.card.MaterialCardView
 	style="@style/FavoriteCard"
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -117,4 +117,4 @@
 
 	</androidx.constraintlayout.widget.ConstraintLayout>
 
-</androidx.cardview.widget.CardView>
+</com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/list_item_leg.xml b/app/src/main/res/layout/list_item_leg.xml
index 0fa0e6c50..24dfe03f5 100644
--- a/app/src/main/res/layout/list_item_leg.xml
+++ b/app/src/main/res/layout/list_item_leg.xml
@@ -23,7 +23,7 @@
 		android:id="@+id/fromDelay"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:textColor="@color/md_red_500"
+		android:textColor="?colorPrimary"
 		app:layout_constraintRight_toRightOf="@+id/fromTime"
 		app:layout_constraintTop_toBottomOf="@+id/fromTime"
 		tools:text="+12"
@@ -43,7 +43,7 @@
 		app:layout_constraintVertical_bias="0.0"
 		tools:ignore="ContentDescription"
 		tools:src="@drawable/leg_circle_end"
-		tools:tint="@color/md_red_300"/>
+		tools:tint="?colorPrimary"/>
 
 	<TextView
 		android:id="@+id/fromLocation"
@@ -87,7 +87,7 @@
 		app:layout_constraintStart_toStartOf="@+id/fromCircle"
 		app:layout_constraintTop_toBottomOf="@+id/fromCircle"
 		tools:ignore="ContentDescription"
-		tools:tint="@color/md_red_300"/>
+		tools:tint="?colorPrimary"/>
 
 	<de.grobox.transportr.ui.LineView
 		android:id="@+id/lineView"
@@ -125,7 +125,7 @@
 		android:layout_marginEnd="8dp"
 		android:layout_marginRight="8dp"
 		android:layout_marginTop="8dp"
-		android:textColor="@color/md_red_500"
+		android:textColor="?colorPrimary"
 		android:textSize="12sp"
 		app:layout_constraintEnd_toStartOf="@+id/duration"
 		app:layout_constraintStart_toStartOf="@+id/lineView"
@@ -198,7 +198,7 @@
 		android:id="@+id/toDelay"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:textColor="@color/md_red_500"
+		android:textColor="?colorPrimary"
 		app:layout_constraintEnd_toEndOf="@+id/toTime"
 		app:layout_constraintTop_toBottomOf="@+id/toTime"
 		tools:text="+3"
@@ -215,7 +215,7 @@
 		app:layout_constraintTop_toTopOf="@+id/toLocation"
 		tools:ignore="ContentDescription"
 		tools:src="@drawable/leg_circle_middle"
-		tools:tint="@color/md_red_300"/>
+		tools:tint="?colorPrimary"/>
 
 	<TextView
 		android:id="@+id/toLocation"
diff --git a/app/src/main/res/layout/list_item_special_favorite.xml b/app/src/main/res/layout/list_item_special_favorite.xml
index 382f78d45..8404c819c 100644
--- a/app/src/main/res/layout/list_item_special_favorite.xml
+++ b/app/src/main/res/layout/list_item_special_favorite.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView
+<com.google.android.material.card.MaterialCardView
 	style="@style/FavoriteCard"
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -68,4 +68,4 @@
 
 	</androidx.constraintlayout.widget.ConstraintLayout>
 
-</androidx.cardview.widget.CardView>
+</com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/list_item_stop.xml b/app/src/main/res/layout/list_item_stop.xml
index b5f023d18..ba1e8606d 100644
--- a/app/src/main/res/layout/list_item_stop.xml
+++ b/app/src/main/res/layout/list_item_stop.xml
@@ -20,7 +20,7 @@
 		android:id="@+id/fromDelay"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:textColor="@color/md_red_500"
+		android:textColor="?colorPrimary"
 		app:layout_constraintRight_toRightOf="@+id/fromTime"
 		app:layout_constraintTop_toBottomOf="@+id/fromTime"
 		tools:text="+12"
@@ -39,7 +39,7 @@
 		android:id="@+id/toDelay"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:textColor="@color/md_red_500"
+		android:textColor="?colorPrimary"
 		app:layout_constraintEnd_toEndOf="@+id/toTime"
 		app:layout_constraintTop_toBottomOf="@+id/toTime"
 		tools:text="+3"
@@ -65,7 +65,7 @@
 		app:layout_constraintStart_toEndOf="@+id/barrier"
 		app:layout_constraintTop_toTopOf="@+id/fromTime"
 		tools:ignore="ContentDescription"
-		tools:tint="@color/md_red_300"/>
+		tools:tint="?colorPrimary"/>
 
 	<TextView
 		android:id="@+id/stopLocation"
diff --git a/app/src/main/res/layout/list_item_trip.xml b/app/src/main/res/layout/list_item_trip.xml
index 1d14bc5a6..4a850182c 100644
--- a/app/src/main/res/layout/list_item_trip.xml
+++ b/app/src/main/res/layout/list_item_trip.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView
-	style="@style/CardView"
+<com.google.android.material.card.MaterialCardView
+	style="@style/FavoriteCard"
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
@@ -10,8 +10,7 @@
 	android:layout_marginTop="4dp"
 	android:clickable="true"
 	android:focusable="true"
-	android:foreground="?android:attr/selectableItemBackground"
-	app:cardCornerRadius="0dp">
+	android:foreground="?android:attr/selectableItemBackground">
 
 	<androidx.constraintlayout.widget.ConstraintLayout
 		android:layout_width="match_parent"
@@ -45,7 +44,7 @@
 			android:layout_height="wrap_content"
 			android:layout_marginTop="0dp"
 			android:gravity="end"
-			android:textColor="@color/md_red_500"
+			android:textColor="?colorPrimary"
 			app:layout_constraintLeft_toLeftOf="parent"
 			app:layout_constraintRight_toRightOf="@+id/fromTime"
 			app:layout_constraintTop_toBottomOf="@+id/fromTime"
@@ -72,7 +71,7 @@
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:contentDescription="@string/trip_issue"
-			app:tint="@color/md_red_500"
+			app:tint="?colorPrimary"
 			app:layout_constraintBottom_toTopOf="@+id/toTime"
 			app:layout_constraintEnd_toEndOf="@+id/fromTime"
 			app:layout_constraintStart_toStartOf="parent"
@@ -131,7 +130,7 @@
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
 			android:gravity="end"
-			android:textColor="@color/md_red_500"
+			android:textColor="?colorPrimary"
 			app:layout_constraintLeft_toLeftOf="parent"
 			app:layout_constraintRight_toRightOf="@+id/toTime"
 			app:layout_constraintTop_toBottomOf="@+id/toTime"
@@ -165,4 +164,4 @@
 
 	</androidx.constraintlayout.widget.ConstraintLayout>
 
-</androidx.cardview.widget.CardView>
+</com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/toolbar.xml b/app/src/main/res/layout/toolbar.xml
index 1e01d66a3..238ca8b20 100644
--- a/app/src/main/res/layout/toolbar.xml
+++ b/app/src/main/res/layout/toolbar.xml
@@ -3,10 +3,8 @@
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
-	style="@style/ToolbarStyle"
 	android:id="@+id/toolbar"
 	android:layout_height="wrap_content"
 	android:layout_width="match_parent"
-	android:background="?attr/colorPrimary"
 	app:layout_scrollFlags="scroll|enterAlways"
 	tools:ignore="Overdraw"/>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
new file mode 100644
index 000000000..5d6145135
--- /dev/null
+++ b/app/src/main/res/values-night/colors.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+	<color name="md_theme_primary">#9ECAFF</color>
+	<color name="md_theme_onPrimary">#003258</color>
+	<color name="md_theme_primaryContainer">#00497D</color>
+	<color name="md_theme_onPrimaryContainer">#D1E4FF</color>
+	<color name="md_theme_secondary">#BBC7DB</color>
+	<color name="md_theme_onSecondary">#253140</color>
+	<color name="md_theme_secondaryContainer">#3B4858</color>
+	<color name="md_theme_onSecondaryContainer">#D7E3F7</color>
+	<color name="md_theme_tertiary">#D6BEE4</color>
+	<color name="md_theme_onTertiary">#3B2948</color>
+	<color name="md_theme_tertiaryContainer">#523F5F</color>
+	<color name="md_theme_onTertiaryContainer">#F2DAFF</color>
+	<color name="md_theme_error">#FFB4AB</color>
+	<color name="md_theme_errorContainer">#93000A</color>
+	<color name="md_theme_onError">#690005</color>
+	<color name="md_theme_onErrorContainer">#FFDAD6</color>
+	<color name="md_theme_background">#1A1C1E</color>
+	<color name="md_theme_onBackground">#E2E2E6</color>
+	<color name="md_theme_surface">#1A1C1E</color>
+	<color name="md_theme_onSurface">#E2E2E6</color>
+	<color name="md_theme_surfaceVariant">#43474E</color>
+	<color name="md_theme_onSurfaceVariant">#C3C7CF</color>
+	<color name="md_theme_outline">#8D9199</color>
+	<color name="md_theme_inverseOnSurface">#1A1C1E</color>
+	<color name="md_theme_inverseSurface">#E2E2E6</color>
+	<color name="md_theme_inversePrimary">#0061A4</color>
+	<color name="md_theme_shadow">#000000</color>
+	<color name="md_theme_surfaceTint">#9ECAFF</color>
+	<color name="md_theme_outlineVariant">#43474E</color>
+	
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 64a13c3a5..add2d9354 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -4,8 +4,6 @@
 	<!-- App Theme -->
 
 	<style name="AppDayNightTheme" parent="AppBaseTheme">
-		<item name="colorControlNormal">@color/drawableTintDark</item>
-		<item name="cardBackgroundColor">@color/cardview_dark_background</item>
 		<item name="colorBackgroundFloating">#ff424242</item>
 
 		<item name="mapStyle">@string/mapbox_style_dark</item>
@@ -16,7 +14,7 @@
 		<item name="about_libraries_text_openSource">@color/about_libraries_text_openSource_dark</item>
 
 		<!-- MaterialDrawer specific values -->
-		<item name="material_drawer_background">@color/material_drawer_dark_background</item>
+		<item name="material_drawer_background">?android:colorBackground</item>
 		<item name="material_drawer_primary_text">@color/material_drawer_dark_primary_text</item>
 		<item name="material_drawer_primary_icon">@color/material_drawer_dark_primary_icon</item>
 		<item name="material_drawer_secondary_text">@color/material_drawer_dark_secondary_text</item>
diff --git a/app/src/main/res/values-v23/themes.xml b/app/src/main/res/values-v23/themes.xml
new file mode 100644
index 000000000..2a9b8b364
--- /dev/null
+++ b/app/src/main/res/values-v23/themes.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+	<style name="AppDayNightTheme" parent="AppBaseTheme">
+		<item name="mapStyle">@string/mapbox_style_mapbox_streets</item>
+		<item name="attributionBackground">#99FFFFFF</item>
+		<item name="android:windowLightStatusBar">true</item>
+
+		<!-- MaterialDrawer specific values -->
+		<item name="material_drawer_background">?android:colorBackground</item>
+		<item name="material_drawer_primary_text">@color/material_drawer_primary_text</item>
+		<item name="material_drawer_primary_icon">@color/material_drawer_primary_icon</item>
+		<item name="material_drawer_secondary_text">@color/material_drawer_secondary_text</item>
+		<item name="material_drawer_hint_text">@color/material_drawer_hint_text</item>
+		<item name="material_drawer_divider">@color/material_drawer_divider</item>
+		<item name="material_drawer_selected">@color/material_drawer_selected</item> <!-- Material 2 defines 12% alpha, primary color -->
+		<item name="material_drawer_selected_legacy">@color/material_drawer_selected
+		</item> <!-- Defines the color if legacy style (Material 1, is enabled) -->
+		<item name="material_drawer_selected_text">@color/material_drawer_selected_text</item>
+		<item name="material_drawer_header_selection_text">@color/material_drawer_header_selection_text</item>
+		<item name="material_drawer_legacy_style">false</item> <!-- Enables legacy Material 1 style -->
+	</style>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index f800a1f91..21d024428 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,35 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <color name="holo_red_light">#ffff4444</color>
-    <color name="walking">#ffea00</color>
-
-    <!-- material theme colors -->
-    <color name="primary">#f44336</color>
-    <color name="primary_dark">#b71c1c</color>
-    <color name="accent">#e53935</color>
-
-    <!-- To enable accent color in settings for devices with API <21 -->
-    <color name="preference_fallback_accent_color" tools:override="true" tools:ignore="UnusedResources">@color/accent</color>
-
-    <color name="drawableTintDark">#ffffffff</color>
-    <color name="drawableTintLight">@color/md_grey_600</color>
-
-    <color name="buttonColor">@color/md_blue_500</color>
 
     <!-- GPS FAB -->
     <color name="fabBackground">@color/cardview_light_background</color>
     <color name="fabBackgroundMoved">@color/md_blue_700</color>
-    <color name="fabForegroundInitial">@color/drawableTintLight</color>
+    <color name="fabForegroundInitial">@color/md_grey_600</color>
     <color name="fabForegroundFollow">@color/fabBackgroundMoved</color>
     <color name="fabForegroundMoved">@color/md_white_1000</color>
 
-    <color name="cardview_dark_background" tools:override="true">#FF424242</color>
-    <color name="cardview_light_background" tools:override="true">#FFFFFFFF</color>
-
-    <!-- Material Drawer -->
-    <color name="material_drawer_header_selection_text" tools:ignore="UnusedResources">#FFFFFFFF</color>
-    <color name="material_drawer_header_selection_subtext" tools:ignore="UnusedResources">#B3FFFFFF</color>
-    <color name="material_drawer_dark_header_selection_text" tools:ignore="UnusedResources">#FFFFFFFF</color>
-    <color name="material_drawer_dark_header_selection_subtext" tools:ignore="UnusedResources">#B3FFFFFF</color>
-
+    <color name="md_theme_primary">#0061A4</color>
+    <color name="md_theme_onPrimary">#FFFFFF</color>
+    <color name="md_theme_primaryContainer">#D1E4FF</color>
+    <color name="md_theme_onPrimaryContainer">#001D36</color>
+    <color name="md_theme_secondary">#535F70</color>
+    <color name="md_theme_onSecondary">#FFFFFF</color>
+    <color name="md_theme_secondaryContainer">#D7E3F7</color>
+    <color name="md_theme_onSecondaryContainer">#101C2B</color>
+    <color name="md_theme_tertiary">#6B5778</color>
+    <color name="md_theme_onTertiary">#FFFFFF</color>
+    <color name="md_theme_tertiaryContainer">#F2DAFF</color>
+    <color name="md_theme_onTertiaryContainer">#251431</color>
+    <color name="md_theme_error">#BA1A1A</color>
+    <color name="md_theme_errorContainer">#FFDAD6</color>
+    <color name="md_theme_onError">#FFFFFF</color>
+    <color name="md_theme_onErrorContainer">#410002</color>
+    <color name="md_theme_background">#FDFCFF</color>
+    <color name="md_theme_onBackground">#1A1C1E</color>
+    <color name="md_theme_surface">#FDFCFF</color>
+    <color name="md_theme_onSurface">#1A1C1E</color>
+    <color name="md_theme_surfaceVariant">#DFE2EB</color>
+    <color name="md_theme_onSurfaceVariant">#43474E</color>
+    <color name="md_theme_outline">#73777F</color>
+    <color name="md_theme_inverseOnSurface">#F1F0F4</color>
+    <color name="md_theme_inverseSurface">#2F3033</color>
+    <color name="md_theme_inversePrimary">#9ECAFF</color>
+    <color name="md_theme_shadow">#000000</color>
+    <color name="md_theme_surfaceTint">#0061A4</color>
+    <color name="md_theme_outlineVariant">#C3C7CF</color>
+    <color name="md_theme_scrim">#000000</color>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 0b206c6b9..1f0a16df8 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-	<style name="ToolbarStyle" parent="Widget.AppCompat.Toolbar">
-		<item name="android:theme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
-		<item name="popupTheme">?popupTheme</item>
-	</style>
-
 	<style name="LineBox">
 		<item name="android:gravity">center_vertical</item>
 		<item name="android:maxLines">1</item>
@@ -21,7 +16,7 @@
 		<item name="android:windowExitAnimation">@anim/scale_down</item>
 	</style>
 
-	<style name="FavoriteCard" parent="CardView">
+	<style name="FavoriteCard" parent="Widget.Material3.CardView.Outlined">
 		<item name="android:foreground">?selectableItemBackground</item>
 		<item name="android:clickable">true</item>
 		<item name="android:layout_marginLeft">8dp</item>
@@ -29,14 +24,14 @@
 		<item name="android:layout_marginTop">8dp</item>
 	</style>
 
-	<style name="ContributorsCard" parent="CardView">
-		<item name="cardBackgroundColor">?attr/cardBackgroundColor</item>
-		<item name="cardCornerRadius">2dp</item>
+	<style name="ContributorsCard" parent="Widget.Material3.CardView.Outlined">
+		<item name="cardCornerRadius">8dp</item>
 		<item name="cardUseCompatPadding">true</item>
+		<item name="cardElevation">2dp</item>
 	</style>
 
 	<style name="Button" parent="Widget.AppCompat.Button.Borderless.Colored">
-		<item name="android:textColor">@color/buttonColor</item>
+		<item name="android:textColor">?attr/colorPrimary</item>
 	</style>
 
 	<style name="Divider">
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index eb35ca606..cebc61fe8 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -2,25 +2,47 @@
 <resources>
 
     <!-- App Theme -->
-
     <style name="AppBaseTheme" parent="Theme.Material3.DayNight.NoActionBar">
-        <item name="colorPrimary">@color/primary</item>
-        <item name="colorPrimaryDark">@color/primary_dark</item>
-        <item name="colorAccent">@color/accent</item>
+        <!-- Colors generated using the material theme builder -->
+        <item name="colorPrimary">@color/md_theme_primary</item>
+        <item name="colorOnPrimary">@color/md_theme_onPrimary</item>
+        <item name="colorPrimaryContainer">@color/md_theme_primaryContainer</item>
+        <item name="colorOnPrimaryContainer">@color/md_theme_onPrimaryContainer</item>
+        <item name="colorSecondary">@color/md_theme_secondary</item>
+        <item name="colorOnSecondary">@color/md_theme_onSecondary</item>
+        <item name="colorSecondaryContainer">@color/md_theme_secondaryContainer</item>
+        <item name="colorOnSecondaryContainer">@color/md_theme_onSecondaryContainer</item>
+        <item name="colorTertiary">@color/md_theme_tertiary</item>
+        <item name="colorOnTertiary">@color/md_theme_onTertiary</item>
+        <item name="colorTertiaryContainer">@color/md_theme_tertiaryContainer</item>
+        <item name="colorOnTertiaryContainer">@color/md_theme_onTertiaryContainer</item>
+        <item name="colorError">@color/md_theme_error</item>
+        <item name="colorErrorContainer">@color/md_theme_errorContainer</item>
+        <item name="colorOnError">@color/md_theme_onError</item>
+        <item name="colorOnErrorContainer">@color/md_theme_onErrorContainer</item>
+        <item name="android:colorBackground">@color/md_theme_background</item>
+        <item name="colorOnBackground">@color/md_theme_onBackground</item>
+        <item name="colorSurface">@color/md_theme_surface</item>
+        <item name="colorOnSurface">@color/md_theme_onSurface</item>
+        <item name="colorSurfaceVariant">@color/md_theme_surfaceVariant</item>
+        <item name="colorOnSurfaceVariant">@color/md_theme_onSurfaceVariant</item>
+        <item name="colorOutline">@color/md_theme_outline</item>
+        <item name="colorOnSurfaceInverse">@color/md_theme_inverseOnSurface</item>
+        <item name="colorSurfaceInverse">@color/md_theme_inverseSurface</item>
+        <item name="colorPrimaryInverse">@color/md_theme_inversePrimary</item>
 
         <item name="android:windowAnimationStyle">@style/ActivityAnimation</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
         <item name="windowActionModeOverlay">true</item>
+        <item name="android:statusBarColor">?android:attr/colorBackground</item>
     </style>
 
     <style name="AppDayNightTheme" parent="AppBaseTheme">
-        <item name="colorControlNormal">@color/drawableTintLight</item>
-        <item name="cardBackgroundColor">@color/cardview_light_background</item>
         <item name="mapStyle">@string/mapbox_style_mapbox_streets</item>
         <item name="attributionBackground">#99FFFFFF</item>
 
         <!-- MaterialDrawer specific values -->
-        <item name="material_drawer_background">@color/material_drawer_background</item>
+        <item name="material_drawer_background">?android:colorBackground</item>
         <item name="material_drawer_primary_text">@color/material_drawer_primary_text</item>
         <item name="material_drawer_primary_icon">@color/material_drawer_primary_icon</item>
         <item name="material_drawer_secondary_text">@color/material_drawer_secondary_text</item>

From fbb17526e4fcfb848979cfc14b621a2889c4feef Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Mon, 12 Jun 2023 16:20:39 +0200
Subject: [PATCH 03/60] Fix minor issues and migrate search suggestions style
 to md3

---
 .../transportr/networks/PickTransportNetworkActivity.kt       | 4 +++-
 app/src/main/res/drawable/ic_action_star_empty.xml            | 1 +
 app/src/main/res/layout/activity_pick_transport_network.xml   | 4 +---
 app/src/main/res/layout/fragment_trip_detail.xml              | 1 -
 app/src/main/res/layout/location_item.xml                     | 3 +++
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/de/grobox/transportr/networks/PickTransportNetworkActivity.kt b/app/src/main/java/de/grobox/transportr/networks/PickTransportNetworkActivity.kt
index e2552bc78..10169e1bd 100644
--- a/app/src/main/java/de/grobox/transportr/networks/PickTransportNetworkActivity.kt
+++ b/app/src/main/java/de/grobox/transportr/networks/PickTransportNetworkActivity.kt
@@ -26,6 +26,8 @@ import android.view.MenuItem
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
+import android.widget.TextView
+import androidx.appcompat.widget.Toolbar
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.mikepenz.fastadapter.IItem
@@ -61,7 +63,7 @@ class PickTransportNetworkActivity : TransportrActivity(), ISelectionListener<II
         } else {
             firstStart = false
             supportActionBar?.setDisplayHomeAsUpEnabled(true)
-            findViewById<View>(R.id.firstRunTextView).visibility = GONE
+            findViewById<TextView>(R.id.firstRunTextView).text = ""
         }
         setResult(RESULT_CANCELED)
 
diff --git a/app/src/main/res/drawable/ic_action_star_empty.xml b/app/src/main/res/drawable/ic_action_star_empty.xml
index d563698df..e18bc40fc 100644
--- a/app/src/main/res/drawable/ic_action_star_empty.xml
+++ b/app/src/main/res/drawable/ic_action_star_empty.xml
@@ -1,6 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
 		android:width="24dp"
 		android:height="24dp"
+		android:tint="?colorControlNormal"
 		android:viewportHeight="24.0"
 		android:viewportWidth="24.0">
 	<path
diff --git a/app/src/main/res/layout/activity_pick_transport_network.xml b/app/src/main/res/layout/activity_pick_transport_network.xml
index 1e601da9f..ec1922780 100644
--- a/app/src/main/res/layout/activity_pick_transport_network.xml
+++ b/app/src/main/res/layout/activity_pick_transport_network.xml
@@ -10,8 +10,7 @@
 
 	<com.google.android.material.appbar.AppBarLayout
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
+		android:layout_height="wrap_content">
 
 		<com.google.android.material.appbar.CollapsingToolbarLayout
 			android:layout_width="match_parent"
@@ -34,7 +33,6 @@
 					android:layout_height="wrap_content"
 					android:padding="8dp"
 					android:text="@string/pick_network_first_run"
-					android:textColor="?android:textColorPrimary"
 					android:textSize="16sp"/>
 
 			</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_trip_detail.xml b/app/src/main/res/layout/fragment_trip_detail.xml
index cbf23ec94..bf3322cb7 100644
--- a/app/src/main/res/layout/fragment_trip_detail.xml
+++ b/app/src/main/res/layout/fragment_trip_detail.xml
@@ -29,7 +29,6 @@
 			android:clickable="true"
 			android:focusable="true"
 			android:foreground="?selectableItemBackgroundBorderless"
-			android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
 			android:visibility="gone"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/location_item.xml b/app/src/main/res/layout/location_item.xml
index 2c98c2325..92a55bc62 100644
--- a/app/src/main/res/layout/location_item.xml
+++ b/app/src/main/res/layout/location_item.xml
@@ -4,6 +4,8 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
+	android:paddingHorizontal="12dp"
+	android:paddingVertical="8dp"
 	android:layout_height="wrap_content">
 
 	<ImageView
@@ -25,6 +27,7 @@
 		android:gravity="center_vertical"
 		android:minHeight="32dp"
 		android:padding="3dp"
+		android:layout_marginStart="8dp"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toEndOf="@+id/imageView"
 		app:layout_constraintTop_toTopOf="parent"

From ff56aff7fc94f1623455919962c42485661d0537 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Mon, 12 Jun 2023 16:27:37 +0200
Subject: [PATCH 04/60] Migrate preference dialogs to MD3

---
 .../transportr/settings/SettingsFragment.kt   | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/app/src/main/java/de/grobox/transportr/settings/SettingsFragment.kt b/app/src/main/java/de/grobox/transportr/settings/SettingsFragment.kt
index f72f78c73..1ba045099 100644
--- a/app/src/main/java/de/grobox/transportr/settings/SettingsFragment.kt
+++ b/app/src/main/java/de/grobox/transportr/settings/SettingsFragment.kt
@@ -27,8 +27,10 @@ import androidx.appcompat.app.AppCompatDelegate.*
 import androidx.core.app.ActivityCompat
 import androidx.core.app.ActivityOptionsCompat
 import androidx.lifecycle.Observer
+import androidx.preference.ListPreference
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import de.grobox.transportr.R
 import de.grobox.transportr.TransportrApplication
 import de.grobox.transportr.map.MapActivity
@@ -108,4 +110,24 @@ class SettingsFragment : PreferenceFragmentCompat() {
         }
     }
 
+    override fun onDisplayPreferenceDialog(preference: Preference?) {
+        when (preference) {
+            // show a material design 3 dialog instead of the default md2 preference dialog
+            is ListPreference -> {
+                val currentValueIndex = preference.entryValues.indexOf(preference.value)
+                MaterialAlertDialogBuilder(requireContext())
+                    .setTitle(preference.title)
+                    .setSingleChoiceItems(preference.entries, currentValueIndex) { dialog, index ->
+                        val newValue = preference.entryValues[index]
+                        if (preference.callChangeListener(newValue)) {
+                            preference.value = newValue as String
+                        }
+                        dialog.dismiss()
+                    }
+                    .setNegativeButton(R.string.cancel, null)
+                    .show()
+            }
+            else -> super.onDisplayPreferenceDialog(preference)
+        }
+    }
 }

From 2dcb6ba49d288bc29908c7b980c4571eaec666fe Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Mon, 12 Jun 2023 16:36:58 +0200
Subject: [PATCH 05/60] Improve appearance of transport networks

---
 .../layout/list_item_transport_network.xml    | 25 +++++++++----------
 app/src/main/res/values/styles.xml            |  5 ++++
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/app/src/main/res/layout/list_item_transport_network.xml b/app/src/main/res/layout/list_item_transport_network.xml
index 4609ad80e..b050c4d29 100644
--- a/app/src/main/res/layout/list_item_transport_network.xml
+++ b/app/src/main/res/layout/list_item_transport_network.xml
@@ -9,29 +9,31 @@
 	android:background="@drawable/selector_list_item_background"
 	android:orientation="horizontal">
 
-	<ImageView
+	<com.google.android.material.imageview.ShapeableImageView
 		android:id="@+id/logo"
+		android:layout_marginStart="10dp"
+		android:layout_marginVertical="8dp"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:contentDescription="@string/network"
 		app:layout_constraintLeft_toLeftOf="parent"
 		app:layout_constraintTop_toTopOf="parent"
-		tools:src="@drawable/network_placeholder"/>
+		app:layout_constraintBottom_toBottomOf="parent"
+		tools:src="@drawable/network_placeholder"
+		app:shapeAppearanceOverlay="@style/RoundedImageView" />
 
 	<TextView
 		android:id="@+id/name"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
+		android:layout_marginVertical="8dp"
+		android:layout_marginStart="16dp"
 		android:layout_marginEnd="8dp"
-		android:layout_marginLeft="8dp"
-		android:layout_marginRight="8dp"
-		android:layout_marginStart="8dp"
-		android:layout_marginTop="8dp"
 		android:textColor="?android:attr/textColorPrimary"
 		android:textSize="15sp"
 		app:layout_constraintLeft_toRightOf="@+id/logo"
 		app:layout_constraintRight_toLeftOf="@+id/status"
-		app:layout_constraintTop_toTopOf="@+id/logo"
+		app:layout_constraintTop_toTopOf="parent"
 		tools:layout_constraintLeft_creator="1"
 		tools:layout_constraintTop_creator="1"
 		tools:text="Network Name"/>
@@ -39,7 +41,7 @@
 	<TextView
 		android:id="@+id/status"
 		android:layout_width="wrap_content"
-		android:layout_height="0dp"
+		android:layout_height="wrap_content"
 		android:layout_marginEnd="8dp"
 		android:layout_marginRight="8dp"
 		android:gravity="center"
@@ -53,12 +55,9 @@
 		android:id="@+id/desc"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_marginBottom="8dp"
+		android:layout_marginVertical="8dp"
+		android:layout_marginStart="16dp"
 		android:layout_marginEnd="8dp"
-		android:layout_marginLeft="8dp"
-		android:layout_marginRight="8dp"
-		android:layout_marginStart="8dp"
-		android:layout_marginTop="8dp"
 		android:textColor="?android:attr/textColorSecondary"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintLeft_toRightOf="@+id/logo"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 1f0a16df8..2175d7c74 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -65,4 +65,9 @@
 		<item name="mapbox_foregroundDrawable">@drawable/mapbox_user_icon_old</item>
 	</style>
 
+	<style name="RoundedImageView">
+		<item name="cornerFamily">rounded</item>
+		<item name="cornerSize">8dp</item>
+	</style>
+
 </resources>

From 03f51cc5c847b8b0c1f3767f516c9f00f2012bf1 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Mon, 24 Jul 2023 09:54:16 +0200
Subject: [PATCH 06/60] Rewrite navigation drawer for Material Design 3

---
 .idea/codeStyles/Project.xml                  |   3 -
 app/build.gradle                              |   1 -
 .../departures/DeparturesActivity.java        |   4 +-
 .../locations/SpecialLocationFragment.kt      |   7 +-
 .../grobox/transportr/map/DrawerActivity.kt   | 167 ------------------
 .../grobox/transportr/map/GpsMapFragment.kt   |  17 +-
 .../de/grobox/transportr/map/MapActivity.java | 101 ++++++++++-
 .../trips/detail/TripDetailFragment.kt        |   7 +-
 .../de/grobox/transportr/utils/DateUtils.kt   |   4 +-
 app/src/main/res/layout/activity_map.xml      | 127 +++++++------
 app/src/main/res/layout/fragment_trip_map.xml |   4 +-
 .../res/layout/header_navigation_drawer.xml   |  58 ++++++
 app/src/main/res/menu/drawer_menu.xml         |  14 ++
 app/src/main/res/values-night/themes.xml      |  12 --
 app/src/main/res/values-v23/themes.xml        |  23 ---
 app/src/main/res/values/colors.xml            |  10 +-
 app/src/main/res/values/strings.xml           |   1 +
 app/src/main/res/values/styles.xml            |   2 +-
 app/src/main/res/values/themes.xml            |  16 +-
 app/witness.gradle                            |   7 +-
 20 files changed, 277 insertions(+), 308 deletions(-)
 delete mode 100644 app/src/main/java/de/grobox/transportr/map/DrawerActivity.kt
 create mode 100644 app/src/main/res/layout/header_navigation_drawer.xml
 create mode 100644 app/src/main/res/menu/drawer_menu.xml
 delete mode 100644 app/src/main/res/values-v23/themes.xml

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 82e269184..af0734dba 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -36,9 +36,6 @@
     <JetCodeStyleSettings>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
-    <XML>
-      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-    </XML>
     <codeStyleSettings language="Groovy">
       <indentOptions>
         <option name="USE_TAB_CHARACTER" value="true" />
diff --git a/app/build.gradle b/app/build.gradle
index 8198db768..190a0678d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -124,7 +124,6 @@ dependencies {
 	implementation 'com.github.omadahealth:swipy:1.2.3'
 	implementation 'de.cketti.library.changelog:ckchangelog:1.2.2'
 	implementation 'com.google.android:flexbox:0.3.2'
-	implementation 'com.mikepenz:materialdrawer:6.1.1'
 	implementation 'com.mikepenz:aboutlibraries:6.2.0'
 	implementation "com.mikepenz:fastadapter:$fastadapterVersion"
 	implementation "com.mikepenz:fastadapter-commons:$fastadapterVersion"
diff --git a/app/src/main/java/de/grobox/transportr/departures/DeparturesActivity.java b/app/src/main/java/de/grobox/transportr/departures/DeparturesActivity.java
index 37ce0465f..d0a790da5 100644
--- a/app/src/main/java/de/grobox/transportr/departures/DeparturesActivity.java
+++ b/app/src/main/java/de/grobox/transportr/departures/DeparturesActivity.java
@@ -20,6 +20,7 @@
 package de.grobox.transportr.departures;
 
 import android.content.Intent;
+import android.graphics.Color;
 import android.os.Bundle;
 import android.os.CountDownTimer;
 import androidx.annotation.NonNull;
@@ -40,6 +41,7 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.google.android.material.color.MaterialColors;
 import com.omadahealth.github.swipyrefreshlayout.library.SwipyRefreshLayout;
 import com.omadahealth.github.swipyrefreshlayout.library.SwipyRefreshLayoutDirection;
 
@@ -121,7 +123,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
 
 		// Swipe to Refresh
 		swipe = findViewById(R.id.swipe);
-		swipe.setColorSchemeResources(R.color.accent);
+		swipe.setColorSchemeColors(MaterialColors.getColor(this, R.attr.colorPrimary, Color.TRANSPARENT));
 		swipe.setDirection(SwipyRefreshLayoutDirection.BOTH);
 		swipe.setDistanceToTriggerSync(getDragDistance(this));
 		swipe.setOnRefreshListener(direction -> loadMoreDepartures(direction != TOP));
diff --git a/app/src/main/java/de/grobox/transportr/favorites/locations/SpecialLocationFragment.kt b/app/src/main/java/de/grobox/transportr/favorites/locations/SpecialLocationFragment.kt
index dfed216bc..5ae0fd4c7 100644
--- a/app/src/main/java/de/grobox/transportr/favorites/locations/SpecialLocationFragment.kt
+++ b/app/src/main/java/de/grobox/transportr/favorites/locations/SpecialLocationFragment.kt
@@ -19,6 +19,7 @@
 
 package de.grobox.transportr.favorites.locations
 
+import android.app.Activity
 import android.content.DialogInterface
 import android.os.Bundle
 import android.view.Gravity
@@ -26,11 +27,11 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.WindowManager.LayoutParams
+import android.view.inputmethod.InputMethodManager
 import androidx.annotation.StringRes
 import androidx.fragment.app.DialogFragment
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
-import com.mikepenz.materialize.util.KeyboardUtil
 import de.grobox.transportr.AppComponent
 import de.grobox.transportr.R
 import de.grobox.transportr.TransportrApplication
@@ -43,6 +44,7 @@ import de.grobox.transportr.settings.SettingsManager
 import javax.annotation.ParametersAreNonnullByDefault
 import javax.inject.Inject
 
+
 @ParametersAreNonnullByDefault
 abstract class SpecialLocationFragment : DialogFragment(), LocationView.LocationViewListener {
 
@@ -105,7 +107,8 @@ abstract class SpecialLocationFragment : DialogFragment(), LocationView.Location
     }
 
     override fun onCancel(dialog: DialogInterface) {
-        KeyboardUtil.hideKeyboard(activity)
+        val imm = activity?.getSystemService(Activity.INPUT_METHOD_SERVICE) as InputMethodManager?
+        imm?.hideSoftInputFromWindow(requireActivity().currentFocus?.windowToken, 0)
     }
 
     override fun onLocationItemClick(loc: WrapLocation, type: FavLocationType) {
diff --git a/app/src/main/java/de/grobox/transportr/map/DrawerActivity.kt b/app/src/main/java/de/grobox/transportr/map/DrawerActivity.kt
deleted file mode 100644
index 7a60d88b0..000000000
--- a/app/src/main/java/de/grobox/transportr/map/DrawerActivity.kt
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- *    Transportr
- *
- *    Copyright (c) 2013 - 2021 Torsten Grote
- *
- *    This program is Free Software: you can redistribute it and/or modify
- *    it under the terms of the GNU General Public License as
- *    published by the Free Software Foundation, either version 3 of the
- *    License, or (at your option) any later version.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package de.grobox.transportr.map
-
-import android.content.Intent
-import android.net.Uri
-import android.os.Bundle
-import androidx.annotation.DrawableRes
-import androidx.annotation.StringRes
-import androidx.core.app.ActivityCompat
-import androidx.core.app.ActivityOptionsCompat.makeScaleUpAnimation
-import androidx.recyclerview.widget.RecyclerView.NO_POSITION
-import android.view.View
-import com.mikepenz.materialdrawer.AccountHeader
-import com.mikepenz.materialdrawer.AccountHeaderBuilder
-import com.mikepenz.materialdrawer.Drawer
-import com.mikepenz.materialdrawer.DrawerBuilder
-import com.mikepenz.materialdrawer.model.DividerDrawerItem
-import com.mikepenz.materialdrawer.model.PrimaryDrawerItem
-import com.mikepenz.materialdrawer.model.ProfileDrawerItem
-import com.mikepenz.materialize.util.KeyboardUtil
-import de.grobox.transportr.R
-import de.grobox.transportr.TransportrActivity
-import de.grobox.transportr.about.AboutActivity
-import de.grobox.transportr.about.ContributorsActivity
-import de.grobox.transportr.networks.PickTransportNetworkActivity
-import de.grobox.transportr.networks.TransportNetwork
-import de.grobox.transportr.settings.SettingsActivity
-import de.grobox.transportr.ui.TransportrChangeLog
-
-internal abstract class DrawerActivity : TransportrActivity() {
-
-    private lateinit var drawer: Drawer
-    private lateinit var accountHeader: AccountHeader
-
-    protected fun setupDrawer(savedInstanceState: Bundle?) {
-        // Accounts aka TransportNetworks
-        accountHeader = AccountHeaderBuilder()
-            .withActivity(this)
-            .withHeaderBackground(R.drawable.account_header_background)
-            .withDividerBelowHeader(true)
-            .withSelectionListEnabled(false)
-            .withThreeSmallProfileImages(true)
-            .withOnAccountHeaderListener { view, profile, currentProfile ->
-                if (currentProfile) {
-                    openPickNetworkProviderActivity(view)
-                    true
-                } else if (profile != null && profile is ProfileDrawerItem) {
-                    val network = profile.tag as TransportNetwork
-                    manager.setTransportNetwork(network)
-                    false
-                } else {
-                    false
-                }
-            }
-            .withOnAccountHeaderSelectionViewClickListener { view, _ ->
-                openPickNetworkProviderActivity(view)
-                true
-            }
-            .withSavedInstance(savedInstanceState)
-            .build()
-
-        // Drawer
-        drawer = DrawerBuilder()
-            .withActivity(this)
-            .withAccountHeader(accountHeader)
-            .addDrawerItems(
-                getDrawerItem(R.string.drawer_settings, R.drawable.ic_action_settings) {
-                    val intent = Intent(this, SettingsActivity::class.java)
-                    startActivity(intent)
-                },
-                DividerDrawerItem(),
-                getDrawerItem(R.string.drawer_changelog, R.drawable.ic_action_changelog) {
-                    TransportrChangeLog(this, settingsManager).getMaterialDialog(true).show()
-                },
-                getDrawerItem(R.string.drawer_contributors, R.drawable.ic_people) {
-                    val intent = Intent(this, ContributorsActivity::class.java)
-                    startActivity(intent)
-                },
-                getDrawerItem(R.string.drawer_report_issue, R.drawable.ic_bug_report) {
-                    val intent = Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.bug_tracker)))
-                    startActivity(intent)
-                },
-                getDrawerItem(R.string.drawer_about, R.drawable.ic_action_about) {
-                    val intent = Intent(this, AboutActivity::class.java)
-                    startActivity(intent)
-                }
-            )
-            .withOnDrawerListener(object : Drawer.OnDrawerListener {
-                override fun onDrawerOpened(drawerView: View) {
-                    KeyboardUtil.hideKeyboard(this@DrawerActivity)
-                }
-
-                override fun onDrawerClosed(drawerView: View) {}
-
-                override fun onDrawerSlide(drawerView: View, slideOffset: Float) {}
-            })
-            .withFireOnInitialOnClick(false)
-            .withShowDrawerOnFirstLaunch(false)
-            .withSavedInstance(savedInstanceState)
-            .withSelectedItem(NO_POSITION.toLong())
-            .build()
-
-        // add transport networks to header
-        addAccounts()
-    }
-
-    private fun getDrawerItem(@StringRes name: Int, @DrawableRes icon: Int, onClick: () -> Unit): PrimaryDrawerItem {
-        return PrimaryDrawerItem()
-            .withName(name)
-            .withIcon(icon)
-            .withIconTintingEnabled(true)
-            .withSelectable(false)
-            .withOnDrawerItemClickListener { _, _, _ ->
-                closeDrawer()
-                onClick.invoke()
-                return@withOnDrawerItemClickListener true
-            }
-    }
-
-    private fun addAccounts() {
-        manager.transportNetwork.value?.let { addAccountItem(it) }
-        manager.getTransportNetwork(2)?.let { addAccountItem(it) }
-        manager.getTransportNetwork(3)?.let { addAccountItem(it) }
-    }
-
-    private fun addAccountItem(network: TransportNetwork) {
-        val item = ProfileDrawerItem()
-            .withName(network.getName(this))
-            .withEmail(network.getDescription(this))
-            .withIcon(network.logo)
-            .withTag(network)
-        accountHeader.addProfile(item, accountHeader.profiles.size)
-    }
-
-    private fun openPickNetworkProviderActivity(view: View) {
-        val intent = Intent(this, PickTransportNetworkActivity::class.java)
-        val options = makeScaleUpAnimation(view, 0, 0, 0, 0)
-        ActivityCompat.startActivity(this, intent, options.toBundle())
-    }
-
-    protected fun openDrawer() {
-        drawer.openDrawer()
-    }
-
-    protected fun closeDrawer() {
-        drawer.closeDrawer()
-    }
-
-}
diff --git a/app/src/main/java/de/grobox/transportr/map/GpsMapFragment.kt b/app/src/main/java/de/grobox/transportr/map/GpsMapFragment.kt
index 002081046..e3becbaad 100644
--- a/app/src/main/java/de/grobox/transportr/map/GpsMapFragment.kt
+++ b/app/src/main/java/de/grobox/transportr/map/GpsMapFragment.kt
@@ -26,6 +26,7 @@ import android.content.pm.PackageManager.PERMISSION_GRANTED
 import android.content.res.ColorStateList
 import android.graphics.BlendMode
 import android.graphics.BlendModeColorFilter
+import android.graphics.Color
 import android.graphics.PorterDuff
 import android.location.Location
 import android.os.Build
@@ -39,6 +40,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
+import com.google.android.material.color.MaterialColors
 import com.mapbox.mapboxsdk.camera.CameraUpdateFactory
 import com.mapbox.mapboxsdk.camera.CameraUpdateFactory.newLatLng
 import com.mapbox.mapboxsdk.camera.CameraUpdateFactory.newLatLngZoom
@@ -195,16 +197,19 @@ abstract class GpsMapFragment : BaseMapFragment(), LocationEngineListener {
 
     private fun onNewGpsState(gpsState: GpsState) {
         // Floating GPS Action Button Style
-        var iconColor = ContextCompat.getColor(context, R.color.fabForegroundInitial)
-        var backgroundColor = ColorStateList.valueOf(ContextCompat.getColor(context, R.color.fabBackground))
+        var iconColorAttr = R.attr.colorOnSurface
+        var backgroundColorAttr = R.attr.colorSurface
         if (gpsState.hasFix && !gpsState.isOld && !gpsState.isTracking) {
-            iconColor = ContextCompat.getColor(context, R.color.fabForegroundMoved)
-            backgroundColor = ColorStateList.valueOf(ContextCompat.getColor(context, R.color.fabBackgroundMoved))
+            iconColorAttr = R.attr.colorOnPrimary
+            backgroundColorAttr = R.attr.colorPrimary
         } else if (gpsState.hasFix && !gpsState.isOld && gpsState.isTracking) {
-            iconColor = ContextCompat.getColor(context, R.color.fabForegroundFollow)
+            iconColorAttr = R.attr.colorOnSecondary
+            backgroundColorAttr = R.attr.colorSecondary
         }
+        val iconColor = MaterialColors.getColor(context, iconColorAttr, Color.TRANSPARENT)
+        val backgroundColor = MaterialColors.getColor(context, backgroundColorAttr, Color.TRANSPARENT)
         gpsFab.drawable.setColorFilter(iconColor, PorterDuff.Mode.SRC_IN)
-        gpsFab.backgroundTintList = backgroundColor
+        gpsFab.backgroundTintList = ColorStateList.valueOf(backgroundColor)
 
         // Location Marker Icon Style
         locationPlugin?.applyStyle(if (gpsState.isOld) R.style.LocationLayerOld else R.style.LocationLayer)
diff --git a/app/src/main/java/de/grobox/transportr/map/MapActivity.java b/app/src/main/java/de/grobox/transportr/map/MapActivity.java
index ca67b2f07..61960bccd 100644
--- a/app/src/main/java/de/grobox/transportr/map/MapActivity.java
+++ b/app/src/main/java/de/grobox/transportr/map/MapActivity.java
@@ -19,16 +19,23 @@
 
 package de.grobox.transportr.map;
 
+import android.app.Activity;
 import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;
 import android.os.StrictMode;
 import android.os.StrictMode.ThreadPolicy;
 import android.os.StrictMode.VmPolicy;
+import android.view.MenuItem;
 import android.view.View;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.ImageView;
+import android.widget.TextView;
 
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
 import com.google.android.material.bottomsheet.BottomSheetBehavior.BottomSheetCallback;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.navigation.NavigationView;
 import com.mapbox.mapboxsdk.geometry.LatLng;
 
 import javax.annotation.ParametersAreNonnullByDefault;
@@ -36,15 +43,22 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.app.ActivityCompat;
+import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.lifecycle.ViewModelProvider;
 import de.grobox.transportr.BuildConfig;
 import de.grobox.transportr.R;
+import de.grobox.transportr.TransportrActivity;
+import de.grobox.transportr.about.AboutActivity;
+import de.grobox.transportr.about.ContributorsActivity;
 import de.grobox.transportr.data.locations.FavoriteLocation.FavLocationType;
 import de.grobox.transportr.locations.LocationFragment;
 import de.grobox.transportr.locations.LocationView;
 import de.grobox.transportr.locations.LocationView.LocationViewListener;
 import de.grobox.transportr.locations.WrapLocation;
+import de.grobox.transportr.networks.PickTransportNetworkActivity;
 import de.grobox.transportr.networks.TransportNetwork;
+import de.grobox.transportr.settings.SettingsActivity;
 import de.grobox.transportr.ui.TransportrChangeLog;
 import de.grobox.transportr.utils.OnboardingBuilder;
 
@@ -60,7 +74,7 @@
 import static uk.co.samuelwall.materialtaptargetprompt.MaterialTapTargetPrompt.STATE_FOCAL_PRESSED;
 
 @ParametersAreNonnullByDefault
-public class MapActivity extends DrawerActivity implements LocationViewListener {
+public class MapActivity extends TransportrActivity implements LocationViewListener, NavigationView.OnNavigationItemSelectedListener {
 
 	@Inject ViewModelProvider.Factory viewModelFactory;
 
@@ -78,10 +92,16 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
 		if (BuildConfig.DEBUG) enableStrictMode();
 		getComponent().inject(this);
 		setContentView(R.layout.activity_map);
-		setupDrawer(savedInstanceState);
+		setupDrawer();
 
 		View menu = findViewById(R.id.menu);
-		menu.setOnClickListener(view -> openDrawer());
+		menu.setOnClickListener(view -> {
+			InputMethodManager imm = (InputMethodManager) getSystemService(Activity.INPUT_METHOD_SERVICE);
+			View currentFocus = getCurrentFocus();
+			if (currentFocus != null) imm.hideSoftInputFromWindow(currentFocus.getWindowToken(), 0);
+			DrawerLayout drawer = findViewById(R.id.drawerLayout);
+			drawer.open();
+		});
 
 		search = findViewById(R.id.search);
 		search.setLocationViewListener(this);
@@ -162,6 +182,54 @@ private void onTransportNetworkChanged(TransportNetwork network) {
 		}
 	}
 
+	private void setupDrawer() {
+		NavigationView navigationView = findViewById(R.id.navigationView);
+		navigationView.setNavigationItemSelectedListener(this);
+		View header = navigationView.getHeaderView(0);
+		TransportNetwork network = manager.getTransportNetwork().getValue();
+		header.setOnClickListener(view -> {
+			openPickNetworkProviderActivity();
+		});
+		if (network != null) {
+			TextView title = header.findViewById(R.id.network_name);
+			TextView description = header.findViewById(R.id.network_description);
+			ImageView image = header.findViewById(R.id.network_image);
+			title.setText(network.getName(this));
+			description.setText(network.getDescription(this));
+			image.setImageResource(network.getLogo());
+		}
+		TransportNetwork networkTwo = manager.getTransportNetwork(2);
+		TransportNetwork networkThree = manager.getTransportNetwork(3);
+
+		if (networkTwo != null) {
+			ImageView image = header.findViewById(R.id.network_image_two);
+			image.setImageResource(networkTwo.getLogo());
+			image.setOnClickListener(view -> {
+				manager.setTransportNetwork(networkTwo);
+				closeDrawer();
+			});
+		}
+
+		if (networkThree != null) {
+			ImageView image = header.findViewById(R.id.network_image_three);
+			image.setImageResource(networkThree.getLogo());
+			image.setOnClickListener(view -> {
+				manager.setTransportNetwork(networkThree);
+				closeDrawer();
+			});
+		}
+	}
+
+	private void closeDrawer() {
+		DrawerLayout drawer = findViewById(R.id.drawerLayout);
+		drawer.close();
+	}
+
+	private void openPickNetworkProviderActivity() {
+		Intent intent = new Intent(this, PickTransportNetworkActivity.class);
+		ActivityCompat.startActivity(this, intent, null);
+	}
+
 	@Override
 	public void onLocationItemClick(final WrapLocation loc, FavLocationType type) {
 		viewModel.selectLocation(loc);
@@ -252,4 +320,31 @@ private void enableStrictMode() {
 		StrictMode.setVmPolicy(vmPolicy.build());
 	}
 
+	@Override
+	public boolean onNavigationItemSelected(@NonNull MenuItem item) {
+		switch (item.getItemId()) {
+			case R.id.settings: {
+				startActivity(new Intent(this, SettingsActivity.class));
+				break;
+			}
+			case R.id.changelog: {
+				new TransportrChangeLog(this, settingsManager).getMaterialDialog(true).show();
+				break;
+			}
+			case R.id.about: {
+				startActivity(new Intent(this, AboutActivity.class));
+				break;
+			}
+			case R.id.contributors: {
+				startActivity(new Intent(this, ContributorsActivity.class));
+				break;
+			}
+			case R.id.bug_report: {
+				startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.bug_tracker))));
+				break;
+			}
+		}
+		closeDrawer();
+		return true;
+	}
 }
diff --git a/app/src/main/java/de/grobox/transportr/trips/detail/TripDetailFragment.kt b/app/src/main/java/de/grobox/transportr/trips/detail/TripDetailFragment.kt
index c6270feb0..7a74e7f7a 100644
--- a/app/src/main/java/de/grobox/transportr/trips/detail/TripDetailFragment.kt
+++ b/app/src/main/java/de/grobox/transportr/trips/detail/TripDetailFragment.kt
@@ -176,10 +176,11 @@ class TripDetailFragment : TransportrFragment(), Toolbar.OnMenuItemClickListener
             MIDDLE -> {
                 toolbar.visibility = GONE
                 topBar.visibility = VISIBLE
+                val textColor = context.getColorFromAttr(android.R.attr.textColorPrimary)
                 topBar.setBackgroundColor(context.getColorFromAttr(R.attr.colorPrimary))
-                fromTimeRel.setTextColor(getColor(context, R.color.md_white_1000))
-                durationTop.setTextColor(getColor(context, R.color.md_white_1000))
-                priceTop.setTextColor(getColor(context, R.color.md_white_1000))
+                fromTimeRel.setTextColor(textColor)
+                durationTop.setTextColor(textColor)
+                priceTop.setTextColor(textColor)
                 bottomBar.visibility = GONE
             }
             EXPANDED -> {
diff --git a/app/src/main/java/de/grobox/transportr/utils/DateUtils.kt b/app/src/main/java/de/grobox/transportr/utils/DateUtils.kt
index 9618707dd..158696d99 100644
--- a/app/src/main/java/de/grobox/transportr/utils/DateUtils.kt
+++ b/app/src/main/java/de/grobox/transportr/utils/DateUtils.kt
@@ -19,10 +19,12 @@
 package de.grobox.transportr.utils
 
 import android.content.Context
+import android.graphics.Color
 import android.text.format.DateFormat
 import android.text.format.DateUtils
 import android.view.View
 import androidx.core.content.ContextCompat
+import com.google.android.material.color.MaterialColors
 import de.grobox.transportr.R
 import java.util.*
 import kotlin.math.abs
@@ -71,7 +73,7 @@ object DateUtils {
         val delayMinutes = millisToMinutes(delay)
         return Delay(
             delay = "${if (delayMinutes >= 0) '+' else ""}$delayMinutes",
-            color = ContextCompat.getColor(context, if (delayMinutes > 0) R.color.md_red_500 else R.color.md_green_500)
+            color = MaterialColors.getColor(context, if (delayMinutes > 0) R.attr.colorError else R.attr.colorPrimary, Color.TRANSPARENT)
         )
     }
 
diff --git a/app/src/main/res/layout/activity_map.xml b/app/src/main/res/layout/activity_map.xml
index 7101631dc..fb79db1e9 100644
--- a/app/src/main/res/layout/activity_map.xml
+++ b/app/src/main/res/layout/activity_map.xml
@@ -1,74 +1,89 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:id="@+id/drawerLayout"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:fitsSystemWindows="true">
 
-	<fragment
-		android:id="@+id/mapFragment"
-		android:name="de.grobox.transportr.map.MapFragment"
+	<androidx.coordinatorlayout.widget.CoordinatorLayout
 		android:layout_width="match_parent"
-		android:layout_height="match_parent"/>
+		android:layout_height="match_parent">
 
-	<com.google.android.material.card.MaterialCardView
-		android:layout_width="match_parent"
-		android:layout_height="48dp"
-		android:layout_marginEnd="16dp"
-		android:layout_marginLeft="16dp"
-		android:layout_marginRight="16dp"
-		android:layout_marginStart="16dp"
-		android:layout_marginTop="16dp">
+		<fragment
+			android:id="@+id/mapFragment"
+			android:name="de.grobox.transportr.map.MapFragment"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent" />
 
-		<ImageButton
-			android:id="@+id/menu"
-			android:layout_width="48dp"
+		<com.google.android.material.card.MaterialCardView
+			android:layout_width="match_parent"
 			android:layout_height="48dp"
-			android:background="?attr/selectableItemBackground"
+			android:layout_marginStart="16dp"
+			android:layout_marginLeft="16dp"
+			android:layout_marginTop="16dp"
+			android:layout_marginEnd="16dp"
+			android:layout_marginRight="16dp">
+
+			<ImageButton
+				android:id="@+id/menu"
+				android:layout_width="48dp"
+				android:layout_height="48dp"
+				android:background="?attr/selectableItemBackground"
+				android:clickable="true"
+				android:contentDescription="@string/material_drawer_open"
+				android:focusable="true"
+				android:scaleType="center"
+				android:src="@drawable/ic_menu_black"
+				app:srcCompat="@drawable/ic_menu_black"
+				app:tint="?colorControlNormal" />
+
+			<de.grobox.transportr.locations.LocationView
+				android:id="@+id/search"
+				android:layout_width="match_parent"
+				android:layout_height="match_parent"
+				android:layout_marginStart="48dp"
+				android:layout_marginLeft="48dp"
+				android:gravity="center_vertical"
+				app:elevation="@dimen/cardview_default_elevation"
+				app:hint="@string/search_hint"
+				app:showIcon="false" />
+
+		</com.google.android.material.card.MaterialCardView>
+
+		<com.google.android.material.floatingactionbutton.FloatingActionButton
+			android:id="@+id/directionsFab"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="bottom|end"
+			android:layout_marginEnd="16dp"
+			android:layout_marginRight="16dp"
+			android:layout_marginBottom="88dp"
 			android:clickable="true"
-			android:contentDescription="@string/material_drawer_open"
 			android:focusable="true"
-			android:scaleType="center"
-			android:src="@drawable/ic_menu_black"
-			app:tint="?colorControlNormal"
-			app:srcCompat="@drawable/ic_menu_black"/>
+			app:behavior_autoHide="true"
+			app:fabSize="normal"
+			app:layout_anchor="@+id/bottomSheet"
+			app:layout_anchorGravity="top|end"
+			app:srcCompat="@drawable/ic_menu_directions" />
 
-		<de.grobox.transportr.locations.LocationView
-			android:id="@+id/search"
+		<FrameLayout
+			android:id="@+id/bottomSheet"
 			android:layout_width="match_parent"
-			android:layout_height="match_parent"
-			android:layout_marginLeft="48dp"
-			android:layout_marginStart="48dp"
-			android:gravity="center_vertical"
-			app:elevation="@dimen/cardview_default_elevation"
-			app:hint="@string/search_hint"
-			app:showIcon="false"/>
+			android:layout_height="wrap_content"
+			app:behavior_hideable="true"
+			app:elevation="5dp"
+			app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior" />
 
-	</com.google.android.material.card.MaterialCardView>
+	</androidx.coordinatorlayout.widget.CoordinatorLayout>
 
-	<com.google.android.material.floatingactionbutton.FloatingActionButton
-		android:id="@+id/directionsFab"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_gravity="bottom|end"
-		android:layout_marginBottom="88dp"
-		android:layout_marginEnd="16dp"
-		android:layout_marginRight="16dp"
-		android:clickable="true"
-		android:focusable="true"
-		app:behavior_autoHide="true"
-		app:fabSize="normal"
-		app:layout_anchor="@+id/bottomSheet"
-		app:layout_anchorGravity="top|end"
-		app:srcCompat="@drawable/ic_menu_directions"/>
 
-	<FrameLayout
-		android:id="@+id/bottomSheet"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		app:behavior_hideable="true"
-		app:elevation="5dp"
-		app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"/>
+	<com.google.android.material.navigation.NavigationView
+		app:menu="@menu/drawer_menu"
+		android:id="@+id/navigationView"
+		android:layout_width="wrap_content"
+		android:layout_height="match_parent"
+		app:headerLayout="@layout/header_navigation_drawer"
+		android:layout_gravity="start" />
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
+</androidx.drawerlayout.widget.DrawerLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_trip_map.xml b/app/src/main/res/layout/fragment_trip_map.xml
index 196d797ae..0bfa36acd 100644
--- a/app/src/main/res/layout/fragment_trip_map.xml
+++ b/app/src/main/res/layout/fragment_trip_map.xml
@@ -48,8 +48,8 @@
 		android:layout_margin="16dp"
 		android:clickable="true"
 		android:focusable="true"
-		android:tint="@color/fabForegroundInitial"
-		app:backgroundTint="@color/fabBackground"
+		app:backgroundTint="?colorSurface"
+		android:tint="?colorOnSurface"
 		app:behavior_autoHide="true"
 		app:fabSize="normal"
 		app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/header_navigation_drawer.xml b/app/src/main/res/layout/header_navigation_drawer.xml
new file mode 100644
index 000000000..af9f5fc52
--- /dev/null
+++ b/app/src/main/res/layout/header_navigation_drawer.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:orientation="vertical"
+	android:id="@+id/drawer_header"
+	android:layout_marginStart="20dp"
+	android:fitsSystemWindows="true">
+
+	<LinearLayout
+		android:layout_marginTop="50dp"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="horizontal">
+
+		<com.google.android.material.imageview.ShapeableImageView
+			android:id="@+id/network_image"
+			android:layout_width="60dp"
+			android:layout_height="60dp"
+			app:shapeAppearanceOverlay="@style/RoundedImageView"
+			android:layout_marginBottom="20dp"/>
+
+		<View
+			android:layout_width="0dp"
+			android:layout_weight="1"
+			android:layout_height="0px" />
+
+		<com.google.android.material.imageview.ShapeableImageView
+			android:id="@+id/network_image_two"
+			android:layout_width="30dp"
+			android:layout_height="30dp"
+			app:shapeAppearanceOverlay="@style/RoundedImageView"
+			android:layout_marginBottom="20dp"/>
+
+		<com.google.android.material.imageview.ShapeableImageView
+			android:id="@+id/network_image_three"
+			android:layout_width="30dp"
+			android:layout_height="30dp"
+			android:layout_marginStart="10dp"
+			app:shapeAppearanceOverlay="@style/RoundedImageView"
+			android:layout_marginBottom="20dp"/>
+
+	</LinearLayout>
+
+	<TextView
+		android:id="@+id/network_name"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:textSize="20sp" />
+
+	<TextView
+		android:id="@+id/network_description"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginBottom="30dp" />
+
+</LinearLayout>
diff --git a/app/src/main/res/menu/drawer_menu.xml b/app/src/main/res/menu/drawer_menu.xml
new file mode 100644
index 000000000..d1d8e39e5
--- /dev/null
+++ b/app/src/main/res/menu/drawer_menu.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+	<group>
+		<item android:id="@+id/settings" android:title="@string/drawer_settings" android:icon="@drawable/ic_action_settings"/>
+	</group>
+
+	<group>
+		<item android:id="@+id/changelog" android:title="@string/drawer_changelog" android:icon="@drawable/ic_action_changelog"/>
+		<item android:id="@+id/contributors" android:title="@string/drawer_contributors" android:icon="@drawable/ic_people"/>
+		<item android:id="@+id/bug_report" android:title="@string/drawer_report_issue" android:icon="@drawable/ic_bug_report"/>
+		<item android:id="@+id/about" android:title="@string/drawer_about" android:icon="@drawable/ic_action_about" />
+	</group>
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index add2d9354..5b57a35e1 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -12,18 +12,6 @@
 		<item name="about_libraries_card">@color/cardview_dark_background</item>
 		<item name="about_libraries_title_openSource">@color/about_libraries_title_openSource_dark</item>
 		<item name="about_libraries_text_openSource">@color/about_libraries_text_openSource_dark</item>
-
-		<!-- MaterialDrawer specific values -->
-		<item name="material_drawer_background">?android:colorBackground</item>
-		<item name="material_drawer_primary_text">@color/material_drawer_dark_primary_text</item>
-		<item name="material_drawer_primary_icon">@color/material_drawer_dark_primary_icon</item>
-		<item name="material_drawer_secondary_text">@color/material_drawer_dark_secondary_text</item>
-		<item name="material_drawer_hint_text">@color/material_drawer_dark_hint_text</item>
-		<item name="material_drawer_divider">@color/material_drawer_dark_divider</item>
-		<item name="material_drawer_selected">@color/material_drawer_dark_selected</item> <!-- Material 2 defines 12% alpha, primary color -->
-		<item name="material_drawer_selected_legacy">@color/material_drawer_dark_selected</item> <!-- Defines the color if legacy style (Material 1, is enabled) -->
-		<item name="material_drawer_selected_text">@color/material_drawer_dark_selected_text</item>
-		<item name="material_drawer_header_selection_text">@color/material_drawer_dark_header_selection_text</item>
 	</style>
 
 </resources>
diff --git a/app/src/main/res/values-v23/themes.xml b/app/src/main/res/values-v23/themes.xml
deleted file mode 100644
index 2a9b8b364..000000000
--- a/app/src/main/res/values-v23/themes.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-	<style name="AppDayNightTheme" parent="AppBaseTheme">
-		<item name="mapStyle">@string/mapbox_style_mapbox_streets</item>
-		<item name="attributionBackground">#99FFFFFF</item>
-		<item name="android:windowLightStatusBar">true</item>
-
-		<!-- MaterialDrawer specific values -->
-		<item name="material_drawer_background">?android:colorBackground</item>
-		<item name="material_drawer_primary_text">@color/material_drawer_primary_text</item>
-		<item name="material_drawer_primary_icon">@color/material_drawer_primary_icon</item>
-		<item name="material_drawer_secondary_text">@color/material_drawer_secondary_text</item>
-		<item name="material_drawer_hint_text">@color/material_drawer_hint_text</item>
-		<item name="material_drawer_divider">@color/material_drawer_divider</item>
-		<item name="material_drawer_selected">@color/material_drawer_selected</item> <!-- Material 2 defines 12% alpha, primary color -->
-		<item name="material_drawer_selected_legacy">@color/material_drawer_selected
-		</item> <!-- Defines the color if legacy style (Material 1, is enabled) -->
-		<item name="material_drawer_selected_text">@color/material_drawer_selected_text</item>
-		<item name="material_drawer_header_selection_text">@color/material_drawer_header_selection_text</item>
-		<item name="material_drawer_legacy_style">false</item> <!-- Enables legacy Material 1 style -->
-	</style>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 21d024428..0fc1d08d7 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-
-    <!-- GPS FAB -->
-    <color name="fabBackground">@color/cardview_light_background</color>
-    <color name="fabBackgroundMoved">@color/md_blue_700</color>
-    <color name="fabForegroundInitial">@color/md_grey_600</color>
-    <color name="fabForegroundFollow">@color/fabBackgroundMoved</color>
-    <color name="fabForegroundMoved">@color/md_white_1000</color>
-
+<resources>
     <color name="md_theme_primary">#0061A4</color>
     <color name="md_theme_onPrimary">#FFFFFF</color>
     <color name="md_theme_primaryContainer">#D1E4FF</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6a46d3155..df278e32f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -46,6 +46,7 @@ It also does not use tracking tools such as Google Analytics to spy on you.
 and always knows where you are to not miss where to get off the bus.
 ]]></string>
 
+	<string name="material_drawer_open">Open</string>
 	<string name="drawer_settings">Settings</string>
 	<string name="drawer_changelog">Changelog</string>
 	<string name="drawer_about">About</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 2175d7c74..f49a434af 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -35,7 +35,7 @@
 	</style>
 
 	<style name="Divider">
-		<item name="android:background">@color/md_grey_500</item>
+		<item name="android:background">?colorControlNormal</item>
 		<item name="android:layout_height">1px</item>
 		<item name="android:layout_width">match_parent</item>
 	</style>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index cebc61fe8..12d7df290 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
 
     <!-- App Theme -->
     <style name="AppBaseTheme" parent="Theme.Material3.DayNight.NoActionBar">
@@ -40,19 +40,7 @@
     <style name="AppDayNightTheme" parent="AppBaseTheme">
         <item name="mapStyle">@string/mapbox_style_mapbox_streets</item>
         <item name="attributionBackground">#99FFFFFF</item>
-
-        <!-- MaterialDrawer specific values -->
-        <item name="material_drawer_background">?android:colorBackground</item>
-        <item name="material_drawer_primary_text">@color/material_drawer_primary_text</item>
-        <item name="material_drawer_primary_icon">@color/material_drawer_primary_icon</item>
-        <item name="material_drawer_secondary_text">@color/material_drawer_secondary_text</item>
-        <item name="material_drawer_hint_text">@color/material_drawer_hint_text</item>
-        <item name="material_drawer_divider">@color/material_drawer_divider</item>
-        <item name="material_drawer_selected">@color/material_drawer_selected</item> <!-- Material 2 defines 12% alpha, primary color -->
-        <item name="material_drawer_selected_legacy">@color/material_drawer_selected</item> <!-- Defines the color if legacy style (Material 1, is enabled) -->
-        <item name="material_drawer_selected_text">@color/material_drawer_selected_text</item>
-        <item name="material_drawer_header_selection_text">@color/material_drawer_header_selection_text</item>
-        <item name="material_drawer_legacy_style">false</item> <!-- Enables legacy Material 1 style -->
+        <item name="android:windowLightStatusBar" tools:targetApi="m">true</item>
     </style>
 
     <style name="AppTheme" parent="AppDayNightTheme" />
diff --git a/app/witness.gradle b/app/witness.gradle
index c3de1dc5c..66aca1125 100644
--- a/app/witness.gradle
+++ b/app/witness.gradle
@@ -66,6 +66,7 @@ dependencyVerification {
         'androidx.test.espresso:espresso-core:3.3.0:espresso-core-3.3.0.aar:23ebf6014645e0c60aec7d1ed924d4d4c848ae8c3673b7d8d06b2ec6a56cafee',
         'androidx.test.espresso:espresso-idling-resource:3.3.0:espresso-idling-resource-3.3.0.aar:29519b112731f289cc6e2f9b2eccc5ea72c754b04272bb93370f45d7e170a7c6',
         'androidx.test.ext:junit:1.1.2:junit-1.1.2.aar:6c6ab120c640bf16fcaae69cb83c144d0ed6b6298562be0ac35e37ed969c0409',
+        'androidx.test.uiautomator:uiautomator:2.2.0:uiautomator-2.2.0.aar:2838e9d961dbffefbbd229a2bd4f6f82ac4fb2462975862a9e75e9ed325a3197',
         'androidx.test:core:1.4.0:core-1.4.0.aar:671284e62e393f16ceae1a99a3a9a07bf1aacda29f8fe7b6b884355ef34c09cf',
         'androidx.test:monitor:1.4.0:monitor-1.4.0.aar:46a912a1e175f27a97521af3f50e5af87c22c49275dd2c57c043740012806325',
         'androidx.test:rules:1.3.0:rules-1.3.0.aar:c1753946c498b0d5d7cf341cfed661f66915c4c9deb4ed10462a08ae33b2429a',
@@ -116,12 +117,10 @@ dependencyVerification {
         'com.mapbox.mapboxsdk:mapbox-java-geojson:2.2.10:mapbox-java-geojson-2.2.10.jar:a587f7e958ae2750819b4bbbd4ba8d5479ecbbd532b7d825fece52299f0c2e81',
         'com.mapzen.android:lost:3.0.4:lost-3.0.4.aar:7c95374ddd406356a6a3085c93e1a549feb68e919b29a8f0f194bc47f27788c0',
         'com.mikepenz:aboutlibraries:6.2.0:aboutlibraries-6.2.0.aar:12f8a49ec0fd859bc7ae9e62582d1198cf3f88a200a7115f34906f53284907f6',
-        'com.mikepenz:fastadapter-commons:3.3.0:fastadapter-commons-3.3.0.aar:bd6d9d9b3222ad8e8d8ad86e1ec63d3a2ecc44d1684d1ea549563c1357e60c3c',
-        'com.mikepenz:fastadapter-extensions-expandable:3.3.0:fastadapter-extensions-expandable-3.3.0.aar:2effaa42a3b82fd92a37317ebf833b9118e8e176426f11250ba903496aa50db7',
+        'com.mikepenz:fastadapter-commons:3.2.4:fastadapter-commons-3.2.4.aar:4d5860ff1778a37cf33af62e62462ea214d8d4d5939143236b61afb33e4fe842',
+        'com.mikepenz:fastadapter-extensions-expandable:3.2.4:fastadapter-extensions-expandable-3.2.4.aar:a8cfb8e9024bb0126d5c2382dfec62f03113bf34ca405e840abc451cc69c2820',
         'com.mikepenz:fastadapter:3.3.0:fastadapter-3.3.0.aar:1a184e655c554821275a7b9bfe7b13a82aec3109194c6141e8e05dda9aa88cbf',
         'com.mikepenz:iconics-core:3.1.0:iconics-core-3.1.0.aar:eac6d9a2983412dba7e7e9df82206e0d55c9708149d35d21a72479a8b32a8998',
-        'com.mikepenz:materialdrawer:6.1.1:materialdrawer-6.1.1.aar:01d2c1e3b9bb4dbeb9546630afb1494179ed5437443560e2a5159e0f7ed2765b',
-        'com.mikepenz:materialize:1.2.0:materialize-1.2.0.aar:9f676d602932398d2d79ef35127d1777baa91a042b8ad3068a0d647463dec1a7',
         'com.squareup.okhttp3:logging-interceptor:3.12.13:logging-interceptor-3.12.13.jar:ee3cd10a2d667621143156f995d4d0fce1dca2b1f3280dd48d821f92afac580a',
         'com.squareup.okhttp3:okhttp:3.10.0:okhttp-3.10.0.jar:4aca3e552afb1ceb47f8956685f6295a276e49fa03f9066f8b6be83bec56fb66',
         'com.squareup.okhttp3:okhttp:3.12.13:okhttp-3.12.13.jar:508234e024ef7e270ab1a6d5b356f5b98e786511239ca986d684fd1e2cf7bc82',

From 30091fbc3d2c532d8f1e9a0a033eef4529f0524c Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Mon, 31 Jul 2023 09:26:31 +0200
Subject: [PATCH 07/60] remove unneeded tests due to md3 migration

---
 .../java/de/grobox/transportr/trips/detail/LegViewHolder.kt     | 1 -
 .../de/grobox/transportr/trips/detail/TripDetailFragment.kt     | 1 -
 app/src/test/java/de/grobox/transportr/utils/DateUtilsTest.kt   | 2 --
 3 files changed, 4 deletions(-)

diff --git a/app/src/main/java/de/grobox/transportr/trips/detail/LegViewHolder.kt b/app/src/main/java/de/grobox/transportr/trips/detail/LegViewHolder.kt
index a62e85669..5592cdfa5 100644
--- a/app/src/main/java/de/grobox/transportr/trips/detail/LegViewHolder.kt
+++ b/app/src/main/java/de/grobox/transportr/trips/detail/LegViewHolder.kt
@@ -28,7 +28,6 @@ import android.widget.ImageButton
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.annotation.ColorInt
-import androidx.core.content.ContextCompat.getColor
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.color.MaterialColors
diff --git a/app/src/main/java/de/grobox/transportr/trips/detail/TripDetailFragment.kt b/app/src/main/java/de/grobox/transportr/trips/detail/TripDetailFragment.kt
index 7a74e7f7a..92acde5d7 100644
--- a/app/src/main/java/de/grobox/transportr/trips/detail/TripDetailFragment.kt
+++ b/app/src/main/java/de/grobox/transportr/trips/detail/TripDetailFragment.kt
@@ -26,7 +26,6 @@ import android.view.View.GONE
 import android.view.View.VISIBLE
 import android.widget.Toast
 import androidx.appcompat.widget.Toolbar
-import androidx.core.content.ContextCompat.getColor
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
diff --git a/app/src/test/java/de/grobox/transportr/utils/DateUtilsTest.kt b/app/src/test/java/de/grobox/transportr/utils/DateUtilsTest.kt
index 50ef7d84c..cc41a73d3 100644
--- a/app/src/test/java/de/grobox/transportr/utils/DateUtilsTest.kt
+++ b/app/src/test/java/de/grobox/transportr/utils/DateUtilsTest.kt
@@ -79,8 +79,6 @@ class DateUtilsTest {
     fun initMocks() {
         MockitoAnnotations.initMocks(this)
         `when`(context.resources).thenReturn(resources)
-        `when`(resources.getColor(R.color.md_green_500)).thenReturn(GREEN)
-        `when`(resources.getColor(R.color.md_red_500)).thenReturn(RED)
 
         `when`(context.getString(R.string.now_small)).thenReturn(getNow())
         `when`(context.getString(eq(R.string.in_x_minutes), anyLong())).thenAnswer { i -> getIn(i.arguments[1]) }

From cd2ae56bd6f98f7f21c4ed43c44daa92285e2d4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20N=C3=BCsse?= <felix.nuesse@t-online.de>
Date: Fri, 12 Jan 2024 21:43:14 +0100
Subject: [PATCH 08/60] make material 3 more colorful

---
 .../trips/detail/TripDetailFragment.kt        |  11 +-
 .../java/de/grobox/transportr/ui/LineView.kt  |   3 +-
 app/src/main/res/drawable/ic_action_star.xml  |   2 +-
 app/src/main/res/drawable/ic_walk.xml         |   5 +-
 app/src/main/res/drawable/product_bus.xml     |   3 +-
 app/src/main/res/layout/activity_map.xml      |   5 +-
 app/src/main/res/layout/fragment_about.xml    |  58 ++++++----
 .../main/res/layout/fragment_trip_detail.xml  |   7 +-
 .../res/layout/header_navigation_drawer.xml   | 106 ++++++++++--------
 .../main/res/layout/list_item_favorite.xml    |  34 +++---
 app/src/main/res/layout/list_item_line.xml    |   1 +
 app/src/main/res/values/colors.xml            |   2 +
 app/src/main/res/values/styles.xml            |  24 +++-
 13 files changed, 150 insertions(+), 111 deletions(-)

diff --git a/app/src/main/java/de/grobox/transportr/trips/detail/TripDetailFragment.kt b/app/src/main/java/de/grobox/transportr/trips/detail/TripDetailFragment.kt
index 92acde5d7..575b5cedf 100644
--- a/app/src/main/java/de/grobox/transportr/trips/detail/TripDetailFragment.kt
+++ b/app/src/main/java/de/grobox/transportr/trips/detail/TripDetailFragment.kt
@@ -175,20 +175,13 @@ class TripDetailFragment : TransportrFragment(), Toolbar.OnMenuItemClickListener
             MIDDLE -> {
                 toolbar.visibility = GONE
                 topBar.visibility = VISIBLE
-                val textColor = context.getColorFromAttr(android.R.attr.textColorPrimary)
-                topBar.setBackgroundColor(context.getColorFromAttr(R.attr.colorPrimary))
-                fromTimeRel.setTextColor(textColor)
-                durationTop.setTextColor(textColor)
-                priceTop.setTextColor(textColor)
+                topBar.setBackgroundColor(context.getColorFromAttr(R.attr.colorPrimaryContainer))
                 bottomBar.visibility = GONE
             }
             EXPANDED -> {
                 toolbar.visibility = VISIBLE
                 topBar.visibility = VISIBLE
-                topBar.setBackgroundColor(context.getColorFromAttr(android.R.attr.colorBackground))
-                fromTimeRel.setTextColor(context.getColorFromAttr(android.R.attr.textColorPrimary))
-                durationTop.setTextColor(context.getColorFromAttr(android.R.attr.textColorSecondary))
-                priceTop.setTextColor(context.getColorFromAttr(android.R.attr.textColorSecondary))
+                topBar.setBackgroundColor(context.getColorFromAttr(R.attr.colorSurface))
                 bottomBar.visibility = GONE
             }
         }
diff --git a/app/src/main/java/de/grobox/transportr/ui/LineView.kt b/app/src/main/java/de/grobox/transportr/ui/LineView.kt
index c511c308f..b985e6a63 100644
--- a/app/src/main/java/de/grobox/transportr/ui/LineView.kt
+++ b/app/src/main/java/de/grobox/transportr/ui/LineView.kt
@@ -30,6 +30,7 @@ import androidx.appcompat.widget.AppCompatTextView
 import android.util.AttributeSet
 import de.grobox.transportr.R
 import de.grobox.transportr.utils.TransportrUtils.dpToPx
+import de.grobox.transportr.utils.TransportrUtils.getColorFromAttr
 import de.grobox.transportr.utils.TransportrUtils.getDrawableForProduct
 import de.schildbach.pte.dto.Line
 
@@ -61,7 +62,7 @@ class LineView(context: Context, attr: AttributeSet?) : AppCompatTextView(contex
     }
 
     fun setWalk() {
-        setDrawable(R.drawable.ic_walk, getColor(context, android.R.color.black))
+        setCompoundDrawablesWithIntrinsicBounds(getDrawable(context, R.drawable.ic_walk), null, null, null)
         setBackgroundResource(R.drawable.walk_box)
     }
 
diff --git a/app/src/main/res/drawable/ic_action_star.xml b/app/src/main/res/drawable/ic_action_star.xml
index f7ded4420..44aed64b9 100644
--- a/app/src/main/res/drawable/ic_action_star.xml
+++ b/app/src/main/res/drawable/ic_action_star.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
 		android:width="24dp"
 		android:height="24dp"
-		android:tint="?colorControlNormal"
+		android:tint="@color/iconTint"
 		android:viewportHeight="24.0"
 		android:viewportWidth="24.0">
 	<path
diff --git a/app/src/main/res/drawable/ic_walk.xml b/app/src/main/res/drawable/ic_walk.xml
index 65e32f83e..bade7c617 100644
--- a/app/src/main/res/drawable/ic_walk.xml
+++ b/app/src/main/res/drawable/ic_walk.xml
@@ -4,8 +4,9 @@
 	android:width="24dp"
 	android:height="24dp"
 	android:viewportHeight="24"
-	android:viewportWidth="24">
+	android:viewportWidth="24"
+	android:tint="@color/iconTint">
 	<path
-		android:fillColor="#FF000000"
+		android:fillColor="#ffffff"
 		android:pathData="M14,3.8c0.99,0 1.8,-0.81 1.8,-1.8 0,-1 -0.81,-1.8 -1.8,-1.8 -1,0 -1.8,0.81 -1.8,1.8S13,3.8 14,3.8zm0.12,6.2H19V8.2h-3.62l-2,-3.33c-0.3,-0.5 -0.84,-0.83 -1.46,-0.83 -0.17,0 -0.34,0.03 -0.49,0.07L6,5.8V11h1.8V7.33l2.11,-0.66L6,22h1.8l2.87,-8.11L13,17v5h1.8v-6.41l-2.49,-4.54 0.73,-2.87L14.12,10z"/>
 </vector>
diff --git a/app/src/main/res/drawable/product_bus.xml b/app/src/main/res/drawable/product_bus.xml
index e16e25979..69c5e9f03 100644
--- a/app/src/main/res/drawable/product_bus.xml
+++ b/app/src/main/res/drawable/product_bus.xml
@@ -2,7 +2,8 @@
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+        android:viewportHeight="24.0"
+        android:tint="?attr/colorOnBackground">
     <path
         android:fillColor="#FF000000"
         android:pathData="M4,16c0,0.88 0.39,1.67 1,2.22L5,20c0,0.55 0.45,1 1,1h1c0.55,0 1,-0.45 1,-1v-1h8v1c0,0.55 0.45,1 1,1h1c0.55,0 1,-0.45 1,-1v-1.78c0.61,-0.55 1,-1.34 1,-2.22L20,6c0,-3.5 -3.58,-4 -8,-4s-8,0.5 -8,4v10zM7.5,17c-0.83,0 -1.5,-0.67 -1.5,-1.5S6.67,14 7.5,14s1.5,0.67 1.5,1.5S8.33,17 7.5,17zM16.5,17c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM18,11L6,11L6,6h12v5z"/>
diff --git a/app/src/main/res/layout/activity_map.xml b/app/src/main/res/layout/activity_map.xml
index fb79db1e9..b5d1ef4ae 100644
--- a/app/src/main/res/layout/activity_map.xml
+++ b/app/src/main/res/layout/activity_map.xml
@@ -79,11 +79,12 @@
 
 
 	<com.google.android.material.navigation.NavigationView
-		app:menu="@menu/drawer_menu"
 		android:id="@+id/navigationView"
 		android:layout_width="wrap_content"
 		android:layout_height="match_parent"
+		android:layout_gravity="start"
+		android:fitsSystemWindows="false"
 		app:headerLayout="@layout/header_navigation_drawer"
-		android:layout_gravity="start" />
+		app:menu="@menu/drawer_menu" />
 
 </androidx.drawerlayout.widget.DrawerLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml
index 90a7c717a..3a6e1e39e 100644
--- a/app/src/main/res/layout/fragment_about.xml
+++ b/app/src/main/res/layout/fragment_about.xml
@@ -60,47 +60,59 @@
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toBottomOf="@+id/appIcon"/>
 
-		<TextView
-			android:id="@+id/warningTitle"
-			android:layout_width="wrap_content"
+		<androidx.cardview.widget.CardView
+			android:id="@+id/cardView"
+			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:layout_marginLeft="16dp"
 			android:layout_marginStart="16dp"
 			android:layout_marginTop="16dp"
-			android:text="@string/about_warning_title"
-			android:textColor="?colorError"
-			android:textSize="16sp"
-			android:textStyle="bold"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/aboutTextView"/>
-
-		<TextView
-			android:id="@+id/warningText"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
 			android:layout_marginEnd="16dp"
-			android:layout_marginStart="16dp"
-			android:layout_marginTop="8dp"
-			android:text="@string/about_warning_text"
-			android:textColor="?colorError"
-			android:textSize="16sp"
+			style="@style/ErrorCard"
+			app:cardUseCompatPadding="false"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/warningTitle"/>
+			app:layout_constraintTop_toBottomOf="@+id/aboutTextView">
+
+			<LinearLayout
+				android:layout_width="match_parent"
+				android:layout_height="match_parent"
+				android:layout_margin="16dp"
+				android:orientation="vertical">
+
+				<TextView
+					android:id="@+id/warningTitle"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="@string/about_warning_title"
+					style="@style/ErrorCard"
+					android:textSize="16sp"
+					android:textStyle="bold" />
+
+				<TextView
+					android:id="@+id/warningText"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_marginTop="8dp"
+					android:text="@string/about_warning_text"
+					style="@style/ErrorCard"
+					android:textSize="16sp" />
+			</LinearLayout>
+
+		</androidx.cardview.widget.CardView>
 
 		<TextView
 			android:id="@+id/contributions"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:layout_marginEnd="16dp"
 			android:layout_marginStart="16dp"
 			android:layout_marginTop="16dp"
+			android:layout_marginEnd="16dp"
 			android:text="@string/about_contributions"
 			android:textColor="?android:textColorPrimary"
 			android:textSize="16sp"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/warningText"/>
+			app:layout_constraintTop_toBottomOf="@+id/cardView" />
 
 		<Button
 			android:id="@+id/websiteButton"
diff --git a/app/src/main/res/layout/fragment_trip_detail.xml b/app/src/main/res/layout/fragment_trip_detail.xml
index bf3322cb7..ea616d01e 100644
--- a/app/src/main/res/layout/fragment_trip_detail.xml
+++ b/app/src/main/res/layout/fragment_trip_detail.xml
@@ -118,7 +118,7 @@
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_marginTop="0dp"
-			android:background="?android:colorBackground"
+			android:background="?attr/colorPrimaryContainer"
 			tools:visibility="visible">
 
 			<TextView
@@ -131,7 +131,7 @@
 				android:layout_marginBottom="8dp"
 				android:textAppearance="@style/TextAppearance.AppCompat.Body2"
 				android:textStyle="normal|bold"
-				android:textColor="?android:textColorPrimary"
+				android:textColor="?attr/colorOnPrimaryContainer"
 				app:layout_constraintTop_toTopOf="parent"
 				app:layout_constraintBottom_toBottomOf="parent"
 				app:layout_constraintStart_toStartOf="parent"
@@ -144,7 +144,7 @@
 				android:layout_height="wrap_content"
 				android:layout_marginTop="8dp"
 				android:layout_marginBottom="8dp"
-				android:textColor="?android:textColorSecondary"
+				android:textColor="?attr/colorOnPrimaryContainer"
 				app:layout_constraintTop_toTopOf="parent"
 				app:layout_constraintBottom_toBottomOf="parent"
 				app:layout_constraintEnd_toEndOf="parent"
@@ -159,6 +159,7 @@
 				android:layout_marginBottom="8dp"
 				android:layout_marginEnd="8dp"
 				android:layout_marginRight="8dp"
+				android:textColor="?attr/colorOnPrimaryContainer"
 				app:layout_constraintTop_toTopOf="parent"
 				app:layout_constraintRight_toRightOf="parent"
 				app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/header_navigation_drawer.xml b/app/src/main/res/layout/header_navigation_drawer.xml
index af9f5fc52..e9e9614fc 100644
--- a/app/src/main/res/layout/header_navigation_drawer.xml
+++ b/app/src/main/res/layout/header_navigation_drawer.xml
@@ -1,58 +1,70 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	style="@style/NavHeaderCard"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
-	android:orientation="vertical"
-	android:id="@+id/drawer_header"
-	android:layout_marginStart="20dp"
+	android:layout_margin="8dp"
+	android:layout_marginTop="32dp"
 	android:fitsSystemWindows="true">
 
 	<LinearLayout
-		android:layout_marginTop="50dp"
+		android:id="@+id/drawer_header"
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:orientation="horizontal">
-
-		<com.google.android.material.imageview.ShapeableImageView
-			android:id="@+id/network_image"
-			android:layout_width="60dp"
-			android:layout_height="60dp"
-			app:shapeAppearanceOverlay="@style/RoundedImageView"
-			android:layout_marginBottom="20dp"/>
-
-		<View
-			android:layout_width="0dp"
-			android:layout_weight="1"
-			android:layout_height="0px" />
-
-		<com.google.android.material.imageview.ShapeableImageView
-			android:id="@+id/network_image_two"
-			android:layout_width="30dp"
-			android:layout_height="30dp"
-			app:shapeAppearanceOverlay="@style/RoundedImageView"
-			android:layout_marginBottom="20dp"/>
-
-		<com.google.android.material.imageview.ShapeableImageView
-			android:id="@+id/network_image_three"
-			android:layout_width="30dp"
-			android:layout_height="30dp"
-			android:layout_marginStart="10dp"
-			app:shapeAppearanceOverlay="@style/RoundedImageView"
-			android:layout_marginBottom="20dp"/>
+		android:layout_height="match_parent"
+		android:layout_margin="12dp"
+		android:orientation="vertical">
 
-	</LinearLayout>
 
-	<TextView
-		android:id="@+id/network_name"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:textSize="20sp" />
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="16dp"
+			android:orientation="horizontal">
+
+			<com.google.android.material.imageview.ShapeableImageView
+				android:id="@+id/network_image"
+				android:layout_width="60dp"
+				android:layout_height="60dp"
+				android:layout_marginBottom="20dp"
+				app:shapeAppearanceOverlay="@style/RoundedImageView" />
+
+			<View
+				android:layout_width="0dp"
+				android:layout_height="0px"
+				android:layout_weight="1" />
+
+			<com.google.android.material.imageview.ShapeableImageView
+				android:id="@+id/network_image_two"
+				android:layout_width="30dp"
+				android:layout_height="30dp"
+				android:layout_marginBottom="20dp"
+				app:shapeAppearanceOverlay="@style/RoundedImageView" />
 
-	<TextView
-		android:id="@+id/network_description"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_marginBottom="30dp" />
+			<com.google.android.material.imageview.ShapeableImageView
+				android:id="@+id/network_image_three"
+				android:layout_width="30dp"
+				android:layout_height="30dp"
+				android:layout_marginStart="10dp"
+				android:layout_marginBottom="20dp"
+				app:shapeAppearanceOverlay="@style/RoundedImageView" />
+
+		</LinearLayout>
+
+		<TextView
+			android:id="@+id/network_name"
+			style="@style/NavHeaderCard"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:textSize="20sp" />
+
+		<TextView
+			android:id="@+id/network_description"
+			style="@style/NavHeaderCard"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginBottom="30dp" />
+
+	</LinearLayout>
 
-</LinearLayout>
+</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/list_item_favorite.xml b/app/src/main/res/layout/list_item_favorite.xml
index 0d4aa43a0..1753ff3a5 100644
--- a/app/src/main/res/layout/list_item_favorite.xml
+++ b/app/src/main/res/layout/list_item_favorite.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.card.MaterialCardView
-	style="@style/FavoriteCard"
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
+	style="@style/FavoriteCard"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content">
 
@@ -15,28 +14,27 @@
 			android:id="@+id/logo"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_marginLeft="8dp"
 			android:layout_marginStart="8dp"
-			app:tint="?colorControlNormal"
 			app:layout_constraintBottom_toBottomOf="parent"
 			app:layout_constraintLeft_toLeftOf="parent"
 			app:layout_constraintTop_toTopOf="parent"
 			app:srcCompat="@drawable/ic_time"
-			tools:ignore="ContentDescription"/>
+			app:tint="?colorControlNormal"
+			tools:ignore="ContentDescription" />
 
 		<ImageView
 			android:id="@+id/fromIcon"
 			android:layout_width="wrap_content"
 			android:layout_height="0dp"
-			android:layout_marginLeft="3dp"
 			android:layout_marginStart="3dp"
+			android:layout_marginLeft="3dp"
 			android:scaleType="matrix"
-			app:tint="?colorControlNormal"
 			app:layout_constraintBottom_toBottomOf="@+id/from"
 			app:layout_constraintLeft_toRightOf="@+id/logo"
 			app:layout_constraintTop_toTopOf="@+id/from"
 			app:srcCompat="@drawable/trip_from"
-			tools:ignore="ContentDescription"/>
+			app:tint="?colorControlNormal"
+			tools:ignore="ContentDescription" />
 
 		<TextView
 			android:id="@+id/from"
@@ -49,20 +47,20 @@
 			app:layout_constraintLeft_toRightOf="@+id/fromIcon"
 			app:layout_constraintRight_toLeftOf="@+id/overflowButton"
 			app:layout_constraintTop_toTopOf="parent"
-			tools:text="From Station that can have a very long name"/>
+			tools:text="From Station that can have a very long name" />
 
 		<ImageView
 			android:id="@+id/viaIcon"
 			android:layout_width="wrap_content"
 			android:layout_height="0dp"
 			android:scaleType="centerCrop"
-			app:tint="?colorControlNormal"
 			app:layout_constraintBottom_toBottomOf="@+id/via"
 			app:layout_constraintLeft_toLeftOf="@+id/fromIcon"
 			app:layout_constraintTop_toTopOf="@+id/via"
 			app:srcCompat="@drawable/trip_via"
+			app:tint="?colorControlNormal"
 			tools:ignore="ContentDescription"
-			tools:visibility="visible"/>
+			tools:visibility="visible" />
 
 		<TextView
 			android:id="@+id/via"
@@ -75,17 +73,17 @@
 			app:layout_constraintRight_toLeftOf="@+id/overflowButton"
 			app:layout_constraintTop_toBottomOf="@+id/from"
 			tools:text="Via Station"
-			tools:visibility="visible"/>
+			tools:visibility="visible" />
 
 		<ImageView
 			android:id="@+id/toIcon"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			app:tint="?colorControlNormal"
 			app:layout_constraintLeft_toLeftOf="@+id/fromIcon"
 			app:layout_constraintTop_toTopOf="@+id/to"
 			app:srcCompat="@drawable/trip_to"
-			tools:ignore="ContentDescription"/>
+			app:tint="?colorControlNormal"
+			tools:ignore="ContentDescription" />
 
 		<TextView
 			android:id="@+id/to"
@@ -99,7 +97,7 @@
 			app:layout_constraintLeft_toRightOf="@+id/toIcon"
 			app:layout_constraintRight_toLeftOf="@+id/overflowButton"
 			app:layout_constraintTop_toBottomOf="@+id/via"
-			tools:text="To station"/>
+			tools:text="To station" />
 
 		<ImageButton
 			android:id="@+id/overflowButton"
@@ -109,11 +107,11 @@
 			android:clickable="true"
 			android:contentDescription="@string/more"
 			android:focusable="true"
-			app:tint="?colorControlNormal"
 			app:layout_constraintBottom_toBottomOf="parent"
 			app:layout_constraintRight_toRightOf="parent"
 			app:layout_constraintTop_toTopOf="parent"
-			app:srcCompat="@drawable/ic_more_vert"/>
+			app:srcCompat="@drawable/ic_more_vert"
+			app:tint="?colorControlNormal" />
 
 	</androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/list_item_line.xml b/app/src/main/res/layout/list_item_line.xml
index 9858e4f3e..85a988cab 100644
--- a/app/src/main/res/layout/list_item_line.xml
+++ b/app/src/main/res/layout/list_item_line.xml
@@ -6,6 +6,7 @@
 	android:layout_width="wrap_content"
 	android:layout_height="wrap_content"
 	android:layout_margin="3dp"
+	android:padding="4dp"
 	tools:background="@drawable/line_box"
 	tools:drawableLeft="@drawable/product_bus"
 	tools:ignore="RtlSymmetry"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 0fc1d08d7..d73dba36b 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -30,4 +30,6 @@
     <color name="md_theme_surfaceTint">#0061A4</color>
     <color name="md_theme_outlineVariant">#C3C7CF</color>
     <color name="md_theme_scrim">#000000</color>
+
+    <color name="iconTint">?attr/colorOnSecondary</color>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f49a434af..832e0c71f 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -16,18 +16,34 @@
 		<item name="android:windowExitAnimation">@anim/scale_down</item>
 	</style>
 
-	<style name="FavoriteCard" parent="Widget.Material3.CardView.Outlined">
+	<style name="FavoriteCard" parent="Widget.Material3.CardView.Elevated">
 		<item name="android:foreground">?selectableItemBackground</item>
 		<item name="android:clickable">true</item>
-		<item name="android:layout_marginLeft">8dp</item>
-		<item name="android:layout_marginRight">8dp</item>
+		<item name="android:layout_marginStart">8dp</item>
+		<item name="android:layout_marginEnd">8dp</item>
 		<item name="android:layout_marginTop">8dp</item>
+		<item name="cardBackgroundColor">?attr/colorPrimaryContainer</item>
 	</style>
 
-	<style name="ContributorsCard" parent="Widget.Material3.CardView.Outlined">
+	<style name="Card" parent="Widget.Material3.CardView.Elevated">
 		<item name="cardCornerRadius">8dp</item>
 		<item name="cardUseCompatPadding">true</item>
 		<item name="cardElevation">2dp</item>
+		<item name="cardBackgroundColor">?attr/colorPrimaryContainer</item>
+	</style>
+
+	<style name="ContributorsCard" parent="Card">
+		<item name="cardBackgroundColor">?attr/colorSurfaceVariant</item>
+	</style>
+
+	<style name="ErrorCard" parent="Card">
+		<item name="cardBackgroundColor">?attr/colorErrorContainer</item>
+		<item name="android:textColor">?attr/colorError</item>
+	</style>
+
+	<style name="NavHeaderCard" parent="Card">
+		<item name="cardBackgroundColor">?attr/colorPrimary</item>
+		<item name="android:textColor">?attr/colorOnPrimary</item>
 	</style>
 
 	<style name="Button" parent="Widget.AppCompat.Button.Borderless.Colored">

From 1c670ef2c62a603a368104692e8c5c83b642af21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20N=C3=BCsse?= <felix.nuesse@t-online.de>
Date: Wed, 17 Jan 2024 11:37:47 +0100
Subject: [PATCH 09/60] use better splashscreen use original color scheme

---
 app/build.gradle                              |  2 +
 app/src/main/AndroidManifest.xml              |  4 +-
 .../de/grobox/transportr/map/MapActivity.java |  2 +
 app/src/main/res/values-night/colors.xml      | 48 +++++++++----------
 app/src/main/res/values/colors.xml            | 46 ++++++++++--------
 app/src/main/res/values/themes.xml            |  6 +++
 6 files changed, 61 insertions(+), 47 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 190a0678d..e8202c965 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -162,4 +162,6 @@ dependencies {
 	androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.3.0'
 	androidTestImplementation('tools.fastlane:screengrab:2.1.1')
 	kaptAndroidTestDebug "com.google.dagger:dagger-compiler:$daggerVersion"
+
+	implementation 'androidx.core:core-splashscreen:1.0.1'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e3965d1c9..2645451c7 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -46,9 +46,9 @@
 		<activity
 			android:name="de.grobox.transportr.map.MapActivity"
 			android:exported="true"
-			android:label="@string/app_name"
 			android:launchMode="singleTop"
-			android:windowSoftInputMode="stateHidden|adjustPan">
+			android:windowSoftInputMode="stateHidden|adjustPan"
+			android:theme="@style/Theme.App.Starting">
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN"/>
 				<category android:name="android.intent.category.LAUNCHER"/>
diff --git a/app/src/main/java/de/grobox/transportr/map/MapActivity.java b/app/src/main/java/de/grobox/transportr/map/MapActivity.java
index 61960bccd..49aeeb8ca 100644
--- a/app/src/main/java/de/grobox/transportr/map/MapActivity.java
+++ b/app/src/main/java/de/grobox/transportr/map/MapActivity.java
@@ -44,6 +44,7 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.app.ActivityCompat;
+import androidx.core.splashscreen.SplashScreen;
 import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.lifecycle.ViewModelProvider;
 import de.grobox.transportr.BuildConfig;
@@ -88,6 +89,7 @@ public class MapActivity extends TransportrActivity implements LocationViewListe
 
 	@Override
 	public void onCreate(@Nullable Bundle savedInstanceState) {
+		SplashScreen.installSplashScreen(this);
 		super.onCreate(savedInstanceState);
 		if (BuildConfig.DEBUG) enableStrictMode();
 		getComponent().inject(this);
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 5d6145135..78a7849ca 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-	<color name="md_theme_primary">#9ECAFF</color>
-	<color name="md_theme_onPrimary">#003258</color>
-	<color name="md_theme_primaryContainer">#00497D</color>
-	<color name="md_theme_onPrimaryContainer">#D1E4FF</color>
-	<color name="md_theme_secondary">#BBC7DB</color>
-	<color name="md_theme_onSecondary">#253140</color>
-	<color name="md_theme_secondaryContainer">#3B4858</color>
-	<color name="md_theme_onSecondaryContainer">#D7E3F7</color>
-	<color name="md_theme_tertiary">#D6BEE4</color>
-	<color name="md_theme_onTertiary">#3B2948</color>
-	<color name="md_theme_tertiaryContainer">#523F5F</color>
-	<color name="md_theme_onTertiaryContainer">#F2DAFF</color>
+	<color name="md_theme_primary">#FFB4A9</color>
+	<color name="md_theme_onPrimary">#690002</color>
+	<color name="md_theme_primaryContainer">#930005</color>
+	<color name="md_theme_onPrimaryContainer">#FFDAD5</color>
+	<color name="md_theme_secondary">#FFB4A9</color>
+	<color name="md_theme_onSecondary">#5F150E</color>
+	<color name="md_theme_secondaryContainer">#7D2B22</color>
+	<color name="md_theme_onSecondaryContainer">#FFDAD5</color>
+	<color name="md_theme_tertiary">#DFC38C</color>
+	<color name="md_theme_onTertiary">#3E2E04</color>
+	<color name="md_theme_tertiaryContainer">#574419</color>
+	<color name="md_theme_onTertiaryContainer">#FCDFA6</color>
 	<color name="md_theme_error">#FFB4AB</color>
 	<color name="md_theme_errorContainer">#93000A</color>
 	<color name="md_theme_onError">#690005</color>
 	<color name="md_theme_onErrorContainer">#FFDAD6</color>
-	<color name="md_theme_background">#1A1C1E</color>
-	<color name="md_theme_onBackground">#E2E2E6</color>
-	<color name="md_theme_surface">#1A1C1E</color>
-	<color name="md_theme_onSurface">#E2E2E6</color>
-	<color name="md_theme_surfaceVariant">#43474E</color>
-	<color name="md_theme_onSurfaceVariant">#C3C7CF</color>
-	<color name="md_theme_outline">#8D9199</color>
-	<color name="md_theme_inverseOnSurface">#1A1C1E</color>
-	<color name="md_theme_inverseSurface">#E2E2E6</color>
-	<color name="md_theme_inversePrimary">#0061A4</color>
+	<color name="md_theme_background">#201A19</color>
+	<color name="md_theme_onBackground">#EDE0DE</color>
+	<color name="md_theme_surface">#201A19</color>
+	<color name="md_theme_onSurface">#EDE0DE</color>
+	<color name="md_theme_surfaceVariant">#534341</color>
+	<color name="md_theme_onSurfaceVariant">#D8C2BE</color>
+	<color name="md_theme_outline">#A08C89</color>
+	<color name="md_theme_inverseOnSurface">#201A19</color>
+	<color name="md_theme_inverseSurface">#EDE0DE</color>
+	<color name="md_theme_inversePrimary">#BB1614</color>
 	<color name="md_theme_shadow">#000000</color>
-	<color name="md_theme_surfaceTint">#9ECAFF</color>
-	<color name="md_theme_outlineVariant">#43474E</color>
+	<color name="md_theme_surfaceTint">#FFB4A9</color>
+	<color name="md_theme_outlineVariant">#534341</color>
 	
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index d73dba36b..6dd46aa12 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,34 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="md_theme_primary">#0061A4</color>
+
+    <!-- original material theme colors -->
+    <color name="primary">#f44336</color>
+
+    <color name="md_theme_primary">#BB1614</color>
     <color name="md_theme_onPrimary">#FFFFFF</color>
-    <color name="md_theme_primaryContainer">#D1E4FF</color>
-    <color name="md_theme_onPrimaryContainer">#001D36</color>
-    <color name="md_theme_secondary">#535F70</color>
+    <color name="md_theme_primaryContainer">#FFDAD5</color>
+    <color name="md_theme_onPrimaryContainer">#410001</color>
+    <color name="md_theme_secondary">#9C4237</color>
     <color name="md_theme_onSecondary">#FFFFFF</color>
-    <color name="md_theme_secondaryContainer">#D7E3F7</color>
-    <color name="md_theme_onSecondaryContainer">#101C2B</color>
-    <color name="md_theme_tertiary">#6B5778</color>
+    <color name="md_theme_secondaryContainer">#FFDAD5</color>
+    <color name="md_theme_onSecondaryContainer">#410001</color>
+    <color name="md_theme_tertiary">#705C2E</color>
     <color name="md_theme_onTertiary">#FFFFFF</color>
-    <color name="md_theme_tertiaryContainer">#F2DAFF</color>
-    <color name="md_theme_onTertiaryContainer">#251431</color>
+    <color name="md_theme_tertiaryContainer">#FCDFA6</color>
+    <color name="md_theme_onTertiaryContainer">#261A00</color>
     <color name="md_theme_error">#BA1A1A</color>
     <color name="md_theme_errorContainer">#FFDAD6</color>
     <color name="md_theme_onError">#FFFFFF</color>
     <color name="md_theme_onErrorContainer">#410002</color>
-    <color name="md_theme_background">#FDFCFF</color>
-    <color name="md_theme_onBackground">#1A1C1E</color>
-    <color name="md_theme_surface">#FDFCFF</color>
-    <color name="md_theme_onSurface">#1A1C1E</color>
-    <color name="md_theme_surfaceVariant">#DFE2EB</color>
-    <color name="md_theme_onSurfaceVariant">#43474E</color>
-    <color name="md_theme_outline">#73777F</color>
-    <color name="md_theme_inverseOnSurface">#F1F0F4</color>
-    <color name="md_theme_inverseSurface">#2F3033</color>
-    <color name="md_theme_inversePrimary">#9ECAFF</color>
+    <color name="md_theme_background">#FFFBFF</color>
+    <color name="md_theme_onBackground">#201A19</color>
+    <color name="md_theme_surface">#FFFBFF</color>
+    <color name="md_theme_onSurface">#201A19</color>
+    <color name="md_theme_surfaceVariant">#F5DDDA</color>
+    <color name="md_theme_onSurfaceVariant">#534341</color>
+    <color name="md_theme_outline">#857370</color>
+    <color name="md_theme_inverseOnSurface">#FBEEEC</color>
+    <color name="md_theme_inverseSurface">#362F2E</color>
+    <color name="md_theme_inversePrimary">#FFB4A9</color>
     <color name="md_theme_shadow">#000000</color>
-    <color name="md_theme_surfaceTint">#0061A4</color>
-    <color name="md_theme_outlineVariant">#C3C7CF</color>
+    <color name="md_theme_surfaceTint">#BB1614</color>
+    <color name="md_theme_outlineVariant">#D8C2BE</color>
     <color name="md_theme_scrim">#000000</color>
 
     <color name="iconTint">?attr/colorOnSecondary</color>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 12d7df290..0fd334b6f 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -45,4 +45,10 @@
 
     <style name="AppTheme" parent="AppDayNightTheme" />
 
+    <style name="Theme.App.Starting" parent="Theme.SplashScreen">
+        <item name="windowSplashScreenBackground">@color/md_theme_primary</item>
+        <item name="windowSplashScreenAnimatedIcon">@drawable/ic_launcher_foreground</item>
+        <item name="postSplashScreenTheme">@style/AppTheme</item>
+    </style>
+
 </resources>

From d6369c5481b547246ca9551318adf42acd2219f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20N=C3=BCsse?= <felix.nuesse@t-online.de>
Date: Wed, 17 Jan 2024 12:40:13 +0100
Subject: [PATCH 10/60] add material you colors

---
 app/src/main/res/values-v31/colors.xml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 app/src/main/res/values-v31/colors.xml

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 000000000..6d42d7d3f
--- /dev/null
+++ b/app/src/main/res/values-v31/colors.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <color name="md_theme_primary">@android:color/system_accent1_200</color>
+    <color name="md_theme_onPrimary">@android:color/system_accent1_0</color>
+    <color name="md_theme_primaryContainer">@android:color/system_accent1_300</color>
+    <color name="md_theme_onPrimaryContainer">@android:color/system_accent1_700</color>
+
+    <color name="md_theme_secondary">@android:color/system_accent2_700</color>
+    <color name="md_theme_onSecondary">@android:color/system_accent2_0</color>
+    <color name="md_theme_secondaryContainer">@android:color/system_accent2_100</color>
+    <color name="md_theme_onSecondaryContainer">@android:color/system_accent2_800</color>
+
+    <color name="md_theme_tertiary">@android:color/system_accent3_700</color>
+    <color name="md_theme_onTertiary">@android:color/system_accent3_0</color>
+    <color name="md_theme_tertiaryContainer">@android:color/system_accent3_400</color>
+    <color name="md_theme_onTertiaryContainer">@android:color/system_accent3_800</color>
+
+</resources>

From ebb7758ce7bdd4259a82e816f8daa07665e12a45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20N=C3=BCsse?= <felix.nuesse@t-online.de>
Date: Wed, 17 Jan 2024 12:55:32 +0100
Subject: [PATCH 11/60] fix star color

---
 app/src/main/res/drawable/ic_action_star.xml | 2 +-
 app/src/main/res/drawable/ic_walk.xml        | 2 +-
 app/src/main/res/values/colors.xml           | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/src/main/res/drawable/ic_action_star.xml b/app/src/main/res/drawable/ic_action_star.xml
index 44aed64b9..0d4acb680 100644
--- a/app/src/main/res/drawable/ic_action_star.xml
+++ b/app/src/main/res/drawable/ic_action_star.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
 		android:width="24dp"
 		android:height="24dp"
-		android:tint="@color/iconTint"
+		android:tint="?attr/colorOnBackground"
 		android:viewportHeight="24.0"
 		android:viewportWidth="24.0">
 	<path
diff --git a/app/src/main/res/drawable/ic_walk.xml b/app/src/main/res/drawable/ic_walk.xml
index bade7c617..64dbacfe6 100644
--- a/app/src/main/res/drawable/ic_walk.xml
+++ b/app/src/main/res/drawable/ic_walk.xml
@@ -5,7 +5,7 @@
 	android:height="24dp"
 	android:viewportHeight="24"
 	android:viewportWidth="24"
-	android:tint="@color/iconTint">
+	android:tint="?attr/colorOnBackground">
 	<path
 		android:fillColor="#ffffff"
 		android:pathData="M14,3.8c0.99,0 1.8,-0.81 1.8,-1.8 0,-1 -0.81,-1.8 -1.8,-1.8 -1,0 -1.8,0.81 -1.8,1.8S13,3.8 14,3.8zm0.12,6.2H19V8.2h-3.62l-2,-3.33c-0.3,-0.5 -0.84,-0.83 -1.46,-0.83 -0.17,0 -0.34,0.03 -0.49,0.07L6,5.8V11h1.8V7.33l2.11,-0.66L6,22h1.8l2.87,-8.11L13,17v5h1.8v-6.41l-2.49,-4.54 0.73,-2.87L14.12,10z"/>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 6dd46aa12..14348f608 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -34,6 +34,4 @@
     <color name="md_theme_surfaceTint">#BB1614</color>
     <color name="md_theme_outlineVariant">#D8C2BE</color>
     <color name="md_theme_scrim">#000000</color>
-
-    <color name="iconTint">?attr/colorOnSecondary</color>
 </resources>

From fc4bdb373a6e6d91c29a536005ed5d47d689282a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20N=C3=BCsse?= <felix.nuesse@t-online.de>
Date: Wed, 17 Jan 2024 13:01:36 +0100
Subject: [PATCH 12/60] add dark material you colors

---
 app/src/main/res/values-night-v31/colors.xml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 app/src/main/res/values-night-v31/colors.xml

diff --git a/app/src/main/res/values-night-v31/colors.xml b/app/src/main/res/values-night-v31/colors.xml
new file mode 100644
index 000000000..d1b6f1afd
--- /dev/null
+++ b/app/src/main/res/values-night-v31/colors.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <color name="md_theme_primary">@android:color/system_accent1_200</color>
+    <color name="md_theme_onPrimary">@android:color/system_accent1_900</color>
+    <color name="md_theme_primaryContainer">@android:color/system_accent1_600</color>
+    <color name="md_theme_onPrimaryContainer">@android:color/system_accent1_200</color>
+
+    <color name="md_theme_secondary">@android:color/system_accent2_200</color>
+    <color name="md_theme_onSecondary">@android:color/system_accent2_900</color>
+    <color name="md_theme_secondaryContainer">@android:color/system_accent2_600</color>
+    <color name="md_theme_onSecondaryContainer">@android:color/system_accent2_200</color>
+
+    <color name="md_theme_tertiary">@android:color/system_accent3_200</color>
+    <color name="md_theme_onTertiary">@android:color/system_accent3_900</color>
+    <color name="md_theme_tertiaryContainer">@android:color/system_accent3_400</color>
+    <color name="md_theme_onTertiaryContainer">@android:color/system_accent3_100</color>
+
+</resources>

From 4bcd65c0bbba471b4cf8576d42f8779d80c571f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20N=C3=BCsse?= <felix.nuesse@t-online.de>
Date: Wed, 17 Jan 2024 13:47:54 +0100
Subject: [PATCH 13/60] use back arrow instead of toolbar

---
 .../trips/detail/TripDetailActivity.java      |  3 +++
 app/src/main/res/drawable/ic_back.xml         | 11 ++++++++++
 app/src/main/res/drawable/shape_circle.xml    |  7 +++++++
 .../main/res/layout/activity_trip_detail.xml  | 21 +++++++------------
 4 files changed, 29 insertions(+), 13 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_back.xml
 create mode 100644 app/src/main/res/drawable/shape_circle.xml

diff --git a/app/src/main/java/de/grobox/transportr/trips/detail/TripDetailActivity.java b/app/src/main/java/de/grobox/transportr/trips/detail/TripDetailActivity.java
index 9d36e8917..919682e35 100644
--- a/app/src/main/java/de/grobox/transportr/trips/detail/TripDetailActivity.java
+++ b/app/src/main/java/de/grobox/transportr/trips/detail/TripDetailActivity.java
@@ -23,6 +23,7 @@
 import android.os.Bundle;
 import android.view.View;
 import android.widget.FrameLayout;
+import android.widget.ImageButton;
 
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
 
@@ -116,6 +117,8 @@ public void onSlide(@NonNull View bottomSheet, float slideOffset) {
 
 			showOnboarding();
 		}
+
+		((ImageButton) findViewById(R.id.backView)).setOnClickListener(view -> getOnBackPressedDispatcher().onBackPressed());
 	}
 
 	private void showOnboarding() {
diff --git a/app/src/main/res/drawable/ic_back.xml b/app/src/main/res/drawable/ic_back.xml
new file mode 100644
index 000000000..07de38944
--- /dev/null
+++ b/app/src/main/res/drawable/ic_back.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+	android:width="24dp"
+	android:height="24dp"
+	android:autoMirrored="true"
+	android:tint="?attr/colorOnPrimary"
+	android:viewportWidth="24"
+	android:viewportHeight="24">
+	<path
+		android:fillColor="@android:color/white"
+		android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z" />
+</vector>
diff --git a/app/src/main/res/drawable/shape_circle.xml b/app/src/main/res/drawable/shape_circle.xml
new file mode 100644
index 000000000..13efdbe16
--- /dev/null
+++ b/app/src/main/res/drawable/shape_circle.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+	android:shape="oval">
+
+	<solid android:color="?attr/colorPrimary"/>
+	<size android:width="120dp" android:height="120dp"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_trip_detail.xml b/app/src/main/res/layout/activity_trip_detail.xml
index eeca077fd..f92f98207 100644
--- a/app/src/main/res/layout/activity_trip_detail.xml
+++ b/app/src/main/res/layout/activity_trip_detail.xml
@@ -18,19 +18,14 @@
 		android:background="@android:color/transparent"
 		app:elevation="0dp">
 
-		<com.google.android.material.appbar.CollapsingToolbarLayout
-			android:layout_width="match_parent"
-			android:layout_height="match_parent"
-			app:layout_scrollFlags="enterAlways"
-			app:titleEnabled="false">
-
-			<androidx.appcompat.widget.Toolbar
-				android:id="@+id/toolbar"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				app:layout_collapseMode="pin"/>
-
-		</com.google.android.material.appbar.CollapsingToolbarLayout>
+		<ImageButton
+			android:id="@+id/backView"
+			android:layout_width="48dp"
+			android:layout_height="48dp"
+			android:layout_margin="12dp"
+			android:background="@drawable/shape_circle"
+			android:padding="8dp"
+			app:srcCompat="@drawable/ic_back" />
 
 	</com.google.android.material.appbar.AppBarLayout>
 

From ac763ad776baecff8077dc1b521f58927ab8c464 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20N=C3=BCsse?= <felix.nuesse@t-online.de>
Date: Wed, 17 Jan 2024 23:39:40 +0100
Subject: [PATCH 14/60] make trip view semi-fullscreen

---
 app/src/main/AndroidManifest.xml              |  2 +
 .../de/grobox/transportr/map/MapActivity.java |  2 +
 .../trips/detail/TripDetailActivity.java      |  9 +++
 .../grobox/transportr/utils/FullScreenUtil.kt | 69 +++++++++++++++++++
 app/src/main/res/values/styles.xml            |  5 ++
 5 files changed, 87 insertions(+)
 create mode 100644 app/src/main/java/de/grobox/transportr/utils/FullScreenUtil.kt

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2645451c7..f4d0afb4b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -68,6 +68,7 @@
 		<activity
 			android:name="de.grobox.transportr.trips.search.DirectionsActivity"
 			android:exported="true"
+			android:theme="@style/AppTheme.MapFullscreen"
 			android:windowSoftInputMode="stateHidden"/>
 
 		<activity
@@ -79,6 +80,7 @@
 		<activity
 			android:name="de.grobox.transportr.trips.detail.TripDetailActivity"
 			android:parentActivityName="de.grobox.transportr.trips.search.DirectionsActivity"
+			android:theme="@style/AppTheme.MapFullscreen"
 			tools:targetApi="jelly_bean"/>
 
 		<activity
diff --git a/app/src/main/java/de/grobox/transportr/map/MapActivity.java b/app/src/main/java/de/grobox/transportr/map/MapActivity.java
index 49aeeb8ca..ea463dc7b 100644
--- a/app/src/main/java/de/grobox/transportr/map/MapActivity.java
+++ b/app/src/main/java/de/grobox/transportr/map/MapActivity.java
@@ -61,6 +61,7 @@
 import de.grobox.transportr.networks.TransportNetwork;
 import de.grobox.transportr.settings.SettingsActivity;
 import de.grobox.transportr.ui.TransportrChangeLog;
+import de.grobox.transportr.utils.FullScreenUtil;
 import de.grobox.transportr.utils.OnboardingBuilder;
 
 import static android.content.Intent.ACTION_VIEW;
@@ -95,6 +96,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
 		getComponent().inject(this);
 		setContentView(R.layout.activity_map);
 		setupDrawer();
+		FullScreenUtil.Companion.drawBehindStatusbar(this);
 
 		View menu = findViewById(R.id.menu);
 		menu.setOnClickListener(view -> {
diff --git a/app/src/main/java/de/grobox/transportr/trips/detail/TripDetailActivity.java b/app/src/main/java/de/grobox/transportr/trips/detail/TripDetailActivity.java
index 919682e35..e8df0de0f 100644
--- a/app/src/main/java/de/grobox/transportr/trips/detail/TripDetailActivity.java
+++ b/app/src/main/java/de/grobox/transportr/trips/detail/TripDetailActivity.java
@@ -38,6 +38,7 @@
 import de.grobox.transportr.locations.WrapLocation;
 import de.grobox.transportr.trips.detail.TripDetailViewModel.SheetState;
 import de.grobox.transportr.ui.ThreeStateBottomSheetBehavior;
+import de.grobox.transportr.utils.FullScreenUtil;
 import de.grobox.transportr.utils.OnboardingBuilder;
 import de.schildbach.pte.dto.Trip;
 
@@ -65,6 +66,8 @@ public class TripDetailActivity extends TransportrActivity {
 	@Override
 	protected void onCreate(@Nullable Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
+		FullScreenUtil.Companion.drawBehindStatusbar(this);
+		FullScreenUtil.Companion.applyTopInset(findViewById(R.id.appBarLayout));
 
 		getComponent().inject(this);
 
@@ -143,11 +146,17 @@ private void onSheetStateChanged(@Nullable SheetState sheetState) {
 			case BOTTOM:
 				bottomSheetBehavior.setBottom();
 				bottomSheetBehavior.setState(STATE_COLLAPSED);
+				FullScreenUtil.Companion.showStatusbar(this);
 				break;
 			case MIDDLE:
 				bottomSheetBehavior.setHideable(true);  // ensures it can be swiped down
 				bottomSheetBehavior.setMiddle();
 				bottomSheetBehavior.setState(STATE_COLLAPSED);
+				FullScreenUtil.Companion.drawBehindStatusbar(this);
+				FullScreenUtil.Companion.applyTopInset(findViewById(R.id.appBarLayout));
+				break;
+			case EXPANDED:
+				FullScreenUtil.Companion.showStatusbar(this);
 				break;
 		}
 	}
diff --git a/app/src/main/java/de/grobox/transportr/utils/FullScreenUtil.kt b/app/src/main/java/de/grobox/transportr/utils/FullScreenUtil.kt
new file mode 100644
index 000000000..b8c2837e0
--- /dev/null
+++ b/app/src/main/java/de/grobox/transportr/utils/FullScreenUtil.kt
@@ -0,0 +1,69 @@
+/*
+ *    Transportr
+ *
+ *    Copyright (c) 2013 - 2024 Torsten Grote
+ *
+ *    This program is Free Software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as
+ *    published by the Free Software Foundation, either version 3 of the
+ *    License, or (at your option) any later version.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package de.grobox.transportr.utils
+
+import android.app.Activity
+import android.graphics.Color
+import android.os.Build
+import android.view.View
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import androidx.core.view.WindowCompat
+import androidx.core.view.WindowInsetsCompat
+
+
+class FullScreenUtil {
+    companion object {
+        fun drawBehindStatusbar(activity: Activity) {
+            WindowCompat.setDecorFitsSystemWindows(activity.window, false)
+            // required for the mail view, which cant properly use the theme.
+            activity.window.statusBarColor = Color.TRANSPARENT
+        }
+
+        fun showStatusbar(activity: Activity) {
+            WindowCompat.setDecorFitsSystemWindows(activity.window, true)
+            // required for the mail view, which cant properly use the theme.
+            //activity.window.statusBarColor = Color.TRANSPARENT
+        }
+
+        fun applyTopInset(view: View?) {
+            if(view == null) {
+                return
+            }
+
+            view.setOnApplyWindowInsetsListener { v, insets ->
+                val originalOffset = (8 * (view.resources.displayMetrics.densityDpi / 160f)).toInt()
+                val top = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                    insets.getInsets(WindowInsetsCompat.Type.statusBars()).top
+                } else {
+                    insets.systemWindowInsetTop
+                }
+
+                val parameters = CoordinatorLayout.LayoutParams(
+                    CoordinatorLayout.LayoutParams.WRAP_CONTENT,
+                    CoordinatorLayout.LayoutParams.WRAP_CONTENT
+                )
+                parameters.setMargins(0, top + originalOffset, 0, 0)
+                v.layoutParams = parameters
+
+                return@setOnApplyWindowInsetsListener insets
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 832e0c71f..4f4e7724a 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -86,4 +86,9 @@
 		<item name="cornerSize">8dp</item>
 	</style>
 
+
+	<style name="AppTheme.MapFullscreen" parent="AppTheme">
+		<item name="android:statusBarColor">@android:color/transparent</item>
+	</style>
+
 </resources>

From a057e5b41ac3f6cce377524fcb1152a95754bfab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20N=C3=BCsse?= <felix.nuesse@t-online.de>
Date: Thu, 18 Jan 2024 09:22:30 +0100
Subject: [PATCH 15/60] use colors in textviews improve material 3 shading

---
 .../main/res/layout/list_item_favorite.xml    | 33 ++++++++++---------
 app/src/main/res/layout/list_item_leg.xml     |  9 ++---
 .../res/layout/list_item_special_favorite.xml |  8 +++--
 app/src/main/res/layout/list_item_trip.xml    | 19 ++++++-----
 app/src/main/res/values-night-v31/colors.xml  |  4 +--
 app/src/main/res/values-v31/colors.xml        |  2 +-
 app/src/main/res/values/styles.xml            |  8 +++++
 7 files changed, 48 insertions(+), 35 deletions(-)

diff --git a/app/src/main/res/layout/list_item_favorite.xml b/app/src/main/res/layout/list_item_favorite.xml
index 1753ff3a5..d3c78b300 100644
--- a/app/src/main/res/layout/list_item_favorite.xml
+++ b/app/src/main/res/layout/list_item_favorite.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.card.MaterialCardView
+	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	style="@style/FavoriteCard"
@@ -19,8 +20,8 @@
 			app:layout_constraintLeft_toLeftOf="parent"
 			app:layout_constraintTop_toTopOf="parent"
 			app:srcCompat="@drawable/ic_time"
-			app:tint="?colorControlNormal"
-			tools:ignore="ContentDescription" />
+			tools:ignore="ContentDescription"
+			style="@style/FavoriteCardForeground" />
 
 		<ImageView
 			android:id="@+id/fromIcon"
@@ -33,8 +34,8 @@
 			app:layout_constraintLeft_toRightOf="@+id/logo"
 			app:layout_constraintTop_toTopOf="@+id/from"
 			app:srcCompat="@drawable/trip_from"
-			app:tint="?colorControlNormal"
-			tools:ignore="ContentDescription" />
+			tools:ignore="ContentDescription"
+			style="@style/FavoriteCardForeground" />
 
 		<TextView
 			android:id="@+id/from"
@@ -43,11 +44,11 @@
 			android:layout_marginTop="8dp"
 			android:ellipsize="middle"
 			android:singleLine="true"
-			android:textColor="?android:textColorPrimary"
 			app:layout_constraintLeft_toRightOf="@+id/fromIcon"
 			app:layout_constraintRight_toLeftOf="@+id/overflowButton"
 			app:layout_constraintTop_toTopOf="parent"
-			tools:text="From Station that can have a very long name" />
+			tools:text="From Station that can have a very long name"
+			style="@style/FavoriteCardForeground" />
 
 		<ImageView
 			android:id="@+id/viaIcon"
@@ -58,9 +59,9 @@
 			app:layout_constraintLeft_toLeftOf="@+id/fromIcon"
 			app:layout_constraintTop_toTopOf="@+id/via"
 			app:srcCompat="@drawable/trip_via"
-			app:tint="?colorControlNormal"
 			tools:ignore="ContentDescription"
-			tools:visibility="visible" />
+			tools:visibility="visible"
+			style="@style/FavoriteCardForeground" />
 
 		<TextView
 			android:id="@+id/via"
@@ -68,12 +69,12 @@
 			android:layout_height="wrap_content"
 			android:ellipsize="middle"
 			android:singleLine="true"
-			android:textColor="?android:textColorPrimary"
 			app:layout_constraintLeft_toRightOf="@+id/viaIcon"
 			app:layout_constraintRight_toLeftOf="@+id/overflowButton"
 			app:layout_constraintTop_toBottomOf="@+id/from"
 			tools:text="Via Station"
-			tools:visibility="visible" />
+			tools:visibility="visible"
+			style="@style/FavoriteCardForeground" />
 
 		<ImageView
 			android:id="@+id/toIcon"
@@ -82,8 +83,8 @@
 			app:layout_constraintLeft_toLeftOf="@+id/fromIcon"
 			app:layout_constraintTop_toTopOf="@+id/to"
 			app:srcCompat="@drawable/trip_to"
-			app:tint="?colorControlNormal"
-			tools:ignore="ContentDescription" />
+			tools:ignore="ContentDescription"
+			style="@style/FavoriteCardForeground" />
 
 		<TextView
 			android:id="@+id/to"
@@ -92,12 +93,12 @@
 			android:layout_marginBottom="8dp"
 			android:ellipsize="middle"
 			android:singleLine="true"
-			android:textColor="?android:textColorPrimary"
 			app:layout_constraintBottom_toBottomOf="parent"
 			app:layout_constraintLeft_toRightOf="@+id/toIcon"
 			app:layout_constraintRight_toLeftOf="@+id/overflowButton"
 			app:layout_constraintTop_toBottomOf="@+id/via"
-			tools:text="To station" />
+			tools:text="To station"
+			style="@style/FavoriteCardForeground" />
 
 		<ImageButton
 			android:id="@+id/overflowButton"
@@ -111,7 +112,7 @@
 			app:layout_constraintRight_toRightOf="parent"
 			app:layout_constraintTop_toTopOf="parent"
 			app:srcCompat="@drawable/ic_more_vert"
-			app:tint="?colorControlNormal" />
+			style="@style/FavoriteCardForeground" />
 
 	</androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/list_item_leg.xml b/app/src/main/res/layout/list_item_leg.xml
index 24dfe03f5..cc80a7a05 100644
--- a/app/src/main/res/layout/list_item_leg.xml
+++ b/app/src/main/res/layout/list_item_leg.xml
@@ -13,7 +13,7 @@
 		android:layout_marginLeft="8dp"
 		android:layout_marginStart="8dp"
 		android:layout_marginTop="8dp"
-		android:textColor="?android:textColorPrimary"
+		style="@style/FavoriteCardForeground"
 		app:layout_constraintLeft_toLeftOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toTopOf="parent"
@@ -54,7 +54,7 @@
 		android:background="?selectableItemBackground"
 		android:gravity="center_vertical"
 		android:paddingBottom="8dp"
-		android:textColor="?android:textColorPrimary"
+		style="@style/FavoriteCardForeground"
 		android:textSize="16sp"
 		app:layout_constraintEnd_toStartOf="@+id/toButton"
 		app:layout_constraintLeft_toRightOf="@+id/fromTime"
@@ -141,6 +141,7 @@
 		android:layout_marginEnd="8dp"
 		android:layout_marginRight="8dp"
 		android:layout_marginTop="8dp"
+		style="@style/FavoriteCardForeground"
 		app:layout_constraintBottom_toTopOf="@+id/toButton"
 		app:layout_constraintRight_toRightOf="parent"
 		app:layout_constraintTop_toBottomOf="@+id/fromButton"
@@ -188,7 +189,7 @@
 		android:id="@+id/toTime"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:textColor="?android:textColorPrimary"
+		style="@style/FavoriteCardForeground"
 		app:layout_constraintBottom_toBottomOf="@+id/toCircle"
 		app:layout_constraintStart_toStartOf="@+id/fromTime"
 		app:layout_constraintTop_toTopOf="@+id/toCircle"
@@ -223,7 +224,7 @@
 		android:layout_height="wrap_content"
 		android:background="?selectableItemBackground"
 		android:paddingBottom="8dp"
-		android:textColor="?android:textColorPrimary"
+		style="@style/FavoriteCardForeground"
 		android:textSize="16sp"
 		app:layout_constraintEnd_toStartOf="@+id/toButton"
 		app:layout_constraintStart_toStartOf="@+id/fromLocation"
diff --git a/app/src/main/res/layout/list_item_special_favorite.xml b/app/src/main/res/layout/list_item_special_favorite.xml
index 8404c819c..b021b65bd 100644
--- a/app/src/main/res/layout/list_item_special_favorite.xml
+++ b/app/src/main/res/layout/list_item_special_favorite.xml
@@ -17,7 +17,7 @@
 			android:layout_height="wrap_content"
 			android:layout_marginLeft="8dp"
 			android:layout_marginStart="8dp"
-			app:tint="?colorControlNormal"
+			style="@style/FavoriteCardForeground"
 			app:layout_constraintBottom_toBottomOf="parent"
 			app:layout_constraintLeft_toLeftOf="parent"
 			app:layout_constraintTop_toTopOf="parent"
@@ -32,6 +32,7 @@
 			android:layout_marginStart="8dp"
 			android:layout_marginTop="8dp"
 			android:text="@string/home"
+			android:textColor="?attr/colorSecondary"
 			android:textAppearance="@style/TextAppearance.AppCompat.Body1"
 			android:textSize="18sp"
 			android:textStyle="normal|bold"
@@ -50,7 +51,8 @@
 			app:layout_constraintHorizontal_bias="0.0"
 			app:layout_constraintLeft_toLeftOf="@+id/title"
 			app:layout_constraintRight_toLeftOf="@+id/overflowButton"
-			app:layout_constraintTop_toBottomOf="@+id/title"/>
+			app:layout_constraintTop_toBottomOf="@+id/title"
+			style="@style/FavoriteCardForeground"/>
 
 		<ImageButton
 			android:id="@+id/overflowButton"
@@ -60,7 +62,7 @@
 			android:clickable="true"
 			android:contentDescription="@string/more"
 			android:focusable="true"
-			app:tint="?colorControlNormal"
+			style="@style/FavoriteCardForeground"
 			app:layout_constraintBottom_toBottomOf="parent"
 			app:layout_constraintRight_toRightOf="parent"
 			app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/layout/list_item_trip.xml b/app/src/main/res/layout/list_item_trip.xml
index 4a850182c..6f86911c0 100644
--- a/app/src/main/res/layout/list_item_trip.xml
+++ b/app/src/main/res/layout/list_item_trip.xml
@@ -18,6 +18,7 @@
 		android:padding="8dp">
 
 		<TextView
+			style="@style/FavoriteCardForeground"
 			android:id="@+id/fromTimeRel"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
@@ -32,7 +33,7 @@
 			android:id="@+id/fromTime"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:textColor="?android:textColorPrimary"
+			style="@style/FavoriteCardForeground"
 			app:layout_constraintLeft_toLeftOf="parent"
 			app:layout_constraintBaseline_toBaselineOf="@+id/fromLocation"
 			app:layout_goneMarginTop="0dp"
@@ -44,7 +45,7 @@
 			android:layout_height="wrap_content"
 			android:layout_marginTop="0dp"
 			android:gravity="end"
-			android:textColor="?colorPrimary"
+			style="@style/FavoriteCardForeground"
 			app:layout_constraintLeft_toLeftOf="parent"
 			app:layout_constraintRight_toRightOf="@+id/fromTime"
 			app:layout_constraintTop_toBottomOf="@+id/fromTime"
@@ -60,7 +61,7 @@
 			android:layout_marginStart="8dp"
 			android:layout_marginRight="8dp"
 			android:layout_marginEnd="8dp"
-			android:textColor="?android:textColorPrimary"
+			style="@style/FavoriteCardForeground"
 			app:layout_constraintTop_toBottomOf="@+id/fromTimeRel"
 			app:layout_constraintLeft_toRightOf="@+id/barrierLeft"
 			app:layout_constraintRight_toLeftOf="@+id/barrierRight"
@@ -71,7 +72,7 @@
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:contentDescription="@string/trip_issue"
-			app:tint="?colorPrimary"
+			style="@style/ErrorCard"
 			app:layout_constraintBottom_toTopOf="@+id/toTime"
 			app:layout_constraintEnd_toEndOf="@+id/fromTime"
 			app:layout_constraintStart_toStartOf="parent"
@@ -97,7 +98,7 @@
 			android:id="@+id/duration"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:textColor="?android:textColorSecondary"
+			style="@style/FavoriteCardForeground"
 			app:layout_constraintBottom_toTopOf="@+id/price"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintTop_toTopOf="@+id/lines"
@@ -109,7 +110,7 @@
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_marginTop="2dp"
-			android:textColor="?android:textColorSecondary"
+			style="@style/FavoriteCardForeground"
 			app:layout_constraintTop_toBottomOf="@+id/duration"
 			app:layout_constraintBottom_toBottomOf="@+id/lines"
 			app:layout_constraintEnd_toEndOf="parent"
@@ -120,7 +121,7 @@
 			android:id="@+id/toTime"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:textColor="?android:textColorPrimary"
+			style="@style/FavoriteCardForeground"
 			app:layout_constraintLeft_toLeftOf="parent"
 			app:layout_constraintBaseline_toBaselineOf="@+id/toLocation"
 			tools:text="23:42"/>
@@ -130,7 +131,7 @@
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
 			android:gravity="end"
-			android:textColor="?colorPrimary"
+			style="@style/FavoriteCardForeground"
 			app:layout_constraintLeft_toLeftOf="parent"
 			app:layout_constraintRight_toRightOf="@+id/toTime"
 			app:layout_constraintTop_toBottomOf="@+id/toTime"
@@ -142,7 +143,7 @@
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
 			android:layout_marginTop="4dp"
-			android:textColor="?android:textColorPrimary"
+			style="@style/FavoriteCardForeground"
 			app:layout_constraintLeft_toLeftOf="@+id/fromLocation"
 			app:layout_constraintRight_toRightOf="@+id/fromLocation"
 			app:layout_constraintTop_toBottomOf="@+id/lines"
diff --git a/app/src/main/res/values-night-v31/colors.xml b/app/src/main/res/values-night-v31/colors.xml
index d1b6f1afd..391b3d516 100644
--- a/app/src/main/res/values-night-v31/colors.xml
+++ b/app/src/main/res/values-night-v31/colors.xml
@@ -3,8 +3,8 @@
 
     <color name="md_theme_primary">@android:color/system_accent1_200</color>
     <color name="md_theme_onPrimary">@android:color/system_accent1_900</color>
-    <color name="md_theme_primaryContainer">@android:color/system_accent1_600</color>
-    <color name="md_theme_onPrimaryContainer">@android:color/system_accent1_200</color>
+    <color name="md_theme_primaryContainer">@android:color/system_accent1_500</color>
+    <color name="md_theme_onPrimaryContainer">@android:color/system_accent1_100</color>
 
     <color name="md_theme_secondary">@android:color/system_accent2_200</color>
     <color name="md_theme_onSecondary">@android:color/system_accent2_900</color>
diff --git a/app/src/main/res/values-v31/colors.xml b/app/src/main/res/values-v31/colors.xml
index 6d42d7d3f..87b0e434a 100644
--- a/app/src/main/res/values-v31/colors.xml
+++ b/app/src/main/res/values-v31/colors.xml
@@ -3,7 +3,7 @@
 
     <color name="md_theme_primary">@android:color/system_accent1_200</color>
     <color name="md_theme_onPrimary">@android:color/system_accent1_0</color>
-    <color name="md_theme_primaryContainer">@android:color/system_accent1_300</color>
+    <color name="md_theme_primaryContainer">@android:color/system_accent1_200</color>
     <color name="md_theme_onPrimaryContainer">@android:color/system_accent1_700</color>
 
     <color name="md_theme_secondary">@android:color/system_accent2_700</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 4f4e7724a..132a19295 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -23,6 +23,12 @@
 		<item name="android:layout_marginEnd">8dp</item>
 		<item name="android:layout_marginTop">8dp</item>
 		<item name="cardBackgroundColor">?attr/colorPrimaryContainer</item>
+		<item name="android:textColor">?attr/colorPrimaryContainer</item>
+	</style>
+
+	<style name="FavoriteCardForeground" parent="Widget.Material3.CardView.Elevated">
+		<item name="android:textColor">?attr/colorOnPrimaryContainer</item>
+		<item name="tint">?attr/colorOnPrimaryContainer</item>
 	</style>
 
 	<style name="Card" parent="Widget.Material3.CardView.Elevated">
@@ -39,6 +45,8 @@
 	<style name="ErrorCard" parent="Card">
 		<item name="cardBackgroundColor">?attr/colorErrorContainer</item>
 		<item name="android:textColor">?attr/colorError</item>
+		<item name="android:textColor">?attr/colorError</item>
+		<item name="tint">?attr/colorError</item>
 	</style>
 
 	<style name="NavHeaderCard" parent="Card">

From d8bac803d326239a016f4ad86b4f67f9665e940d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20N=C3=BCsse?= <felix.nuesse@t-online.de>
Date: Thu, 18 Jan 2024 18:18:32 +0100
Subject: [PATCH 16/60] mute colors a bit

---
 app/src/main/res/values/styles.xml | 9 ++++-----
 app/src/main/res/values/themes.xml | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 132a19295..605636a02 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -22,8 +22,8 @@
 		<item name="android:layout_marginStart">8dp</item>
 		<item name="android:layout_marginEnd">8dp</item>
 		<item name="android:layout_marginTop">8dp</item>
-		<item name="cardBackgroundColor">?attr/colorPrimaryContainer</item>
-		<item name="android:textColor">?attr/colorPrimaryContainer</item>
+		<item name="cardBackgroundColor">?attr/colorSurfaceVariant</item>
+		<item name="android:textColor">?attr/colorSurfaceVariant</item>
 	</style>
 
 	<style name="FavoriteCardForeground" parent="Widget.Material3.CardView.Elevated">
@@ -50,8 +50,8 @@
 	</style>
 
 	<style name="NavHeaderCard" parent="Card">
-		<item name="cardBackgroundColor">?attr/colorPrimary</item>
-		<item name="android:textColor">?attr/colorOnPrimary</item>
+		<item name="cardBackgroundColor">?attr/colorSurfaceVariant</item>
+		<item name="android:textColor">?attr/colorOnSurface</item>
 	</style>
 
 	<style name="Button" parent="Widget.AppCompat.Button.Borderless.Colored">
@@ -94,7 +94,6 @@
 		<item name="cornerSize">8dp</item>
 	</style>
 
-
 	<style name="AppTheme.MapFullscreen" parent="AppTheme">
 		<item name="android:statusBarColor">@android:color/transparent</item>
 	</style>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 0fd334b6f..d583ab467 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -46,7 +46,7 @@
     <style name="AppTheme" parent="AppDayNightTheme" />
 
     <style name="Theme.App.Starting" parent="Theme.SplashScreen">
-        <item name="windowSplashScreenBackground">@color/md_theme_primary</item>
+        <item name="windowSplashScreenBackground">?attr/colorOnSurface</item>
         <item name="windowSplashScreenAnimatedIcon">@drawable/ic_launcher_foreground</item>
         <item name="postSplashScreenTheme">@style/AppTheme</item>
     </style>

From 296ea976a2897f9e71586c29d29b23049aebb28d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20N=C3=BCsse?= <felix.nuesse@t-online.de>
Date: Mon, 22 Jan 2024 17:55:09 +0100
Subject: [PATCH 17/60] fix primary card style

---
 app/src/main/res/values-night/styles.xml | 13 +++++++++++++
 app/src/main/res/values/styles.xml       |  1 +
 2 files changed, 14 insertions(+)
 create mode 100644 app/src/main/res/values-night/styles.xml

diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
new file mode 100644
index 000000000..83ddd4b9f
--- /dev/null
+++ b/app/src/main/res/values-night/styles.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+	<style name="FavoriteCard" parent="Widget.Material3.CardView.Elevated">
+		<item name="android:foreground">?selectableItemBackground</item>
+		<item name="android:clickable">true</item>
+		<item name="android:layout_marginStart">8dp</item>
+		<item name="android:layout_marginEnd">8dp</item>
+		<item name="android:layout_marginTop">8dp</item>
+		<item name="cardElevation">3dp</item>
+	</style>
+
+</resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 605636a02..b21a1d559 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -24,6 +24,7 @@
 		<item name="android:layout_marginTop">8dp</item>
 		<item name="cardBackgroundColor">?attr/colorSurfaceVariant</item>
 		<item name="android:textColor">?attr/colorSurfaceVariant</item>
+		<item name="cardElevation">3dp</item>
 	</style>
 
 	<style name="FavoriteCardForeground" parent="Widget.Material3.CardView.Elevated">

From 71fd70c2b47b6539ce402bffd8fc6586e32fcb08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20N=C3=BCsse?= <felix.nuesse@t-online.de>
Date: Mon, 22 Jan 2024 20:38:32 +0100
Subject: [PATCH 18/60] update startup icon color

---
 app/src/main/res/values/styles.xml | 4 +---
 app/src/main/res/values/themes.xml | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index b21a1d559..a1496fe8c 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -16,14 +16,12 @@
 		<item name="android:windowExitAnimation">@anim/scale_down</item>
 	</style>
 
-	<style name="FavoriteCard" parent="Widget.Material3.CardView.Elevated">
+	<style name="FavoriteCard" parent="Widget.Material3.CardView.Filled">
 		<item name="android:foreground">?selectableItemBackground</item>
 		<item name="android:clickable">true</item>
 		<item name="android:layout_marginStart">8dp</item>
 		<item name="android:layout_marginEnd">8dp</item>
 		<item name="android:layout_marginTop">8dp</item>
-		<item name="cardBackgroundColor">?attr/colorSurfaceVariant</item>
-		<item name="android:textColor">?attr/colorSurfaceVariant</item>
 		<item name="cardElevation">3dp</item>
 	</style>
 
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index d583ab467..e3a2c542d 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -46,8 +46,8 @@
     <style name="AppTheme" parent="AppDayNightTheme" />
 
     <style name="Theme.App.Starting" parent="Theme.SplashScreen">
-        <item name="windowSplashScreenBackground">?attr/colorOnSurface</item>
-        <item name="windowSplashScreenAnimatedIcon">@drawable/ic_launcher_foreground</item>
+        <item name="windowSplashScreenBackground">?attr/backgroundColor</item>
+        <item name="windowSplashScreenAnimatedIcon">@drawable/ic_launcher_foreground_primary_color</item>
         <item name="postSplashScreenTheme">@style/AppTheme</item>
     </style>
 

From 1196dc07d625f76ed739e9e18ac1c9a8996d9a57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20N=C3=BCsse?= <felix.nuesse@t-online.de>
Date: Mon, 22 Jan 2024 20:38:55 +0100
Subject: [PATCH 19/60] add startup icon

---
 .../ic_launcher_foreground_primary_color.xml       | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 app/src/main/res/drawable/ic_launcher_foreground_primary_color.xml

diff --git a/app/src/main/res/drawable/ic_launcher_foreground_primary_color.xml b/app/src/main/res/drawable/ic_launcher_foreground_primary_color.xml
new file mode 100644
index 000000000..b7cbab359
--- /dev/null
+++ b/app/src/main/res/drawable/ic_launcher_foreground_primary_color.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+		android:width="108dp"
+		android:height="108dp"
+	    android:tint="@color/md_theme_primary"
+		android:viewportHeight="853.3333"
+		android:viewportWidth="853.3333">
+	<group
+		android:translateX="170.66667"
+		android:translateY="170.66667">
+		<path
+			android:fillColor="#ffffff"
+			android:pathData="m459.1,308.4c-8.9,-26.1 -59.9,-115.1 -79.7,-145.6 -20,-32.9 -43.2,-46.6 -77.8,-45.9 -28.3,-0.9 -189,6.4 -243.6,15.6 -12,2 -9.5,18.1 -1.4,18.6 14.5,0.9 68,2.9 91.9,5.2 14.9,1.4 28.8,8.5 39,28.5 10.2,20 34.6,80.9 43.6,104.2 5.1,13.2 6.2,27.4 0.9,36.6 -3.9,6.9 -16.1,13.7 -34.5,10.4 -15.4,-2.7 -117,-24.8 -127,-27.1 -12.8,-2.9 -17,20.7 -3.4,25.4 18.6,6.4 104.4,36.3 174,55.4 35.5,9.8 55.4,4.9 81.8,-0.3 33.2,-6.5 79.6,-15.9 107.7,-23.7 27.6,-7.6 37.5,-33.7 28.5,-57.1zM306.9,362.9c-11.9,0 -21.6,-9.7 -21.6,-21.6 0,-11.9 9.7,-21.6 21.6,-21.6 11.9,0 21.6,9.7 21.6,21.6 0,11.9 -9.7,21.6 -21.6,21.6zM386.4,269c-14.9,3.8 -67,11.4 -88,13.7 -22.9,3.3 -35.9,-1 -43.2,-17.8 -6.1,-11.2 -31.4,-76.2 -35.6,-85.7 -7.6,-20.1 1.8,-25.9 14.5,-27.2 10.1,-1.2 57.6,-5.2 74.8,-6.7 25.9,-2 39.2,8 52.1,30.3 14.5,24.5 27.8,47.3 39,67.4 6.3,11.4 0.9,22.3 -13.5,25.9zM421.3,338.6c-10.8,0 -19.5,-8.7 -19.5,-19.5 0,-10.8 8.7,-19.5 19.5,-19.5 10.8,0 19.5,8.7 19.5,19.5 0,10.8 -8.7,19.5 -19.5,19.5z"/>
+	</group>
+</vector>

From d38dfb1a2ac72f5e9f487c1499fe467381ebb3c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20N=C3=BCsse?= <felix.nuesse@t-online.de>
Date: Mon, 22 Jan 2024 21:13:35 +0100
Subject: [PATCH 20/60] add missing colors

---
 app/src/main/res/values-night-v31/colors.xml | 16 ++++++++++++++++
 app/src/main/res/values-v31/colors.xml       | 15 +++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/app/src/main/res/values-night-v31/colors.xml b/app/src/main/res/values-night-v31/colors.xml
index 391b3d516..6647ae8c3 100644
--- a/app/src/main/res/values-night-v31/colors.xml
+++ b/app/src/main/res/values-night-v31/colors.xml
@@ -16,4 +16,20 @@
     <color name="md_theme_tertiaryContainer">@android:color/system_accent3_400</color>
     <color name="md_theme_onTertiaryContainer">@android:color/system_accent3_100</color>
 
+    <color name="md_theme_error">#F2B8B5</color>
+    <color name="md_theme_errorContainer">#8C1D18</color>
+    <color name="md_theme_onError">#601410</color>
+    <color name="md_theme_onErrorContainer">#F9DEDC</color>
+
+    <color name="md_theme_background">#1C1B1F</color>
+    <color name="md_theme_onBackground">#E6E1E5</color>
+
+    <color name="md_theme_surface">#1C1B1F</color>
+    <color name="md_theme_onSurface">#E6E1E5</color>
+    <color name="md_theme_surfaceVariant">#49454F</color>
+    <color name="md_theme_onSurfaceVariant">#CAC4D0</color>
+
+    <color name="md_theme_outline">#938F99</color>
+
+
 </resources>
diff --git a/app/src/main/res/values-v31/colors.xml b/app/src/main/res/values-v31/colors.xml
index 87b0e434a..150ca0812 100644
--- a/app/src/main/res/values-v31/colors.xml
+++ b/app/src/main/res/values-v31/colors.xml
@@ -16,4 +16,19 @@
     <color name="md_theme_tertiaryContainer">@android:color/system_accent3_400</color>
     <color name="md_theme_onTertiaryContainer">@android:color/system_accent3_800</color>
 
+    <color name="md_theme_error">#B3261E</color>
+    <color name="md_theme_errorContainer">#F9DEDC</color>
+    <color name="md_theme_onError">#FFFFFF</color>
+    <color name="md_theme_onErrorContainer">#410E0B</color>
+
+    <color name="md_theme_background">#FFFBFE</color>
+    <color name="md_theme_onBackground">#1C1B1F</color>
+
+    <color name="md_theme_surface">#FFFBFE</color>
+    <color name="md_theme_onSurface">#1C1B1F</color>
+    <color name="md_theme_surfaceVariant">#E7E0EC</color>
+    <color name="md_theme_onSurfaceVariant">#49454F</color>
+
+    <color name="md_theme_outline">#79747E</color>
+
 </resources>

From c091cb7aefa7b14312163b72244c7781c8e252cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20N=C3=BCsse?= <felix.nuesse@t-online.de>
Date: Tue, 23 Jan 2024 13:10:57 +0100
Subject: [PATCH 21/60] push map route below statusbar

---
 .../java/de/grobox/transportr/trips/detail/TripMapFragment.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/de/grobox/transportr/trips/detail/TripMapFragment.kt b/app/src/main/java/de/grobox/transportr/trips/detail/TripMapFragment.kt
index 563b0d8e7..851467251 100644
--- a/app/src/main/java/de/grobox/transportr/trips/detail/TripMapFragment.kt
+++ b/app/src/main/java/de/grobox/transportr/trips/detail/TripMapFragment.kt
@@ -66,7 +66,7 @@ class TripMapFragment : GpsMapFragment() {
         // set padding, so everything gets centered in top half of screen
         val metrics = DisplayMetrics()
         activity!!.windowManager.defaultDisplay.getMetrics(metrics)
-        val topPadding = mapPadding / 2
+        val topPadding = mapPadding
         val bottomPadding = mapView.height / 4
         map!!.setPadding(0, topPadding, 0, bottomPadding)
 

From 26497045e7c87072dd9853658558e13eb8a963df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20N=C3=BCsse?= <felix.nuesse@t-online.de>
Date: Tue, 23 Jan 2024 13:16:02 +0100
Subject: [PATCH 22/60] improve splash screen colors

---
 .../main/res/drawable/ic_launcher_foreground_primary_color.xml  | 2 +-
 app/src/main/res/values/themes.xml                              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/drawable/ic_launcher_foreground_primary_color.xml b/app/src/main/res/drawable/ic_launcher_foreground_primary_color.xml
index b7cbab359..1dd21ff2c 100644
--- a/app/src/main/res/drawable/ic_launcher_foreground_primary_color.xml
+++ b/app/src/main/res/drawable/ic_launcher_foreground_primary_color.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
 		android:width="108dp"
 		android:height="108dp"
-	    android:tint="@color/md_theme_primary"
+	    android:tint="@color/md_theme_onPrimaryContainer"
 		android:viewportHeight="853.3333"
 		android:viewportWidth="853.3333">
 	<group
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index e3a2c542d..fe12a5600 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -46,7 +46,7 @@
     <style name="AppTheme" parent="AppDayNightTheme" />
 
     <style name="Theme.App.Starting" parent="Theme.SplashScreen">
-        <item name="windowSplashScreenBackground">?attr/backgroundColor</item>
+        <item name="windowSplashScreenBackground">?attr/colorPrimaryContainer</item>
         <item name="windowSplashScreenAnimatedIcon">@drawable/ic_launcher_foreground_primary_color</item>
         <item name="postSplashScreenTheme">@style/AppTheme</item>
     </style>

From 56f8e9b49d0dc82072b62649a1808a772e793355 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20N=C3=BCsse?= <felix.nuesse@t-online.de>
Date: Tue, 23 Jan 2024 13:34:10 +0100
Subject: [PATCH 23/60] update divider between map and content

---
 .../trips/detail/TripDetailActivity.java      |  3 ++
 .../main/res/layout/fragment_favorites.xml    |  4 --
 .../main/res/layout/fragment_trip_detail.xml  | 41 +++++++++----------
 3 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/app/src/main/java/de/grobox/transportr/trips/detail/TripDetailActivity.java b/app/src/main/java/de/grobox/transportr/trips/detail/TripDetailActivity.java
index e8df0de0f..1f9da5d19 100644
--- a/app/src/main/java/de/grobox/transportr/trips/detail/TripDetailActivity.java
+++ b/app/src/main/java/de/grobox/transportr/trips/detail/TripDetailActivity.java
@@ -147,6 +147,7 @@ private void onSheetStateChanged(@Nullable SheetState sheetState) {
 				bottomSheetBehavior.setBottom();
 				bottomSheetBehavior.setState(STATE_COLLAPSED);
 				FullScreenUtil.Companion.showStatusbar(this);
+				findViewById(R.id.divider).setVisibility(View.GONE);
 				break;
 			case MIDDLE:
 				bottomSheetBehavior.setHideable(true);  // ensures it can be swiped down
@@ -154,9 +155,11 @@ private void onSheetStateChanged(@Nullable SheetState sheetState) {
 				bottomSheetBehavior.setState(STATE_COLLAPSED);
 				FullScreenUtil.Companion.drawBehindStatusbar(this);
 				FullScreenUtil.Companion.applyTopInset(findViewById(R.id.appBarLayout));
+				findViewById(R.id.divider).setVisibility(View.GONE);
 				break;
 			case EXPANDED:
 				FullScreenUtil.Companion.showStatusbar(this);
+				findViewById(R.id.divider).setVisibility(View.VISIBLE);
 				break;
 		}
 	}
diff --git a/app/src/main/res/layout/fragment_favorites.xml b/app/src/main/res/layout/fragment_favorites.xml
index 634ae6115..3094af472 100644
--- a/app/src/main/res/layout/fragment_favorites.xml
+++ b/app/src/main/res/layout/fragment_favorites.xml
@@ -20,8 +20,4 @@
 		android:layout_height="wrap_content"
 		android:layout_gravity="center"/>
 
-	<View
-		style="@style/Divider"
-		android:layout_gravity="top"/>
-
 </FrameLayout>
diff --git a/app/src/main/res/layout/fragment_trip_detail.xml b/app/src/main/res/layout/fragment_trip_detail.xml
index ea616d01e..1ef266a6a 100644
--- a/app/src/main/res/layout/fragment_trip_detail.xml
+++ b/app/src/main/res/layout/fragment_trip_detail.xml
@@ -125,18 +125,15 @@
 				android:id="@+id/fromTimeRel"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:layout_marginLeft="8dp"
 				android:layout_marginStart="8dp"
-				android:layout_marginTop="8dp"
-				android:layout_marginBottom="8dp"
 				android:textAppearance="@style/TextAppearance.AppCompat.Body2"
-				android:textStyle="normal|bold"
 				android:textColor="?attr/colorOnPrimaryContainer"
-				app:layout_constraintTop_toTopOf="parent"
-				app:layout_constraintBottom_toBottomOf="parent"
+				android:textStyle="normal|bold"
+				app:layout_constraintBottom_toBottomOf="@+id/durationTop"
 				app:layout_constraintStart_toStartOf="parent"
+				app:layout_constraintTop_toTopOf="@+id/durationTop"
 				tools:text="in 20min"
-				tools:visibility="visible"/>
+				tools:visibility="visible" />
 
 			<TextView
 				android:id="@+id/durationTop"
@@ -145,35 +142,37 @@
 				android:layout_marginTop="8dp"
 				android:layout_marginBottom="8dp"
 				android:textColor="?attr/colorOnPrimaryContainer"
-				app:layout_constraintTop_toTopOf="parent"
 				app:layout_constraintBottom_toBottomOf="parent"
 				app:layout_constraintEnd_toEndOf="parent"
 				app:layout_constraintStart_toStartOf="parent"
-				tools:text="Gesamtdauer: 0:42"/>
+				app:layout_constraintTop_toTopOf="parent"
+				tools:text="Gesamtdauer: 0:42" />
 
 			<TextView
 				android:id="@+id/priceTop"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:layout_marginTop="8dp"
-				android:layout_marginBottom="8dp"
 				android:layout_marginEnd="8dp"
-				android:layout_marginRight="8dp"
 				android:textColor="?attr/colorOnPrimaryContainer"
-				app:layout_constraintTop_toTopOf="parent"
-				app:layout_constraintRight_toRightOf="parent"
+				app:layout_constraintBottom_toBottomOf="@+id/durationTop"
 				app:layout_constraintEnd_toEndOf="parent"
-				tools:text="1,50 €"/>
-
-			<View
-				style="@style/Divider"
-				android:layout_width="0dp"
-				app:layout_constraintBottom_toBottomOf="parent"
-				app:layout_constraintLeft_toLeftOf="parent"
-				app:layout_constraintRight_toRightOf="parent"/>
+				app:layout_constraintRight_toRightOf="parent"
+				app:layout_constraintTop_toTopOf="parent"
+				tools:text="1,50 €" />
 
 		</androidx.constraintlayout.widget.ConstraintLayout>
 
+		<View
+			android:id="@+id/divider"
+			style="@style/Divider"
+			android:layout_width="match_parent"
+			android:layout_height="2px"
+			android:layout_marginLeft="32dp"
+			android:layout_marginRight="32dp"
+			android:layout_marginBottom="8dp"
+			android:background="?attr/colorPrimary" />
+
 	</com.google.android.material.appbar.AppBarLayout>
 
 	<androidx.recyclerview.widget.RecyclerView

From 16858629e182dfdcdb7619d890ee2612183da456 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20N=C3=BCsse?= <felix.nuesse@t-online.de>
Date: Tue, 23 Jan 2024 14:21:25 +0100
Subject: [PATCH 24/60] draw map below statusbar in map activity

---
 .../de/grobox/transportr/map/MapActivity.java |  1 +
 .../grobox/transportr/utils/FullScreenUtil.kt | 23 +++++++++++++++----
 app/src/main/res/layout/activity_map.xml      |  4 ++--
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/de/grobox/transportr/map/MapActivity.java b/app/src/main/java/de/grobox/transportr/map/MapActivity.java
index ea463dc7b..dd3e2475a 100644
--- a/app/src/main/java/de/grobox/transportr/map/MapActivity.java
+++ b/app/src/main/java/de/grobox/transportr/map/MapActivity.java
@@ -97,6 +97,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
 		setContentView(R.layout.activity_map);
 		setupDrawer();
 		FullScreenUtil.Companion.drawBehindStatusbar(this);
+		FullScreenUtil.Companion.applyTopInset(findViewById(R.id.searchCardView), 16);
 
 		View menu = findViewById(R.id.menu);
 		menu.setOnClickListener(view -> {
diff --git a/app/src/main/java/de/grobox/transportr/utils/FullScreenUtil.kt b/app/src/main/java/de/grobox/transportr/utils/FullScreenUtil.kt
index b8c2837e0..48558e28c 100644
--- a/app/src/main/java/de/grobox/transportr/utils/FullScreenUtil.kt
+++ b/app/src/main/java/de/grobox/transportr/utils/FullScreenUtil.kt
@@ -26,6 +26,7 @@ import android.view.View
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.view.WindowCompat
 import androidx.core.view.WindowInsetsCompat
+import de.grobox.transportr.utils.TransportrUtils.dpToPx
 
 
 class FullScreenUtil {
@@ -46,9 +47,23 @@ class FullScreenUtil {
             if(view == null) {
                 return
             }
+            applyTopInset(view, 0, 8, 0 ,0)
+        }
+
+        fun applyTopInset(view: View?, margin: Int) {
+            if(view == null) {
+                return
+            }
+            applyTopInset(view, margin, margin, margin ,margin)
+        }
+
+        fun applyTopInset(view: View?, dpLeft: Int, dpTop: Int, dpRight: Int, dpBottom: Int) {
+            if(view == null) {
+                return
+            }
 
             view.setOnApplyWindowInsetsListener { v, insets ->
-                val originalOffset = (8 * (view.resources.displayMetrics.densityDpi / 160f)).toInt()
+                val originalOffset = dpToPx(view.context, dpTop)
                 val top = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
                     insets.getInsets(WindowInsetsCompat.Type.statusBars()).top
                 } else {
@@ -56,10 +71,10 @@ class FullScreenUtil {
                 }
 
                 val parameters = CoordinatorLayout.LayoutParams(
-                    CoordinatorLayout.LayoutParams.WRAP_CONTENT,
-                    CoordinatorLayout.LayoutParams.WRAP_CONTENT
+                    v.layoutParams.width,
+                    v.layoutParams.height
                 )
-                parameters.setMargins(0, top + originalOffset, 0, 0)
+                parameters.setMargins(dpToPx(view.context, dpLeft), top + originalOffset, dpToPx(view.context, dpRight), dpToPx(view.context, dpBottom))
                 v.layoutParams = parameters
 
                 return@setOnApplyWindowInsetsListener insets
diff --git a/app/src/main/res/layout/activity_map.xml b/app/src/main/res/layout/activity_map.xml
index b5d1ef4ae..0f39dec2b 100644
--- a/app/src/main/res/layout/activity_map.xml
+++ b/app/src/main/res/layout/activity_map.xml
@@ -3,8 +3,7 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:id="@+id/drawerLayout"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:fitsSystemWindows="true">
+	android:layout_height="match_parent">
 
 	<androidx.coordinatorlayout.widget.CoordinatorLayout
 		android:layout_width="match_parent"
@@ -17,6 +16,7 @@
 			android:layout_height="match_parent" />
 
 		<com.google.android.material.card.MaterialCardView
+			android:id="@+id/searchCardView"
 			android:layout_width="match_parent"
 			android:layout_height="48dp"
 			android:layout_marginStart="16dp"

From 3dae404b0b54abd819c1b15dd9d52bf06db33f80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20N=C3=BCsse?= <felix.nuesse@t-online.de>
Date: Tue, 23 Jan 2024 15:09:11 +0100
Subject: [PATCH 25/60] partially fix shadow on special location fragment

---
 .../locations/SpecialLocationFragment.kt      |  4 +++
 app/src/main/res/layout/activity_map.xml      | 11 +++---
 .../res/layout/fragment_special_location.xml  | 34 +++++++++++--------
 app/src/main/res/layout/location_item.xml     | 17 +++++-----
 app/src/main/res/values/dimens.xml            |  6 ++++
 5 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/app/src/main/java/de/grobox/transportr/favorites/locations/SpecialLocationFragment.kt b/app/src/main/java/de/grobox/transportr/favorites/locations/SpecialLocationFragment.kt
index 5ae0fd4c7..721184f3a 100644
--- a/app/src/main/java/de/grobox/transportr/favorites/locations/SpecialLocationFragment.kt
+++ b/app/src/main/java/de/grobox/transportr/favorites/locations/SpecialLocationFragment.kt
@@ -21,6 +21,8 @@ package de.grobox.transportr.favorites.locations
 
 import android.app.Activity
 import android.content.DialogInterface
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
 import android.os.Bundle
 import android.view.Gravity
 import android.view.LayoutInflater
@@ -72,6 +74,8 @@ abstract class SpecialLocationFragment : DialogFragment(), LocationView.Location
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         val v = inflater.inflate(R.layout.fragment_special_location, container)
 
+        dialog?.window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
+
         // Initialize LocationView
         loc = v.findViewById(R.id.location_input)
         loc.setHint(hint)
diff --git a/app/src/main/res/layout/activity_map.xml b/app/src/main/res/layout/activity_map.xml
index 0f39dec2b..cca6066d4 100644
--- a/app/src/main/res/layout/activity_map.xml
+++ b/app/src/main/res/layout/activity_map.xml
@@ -18,12 +18,11 @@
 		<com.google.android.material.card.MaterialCardView
 			android:id="@+id/searchCardView"
 			android:layout_width="match_parent"
-			android:layout_height="48dp"
-			android:layout_marginStart="16dp"
-			android:layout_marginLeft="16dp"
-			android:layout_marginTop="16dp"
-			android:layout_marginEnd="16dp"
-			android:layout_marginRight="16dp">
+			android:layout_height="@dimen/searchBarHeight"
+			android:layout_marginEnd="@dimen/searchBarMargins"
+			android:layout_marginStart="@dimen/searchBarMargins"
+			android:layout_marginTop="@dimen/searchBarMargins"
+			app:cardCornerRadius="@dimen/searchBarCornerRadius">
 
 			<ImageButton
 				android:id="@+id/menu"
diff --git a/app/src/main/res/layout/fragment_special_location.xml b/app/src/main/res/layout/fragment_special_location.xml
index 7492423aa..d8b1a2ce0 100644
--- a/app/src/main/res/layout/fragment_special_location.xml
+++ b/app/src/main/res/layout/fragment_special_location.xml
@@ -1,23 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.card.MaterialCardView
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:layout_width="match_parent"
-	android:layout_height="48dp"
-	android:layout_marginEnd="16dp"
-	android:layout_marginLeft="16dp"
-	android:layout_marginRight="16dp"
-	android:layout_marginStart="16dp"
-	android:layout_marginTop="16dp">
+	android:layout_height="wrap_content"
+	android:orientation="vertical">
 
-	<de.grobox.transportr.locations.LocationView
-		android:id="@+id/location_input"
+	<com.google.android.material.card.MaterialCardView
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		app:hint="@string/home_dialog_title">
+		android:layout_height="@dimen/searchBarHeight"
+		android:layout_marginStart="@dimen/searchBarMargins"
+		android:layout_marginTop="@dimen/searchBarMargins"
+		android:layout_marginEnd="@dimen/searchBarMargins"
+		app:cardCornerRadius="@dimen/searchBarCornerRadius">
 
-		<requestFocus/>
+		<de.grobox.transportr.locations.LocationView
+			android:id="@+id/location_input"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			app:hint="@string/home_dialog_title">
 
-	</de.grobox.transportr.locations.LocationView>
+			<requestFocus />
 
-</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
+		</de.grobox.transportr.locations.LocationView>
+
+	</com.google.android.material.card.MaterialCardView>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/location_item.xml b/app/src/main/res/layout/location_item.xml
index 92a55bc62..3aa0c6813 100644
--- a/app/src/main/res/layout/location_item.xml
+++ b/app/src/main/res/layout/location_item.xml
@@ -1,36 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:layout_marginStart="16dp"
+	android:layout_marginEnd="16dp"
 	android:paddingHorizontal="12dp"
-	android:paddingVertical="8dp"
-	android:layout_height="wrap_content">
+	android:paddingVertical="8dp">
 
 	<ImageView
 		android:id="@+id/imageView"
 		android:layout_width="32dp"
 		android:layout_height="32dp"
 		android:padding="3dp"
-		app:tint="?attr/colorControlNormal"
 		app:layout_constraintBottom_toBottomOf="@+id/textView"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toTopOf="@+id/textView"
+		app:tint="?attr/colorControlNormal"
 		tools:ignore="ContentDescription"
-		tools:src="@drawable/ic_action_home"/>
+		tools:src="@drawable/ic_action_home" />
 
 	<TextView
 		android:id="@+id/textView"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
+		android:layout_marginStart="8dp"
 		android:gravity="center_vertical"
 		android:minHeight="32dp"
 		android:padding="3dp"
-		android:layout_marginStart="8dp"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toEndOf="@+id/imageView"
 		app:layout_constraintTop_toTopOf="parent"
-		tools:text="This can a be location that has a very long name. It can even span two or more lines."/>
+		tools:text="This can a be location that has a very long name. It can even span two or more lines." />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index dc7f10487..14005f071 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -15,4 +15,10 @@
 	<dimen name="locationPeekPadding">32dp</dimen>
 	<dimen name="dragToRefreshDistance">96dp</dimen>
 
+
+
+	<dimen name="searchBarMargins">16dp</dimen>
+	<dimen name="searchBarHeight">48dp</dimen>
+	<dimen name="searchBarCornerRadius">8dp</dimen>
+
 </resources>

From 28fa82b6c84aac9928e4ffc59d720efa8ac5eee1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20N=C3=BCsse?= <felix.nuesse@t-online.de>
Date: Tue, 23 Jan 2024 15:23:12 +0100
Subject: [PATCH 26/60] use transparent navigation bar

---
 .../transportr/trips/detail/TripDetailActivity.java      | 2 +-
 .../java/de/grobox/transportr/utils/FullScreenUtil.kt    | 3 +--
 app/src/main/res/values-v27/styles.xml                   | 9 +++++++++
 app/src/main/res/values/styles.xml                       | 1 +
 4 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/res/values-v27/styles.xml

diff --git a/app/src/main/java/de/grobox/transportr/trips/detail/TripDetailActivity.java b/app/src/main/java/de/grobox/transportr/trips/detail/TripDetailActivity.java
index 1f9da5d19..a4731f848 100644
--- a/app/src/main/java/de/grobox/transportr/trips/detail/TripDetailActivity.java
+++ b/app/src/main/java/de/grobox/transportr/trips/detail/TripDetailActivity.java
@@ -146,7 +146,7 @@ private void onSheetStateChanged(@Nullable SheetState sheetState) {
 			case BOTTOM:
 				bottomSheetBehavior.setBottom();
 				bottomSheetBehavior.setState(STATE_COLLAPSED);
-				FullScreenUtil.Companion.showStatusbar(this);
+				FullScreenUtil.Companion.drawBehindStatusbar(this);
 				findViewById(R.id.divider).setVisibility(View.GONE);
 				break;
 			case MIDDLE:
diff --git a/app/src/main/java/de/grobox/transportr/utils/FullScreenUtil.kt b/app/src/main/java/de/grobox/transportr/utils/FullScreenUtil.kt
index 48558e28c..0f2c349f4 100644
--- a/app/src/main/java/de/grobox/transportr/utils/FullScreenUtil.kt
+++ b/app/src/main/java/de/grobox/transportr/utils/FullScreenUtil.kt
@@ -35,12 +35,11 @@ class FullScreenUtil {
             WindowCompat.setDecorFitsSystemWindows(activity.window, false)
             // required for the mail view, which cant properly use the theme.
             activity.window.statusBarColor = Color.TRANSPARENT
+            activity.window.navigationBarColor = Color.TRANSPARENT
         }
 
         fun showStatusbar(activity: Activity) {
             WindowCompat.setDecorFitsSystemWindows(activity.window, true)
-            // required for the mail view, which cant properly use the theme.
-            //activity.window.statusBarColor = Color.TRANSPARENT
         }
 
         fun applyTopInset(view: View?) {
diff --git a/app/src/main/res/values-v27/styles.xml b/app/src/main/res/values-v27/styles.xml
new file mode 100644
index 000000000..078866d8f
--- /dev/null
+++ b/app/src/main/res/values-v27/styles.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+	<style name="AppTheme.MapFullscreen" parent="AppTheme">
+		<item name="android:statusBarColor">@android:color/transparent</item>
+		<item name="android:navigationBarColor">@android:color/transparent</item>
+		<item name="android:windowLightNavigationBar">true</item>
+	</style>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index a1496fe8c..89a01c1e4 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -95,6 +95,7 @@
 
 	<style name="AppTheme.MapFullscreen" parent="AppTheme">
 		<item name="android:statusBarColor">@android:color/transparent</item>
+		<item name="android:navigationBarColor">@android:color/transparent</item>
 	</style>
 
 </resources>

From 6f6ed8399ea806418ca02a93e23538a6eb31119a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20N=C3=BCsse?= <felix.nuesse@t-online.de>
Date: Tue, 23 Jan 2024 15:28:59 +0100
Subject: [PATCH 27/60] fix minor color choices

---
 app/src/main/res/drawable/shape_circle.xml       | 2 +-
 app/src/main/res/layout/activity_trip_detail.xml | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/drawable/shape_circle.xml b/app/src/main/res/drawable/shape_circle.xml
index 13efdbe16..c4759da91 100644
--- a/app/src/main/res/drawable/shape_circle.xml
+++ b/app/src/main/res/drawable/shape_circle.xml
@@ -2,6 +2,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
 	android:shape="oval">
 
-	<solid android:color="?attr/colorPrimary"/>
+	<solid android:color="@android:color/white"/>
 	<size android:width="120dp" android:height="120dp"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_trip_detail.xml b/app/src/main/res/layout/activity_trip_detail.xml
index f92f98207..e0b4959ab 100644
--- a/app/src/main/res/layout/activity_trip_detail.xml
+++ b/app/src/main/res/layout/activity_trip_detail.xml
@@ -25,6 +25,8 @@
 			android:layout_margin="12dp"
 			android:background="@drawable/shape_circle"
 			android:padding="8dp"
+			android:backgroundTint="@color/md_theme_primary"
+			app:tint="@color/md_theme_onPrimaryContainer"
 			app:srcCompat="@drawable/ic_back" />
 
 	</com.google.android.material.appbar.AppBarLayout>

From 8eeb109b616ba7c6032076cdfb569f40fb07d5b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20N=C3=BCsse?= <felix.nuesse@t-online.de>
Date: Tue, 23 Jan 2024 16:50:18 +0100
Subject: [PATCH 28/60] make walk icon more legible

---
 app/src/main/res/drawable/ic_walk.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/drawable/ic_walk.xml b/app/src/main/res/drawable/ic_walk.xml
index 64dbacfe6..5b6d71dfb 100644
--- a/app/src/main/res/drawable/ic_walk.xml
+++ b/app/src/main/res/drawable/ic_walk.xml
@@ -5,7 +5,7 @@
 	android:height="24dp"
 	android:viewportHeight="24"
 	android:viewportWidth="24"
-	android:tint="?attr/colorOnBackground">
+	android:tint="?attr/colorOnPrimary">
 	<path
 		android:fillColor="#ffffff"
 		android:pathData="M14,3.8c0.99,0 1.8,-0.81 1.8,-1.8 0,-1 -0.81,-1.8 -1.8,-1.8 -1,0 -1.8,0.81 -1.8,1.8S13,3.8 14,3.8zm0.12,6.2H19V8.2h-3.62l-2,-3.33c-0.3,-0.5 -0.84,-0.83 -1.46,-0.83 -0.17,0 -0.34,0.03 -0.49,0.07L6,5.8V11h1.8V7.33l2.11,-0.66L6,22h1.8l2.87,-8.11L13,17v5h1.8v-6.41l-2.49,-4.54 0.73,-2.87L14.12,10z"/>

From b6677e0d043dc30ac99b26363d313e5c6dfbd309 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20N=C3=BCsse?= <felix.nuesse@t-online.de>
Date: Fri, 26 Jan 2024 19:00:20 +0100
Subject: [PATCH 29/60] use light navbar

---
 app/src/main/AndroidManifest.xml   | 6 ++----
 app/src/main/res/values/themes.xml | 1 +
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f4d0afb4b..e051e89ae 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -74,14 +74,12 @@
 		<activity
 			android:name="de.grobox.transportr.departures.DeparturesActivity"
 			android:label="@string/drawer_departures"
-			android:parentActivityName="de.grobox.transportr.map.MapActivity"
-			tools:targetApi="jelly_bean"/>
+			android:parentActivityName="de.grobox.transportr.map.MapActivity" />
 
 		<activity
 			android:name="de.grobox.transportr.trips.detail.TripDetailActivity"
 			android:parentActivityName="de.grobox.transportr.trips.search.DirectionsActivity"
-			android:theme="@style/AppTheme.MapFullscreen"
-			tools:targetApi="jelly_bean"/>
+			android:theme="@style/AppTheme.MapFullscreen" />
 
 		<activity
 			android:name="de.grobox.transportr.networks.PickTransportNetworkActivity"
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index fe12a5600..1758b087c 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -35,6 +35,7 @@
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
         <item name="windowActionModeOverlay">true</item>
         <item name="android:statusBarColor">?android:attr/colorBackground</item>
+        <item name="android:navigationBarColor">?android:attr/colorBackground</item>
     </style>
 
     <style name="AppDayNightTheme" parent="AppBaseTheme">

From 6946aa469cee568515298dccbee8616900b3ff1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20N=C3=BCsse?= <felix.nuesse@t-online.de>
Date: Wed, 31 Jan 2024 17:46:43 +0100
Subject: [PATCH 30/60] add main view rounded corners

---
 .../main/res/layout/fragment_favorites.xml    | 36 ++++++++++++-------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/app/src/main/res/layout/fragment_favorites.xml b/app/src/main/res/layout/fragment_favorites.xml
index 3094af472..288e7e05a 100644
--- a/app/src/main/res/layout/fragment_favorites.xml
+++ b/app/src/main/res/layout/fragment_favorites.xml
@@ -1,23 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	android:background="?android:windowBackground"
+	android:background="@android:color/transparent"
 	tools:ignore="Overdraw">
 
-	<androidx.recyclerview.widget.RecyclerView
-		android:id="@+id/favorites"
+	<androidx.cardview.widget.CardView
 		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		tools:listitem="@layout/list_item_favorite"/>
-
-	<ProgressBar
-		android:id="@+id/progressBar"
-		style="?android:progressBarStyleLarge"
-		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_gravity="center"/>
+		android:layout_marginBottom="-20dp">
+
+		<androidx.recyclerview.widget.RecyclerView
+			android:id="@+id/favorites"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:layout_marginBottom="20dp"
+			android:paddingStart="4dp"
+			android:paddingTop="4dp"
+			android:paddingEnd="4dp"
+			tools:listitem="@layout/list_item_favorite" />
+
+		<ProgressBar
+			android:id="@+id/progressBar"
+			style="?android:progressBarStyleLarge"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center" />
+	</androidx.cardview.widget.CardView>
+
 
 </FrameLayout>

From 204c59b425368a227c15d5df4532bb02ae0d3cad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20N=C3=BCsse?= <felix.nuesse@t-online.de>
Date: Sun, 4 Feb 2024 12:58:45 +0100
Subject: [PATCH 31/60] add rounded corners

---
 app/src/main/res/layout/fragment_favorites.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/app/src/main/res/layout/fragment_favorites.xml b/app/src/main/res/layout/fragment_favorites.xml
index 288e7e05a..cf90e45be 100644
--- a/app/src/main/res/layout/fragment_favorites.xml
+++ b/app/src/main/res/layout/fragment_favorites.xml
@@ -3,15 +3,26 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:background="@android:color/transparent"
 	tools:ignore="Overdraw">
 
+
+	<!--
+	Move this card outside of the screen with the margin.
+	This cuts off the bottom corner radi.
+	Then push the content back up with the padding.
+	-->
 	<androidx.cardview.widget.CardView
+		app:cardCornerRadius="10dp"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
+		app:contentPaddingBottom="20dp"
 		android:layout_marginBottom="-20dp">
 
 		<androidx.recyclerview.widget.RecyclerView
+			android:clipToPadding="false"
+			android:clipChildren="false"
 			android:id="@+id/favorites"
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
@@ -19,6 +30,7 @@
 			android:paddingStart="4dp"
 			android:paddingTop="4dp"
 			android:paddingEnd="4dp"
+			android:paddingBottom="8dp"
 			tools:listitem="@layout/list_item_favorite" />
 
 		<ProgressBar

From 6ebc0d5733e7e85602429b1e798dd429202a1533 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20N=C3=BCsse?= <felix.nuesse@t-online.de>
Date: Sun, 4 Feb 2024 14:11:59 +0100
Subject: [PATCH 32/60] add better dropdown background

---
 .../de/grobox/transportr/locations/LocationView.kt     |  6 ++++++
 app/src/main/res/drawable/shape_location_dropdown.xml  |  9 +++++++++
 app/src/main/res/layout/fragment_favorites.xml         |  2 +-
 app/src/main/res/layout/location_item.xml              | 10 +++++-----
 app/src/main/res/layout/location_view.xml              |  2 +-
 app/src/main/res/values/dimens.xml                     |  3 ++-
 6 files changed, 24 insertions(+), 8 deletions(-)
 create mode 100644 app/src/main/res/drawable/shape_location_dropdown.xml

diff --git a/app/src/main/java/de/grobox/transportr/locations/LocationView.kt b/app/src/main/java/de/grobox/transportr/locations/LocationView.kt
index ae502908c..c6c9807e8 100644
--- a/app/src/main/java/de/grobox/transportr/locations/LocationView.kt
+++ b/app/src/main/java/de/grobox/transportr/locations/LocationView.kt
@@ -38,6 +38,7 @@ import android.view.View
 import android.view.View.OnFocusChangeListener
 import android.view.inputmethod.InputMethodManager
 import android.widget.*
+import androidx.core.content.res.ResourcesCompat
 import com.google.common.base.Strings.isNullOrEmpty
 import de.grobox.transportr.R
 import de.grobox.transportr.data.locations.FavoriteLocation
@@ -142,6 +143,11 @@ open class LocationView @JvmOverloads constructor(context: Context, attrs: Attri
         val location: AutoCompleteTextView = view.findViewById(R.id.location)
         internal val progress: ProgressBar = view.findViewById(R.id.progress)
         val clear: ImageButton = view.findViewById(R.id.clearButton)
+
+        init {
+            val drawable = ResourcesCompat.getDrawable(view.context.resources, R.drawable.shape_location_dropdown, null)
+            location.setDropDownBackgroundDrawable(drawable)
+        }
     }
 
     /* State Saving and Restoring */
diff --git a/app/src/main/res/drawable/shape_location_dropdown.xml b/app/src/main/res/drawable/shape_location_dropdown.xml
new file mode 100644
index 000000000..3d9f4d30d
--- /dev/null
+++ b/app/src/main/res/drawable/shape_location_dropdown.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+	android:shape="rectangle">
+	<solid android:color="@color/md_theme_background" />
+	<stroke
+		android:width="1dp"
+		android:color="@color/md_theme_outlineVariant" />
+	<corners android:radius="@dimen/cardview_corner_radius" />
+</shape>
diff --git a/app/src/main/res/layout/fragment_favorites.xml b/app/src/main/res/layout/fragment_favorites.xml
index cf90e45be..c7898b8a6 100644
--- a/app/src/main/res/layout/fragment_favorites.xml
+++ b/app/src/main/res/layout/fragment_favorites.xml
@@ -14,7 +14,7 @@
 	Then push the content back up with the padding.
 	-->
 	<androidx.cardview.widget.CardView
-		app:cardCornerRadius="10dp"
+		app:cardCornerRadius="@dimen/cardview_corner_radius"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		app:contentPaddingBottom="20dp"
diff --git a/app/src/main/res/layout/location_item.xml b/app/src/main/res/layout/location_item.xml
index 3aa0c6813..83d660d04 100644
--- a/app/src/main/res/layout/location_item.xml
+++ b/app/src/main/res/layout/location_item.xml
@@ -14,9 +14,9 @@
 		android:layout_width="32dp"
 		android:layout_height="32dp"
 		android:padding="3dp"
-		app:layout_constraintBottom_toBottomOf="@+id/textView"
+		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toTopOf="@+id/textView"
+		app:layout_constraintTop_toTopOf="parent"
 		app:tint="?attr/colorControlNormal"
 		tools:ignore="ContentDescription"
 		tools:src="@drawable/ic_action_home" />
@@ -25,11 +25,11 @@
 		android:id="@+id/textView"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_marginStart="8dp"
-		android:gravity="center_vertical"
+		android:layout_marginStart="16dp"
+		android:gravity="center"
 		android:minHeight="32dp"
 		android:padding="3dp"
-		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintStart_toEndOf="@+id/imageView"
 		app:layout_constraintTop_toTopOf="parent"
 		tools:text="This can a be location that has a very long name. It can even span two or more lines." />
diff --git a/app/src/main/res/layout/location_view.xml b/app/src/main/res/layout/location_view.xml
index 33e942919..a7e99b118 100644
--- a/app/src/main/res/layout/location_view.xml
+++ b/app/src/main/res/layout/location_view.xml
@@ -24,7 +24,7 @@
 		android:background="@android:color/transparent"
 		android:completionThreshold="1"
 		android:dropDownHeight="wrap_content"
-		android:dropDownWidth="match_parent"
+		android:dropDownWidth="wrap_content"
 		android:importantForAutofill="no"
 		android:inputType="text|textNoSuggestions|textAutoComplete|textFilter"
 		android:maxLines="1"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 14005f071..d55aa38f0 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -16,9 +16,10 @@
 	<dimen name="dragToRefreshDistance">96dp</dimen>
 
 
-
 	<dimen name="searchBarMargins">16dp</dimen>
 	<dimen name="searchBarHeight">48dp</dimen>
 	<dimen name="searchBarCornerRadius">8dp</dimen>
 
+
+	<dimen name="cardview_corner_radius">10dp</dimen>
 </resources>

From 8472cedfc2d7f93732a5ddb63807d35465c625b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20N=C3=BCsse?= <felix.nuesse@t-online.de>
Date: Sun, 4 Feb 2024 14:13:29 +0100
Subject: [PATCH 33/60] add myself to cla

---
 .clabot | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.clabot b/.clabot
index 024f23401..2964c1dda 100644
--- a/.clabot
+++ b/.clabot
@@ -22,7 +22,8 @@
     "thgoebel",
     "pt2121",
     "Jean-BaptisteC",
-    "Bnyro"
+    "Bnyro",
+    "newinton"
   ],
   "label": "cla-signed ✔️",
   "message": "Thank you for your pull request and welcome to our community! We require contributors to sign our [Contributor License Agreement](https://github.com/grote/Transportr/blob/master/CLA.md), and we don't seem to have the user {{usersWithoutCLA}} on file. In order for your code to get reviewed and merged, please explicitly state that you accept the agreement. Alternatively, you can add a commit that adds yourself to https://github.com/grote/Transportr/blob/master/.clabot"

From 4cabad3886d81775c7953224d3817d71bf0511bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20N=C3=BCsse?= <felix.nuesse@t-online.de>
Date: Sun, 4 Feb 2024 15:13:53 +0100
Subject: [PATCH 34/60] fix typo

---
 .clabot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.clabot b/.clabot
index 2964c1dda..0a713038e 100644
--- a/.clabot
+++ b/.clabot
@@ -23,7 +23,7 @@
     "pt2121",
     "Jean-BaptisteC",
     "Bnyro",
-    "newinton"
+    "newhinton"
   ],
   "label": "cla-signed ✔️",
   "message": "Thank you for your pull request and welcome to our community! We require contributors to sign our [Contributor License Agreement](https://github.com/grote/Transportr/blob/master/CLA.md), and we don't seem to have the user {{usersWithoutCLA}} on file. In order for your code to get reviewed and merged, please explicitly state that you accept the agreement. Alternatively, you can add a commit that adds yourself to https://github.com/grote/Transportr/blob/master/.clabot"

From 56cc7e22ed8075baa63f218a02e0eee47013d526 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20N=C3=BCsse?= <felix.nuesse@t-online.de>
Date: Sun, 4 Feb 2024 18:09:15 +0100
Subject: [PATCH 35/60] remove divider from detailview

---
 .../transportr/trips/detail/TripDetailActivity.java    |  6 +++---
 app/src/main/res/layout/fragment_trip_detail.xml       | 10 ----------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/de/grobox/transportr/trips/detail/TripDetailActivity.java b/app/src/main/java/de/grobox/transportr/trips/detail/TripDetailActivity.java
index a4731f848..e3d80444e 100644
--- a/app/src/main/java/de/grobox/transportr/trips/detail/TripDetailActivity.java
+++ b/app/src/main/java/de/grobox/transportr/trips/detail/TripDetailActivity.java
@@ -147,7 +147,7 @@ private void onSheetStateChanged(@Nullable SheetState sheetState) {
 				bottomSheetBehavior.setBottom();
 				bottomSheetBehavior.setState(STATE_COLLAPSED);
 				FullScreenUtil.Companion.drawBehindStatusbar(this);
-				findViewById(R.id.divider).setVisibility(View.GONE);
+				//findViewById(R.id.divider).setVisibility(View.GONE);
 				break;
 			case MIDDLE:
 				bottomSheetBehavior.setHideable(true);  // ensures it can be swiped down
@@ -155,11 +155,11 @@ private void onSheetStateChanged(@Nullable SheetState sheetState) {
 				bottomSheetBehavior.setState(STATE_COLLAPSED);
 				FullScreenUtil.Companion.drawBehindStatusbar(this);
 				FullScreenUtil.Companion.applyTopInset(findViewById(R.id.appBarLayout));
-				findViewById(R.id.divider).setVisibility(View.GONE);
+				//findViewById(R.id.divider).setVisibility(View.GONE);
 				break;
 			case EXPANDED:
 				FullScreenUtil.Companion.showStatusbar(this);
-				findViewById(R.id.divider).setVisibility(View.VISIBLE);
+				//findViewById(R.id.divider).setVisibility(View.VISIBLE);
 				break;
 		}
 	}
diff --git a/app/src/main/res/layout/fragment_trip_detail.xml b/app/src/main/res/layout/fragment_trip_detail.xml
index 1ef266a6a..34d956571 100644
--- a/app/src/main/res/layout/fragment_trip_detail.xml
+++ b/app/src/main/res/layout/fragment_trip_detail.xml
@@ -163,16 +163,6 @@
 
 		</androidx.constraintlayout.widget.ConstraintLayout>
 
-		<View
-			android:id="@+id/divider"
-			style="@style/Divider"
-			android:layout_width="match_parent"
-			android:layout_height="2px"
-			android:layout_marginLeft="32dp"
-			android:layout_marginRight="32dp"
-			android:layout_marginBottom="8dp"
-			android:background="?attr/colorPrimary" />
-
 	</com.google.android.material.appbar.AppBarLayout>
 
 	<androidx.recyclerview.widget.RecyclerView

From d411da14004212777f7c83c67b4176041a338577 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20N=C3=BCsse?= <felix.nuesse@t-online.de>
Date: Sun, 4 Feb 2024 18:13:19 +0100
Subject: [PATCH 36/60] remove divider comments

---
 .../de/grobox/transportr/trips/detail/TripDetailActivity.java  | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/src/main/java/de/grobox/transportr/trips/detail/TripDetailActivity.java b/app/src/main/java/de/grobox/transportr/trips/detail/TripDetailActivity.java
index e3d80444e..bd1699b42 100644
--- a/app/src/main/java/de/grobox/transportr/trips/detail/TripDetailActivity.java
+++ b/app/src/main/java/de/grobox/transportr/trips/detail/TripDetailActivity.java
@@ -147,7 +147,6 @@ private void onSheetStateChanged(@Nullable SheetState sheetState) {
 				bottomSheetBehavior.setBottom();
 				bottomSheetBehavior.setState(STATE_COLLAPSED);
 				FullScreenUtil.Companion.drawBehindStatusbar(this);
-				//findViewById(R.id.divider).setVisibility(View.GONE);
 				break;
 			case MIDDLE:
 				bottomSheetBehavior.setHideable(true);  // ensures it can be swiped down
@@ -155,11 +154,9 @@ private void onSheetStateChanged(@Nullable SheetState sheetState) {
 				bottomSheetBehavior.setState(STATE_COLLAPSED);
 				FullScreenUtil.Companion.drawBehindStatusbar(this);
 				FullScreenUtil.Companion.applyTopInset(findViewById(R.id.appBarLayout));
-				//findViewById(R.id.divider).setVisibility(View.GONE);
 				break;
 			case EXPANDED:
 				FullScreenUtil.Companion.showStatusbar(this);
-				//findViewById(R.id.divider).setVisibility(View.VISIBLE);
 				break;
 		}
 	}

From 08d41fb0e4aa4859ecccf30e92a9d57d3ea2ca41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20N=C3=BCsse?= <felix.nuesse@t-online.de>
Date: Sun, 4 Feb 2024 18:32:47 +0100
Subject: [PATCH 37/60] remove border from map

---
 app/src/main/res/layout/activity_trip_detail.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/activity_trip_detail.xml b/app/src/main/res/layout/activity_trip_detail.xml
index e0b4959ab..33f4c3e1a 100644
--- a/app/src/main/res/layout/activity_trip_detail.xml
+++ b/app/src/main/res/layout/activity_trip_detail.xml
@@ -8,8 +8,7 @@
 	<FrameLayout
 		android:id="@+id/topContainer"
 		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:layout_marginBottom="?android:actionBarSize"/>
+		android:layout_height="match_parent"/>
 
 	<com.google.android.material.appbar.AppBarLayout
 		android:id="@+id/appBarLayout"

From ed81b76099358abe4ec3c6984baae78364bf6915 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20N=C3=BCsse?= <felix.nuesse@t-online.de>
Date: Sun, 4 Feb 2024 18:47:42 +0100
Subject: [PATCH 38/60] Animate details screen

---
 .../trips/detail/TripDetailActivity.java      |   2 +-
 .../trips/detail/TripDetailFragment.kt        |  19 +-
 .../grobox/transportr/utils/FullScreenUtil.kt |  24 ++
 .../main/res/layout/fragment_trip_detail.xml  | 283 ++++++++++--------
 4 files changed, 189 insertions(+), 139 deletions(-)

diff --git a/app/src/main/java/de/grobox/transportr/trips/detail/TripDetailActivity.java b/app/src/main/java/de/grobox/transportr/trips/detail/TripDetailActivity.java
index bd1699b42..1665398d5 100644
--- a/app/src/main/java/de/grobox/transportr/trips/detail/TripDetailActivity.java
+++ b/app/src/main/java/de/grobox/transportr/trips/detail/TripDetailActivity.java
@@ -156,7 +156,7 @@ private void onSheetStateChanged(@Nullable SheetState sheetState) {
 				FullScreenUtil.Companion.applyTopInset(findViewById(R.id.appBarLayout));
 				break;
 			case EXPANDED:
-				FullScreenUtil.Companion.showStatusbar(this);
+				FullScreenUtil.Companion.drawBehindStatusbar(this);
 				break;
 		}
 	}
diff --git a/app/src/main/java/de/grobox/transportr/trips/detail/TripDetailFragment.kt b/app/src/main/java/de/grobox/transportr/trips/detail/TripDetailFragment.kt
index 575b5cedf..58b0082ce 100644
--- a/app/src/main/java/de/grobox/transportr/trips/detail/TripDetailFragment.kt
+++ b/app/src/main/java/de/grobox/transportr/trips/detail/TripDetailFragment.kt
@@ -21,9 +21,14 @@ package de.grobox.transportr.trips.detail
 
 import android.os.Bundle
 import android.os.CountDownTimer
-import android.view.*
+import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
+import android.view.ViewGroup
 import android.widget.Toast
 import androidx.appcompat.widget.Toolbar
 import androidx.lifecycle.Observer
@@ -40,7 +45,7 @@ import de.grobox.transportr.trips.detail.TripUtils.share
 import de.grobox.transportr.utils.DateUtils.formatDuration
 import de.grobox.transportr.utils.DateUtils.formatTime
 import de.grobox.transportr.utils.DateUtils.formatRelativeTime
-import de.grobox.transportr.utils.TransportrUtils.getColorFromAttr
+import de.grobox.transportr.utils.FullScreenUtil
 import de.schildbach.pte.dto.Trip
 import kotlinx.android.synthetic.main.fragment_trip_detail.*
 import javax.inject.Inject
@@ -165,23 +170,23 @@ class TripDetailFragment : TransportrFragment(), Toolbar.OnMenuItemClickListener
     }
 
     private fun onSheetStateChanged(sheetState: SheetState?) {
+        FullScreenUtil.applyImageViewTopInset(closeButton)
         when (sheetState) {
             null -> return
             BOTTOM -> {
-                toolbar.visibility = GONE
+                closeButton.visibility = GONE
                 topBar.visibility = GONE
                 bottomBar.visibility = VISIBLE
             }
             MIDDLE -> {
-                toolbar.visibility = GONE
+
+                closeButton.visibility = GONE
                 topBar.visibility = VISIBLE
-                topBar.setBackgroundColor(context.getColorFromAttr(R.attr.colorPrimaryContainer))
                 bottomBar.visibility = GONE
             }
             EXPANDED -> {
-                toolbar.visibility = VISIBLE
+                closeButton.visibility = VISIBLE
                 topBar.visibility = VISIBLE
-                topBar.setBackgroundColor(context.getColorFromAttr(R.attr.colorSurface))
                 bottomBar.visibility = GONE
             }
         }
diff --git a/app/src/main/java/de/grobox/transportr/utils/FullScreenUtil.kt b/app/src/main/java/de/grobox/transportr/utils/FullScreenUtil.kt
index 0f2c349f4..2d2c3b7d4 100644
--- a/app/src/main/java/de/grobox/transportr/utils/FullScreenUtil.kt
+++ b/app/src/main/java/de/grobox/transportr/utils/FullScreenUtil.kt
@@ -23,6 +23,12 @@ import android.app.Activity
 import android.graphics.Color
 import android.os.Build
 import android.view.View
+import android.view.ViewGroup
+import android.view.ViewGroup.MarginLayoutParams
+import android.widget.ImageButton
+import android.widget.ImageView
+import android.widget.LinearLayout
+import android.widget.RelativeLayout
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.view.WindowCompat
 import androidx.core.view.WindowInsetsCompat
@@ -79,5 +85,23 @@ class FullScreenUtil {
                 return@setOnApplyWindowInsetsListener insets
             }
         }
+
+        fun applyImageViewTopInset(imageView: ImageView) {
+
+            imageView.setOnApplyWindowInsetsListener { v, insets ->
+                val originalOffset = dpToPx(imageView.context, 0)
+                val top = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                    insets.getInsets(WindowInsetsCompat.Type.statusBars()).top
+                } else {
+                    insets.systemWindowInsetTop
+                }
+
+                val parameters = v.layoutParams as MarginLayoutParams
+                parameters.setMargins(0, top + originalOffset, 0, 0)
+                v.layoutParams = parameters
+
+                return@setOnApplyWindowInsetsListener insets
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_trip_detail.xml b/app/src/main/res/layout/fragment_trip_detail.xml
index 34d956571..387d82bfb 100644
--- a/app/src/main/res/layout/fragment_trip_detail.xml
+++ b/app/src/main/res/layout/fragment_trip_detail.xml
@@ -18,148 +18,169 @@
 			android:layout_height="wrap_content"
 			android:visibility="gone"
 			app:navigationIcon="@drawable/ic_action_content_remove"
-			tools:visibility="visible"/>
+			tools:visibility="gone" />
 
 		<androidx.constraintlayout.widget.ConstraintLayout
-			android:id="@+id/bottomBar"
-			android:layout_width="match_parent"
-			android:layout_height="@dimen/mapPadding"
-			android:padding="8dp"
-			android:layout_marginTop="0dp"
-			android:clickable="true"
-			android:focusable="true"
-			android:foreground="?selectableItemBackgroundBorderless"
-			android:visibility="gone"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toStartOf="parent"
-			tools:visibility="visible">
-
-			<TextView
-				android:id="@+id/fromTime"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				app:layout_constraintStart_toStartOf="parent"
-				app:layout_constraintTop_toTopOf="parent"
-				tools:text="12:23"/>
-
-			<TextView
-				android:id="@+id/from"
-				android:layout_width="0dp"
-				android:layout_height="wrap_content"
-				android:layout_marginEnd="8dp"
-				android:layout_marginStart="8dp"
-				android:ellipsize="middle"
-				android:singleLine="true"
-				app:layout_constraintEnd_toStartOf="@+id/barrierRight"
-				app:layout_constraintStart_toEndOf="@+id/fromTime"
-				app:layout_constraintBaseline_toBaselineOf="@+id/fromTime"
-				app:layout_constraintTop_toTopOf="parent"
-				tools:text="From Station"/>
-
-			<TextView
-				android:id="@+id/toTime"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				app:layout_constraintBottom_toBottomOf="parent"
-				app:layout_constraintStart_toStartOf="parent"
-				app:layout_constraintTop_toBottomOf="@+id/fromTime"
-				tools:text="13:77"/>
-
-			<TextView
-				android:id="@+id/to"
-				android:layout_width="0dp"
-				android:layout_height="wrap_content"
-				android:layout_marginEnd="8dp"
-				android:layout_marginStart="8dp"
-				android:ellipsize="middle"
-				android:singleLine="true"
-				android:textColor="?android:textColorPrimary"
-				app:layout_constraintBottom_toBottomOf="parent"
-				app:layout_constraintEnd_toStartOf="@+id/barrierRight"
-				app:layout_constraintStart_toEndOf="@+id/toTime"
-				app:layout_constraintTop_toBottomOf="@+id/from"
-				app:layout_constraintBaseline_toBaselineOf="@+id/toTime"
-				tools:text="To Station"/>
-
-			<TextView
-				android:id="@+id/duration"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:textColor="?android:textColorSecondary"
-				app:layout_constraintTop_toTopOf="parent"
-				app:layout_constraintBottom_toTopOf="@+id/price"
-				app:layout_constraintEnd_toEndOf="parent"
-				app:layout_constraintVertical_chainStyle="packed"
-				tools:text="0:42"/>
-
-			<TextView
-				android:id="@+id/price"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_marginTop="2dp"
-				android:textColor="?android:textColorSecondary"
-				app:layout_constraintTop_toBottomOf="@+id/duration"
-				app:layout_constraintBottom_toBottomOf="parent"
-				app:layout_constraintEnd_toEndOf="parent"
-				tools:visibility="visible"
-				tools:text="1,50 €"/>
-
-			<androidx.constraintlayout.widget.Barrier
-				android:id="@+id/barrierRight"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				app:barrierDirection="left"
-				app:constraint_referenced_ids="duration,price"/>
-
-		</androidx.constraintlayout.widget.ConstraintLayout>
-
-		<androidx.constraintlayout.widget.ConstraintLayout
-			android:id="@+id/topBar"
+			android:id="@+id/primaryViewContainer"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_marginTop="0dp"
-			android:background="?attr/colorPrimaryContainer"
-			tools:visibility="visible">
-
-			<TextView
-				android:id="@+id/fromTimeRel"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_marginStart="8dp"
-				android:textAppearance="@style/TextAppearance.AppCompat.Body2"
-				android:textColor="?attr/colorOnPrimaryContainer"
-				android:textStyle="normal|bold"
-				app:layout_constraintBottom_toBottomOf="@+id/durationTop"
-				app:layout_constraintStart_toStartOf="parent"
-				app:layout_constraintTop_toTopOf="@+id/durationTop"
-				tools:text="in 20min"
-				tools:visibility="visible" />
+			android:animateLayoutChanges="true"
+			android:background="?attr/colorPrimaryContainer">
 
-			<TextView
-				android:id="@+id/durationTop"
-				android:layout_width="wrap_content"
+			<androidx.constraintlayout.widget.ConstraintLayout
+				android:id="@+id/bottomBar"
+				android:animateLayoutChanges="true"
+				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:layout_marginTop="8dp"
-				android:layout_marginBottom="8dp"
-				android:textColor="?attr/colorOnPrimaryContainer"
-				app:layout_constraintBottom_toBottomOf="parent"
+				android:clickable="true"
+				android:focusable="true"
+				android:paddingStart="8dp"
+				android:paddingTop="8dp"
+				android:paddingEnd="8dp"
+				android:paddingBottom="96dp"
 				app:layout_constraintEnd_toEndOf="parent"
 				app:layout_constraintStart_toStartOf="parent"
 				app:layout_constraintTop_toTopOf="parent"
-				tools:text="Gesamtdauer: 0:42" />
-
-			<TextView
-				android:id="@+id/priceTop"
-				android:layout_width="wrap_content"
+				tools:visibility="visible">
+
+				<TextView
+					android:id="@+id/fromTime"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					app:layout_constraintStart_toStartOf="parent"
+					app:layout_constraintTop_toTopOf="parent"
+					tools:text="12:23" />
+
+				<TextView
+					android:id="@+id/from"
+					android:layout_width="0dp"
+					android:layout_height="wrap_content"
+					android:layout_marginStart="8dp"
+					android:layout_marginEnd="8dp"
+					android:ellipsize="middle"
+					android:singleLine="true"
+					app:layout_constraintBaseline_toBaselineOf="@+id/fromTime"
+					app:layout_constraintEnd_toStartOf="@+id/barrierRight"
+					app:layout_constraintStart_toEndOf="@+id/fromTime"
+					app:layout_constraintTop_toTopOf="parent"
+					tools:text="From Station" />
+
+				<TextView
+					android:id="@+id/toTime"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					app:layout_constraintBottom_toBottomOf="parent"
+					app:layout_constraintStart_toStartOf="parent"
+					app:layout_constraintTop_toBottomOf="@+id/fromTime"
+					tools:text="13:77" />
+
+				<TextView
+					android:id="@+id/to"
+					android:layout_width="0dp"
+					android:layout_height="wrap_content"
+					android:layout_marginStart="8dp"
+					android:layout_marginEnd="8dp"
+					android:ellipsize="middle"
+					android:singleLine="true"
+					android:textColor="?android:textColorPrimary"
+					app:layout_constraintBaseline_toBaselineOf="@+id/toTime"
+					app:layout_constraintBottom_toBottomOf="parent"
+					app:layout_constraintEnd_toStartOf="@+id/barrierRight"
+					app:layout_constraintStart_toEndOf="@+id/toTime"
+					app:layout_constraintTop_toBottomOf="@+id/from"
+					tools:text="To Station" />
+
+				<TextView
+					android:id="@+id/duration"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:textColor="?android:textColorSecondary"
+					app:layout_constraintBottom_toTopOf="@+id/price"
+					app:layout_constraintEnd_toEndOf="parent"
+					app:layout_constraintTop_toTopOf="parent"
+					app:layout_constraintVertical_chainStyle="packed"
+					tools:text="0:42" />
+
+				<TextView
+					android:id="@+id/price"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_marginTop="2dp"
+					android:textColor="?android:textColorSecondary"
+					app:layout_constraintBottom_toBottomOf="parent"
+					app:layout_constraintEnd_toEndOf="parent"
+					app:layout_constraintTop_toBottomOf="@+id/duration"
+					tools:text="1,50 €"
+					tools:visibility="visible" />
+
+				<androidx.constraintlayout.widget.Barrier
+					android:id="@+id/barrierRight"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					app:barrierDirection="left"
+					app:constraint_referenced_ids="duration,price" />
+
+			</androidx.constraintlayout.widget.ConstraintLayout>
+
+			<androidx.constraintlayout.widget.ConstraintLayout
+				android:id="@+id/topBar"
+				android:animateLayoutChanges="true"
+				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:layout_marginTop="8dp"
-				android:layout_marginEnd="8dp"
-				android:textColor="?attr/colorOnPrimaryContainer"
-				app:layout_constraintBottom_toBottomOf="@+id/durationTop"
+				android:padding="8dp"
 				app:layout_constraintEnd_toEndOf="parent"
-				app:layout_constraintRight_toRightOf="parent"
-				app:layout_constraintTop_toTopOf="parent"
-				tools:text="1,50 €" />
+				app:layout_constraintStart_toStartOf="parent"
+				app:layout_constraintTop_toBottomOf="@+id/bottomBar"
+				tools:visibility="visible">
+
+				<ImageView
+					android:id="@+id/closeButton"
+					android:layout_width="48dp"
+					android:layout_height="48dp"
+					android:padding="8dp"
+					android:tint="?attr/colorOnPrimaryContainer"
+					app:layout_constraintBottom_toBottomOf="parent"
+					app:layout_constraintStart_toStartOf="parent"
+					app:layout_constraintTop_toTopOf="parent"
+					app:srcCompat="@drawable/ic_back" />
+
+				<TextView
+					android:id="@+id/fromTimeRel"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_marginStart="8dp"
+					android:textAppearance="@style/TextAppearance.AppCompat.Body2"
+					android:textColor="?attr/colorOnPrimaryContainer"
+					android:textStyle="normal|bold"
+					app:layout_constraintBottom_toBottomOf="@+id/durationTop"
+					app:layout_constraintStart_toEndOf="@+id/closeButton"
+					app:layout_constraintTop_toTopOf="@+id/durationTop"
+					tools:text="in 20min"
+					tools:visibility="visible" />
+
+				<TextView
+					android:id="@+id/durationTop"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:textColor="?attr/colorOnPrimaryContainer"
+					app:layout_constraintBottom_toBottomOf="parent"
+					app:layout_constraintEnd_toEndOf="parent"
+					app:layout_constraintStart_toStartOf="parent"
+					tools:text="Gesamtdauer: 0:42" />
+
+				<TextView
+					android:id="@+id/priceTop"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_marginEnd="8dp"
+					android:textColor="?attr/colorOnPrimaryContainer"
+					app:layout_constraintBottom_toBottomOf="@+id/durationTop"
+					app:layout_constraintEnd_toEndOf="parent"
+					app:layout_constraintRight_toRightOf="parent"
+					app:layout_constraintTop_toTopOf="@+id/durationTop"
+					tools:text="1,50 €" />
+
+			</androidx.constraintlayout.widget.ConstraintLayout>
 
 		</androidx.constraintlayout.widget.ConstraintLayout>
 

From aa04e25115c62f339d0994214e2a6da216f4dfe5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20N=C3=BCsse?= <felix.nuesse@t-online.de>
Date: Sun, 4 Feb 2024 18:48:57 +0100
Subject: [PATCH 39/60] use proper namespace

---
 app/src/main/res/layout/fragment_trip_detail.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/fragment_trip_detail.xml b/app/src/main/res/layout/fragment_trip_detail.xml
index 387d82bfb..c114233b5 100644
--- a/app/src/main/res/layout/fragment_trip_detail.xml
+++ b/app/src/main/res/layout/fragment_trip_detail.xml
@@ -138,11 +138,11 @@
 					android:layout_width="48dp"
 					android:layout_height="48dp"
 					android:padding="8dp"
-					android:tint="?attr/colorOnPrimaryContainer"
 					app:layout_constraintBottom_toBottomOf="parent"
 					app:layout_constraintStart_toStartOf="parent"
 					app:layout_constraintTop_toTopOf="parent"
-					app:srcCompat="@drawable/ic_back" />
+					app:srcCompat="@drawable/ic_back"
+					app:tint="?attr/colorOnPrimaryContainer" />
 
 				<TextView
 					android:id="@+id/fromTimeRel"

From c07cb18119bc87f125574a2f8ee253c891e97772 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20N=C3=BCsse?= <felix.nuesse@t-online.de>
Date: Sun, 4 Feb 2024 23:23:09 +0100
Subject: [PATCH 40/60] fix merge errors

---
 app/src/main/res/values-night-v31/colors.xml | 7 +++++++
 app/src/main/res/values-night/colors.xml     | 7 ++++++-
 app/src/main/res/values-v31/colors.xml       | 7 +++++++
 app/src/main/res/values/colors.xml           | 6 ++++++
 app/src/main/res/values/themes.xml           | 2 --
 app/witness.gradle                           | 5 +++--
 6 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/app/src/main/res/values-night-v31/colors.xml b/app/src/main/res/values-night-v31/colors.xml
index 6647ae8c3..fb955ccfb 100644
--- a/app/src/main/res/values-night-v31/colors.xml
+++ b/app/src/main/res/values-night-v31/colors.xml
@@ -32,4 +32,11 @@
     <color name="md_theme_outline">#938F99</color>
 
 
+    <color name="fabBackgroundMoved">@color/md_theme_onSurfaceVariant</color>
+    <color name="fabForegroundInitial">@color/md_theme_onPrimaryContainer</color>
+    <color name="fabForegroundFollow">@color/md_theme_onSecondaryContainer</color>
+    <color name="fabBackground">@color/md_theme_primary</color>
+    <color name="fabForegroundMoved">@android:color/white</color>
+
+
 </resources>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 78a7849ca..34d92c193 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -30,5 +30,10 @@
 	<color name="md_theme_shadow">#000000</color>
 	<color name="md_theme_surfaceTint">#FFB4A9</color>
 	<color name="md_theme_outlineVariant">#534341</color>
-	
+
+	<color name="fabBackgroundMoved">@color/md_theme_onSurfaceVariant</color>
+	<color name="fabForegroundInitial">@color/md_theme_onPrimaryContainer</color>
+	<color name="fabForegroundFollow">@color/md_theme_onSecondaryContainer</color>
+	<color name="fabBackground">@color/md_theme_primary</color>
+	<color name="fabForegroundMoved">@android:color/white</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v31/colors.xml b/app/src/main/res/values-v31/colors.xml
index 150ca0812..2d0d69736 100644
--- a/app/src/main/res/values-v31/colors.xml
+++ b/app/src/main/res/values-v31/colors.xml
@@ -31,4 +31,11 @@
 
     <color name="md_theme_outline">#79747E</color>
 
+
+    <color name="fabBackgroundMoved">@color/md_theme_onSurfaceVariant</color>
+    <color name="fabForegroundInitial">@color/md_theme_onPrimaryContainer</color>
+    <color name="fabForegroundFollow">@color/md_theme_onSecondaryContainer</color>
+    <color name="fabBackground">@color/md_theme_primary</color>
+    <color name="fabForegroundMoved">@android:color/white</color>
+
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 14348f608..9ef4887e7 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -34,4 +34,10 @@
     <color name="md_theme_surfaceTint">#BB1614</color>
     <color name="md_theme_outlineVariant">#D8C2BE</color>
     <color name="md_theme_scrim">#000000</color>
+
+    <color name="fabBackgroundMoved">@color/md_theme_onSurfaceVariant</color>
+    <color name="fabForegroundInitial">@color/md_theme_onPrimaryContainer</color>
+    <color name="fabForegroundFollow">@color/md_theme_onSecondaryContainer</color>
+    <color name="fabBackground">@color/md_theme_primary</color>
+    <color name="fabForegroundMoved">@android:color/white</color>
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 9eb5d7ad2..8b1bafc3e 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -39,8 +39,6 @@
     </style>
 
     <style name="AppDayNightTheme" parent="AppBaseTheme">
-        <item name="colorControlNormal">@color/drawableTintLight</item>
-        <item name="cardBackgroundColor">@color/cardview_light_background</item>
         <item name="mapStyle">@string/jawg_style_light</item>
         <item name="attributionBackground">#99FFFFFF</item>
         <item name="android:windowLightStatusBar" tools:targetApi="m">true</item>
diff --git a/app/witness.gradle b/app/witness.gradle
index 563349f3d..e45cafff2 100644
--- a/app/witness.gradle
+++ b/app/witness.gradle
@@ -20,6 +20,7 @@ dependencyVerification {
         'androidx.constraintlayout:constraintlayout:2.0.4:constraintlayout-2.0.4.aar:307a79a4a1ccff44249c72a2bf7f47da09fa1b6b1fab2a25808ca889382b738e',
         'androidx.coordinatorlayout:coordinatorlayout:1.0.0:coordinatorlayout-1.0.0.aar:e508c695489493374d942bf7b4ee02abf7571d25aac4c622e57d6cd5cd29eb73',
         'androidx.coordinatorlayout:coordinatorlayout:1.1.0:coordinatorlayout-1.1.0.aar:44a9e30abf56af1025c52a0af506fee9c4131aa55efda52f9fd9451211c5e8cb',
+        'androidx.core:core-splashscreen:1.0.1:core-splashscreen-1.0.1.aar:25c813ae7795c99dd20628527043f8d0425eb2e826e6c42cb77acbb6c01dde68',
         'androidx.core:core:1.0.0:core-1.0.0.aar:d7672358fc0d46de678968bcddfd3bdfe1618574299a753477b16116cfec74f5',
         'androidx.core:core:1.5.0:core-1.5.0.aar:2b279712795689069cfb63e48b3ab63c32a5649bdda44c482eb8f81ca1a72161',
         'androidx.cursoradapter:cursoradapter:1.0.0:cursoradapter-1.0.0.aar:a81c8fe78815fa47df5b749deb52727ad11f9397da58b16017f4eb2c11e28564',
@@ -115,8 +116,8 @@ dependencyVerification {
         'com.jraska:falcon:2.2.0:falcon-2.2.0.aar:8b016c6e016ef99fb493b8614b2362cfba540a68ac16a9bb6da310ae10e30b81',
         'com.mapbox.mapboxsdk:mapbox-android-gestures:0.7.0:mapbox-android-gestures-0.7.0.aar:7f1c0e22a1f1c23879dc7faf08fd91b4ca7a8251e08263dbba73ee5a4ebe8ae1',
         'com.mikepenz:aboutlibraries:6.2.0:aboutlibraries-6.2.0.aar:12f8a49ec0fd859bc7ae9e62582d1198cf3f88a200a7115f34906f53284907f6',
-        'com.mikepenz:fastadapter-commons:3.3.0:fastadapter-commons-3.3.0.aar:bd6d9d9b3222ad8e8d8ad86e1ec63d3a2ecc44d1684d1ea549563c1357e60c3c',
-        'com.mikepenz:fastadapter-extensions-expandable:3.3.0:fastadapter-extensions-expandable-3.3.0.aar:2effaa42a3b82fd92a37317ebf833b9118e8e176426f11250ba903496aa50db7',
+        'com.mikepenz:fastadapter-commons:3.2.4:fastadapter-commons-3.2.4.aar:4d5860ff1778a37cf33af62e62462ea214d8d4d5939143236b61afb33e4fe842',
+        'com.mikepenz:fastadapter-extensions-expandable:3.2.4:fastadapter-extensions-expandable-3.2.4.aar:a8cfb8e9024bb0126d5c2382dfec62f03113bf34ca405e840abc451cc69c2820',
         'com.mikepenz:fastadapter:3.3.0:fastadapter-3.3.0.aar:afc2658ee45df47a66615d1a1a2744cb226e11ddf6cc5f0115e07f0620a4fb7c',
         'com.mikepenz:iconics-core:3.1.0:iconics-core-3.1.0.aar:eac6d9a2983412dba7e7e9df82206e0d55c9708149d35d21a72479a8b32a8998',
         'com.squareup.okhttp3:logging-interceptor:3.12.13:logging-interceptor-3.12.13.jar:ee3cd10a2d667621143156f995d4d0fce1dca2b1f3280dd48d821f92afac580a',

From bd455199fe8c0637a3e23c1b5b6e437aa42f4f3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20N=C3=BCsse?= <felix.nuesse@t-online.de>
Date: Mon, 5 Feb 2024 14:23:21 +0100
Subject: [PATCH 41/60] make message for trip section more prominent

---
 app/src/main/res/layout/list_item_leg.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/list_item_leg.xml b/app/src/main/res/layout/list_item_leg.xml
index cc80a7a05..fd086416f 100644
--- a/app/src/main/res/layout/list_item_leg.xml
+++ b/app/src/main/res/layout/list_item_leg.xml
@@ -125,7 +125,7 @@
 		android:layout_marginEnd="8dp"
 		android:layout_marginRight="8dp"
 		android:layout_marginTop="8dp"
-		android:textColor="?colorPrimary"
+		android:textColor="?colorError"
 		android:textSize="12sp"
 		app:layout_constraintEnd_toStartOf="@+id/duration"
 		app:layout_constraintStart_toStartOf="@+id/lineView"

From ce1f44eb10ee68f795db8438b6a39a8c186ca5d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20N=C3=BCsse?= <felix.nuesse@t-online.de>
Date: Mon, 5 Feb 2024 14:35:54 +0100
Subject: [PATCH 42/60] use smaller, filled circles for intermediary stops

---
 app/src/main/res/layout/list_item_stop.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/list_item_stop.xml b/app/src/main/res/layout/list_item_stop.xml
index ba1e8606d..cc7e6eaa4 100644
--- a/app/src/main/res/layout/list_item_stop.xml
+++ b/app/src/main/res/layout/list_item_stop.xml
@@ -60,7 +60,8 @@
 		android:layout_marginLeft="8dp"
 		android:layout_marginStart="8dp"
 		android:layout_marginTop="8dp"
-		android:src="@drawable/leg_circle_middle"
+		android:padding="4dp"
+		android:src="@drawable/leg_circle_end"
 		app:layout_constraintBottom_toBottomOf="@+id/toTime"
 		app:layout_constraintStart_toEndOf="@+id/barrier"
 		app:layout_constraintTop_toTopOf="@+id/fromTime"

From 3d9934f43ef75a2a1a1f13395e7026f9c53c01af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20N=C3=BCsse?= <felix.nuesse@t-online.de>
Date: Mon, 5 Feb 2024 14:51:11 +0100
Subject: [PATCH 43/60] fix scroll issue on map-selected-target-location

---
 .../main/res/layout/activity_directions.xml   | 34 ++++++++++++-------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/app/src/main/res/layout/activity_directions.xml b/app/src/main/res/layout/activity_directions.xml
index d331120f2..10281f03c 100644
--- a/app/src/main/res/layout/activity_directions.xml
+++ b/app/src/main/res/layout/activity_directions.xml
@@ -1,40 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/coordinatorLayout"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	android:fitsSystemWindows="true">
+	android:fitsSystemWindows="false">
 
 	<com.google.android.material.appbar.AppBarLayout
 		android:id="@+id/appBarLayout"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content">
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent">
 
 		<com.google.android.material.appbar.CollapsingToolbarLayout
 			android:layout_width="match_parent"
-			android:layout_height="match_parent"
+			android:layout_height="wrap_content"
 			android:fitsSystemWindows="true"
 			app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
 
 			<fragment
 				android:id="@+id/directionsForm"
+				android:name="de.grobox.transportr.trips.search.DirectionsFragment"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:name="de.grobox.transportr.trips.search.DirectionsFragment"
-				tools:layout="@layout/fragment_directions_form"/>
-
+				tools:layout="@layout/fragment_directions_form" />
 		</com.google.android.material.appbar.CollapsingToolbarLayout>
 
 	</com.google.android.material.appbar.AppBarLayout>
 
 	<FrameLayout
 		android:id="@+id/fragmentContainer"
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
+		android:layout_width="0dp"
+		android:layout_height="0dp"
 		android:focusable="true"
 		android:focusableInTouchMode="true"
-		app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
+		android:paddingStart="4dp"
+		android:paddingEnd="4dp"
+		app:layout_behavior="@string/appbar_scrolling_view_behavior"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/appBarLayout" />
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

From 2e8c3f501fe1cf565004b7027428a34c9b6670a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20N=C3=BCsse?= <felix.nuesse@t-online.de>
Date: Wed, 7 Feb 2024 23:27:17 +0100
Subject: [PATCH 44/60] fix toolbar menus not showing

---
 .../java/de/grobox/transportr/trips/detail/TripDetailFragment.kt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/de/grobox/transportr/trips/detail/TripDetailFragment.kt b/app/src/main/java/de/grobox/transportr/trips/detail/TripDetailFragment.kt
index 58b0082ce..ae6230f1b 100644
--- a/app/src/main/java/de/grobox/transportr/trips/detail/TripDetailFragment.kt
+++ b/app/src/main/java/de/grobox/transportr/trips/detail/TripDetailFragment.kt
@@ -83,6 +83,7 @@ class TripDetailFragment : TransportrFragment(), Toolbar.OnMenuItemClickListener
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
+        setUpToolbar(toolbar)
         setHasOptionsMenu(true)
         component.inject(this)
 

From 1ac936960a2ae7181c2b622bc191cc46b12f1910 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20N=C3=BCsse?= <felix.nuesse@t-online.de>
Date: Sun, 18 Feb 2024 21:03:49 +0100
Subject: [PATCH 45/60] reintroduce yellow walk color

---
 .../de/grobox/transportr/trips/detail/LegViewHolder.kt | 10 ++++------
 app/src/main/res/drawable/walk_box.xml                 |  2 +-
 app/src/main/res/values/colors.xml                     |  4 ++++
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/de/grobox/transportr/trips/detail/LegViewHolder.kt b/app/src/main/java/de/grobox/transportr/trips/detail/LegViewHolder.kt
index 5592cdfa5..212520845 100644
--- a/app/src/main/java/de/grobox/transportr/trips/detail/LegViewHolder.kt
+++ b/app/src/main/java/de/grobox/transportr/trips/detail/LegViewHolder.kt
@@ -19,7 +19,6 @@
 
 package de.grobox.transportr.trips.detail
 
-import android.graphics.Color
 import android.text.Html.fromHtml
 import android.view.View
 import android.view.View.GONE
@@ -28,9 +27,9 @@ import android.widget.ImageButton
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.annotation.ColorInt
+import androidx.core.content.ContextCompat.getColor
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import com.google.android.material.color.MaterialColors
 import com.google.common.base.Strings
 import com.google.common.base.Strings.isNullOrEmpty
 import de.grobox.transportr.R
@@ -195,10 +194,9 @@ internal class LegViewHolder(v: View, private val listener: LegClickListener, pr
         lineView.setWalk()
 
         // line color
-        val color = MaterialColors.getColor(fromCircle.context, R.attr.colorSecondary, Color.TRANSPARENT)
-        fromCircle.setColorFilter(color)
-        lineBar.setColorFilter(color)
-        toCircle.setColorFilter(color)
+        fromCircle.setColorFilter(getColor(fromCircle.context, R.color.walking))
+        lineBar.setColorFilter(getColor(lineBar.context, R.color.walking))
+        toCircle.setColorFilter(getColor(toCircle.context, R.color.walking))
 
         // show distance
         if (leg.distance > 0) {
diff --git a/app/src/main/res/drawable/walk_box.xml b/app/src/main/res/drawable/walk_box.xml
index 6154118b7..ee19581a9 100644
--- a/app/src/main/res/drawable/walk_box.xml
+++ b/app/src/main/res/drawable/walk_box.xml
@@ -3,7 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <solid android:color="?colorSecondary"/>
+    <solid android:color="@color/walking"/>
 
     <corners
         android:radius="@dimen/line_box_corner_radius"/>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 9ef4887e7..f1259ee7a 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -35,6 +35,10 @@
     <color name="md_theme_outlineVariant">#D8C2BE</color>
     <color name="md_theme_scrim">#000000</color>
 
+
+    <color name="walking">#ffea00</color>
+
+
     <color name="fabBackgroundMoved">@color/md_theme_onSurfaceVariant</color>
     <color name="fabForegroundInitial">@color/md_theme_onPrimaryContainer</color>
     <color name="fabForegroundFollow">@color/md_theme_onSecondaryContainer</color>

From 64ee5012cab2d500a51c549a9a1d4b72a27edf0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20N=C3=BCsse?= <felix.nuesse@t-online.de>
Date: Sun, 18 Feb 2024 21:05:52 +0100
Subject: [PATCH 46/60] fix typo in comment

---
 app/src/main/java/de/grobox/transportr/utils/FullScreenUtil.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/de/grobox/transportr/utils/FullScreenUtil.kt b/app/src/main/java/de/grobox/transportr/utils/FullScreenUtil.kt
index 2d2c3b7d4..de4702964 100644
--- a/app/src/main/java/de/grobox/transportr/utils/FullScreenUtil.kt
+++ b/app/src/main/java/de/grobox/transportr/utils/FullScreenUtil.kt
@@ -39,7 +39,7 @@ class FullScreenUtil {
     companion object {
         fun drawBehindStatusbar(activity: Activity) {
             WindowCompat.setDecorFitsSystemWindows(activity.window, false)
-            // required for the mail view, which cant properly use the theme.
+            // required for the main view, which cant properly use the theme.xml
             activity.window.statusBarColor = Color.TRANSPARENT
             activity.window.navigationBarColor = Color.TRANSPARENT
         }

From d16083077feaf16ba9e47ed76634ebaf62eaa39c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20N=C3=BCsse?= <felix.nuesse@t-online.de>
Date: Sun, 18 Feb 2024 21:30:46 +0100
Subject: [PATCH 47/60] Fix PopupMenu icon colors

---
 app/src/main/java/de/grobox/transportr/ui/BasePopupMenu.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/de/grobox/transportr/ui/BasePopupMenu.java b/app/src/main/java/de/grobox/transportr/ui/BasePopupMenu.java
index d8a116b92..cc90bab71 100644
--- a/app/src/main/java/de/grobox/transportr/ui/BasePopupMenu.java
+++ b/app/src/main/java/de/grobox/transportr/ui/BasePopupMenu.java
@@ -46,7 +46,7 @@ protected BasePopupMenu(Context context, View anchor) {
 		setOnMenuItemClickListener(this);
 
 		TypedValue typedValue = new TypedValue();
-		context.getTheme().resolveAttribute(R.attr.colorControlNormal, typedValue, true);
+		context.getTheme().resolveAttribute(R.attr.colorOnPrimarySurface, typedValue, true);
 		iconColor = typedValue.data;
 	}
 

From 01005699f13977548b2794650ec8bdf67b257333 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20N=C3=BCsse?= <felix.nuesse@t-online.de>
Date: Mon, 19 Feb 2024 08:14:56 +0100
Subject: [PATCH 48/60] fix coloring on network selection

---
 app/src/main/res/color/selector_highlight.xml           | 8 ++++----
 app/src/main/res/layout/list_item_transport_network.xml | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/res/color/selector_highlight.xml b/app/src/main/res/color/selector_highlight.xml
index be25d37ce..0f3bfe807 100644
--- a/app/src/main/res/color/selector_highlight.xml
+++ b/app/src/main/res/color/selector_highlight.xml
@@ -3,10 +3,10 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
-        android:color="?colorPrimary"
-        android:state_activated="false" />
+        android:color="?colorOnPrimary"
+        android:state_selected="true" />
     <item
-        android:color="@android:color/white"
-        android:state_activated="true" />
+        android:color="?android:attr/textColorPrimary"
+        android:state_selected="false" />
 
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/list_item_transport_network.xml b/app/src/main/res/layout/list_item_transport_network.xml
index b050c4d29..a033039c1 100644
--- a/app/src/main/res/layout/list_item_transport_network.xml
+++ b/app/src/main/res/layout/list_item_transport_network.xml
@@ -29,7 +29,7 @@
 		android:layout_marginVertical="8dp"
 		android:layout_marginStart="16dp"
 		android:layout_marginEnd="8dp"
-		android:textColor="?android:attr/textColorPrimary"
+		android:textColor="@color/selector_highlight"
 		android:textSize="15sp"
 		app:layout_constraintLeft_toRightOf="@+id/logo"
 		app:layout_constraintRight_toLeftOf="@+id/status"
@@ -58,7 +58,7 @@
 		android:layout_marginVertical="8dp"
 		android:layout_marginStart="16dp"
 		android:layout_marginEnd="8dp"
-		android:textColor="?android:attr/textColorSecondary"
+		android:textColor="@color/selector_highlight"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintLeft_toRightOf="@+id/logo"
 		app:layout_constraintRight_toRightOf="parent"

From 001cb61f74314254cbf2693c2e1a1b3c612088ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20N=C3=BCsse?= <felix.nuesse@t-online.de>
Date: Mon, 19 Feb 2024 08:15:11 +0100
Subject: [PATCH 49/60] refactor attribute naming

---
 app/src/main/res/drawable/product_bus.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/drawable/product_bus.xml b/app/src/main/res/drawable/product_bus.xml
index 69c5e9f03..cc4050322 100644
--- a/app/src/main/res/drawable/product_bus.xml
+++ b/app/src/main/res/drawable/product_bus.xml
@@ -3,7 +3,7 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?attr/colorOnBackground">
+        android:tint="?colorOnBackground">
     <path
         android:fillColor="#FF000000"
         android:pathData="M4,16c0,0.88 0.39,1.67 1,2.22L5,20c0,0.55 0.45,1 1,1h1c0.55,0 1,-0.45 1,-1v-1h8v1c0,0.55 0.45,1 1,1h1c0.55,0 1,-0.45 1,-1v-1.78c0.61,-0.55 1,-1.34 1,-2.22L20,6c0,-3.5 -3.58,-4 -8,-4s-8,0.5 -8,4v10zM7.5,17c-0.83,0 -1.5,-0.67 -1.5,-1.5S6.67,14 7.5,14s1.5,0.67 1.5,1.5S8.33,17 7.5,17zM16.5,17c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM18,11L6,11L6,6h12v5z"/>

From c534558152391b0267a5a57cfb3ff9a1fb834c46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20N=C3=BCsse?= <felix.nuesse@t-online.de>
Date: Mon, 19 Feb 2024 08:19:29 +0100
Subject: [PATCH 50/60] use less prominent color for back button

---
 app/src/main/res/layout/activity_trip_detail.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/activity_trip_detail.xml b/app/src/main/res/layout/activity_trip_detail.xml
index 33f4c3e1a..4cad7be97 100644
--- a/app/src/main/res/layout/activity_trip_detail.xml
+++ b/app/src/main/res/layout/activity_trip_detail.xml
@@ -24,8 +24,8 @@
 			android:layout_margin="12dp"
 			android:background="@drawable/shape_circle"
 			android:padding="8dp"
-			android:backgroundTint="@color/md_theme_primary"
-			app:tint="@color/md_theme_onPrimaryContainer"
+			android:backgroundTint="@color/md_theme_surface"
+			app:tint="@color/md_theme_onSurface"
 			app:srcCompat="@drawable/ic_back" />
 
 	</com.google.android.material.appbar.AppBarLayout>

From d1f2b458d87d2d15ec7f81ab28f1801adc435465 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20N=C3=BCsse?= <felix.nuesse@t-online.de>
Date: Mon, 19 Feb 2024 08:24:27 +0100
Subject: [PATCH 51/60] use proper color for toolbar close

---
 app/src/main/res/drawable/ic_action_content_remove.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/drawable/ic_action_content_remove.xml b/app/src/main/res/drawable/ic_action_content_remove.xml
index 42222ec79..05984360d 100644
--- a/app/src/main/res/drawable/ic_action_content_remove.xml
+++ b/app/src/main/res/drawable/ic_action_content_remove.xml
@@ -5,6 +5,6 @@
 		android:viewportHeight="24.0"
 		android:viewportWidth="24.0">
 	<path
-		android:fillColor="#FFFFFFFF"
+		android:fillColor="?colorControlNormal"
 		android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
 </vector>

From 5b1dbadc7b3acf1fc26fc8ca8d581490d7cb34ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20N=C3=BCsse?= <felix.nuesse@t-online.de>
Date: Wed, 13 Mar 2024 18:14:46 +0100
Subject: [PATCH 52/60] improve map attribution

---
 app/src/main/res/layout/fragment_map.xml | 68 ++++++++++++------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/app/src/main/res/layout/fragment_map.xml b/app/src/main/res/layout/fragment_map.xml
index 8f0f92f86..285853cc3 100644
--- a/app/src/main/res/layout/fragment_map.xml
+++ b/app/src/main/res/layout/fragment_map.xml
@@ -19,40 +19,6 @@
 		app:maplibre_uiCompassMarginTop="72dp"
 		app:maplibre_uiRotateGestures="true"/>
 
-	<View
-		android:layout_width="0dp"
-		android:layout_height="0dp"
-		android:background="?attributionBackground"
-		app:layout_constraintStart_toStartOf="@id/logo"
-		app:layout_constraintEnd_toEndOf="@id/attribution"
-		app:layout_constraintTop_toTopOf="@id/attribution"
-		app:layout_constraintBottom_toBottomOf="@id/attribution" />
-
-	<ImageView
-		android:id="@+id/logo"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:padding="4dp"
-		app:layout_constraintStart_toStartOf="@id/map"
-		app:layout_constraintTop_toTopOf="@id/attribution"
-		app:layout_constraintBottom_toBottomOf="@id/map"
-		app:srcCompat="@drawable/maplibre_logo_icon"/>
-
-	<TextView
-		android:id="@+id/attribution"
-		android:layout_width="0dp"
-		android:layout_height="wrap_content"
-		android:padding="4dp"
-		android:textSize="12sp"
-		android:text="@string/map_attribution"
-		android:textColorLink="?android:textColorTertiary"
-		app:layout_constraintHorizontal_bias="0"
-		app:layout_constraintWidth_default="wrap"
-		app:layout_constraintStart_toEndOf="@+id/logo"
-		app:layout_constraintEnd_toStartOf="@id/gpsFab"
-		app:layout_constraintBottom_toBottomOf="@+id/map"
-		tools:text="© JawgMaps, © OSM Contributors\nImprove this map"/>
-
 	<com.google.android.material.floatingactionbutton.FloatingActionButton
 		android:id="@+id/gpsFab"
 		android:layout_width="wrap_content"
@@ -67,4 +33,38 @@
 		app:layout_constraintEnd_toEndOf="parent"
 		app:srcCompat="@drawable/ic_gps"/>
 
+	<LinearLayout
+		android:id="@+id/attributionLayout"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginBottom="32dp"
+		android:background="@drawable/shape_location_dropdown"
+		android:backgroundTint="?attributionBackground"
+		android:gravity="center"
+		android:orientation="horizontal"
+		android:padding="4dp"
+		android:paddingStart="8dp"
+		android:paddingEnd="8dp"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent">
+
+		<ImageView
+			android:id="@+id/logo"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:padding="4dp"
+			app:srcCompat="@drawable/maplibre_logo_icon" />
+
+		<TextView
+			android:id="@+id/attribution"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:padding="4dp"
+			android:text="@string/map_attribution"
+			android:textColorLink="?android:textColorTertiary"
+			android:textSize="12sp"
+			tools:text="© JawgMaps, © OSM Contributors\nImprove this map" />
+	</LinearLayout>
+
 </androidx.constraintlayout.widget.ConstraintLayout>

From 64f4b49e1618bb72866359bcb3902de11c13374b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20N=C3=BCsse?= <felix.nuesse@t-online.de>
Date: Wed, 13 Mar 2024 19:26:12 +0100
Subject: [PATCH 53/60] use material dialog for transport mode selector

---
 .../trips/search/ProductDialogFragment.java   | 56 +++++++-------
 .../res/layout/fragment_product_dialog.xml    | 75 ++++---------------
 app/src/main/res/layout/list_item_product.xml | 15 ++--
 3 files changed, 52 insertions(+), 94 deletions(-)

diff --git a/app/src/main/java/de/grobox/transportr/trips/search/ProductDialogFragment.java b/app/src/main/java/de/grobox/transportr/trips/search/ProductDialogFragment.java
index 5d1329f01..227683766 100755
--- a/app/src/main/java/de/grobox/transportr/trips/search/ProductDialogFragment.java
+++ b/app/src/main/java/de/grobox/transportr/trips/search/ProductDialogFragment.java
@@ -20,8 +20,11 @@
 package de.grobox.transportr.trips.search;
 
 import android.app.Dialog;
+
+import androidx.annotation.NonNull;
 import androidx.lifecycle.ViewModelProvider;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.os.Bundle;
 import androidx.fragment.app.DialogFragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -35,6 +38,7 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.mikepenz.fastadapter.commons.adapters.FastItemAdapter;
 import com.mikepenz.fastadapter.items.AbstractItem;
 
@@ -62,6 +66,29 @@ public class ProductDialogFragment extends DialogFragment {
 	private FastItemAdapter<ProductItem> adapter;
 	private Button okButton;
 
+	private View dialog;
+
+	@NonNull
+	@Override
+	public Dialog onCreateDialog(@androidx.annotation.Nullable Bundle savedInstanceState) {
+		dialog = onCreateView(LayoutInflater.from(requireContext()), null, savedInstanceState);
+
+
+		MaterialAlertDialogBuilder mb = new MaterialAlertDialogBuilder(requireContext());
+		mb.setView(dialog);
+		mb.setTitle(R.string.select_products);
+		mb.setIcon(R.drawable.product_bus);
+		mb.setNegativeButton(R.string.cancel, (dialog, which) -> {
+			getDialog().cancel();
+		});
+		mb.setPositiveButton(R.string.ok, (dialog, which) -> {
+			EnumSet<Product> products = getProductsFromItems(adapter.getSelectedItems());
+			viewModel.setProducts(products);
+			getDialog().cancel();
+		});
+		return mb.create();
+	}
+
 	@Override
 	public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
 		View v = inflater.inflate(R.layout.fragment_product_dialog, container);
@@ -79,41 +106,14 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
 		// Get view model and observe products
 		viewModel = new ViewModelProvider(requireActivity(), viewModelFactory).get(DirectionsViewModel.class);
 		if (savedInstanceState == null) {
-			viewModel.getProducts().observe(getViewLifecycleOwner(), this::onProductsChanged);
+			viewModel.getProducts().observe(requireActivity(), this::onProductsChanged);
 		} else {
 			adapter.withSavedInstanceState(savedInstanceState);
 		}
 
-		// OK Button
-		okButton = v.findViewById(R.id.okButton);
-		okButton.setOnClickListener(view -> {
-			EnumSet<Product> products = getProductsFromItems(adapter.getSelectedItems());
-			viewModel.setProducts(products);
-			getDialog().cancel();
-		});
-		// Cancel Button
-		Button cancelButton = v.findViewById(R.id.cancelButton);
-		cancelButton.setOnClickListener(view -> getDialog().cancel());
-
 		return v;
 	}
 
-	@Override
-	public void onStart() {
-		super.onStart();
-
-		// adjust width and height to be shown properly in landscape orientation
-		Dialog dialog = getDialog();
-		if (dialog != null) {
-			Window window = dialog.getWindow();
-			if (window != null) {
-				int width = ViewGroup.LayoutParams.MATCH_PARENT;
-				int height = ViewGroup.LayoutParams.MATCH_PARENT;
-				window.setLayout(width, height);
-			}
-		}
-	}
-
 	@Override
 	public void onSaveInstanceState(Bundle outState) {
 		super.onSaveInstanceState(outState);
diff --git a/app/src/main/res/layout/fragment_product_dialog.xml b/app/src/main/res/layout/fragment_product_dialog.xml
index 099d98361..1ea5231d0 100644
--- a/app/src/main/res/layout/fragment_product_dialog.xml
+++ b/app/src/main/res/layout/fragment_product_dialog.xml
@@ -1,73 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent">
+	android:layout_height="wrap_content"
+	android:padding="16dp">
 
-	<TextView
-		android:id="@+id/title"
-		style="@style/TextAppearance.AppCompat.Title"
+	<ScrollView
+		android:id="@+id/listContainer"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_marginEnd="8dp"
 		android:layout_marginStart="8dp"
-		android:layout_marginTop="8dp"
-		android:gravity="center_vertical"
-		android:padding="10dp"
-		android:text="@string/select_products"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintHorizontal_bias="0.0"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toTopOf="parent"/>
-
-	<androidx.recyclerview.widget.RecyclerView
-		android:id="@+id/productsView"
-		android:layout_width="0dp"
-		android:layout_height="0dp"
+		android:layout_marginTop="16dp"
 		android:layout_marginEnd="8dp"
-		android:layout_marginStart="8dp"
-		app:layout_constraintBottom_toTopOf="@+id/divider"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/title"
-		tools:listitem="@layout/list_item_product"/>
-
-	<View
-		android:id="@+id/divider"
-		android:layout_width="0dp"
-		android:layout_height="1px"
-		android:background="?colorControlNormal"
-		app:layout_constraintBottom_toTopOf="@+id/okButton"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintStart_toStartOf="parent"/>
-
-	<Button
-		android:id="@+id/cancelButton"
-		style="@style/Widget.AppCompat.Button.ButtonBar.AlertDialog"
-		android:layout_width="0dp"
-		android:layout_height="wrap_content"
-		android:text="@string/cancel"
-		app:layout_constraintBottom_toBottomOf="parent"
-		app:layout_constraintEnd_toStartOf="@+id/guideline"
-		app:layout_constraintStart_toStartOf="parent"/>
-
-	<androidx.constraintlayout.widget.Guideline
-		android:id="@+id/guideline"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
+		android:layout_marginBottom="16dp"
 		android:orientation="vertical"
-		app:layout_constraintGuide_percent="0.5"/>
-
-	<Button
-		android:id="@+id/okButton"
-		style="@style/Widget.AppCompat.Button.ButtonBar.AlertDialog"
-		android:layout_width="0dp"
-		android:layout_height="wrap_content"
-		android:text="@string/ok"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintStart_toStartOf="@+id/guideline"/>
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent">
+
+		<androidx.recyclerview.widget.RecyclerView
+			android:id="@+id/productsView"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			tools:listitem="@layout/list_item_product" />
+	</ScrollView>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/list_item_product.xml b/app/src/main/res/layout/list_item_product.xml
index 195995bbd..d527fc360 100644
--- a/app/src/main/res/layout/list_item_product.xml
+++ b/app/src/main/res/layout/list_item_product.xml
@@ -1,23 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-	android:id="@+id/linearLayout"
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/linearLayout"
 	android:layout_width="match_parent"
-	android:layout_height="wrap_content">
+	android:layout_height="48dp">
 
 	<androidx.appcompat.widget.AppCompatImageView
 		android:id="@+id/productImage"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:padding="5dp"
+		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toStartOf="@+id/productName"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toTopOf="parent"
+		app:srcCompat="@drawable/product_bus"
 		app:tint="?attr/colorControlNormal"
 		tools:ignore="ContentDescription"
-		tools:src="@drawable/product_bus"/>
+		tools:src="@drawable/product_bus" />
 
 	<TextView
 		android:id="@+id/productName"
@@ -27,7 +28,7 @@
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toStartOf="@+id/productCheckBox"
 		app:layout_constraintStart_toEndOf="@+id/productImage"
-		app:layout_constraintTop_toTopOf="parent"/>
+		app:layout_constraintTop_toTopOf="parent" />
 
 	<CheckBox
 		android:id="@+id/productCheckBox"
@@ -36,6 +37,6 @@
 		android:clickable="false"
 		app:layout_constraintBaseline_toBaselineOf="@+id/productName"
 		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintStart_toEndOf="@+id/productName"/>
+		app:layout_constraintStart_toEndOf="@+id/productName" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 4bb7cfb47e28b7c07eda2b27c2b06de469c2f29d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20N=C3=BCsse?= <felix.nuesse@t-online.de>
Date: Wed, 13 Mar 2024 20:15:10 +0100
Subject: [PATCH 54/60] use less obtrusive color on favorite card

---
 app/src/main/res/values/styles.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 59c9293eb..f4e51c6ca 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -26,8 +26,8 @@
 	</style>
 
 	<style name="FavoriteCardForeground" parent="Widget.Material3.CardView.Elevated">
-		<item name="android:textColor">?attr/colorOnPrimaryContainer</item>
-		<item name="tint">?attr/colorOnPrimaryContainer</item>
+		<item name="android:textColor">@color/md_theme_onSecondaryContainer</item>
+		<item name="tint">@color/md_theme_onSecondaryContainer</item>
 	</style>
 
 	<style name="Card" parent="Widget.Material3.CardView.Elevated">

From e7a18ecaa3df754f6aa55368d05a5ce8e1f716a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20N=C3=BCsse?= <felix.nuesse@t-online.de>
Date: Wed, 13 Mar 2024 20:19:46 +0100
Subject: [PATCH 55/60] undo intellij-configchange

---
 .idea/codeStyles/Project.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index af0734dba..82e269184 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -36,6 +36,9 @@
     <JetCodeStyleSettings>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
+    <XML>
+      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
+    </XML>
     <codeStyleSettings language="Groovy">
       <indentOptions>
         <option name="USE_TAB_CHARACTER" value="true" />

From d393f5dbc1a8d7510624c604955e037a0b4c5c58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20N=C3=BCsse?= <felix.nuesse@t-online.de>
Date: Thu, 14 Mar 2024 08:55:11 +0100
Subject: [PATCH 56/60] update first network selection

---
 app/src/main/res/drawable/ic_globe.xml        |  10 ++
 .../activity_pick_transport_network.xml       | 104 ++++++++++++------
 2 files changed, 82 insertions(+), 32 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_globe.xml

diff --git a/app/src/main/res/drawable/ic_globe.xml b/app/src/main/res/drawable/ic_globe.xml
new file mode 100644
index 000000000..51f2b39d0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_globe.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q626,80 735.5,171.5Q845,263 872,401L790,401Q771,328 721.5,270.5Q672,213 600,184L600,200Q600,233 576.5,256.5Q553,280 520,280L440,280L440,360Q440,377 428.5,388.5Q417,400 400,400L320,400L320,480L400,480L400,600L360,600L168,408Q165,426 162.5,444Q160,462 160,480Q160,611 252,705Q344,799 480,800L480,880ZM844,860L716,732Q695,744 671,752Q647,760 620,760Q545,760 492.5,707.5Q440,655 440,580Q440,505 492.5,452.5Q545,400 620,400Q695,400 747.5,452.5Q800,505 800,580Q800,607 792,631Q784,655 772,676L900,804L844,860ZM620,680Q662,680 691,651Q720,622 720,580Q720,538 691,509Q662,480 620,480Q578,480 549,509Q520,538 520,580Q520,622 549,651Q578,680 620,680Z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_pick_transport_network.xml b/app/src/main/res/layout/activity_pick_transport_network.xml
index ec1922780..c5e53eadc 100644
--- a/app/src/main/res/layout/activity_pick_transport_network.xml
+++ b/app/src/main/res/layout/activity_pick_transport_network.xml
@@ -1,51 +1,91 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/coordinatorLayout2"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:fitsSystemWindows="true"
 	tools:context=".networks.PickTransportNetworkActivity">
 
-	<com.google.android.material.appbar.AppBarLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content">
+	<androidx.cardview.widget.CardView
+		android:id="@+id/cardView2"
+		style="@style/NavHeaderCard"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_marginStart="16dp"
+		android:layout_marginTop="16dp"
+		android:layout_marginEnd="16dp"
+		app:cardCornerRadius="@dimen/cardview_corner_radius"
+		app:cardElevation="@dimen/cardview_default_elevation"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent">
 
-		<com.google.android.material.appbar.CollapsingToolbarLayout
-			android:layout_width="match_parent"
+		<androidx.constraintlayout.widget.ConstraintLayout
+			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			app:layout_scrollFlags="scroll|enterAlways|snap">
+			android:layout_margin="12dp">
 
-			<LinearLayout
-				android:layout_width="match_parent"
+			<ImageView
+				android:id="@+id/globeView"
+				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:orientation="vertical">
+				android:layout_marginTop="8dp"
+				app:layout_constraintEnd_toEndOf="parent"
+				app:layout_constraintStart_toStartOf="parent"
+				app:layout_constraintTop_toTopOf="parent"
+				app:srcCompat="@drawable/ic_globe" />
 
-				<androidx.appcompat.widget.Toolbar
-					android:id="@+id/toolbar"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"/>
+			<TextView
+				android:id="@+id/title"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="8dp"
+				android:text="@string/pick_network_activity"
+				android:textAppearance="@style/TextAppearance.AppCompat.Large"
+				app:layout_constraintEnd_toEndOf="parent"
+				app:layout_constraintStart_toStartOf="parent"
+				app:layout_constraintTop_toBottomOf="@+id/globeView" />
+
+			<TextView
+				android:id="@+id/firstRunTextView"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="16dp"
+				android:text="@string/pick_network_first_run"
+				android:textSize="16sp"
+				app:layout_constraintBottom_toBottomOf="parent"
+				app:layout_constraintEnd_toEndOf="parent"
+				app:layout_constraintStart_toStartOf="parent"
+				app:layout_constraintTop_toBottomOf="@+id/title" />
+		</androidx.constraintlayout.widget.ConstraintLayout>
 
-				<TextView
-					android:id="@+id/firstRunTextView"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:padding="8dp"
-					android:text="@string/pick_network_first_run"
-					android:textSize="16sp"/>
+	</androidx.cardview.widget.CardView>
 
-			</LinearLayout>
 
-		</com.google.android.material.appbar.CollapsingToolbarLayout>
+	<ScrollView
+		android:layout_width="0dp"
+		android:layout_height="0dp"
+		android:layout_marginTop="8dp"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/cardView2">
 
-	</com.google.android.material.appbar.AppBarLayout>
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:orientation="vertical">
+
+			<androidx.recyclerview.widget.RecyclerView
+				android:id="@+id/list"
+				android:layout_width="match_parent"
+				android:layout_height="match_parent"
+				app:layout_behavior="@string/appbar_scrolling_view_behavior"
+				tools:listitem="@layout/list_item_transport_continent" />
+		</LinearLayout>
+	</ScrollView>
 
-	<androidx.recyclerview.widget.RecyclerView
-		android:id="@+id/list"
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		app:layout_behavior="@string/appbar_scrolling_view_behavior"
-		tools:listitem="@layout/list_item_transport_continent"/>
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

From 200ad8492dc50a6c1aa55a6306910334a4136d43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20N=C3=BCsse?= <felix.nuesse@t-online.de>
Date: Thu, 14 Mar 2024 09:17:15 +0100
Subject: [PATCH 57/60] improve list styles

---
 .../networks/PickTransportNetworkActivity.kt  |  2 --
 .../layout/list_item_transport_country.xml    | 25 +++++++++----------
 app/src/main/res/values/styles.xml            |  2 +-
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/de/grobox/transportr/networks/PickTransportNetworkActivity.kt b/app/src/main/java/de/grobox/transportr/networks/PickTransportNetworkActivity.kt
index 10169e1bd..99c6316e0 100644
--- a/app/src/main/java/de/grobox/transportr/networks/PickTransportNetworkActivity.kt
+++ b/app/src/main/java/de/grobox/transportr/networks/PickTransportNetworkActivity.kt
@@ -24,10 +24,8 @@ import android.os.Bundle
 import android.os.PersistableBundle
 import android.view.MenuItem
 import android.view.View
-import android.view.View.GONE
 import android.view.View.VISIBLE
 import android.widget.TextView
-import androidx.appcompat.widget.Toolbar
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.mikepenz.fastadapter.IItem
diff --git a/app/src/main/res/layout/list_item_transport_country.xml b/app/src/main/res/layout/list_item_transport_country.xml
index ad1a30704..4d8f0abf2 100644
--- a/app/src/main/res/layout/list_item_transport_country.xml
+++ b/app/src/main/res/layout/list_item_transport_country.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-	android:id="@+id/list_item_transport_country"
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/list_item_transport_country"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:background="?selectableItemBackground"
@@ -14,6 +13,7 @@
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_margin="8dp"
+		android:paddingStart="24dp"
 		android:gravity="center"
 		android:textAlignment="center"
 		android:textAppearance="@style/TextAppearance.AppCompat"
@@ -21,16 +21,16 @@
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintLeft_toLeftOf="parent"
 		app:layout_constraintTop_toTopOf="parent"
-		tools:text="FLAG"/>
+		tools:text="FLAG" />
 
 	<TextView
 		android:id="@+id/name"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_marginBottom="8dp"
 		android:layout_marginLeft="8dp"
-		android:layout_marginRight="8dp"
 		android:layout_marginTop="8dp"
+		android:layout_marginRight="8dp"
+		android:layout_marginBottom="8dp"
 		android:gravity="center_vertical"
 		android:textAppearance="@style/TextAppearance.AppCompat"
 		android:textSize="18sp"
@@ -38,28 +38,27 @@
 		app:layout_constraintLeft_toRightOf="@+id/flag"
 		app:layout_constraintRight_toLeftOf="@+id/chevron"
 		app:layout_constraintTop_toTopOf="parent"
-		tools:text="Network Provider Country"/>
+		tools:text="Network Provider Country" />
 
 	<ImageView
 		android:id="@+id/chevron"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_marginBottom="8dp"
-		android:layout_marginEnd="8dp"
-		android:layout_marginRight="8dp"
 		android:layout_marginTop="8dp"
-		app:tint="?colorControlNormal"
+		android:layout_marginRight="16dp"
+		android:layout_marginBottom="8dp"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintRight_toRightOf="parent"
 		app:layout_constraintTop_toTopOf="parent"
 		app:srcCompat="@drawable/ic_chevron_down"
-		tools:ignore="ContentDescription"/>
+		app:tint="?colorControlNormal"
+		tools:ignore="ContentDescription" />
 
 	<View
 		style="@style/Divider"
 		android:layout_width="0dp"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintLeft_toLeftOf="parent"
-		app:layout_constraintRight_toRightOf="parent"/>
+		app:layout_constraintRight_toRightOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f4e51c6ca..79afe85c1 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -58,7 +58,7 @@
 	</style>
 
 	<style name="Divider">
-		<item name="android:background">?colorControlNormal</item>
+		<item name="android:background">?colorOutline</item>
 		<item name="android:layout_height">1px</item>
 		<item name="android:layout_width">match_parent</item>
 	</style>

From 7fa31ca05d8f79d217e1271a6a14541a4a04bdcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20N=C3=BCsse?= <felix.nuesse@t-online.de>
Date: Thu, 14 Mar 2024 10:30:57 +0100
Subject: [PATCH 58/60] Switch navheader to constraintlayout

---
 .../res/layout/header_navigation_drawer.xml   | 89 ++++++++++---------
 1 file changed, 46 insertions(+), 43 deletions(-)

diff --git a/app/src/main/res/layout/header_navigation_drawer.xml b/app/src/main/res/layout/header_navigation_drawer.xml
index e9e9614fc..9f9883914 100644
--- a/app/src/main/res/layout/header_navigation_drawer.xml
+++ b/app/src/main/res/layout/header_navigation_drawer.xml
@@ -1,70 +1,73 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
 	style="@style/NavHeaderCard"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:layout_margin="8dp"
 	android:layout_marginTop="32dp"
-	android:fitsSystemWindows="true">
+	android:fitsSystemWindows="false">
 
-	<LinearLayout
-		android:id="@+id/drawer_header"
+	<androidx.constraintlayout.widget.ConstraintLayout
 		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:layout_margin="12dp"
-		android:orientation="vertical">
+		android:layout_height="wrap_content">
 
+		<com.google.android.material.imageview.ShapeableImageView
+			android:id="@+id/network_image"
+			android:layout_width="60dp"
+			android:layout_height="60dp"
+			android:layout_marginStart="16dp"
+			android:layout_marginTop="24dp"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toTopOf="parent"
+			app:shapeAppearanceOverlay="@style/RoundedImageView" />
 
-		<LinearLayout
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="16dp"
-			android:orientation="horizontal">
-
-			<com.google.android.material.imageview.ShapeableImageView
-				android:id="@+id/network_image"
-				android:layout_width="60dp"
-				android:layout_height="60dp"
-				android:layout_marginBottom="20dp"
-				app:shapeAppearanceOverlay="@style/RoundedImageView" />
-
-			<View
-				android:layout_width="0dp"
-				android:layout_height="0px"
-				android:layout_weight="1" />
+		<com.google.android.material.imageview.ShapeableImageView
+			android:id="@+id/network_image_two"
+			android:layout_width="30dp"
+			android:layout_height="30dp"
+			android:layout_marginEnd="16dp"
+			app:layout_constraintEnd_toStartOf="@+id/network_image_three"
+			app:layout_constraintTop_toTopOf="@+id/network_image_three"
+			app:shapeAppearanceOverlay="@style/RoundedImageView" />
 
-			<com.google.android.material.imageview.ShapeableImageView
-				android:id="@+id/network_image_two"
-				android:layout_width="30dp"
-				android:layout_height="30dp"
-				android:layout_marginBottom="20dp"
-				app:shapeAppearanceOverlay="@style/RoundedImageView" />
-
-			<com.google.android.material.imageview.ShapeableImageView
-				android:id="@+id/network_image_three"
-				android:layout_width="30dp"
-				android:layout_height="30dp"
-				android:layout_marginStart="10dp"
-				android:layout_marginBottom="20dp"
-				app:shapeAppearanceOverlay="@style/RoundedImageView" />
-
-		</LinearLayout>
+		<com.google.android.material.imageview.ShapeableImageView
+			android:id="@+id/network_image_three"
+			android:layout_width="30dp"
+			android:layout_height="30dp"
+			android:layout_marginTop="24dp"
+			android:layout_marginEnd="16dp"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintTop_toTopOf="parent"
+			app:shapeAppearanceOverlay="@style/RoundedImageView" />
 
 		<TextView
 			android:id="@+id/network_name"
 			style="@style/NavHeaderCard"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:textSize="20sp" />
+			android:layout_marginStart="16dp"
+			android:layout_marginTop="16dp"
+			android:layout_marginEnd="16dp"
+			android:textSize="20sp"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/network_image" />
 
 		<TextView
 			android:id="@+id/network_description"
 			style="@style/NavHeaderCard"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_marginBottom="30dp" />
-
-	</LinearLayout>
+			android:layout_marginStart="16dp"
+			android:layout_marginTop="16dp"
+			android:layout_marginEnd="16dp"
+			android:layout_marginBottom="24dp"
+			app:layout_constraintBottom_toBottomOf="parent"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/network_name" />
+	</androidx.constraintlayout.widget.ConstraintLayout>
 
 </androidx.cardview.widget.CardView>
\ No newline at end of file

From 62f3facc6aff57b162bc742074fe006f9713b22f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20N=C3=BCsse?= <felix.nuesse@t-online.de>
Date: Thu, 14 Mar 2024 10:42:36 +0100
Subject: [PATCH 59/60] fix map attribution on trip details

---
 app/src/main/res/layout/fragment_trip_map.xml | 67 +++++++++----------
 1 file changed, 33 insertions(+), 34 deletions(-)

diff --git a/app/src/main/res/layout/fragment_trip_map.xml b/app/src/main/res/layout/fragment_trip_map.xml
index d49c02d81..ed3e86c7b 100644
--- a/app/src/main/res/layout/fragment_trip_map.xml
+++ b/app/src/main/res/layout/fragment_trip_map.xml
@@ -17,40 +17,6 @@
 		app:layout_constraintTop_toTopOf="parent"
 		app:maplibre_uiCompassMarginTop="24dp"/>
 
-	<View
-		android:layout_width="0dp"
-		android:layout_height="0dp"
-		android:background="?attributionBackground"
-		app:layout_constraintStart_toStartOf="@id/logo"
-		app:layout_constraintEnd_toEndOf="@id/attribution"
-		app:layout_constraintTop_toTopOf="@id/attribution"
-		app:layout_constraintBottom_toBottomOf="@id/attribution" />
-
-	<ImageView
-		android:id="@+id/logo"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:padding="4dp"
-		app:layout_constraintStart_toStartOf="@id/map"
-		app:layout_constraintTop_toTopOf="@id/attribution"
-		app:layout_constraintBottom_toBottomOf="@id/map"
-		app:srcCompat="@drawable/maplibre_logo_icon"/>
-
-	<TextView
-		android:id="@+id/attribution"
-		android:layout_width="0dp"
-		android:layout_height="wrap_content"
-		android:padding="4dp"
-		android:textSize="12sp"
-		android:text="@string/map_attribution"
-		android:textColorLink="?android:textColorTertiary"
-		app:layout_constraintHorizontal_bias="0"
-		app:layout_constraintWidth_default="wrap"
-		app:layout_constraintStart_toEndOf="@+id/logo"
-		app:layout_constraintEnd_toStartOf="@id/gpsFab"
-		app:layout_constraintBottom_toBottomOf="@+id/map"
-		tools:text="© JawgMaps, © OSM Contributors\nImprove this map"/>
-
 	<com.google.android.material.floatingactionbutton.FloatingActionButton
 		android:id="@+id/gpsFab"
 		android:layout_width="wrap_content"
@@ -66,4 +32,37 @@
 		app:layout_constraintEnd_toEndOf="parent"
 		app:srcCompat="@drawable/ic_gps"/>
 
+	<LinearLayout
+		android:id="@+id/attributionLayout"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginBottom="32dp"
+		android:background="@drawable/shape_location_dropdown"
+		android:backgroundTint="?attributionBackground"
+		android:gravity="center"
+		android:orientation="horizontal"
+		android:padding="4dp"
+		android:paddingStart="8dp"
+		android:paddingEnd="8dp"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent">
+
+		<ImageView
+			android:id="@+id/logo"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:padding="4dp"
+			app:srcCompat="@drawable/maplibre_logo_icon" />
+
+		<TextView
+			android:id="@+id/attribution"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:padding="4dp"
+			android:text="@string/map_attribution"
+			android:textColorLink="?android:textColorTertiary"
+			android:textSize="12sp"
+			tools:text="© JawgMaps, © OSM Contributors\nImprove this map" />
+	</LinearLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>

From ca358fe2a4ca5ff6035af9e09d2f1ca3a41777bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20N=C3=BCsse?= <felix.nuesse@t-online.de>
Date: Thu, 14 Mar 2024 10:45:54 +0100
Subject: [PATCH 60/60] increase back button contrast

---
 app/src/main/res/layout/activity_trip_detail.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/layout/activity_trip_detail.xml b/app/src/main/res/layout/activity_trip_detail.xml
index 4cad7be97..d625d9960 100644
--- a/app/src/main/res/layout/activity_trip_detail.xml
+++ b/app/src/main/res/layout/activity_trip_detail.xml
@@ -23,10 +23,10 @@
 			android:layout_height="48dp"
 			android:layout_margin="12dp"
 			android:background="@drawable/shape_circle"
+			android:backgroundTint="@color/md_theme_surfaceVariant"
 			android:padding="8dp"
-			android:backgroundTint="@color/md_theme_surface"
-			app:tint="@color/md_theme_onSurface"
-			app:srcCompat="@drawable/ic_back" />
+			app:srcCompat="@drawable/ic_back"
+			app:tint="@color/md_theme_onSurface" />
 
 	</com.google.android.material.appbar.AppBarLayout>