Theme and typography changes

base/src/main/res/values-night-v31/color-schemes.xml

@@ -1,5 +1,5 @@
 <resources>
-    <style name="DefaultColors" parent="Theme.Material3.DayNight">
+    <style name="DefaultColors" parent="BaseTheme">
         <item name="colorPrimary">@android:color/system_accent1_200</item>
         <item name="colorOnPrimary">@android:color/system_accent1_800</item>
         <item name="colorPrimaryContainer">@android:color/system_accent1_700</item>
@@ -21,7 +21,7 @@
         <item name="android:colorBackground">@android:color/system_neutral1_900</item>
         <item name="colorOnBackground">@android:color/system_neutral1_100</item>
         <item name="colorSurface">@android:color/system_neutral1_900</item>
-        <item name="colorOnSurface">@android:color/system_neutral1_200</item>
+        <item name="colorOnSurface">@android:color/system_neutral1_100</item>
         <item name="colorSurfaceVariant">@android:color/system_neutral2_700</item>
         <item name="colorOnSurfaceVariant">@android:color/system_neutral2_200</item>
         <item name="colorSurfaceInverse">@android:color/system_neutral1_100</item>

base/src/main/res/values-night/color-schemes.xml

@@ -1,5 +1,5 @@
 <resources>
-    <style name="DefaultColors" parent="Theme.Material3.DayNight">
+    <style name="DefaultColors" parent="BaseTheme">
         <item name="colorPrimary">#72D1FF</item>
         <item name="colorOnPrimary">#003549</item>
         <item name="colorPrimaryContainer">#004D68</item>
@@ -29,7 +29,7 @@
         <item name="elevationOverlayEnabled">true</item>
     </style>
 
-    <style name="BlackWhiteColors" parent="Theme.Material3.DayNight">
+    <style name="BlackWhiteColors" parent="BaseTheme">
         <item name="colorPrimary">@android:color/white</item>
         <item name="colorOnPrimary">@android:color/black</item>
         <item name="colorPrimaryContainer">@android:color/black</item>

base/src/main/res/values-v31/color-schemes.xml

@@ -1,5 +1,5 @@
 <resources>
-    <style name="DefaultColors" parent="Theme.Material3.DayNight">
+    <style name="DefaultColors" parent="BaseTheme">
         <item name="colorPrimary">@android:color/system_accent1_600</item>
         <item name="colorOnPrimary">@android:color/system_accent1_0</item>
         <item name="colorPrimaryContainer">@android:color/system_accent1_100</item>

base/src/main/res/values/color-schemes.xml

@@ -1,5 +1,5 @@
 <resources>
-    <style name="DefaultColors" parent="Theme.Material3.DayNight">
+    <style name="DefaultColors" parent="BaseTheme">
         <item name="colorPrimary">#006689</item>
         <item name="colorOnPrimary">@android:color/white</item>
         <item name="colorPrimaryContainer">#BFE8FF</item>
@@ -29,7 +29,7 @@
         <item name="elevationOverlayEnabled">false</item>
     </style>
 
-    <style name="BlackWhiteColors" parent="Theme.Material3.DayNight">
+    <style name="BlackWhiteColors" parent="BaseTheme">
         <item name="colorPrimary">@android:color/black</item>
         <item name="colorOnPrimary">@android:color/white</item>
         <item name="colorPrimaryContainer">@android:color/white</item>

base/src/main/res/values/themes.xml

@@ -1,5 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <style name="BaseTheme" parent="Theme.Material3.DayNight">
+        <item name="textAppearanceDisplayLarge">@style/Typography.Display.Large</item>
+        <item name="textAppearanceDisplayMedium">@style/Typography.Display.Medium</item>
+        <item name="textAppearanceDisplaySmall">@style/Typography.Display.Small</item>
+        <item name="textAppearanceHeadlineLarge">@style/Typography.Headline.Large</item>
+        <item name="textAppearanceHeadlineMedium">@style/Typography.Headline.Medium</item>
+        <item name="textAppearanceHeadlineSmall">@style/Typography.Headline.Small</item>
+        <item name="textAppearanceTitleLarge">@style/Typography.Title.Large</item>
+        <item name="textAppearanceTitleMedium">@style/Typography.Title.Medium</item>
+        <item name="textAppearanceTitleSmall">@style/Typography.Title.Small</item>
+        <item name="textAppearanceBodyLarge">@style/Typography.Body.Large</item>
+        <item name="textAppearanceBodyMedium">@style/Typography.Body.Medium</item>
+        <item name="textAppearanceBodySmall">@style/Typography.Body.Small</item>
+        <item name="textAppearanceLabelLarge">@style/Typography.Label.Large</item>
+        <item name="textAppearanceLabelMedium">@style/Typography.Label.Medium</item>
+        <item name="textAppearanceLabelSmall">@style/Typography.Label.Small</item>
+    </style>
+
+
     <style name="SettingsTheme.DefaultColors" parent="DefaultColors">
         <item name="android:statusBarColor">?colorSurface</item>
         <item name="android:windowLightStatusBar">true</item>

base/src/main/res/values/typography.xml

@@ -1,28 +1,114 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
     <style name="TextAppearance">
 
     </style>
+
     <style name="TextAppearance.Heading1">
         <item name="android:textColor">@color/text_color_primary</item>
         <item name="android:textSize">18sp</item>
         <item name="android:fontFamily">sans-serif-medium</item>
     </style>
+
     <style name="TextAppearance.Heading2">
         <item name="android:textColor">@color/text_color_primary</item>
         <item name="android:textSize">13sp</item>
         <item name="android:textStyle">bold</item>
     </style>
+
     <style name="TextAppearance.Heading3">
         <item name="android:textColor">@color/text_color_primary</item>
         <item name="android:textSize">13sp</item>
     </style>
+
     <style name="TextAppearance.Body1">
         <item name="android:textColor">@color/text_color_primary</item>
         <item name="android:textSize">13sp</item>
     </style>
+
     <style name="TextAppearance.Body2">
         <item name="android:textColor">@color/text_color_secondary</item>
         <item name="android:textSize">13sp</item>
     </style>
+
+    <style name="Typography.Display.Large" parent="TextAppearance.Material3.DisplaySmall">
+        <item name="fontFamily">@font/poppins</item>
+        <item name="fontWeight">500</item>
+        <item name="android:textFontWeight">500</item>
+    </style>
+
+    <style name="Typography.Display.Medium" parent="TextAppearance.Material3.DisplaySmall">
+        <item name="fontFamily">@font/poppins</item>
+        <item name="fontWeight">500</item>
+        <item name="android:textFontWeight">500</item>
+    </style>
+
+    <style name="Typography.Display.Small" parent="TextAppearance.Material3.DisplaySmall">
+        <item name="fontFamily">@font/poppins</item>
+        <item name="fontWeight">500</item>
+        <item name="android:textFontWeight">500</item>
+    </style>
+
+    <style name="Typography.Headline.Large" parent="TextAppearance.Material3.HeadlineLarge">
+        <item name="fontFamily">@font/poppins</item>
+        <item name="fontWeight">600</item>
+        <item name="android:textFontWeight">600</item>
+    </style>
+
+    <style name="Typography.Headline.Medium" parent="TextAppearance.Material3.HeadlineMedium">
+        <item name="fontFamily">@font/poppins</item>
+        <item name="fontWeight">600</item>
+        <item name="android:textFontWeight">600</item>
+    </style>
+
+    <style name="Typography.Headline.Small" parent="TextAppearance.Material3.HeadlineSmall">
+        <item name="fontFamily">@font/poppins</item>
+        <item name="fontWeight">600</item>
+        <item name="android:textFontWeight">600</item>
+    </style>
+
+    <style name="Typography.Title.Large" parent="TextAppearance.Material3.TitleLarge">
+        <item name="fontFamily">@font/poppins</item>
+        <item name="fontWeight">600</item>
+        <item name="android:textFontWeight">600</item>
+    </style>
+
+    <style name="Typography.Title.Medium" parent="TextAppearance.Material3.TitleMedium">
+        <item name="fontFamily">@font/poppins</item>
+        <item name="fontWeight">600</item>
+        <item name="android:textFontWeight">600</item>
+    </style>
+
+    <style name="Typography.Title.Small" parent="TextAppearance.Material3.TitleSmall">
+        <item name="fontFamily">@font/poppins</item>
+        <item name="fontWeight">600</item>
+        <item name="android:textFontWeight">600</item>
+    </style>
+
+    <style name="Typography.Label.Large" parent="TextAppearance.Material3.LabelLarge">
+        <item name="fontFamily">@font/poppins</item>
+        <item name="fontWeight">600</item>
+        <item name="android:textFontWeight">600</item>
+    </style>
+
+    <style name="Typography.Label.Medium" parent="TextAppearance.Material3.LabelMedium">
+        <item name="fontFamily">@font/poppins</item>
+        <item name="fontWeight">600</item>
+        <item name="android:textFontWeight">600</item>
+    </style>
+
+    <style name="Typography.Label.Small" parent="TextAppearance.Material3.LabelSmall">
+        <item name="fontFamily">@font/poppins</item>
+        <item name="fontWeight">600</item>
+        <item name="android:textFontWeight">600</item>
+    </style>
+
+    <style name="Typography.Body.Large" parent="TextAppearance.Material3.BodyLarge" />
+
+    <style name="Typography.Body.Medium" parent="TextAppearance.Material3.BodyMedium" />
+
+    <style name="Typography.Body.Small" parent="TextAppearance.Material3.BodySmall" />
+
+
 </resources>