Material Design 3 migration (V2)

.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"

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"
@@ -163,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'
 }

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"/>
@@ -68,18 +68,18 @@
 		<activity
 			android:name="de.grobox.transportr.trips.search.DirectionsActivity"
 			android:exported="true"
+			android:theme="@style/AppTheme.MapFullscreen"
 			android:windowSoftInputMode="stateHidden"/>
 
 		<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"
-			tools:targetApi="jelly_bean"/>
+			android:theme="@style/AppTheme.MapFullscreen" />
 
 		<activity
 			android:name="de.grobox.transportr.networks.PickTransportNetworkActivity"

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() {
+        DynamicColors.applyToActivitiesIfAvailable(this)
+
         super.onCreate()
 
         Mapbox.getInstance(

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

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));

app/src/main/java/de/grobox/transportr/favorites/locations/SpecialLocationFragment.kt

@@ -19,18 +19,21 @@
 
 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
 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 +46,7 @@ import de.grobox.transportr.settings.SettingsManager
 import javax.annotation.ParametersAreNonnullByDefault
 import javax.inject.Inject
 
+
 @ParametersAreNonnullByDefault
 abstract class SpecialLocationFragment : DialogFragment(), LocationView.LocationViewListener {
 
@@ -62,10 +66,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)
@@ -74,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)
@@ -109,7 +111,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) {

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 */