Remove colorBranded attrs in favor of colorPrimarySurface

- Removed legacy colorBranded used before colorPrimarySurface was added
- Updaed drawables to use colorControlNormal tinting
- Updated drawable file names
- Updated BottomAppBar style to be .PrimarySurface

Change-Id: I8d134b26978cd61823effd58d07c6b11e96a35a8

Author: hunterstich

app/src/main/java/com/materialstudies/reply/data/Account.kt

@@ -34,7 +34,7 @@ data class Account(
     var isCurrentAccount: Boolean = false
 ) {
     val fullName: String = "$firstName $lastName"
-    @DrawableRes val checkedIcon: Int = if (isCurrentAccount) R.drawable.ic_done_on_branded else 0
+    @DrawableRes val checkedIcon: Int = if (isCurrentAccount) R.drawable.ic_done else 0
 }
 
 object AccountDiffCallback : DiffUtil.ItemCallback<Account>() {

app/src/main/java/com/materialstudies/reply/ui/MainActivity.kt

@@ -96,10 +96,6 @@ class MainActivity : AppCompatActivity(),
 
         // Set up the BottomAppBar menu
         binding.bottomAppBar.apply {
-            overflowIcon = ContextCompat.getDrawable(
-                this@MainActivity,
-                R.drawable.ic_more_vert_on_branded
-            )
             setNavigationOnClickListener {
                 bottomNavDrawer.toggle()
             }

app/src/main/java/com/materialstudies/reply/ui/nav/BottomNavDrawerFragment.kt

@@ -84,29 +84,31 @@ class BottomNavDrawerFragment :
     private val sandwichSlideActions = mutableListOf<OnSandwichSlideAction>()
 
     private val backgroundShapeDrawable: MaterialShapeDrawable by lazy(NONE) {
+        val backgroundContext = binding.backgroundContainer.context
         MaterialShapeDrawable(
-            binding.backgroundContainer.context,
+            backgroundContext,
             null,
             R.attr.bottomSheetStyle,
             0
         ).apply {
             fillColor = ColorStateList.valueOf(
-                requireContext().themeColor(R.attr.colorBrandedVariantSurface)
+                backgroundContext.themeColor(R.attr.colorPrimarySurfaceVariant)
             )
             elevation = resources.getDimension(R.dimen.plane_08)
             initializeElevationOverlay(requireContext())
         }
     }
 
     private val foregroundShapeDrawable: MaterialShapeDrawable by lazy(NONE) {
+        val foregroundContext = binding.foregroundContainer.context
         MaterialShapeDrawable(
-            binding.foregroundContainer.context,
+            foregroundContext,
             null,
             R.attr.bottomSheetStyle,
             0
         ).apply {
             fillColor = ColorStateList.valueOf(
-                requireContext().themeColor(R.attr.colorBrandedSurface)
+                foregroundContext.themeColor(R.attr.colorPrimarySurface)
             )
             elevation = resources.getDimension(R.dimen.plane_16)
             shadowCompatibilityMode = MaterialShapeDrawable.SHADOW_COMPAT_MODE_NEVER

app/src/main/java/com/materialstudies/reply/ui/nav/NavigationModel.kt

@@ -29,37 +29,37 @@ object NavigationModel {
     private var navigationMenuItems = mutableListOf(
         NavigationModelItem.NavMenuItem(
             id = 0,
-            icon = R.drawable.ic_twotone_inbox_on_branded,
+            icon = R.drawable.ic_twotone_inbox,
             titleRes = R.string.navigation_inbox,
             checked = false
         ),
         NavigationModelItem.NavMenuItem(
             id = 1,
-            icon = R.drawable.ic_twotone_stars_on_branded,
+            icon = R.drawable.ic_twotone_stars,
             titleRes = R.string.navigation_starred,
             checked = false
         ),
         NavigationModelItem.NavMenuItem(
             id = 2,
-            icon = R.drawable.ic_twotone_send_on_branded,
+            icon = R.drawable.ic_twotone_send,
             titleRes = R.string.navigation_sent,
             checked = false
         ),
         NavigationModelItem.NavMenuItem(
             id = 3,
-            icon = R.drawable.ic_twotone_delete_on_branded,
+            icon = R.drawable.ic_twotone_delete,
             titleRes = R.string.navigation_trash,
             checked = false
         ),
         NavigationModelItem.NavMenuItem(
             id = 4,
-            icon = R.drawable.ic_twotone_error_on_branded,
+            icon = R.drawable.ic_twotone_error,
             titleRes = R.string.navigation_spam,
             checked = false
         ),
         NavigationModelItem.NavMenuItem(
             id = 5,
-            icon = R.drawable.ic_twotone_drafts_on_branded,
+            icon = R.drawable.ic_twotone_drafts,
             titleRes = R.string.navigation_drafts,
             checked = false
         )

app/src/main/res/color/color_navigation_drawer_menu_item.xml

@@ -14,5 +14,5 @@
   -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:color="?attr/colorSecondary" android:state_checked="true"/>
-    <item android:color="@color/color_on_branded_surface_emphasis_medium" />
+    <item android:color="@color/color_on_primary_surface_emphasis_medium" />
 </selector>

app/src/main/res/color/color_on_branded_surface_divider.xml renamed to app/src/main/res/color/color_on_primary_surface_divider.xml

@@ -13,5 +13,5 @@
   the License.
   -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?attr/colorOnBrandedSurface" android:alpha="0.1" />
+    <item android:color="?attr/colorOnPrimarySurface" android:alpha="0.1" />
 </selector>

app/src/main/res/color/color_on_branded_surface_emphasis_disabled.xml renamed to app/src/main/res/color/color_on_primary_surface_emphasis_disabled.xml

@@ -13,5 +13,5 @@
   the License.
   -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?attr/colorOnBrandedSurface" android:alpha="?attr/emphasisDisabledAlpha" />
+    <item android:color="?attr/colorOnPrimarySurface" android:alpha="?attr/emphasisDisabledAlpha" />
 </selector>

app/src/main/res/color/color_on_branded_surface_emphasis_high.xml renamed to app/src/main/res/color/color_on_primary_surface_emphasis_high.xml

@@ -13,5 +13,5 @@
   the License.
   -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?attr/colorOnBrandedSurface" android:alpha="?attr/emphasisHighAlpha" />
+    <item android:color="?attr/colorOnPrimarySurface" android:alpha="?attr/emphasisHighAlpha" />
 </selector>

app/src/main/res/color/color_on_branded_surface_emphasis_medium.xml renamed to app/src/main/res/color/color_on_primary_surface_emphasis_medium.xml

@@ -13,5 +13,5 @@
   the License.
   -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?attr/colorOnBrandedSurface" android:alpha="?attr/emphasisMediumAlpha" />
+    <item android:color="?attr/colorOnPrimarySurface" android:alpha="?attr/emphasisMediumAlpha" />
 </selector>

app/src/main/res/drawable/asl_edit_reply.xml

@@ -16,12 +16,12 @@
 
     <item
         android:id="@+id/edit"
-        android:drawable="@drawable/ic_edit_on_secondary"
+        android:drawable="@drawable/ic_edit"
         android:state_activated="false"/>
 
     <item
         android:id="@+id/reply"
-        android:drawable="@drawable/ic_reply_all_on_secondary"
+        android:drawable="@drawable/ic_reply_all"
         android:state_activated="true"/>
 
     <transition