From fecd0c3bb3f34585d1d243c7ccb60b332c294e48 Mon Sep 17 00:00:00 2001
From: inotia00 <ars258000@gmail.com>
Date: Fri, 23 Dec 2022 16:36:34 +0900
Subject: [PATCH] apply DynamicColors

---
 play-services-core/src/main/AndroidManifest.xml    |  6 +++---
 .../java/org/microg/gms/ui/SettingsActivity.java   |  6 +++++-
 .../src/main/res/drawable/ic_add_account.xml       |  6 +++---
 .../res/drawable/ic_baseline_hide_source_24.xml    |  6 +++---
 .../src/main/res/drawable/ic_cloud_bell.xml        |  6 +++---
 .../src/main/res/drawable/ic_device_login.xml      |  6 +++---
 .../src/main/res/drawable/ic_info_outline.xml      |  6 +++---
 .../src/main/res/layout/login_assistant.xml        |  8 ++++----
 .../src/main/res/layout/preference_switch_bar.xml  | 13 ++++++-------
 .../src/main/res/values-night-v31/themes.xml       | 14 ++++++++++++++
 .../src/main/res/values-night/themes.xml           |  8 ++++++++
 .../src/main/res/values-v31/themes.xml             | 13 +++++++++++++
 play-services-core/src/main/res/values/colors.xml  |  3 ++-
 play-services-core/src/main/res/values/themes.xml  |  9 +++++++--
 14 files changed, 77 insertions(+), 33 deletions(-)
 create mode 100644 play-services-core/src/main/res/values-night-v31/themes.xml
 create mode 100644 play-services-core/src/main/res/values-night/themes.xml
 create mode 100644 play-services-core/src/main/res/values-v31/themes.xml

diff --git a/play-services-core/src/main/AndroidManifest.xml b/play-services-core/src/main/AndroidManifest.xml
index 3c2a8313..e7f2c50e 100644
--- a/play-services-core/src/main/AndroidManifest.xml
+++ b/play-services-core/src/main/AndroidManifest.xml
@@ -87,7 +87,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:multiArch="true"
-        android:theme="@style/Theme.AppCompat.DayNight"
+        android:theme="@style/AppTheme"
         android:networkSecurityConfig="@xml/network_security_config">
 
         <library android:name="com.mgoogle.android.gms" />
@@ -309,7 +309,7 @@
             android:process=":ui"
             android:roundIcon="@mipmap/ic_launcher"
             android:taskAffinity="org.microg.gms.settings"
-            android:theme="@style/Theme.AppCompat.DayNight">
+            android:theme="@style/AppTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -339,7 +339,7 @@
             android:process=":ui"
             android:targetActivity="org.microg.gms.ui.SettingsActivity"
             android:taskAffinity="org.microg.gms.settings"
-            android:theme="@style/Theme.AppCompat.DayNight">
+            android:theme="@style/AppTheme">
             <intent-filter>
                 <action android:name="com.android.settings.action.EXTRA_SETTINGS" />
             </intent-filter>
diff --git a/play-services-core/src/main/java/org/microg/gms/ui/SettingsActivity.java b/play-services-core/src/main/java/org/microg/gms/ui/SettingsActivity.java
index 814eac6e..c60833ec 100755
--- a/play-services-core/src/main/java/org/microg/gms/ui/SettingsActivity.java
+++ b/play-services-core/src/main/java/org/microg/gms/ui/SettingsActivity.java
@@ -1,5 +1,6 @@
 package org.microg.gms.ui;
 
+import android.os.Build;
 import android.os.Bundle;
 
 import androidx.annotation.Nullable;
@@ -9,6 +10,7 @@ import androidx.navigation.fragment.NavHostFragment;
 import androidx.navigation.ui.AppBarConfiguration;
 import androidx.navigation.ui.NavigationUI;
 
+import com.google.android.material.color.DynamicColors;
 import com.mgoogle.android.gms.R;
 
 public class SettingsActivity extends AppCompatActivity {
@@ -22,7 +24,9 @@ public class SettingsActivity extends AppCompatActivity {
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.settings_root_activity);
-
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            DynamicColors.applyToActivityIfAvailable(this);
+        }
         appBarConfiguration = new AppBarConfiguration.Builder(getNavController().getGraph()).build();
         NavigationUI.setupActionBarWithNavController(this, getNavController(), appBarConfiguration);
     }
diff --git a/play-services-core/src/main/res/drawable/ic_add_account.xml b/play-services-core/src/main/res/drawable/ic_add_account.xml
index d3f70563..d8725732 100644
--- a/play-services-core/src/main/res/drawable/ic_add_account.xml
+++ b/play-services-core/src/main/res/drawable/ic_add_account.xml
@@ -2,9 +2,9 @@
     android:width="24dp"
     android:height="24dp"
     android:tint="?attr/colorAccent"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportWidth="48"
+    android:viewportHeight="48">
     <path
         android:fillColor="#000000"
-        android:pathData="M15,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM6,10L6,7L4,7v3L1,10v2h3v3h2v-3h3v-2L6,10zM15,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z" />
+        android:pathData="M38,28Q37.35,28 36.925,27.575Q36.5,27.15 36.5,26.5V21.5H31.5Q30.85,21.5 30.425,21.075Q30,20.65 30,20Q30,19.35 30.425,18.925Q30.85,18.5 31.5,18.5H36.5V13.5Q36.5,12.85 36.925,12.425Q37.35,12 38,12Q38.65,12 39.075,12.425Q39.5,12.85 39.5,13.5V18.5H44.5Q45.15,18.5 45.575,18.925Q46,19.35 46,20Q46,20.65 45.575,21.075Q45.15,21.5 44.5,21.5H39.5V26.5Q39.5,27.15 39.075,27.575Q38.65,28 38,28ZM18,23.95Q14.7,23.95 12.6,21.85Q10.5,19.75 10.5,16.45Q10.5,13.15 12.6,11.05Q14.7,8.95 18,8.95Q21.3,8.95 23.4,11.05Q25.5,13.15 25.5,16.45Q25.5,19.75 23.4,21.85Q21.3,23.95 18,23.95ZM3.5,40Q2.85,40 2.425,39.575Q2,39.15 2,38.5V35.3Q2,33.55 2.9,32.125Q3.8,30.7 5.4,30Q9.15,28.35 12.075,27.675Q15,27 18,27Q21,27 23.925,27.675Q26.85,28.35 30.55,30Q32.15,30.75 33.075,32.15Q34,33.55 34,35.3V38.5Q34,39.15 33.575,39.575Q33.15,40 32.5,40ZM5,37H31V35.3Q31,34.5 30.6,33.775Q30.2,33.05 29.35,32.7Q25.85,31 23.375,30.5Q20.9,30 18,30Q15.1,30 12.625,30.525Q10.15,31.05 6.6,32.7Q5.85,33.05 5.425,33.775Q5,34.5 5,35.3ZM18,20.95Q19.95,20.95 21.225,19.675Q22.5,18.4 22.5,16.45Q22.5,14.5 21.225,13.225Q19.95,11.95 18,11.95Q16.05,11.95 14.775,13.225Q13.5,14.5 13.5,16.45Q13.5,18.4 14.775,19.675Q16.05,20.95 18,20.95ZM18,16.45Q18,16.45 18,16.45Q18,16.45 18,16.45Q18,16.45 18,16.45Q18,16.45 18,16.45Q18,16.45 18,16.45Q18,16.45 18,16.45Q18,16.45 18,16.45Q18,16.45 18,16.45ZM18,30Q18,30 18,30Q18,30 18,30Q18,30 18,30Q18,30 18,30Q18,30 18,30Q18,30 18,30Q18,30 18,30Q18,30 18,30Z"/>
 </vector>
diff --git a/play-services-core/src/main/res/drawable/ic_baseline_hide_source_24.xml b/play-services-core/src/main/res/drawable/ic_baseline_hide_source_24.xml
index 273167f3..478592d3 100644
--- a/play-services-core/src/main/res/drawable/ic_baseline_hide_source_24.xml
+++ b/play-services-core/src/main/res/drawable/ic_baseline_hide_source_24.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
+    android:viewportWidth="48"
+    android:viewportHeight="48"
     android:tint="?attr/colorAccent">
     <path
         android:fillColor="#000000"
-        android:pathData="M2.81,2.81L1.39,4.22l2.27,2.27C2.61,8.07 2,9.96 2,12c0,5.52 4.48,10 10,10c2.04,0 3.93,-0.61 5.51,-1.66l2.27,2.27l1.41,-1.41L2.81,2.81zM12,20c-4.41,0 -8,-3.59 -8,-8c0,-1.48 0.41,-2.86 1.12,-4.06l10.94,10.94C14.86,19.59 13.48,20 12,20zM7.94,5.12L6.49,3.66C8.07,2.61 9.96,2 12,2c5.52,0 10,4.48 10,10c0,2.04 -0.61,3.93 -1.66,5.51l-1.46,-1.46C19.59,14.86 20,13.48 20,12c0,-4.41 -3.59,-8 -8,-8C10.52,4 9.14,4.41 7.94,5.12z"/>
+        android:pathData="M39.6,43.85 L35.9,40.2Q33.4,42 30.4,43Q27.4,44 24,44Q19.75,44 16.1,42.475Q12.45,40.95 9.75,38.25Q7.05,35.55 5.525,31.9Q4,28.25 4,24Q4,20.6 5,17.6Q6,14.6 7.8,12.1L4.1,8.4Q3.65,7.95 3.675,7.35Q3.7,6.75 4.15,6.3Q4.6,5.85 5.225,5.85Q5.85,5.85 6.3,6.3L41.75,41.75Q42.2,42.2 42.2,42.8Q42.2,43.4 41.75,43.85Q41.3,44.3 40.675,44.3Q40.05,44.3 39.6,43.85ZM24,41Q26.75,41 29.2,40.225Q31.65,39.45 33.75,38.05L9.95,14.25Q8.55,16.35 7.775,18.8Q7,21.25 7,24Q7,31.25 11.875,36.125Q16.75,41 24,41ZM40.2,35.9 L38.05,33.75Q39.45,31.65 40.225,29.2Q41,26.75 41,24Q41,16.75 36.125,11.875Q31.25,7 24,7Q21.25,7 18.8,7.775Q16.35,8.55 14.25,9.95L12.1,7.8Q14.6,6 17.6,5Q20.6,4 24,4Q28.2,4 31.85,5.55Q35.5,7.1 38.2,9.8Q40.9,12.5 42.45,16.15Q44,19.8 44,24Q44,27.4 43,30.4Q42,33.4 40.2,35.9ZM26.15,21.85Q26.15,21.85 26.15,21.85Q26.15,21.85 26.15,21.85Q26.15,21.85 26.15,21.85Q26.15,21.85 26.15,21.85Q26.15,21.85 26.15,21.85Q26.15,21.85 26.15,21.85ZM21.85,26.15Q21.85,26.15 21.85,26.15Q21.85,26.15 21.85,26.15Q21.85,26.15 21.85,26.15Q21.85,26.15 21.85,26.15Q21.85,26.15 21.85,26.15Q21.85,26.15 21.85,26.15Z"/>
 </vector>
diff --git a/play-services-core/src/main/res/drawable/ic_cloud_bell.xml b/play-services-core/src/main/res/drawable/ic_cloud_bell.xml
index 0f41c719..3b7fb42e 100644
--- a/play-services-core/src/main/res/drawable/ic_cloud_bell.xml
+++ b/play-services-core/src/main/res/drawable/ic_cloud_bell.xml
@@ -3,10 +3,10 @@
     android:width="24dp"
     android:height="24dp"
     android:tint="?attr/colorAccent"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportWidth="48"
+    android:viewportHeight="48">
 
     <path
         android:fillColor="#000000"
-        android:pathData="M 12 4 C 9.11 4 6.5996094 5.6392969 5.3496094 8.0292969 C 2.3396094 8.3592969 0 10.9 0 14 A 6 6 0 0 0 6 20 L 19 20 A 5 5 0 0 0 24 15 C 24 12.36 21.949609 10.219297 19.349609 10.029297 C 18.669609 6.5892969 15.64 4 12 4 z M 12 7.5 A 0.5 0.5 0 0 1 12.5 8 L 12.5 8.5390625 C 13.92 8.7790625 15 10.015 15 11.5 L 15 14.5 L 16.5 16 L 7.5 16 L 9 14.5 L 9 11.5 C 9 10.015 10.08 8.7790625 11.5 8.5390625 L 11.5 8 A 0.5 0.5 0 0 1 12 7.5 z M 11 16.5 L 13 16.5 A 1 1 0 0 1 12 17.5 A 1 1 0 0 1 11 16.5 z" />
+        android:pathData="M21.5,15.55H34.55Q35.2,15.55 35.625,15.125Q36.05,14.7 36.05,14.05Q36.05,13.4 35.625,12.975Q35.2,12.55 34.55,12.55H21.5Q20.85,12.55 20.425,12.975Q20,13.4 20,14.05Q20,14.7 20.425,15.125Q20.85,15.55 21.5,15.55ZM21.5,21.55H34.55Q35.2,21.55 35.625,21.125Q36.05,20.7 36.05,20.05Q36.05,19.4 35.625,18.975Q35.2,18.55 34.55,18.55H21.5Q20.85,18.55 20.425,18.975Q20,19.4 20,20.05Q20,20.7 20.425,21.125Q20.85,21.55 21.5,21.55ZM21.5,27.55H28.5Q29.15,27.55 29.575,27.125Q30,26.7 30,26.05Q30,25.4 29.575,24.975Q29.15,24.55 28.5,24.55H21.5Q20.85,24.55 20.425,24.975Q20,25.4 20,26.05Q20,26.7 20.425,27.125Q20.85,27.55 21.5,27.55ZM14.05,16.05Q14.9,16.05 15.475,15.475Q16.05,14.9 16.05,14.05Q16.05,13.2 15.475,12.625Q14.9,12.05 14.05,12.05Q13.2,12.05 12.625,12.625Q12.05,13.2 12.05,14.05Q12.05,14.9 12.625,15.475Q13.2,16.05 14.05,16.05ZM14.05,22.05Q14.9,22.05 15.475,21.475Q16.05,20.9 16.05,20.05Q16.05,19.2 15.475,18.625Q14.9,18.05 14.05,18.05Q13.2,18.05 12.625,18.625Q12.05,19.2 12.05,20.05Q12.05,20.9 12.625,21.475Q13.2,22.05 14.05,22.05ZM14.05,28.05Q14.9,28.05 15.475,27.475Q16.05,26.9 16.05,26.05Q16.05,25.2 15.475,24.625Q14.9,24.05 14.05,24.05Q13.2,24.05 12.625,24.625Q12.05,25.2 12.05,26.05Q12.05,26.9 12.625,27.475Q13.2,28.05 14.05,28.05ZM4,40.4V7Q4,5.85 4.9,4.925Q5.8,4 7,4H41Q42.15,4 43.075,4.925Q44,5.85 44,7V33Q44,34.15 43.075,35.075Q42.15,36 41,36H12L6.55,41.45Q5.85,42.15 4.925,41.775Q4,41.4 4,40.4ZM7,36.75 L10.75,33H41Q41,33 41,33Q41,33 41,33V7Q41,7 41,7Q41,7 41,7H7Q7,7 7,7Q7,7 7,7ZM7,7Q7,7 7,7Q7,7 7,7Q7,7 7,7Q7,7 7,7V33Q7,33 7,33Q7,33 7,33V36.75Z"/>
 </vector>
diff --git a/play-services-core/src/main/res/drawable/ic_device_login.xml b/play-services-core/src/main/res/drawable/ic_device_login.xml
index e7ba5124..138e6d26 100644
--- a/play-services-core/src/main/res/drawable/ic_device_login.xml
+++ b/play-services-core/src/main/res/drawable/ic_device_login.xml
@@ -2,9 +2,9 @@
     android:width="24dp"
     android:height="24dp"
     android:tint="?attr/colorAccent"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportWidth="48"
+    android:viewportHeight="48">
     <path
         android:fillColor="#000000"
-        android:pathData="M10,17V14H3V10H10V7L15,12L10,17M10,2H19A2,2 0 0,1 21,4V20A2,2 0 0,1 19,22H10A2,2 0 0,1 8,20V18H10V20H19V4H10V6H8V4A2,2 0 0,1 10,2Z" />
+        android:pathData="M19.5,31.65Q19.05,31.2 19.05,30.55Q19.05,29.9 19.5,29.5L23.5,25.5H7.5Q6.85,25.5 6.425,25.075Q6,24.65 6,24Q6,23.35 6.425,22.925Q6.85,22.5 7.5,22.5H23.4L19.35,18.45Q18.95,18.05 18.95,17.425Q18.95,16.8 19.4,16.35Q19.85,15.9 20.475,15.9Q21.1,15.9 21.55,16.35L28.2,23Q28.45,23.25 28.55,23.5Q28.65,23.75 28.65,24.05Q28.65,24.35 28.55,24.6Q28.45,24.85 28.2,25.1L21.6,31.7Q21.2,32.1 20.575,32.1Q19.95,32.1 19.5,31.65ZM25.95,42Q25.3,42 24.875,41.575Q24.45,41.15 24.45,40.5Q24.45,39.85 24.875,39.425Q25.3,39 25.95,39H39Q39,39 39,39Q39,39 39,39V9Q39,9 39,9Q39,9 39,9H25.95Q25.3,9 24.875,8.575Q24.45,8.15 24.45,7.5Q24.45,6.85 24.875,6.425Q25.3,6 25.95,6H39Q40.2,6 41.1,6.9Q42,7.8 42,9V39Q42,40.2 41.1,41.1Q40.2,42 39,42Z"/>
 </vector>
\ No newline at end of file
diff --git a/play-services-core/src/main/res/drawable/ic_info_outline.xml b/play-services-core/src/main/res/drawable/ic_info_outline.xml
index 26fa3be3..69c629ac 100755
--- a/play-services-core/src/main/res/drawable/ic_info_outline.xml
+++ b/play-services-core/src/main/res/drawable/ic_info_outline.xml
@@ -2,9 +2,9 @@
     android:width="24dp"
     android:height="24dp"
     android:tint="?attr/colorAccent"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportWidth="48"
+    android:viewportHeight="48">
     <path
         android:fillColor="#000000"
-        android:pathData="M11,7h2v2h-2zM11,11h2v6h-2zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z" />
+        android:pathData="M24.15,34Q24.8,34 25.225,33.575Q25.65,33.15 25.65,32.5V23.45Q25.65,22.85 25.2,22.425Q24.75,22 24.15,22Q23.5,22 23.075,22.425Q22.65,22.85 22.65,23.5V32.55Q22.65,33.15 23.1,33.575Q23.55,34 24.15,34ZM24,18.3Q24.7,18.3 25.175,17.85Q25.65,17.4 25.65,16.7Q25.65,16 25.175,15.5Q24.7,15 24,15Q23.3,15 22.825,15.5Q22.35,16 22.35,16.7Q22.35,17.4 22.825,17.85Q23.3,18.3 24,18.3ZM24,44Q19.75,44 16.1,42.475Q12.45,40.95 9.75,38.25Q7.05,35.55 5.525,31.9Q4,28.25 4,24Q4,19.8 5.525,16.15Q7.05,12.5 9.75,9.8Q12.45,7.1 16.1,5.55Q19.75,4 24,4Q28.2,4 31.85,5.55Q35.5,7.1 38.2,9.8Q40.9,12.5 42.45,16.15Q44,19.8 44,24Q44,28.25 42.45,31.9Q40.9,35.55 38.2,38.25Q35.5,40.95 31.85,42.475Q28.2,44 24,44ZM24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24ZM24,41Q31,41 36,36Q41,31 41,24Q41,17 36,12Q31,7 24,7Q17,7 12,12Q7,17 7,24Q7,31 12,36Q17,41 24,41Z"/>
 </vector>
diff --git a/play-services-core/src/main/res/layout/login_assistant.xml b/play-services-core/src/main/res/layout/login_assistant.xml
index 53d330e4..eecf9ee6 100755
--- a/play-services-core/src/main/res/layout/login_assistant.xml
+++ b/play-services-core/src/main/res/layout/login_assistant.xml
@@ -76,8 +76,8 @@
                 android:paddingLeft="38dp"
                 android:paddingRight="38dp"
                 android:textAllCaps="true"
-                android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-                android:textSize="16sp" />
+                android:textAppearance="@style/TextAppearance.M3.Sys.Typescale.BodyLarge"
+                android:textColor="?attr/colorOnSurface" />
 
             <Button
                 android:id="@+id/next_button"
@@ -91,8 +91,8 @@
                 android:paddingLeft="38dp"
                 android:paddingRight="38dp"
                 android:textAllCaps="true"
-                android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-                android:textSize="16sp" />
+                android:textAppearance="@style/TextAppearance.M3.Sys.Typescale.BodyLarge"
+                android:textColor="?attr/colorOnSurface" />
         </RelativeLayout>
     </LinearLayout>
 
diff --git a/play-services-core/src/main/res/layout/preference_switch_bar.xml b/play-services-core/src/main/res/layout/preference_switch_bar.xml
index 176fbd2d..d45909cd 100755
--- a/play-services-core/src/main/res/layout/preference_switch_bar.xml
+++ b/play-services-core/src/main/res/layout/preference_switch_bar.xml
@@ -39,7 +39,7 @@
         android:paddingLeft="?attr/listPreferredItemPaddingLeft"
         android:paddingEnd="?attr/listPreferredItemPaddingEnd"
         android:paddingRight="?attr/listPreferredItemPaddingRight"
-        android:background="?attr/colorAccent"
+        android:background="@null"
         tools:background="?attr/colorControlActivated">
 
         <TextView
@@ -49,24 +49,23 @@
             android:layout_gravity="center_vertical"
             android:layout_weight="1"
             android:ellipsize="end"
-            android:maxLines="2"
+            android:maxLines="1"
             android:paddingStart="56dp"
             android:paddingLeft="56dp"
             android:text="@{description}"
-            android:textAppearance="?attr/textAppearanceListItem"
-            android:textColor="#ffffff"
+            android:textSize="20sp"
+            android:textAppearance="@style/TextAppearance.M3.Sys.Typescale.HeadlineSmall"
             tools:text="Enabled" />
 
-        <androidx.appcompat.widget.SwitchCompat
+        <com.google.android.material.switchmaterial.SwitchMaterial
             android:id="@+id/switch_widget"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:background="@null"
             android:layout_gravity="center_vertical"
             android:checked="@{checked}"
             android:enabled="@{enabled}"
             app:onCheckedChangeListener="@{(v, newStatus) -> callback.onChecked(newStatus)}"
-            app:thumbTint="#ffffff"
-            app:trackTint="#e1e2e3"
             tools:checked="true" />
     </LinearLayout>
 </layout>
diff --git a/play-services-core/src/main/res/values-night-v31/themes.xml b/play-services-core/src/main/res/values-night-v31/themes.xml
new file mode 100644
index 00000000..de5386e8
--- /dev/null
+++ b/play-services-core/src/main/res/values-night-v31/themes.xml
@@ -0,0 +1,14 @@
+<resources>
+    <style name="AppTheme" parent="Theme.Material3.DynamicColors.DayNight"/>
+    <style name="Theme.Material3.DynamicColors.DayNight" parent="Theme.Material3.DynamicColors.Dark"/>
+    <style name="Theme.Material3.DynamicColors.Dark" parent="Theme.Material3.Dark">
+        <item name="colorPrimary">@android:color/system_accent1_600</item>
+        <item name="colorPrimaryDark">@android:color/system_neutral1_900</item>
+        <item name="colorOnPrimary">@android:color/system_accent1_0</item>
+        <item name="colorSecondary">@android:color/system_accent2_600</item>
+        <item name="colorOnSecondary">@android:color/system_accent2_0</item>
+        <item name="colorTertiary">@android:color/system_accent3_600</item>
+        <item name="colorOnTertiary">@android:color/system_accent3_0</item>
+        <item name="colorOnBackground">@android:color/system_neutral1_900</item>
+    </style>
+</resources>
diff --git a/play-services-core/src/main/res/values-night/themes.xml b/play-services-core/src/main/res/values-night/themes.xml
new file mode 100644
index 00000000..a1a664cb
--- /dev/null
+++ b/play-services-core/src/main/res/values-night/themes.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="Theme.Material3.DayNight" parent="Theme.Material3.Dark">
+        <item name="colorPrimaryDark">@android:color/transparent</item>
+    </style>
+
+</resources>
diff --git a/play-services-core/src/main/res/values-v31/themes.xml b/play-services-core/src/main/res/values-v31/themes.xml
new file mode 100644
index 00000000..1719a989
--- /dev/null
+++ b/play-services-core/src/main/res/values-v31/themes.xml
@@ -0,0 +1,13 @@
+<resources>
+    <style name="AppTheme" parent="Theme.Material3.DynamicColors.DayNight"/>
+    <style name="Theme.Material3.DynamicColors.DayNight" parent="Theme.Material3.DynamicColors.Light"/>
+    <style name="Theme.Material3.DynamicColors.Light" parent="Theme.Material3.Light">
+        <item name="colorPrimary">@android:color/system_accent1_600</item>
+        <item name="colorOnPrimary">@android:color/system_accent1_0</item>
+        <item name="colorSecondary">@android:color/system_accent2_600</item>
+        <item name="colorOnSecondary">@android:color/system_accent2_0</item>
+        <item name="colorTertiary">@android:color/system_accent3_600</item>
+        <item name="colorOnTertiary">@android:color/system_accent3_0</item>
+        <item name="colorOnBackground">@android:color/system_neutral1_900</item>
+    </style>
+</resources>
diff --git a/play-services-core/src/main/res/values/colors.xml b/play-services-core/src/main/res/values/colors.xml
index cb2ec631..85c87c33 100755
--- a/play-services-core/src/main/res/values/colors.xml
+++ b/play-services-core/src/main/res/values/colors.xml
@@ -18,6 +18,7 @@
 
     <color name="login_blue_theme_primary">#ff4285f4</color>
     <color name="login_blue_theme_primary_dark">#ff3367d6</color>
-    <color name="login_blue_theme_accent">#ffFFAB40</color>
+    <color name="login_blue_theme_accent">#ffffab40</color>
+    <color name="m3_theme_primary_dark">#ff9a82db</color>
 
 </resources>
diff --git a/play-services-core/src/main/res/values/themes.xml b/play-services-core/src/main/res/values/themes.xml
index 883fcf92..d5cb5705 100755
--- a/play-services-core/src/main/res/values/themes.xml
+++ b/play-services-core/src/main/res/values/themes.xml
@@ -16,9 +16,14 @@
 
 <resources>
 
-    <style name="Theme.LoginBlue" parent="Theme.LoginBlue.Base" />
+    <style name="AppTheme" parent="Theme.Material3.DayNight"/>
 
-    <style name="Theme.LoginBlue.Base" parent="Theme.AppCompat.DayNight">
+    <style name="Theme.Material3.DayNight" parent="Theme.Material3.Light">
+        <item name="colorPrimaryDark">@color/m3_theme_primary_dark</item>
+    </style>
+
+    <style name="Theme.LoginBlue" parent="Theme.LoginBlue.Base" />
+    <style name="Theme.LoginBlue.Base" parent="Theme.Material3.DayNight">
         <item name="colorPrimary">@color/login_blue_theme_primary</item>
         <item name="colorPrimaryDark">@color/login_blue_theme_primary_dark</item>
         <item name="colorAccent">@color/login_blue_theme_accent</item>