From 85cc80c3224c7dc67747a494b9abafc254fbc5de Mon Sep 17 00:00:00 2001
From: Santosh Pingle <spingle@google.com>
Date: Wed, 27 Sep 2023 12:45:40 +0530
Subject: [PATCH 1/5] Update material3 theme.

---
 demo/src/main/AndroidManifest.xml          |  1 -
 demo/src/main/res/layout/activity_main.xml |  3 +-
 demo/src/main/res/values/colors.xml        | 90 +++++++++++++++++++++-
 demo/src/main/res/values/styles.xml        | 68 +++++++++++-----
 4 files changed, 139 insertions(+), 23 deletions(-)

diff --git a/demo/src/main/AndroidManifest.xml b/demo/src/main/AndroidManifest.xml
index 72154d82af..904124c520 100644
--- a/demo/src/main/AndroidManifest.xml
+++ b/demo/src/main/AndroidManifest.xml
@@ -29,7 +29,6 @@
         <activity
             android:name="com.google.android.fhir.demo.MainActivity"
             android:label="@string/app_name"
-            android:theme="@style/AppTheme.NoActionBar"
             android:windowSoftInputMode="adjustResize"
             android:exported="true"
         >
diff --git a/demo/src/main/res/layout/activity_main.xml b/demo/src/main/res/layout/activity_main.xml
index 248eb19710..f5633103f7 100644
--- a/demo/src/main/res/layout/activity_main.xml
+++ b/demo/src/main/res/layout/activity_main.xml
@@ -37,14 +37,13 @@
             android:id="@+id/app_bar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:theme="@style/AppTheme.AppBarOverlay"
         >
 
         <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
-                app:popupTheme="@style/AppTheme.PopupOverlay"
+                android:background="?attr/colorOnPrimary"
             />
 
     </com.google.android.material.appbar.AppBarLayout>
diff --git a/demo/src/main/res/values/colors.xml b/demo/src/main/res/values/colors.xml
index c9ffbf7cbe..fad8b2fb17 100644
--- a/demo/src/main/res/values/colors.xml
+++ b/demo/src/main/res/values/colors.xml
@@ -28,6 +28,94 @@
     <color name="unknown_risk_background">#10156125</color>
     <color name="unknown_risk">#ffffff</color>
     <color name="syncing_background">#E8F0FE</color>
-    <color name="white">#FFFFFFFF</color>
     <color name="disable_state">#9AFFFFFF</color>
+
+
+    <color name="purple_200">#FFBB86FC</color>
+    <color name="purple_500">#FF6200EE</color>
+    <color name="purple_700">#FF3700B3</color>
+    <color name="teal_200">#FF03DAC5</color>
+    <color name="teal_700">#FF018786</color>
+    <color name="black">#FF000000</color>
+    <color name="white">#FFFFFFFF</color>
+    <color name="grey_50">#F8F9FA</color>
+    <color name="grey_100">#F1F3F4</color>
+    <color name="grey_200">#E8EAED</color>
+    <color name="grey_300">#F1F3F4</color>
+    <color name="grey_800">#3C4043</color>
+    <color name="grey_700">#5F6368</color>
+    <color name="grey_900">#202124</color>
+    <color name="blue_800">#1A73E8</color>
+    <color name="blue_700">#1967D2</color>
+    <color name="blue_600">#1A73E8</color>
+    <color name="blue_300">#8AB4F8</color>
+    <color name="blue_300_38">#618AB4F8</color>
+    <color name="blue_100">#D2E3FC</color>
+    <color name="blue_50">#E8F0FE</color>
+    <color name="red_600">#D93025</color>
+    <color name="red_300">#F28B82</color>
+    <color name="toolbar_text_color">#5F6368</color>
+    <color name="line_24">#DADCE0</color>
+
+    <color name="primary_blue_40">#0B57D0</color>
+    <color name="onPrimary_blue_100">#FFFFFF</color>
+    <color name="primaryContainer_blue_90">#D3E3FD</color>
+    <color name="onPrimaryContainer_blue_10">#041E49</color>
+
+    <color name="secondary_blue_40">#00639B</color>
+    <color name="onSecondary_blue_100">#FFFFFF</color>
+    <color name="secondaryContainer_blue_90">#C2E7FF</color>
+    <color name="onSecondaryContainer_blue_10">#001D35</color>
+
+    <color name="tertiary_green_40">#146C2E</color>
+    <color name="onTertiary_green_100">#FFFFFF</color>
+    <color name="tertiaryContainer_green_90">#C4EED0</color>
+    <color name="onTertiaryContainer_green_10">#072711</color>
+
+    <color name="error_red_40">#B3261E</color>
+    <color name="errorContainer_red_100">#FFFFFF</color>
+    <color name="onError_red_90">#F9DEDC</color>
+    <color name="onErrorContainer_red_10">#410E0B</color>
+
+    <color name="background_neutral_100">#FFFFFF</color>
+    <color name="onBackground_neutral_10">#1F1F1F</color>
+
+    <color name="surface_neutral_100">#FFFFFF</color>
+    <color name="onSurface_neutral_10">#1F1F1F</color>
+
+    <color name="surfaceVariant_neutral_variant_90">#E1E3E1</color>
+    <color name="onSurfaceVariant_neutral_variant_30">#444746</color>
+
+    <color name="outline_neutral_variant_50">#747775</color>
+
+    <color name="primary_blue_80">#A8C7FA</color>
+    <color name="onPrimary_blue_20">#062E6F</color>
+    <color name="primaryContainer_blue_30">#0842A0</color>
+    <color name="onPrimaryContainer_blue_90">#D3E3FD</color>
+
+    <color name="secondary_blue_80">#7FCFFF</color>
+    <color name="onSecondary_blue_20">#003355</color>
+    <color name="secondaryContainer_blue_30">#004A77</color>
+    <color name="onSecondaryContainer_blue_90">#C2E7FF</color>
+
+    <color name="tertiary_green_80">#146C2E</color>
+    <color name="onTertiary_green_20">#0A3818</color>
+    <color name="tertiaryContainer_green_30">#0F5223</color>
+    <color name="onTertiaryContainer_green_90">#C4EED0</color>
+
+    <color name="error_red_80">#F2B8B5</color>
+    <color name="errorContainer_red_20">#601410</color>
+    <color name="onError_red_30">#8C1D18</color>
+    <color name="onErrorContainer_red_90">#F9DEDC</color>
+
+    <color name="background_neutral_10">#1F1F1F</color>
+    <color name="onBackground_neutral_90">#E3E3E3</color>
+
+    <color name="surface_neutral_10">#1F1F1F</color>
+    <color name="onSurface_neutral_90">#E3E3E3</color>
+
+    <color name="surfaceVariant_neutral_variant_30">#444746</color>
+    <color name="onSurfaceVariant_neutral_variant_80">#C4C7C5</color>
+
+    <color name="outline_neutral_variant_60">#8E918F</color>
 </resources>
diff --git a/demo/src/main/res/values/styles.xml b/demo/src/main/res/values/styles.xml
index 90c77bed96..dcc7451ccb 100644
--- a/demo/src/main/res/values/styles.xml
+++ b/demo/src/main/res/values/styles.xml
@@ -13,29 +13,59 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.MaterialComponents.DayNight">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-        <item name="android:statusBarColor">@color/colorStatusBar</item>
-        <item name="enabledMenuIconColor">@color/white</item>
-        <item name="disabledMenuIconColor">@color/disable_state</item>
-    </style>
+    <style name="AppTheme" parent="Theme.Material3.DayNight.NoActionBar">
+        <item name="colorPrimary">@color/primary_blue_40</item>
+        <item name="colorOnPrimary">@color/onPrimary_blue_100</item>
+        <item
+            name="colorPrimaryContainer"
+        >@color/primaryContainer_blue_90</item>
+        <item
+            name="colorOnPrimaryContainer"
+        >@color/onPrimaryContainer_blue_10</item>
 
-    <style name="AppTheme.NoActionBar">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-    </style>
+        <item name="colorSecondary">@color/secondary_blue_40</item>
+        <item name="colorOnSecondary">@color/onSecondary_blue_100</item>
+        <item
+            name="colorSecondaryContainer"
+        >@color/secondaryContainer_blue_90</item>
+        <item
+            name="colorOnSecondaryContainer"
+        >@color/onSecondaryContainer_blue_10</item>
+
+        <item name="colorTertiary">@color/tertiary_green_40</item>
+        <item name="colorOnTertiary">@color/onTertiary_green_100</item>
+        <item
+            name="colorTertiaryContainer"
+        >@color/tertiaryContainer_green_90</item>
+        <item
+            name="colorOnTertiaryContainer"
+        >@color/onTertiaryContainer_green_10</item>
+
+        <item name="colorError">@color/error_red_40</item>
+        <item name="colorErrorContainer">@color/errorContainer_red_100</item>
+        <item name="colorOnError">@color/onError_red_90</item>
+        <item name="colorOnErrorContainer">@color/onErrorContainer_red_10</item>
 
-    <style
-        name="AppTheme.AppBarOverlay"
-        parent="ThemeOverlay.AppCompat.Dark.ActionBar"
-    />
+        <item
+            name="android:colorBackground"
+        >@color/background_neutral_100</item>
+        <item name="colorOnBackground">@color/onBackground_neutral_10</item>
 
-    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
+        <item name="colorSurface">@color/surface_neutral_100</item>
+        <item name="colorOnSurface">@color/onSurface_neutral_10</item>
+
+        <item
+            name="colorSurfaceVariant"
+        >@color/surfaceVariant_neutral_variant_90</item>
+        <item
+            name="colorOnSurfaceVariant"
+        >@color/onSurfaceVariant_neutral_variant_30</item>
+
+        <item name="colorOutline">@color/outline_neutral_variant_50</item>
+
+    </style>
 
     <style name="AppCard" parent="Widget.MaterialComponents.CardView">
         <item name="cardElevation">8dp</item>

From 52dd9600f756fa64f9643542d063dba4de719a1e Mon Sep 17 00:00:00 2001
From: Santosh Pingle <spingle@google.com>
Date: Wed, 27 Sep 2023 13:34:20 +0530
Subject: [PATCH 2/5] Support m3 night mode.

---
 demo/src/main/res/values-night/themes.xml | 64 +++++++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 demo/src/main/res/values-night/themes.xml

diff --git a/demo/src/main/res/values-night/themes.xml b/demo/src/main/res/values-night/themes.xml
new file mode 100644
index 0000000000..45f017c6bb
--- /dev/null
+++ b/demo/src/main/res/values-night/themes.xml
@@ -0,0 +1,64 @@
+<!--
+ Copyright 2020 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Base application theme. -->
+  <style name="AppTheme" parent="Theme.Material3.DayNight.NoActionBar">
+      <item name="colorPrimary">@color/primary_blue_80</item>
+      <item name="colorOnPrimary">@color/onPrimary_blue_20</item>
+      <item name="colorPrimaryContainer">@color/primaryContainer_blue_30</item>
+      <item
+            name="colorOnPrimaryContainer"
+        >@color/onPrimaryContainer_blue_90</item>
+
+      <item name="colorSecondary">@color/secondary_blue_80</item>
+      <item name="colorOnSecondary">@color/onSecondary_blue_20</item>
+      <item
+            name="colorSecondaryContainer"
+        >@color/secondaryContainer_blue_30</item>
+      <item
+            name="colorOnSecondaryContainer"
+        >@color/onSecondaryContainer_blue_90</item>
+
+      <item name="colorTertiary">@color/tertiary_green_80</item>
+      <item name="colorOnTertiary">@color/onTertiary_green_20</item>
+      <item
+            name="colorTertiaryContainer"
+        >@color/tertiaryContainer_green_30</item>
+      <item
+            name="colorOnTertiaryContainer"
+        >@color/onTertiaryContainer_green_90</item>
+
+      <item name="colorError">@color/error_red_80</item>
+      <item name="colorErrorContainer">@color/errorContainer_red_20</item>
+      <item name="colorOnError">@color/onError_red_30</item>
+      <item name="colorOnErrorContainer">@color/onErrorContainer_red_90</item>
+
+      <item name="android:colorBackground">@color/background_neutral_10</item>
+      <item name="colorOnBackground">@color/onBackground_neutral_90</item>
+
+      <item name="colorSurface">@color/surface_neutral_10</item>
+      <item name="colorOnSurface">@color/onSurface_neutral_90</item>
+
+      <item
+            name="colorSurfaceVariant"
+        >@color/surfaceVariant_neutral_variant_30</item>
+      <item
+            name="colorOnSurfaceVariant"
+        >@color/onSurfaceVariant_neutral_variant_80</item>
+
+      <item name="colorOutline">@color/outline_neutral_variant_60</item>
+    </style>
+</resources>

From 1f807ad98ac10d43c48ab7aeeb0266ca02498e40 Mon Sep 17 00:00:00 2001
From: Santosh Pingle <spingle@google.com>
Date: Wed, 27 Sep 2023 17:55:37 +0530
Subject: [PATCH 3/5] Address review comments.

---
 demo/src/main/res/layout/activity_main.xml                | 2 +-
 demo/src/main/res/values-night/{themes.xml => styles.xml} | 0
 demo/src/main/res/values/colors.xml                       | 3 ---
 3 files changed, 1 insertion(+), 4 deletions(-)
 rename demo/src/main/res/values-night/{themes.xml => styles.xml} (100%)

diff --git a/demo/src/main/res/layout/activity_main.xml b/demo/src/main/res/layout/activity_main.xml
index f5633103f7..f665c02b55 100644
--- a/demo/src/main/res/layout/activity_main.xml
+++ b/demo/src/main/res/layout/activity_main.xml
@@ -43,7 +43,7 @@
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
-                android:background="?attr/colorOnPrimary"
+                android:background="?attr/colorSurface"
             />
 
     </com.google.android.material.appbar.AppBarLayout>
diff --git a/demo/src/main/res/values-night/themes.xml b/demo/src/main/res/values-night/styles.xml
similarity index 100%
rename from demo/src/main/res/values-night/themes.xml
rename to demo/src/main/res/values-night/styles.xml
diff --git a/demo/src/main/res/values/colors.xml b/demo/src/main/res/values/colors.xml
index fad8b2fb17..d3e76d49f2 100644
--- a/demo/src/main/res/values/colors.xml
+++ b/demo/src/main/res/values/colors.xml
@@ -15,10 +15,7 @@
  limitations under the License.
 -->
 <resources>
-    <color name="colorPrimary">#175adf</color>
-    <color name="colorPrimaryDark">#3700B3</color>
     <color name="colorAccent">#175adf</color>
-    <color name="colorStatusBar">#175adf</color>
     <color name="low_risk">#388e3c</color>
     <color name="low_risk_background">#e8f5e9</color>
     <color name="moderate_risk">#FFBF00</color>

From aa7081d5c6657b9e67e8a20b329aa221e8d19f8b Mon Sep 17 00:00:00 2001
From: Santosh Pingle <spingle@google.com>
Date: Thu, 28 Sep 2023 16:52:03 +0530
Subject: [PATCH 4/5] Address review comments.

---
 .../main/res/layout/fragment_patient_list.xml |  2 --
 demo/src/main/res/values/colors.xml           | 28 -------------------
 2 files changed, 30 deletions(-)

diff --git a/demo/src/main/res/layout/fragment_patient_list.xml b/demo/src/main/res/layout/fragment_patient_list.xml
index be68c4514a..12fe261bda 100644
--- a/demo/src/main/res/layout/fragment_patient_list.xml
+++ b/demo/src/main/res/layout/fragment_patient_list.xml
@@ -41,8 +41,6 @@
         android:layout_marginEnd="12dp"
         android:layout_marginBottom="12dp"
         android:clickable="true"
-        android:foregroundTint="#ffffff"
-        app:backgroundTint="@color/colorAccent"
         app:srcCompat="@drawable/ic_baseline_add_24"
     />
 
diff --git a/demo/src/main/res/values/colors.xml b/demo/src/main/res/values/colors.xml
index d3e76d49f2..236ba54d2b 100644
--- a/demo/src/main/res/values/colors.xml
+++ b/demo/src/main/res/values/colors.xml
@@ -15,7 +15,6 @@
  limitations under the License.
 -->
 <resources>
-    <color name="colorAccent">#175adf</color>
     <color name="low_risk">#388e3c</color>
     <color name="low_risk_background">#e8f5e9</color>
     <color name="moderate_risk">#FFBF00</color>
@@ -27,33 +26,6 @@
     <color name="syncing_background">#E8F0FE</color>
     <color name="disable_state">#9AFFFFFF</color>
 
-
-    <color name="purple_200">#FFBB86FC</color>
-    <color name="purple_500">#FF6200EE</color>
-    <color name="purple_700">#FF3700B3</color>
-    <color name="teal_200">#FF03DAC5</color>
-    <color name="teal_700">#FF018786</color>
-    <color name="black">#FF000000</color>
-    <color name="white">#FFFFFFFF</color>
-    <color name="grey_50">#F8F9FA</color>
-    <color name="grey_100">#F1F3F4</color>
-    <color name="grey_200">#E8EAED</color>
-    <color name="grey_300">#F1F3F4</color>
-    <color name="grey_800">#3C4043</color>
-    <color name="grey_700">#5F6368</color>
-    <color name="grey_900">#202124</color>
-    <color name="blue_800">#1A73E8</color>
-    <color name="blue_700">#1967D2</color>
-    <color name="blue_600">#1A73E8</color>
-    <color name="blue_300">#8AB4F8</color>
-    <color name="blue_300_38">#618AB4F8</color>
-    <color name="blue_100">#D2E3FC</color>
-    <color name="blue_50">#E8F0FE</color>
-    <color name="red_600">#D93025</color>
-    <color name="red_300">#F28B82</color>
-    <color name="toolbar_text_color">#5F6368</color>
-    <color name="line_24">#DADCE0</color>
-
     <color name="primary_blue_40">#0B57D0</color>
     <color name="onPrimary_blue_100">#FFFFFF</color>
     <color name="primaryContainer_blue_90">#D3E3FD</color>

From a3fe332de6b38a3d8996fd4d67d11a5d61b5d104 Mon Sep 17 00:00:00 2001
From: Santosh Pingle <spingle@google.com>
Date: Fri, 29 Sep 2023 12:03:56 +0530
Subject: [PATCH 5/5] Update m3 typography.

---
 demo/src/main/res/values/styles.xml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/demo/src/main/res/values/styles.xml b/demo/src/main/res/values/styles.xml
index dcc7451ccb..3096ca4f64 100644
--- a/demo/src/main/res/values/styles.xml
+++ b/demo/src/main/res/values/styles.xml
@@ -67,7 +67,7 @@
 
     </style>
 
-    <style name="AppCard" parent="Widget.MaterialComponents.CardView">
+    <style name="AppCard" parent="Widget.Material3.CardView.Outlined">
         <item name="cardElevation">8dp</item>
     </style>
 
@@ -79,16 +79,21 @@
     </style>
 
     <style name="AppTheme.PatientDetails.headline">
-        <item name="android:textAppearance">?attr/textAppearanceHeadline6</item>
-        <item name="android:textSize">24sp</item>
+        <item
+            name="android:textAppearance"
+        >?attr/textAppearanceHeadlineSmall</item>
         <item name="android:textStyle">normal</item>
     </style>
 
     <style name="AppTheme.PatientDetails.Subtitle2">
-        <item name="android:textAppearance">?attr/textAppearanceSubtitle2</item>
+        <item
+            name="android:textAppearance"
+        >?attr/textAppearanceTitleSmall</item>
     </style>
 
     <style name="AppTheme.PatientDetails.body2">
-        <item name="android:textAppearance">?attr/textAppearanceBody2</item>
+        <item
+            name="android:textAppearance"
+        >?attr/textAppearanceBodyMedium</item>
     </style>
 </resources>