Add Toolbar styles that use themed text appearances based on type scale

PiperOrigin-RevId: 202636817
Thomas-Vos · Jul 2, 2018 · 7cd55d8 · 7cd55d8
1 parent 58df7b8
commit 7cd55d8
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 10 deletions.
diff --git a/catalog/java/io/material/catalog/application/theme/res/values/styles.xml b/catalog/java/io/material/catalog/application/theme/res/values/styles.xml
@@ -16,22 +16,17 @@
   -->
 <resources>
 
-  <style name="Widget.Catalog.Toolbar" parent="Widget.AppCompat.Toolbar">
+  <style name="Widget.Catalog.Toolbar" parent="Widget.MaterialComponents.Toolbar">
     <item name="android:background">?attr/colorPrimary</item>
     <item name="android:theme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
     <item name="popupTheme">@style/ThemeOverlay.AppCompat.Light</item>
-    <item name="titleTextAppearance">@style/TextAppearance.Catalog.Title</item>
   </style>
 
   <style name="Widget.Catalog.Toolbar.WithCloseButton" parent="Widget.Catalog.Toolbar">
     <item name="navigationContentDescription">@string/toolbar_navigation_close_description</item>
     <item name="navigationIcon">@drawable/ic_close_vd_theme_24px</item>
   </style>
 
-  <style name="TextAppearance.Catalog.Title" parent="TextAppearance.AppCompat.Title">
-    <item name="android:textColor">@color/cat_title_text_color</item>
-  </style>
-
   <style name="TextAppearance.Catalog.SectionTitle" parent="TextAppearance.AppCompat.Subhead"/>
 
   <style name="TextAppearance.Catalog.Body" parent="TextAppearance.AppCompat.Body1"/>

diff --git a/catalog/java/io/material/catalog/tableofcontents/res/layout/cat_toc_header.xml b/catalog/java/io/material/catalog/tableofcontents/res/layout/cat_toc_header.xml
@@ -32,5 +32,6 @@
       android:layout_height="wrap_content"
       android:includeFontPadding="false"
       android:text="@string/cat_toc_title"
-      android:textAppearance="@style/TextAppearance.Catalog.Title"/>
+      android:textAppearance="?attr/textAppearanceHeadline6"
+      android:textColor="@color/cat_title_text_color"/>
 </LinearLayout>
diff --git a/lib/java/com/google/android/material/appbar/res/values/dimens.xml b/lib/java/com/google/android/material/appbar/res/values/dimens.xml
@@ -15,7 +15,9 @@
   ~ limitations under the License.
 -->
 <resources>
-  
+
   <dimen name="design_appbar_elevation">4dp</dimen>
 
+  <dimen name="mtrl_toolbar_default_height">56dp</dimen>
+
 </resources>
diff --git a/lib/java/com/google/android/material/appbar/res/values/styles.xml b/lib/java/com/google/android/material/appbar/res/values/styles.xml
@@ -34,4 +34,14 @@
     <item name="android:textColor">?android:attr/textColorPrimary</item>
   </style>
 
+  <style name="Widget.MaterialComponents.Toolbar" parent="Widget.AppCompat.Toolbar">
+    <item name="titleTextAppearance">?attr/textAppearanceHeadline6</item>
+    <item name="titleTextColor">?android:attr/textColorPrimary</item>
+    <item name="subtitleTextAppearance">?attr/textAppearanceSubtitle1</item>
+    <item name="subtitleTextColor">?android:attr/textColorSecondary</item>
+    <!-- Overrides minimum height in landscape to avoid headline6 and subtitle1
+         height concerns. -->
+    <item name="android:minHeight">@dimen/mtrl_toolbar_default_height</item>
+  </style>
+
 </resources>
diff --git a/lib/java/com/google/android/material/dialog/res/values/themes_base.xml b/lib/java/com/google/android/material/dialog/res/values/themes_base.xml
@@ -60,7 +60,7 @@
     <item name="snackbarButtonStyle">?attr/borderlessButtonStyle</item>
     <item name="tabStyle">@style/Widget.MaterialComponents.TabLayout.Colored</item>
     <item name="textInputStyle">@style/Widget.Design.TextInputLayout</item>
-
+    <item name="toolbarStyle">@style/Widget.MaterialComponents.Toolbar</item>
 
     <!-- Type styles -->
     <item name="textAppearanceHeadline1">@style/TextAppearance.MaterialComponents.Headline1</item>
@@ -108,7 +108,7 @@
     <item name="snackbarButtonStyle">?attr/borderlessButtonStyle</item>
     <item name="tabStyle">@style/Widget.MaterialComponents.TabLayout</item>
     <item name="textInputStyle">@style/Widget.Design.TextInputLayout</item>
-
+    <item name="toolbarStyle">@style/Widget.MaterialComponents.Toolbar</item>
 
     <!-- Type styles -->
     <item name="textAppearanceHeadline1">@style/TextAppearance.MaterialComponents.Headline1</item>

diff --git a/lib/java/com/google/android/material/theme/res/values/themes_base.xml b/lib/java/com/google/android/material/theme/res/values/themes_base.xml
@@ -59,6 +59,7 @@
     <item name="snackbarButtonStyle">?attr/borderlessButtonStyle</item>
     <item name="tabStyle">@style/Widget.MaterialComponents.TabLayout.Colored</item>
     <item name="textInputStyle">@style/Widget.Design.TextInputLayout</item>
+    <item name="toolbarStyle">@style/Widget.MaterialComponents.Toolbar</item>
 
     <!-- Dialog themes -->
     <item name="alertDialogTheme">@style/ThemeOverlay.MaterialComponents.Dialog.Alert</item>
@@ -109,6 +110,7 @@
     <item name="snackbarButtonStyle">?attr/borderlessButtonStyle</item>
     <item name="tabStyle">@style/Widget.MaterialComponents.TabLayout</item>
     <item name="textInputStyle">@style/Widget.Design.TextInputLayout</item>
+    <item name="toolbarStyle">@style/Widget.MaterialComponents.Toolbar</item>
 
     <!-- Dialog themes -->
     <item name="alertDialogTheme">@style/ThemeOverlay.MaterialComponents.Dialog.Alert</item>

diff --git a/testing/java/com/google/android/material/testapp/AndroidManifest.xml b/testing/java/com/google/android/material/testapp/AndroidManifest.xml
@@ -24,6 +24,7 @@
     tools:overrideLibrary="android.support.test, android.app, android.support.test.rule, android.support.test.espresso, android.support.test.espresso.idling"/>
 
   <application
+    android:name="android.support.multidex.MultiDexApplication"
     android:supportsRtl="true"
     android:theme="@style/Theme.Design">
 

diff --git a/testing/java/com/google/android/material/testapp/build.gradle b/testing/java/com/google/android/material/testapp/build.gradle
@@ -7,9 +7,15 @@ dependencies {
   api project(fromPath("lib"))
   api project(fromPath("testing/java/com/google/android/material/testapp/base"))
   api project(fromPath("testing/java/com/google/android/material/testapp/custom"))
+
+  api 'com.android.support:multidex:1.0.3'
 }
 
 android {
+  defaultConfig {
+    multiDexEnabled true
+  }
+
   sourceSets {
     main.manifest.srcFile 'AndroidManifest.xml'
     main.java.srcDirs = [ '.' ]