Merge pull request #136 from code-payments/fix/avenir-demi-font-metrics

fix(typography): update demi OTF to fix corrupt font metrics

Author: bmc08gt

app/src/main/java/com/getcode/theme/Theme.kt

@@ -180,5 +180,4 @@ fun inputColors() = TextFieldDefaults.textFieldColors(
     focusedIndicatorColor = Color.Transparent,
     unfocusedIndicatorColor = Color.Transparent,
     cursorColor = Color.White,
-
 )

app/src/main/java/com/getcode/theme/Type.kt

@@ -2,19 +2,27 @@ package com.getcode.theme
 
 import androidx.compose.material.Typography
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.text.ExperimentalTextApi
+import androidx.compose.ui.text.PlatformTextStyle
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.Font
 import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontVariation
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.sp
 import com.getcode.R
 
 private val Avenir = FontFamily(
+    Font(R.font.avenir_next_regular, FontWeight.Thin),
+    Font(R.font.avenir_next_regular, FontWeight.ExtraLight),
     Font(R.font.avenir_next_regular, FontWeight.Light),
     Font(R.font.avenir_next_regular, FontWeight.Normal),
-    Font(R.font.avenir_next_demi, FontWeight.Medium),
-    Font(R.font.avenir_next_demi, FontWeight.SemiBold)
+    Font(R.font.avenir_next_medium, FontWeight.Medium),
+    Font(R.font.avenir_next_demi, FontWeight.SemiBold),
+    Font(R.font.avenir_next_demi, FontWeight.Bold),
+    Font(R.font.avenir_next_demi, FontWeight.ExtraBold),
+    Font(R.font.avenir_next_demi, FontWeight.Black)
 )
 
 private val RobotoMono = FontFamily(
@@ -65,7 +73,7 @@ internal val typography = Typography(
         fontFamily = Avenir,
         fontSize = 20.sp,
         fontWeight = FontWeight.SemiBold,
-        lineHeight = 26.sp
+        lineHeight = 26.sp,
     ),
     subtitle2 = TextStyle( //Screen Title
         fontFamily = Avenir,

app/src/main/java/com/getcode/view/login/BaseAccessKeyViewModel.kt

@@ -213,7 +213,7 @@ abstract class BaseAccessKeyViewModel(private val resources: ResourceHelper) :
         return imageOut
     }
 
-    internal fun getQrCode(entropyB64: String): Bitmap? {
+    private fun getQrCode(entropyB64: String): Bitmap? {
         val base58 = Base58.encode(entropyB64.decodeBase64())
         val url = "${resources.getString(R.string.root_url_app)}/login?data=$base58"
 
@@ -235,7 +235,7 @@ abstract class BaseAccessKeyViewModel(private val resources: ResourceHelper) :
         textPaint.color = color
         textPaint.textSize = sizePx.toFloat()
         textPaint.typeface = Typeface.create(
-            resources.getFont(R.font.avenir),
+            resources.getFont(R.font.avenir_next_demi),
             Typeface.BOLD
         )
 
@@ -245,17 +245,17 @@ abstract class BaseAccessKeyViewModel(private val resources: ResourceHelper) :
         canvas.drawText(text, xV.toFloat(), y.toFloat(), textPaint)
     }
 
-    internal fun getAccessKeySaveError() = TopBarManager.TopBarMessage(
+    private fun getAccessKeySaveError() = TopBarManager.TopBarMessage(
         resources.getString(R.string.error_title_failedToSave),
         resources.getString(R.string.error_description_failedToSave),
     )
 
-    internal fun getDeniedError() = TopBarManager.TopBarMessage(
+    private fun getDeniedError() = TopBarManager.TopBarMessage(
         resources.getString(R.string.error_title_tooManyAccounts),
         resources.getString(R.string.error_description_tooManyAccounts)
     )
 
-    internal fun getGenericError() = TopBarManager.TopBarMessage(
+    private fun getGenericError() = TopBarManager.TopBarMessage(
         resources.getString(R.string.error_title_failedToVerifyPhone),
         resources.getString(R.string.error_description_failedToVerifyPhone),
     )