Migrates Material design from AppCompat to MaterialComponents

app/src/androidTest/java/com/github/ashutoshgngwr/noice/fragment/AboutFragmentTest.kt

@@ -14,7 +14,6 @@ import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import com.github.ashutoshgngwr.noice.R
-import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith

app/src/androidTest/java/com/github/ashutoshgngwr/noice/fragment/PresetFragmentTest.kt

@@ -40,7 +40,7 @@ class PresetFragmentTest {
 
   @Before
   fun setup() {
-    fragmentScenario = launchFragmentInContainer<PresetFragment>(null, R.style.AppTheme)
+    fragmentScenario = launchFragmentInContainer<PresetFragment>(null, R.style.Theme_App)
       .onFragment { fragment = it }
 
     MockitoAnnotations.initMocks(this)

app/src/androidTest/java/com/github/ashutoshgngwr/noice/fragment/SavePresetDialogFragmentTest.kt

@@ -29,7 +29,7 @@ class SavePresetDialogFragmentTest {
 
   @Before
   fun setup() {
-    fragmentScenario = launchFragmentInContainer<SavePresetDialogFragment>(null, R.style.AppTheme)
+    fragmentScenario = launchFragmentInContainer<SavePresetDialogFragment>(null, R.style.Theme_App)
   }
 
   @Test

app/src/androidTest/java/com/github/ashutoshgngwr/noice/fragment/SleepTimerFragmentTest.kt

@@ -40,7 +40,7 @@ class SleepTimerFragmentTest {
 
   @Before
   fun setup() {
-    fragmentScenario = launchFragmentInContainer<SleepTimerFragment>(null, R.style.AppTheme)
+    fragmentScenario = launchFragmentInContainer<SleepTimerFragment>(null, R.style.Theme_App)
     fragmentScenario.onFragment {
       fragment = it
     }

app/src/androidTest/java/com/github/ashutoshgngwr/noice/fragment/SoundLibraryFragmentTest.kt

@@ -100,7 +100,7 @@ class SoundLibraryFragmentTest {
 
   @Before
   fun setup() {
-    fragmentScenario = launchFragmentInContainer<SoundLibraryFragment>(null, R.style.AppTheme, null)
+    fragmentScenario = launchFragmentInContainer<SoundLibraryFragment>(null, R.style.Theme_App, null)
     fragmentScenario.onFragment {
       fragment = it
     }

app/src/main/AndroidManifest.xml

@@ -12,7 +12,7 @@
     android:icon="@mipmap/ic_launcher"
     android:roundIcon="@mipmap/ic_launcher"
     android:supportsRtl="true"
-    android:theme="@style/AppTheme"
+    android:theme="@style/Theme.App"
     tools:ignore="AllowBackup,GoogleAppIndexingWarning">
 
     <activity

app/src/main/java/com/github/ashutoshgngwr/noice/MainActivity.kt

@@ -8,7 +8,6 @@ import android.os.Bundle
 import android.util.Log
 import android.view.MenuItem
 import androidx.appcompat.app.ActionBarDrawerToggle
-import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.view.GravityCompat
@@ -18,6 +17,7 @@ import com.github.ashutoshgngwr.noice.fragment.AboutFragment
 import com.github.ashutoshgngwr.noice.fragment.PresetFragment
 import com.github.ashutoshgngwr.noice.fragment.SleepTimerFragment
 import com.github.ashutoshgngwr.noice.fragment.SoundLibraryFragment
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.navigation.NavigationView
 import kotlinx.android.synthetic.main.activity_main.*
 
@@ -67,6 +67,9 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
         PresetFragment::class.java.simpleName -> {
           navigation_drawer.setCheckedItem(R.id.saved_presets)
         }
+        SleepTimerFragment::class.java.simpleName -> {
+          navigation_drawer.setCheckedItem(R.id.sleep_timer)
+        }
         AboutFragment::class.java.simpleName -> {
           navigation_drawer.setCheckedItem(R.id.about)
         }
@@ -103,7 +106,7 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
         setFragment(SleepTimerFragment::class.java)
       }
       R.id.app_theme -> {
-        AlertDialog.Builder(this)
+        MaterialAlertDialogBuilder(this)
           .setSingleChoiceItems(R.array.app_themes, getAppTheme()) { dialog, which ->
             dialog.dismiss()
             setAppTheme(which)

app/src/main/java/com/github/ashutoshgngwr/noice/fragment/PresetFragment.kt

@@ -7,13 +7,13 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.annotation.VisibleForTesting
-import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.Fragment
 import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.RecyclerView
 import com.github.ashutoshgngwr.noice.R
 import com.github.ashutoshgngwr.noice.sound.Playback
 import com.github.ashutoshgngwr.noice.sound.PlaybackControlEvents
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
 import com.google.gson.GsonBuilder
 import com.google.gson.annotations.Expose
@@ -128,7 +128,7 @@ class PresetFragment : Fragment() {
         }
 
         itemView.button_delete.setOnClickListener {
-          AlertDialog.Builder(requireContext()).run {
+          MaterialAlertDialogBuilder(requireContext()).run {
             setMessage(
               getString(
                 R.string.preset_delete_confirmation,
@@ -151,9 +151,7 @@ class PresetFragment : Fragment() {
                 notifyDataSetChanged() // or call it explicitly
               }
 
-              @Suppress("DEPRECATION")
               Snackbar.make(requireView(), R.string.preset_deleted, Snackbar.LENGTH_LONG)
-                .setBackgroundTint(resources.getColor(R.color.colorPrimary))
                 .setAction(R.string.dismiss) { }
                 .show()
             }

app/src/main/java/com/github/ashutoshgngwr/noice/fragment/SavePresetDialogFragment.kt

@@ -21,7 +21,8 @@ class SavePresetDialogFragment : BottomSheetDialogFragment() {
     savedInstanceState: Bundle?
   ): View? {
     // see https://github.com/material-components/material-components-android/issues/99
-    val ctxWrapper = ContextThemeWrapper(requireContext(), R.style.AppTheme)
+    // Also this is just needed to use the global background color '?android:attr/colorBackground'
+    val ctxWrapper = ContextThemeWrapper(requireContext(), R.style.Theme_App)
     return inflater
       .cloneInContext(ctxWrapper)
       .inflate(R.layout.dialog_save_preset, container, false)

app/src/main/java/com/github/ashutoshgngwr/noice/fragment/SoundLibraryFragment.kt

@@ -97,11 +97,10 @@ class SoundLibraryFragment : Fragment() {
     super.onDestroyView()
   }
 
-  @Suppress("DEPRECATION")
-  fun showMessage(@StringRes messageId: Int) {
+  @Suppress("SameParameterValue")
+  private fun showMessage(@StringRes messageId: Int) {
     Snackbar.make(requireView(), messageId, Snackbar.LENGTH_LONG)
       .setAction(R.string.dismiss) { }
-      .setBackgroundTint(resources.getColor(R.color.colorPrimary))
       .show()
   }
 

app/src/main/res/layout/activity_main.xml

@@ -16,8 +16,7 @@
     android:layout_width="wrap_content"
     android:layout_height="match_parent"
     android:layout_gravity="start"
-    app:itemIconTint="@color/nav_view__item_text_color"
-    app:itemTextColor="@color/nav_view__item_text_color"
+    android:background="?android:attr/colorBackground"
     app:menu="@menu/main"/>
 
 </androidx.drawerlayout.widget.DrawerLayout>

app/src/main/res/layout/dialog_save_preset.xml

@@ -8,16 +8,17 @@
   android:layout_height="wrap_content"
   android:padding="16dp"
   android:orientation="vertical"
-  android:background="@color/colorBackground"
+  android:background="?android:attr/colorBackground"
   app:layout_behavior="android.support.design.widget.BottomSheetBehavior">
 
   <TextView
-    style="@style/TextAppearance.AppCompat.Headline"
+    style="@style/TextAppearance.MaterialComponents.Headline5"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:text="@string/save_preset"/>
 
   <com.google.android.material.textfield.TextInputLayout
+    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
     android:id="@+id/layout_edit_name"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -44,14 +45,14 @@
     android:gravity="end|center_vertical">
 
     <Button
-      style="@style/Widget.AppCompat.Button.Borderless.Colored"
+      style="@style/Widget.MaterialComponents.Button.TextButton"
       android:id="@+id/button_cancel"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:text="@string/cancel"/>
 
     <Button
-      style="@style/Widget.AppCompat.Button.Borderless.Colored"
+      style="@style/Widget.MaterialComponents.Button.TextButton"
       android:id="@+id/button_save"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"

app/src/main/res/layout/fragment_sleep_timer.xml

@@ -11,8 +11,8 @@
     android:paddingTop="20dp"
     android:paddingBottom="20dp">
 
-    <androidx.appcompat.widget.AppCompatTextView
-      style="@style/TextAppearance.AppCompat.Title"
+    <TextView
+      style="@style/TextAppearance.MaterialComponents.Headline4"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_margin="20dp"
@@ -31,9 +31,9 @@
       android:layout_margin="20dp"
       android:orientation="horizontal">
 
-      <androidx.appcompat.widget.AppCompatButton
+      <Button
         android:id="@+id/button_schedule"
-        style="@style/TextAppearance.AppCompat.Widget.Button"
+        style="@style/Widget.MaterialComponents.Button.OutlinedButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/schedule" />
@@ -42,9 +42,9 @@
         android:layout_width="20dp"
         android:layout_height="1dp" />
 
-      <androidx.appcompat.widget.AppCompatButton
+      <Button
         android:id="@+id/button_reset"
-        style="@style/TextAppearance.AppCompat.Widget.Button"
+        style="@style/Widget.MaterialComponents.Button.OutlinedButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:enabled="false"

app/src/main/res/layout/layout_list_item__preset.xml

@@ -1,14 +1,9 @@
 <?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"
+  style="@style/Widget.App.CardView"
   android:layout_width="match_parent"
-  android:layout_height="wrap_content"
-  android:layout_margin="7dp"
-  app:cardBackgroundColor="@color/colorCardBackground"
-  app:cardElevation="3dp"
-  app:cardCornerRadius="7dp"
-  app:contentPadding="15dp">
+  android:layout_height="wrap_content">
 
   <LinearLayout
     android:layout_width="match_parent"
@@ -23,11 +18,11 @@
       android:layout_height="wrap_content"
       android:background="?android:selectableItemBackgroundBorderless"
       android:src="@drawable/ic_action_play"
-      android:tint="@color/colorAccent"
+      android:tint="?attr/colorAccent"
       android:contentDescription="@string/play_pause"/>
 
     <TextView
-      style="@style/TextAppearance.AppCompat.Subhead"
+      style="@style/TextAppearance.MaterialComponents.Subtitle1"
       android:id="@+id/title"
       android:layout_width="0dp"
       android:layout_height="wrap_content"
@@ -44,7 +39,7 @@
       android:layout_height="wrap_content"
       android:background="?android:selectableItemBackgroundBorderless"
       android:src="@drawable/ic_action_delete"
-      android:tint="@color/colorAccent"
+      android:tint="?attr/colorAccent"
       android:contentDescription="@string/delete_preset"/>
 
   </LinearLayout>

app/src/main/res/layout/layout_list_item__sound.xml

@@ -1,13 +1,9 @@
 <?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"
+<androidx.cardview.widget.CardView
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  style="@style/Widget.App.CardView"
   android:layout_width="match_parent"
-  android:layout_height="wrap_content"
-  android:layout_margin="7dp"
-  app:cardBackgroundColor="@color/colorCardBackground"
-  app:cardCornerRadius="7dp"
-  app:cardElevation="3dp"
-  app:contentPadding="15dp">
+  android:layout_height="wrap_content">
 
   <!-- Lot of linear layouts because performance -->
   <LinearLayout
@@ -25,7 +21,7 @@
       android:contentDescription="@string/play_pause"
       android:padding="5dp"
       android:src="@drawable/ic_action_play"
-      android:tint="@color/colorAccent" />
+      android:tint="?attr/colorAccent" />
 
     <LinearLayout
       android:layout_width="0dp"
@@ -36,7 +32,7 @@
 
       <TextView
         android:id="@+id/title"
-        style="@style/TextAppearance.AppCompat.Subhead"
+        style="@style/TextAppearance.MaterialComponents.Subtitle1"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:ellipsize="end"
@@ -54,13 +50,13 @@
           android:layout_height="wrap_content"
           android:contentDescription="@string/volume"
           android:src="@drawable/ic_stat_volume"
-          android:tint="@color/colorAccent" />
+          android:tint="?attr/colorAccent" />
 
         <SeekBar
           android:id="@+id/seekbar_volume"
           android:layout_width="0dp"
           android:layout_height="wrap_content"
-          android:layout_weight="1" />
+          android:layout_weight="1"/>
 
       </LinearLayout>
 
@@ -78,7 +74,7 @@
           android:layout_height="wrap_content"
           android:contentDescription="@string/repeat_time_period"
           android:src="@drawable/ic_stat_time_period"
-          android:tint="@color/colorAccent" />
+          android:tint="?attr/colorAccent" />
 
         <SeekBar
           android:id="@+id/seekbar_time_period"

app/src/main/res/values-night/colors.xml

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <color name="colorBackground">#373740</color>
-  <color name="colorCardBackground">#33333d</color>
-  <color name="about_background_color">#373740</color>
+  <color name="colorBackground">#3f3f4d</color>
+  <color name="colorCardBackground">#3c3c48</color>
   <color name="colorHint">#828297</color>
-  <color name="colorNavigationViewText">@android:color/primary_text_dark</color>
+  <!-- Following is needed because AboutPage doesn't have any way to define custom style.
+  This is supposed to override its default background color -->
+  <color name="about_background_color">@color/colorBackground</color>
 </resources>

app/src/main/res/values/colors.xml

@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <color name="colorPrimary">#27272f</color>
-  <color name="colorPrimaryDark">#000000</color>
+  <color name="colorPrimary">#1eb980</color>
+  <color name="colorPrimaryDark">#1d1d23</color>
   <color name="colorAccent">#1eb980</color>
+  <color name="colorActionBar">#2b2b34</color>
   <color name="colorBackground">#f8fAf9</color>
-  <color name="colorCardBackground">#f1f5f4</color>
-  <color name="about_background_color">#f8fAf9</color>
+  <color name="colorCardBackground">#fdfdfd</color>
   <color name="colorHint">#7d7d68</color>
-  <color name="colorNavigationViewText">@android:color/primary_text_light</color>
+  <!-- Following is needed because AboutPage doesn't have any way to define custom style.
+  This is supposed to override its default background color -->
+  <color name="about_background_color">@color/colorBackground</color>
 </resources>