zec
/
secant-android-wallet
mirror of https://github.com/zcash/secant-android-wallet.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[#917] Use Inter font

This commit is contained in:
Honza Rychnovský 2023-08-03 16:02:51 +02:00 committed by GitHub
parent ebc2061916
commit 3c751a5893
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/Third party licenses.md
View File

@ -5,5 +5,5 @@ The majority of the contents of this Git repository are covered under the [LICEN
## Electric Coin Company copyrights trademarks
## Rubik Font
We use fonts from Rubik font family. The fonts are downloaded from [Google Fonts](https://fonts.google.com/specimen/Rubik) and are licensed under the [Open Font License](https://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=OFL).
## Inter Font
We use fonts from Inter font family. The fonts are downloaded from [Google Fonts](https://fonts.google.com/specimen/Inter) and are licensed under the [Open Font License](https://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=OFL).

24
ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/theme/internal/Typography.kt
View File

@ -3,7 +3,6 @@ package co.electriccoin.zcash.ui.design.theme.internal
import androidx.compose.material3.Typography
import androidx.compose.runtime.Immutable
import androidx.compose.runtime.staticCompositionLocalOf
import androidx.compose.ui.text.ExperimentalTextApi
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.font.Font
import androidx.compose.ui.text.font.FontFamily
@ -14,7 +13,6 @@ import androidx.compose.ui.text.style.BaselineShift
import androidx.compose.ui.unit.sp
import co.electriccoin.zcash.ui.design.R
@OptIn(ExperimentalTextApi::class)
private val provider = GoogleFont.Provider(
providerAuthority = "com.google.android.gms.fonts",
providerPackage = "com.google.android.gms",
@ -23,15 +21,13 @@ private val provider = GoogleFont.Provider(
// We use bestEffort here to be able to get the closest font weight, if accidentally use
// an unspecified font weight and not the default one.
@OptIn(ExperimentalTextApi::class)
private val RubikFont = GoogleFont(name = "Rubik", bestEffort = true)
private val InterFont = GoogleFont(name = "Inter", bestEffort = true)
@OptIn(ExperimentalTextApi::class)
private val RubikFontFamily = FontFamily(
Font(googleFont = RubikFont, fontProvider = provider, weight = FontWeight.Normal), // W400
Font(googleFont = RubikFont, fontProvider = provider, weight = FontWeight.Medium), // W500
Font(googleFont = RubikFont, fontProvider = provider, weight = FontWeight.SemiBold), // W600
Font(googleFont = RubikFont, fontProvider = provider, weight = FontWeight.Bold) // W700
private val InterFontFamily = FontFamily(
Font(googleFont = InterFont, fontProvider = provider, weight = FontWeight.Normal), // W400
Font(googleFont = InterFont, fontProvider = provider, weight = FontWeight.Medium), // W500
Font(googleFont = InterFont, fontProvider = provider, weight = FontWeight.SemiBold), // W600
Font(googleFont = InterFont, fontProvider = provider, weight = FontWeight.Bold) // W700
)
private val Zboto = FontFamily(
@ -42,22 +38,22 @@ private val Zboto = FontFamily(
// the defined font weights above, otherwise the closest one will be used.
internal val Typography = Typography(
headlineLarge = TextStyle(
fontFamily = RubikFontFamily,
fontFamily = InterFontFamily,
fontWeight = FontWeight.SemiBold,
fontSize = 30.sp
),
bodyLarge = TextStyle(
fontFamily = RubikFontFamily,
fontFamily = InterFontFamily,
fontWeight = FontWeight.Normal,
fontSize = 16.sp
),
bodySmall = TextStyle(
fontFamily = RubikFontFamily,
fontFamily = InterFontFamily,
fontWeight = FontWeight.Medium,
fontSize = 16.sp
),
labelLarge = TextStyle(
fontFamily = RubikFontFamily,
fontFamily = InterFontFamily,
fontWeight = FontWeight.Normal,
fontSize = 16.sp
)

2
ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/common/ScreenSecurityTest.kt
View File

@ -9,7 +9,6 @@ import androidx.compose.ui.test.junit4.createComposeRule
import androidx.test.filters.MediumTest
import co.electriccoin.zcash.test.UiTestPrerequisites
import co.electriccoin.zcash.ui.design.theme.ZcashTheme
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.update
import kotlinx.coroutines.test.runTest
@ -17,7 +16,6 @@ import org.junit.Rule
import org.junit.Test
import kotlin.test.assertEquals
@OptIn(ExperimentalCoroutinesApi::class)
class ScreenSecurityTest : UiTestPrerequisites() {
@get:Rule
val composeTestRule = createComposeRule()