add resource and move some resource to module base

abrahamlay · Apr 26, 2020 · 0a81f66 · 0a81f66
1 parent c1148b7
commit 0a81f66
Show file tree

Hide file tree

Showing 22 changed files with 79 additions and 11 deletions.
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
diff --git a/base/src/main/res/font/graphik_black.ttf b/base/src/main/res/font/graphik_black.ttf
diff --git a/base/src/main/res/font/graphik_blackitalic.ttf b/base/src/main/res/font/graphik_blackitalic.ttf
diff --git a/base/src/main/res/font/graphik_bold.ttf b/base/src/main/res/font/graphik_bold.ttf
diff --git a/base/src/main/res/font/graphik_bolditalic.ttf b/base/src/main/res/font/graphik_bolditalic.ttf
diff --git a/base/src/main/res/font/graphik_extralight.ttf b/base/src/main/res/font/graphik_extralight.ttf
diff --git a/base/src/main/res/font/graphik_extralightitalic.ttf b/base/src/main/res/font/graphik_extralightitalic.ttf
diff --git a/base/src/main/res/font/graphik_light.ttf b/base/src/main/res/font/graphik_light.ttf
diff --git a/base/src/main/res/font/graphik_lightitalic.ttf b/base/src/main/res/font/graphik_lightitalic.ttf
diff --git a/base/src/main/res/font/graphik_medium.ttf b/base/src/main/res/font/graphik_medium.ttf
diff --git a/base/src/main/res/font/graphik_mediumitalic.ttf b/base/src/main/res/font/graphik_mediumitalic.ttf
diff --git a/base/src/main/res/font/graphik_regular.ttf b/base/src/main/res/font/graphik_regular.ttf
diff --git a/base/src/main/res/font/graphik_regularitalic.ttf b/base/src/main/res/font/graphik_regularitalic.ttf
diff --git a/base/src/main/res/font/graphik_semibold.ttf b/base/src/main/res/font/graphik_semibold.ttf
diff --git a/base/src/main/res/font/graphik_semibolditalic.ttf b/base/src/main/res/font/graphik_semibolditalic.ttf
diff --git a/base/src/main/res/font/graphik_super.ttf b/base/src/main/res/font/graphik_super.ttf
diff --git a/base/src/main/res/font/graphik_superitalic.ttf b/base/src/main/res/font/graphik_superitalic.ttf
diff --git a/base/src/main/res/font/graphik_thin.ttf b/base/src/main/res/font/graphik_thin.ttf
diff --git a/base/src/main/res/font/graphik_thinitalic.ttf b/base/src/main/res/font/graphik_thinitalic.ttf
diff --git a/base/src/main/res/values/colors.xml b/base/src/main/res/values/colors.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#473F97</color>
+    <color name="colorPrimaryDark">@color/colorPrimary</color>
+    <color name="colorAccent">@color/colorWhite</color>
+    <color name="colorGrey1">#e0e0e0</color>
+    <color name="colorGrey2">#BDBDBD</color>
+    <color name="colorBlack1">#212121</color>
+    <color name="colorBlack2">#0D1333</color>
+    <color name="colorWhite">#eeeeee</color>
+    <color name="colorTransparentGrey">#B3BDBDBD</color>
+    <color name="colorAffected">#FFB259</color>
+    <color name="colorDeath">#FF5959</color>
+    <color name="colorRecovered">#4CD97B</color>
+    <color name="colorActive">#4DB5FF</color>
+    <color name="colorSerious">#9059FF</color>
+</resources>
diff --git a/app/src/main/res/values/strings.xml → base/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml → base/src/main/res/values/strings.xml
diff --git a/base/src/main/res/values/styles.xml b/base/src/main/res/values/styles.xml
@@ -0,0 +1,62 @@
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+        <item name="font">@font/graphik_medium</item>
+    </style>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme.NoActionBar" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+        <item name="font">@font/graphik_medium</item>
+    </style>
+
+
+    <!-- TextAppearance-->
+    <style name="TextAppearance.AppCompat.Covid.App" parent="TextAppearance.AppCompat.Title">
+        <item name="android:textColor">@color/colorWhite</item>
+        <item name="font">@font/graphik_medium</item>
+    </style>
+
+    <!-- TextAppearance-->
+    <style name="TextAppearance.AppCompat.Covid.App.Title" parent="TextAppearance.AppCompat.Covid.App">
+        <item name="android:textSize">24sp</item>
+    </style>
+
+    <style name="TextAppearance.AppCompat.Covid.App.SubTitle" parent="TextAppearance.AppCompat.Covid.App">
+        <item name="android:textSize">16sp</item>
+    </style>
+
+    <style name="TextAppearance.AppCompat.Covid.App.SubTitle.Black" parent="TextAppearance.AppCompat.Covid.App">
+        <item name="android:textColor">@color/colorBlack2</item>
+        <item name="android:textSize">16sp</item>
+    </style>
+
+
+    <style name="TextAppearance.AppCompat.Covid.App.Small" parent="TextAppearance.AppCompat.Covid.App">
+        <item name="android:textSize">12sp</item>
+    </style>
+
+
+    <style name="TextAppearance.AppCompat.Covid.App.Item.Title" parent="TextAppearance.AppCompat.Covid.App">
+        <item name="android:textColor">@color/colorBlack2</item>
+        <item name="android:textSize">14sp</item>
+    </style>
+
+    <style name="TextAppearance.AppCompat.Covid.App.Statistic.Label" parent="TextAppearance.AppCompat.Covid.App">
+        <item name="android:textSize">14sp</item>
+    </style>
+
+    <style name="TextAppearance.AppCompat.Covid.App.Statistic.Value" parent="TextAppearance.AppCompat.Covid.App">
+        <item name="android:textSize">24sp</item>
+    </style>
+</resources>