SIANXSVC-1266: add custom fonts

anexia · Nov 21, 2024 · a93f374 · a93f374
1 parent 5917795
commit a93f374
Show file tree

Hide file tree

Showing 13 changed files with 37 additions and 27 deletions.
diff --git a/core/designsystem/src/main/java/com/twofasapp/designsystem/internal/ThemeTypo.kt b/core/designsystem/src/main/java/com/twofasapp/designsystem/internal/ThemeTypo.kt
@@ -15,102 +15,112 @@ import com.twofasapp.designsystem.TwTheme
 class ThemeTypo {
 
     val h1 = TextStyle(
-        fontFamily = FontFamily.Default,
-        fontWeight = FontWeight.Normal,
+        fontFamily = FontFamily(
+            Font(resId = R.font.fira_sans_regular)
+        ),
         fontSize = 42.sp,
         lineHeight = 42.sp,
     )
 
     val h2 = TextStyle(
-        fontFamily = FontFamily.Default,
-        fontWeight = FontWeight.Bold,
+        fontFamily = FontFamily(
+            Font(resId = R.font.fira_sans_bold)
+        ),
         fontSize = 24.sp,
         lineHeight = 32.sp,
     )
 
     val h3 = TextStyle(
-        fontFamily = FontFamily.Default,
-        fontWeight = FontWeight.Normal,
+        fontFamily = FontFamily(
+            Font(resId = R.font.fira_sans_regular)
+        ),
         fontSize = 24.sp,
         lineHeight = 32.sp,
     )
 
     val title = TextStyle(
-        fontFamily = FontFamily.Default,
-        fontWeight = FontWeight.Normal,
+        fontFamily = FontFamily(
+            Font(resId = R.font.fira_sans_regular)
+        ),
         fontSize = 22.sp,
         lineHeight = 26.sp,
     )
 
     val body1 = TextStyle(
-        fontFamily = FontFamily.Default,
-        fontWeight = FontWeight.Normal,
+        fontFamily = FontFamily(
+            Font(resId = R.font.fira_sans_regular)
+        ),
         fontSize = 16.sp,
         lineHeight = 24.sp,
     )
 
     val body2 = TextStyle(
-        fontFamily = FontFamily.Default,
-        fontWeight = FontWeight.Medium,
+        fontFamily = FontFamily(
+            Font(resId = R.font.fira_sans_medium)
+        ),
         fontSize = 14.sp,
         lineHeight = 20.sp,
     )
 
     val body3 = TextStyle(
-        fontFamily = FontFamily.Default,
-        fontWeight = FontWeight.Normal,
+        fontFamily = FontFamily(
+            Font(resId = R.font.fira_sans_regular)
+        ),
         fontSize = 14.sp,
         lineHeight = 17.sp,
     )
 
     val body4 = TextStyle(
-        fontFamily = FontFamily.Default,
-        fontWeight = FontWeight.Normal,
+        fontFamily = FontFamily(
+            Font(resId = R.font.fira_sans_regular)
+        ),
         fontSize = 13.sp,
         lineHeight = 17.sp,
     )
 
     val caption = TextStyle(
-        fontFamily = FontFamily.Default,
-        fontWeight = FontWeight.Normal,
+        fontFamily = FontFamily(
+            Font(resId = R.font.fira_sans_regular)
+        ),
         fontSize = 12.sp,
         lineHeight = 16.sp,
     )
 
     val subhead = TextStyle(
-        fontFamily = FontFamily.Default,
-        fontWeight = FontWeight.Medium,
+        fontFamily = FontFamily(
+            Font(resId = R.font.fira_sans_medium)
+        ),
         fontSize = 12.sp,
         lineHeight = 16.sp,
     )
 
     val codeExtraLight = TextStyle(
         fontFamily = FontFamily(
-            Font(resId = R.font.roboto_extra_light)
+            Font(resId = R.font.fira_sans_extra_light)
         ),
         fontSize = 44.sp,
         lineHeight = 44.sp,
     )
 
     val codeLightSmall = TextStyle(
         fontFamily = FontFamily(
-            Font(resId = R.font.roboto_light)
+            Font(resId = R.font.fira_sans_light)
         ),
         fontSize = 24.sp,
         lineHeight = 32.sp,
     )
 
     val codeLight = TextStyle(
         fontFamily = FontFamily(
-            Font(resId = R.font.roboto_light)
+            Font(resId = R.font.fira_sans_light)
         ),
         fontSize = 44.sp,
         lineHeight = 44.sp,
     )
 
     val codeThin = TextStyle(
         fontFamily = FontFamily(
-            Font(resId = R.font.roboto_thin)
+            Font(resId = R.font.fira_sans_thin)
         ),
         fontSize = 44.sp,
         lineHeight = 44.sp,

diff --git a/core/designsystem/src/main/res/font/fira_sans_bold.ttf b/core/designsystem/src/main/res/font/fira_sans_bold.ttf
diff --git a/core/designsystem/src/main/res/font/fira_sans_extra_light.ttf b/core/designsystem/src/main/res/font/fira_sans_extra_light.ttf
diff --git a/core/designsystem/src/main/res/font/fira_sans_light.ttf b/core/designsystem/src/main/res/font/fira_sans_light.ttf
diff --git a/core/designsystem/src/main/res/font/fira_sans_medium.ttf b/core/designsystem/src/main/res/font/fira_sans_medium.ttf
diff --git a/core/designsystem/src/main/res/font/fira_sans_regular.ttf b/core/designsystem/src/main/res/font/fira_sans_regular.ttf
diff --git a/core/designsystem/src/main/res/font/fira_sans_thin.ttf b/core/designsystem/src/main/res/font/fira_sans_thin.ttf
diff --git a/core/designsystem/src/main/res/font/roboto_extra_light.ttf b/core/designsystem/src/main/res/font/roboto_extra_light.ttf
diff --git a/core/designsystem/src/main/res/font/roboto_light.ttf b/core/designsystem/src/main/res/font/roboto_light.ttf
diff --git a/core/designsystem/src/main/res/font/roboto_thin.ttf b/core/designsystem/src/main/res/font/roboto_thin.ttf
diff --git a/data/cloud/src/main/java/com/twofasapp/data/cloud/googledrive/GoogleDriveImpl.kt b/data/cloud/src/main/java/com/twofasapp/data/cloud/googledrive/GoogleDriveImpl.kt
@@ -178,7 +178,7 @@ internal class GoogleDriveImpl(
             GsonFactory(),
             googleAccountCredential
         )
-            .setApplicationName("2FAS")
+            .setApplicationName("Anexia Authenticator")
             .build()
     }
 }
diff --git a/feature/widget/src/main/res/values-night/colors.xml b/feature/widget/src/main/res/values-night/colors.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="primary">#ED1C24</color>
+    <color name="primary">#77BC1F</color>
     <color name="background">#101116</color>
     <color name="onSurface">#FFFFFF</color>
     <color name="iconTint">#636363</color>

diff --git a/feature/widget/src/main/res/values/colors.xml b/feature/widget/src/main/res/values/colors.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="primary">#ED1C24</color>
+    <color name="primary">#77BC1F</color>
     <color name="background">#FFFFFF</color>
     <color name="onSurface">#000000</color>
     <color name="iconTint">#FF9E9E9E</color>