Colors update

tools/check/forbidden_strings_in_resources.txt

@@ -98,6 +98,10 @@ layout_constraintLeft_
 ### Use com.google.android.material.switchmaterial.SwitchMaterial instead of Switch, the inflater will not automatically inflate Material Views for Switch.
 <Switch
 
+### Use com.google.android.material.appbar.MaterialToolbar instead of Toolbar, the inflater will not automatically inflate Material Views for Toolbar.
+<Toolbar
+<androidx\.appcompat\.widget\.Toolbar
+
 ### Use colorSecondary
 colorAccent
 

tools/templates/ElementFeature/root/src/app_package/Activity.kt.ftl

@@ -2,7 +2,7 @@ package ${escapeKotlinIdentifiers(packageName)}
 
 import android.content.Context
 import android.content.Intent
-import androidx.appcompat.widget.Toolbar
+import com.google.android.material.appbar.MaterialToolbar
 import im.vector.app.R
 import im.vector.app.core.extensions.addFragment
 import im.vector.app.core.platform.ToolbarConfigurable
@@ -42,7 +42,7 @@ class ${activityClass} : VectorBaseActivity(), ToolbarConfigurable {
         }
     }
 
-    override fun configure(toolbar: Toolbar) {
+    override fun configure(toolbar: MaterialToolbar) {
         configureToolbar(toolbar)
     }
 

vector/lint.xml

@@ -58,6 +58,9 @@
     <!-- Manifest -->
     <issue id="PermissionImpliesUnsupportedChromeOsHardware" severity="error" />
 
+    <!-- Performance -->
+    <issue id="UselessParent" severity="error" />
+
     <!-- Dependencies -->
     <issue id="KtxExtensionAvailable" severity="error" />
 

vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeActivity.kt

@@ -33,6 +33,12 @@ abstract class DebugMaterialThemeActivity : AppCompatActivity() {
         val views = ActivityTestMaterialThemeBinding.inflate(layoutInflater)
         setContentView(views.root)
 
+        setSupportActionBar(views.debugToolbar)
+        supportActionBar?.let {
+            it.setDisplayShowHomeEnabled(true)
+            it.setDisplayHomeAsUpEnabled(true)
+        }
+
         views.debugShowSnackbar.setOnClickListener {
             Snackbar.make(views.coordinatorLayout, "Snackbar!", Snackbar.LENGTH_SHORT)
                     .setAction("Action") { }
@@ -60,7 +66,7 @@ abstract class DebugMaterialThemeActivity : AppCompatActivity() {
     }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
-        menuInflater.inflate(R.menu.home, menu)
+        menuInflater.inflate(R.menu.menu_debug, menu)
         return true
     }
 }