Update all attribute references to use 'attr' namespace

hunterstich · hunterstich · commit 1ccde4d70797 · 2020-01-17T10:07:31.000-08:00
diff --git a/Material Theme Builder/app/src/main/res/drawable/ic_add_on_secondary_24dp.xml b/Material Theme Builder/app/src/main/res/drawable/ic_add_on_secondary_24dp.xml
@@ -19,7 +19,7 @@
   android:height="24dp"
   android:viewportWidth="24.0"
   android:viewportHeight="24.0"
-  android:tint="?colorOnSecondary">
+  android:tint="?attr/colorOnSecondary">
     <path
       android:fillColor="#FF000000"
       android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
diff --git a/Material Theme Builder/app/src/main/res/drawable/ic_bookmark_24dp.xml b/Material Theme Builder/app/src/main/res/drawable/ic_bookmark_24dp.xml
@@ -19,7 +19,7 @@
   android:height="24dp"
   android:viewportWidth="24.0"
   android:viewportHeight="24.0"
-  android:tint="?colorOnBackground">
+  android:tint="?attr/colorOnBackground">
     <path
       android:fillColor="#FF000000"
       android:pathData="M17,3H7c-1.1,0 -1.99,0.9 -1.99,2L5,21l7,-3 7,3V5c0,-1.1 -0.9,-2 -2,-2z"/>
diff --git a/Material Theme Builder/app/src/main/res/drawable/ic_bookmark_control_normal_24dp.xml b/Material Theme Builder/app/src/main/res/drawable/ic_bookmark_control_normal_24dp.xml
@@ -19,7 +19,7 @@
   android:height="24dp"
   android:viewportWidth="24.0"
   android:viewportHeight="24.0"
-  android:tint="?colorControlNormal">
+  android:tint="?attr/colorControlNormal">
     <path
       android:fillColor="#FF000000"
       android:pathData="M17,3H7c-1.1,0 -1.99,0.9 -1.99,2L5,21l7,-3 7,3V5c0,-1.1 -0.9,-2 -2,-2z"/>
diff --git a/Material Theme Builder/app/src/main/res/drawable/ic_bookmark_on_surface_24dp.xml b/Material Theme Builder/app/src/main/res/drawable/ic_bookmark_on_surface_24dp.xml
@@ -19,7 +19,7 @@
   android:height="24dp"
   android:viewportWidth="24.0"
   android:viewportHeight="24.0"
-  android:tint="?colorOnSurface">
+  android:tint="?attr/colorOnSurface">
     <path
       android:fillColor="#FF000000"
       android:pathData="M17,3H7c-1.1,0 -1.99,0.9 -1.99,2L5,21l7,-3 7,3V5c0,-1.1 -0.9,-2 -2,-2z"/>
diff --git a/Material Theme Builder/app/src/main/res/drawable/ic_colorize_24dp.xml b/Material Theme Builder/app/src/main/res/drawable/ic_colorize_24dp.xml
@@ -19,7 +19,7 @@
   android:height="24dp"
   android:viewportWidth="24.0"
   android:viewportHeight="24.0"
-  android:tint="?colorOnBackground">
+  android:tint="?attr/colorOnBackground">
     <path
       android:fillColor="#FF000000"
       android:pathData="M20.71,5.63l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-3.12,3.12 -1.93,-1.91 -1.41,1.41 1.42,1.42L3,16.25V21h4.75l8.92,-8.92 1.42,1.42 1.41,-1.41 -1.92,-1.92 3.12,-3.12c0.4,-0.4 0.4,-1.03 0.01,-1.42zM6.92,19L5,17.08l8.06,-8.06 1.92,1.92L6.92,19z"/>
diff --git a/Material Theme Builder/app/src/main/res/drawable/ic_favorite_on_surface_24dp.xml b/Material Theme Builder/app/src/main/res/drawable/ic_favorite_on_surface_24dp.xml
@@ -19,7 +19,7 @@
   android:height="24dp"
   android:viewportWidth="24.0"
   android:viewportHeight="24.0"
-  android:tint="?colorOnSurface">
+  android:tint="?attr/colorOnSurface">
     <path
       android:fillColor="#FF000000"
       android:pathData="M12,21.35l-1.45,-1.32C5.4,15.36 2,12.28 2,8.5 2,5.42 4.42,3 7.5,3c1.74,0 3.41,0.81 4.5,2.09C13.09,3.81 14.76,3 16.5,3 19.58,3 22,5.42 22,8.5c0,3.78 -3.4,6.86 -8.55,11.54L12,21.35z"/>
diff --git a/Material Theme Builder/app/src/main/res/drawable/ic_format_size_24dp.xml b/Material Theme Builder/app/src/main/res/drawable/ic_format_size_24dp.xml
@@ -19,7 +19,7 @@
   android:height="24dp"
   android:viewportWidth="24.0"
   android:viewportHeight="24.0"
-  android:tint="?colorOnBackground">
+  android:tint="?attr/colorOnBackground">
     <path
       android:fillColor="#FF000000"
       android:pathData="M9,4v3h5v12h3L17,7h5L22,4L9,4zM3,12h3v7h3v-7h3L12,9L3,9v3z"/>
diff --git a/Material Theme Builder/app/src/main/res/drawable/ic_inbox_24dp.xml b/Material Theme Builder/app/src/main/res/drawable/ic_inbox_24dp.xml
@@ -19,7 +19,7 @@
   android:height="24dp"
   android:viewportWidth="24.0"
   android:viewportHeight="24.0"
-  android:tint="?colorOnBackground">
+  android:tint="?attr/colorOnBackground">
     <path
       android:fillColor="#FF000000"
       android:pathData="M19,3L4.99,3c-1.11,0 -1.98,0.89 -1.98,2L3,19c0,1.1 0.88,2 1.99,2L19,21c1.1,0 2,-0.9 2,-2L21,5c0,-1.11 -0.9,-2 -2,-2zM19,15h-4c0,1.66 -1.35,3 -3,3s-3,-1.34 -3,-3L4.99,15L4.99,5L19,5v10z"/>
diff --git a/Material Theme Builder/app/src/main/res/drawable/ic_material_icon_24dp.xml b/Material Theme Builder/app/src/main/res/drawable/ic_material_icon_24dp.xml
@@ -20,7 +20,7 @@
   android:viewportWidth="24.0"
   android:viewportHeight="24.0"
   android:alpha="0.38"
-  android:tint="?colorOnSurface">
+  android:tint="?attr/colorOnSurface">
     <path
       android:fillColor="#FF000000"
       android:pathData="M 23.8462 12 C 23.8462 5.46308 18.5369 0.153846 12 0.153846 C 5.46308 0.153846 0.153846 5.46308 0.153846 12 C 0.153846 18.5369 5.46308 23.8462 12 23.8462 C 18.5369 23.8462 23.8462 18.5369 23.8462 12 Z M 4.46154 18.0738 C 3.11538 16.4154 2.30769 14.3046 2.30769 12 C 2.30769 9.70615 3.12615 7.60615 4.46154 5.93692 L 4.46154 18.0738 Z M 18.0738 4.46154 L 5.92615 4.46154 C 7.58462 3.11538 9.69538 2.30769 12 2.30769 C 14.3046 2.30769 16.4154 3.11538 18.0738 4.46154 Z M 12 14.7246 L 7.95077 6.61538 L 16.06 6.61538 L 12 14.7246 Z M 17.3846 8.76923 L 17.3846 17.3846 L 13.0769 17.3846 L 17.3846 8.76923 Z M 10.9231 17.3846 L 6.61538 17.3846 L 6.61538 8.76923 L 10.9231 17.3846 Z M 18.0738 19.5385 C 16.4046 20.8846 14.2938 21.6923 12 21.6923 C 9.70615 21.6923 7.58462 20.8846 5.92615 19.5385 L 18.0738 19.5385 Z M 21.6923 12 C 21.6923 14.3046 20.8846 16.4154 19.5385 18.0738 L 19.5385 5.93692 C 20.8738 7.60615 21.6923 9.70615 21.6923 12 Z"
diff --git a/Material Theme Builder/app/src/main/res/drawable/ic_menu_control_normal_24dp.xml b/Material Theme Builder/app/src/main/res/drawable/ic_menu_control_normal_24dp.xml
@@ -19,7 +19,7 @@
   android:height="24dp"
   android:viewportWidth="24.0"
   android:viewportHeight="24.0"
-  android:tint="?colorControlNormal">
+  android:tint="?attr/colorControlNormal">
     <path
       android:fillColor="#FF000000"
       android:pathData="M3,18h18v-2L3,16v2zM3,13h18v-2L3,11v2zM3,6v2h18L21,6L3,6z"/>
diff --git a/Material Theme Builder/app/src/main/res/drawable/ic_menu_on_surface_24dp.xml b/Material Theme Builder/app/src/main/res/drawable/ic_menu_on_surface_24dp.xml
@@ -19,7 +19,7 @@
   android:height="24dp"
   android:viewportWidth="24.0"
   android:viewportHeight="24.0"
-  android:tint="?colorOnSurface">
+  android:tint="?attr/colorOnSurface">
     <path
       android:fillColor="#FF000000"
       android:pathData="M3,18h18v-2L3,16v2zM3,13h18v-2L3,11v2zM3,6v2h18L21,6L3,6z"/>
diff --git a/Material Theme Builder/app/src/main/res/drawable/ic_more_vert_on_surface_24dp.xml b/Material Theme Builder/app/src/main/res/drawable/ic_more_vert_on_surface_24dp.xml
@@ -19,7 +19,7 @@
   android:height="24dp"
   android:viewportWidth="24.0"
   android:viewportHeight="24.0"
-  android:tint="?colorOnSurface">
+  android:tint="?attr/colorOnSurface">
     <path
       android:fillColor="#FF000000"
       android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
diff --git a/Material Theme Builder/app/src/main/res/drawable/ic_music_note_on_surface_24dp.xml b/Material Theme Builder/app/src/main/res/drawable/ic_music_note_on_surface_24dp.xml
@@ -19,7 +19,7 @@
   android:height="24dp"
   android:viewportWidth="24.0"
   android:viewportHeight="24.0"
-  android:tint="?colorOnSurface">
+  android:tint="?attr/colorOnSurface">
     <path
       android:fillColor="#FF000000"
       android:pathData="M12,3v10.55c-0.59,-0.34 -1.27,-0.55 -2,-0.55 -2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4V7h4V3h-6z"/>
diff --git a/Material Theme Builder/app/src/main/res/drawable/ic_news_on_surface_24dp.xml b/Material Theme Builder/app/src/main/res/drawable/ic_news_on_surface_24dp.xml
@@ -19,7 +19,7 @@
   android:height="24dp"
   android:viewportWidth="24.0"
   android:viewportHeight="24.0"
-  android:tint="?colorOnSurface">
+  android:tint="?attr/colorOnSurface">
     <path
       android:fillColor="#FF000000"
       android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM15,18L4,18v-4h11v4zM15,13L4,13L4,9h11v4zM20,18h-4L16,9h4v9z"/>
diff --git a/Material Theme Builder/app/src/main/res/drawable/ic_open_in_new_24dp.xml b/Material Theme Builder/app/src/main/res/drawable/ic_open_in_new_24dp.xml
@@ -19,7 +19,7 @@
   android:height="24dp"
   android:viewportWidth="24.0"
   android:viewportHeight="24.0"
-  android:tint="?colorOnBackground">
+  android:tint="?attr/colorOnBackground">
     <path
       android:fillColor="#FF000000"
       android:pathData="M19,19H5V5h7V3H5c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2v-7h-2v7zM14,3v2h3.59l-9.83,9.83 1.41,1.41L19,6.41V10h2V3h-7z"/>
diff --git a/Material Theme Builder/app/src/main/res/drawable/ic_place_on_surface_24dp.xml b/Material Theme Builder/app/src/main/res/drawable/ic_place_on_surface_24dp.xml
@@ -19,7 +19,7 @@
   android:height="24dp"
   android:viewportWidth="24.0"
   android:viewportHeight="24.0"
-  android:tint="?colorOnSurface">
+  android:tint="?attr/colorOnSurface">
     <path
       android:fillColor="#FF000000"
       android:pathData="M12,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13c0,-3.87 -3.13,-7 -7,-7zM12,11.5c-1.38,0 -2.5,-1.12 -2.5,-2.5s1.12,-2.5 2.5,-2.5 2.5,1.12 2.5,2.5 -1.12,2.5 -2.5,2.5z"/>
diff --git a/Material Theme Builder/app/src/main/res/drawable/ic_rounded_corner_24dp.xml b/Material Theme Builder/app/src/main/res/drawable/ic_rounded_corner_24dp.xml
@@ -19,7 +19,7 @@
   android:height="24dp"
   android:viewportWidth="24.0"
   android:viewportHeight="24.0"
-  android:tint="?colorOnBackground">
+  android:tint="?attr/colorOnBackground">
     <path
       android:fillColor="#FF000000"
       android:pathData="M19,19h2v2h-2v-2zM19,17h2v-2h-2v2zM3,13h2v-2L3,11v2zM3,17h2v-2L3,15v2zM3,9h2L5,7L3,7v2zM3,5h2L5,3L3,3v2zM7,5h2L9,3L7,3v2zM15,21h2v-2h-2v2zM11,21h2v-2h-2v2zM15,21h2v-2h-2v2zM7,21h2v-2L7,19v2zM3,21h2v-2L3,19v2zM21,8c0,-2.76 -2.24,-5 -5,-5h-5v2h5c1.65,0 3,1.35 3,3v5h2L21,8z"/>
diff --git a/Material Theme Builder/app/src/main/res/drawable/ic_search_control_normal_24dp.xml b/Material Theme Builder/app/src/main/res/drawable/ic_search_control_normal_24dp.xml
@@ -19,7 +19,7 @@
   android:height="24dp"
   android:viewportWidth="24.0"
   android:viewportHeight="24.0"
-  android:tint="?colorControlNormal">
+  android:tint="?attr/colorControlNormal">
     <path
       android:fillColor="#FF000000"
       android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
diff --git a/Material Theme Builder/app/src/main/res/drawable/ic_search_on_surface_24dp.xml b/Material Theme Builder/app/src/main/res/drawable/ic_search_on_surface_24dp.xml
@@ -19,7 +19,7 @@
   android:height="24dp"
   android:viewportWidth="24.0"
   android:viewportHeight="24.0"
-  android:tint="?colorOnSurface">
+  android:tint="?attr/colorOnSurface">
     <path
       android:fillColor="#FF000000"
       android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
diff --git a/Material Theme Builder/app/src/main/res/drawable/ic_send_24dp.xml b/Material Theme Builder/app/src/main/res/drawable/ic_send_24dp.xml
@@ -19,7 +19,7 @@
   android:height="24dp"
   android:viewportWidth="24.0"
   android:viewportHeight="24.0"
-  android:tint="?colorOnBackground">
+  android:tint="?attr/colorOnBackground">
     <path
       android:fillColor="#FF000000"
       android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z"/>
diff --git a/Material Theme Builder/app/src/main/res/drawable/ic_share_control_normal_24dp.xml b/Material Theme Builder/app/src/main/res/drawable/ic_share_control_normal_24dp.xml
@@ -19,7 +19,7 @@
   android:height="24dp"
   android:viewportWidth="24.0"
   android:viewportHeight="24.0"
-  android:tint="?colorControlNormal">
+  android:tint="?attr/colorControlNormal">
     <path
       android:fillColor="#FF000000"
       android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
diff --git a/Material Theme Builder/app/src/main/res/drawable/ic_share_on_surface_24dp.xml b/Material Theme Builder/app/src/main/res/drawable/ic_share_on_surface_24dp.xml
@@ -19,7 +19,7 @@
   android:height="24dp"
   android:viewportWidth="24.0"
   android:viewportHeight="24.0"
-  android:tint="?colorOnSurface">
+  android:tint="?attr/colorOnSurface">
     <path
       android:fillColor="#FF000000"
       android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
diff --git a/Material Theme Builder/app/src/main/res/drawable/ic_star_24dp.xml b/Material Theme Builder/app/src/main/res/drawable/ic_star_24dp.xml
@@ -19,7 +19,7 @@
   android:height="24dp"
   android:viewportWidth="24.0"
   android:viewportHeight="24.0"
-  android:tint="?colorOnBackground">
+  android:tint="?attr/colorOnBackground">
     <path
       android:fillColor="#FF000000"
       android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"/>
diff --git a/Material Theme Builder/app/src/main/res/layout/activity_main.xml b/Material Theme Builder/app/src/main/res/layout/activity_main.xml
@@ -17,10 +17,10 @@
 
 <androidx.coordinatorlayout.widget.CoordinatorLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_height="match_parent"
-  android:layout_width="match_parent"
   xmlns:app="http://schemas.android.com/apk/res-auto"
-  xmlns:tools="http://schemas.android.com/tools">
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_height="match_parent"
+  android:layout_width="match_parent">
 
     <androidx.viewpager.widget.ViewPager
       android:id="@+id/view_pager"
diff --git a/Material Theme Builder/app/src/main/res/layout/color_attribute_view_layout.xml b/Material Theme Builder/app/src/main/res/layout/color_attribute_view_layout.xml
@@ -23,7 +23,7 @@
       android:layout_height="wrap_content"
       android:layout_gravity="start|center_vertical"
       android:layout_marginEnd="26dp"
-      android:textAppearance="?textAppearanceBody1"
+      android:textAppearance="?attr/textAppearanceBody1"
       android:textColor="@color/material_on_background_emphasis_medium"
       android:text="\?colorPrimary" />
 
diff --git a/Material Theme Builder/app/src/main/res/layout/component_bottom_app_bar.xml b/Material Theme Builder/app/src/main/res/layout/component_bottom_app_bar.xml
@@ -46,7 +46,7 @@
         <com.google.android.material.bottomappbar.BottomAppBar
           android:id="@+id/bottom_app_bar"
           android:layout_width="match_parent"
-          android:layout_height="?actionBarSize"
+          android:layout_height="?attr/actionBarSize"
           android:layout_gravity="bottom"
           app:fabAlignmentMode="center"
           app:menu="@menu/bottom_app_bar_menu"
diff --git a/Material Theme Builder/app/src/main/res/layout/component_buttons.xml b/Material Theme Builder/app/src/main/res/layout/component_buttons.xml
@@ -83,21 +83,21 @@
       app:layout_constraintStart_toStartOf="parent">
 
         <Button
-          style="?materialButtonOutlinedStyle"
+          style="?attr/materialButtonOutlinedStyle"
           android:id="@+id/button_one"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:text="@string/button_left_button_label" />
 
         <Button
-          style="?materialButtonOutlinedStyle"
+          style="?attr/materialButtonOutlinedStyle"
           android:id="@+id/button_center"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:text="@string/button_center_button_label" />
 
         <Button
-          style="?materialButtonOutlinedStyle"
+          style="?attr/materialButtonOutlinedStyle"
           android:id="@+id/button_three"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
diff --git a/Material Theme Builder/app/src/main/res/layout/component_cards.xml b/Material Theme Builder/app/src/main/res/layout/component_cards.xml
@@ -53,7 +53,7 @@
               android:layout_height="192dp"
               android:scaleType="centerCrop"
               app:srcCompat="@drawable/sample_image"
-              app:tint="?colorSurface"
+              app:tint="?attr/colorSurface"
               app:tintMode="multiply"
               app:layout_constraintTop_toTopOf="parent"
               app:layout_constraintStart_toStartOf="parent"
@@ -64,7 +64,7 @@
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
               android:text="@string/text_overline"
-              android:textAppearance="?textAppearanceOverline"
+              android:textAppearance="?attr/textAppearanceOverline"
               android:textColor="@color/material_on_surface_emphasis_medium"
               android:layout_marginTop="@dimen/keyline_4"
               android:layout_marginStart="@dimen/keyline_4"
@@ -76,7 +76,7 @@
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
               android:text="@string/text_headline_6"
-              android:textAppearance="?textAppearanceHeadline6"
+              android:textAppearance="?attr/textAppearanceHeadline6"
               android:textColor="@color/material_on_surface_emphasis_high_type"
               android:layout_marginLeft="@dimen/keyline_4"
               android:firstBaselineToTopHeight="40dp"
@@ -91,7 +91,7 @@
               android:layout_marginEnd="@dimen/keyline_5"
               android:firstBaselineToTopHeight="@dimen/keyline_5"
               android:text="@string/lorem_ipsum"
-              android:textAppearance="?textAppearanceBody2"
+              android:textAppearance="?attr/textAppearanceBody2"
               android:textColor="@color/material_on_surface_emphasis_medium"
               app:layout_constraintEnd_toEndOf="parent"
               app:layout_constraintStart_toStartOf="parent"
diff --git a/Material Theme Builder/app/src/main/res/layout/component_chips.xml b/Material Theme Builder/app/src/main/res/layout/component_chips.xml
@@ -51,23 +51,23 @@
           android:text="@string/chip_action_title" />
 
         <com.google.android.material.chip.Chip
-          android:id="@+id/chip_filter"
           style="@style/Widget.MaterialComponents.Chip.Filter"
+          android:id="@+id/chip_filter"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:checked="true"
           android:text="@string/chip_filter_title" />
 
         <com.google.android.material.chip.Chip
-          android:id="@+id/chip_choice"
           style="@style/Widget.MaterialComponents.Chip.Choice"
+          android:id="@+id/chip_choice"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:text="@string/chip_choice_title" />
 
         <com.google.android.material.chip.Chip
-          android:id="@+id/chip_entry"
           style="@style/Widget.MaterialComponents.Chip.Entry"
+          android:id="@+id/chip_entry"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:text="@string/chip_entry_title" />
diff --git a/Material Theme Builder/app/src/main/res/layout/component_drawer.xml b/Material Theme Builder/app/src/main/res/layout/component_drawer.xml
@@ -40,14 +40,14 @@
       android:layout_width="400dp"
       android:layout_height="324dp"
       android:layout_marginTop="@dimen/keyline_4"
-      android:background="?colorControlHighlight"
+      android:background="?attr/colorControlHighlight"
       tools:openDrawer="left"
       app:layout_constraintTop_toBottomOf="@+id/label"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintEnd_toEndOf="parent">
 
         <com.google.android.material.navigation.NavigationView
-          style="?navigationViewStyle"
+          style="?attr/navigationViewStyle"
           android:id="@+id/nav_view"
           android:layout_width="wrap_content"
           android:layout_height="match_parent"
diff --git a/Material Theme Builder/app/src/main/res/layout/component_text_field.xml b/Material Theme Builder/app/src/main/res/layout/component_text_field.xml
@@ -53,7 +53,7 @@
     </com.google.android.material.textfield.TextInputLayout>
 
     <com.google.android.material.textfield.TextInputLayout
-      style="?textInputStyle"
+      style="?attr/textInputStyle"
       android:id="@+id/text_input_layout_filled"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
diff --git a/Material Theme Builder/app/src/main/res/layout/component_top_app_bar.xml b/Material Theme Builder/app/src/main/res/layout/component_top_app_bar.xml
@@ -35,7 +35,7 @@
       app:layout_constraintTop_toTopOf="parent" />
 
     <com.google.android.material.appbar.MaterialToolbar
-      style="?toolbarStyle"
+      style="?attr/toolbarStyle"
       android:id="@+id/toolbar"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
diff --git a/Material Theme Builder/app/src/main/res/layout/drawer_header_layout.xml b/Material Theme Builder/app/src/main/res/layout/drawer_header_layout.xml
@@ -28,7 +28,7 @@
       android:text="@string/text_headline_6"
       android:layout_marginTop="@dimen/keyline_2"
       android:layout_marginBottom="@dimen/keyline_1"
-      android:textAppearance="?textAppearanceHeadline6"
+      android:textAppearance="?attr/textAppearanceHeadline6"
       android:textColor="@color/material_on_surface_emphasis_high_type"/>
 
     <TextView
@@ -38,7 +38,7 @@
       android:layout_marginTop="@dimen/keyline_1"
       android:layout_marginBottom="@dimen/keyline_2"
       android:text="@string/text_body_2"
-      android:textAppearance="?textAppearanceBody2"
+      android:textAppearance="?attr/textAppearanceBody2"
       android:textColor="@color/material_on_surface_emphasis_medium"/>
 
 </LinearLayout>
diff --git a/Material Theme Builder/app/src/main/res/layout/fragment_bottom_sheet.xml b/Material Theme Builder/app/src/main/res/layout/fragment_bottom_sheet.xml
@@ -28,15 +28,15 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:gravity="center_vertical"
-      android:textAppearance="?textAppearanceHeadline6"
+      android:textAppearance="?attr/textAppearanceHeadline6"
       android:textColor="@color/material_on_surface_emphasis_high_type"
       android:firstBaselineToTopHeight="40dp"
       android:text="@string/text_headline_6" />
 
     <TextView
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:textAppearance="?textAppearanceBody1"
+      android:textAppearance="?attr/textAppearanceBody1"
       android:textColor="@color/material_on_surface_emphasis_medium"
       android:firstBaselineToTopHeight="36dp"
       android:text="@string/lorem_ipsum" />
diff --git a/Material Theme Builder/app/src/main/res/layout/fragment_instructions.xml b/Material Theme Builder/app/src/main/res/layout/fragment_instructions.xml
diff --git a/Material Theme Builder/app/src/main/res/layout/label_view_layout.xml b/Material Theme Builder/app/src/main/res/layout/label_view_layout.xml
diff --git a/Material Theme Builder/app/src/main/res/layout/shape_attribute_view_layout.xml b/Material Theme Builder/app/src/main/res/layout/shape_attribute_view_layout.xml
diff --git a/Material Theme Builder/app/src/main/res/layout/subsystem_color.xml b/Material Theme Builder/app/src/main/res/layout/subsystem_color.xml
diff --git a/Material Theme Builder/app/src/main/res/layout/subsystem_shape.xml b/Material Theme Builder/app/src/main/res/layout/subsystem_shape.xml
diff --git a/Material Theme Builder/app/src/main/res/layout/subsystem_type.xml b/Material Theme Builder/app/src/main/res/layout/subsystem_type.xml
diff --git a/Material Theme Builder/app/src/main/res/layout/type_attribute_view_layout.xml b/Material Theme Builder/app/src/main/res/layout/type_attribute_view_layout.xml
diff --git a/Material Theme Builder/app/src/main/res/values/styles.xml b/Material Theme Builder/app/src/main/res/values/styles.xml
