diff --git a/app/src/main/java/com/starry/myne/ui/common/BookDetailTopUI.kt b/app/src/main/java/com/starry/myne/ui/common/BookDetailTopUI.kt index c99f44a5..05b63030 100644 --- a/app/src/main/java/com/starry/myne/ui/common/BookDetailTopUI.kt +++ b/app/src/main/java/com/starry/myne/ui/common/BookDetailTopUI.kt @@ -51,7 +51,7 @@ import coil.compose.AsyncImage import coil.request.ImageRequest import com.starry.myne.R import com.starry.myne.ui.screens.settings.viewmodels.ThemeMode -import com.starry.myne.ui.theme.figeronaFont +import com.starry.myne.ui.theme.poppinsFont @Composable fun BookDetailTopUI( @@ -135,7 +135,7 @@ fun BookDetailTopUI( ) .fillMaxWidth(), fontSize = 24.sp, - fontFamily = figeronaFont, + fontFamily = poppinsFont, maxLines = 3, overflow = TextOverflow.Ellipsis, fontWeight = FontWeight.Bold, @@ -148,7 +148,7 @@ fun BookDetailTopUI( start = 12.dp, end = 8.dp, top = 4.dp ), fontSize = 18.sp, - fontFamily = figeronaFont, + fontFamily = poppinsFont, fontWeight = FontWeight.SemiBold, maxLines = 2, overflow = TextOverflow.Ellipsis, @@ -162,7 +162,7 @@ fun BookDetailTopUI( start = 12.dp, end = 8.dp, top = 8.dp ), fontSize = 16.sp, - fontFamily = figeronaFont, + fontFamily = poppinsFont, fontWeight = FontWeight.Medium, maxLines = 2, overflow = TextOverflow.Ellipsis, diff --git a/app/src/main/java/com/starry/myne/ui/common/BookItemCard.kt b/app/src/main/java/com/starry/myne/ui/common/BookItemCard.kt index 1ea7d971..3352a318 100644 --- a/app/src/main/java/com/starry/myne/ui/common/BookItemCard.kt +++ b/app/src/main/java/com/starry/myne/ui/common/BookItemCard.kt @@ -56,7 +56,7 @@ import coil.request.ImageRequest import com.starry.myne.R import com.starry.myne.helpers.weakHapticFeedback import com.starry.myne.ui.common.placeholder.placeholder -import com.starry.myne.ui.theme.figeronaFont +import com.starry.myne.ui.theme.poppinsFont @Composable @@ -122,7 +122,7 @@ fun BookItemCard( .placeholder(isLoading = loadingEffect), fontStyle = MaterialTheme.typography.headlineMedium.fontStyle, fontSize = 18.sp, - fontFamily = figeronaFont, + fontFamily = poppinsFont, fontWeight = FontWeight.Bold, maxLines = 2, overflow = TextOverflow.Ellipsis, @@ -137,7 +137,7 @@ fun BookItemCard( color = MaterialTheme.colorScheme.onSurface, maxLines = 2, fontStyle = MaterialTheme.typography.bodySmall.fontStyle, - fontFamily = figeronaFont, + fontFamily = poppinsFont, fontSize = 14.sp, ) @@ -152,7 +152,7 @@ fun BookItemCard( fontSize = 16.sp, fontWeight = FontWeight.SemiBold, fontStyle = MaterialTheme.typography.bodyMedium.fontStyle, - fontFamily = figeronaFont + fontFamily = poppinsFont ) Text( @@ -164,7 +164,7 @@ fun BookItemCard( maxLines = 2, overflow = TextOverflow.Ellipsis, fontStyle = MaterialTheme.typography.bodySmall.fontStyle, - fontFamily = figeronaFont, + fontFamily = poppinsFont, fontSize = 13.sp ) diff --git a/app/src/main/java/com/starry/myne/ui/common/BookLanguageButton.kt b/app/src/main/java/com/starry/myne/ui/common/BookLanguageButton.kt index 063b839c..4586c51a 100644 --- a/app/src/main/java/com/starry/myne/ui/common/BookLanguageButton.kt +++ b/app/src/main/java/com/starry/myne/ui/common/BookLanguageButton.kt @@ -35,7 +35,7 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.starry.myne.helpers.book.BookLanguage -import com.starry.myne.ui.theme.figeronaFont +import com.starry.myne.ui.theme.poppinsFont @Composable fun BookLanguageButton(language: BookLanguage, isSelected: Boolean, onClick: () -> Unit) { @@ -64,7 +64,7 @@ fun BookLanguageButton(language: BookLanguage, isSelected: Boolean, onClick: () text = language.name, fontSize = 18.sp, fontStyle = MaterialTheme.typography.headlineMedium.fontStyle, - fontFamily = figeronaFont, + fontFamily = poppinsFont, fontWeight = FontWeight.Bold, maxLines = 1, overflow = TextOverflow.Ellipsis, diff --git a/app/src/main/java/com/starry/myne/ui/common/NetworkError.kt b/app/src/main/java/com/starry/myne/ui/common/NetworkError.kt index 6377e0c9..44c217e7 100644 --- a/app/src/main/java/com/starry/myne/ui/common/NetworkError.kt +++ b/app/src/main/java/com/starry/myne/ui/common/NetworkError.kt @@ -47,7 +47,7 @@ import com.airbnb.lottie.compose.LottieConstants import com.airbnb.lottie.compose.animateLottieCompositionAsState import com.airbnb.lottie.compose.rememberLottieComposition import com.starry.myne.R -import com.starry.myne.ui.theme.figeronaFont +import com.starry.myne.ui.theme.poppinsFont @Composable @@ -88,7 +88,7 @@ fun NetworkError(errorMessage: String? = null, onRetryClicked: () -> Unit) { .padding(top = 10.dp, bottom = 18.dp) .fillMaxWidth(), color = MaterialTheme.colorScheme.onBackground, - fontFamily = figeronaFont, + fontFamily = poppinsFont, fontWeight = FontWeight.Medium, textAlign = TextAlign.Center ) @@ -97,7 +97,7 @@ fun NetworkError(errorMessage: String? = null, onRetryClicked: () -> Unit) { Text( text = stringResource(id = R.string.network_error_retry), fontWeight = FontWeight.Medium, - fontFamily = figeronaFont + fontFamily = poppinsFont ) } } diff --git a/app/src/main/java/com/starry/myne/ui/screens/categories/composables/CategoriesScreen.kt b/app/src/main/java/com/starry/myne/ui/screens/categories/composables/CategoriesScreen.kt index 77594f90..3b1ffc61 100644 --- a/app/src/main/java/com/starry/myne/ui/screens/categories/composables/CategoriesScreen.kt +++ b/app/src/main/java/com/starry/myne/ui/screens/categories/composables/CategoriesScreen.kt @@ -50,7 +50,7 @@ import com.starry.myne.helpers.weakHapticFeedback import com.starry.myne.ui.common.CustomTopAppBar import com.starry.myne.ui.navigation.Screens import com.starry.myne.ui.screens.main.bottomNavPadding -import com.starry.myne.ui.theme.figeronaFont +import com.starry.myne.ui.theme.poppinsFont @Composable @@ -119,7 +119,7 @@ private fun CategoriesItem(category: String, onClick: () -> Unit) { text = category, fontSize = 18.sp, fontStyle = MaterialTheme.typography.headlineMedium.fontStyle, - fontFamily = figeronaFont, + fontFamily = poppinsFont, fontWeight = FontWeight.Bold, maxLines = 1, overflow = TextOverflow.Ellipsis, diff --git a/app/src/main/java/com/starry/myne/ui/screens/detail/composables/BookDetailScreen.kt b/app/src/main/java/com/starry/myne/ui/screens/detail/composables/BookDetailScreen.kt index 6b39a7e4..1aa115b1 100644 --- a/app/src/main/java/com/starry/myne/ui/screens/detail/composables/BookDetailScreen.kt +++ b/app/src/main/java/com/starry/myne/ui/screens/detail/composables/BookDetailScreen.kt @@ -92,7 +92,7 @@ import com.starry.myne.ui.common.BookDetailTopUI import com.starry.myne.ui.common.NetworkError import com.starry.myne.ui.common.ProgressDots import com.starry.myne.ui.screens.detail.viewmodels.BookDetailViewModel -import com.starry.myne.ui.theme.figeronaFont +import com.starry.myne.ui.theme.poppinsFont import com.starry.myne.ui.theme.pacificoFont import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch @@ -316,7 +316,7 @@ private fun BookDetailContents( text = stringResource(id = R.string.book_synopsis), modifier = Modifier.padding(start = 12.dp, end = 8.dp), fontSize = 20.sp, - fontFamily = figeronaFont, + fontFamily = poppinsFont, fontWeight = FontWeight.Bold, color = MaterialTheme.colorScheme.onBackground, ) @@ -326,7 +326,7 @@ private fun BookDetailContents( Text( text = synopsis, modifier = Modifier.padding(14.dp), - fontFamily = figeronaFont, + fontFamily = poppinsFont, fontWeight = FontWeight.Medium, color = MaterialTheme.colorScheme.onBackground, ) @@ -405,7 +405,7 @@ private fun MiddleBar( text = bookLang, modifier = Modifier.padding(top = 14.dp, bottom = 14.dp, start = 4.dp), fontSize = 18.sp, - fontFamily = figeronaFont, + fontFamily = poppinsFont, fontWeight = FontWeight.SemiBold, color = MaterialTheme.colorScheme.onBackground, ) @@ -434,7 +434,7 @@ private fun MiddleBar( text = pageCount, modifier = Modifier.padding(top = 14.dp, bottom = 14.dp, start = 4.dp), fontSize = 18.sp, - fontFamily = figeronaFont, + fontFamily = poppinsFont, fontWeight = FontWeight.SemiBold, color = MaterialTheme.colorScheme.onBackground, ) @@ -462,7 +462,7 @@ private fun MiddleBar( text = downloadCount, modifier = Modifier.padding(top = 14.dp, bottom = 14.dp, start = 4.dp), fontSize = 18.sp, - fontFamily = figeronaFont, + fontFamily = poppinsFont, fontWeight = FontWeight.SemiBold, color = MaterialTheme.colorScheme.onBackground, ) @@ -486,7 +486,7 @@ private fun MiddleBar( Text( text = buttonText, fontSize = 18.sp, - fontFamily = figeronaFont, + fontFamily = poppinsFont, fontWeight = FontWeight.SemiBold, color = MaterialTheme.colorScheme.onPrimaryContainer, ) @@ -580,7 +580,7 @@ private fun NoSynopsisUI() { Text( text = stringResource(id = R.string.book_synopsis_not_found), modifier = Modifier.padding(14.dp), - fontFamily = figeronaFont, + fontFamily = poppinsFont, fontWeight = FontWeight.Medium, color = MaterialTheme.colorScheme.onBackground, ) diff --git a/app/src/main/java/com/starry/myne/ui/screens/home/composables/HomeScreen.kt b/app/src/main/java/com/starry/myne/ui/screens/home/composables/HomeScreen.kt index 9e3f0c4d..8607e5fe 100644 --- a/app/src/main/java/com/starry/myne/ui/screens/home/composables/HomeScreen.kt +++ b/app/src/main/java/com/starry/myne/ui/screens/home/composables/HomeScreen.kt @@ -96,7 +96,7 @@ import com.starry.myne.ui.screens.home.viewmodels.HomeViewModel import com.starry.myne.ui.screens.home.viewmodels.SearchBarState import com.starry.myne.ui.screens.home.viewmodels.UserAction import com.starry.myne.ui.screens.main.bottomNavPadding -import com.starry.myne.ui.theme.figeronaFont +import com.starry.myne.ui.theme.poppinsFont import com.starry.myne.ui.theme.pacificoFont import kotlinx.coroutines.delay @@ -459,7 +459,7 @@ private fun SearchAppBar( placeholder = { Text( text = "Search...", - fontFamily = figeronaFont, + fontFamily = poppinsFont, color = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.5f) ) }, diff --git a/app/src/main/java/com/starry/myne/ui/screens/library/composables/LibraryScreen.kt b/app/src/main/java/com/starry/myne/ui/screens/library/composables/LibraryScreen.kt index 5fa81a26..01b79454 100644 --- a/app/src/main/java/com/starry/myne/ui/screens/library/composables/LibraryScreen.kt +++ b/app/src/main/java/com/starry/myne/ui/screens/library/composables/LibraryScreen.kt @@ -110,7 +110,7 @@ import com.starry.myne.ui.screens.library.viewmodels.LibraryViewModel import com.starry.myne.ui.screens.main.bottomNavPadding import com.starry.myne.ui.screens.settings.viewmodels.SettingsViewModel import com.starry.myne.ui.screens.settings.viewmodels.ThemeMode -import com.starry.myne.ui.theme.figeronaFont +import com.starry.myne.ui.theme.poppinsFont import kotlinx.coroutines.delay import kotlinx.coroutines.launch import me.saket.swipe.SwipeAction @@ -235,7 +235,7 @@ fun LibraryScreen(navController: NavController) { Text( text = stringResource(id = R.string.import_button_text), fontWeight = FontWeight.Medium, - fontFamily = figeronaFont, + fontFamily = poppinsFont, fontSize = 14.sp, color = MaterialTheme.colorScheme.onPrimaryContainer ) @@ -273,7 +273,7 @@ fun LibraryScreen(navController: NavController) { Spacer(modifier = Modifier.width(24.dp)) Text( text = stringResource(id = R.string.epub_importing), - fontFamily = figeronaFont, + fontFamily = poppinsFont, fontWeight = FontWeight.Medium, fontSize = 17.sp, ) @@ -521,7 +521,7 @@ private fun LibraryCard( text = title, fontStyle = MaterialTheme.typography.headlineMedium.fontStyle, fontSize = 20.sp, - fontFamily = figeronaFont, + fontFamily = poppinsFont, fontWeight = FontWeight.SemiBold, maxLines = 1, overflow = TextOverflow.Ellipsis, @@ -533,7 +533,7 @@ private fun LibraryCard( color = MaterialTheme.colorScheme.onSurface, maxLines = 1, fontStyle = MaterialTheme.typography.bodySmall.fontStyle, - fontFamily = figeronaFont, + fontFamily = poppinsFont, fontWeight = FontWeight.Medium, fontSize = 16.sp, ) @@ -543,7 +543,7 @@ private fun LibraryCard( Row { Text( text = fileSize, - fontFamily = figeronaFont, + fontFamily = poppinsFont, color = MaterialTheme.colorScheme.onSurface, fontWeight = FontWeight.Light, fontSize = 14.sp, @@ -558,7 +558,7 @@ private fun LibraryCard( ) Text( text = date, - fontFamily = figeronaFont, + fontFamily = poppinsFont, color = MaterialTheme.colorScheme.onSurface, fontWeight = FontWeight.Light, fontSize = 14.sp, @@ -611,7 +611,7 @@ private fun LibraryCardButton( Text( text = text, fontWeight = FontWeight.Medium, - fontFamily = figeronaFont, + fontFamily = poppinsFont, fontSize = 14.sp, color = MaterialTheme.colorScheme.onSurface, modifier = Modifier.padding(start = 2.dp), diff --git a/app/src/main/java/com/starry/myne/ui/screens/main/MainScreen.kt b/app/src/main/java/com/starry/myne/ui/screens/main/MainScreen.kt index babd3f2f..5497f786 100644 --- a/app/src/main/java/com/starry/myne/ui/screens/main/MainScreen.kt +++ b/app/src/main/java/com/starry/myne/ui/screens/main/MainScreen.kt @@ -61,7 +61,7 @@ import com.starry.myne.helpers.NetworkObserver import com.starry.myne.ui.navigation.BottomBarScreen import com.starry.myne.ui.navigation.NavGraph import com.starry.myne.ui.navigation.Screens -import com.starry.myne.ui.theme.figeronaFont +import com.starry.myne.ui.theme.poppinsFont /** * Padding for the bottom navigation bar. @@ -171,7 +171,7 @@ private fun CustomBottomNavigationItem( Text( text = stringResource(id = screen.title), color = contentColor, - fontFamily = figeronaFont, + fontFamily = poppinsFont, fontSize = 14.sp, modifier = Modifier.padding(start = 4.dp) ) diff --git a/app/src/main/java/com/starry/myne/ui/screens/reader/composables/ReaderDetailScreen.kt b/app/src/main/java/com/starry/myne/ui/screens/reader/composables/ReaderDetailScreen.kt index 51f8925c..5f991ee8 100644 --- a/app/src/main/java/com/starry/myne/ui/screens/reader/composables/ReaderDetailScreen.kt +++ b/app/src/main/java/com/starry/myne/ui/screens/reader/composables/ReaderDetailScreen.kt @@ -75,7 +75,7 @@ import com.starry.myne.ui.screens.reader.activities.ReaderActivity import com.starry.myne.ui.screens.reader.activities.ReaderConstants import com.starry.myne.ui.screens.reader.viewmodels.ReaderDetailScreenState import com.starry.myne.ui.screens.reader.viewmodels.ReaderDetailViewModel -import com.starry.myne.ui.theme.figeronaFont +import com.starry.myne.ui.theme.poppinsFont @Composable @@ -223,7 +223,7 @@ private fun ChapterItem(chapterTitle: String, onClick: () -> Unit) { .weight(3f) .padding(start = 12.dp), text = chapterTitle, - fontFamily = figeronaFont, + fontFamily = poppinsFont, color = MaterialTheme.colorScheme.onSurface, fontSize = 16.sp, fontWeight = FontWeight.Bold, diff --git a/app/src/main/java/com/starry/myne/ui/screens/reader/composables/ReaderScreen.kt b/app/src/main/java/com/starry/myne/ui/screens/reader/composables/ReaderScreen.kt index 2db78518..4049081a 100644 --- a/app/src/main/java/com/starry/myne/ui/screens/reader/composables/ReaderScreen.kt +++ b/app/src/main/java/com/starry/myne/ui/screens/reader/composables/ReaderScreen.kt @@ -95,7 +95,7 @@ import androidx.compose.ui.unit.sp import com.starry.myne.R import com.starry.myne.ui.screens.reader.others.ReaderFont import com.starry.myne.ui.screens.reader.viewmodels.ReaderViewModel -import com.starry.myne.ui.theme.figeronaFont +import com.starry.myne.ui.theme.poppinsFont import kotlinx.coroutines.launch @@ -144,7 +144,7 @@ fun ReaderScreen( modifier = Modifier.padding(start = 16.dp, top = 12.dp), fontSize = 24.sp, fontWeight = FontWeight.SemiBold, - fontFamily = figeronaFont, + fontFamily = poppinsFont, color = MaterialTheme.colorScheme.onSurface ) @@ -210,7 +210,7 @@ fun ReaderScreen( overflow = TextOverflow.Ellipsis, modifier = Modifier.animateContentSize(), color = MaterialTheme.colorScheme.onSurface, - fontFamily = figeronaFont + fontFamily = poppinsFont ) } }, @@ -234,7 +234,7 @@ fun ReaderScreen( maxLines = 2, overflow = TextOverflow.Ellipsis, color = MaterialTheme.colorScheme.onSurface, - fontFamily = figeronaFont, + fontFamily = poppinsFont, fontWeight = FontWeight.Medium ) } @@ -339,7 +339,7 @@ private fun FontChooserDialog( text = text, modifier = Modifier.padding(start = 16.dp), color = MaterialTheme.colorScheme.onSurface, - fontFamily = figeronaFont + fontFamily = poppinsFont ) } } @@ -422,7 +422,7 @@ private fun TextScaleControls( ) { Text( text = viewModel.state.fontSize.toString(), - fontFamily = figeronaFont, + fontFamily = poppinsFont, fontSize = 16.sp, color = MaterialTheme.colorScheme.onSurface, modifier = Modifier.padding(start = 2.dp, bottom = 1.dp) @@ -526,4 +526,4 @@ private fun ReaderTextScaleButton( modifier = Modifier.size(ButtonDefaults.IconSize) ) } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/starry/myne/ui/screens/reader/others/ReaderFont.kt b/app/src/main/java/com/starry/myne/ui/screens/reader/others/ReaderFont.kt index 9a43b7a7..4f64ad4d 100644 --- a/app/src/main/java/com/starry/myne/ui/screens/reader/others/ReaderFont.kt +++ b/app/src/main/java/com/starry/myne/ui/screens/reader/others/ReaderFont.kt @@ -20,7 +20,7 @@ import androidx.annotation.Keep import androidx.compose.ui.text.font.Font import androidx.compose.ui.text.font.FontFamily import com.starry.myne.R -import com.starry.myne.ui.theme.figeronaFont +import com.starry.myne.ui.theme.poppinsFont @Keep sealed class ReaderFont(val id: String, val name: String, val fontFamily: FontFamily) { @@ -52,5 +52,5 @@ sealed class ReaderFont(val id: String, val name: String, val fontFamily: FontFa ReaderFont("dyslexic", "OpenDyslexic", FontFamily(Font(R.font.reader_inter_font))) @Keep - data object Lora : ReaderFont("figerona", "Figerona", figeronaFont) -} \ No newline at end of file + data object Lora : ReaderFont("poppins", "Poppins", poppinsFont) +} diff --git a/app/src/main/java/com/starry/myne/ui/screens/settings/composables/AboutScreen.kt b/app/src/main/java/com/starry/myne/ui/screens/settings/composables/AboutScreen.kt index 9db24a2b..83b7770c 100644 --- a/app/src/main/java/com/starry/myne/ui/screens/settings/composables/AboutScreen.kt +++ b/app/src/main/java/com/starry/myne/ui/screens/settings/composables/AboutScreen.kt @@ -72,7 +72,7 @@ import com.starry.myne.R import com.starry.myne.helpers.Constants import com.starry.myne.helpers.Utils import com.starry.myne.ui.common.CustomTopAppBar -import com.starry.myne.ui.theme.figeronaFont +import com.starry.myne.ui.theme.poppinsFont @Composable @@ -107,7 +107,7 @@ fun AboutScreen(navController: NavController) { .fillMaxWidth() .padding(start = 20.dp, bottom = 12.dp), fontSize = 16.sp, - fontFamily = figeronaFont, + fontFamily = poppinsFont, fontWeight = FontWeight.SemiBold, color = MaterialTheme.colorScheme.onBackground ) @@ -129,7 +129,7 @@ fun AboutScreen(navController: NavController) { .fillMaxWidth() .padding(start = 20.dp, bottom = 12.dp, top = 12.dp), fontSize = 16.sp, - fontFamily = figeronaFont, + fontFamily = poppinsFont, fontWeight = FontWeight.SemiBold, color = MaterialTheme.colorScheme.onBackground ) @@ -200,7 +200,7 @@ private fun LinkButton( Text( text = text.uppercase(), fontWeight = FontWeight.Bold, - fontFamily = figeronaFont, + fontFamily = poppinsFont, color = MaterialTheme.colorScheme.onSurface, modifier = Modifier.padding(start = 4.dp), ) @@ -265,7 +265,7 @@ private fun AppInfoCard() { Text( text = stringResource(id = R.string.app_name), fontSize = 26.sp, - fontFamily = figeronaFont, + fontFamily = poppinsFont, fontWeight = FontWeight.Bold, color = MaterialTheme.colorScheme.onBackground, textAlign = TextAlign.Center @@ -276,7 +276,7 @@ private fun AppInfoCard() { Text( text = "Version ${BuildConfig.VERSION_NAME}", fontSize = 14.sp, - fontFamily = figeronaFont, + fontFamily = poppinsFont, fontWeight = FontWeight.Normal, color = MaterialTheme.colorScheme.onBackground, textAlign = TextAlign.Center @@ -288,7 +288,7 @@ private fun AppInfoCard() { text = stringResource(id = R.string.about_desc), modifier = Modifier.padding(horizontal = 22.dp), fontSize = 14.sp, - fontFamily = figeronaFont, + fontFamily = poppinsFont, fontWeight = FontWeight.Medium, color = MaterialTheme.colorScheme.onBackground, textAlign = TextAlign.Center @@ -334,7 +334,7 @@ private fun DeveloperCard(context: Context) { Text( text = stringResource(id = R.string.dev_name), fontSize = 18.sp, - fontFamily = figeronaFont, + fontFamily = poppinsFont, fontWeight = FontWeight.SemiBold, color = MaterialTheme.colorScheme.onBackground, ) @@ -344,7 +344,7 @@ private fun DeveloperCard(context: Context) { Text( text = Constants.DEV_EMAIL, fontSize = 16.sp, - fontFamily = figeronaFont, + fontFamily = poppinsFont, fontWeight = FontWeight.Medium, color = MaterialTheme.colorScheme.onBackground, modifier = Modifier.clickable { diff --git a/app/src/main/java/com/starry/myne/ui/screens/settings/composables/SettingsItems.kt b/app/src/main/java/com/starry/myne/ui/screens/settings/composables/SettingsItems.kt index 6c568477..2b04d5b2 100644 --- a/app/src/main/java/com/starry/myne/ui/screens/settings/composables/SettingsItems.kt +++ b/app/src/main/java/com/starry/myne/ui/screens/settings/composables/SettingsItems.kt @@ -59,7 +59,7 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.starry.myne.helpers.weakHapticFeedback -import com.starry.myne.ui.theme.figeronaFont +import com.starry.myne.ui.theme.poppinsFont @Composable @@ -106,7 +106,7 @@ fun SettingItem(icon: ImageVector, mainText: String, subText: String, onClick: ( ) { Text( text = mainText, - fontFamily = figeronaFont, + fontFamily = poppinsFont, color = MaterialTheme.colorScheme.onSurface, fontSize = 14.sp, fontWeight = FontWeight.Bold, @@ -116,7 +116,7 @@ fun SettingItem(icon: ImageVector, mainText: String, subText: String, onClick: ( Text( text = subText, - fontFamily = figeronaFont, + fontFamily = poppinsFont, color = Color.Gray, fontSize = 13.sp, fontWeight = FontWeight.SemiBold, @@ -181,7 +181,7 @@ fun SettingItemWIthSwitch( ) { Text( text = mainText, - fontFamily = figeronaFont, + fontFamily = poppinsFont, color = MaterialTheme.colorScheme.onSurface, fontSize = 14.sp, fontWeight = FontWeight.Bold, @@ -191,7 +191,7 @@ fun SettingItemWIthSwitch( Text( text = subText, - fontFamily = figeronaFont, + fontFamily = poppinsFont, color = Color.Gray, fontSize = 13.sp, fontWeight = FontWeight.SemiBold, diff --git a/app/src/main/java/com/starry/myne/ui/screens/settings/composables/SettingsScreen.kt b/app/src/main/java/com/starry/myne/ui/screens/settings/composables/SettingsScreen.kt index 19ab2c9f..430ac501 100644 --- a/app/src/main/java/com/starry/myne/ui/screens/settings/composables/SettingsScreen.kt +++ b/app/src/main/java/com/starry/myne/ui/screens/settings/composables/SettingsScreen.kt @@ -90,7 +90,7 @@ import com.starry.myne.ui.navigation.Screens import com.starry.myne.ui.screens.main.bottomNavPadding import com.starry.myne.ui.screens.settings.viewmodels.SettingsViewModel import com.starry.myne.ui.screens.settings.viewmodels.ThemeMode -import com.starry.myne.ui.theme.figeronaFont +import com.starry.myne.ui.theme.poppinsFont import kotlinx.coroutines.launch @OptIn(ExperimentalMaterial3Api::class) @@ -146,7 +146,7 @@ private fun SettingsCard() { Column { Text( text = "${stringResource(id = R.string.app_name)} ${stringResource(id = R.string.app_desc)}", - fontFamily = figeronaFont, + fontFamily = poppinsFont, color = MaterialTheme.colorScheme.onSurface, fontSize = 16.sp, fontWeight = FontWeight.Bold, @@ -154,7 +154,7 @@ private fun SettingsCard() { Text( text = stringResource(id = R.string.made_by), - fontFamily = figeronaFont, + fontFamily = poppinsFont, color = MaterialTheme.colorScheme.onSurface, fontSize = 10.sp, fontWeight = FontWeight.SemiBold, @@ -171,7 +171,7 @@ private fun SettingsCard() { ) { Text( text = "version-${BuildConfig.VERSION_NAME}", - fontFamily = figeronaFont, + fontFamily = poppinsFont, color = MaterialTheme.colorScheme.onPrimary, fontSize = 12.sp, fontWeight = FontWeight.Bold @@ -225,7 +225,7 @@ private fun GeneralOptionsUI( ) { Text( text = stringResource(id = R.string.general_settings_header), - fontFamily = figeronaFont, + fontFamily = poppinsFont, color = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.8f), fontSize = 14.sp, fontWeight = FontWeight.Bold, @@ -303,7 +303,7 @@ private fun GeneralOptionsUI( text = text, modifier = Modifier.padding(start = 16.dp), color = MaterialTheme.colorScheme.onSurface, - fontFamily = figeronaFont + fontFamily = poppinsFont ) } } @@ -386,7 +386,7 @@ private fun DisplayOptionsUI( ) { Text( text = stringResource(id = R.string.display_setting_header), - fontFamily = figeronaFont, + fontFamily = poppinsFont, color = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.8f), fontSize = 14.sp, fontWeight = FontWeight.Bold, @@ -464,7 +464,7 @@ private fun DisplayOptionsUI( text = text, modifier = Modifier.padding(start = 16.dp), color = MaterialTheme.colorScheme.onSurface, - fontFamily = figeronaFont + fontFamily = poppinsFont ) } } @@ -514,7 +514,7 @@ private fun InformationUI(navController: NavController) { ) { Text( text = stringResource(id = R.string.miscellaneous_setting_header), - fontFamily = figeronaFont, + fontFamily = poppinsFont, color = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.8f), fontSize = 14.sp, fontWeight = FontWeight.Bold, diff --git a/app/src/main/java/com/starry/myne/ui/screens/welcome/composables/WelcomeScreen.kt b/app/src/main/java/com/starry/myne/ui/screens/welcome/composables/WelcomeScreen.kt index 38913e8d..5cf8a8f8 100644 --- a/app/src/main/java/com/starry/myne/ui/screens/welcome/composables/WelcomeScreen.kt +++ b/app/src/main/java/com/starry/myne/ui/screens/welcome/composables/WelcomeScreen.kt @@ -73,7 +73,7 @@ import com.starry.myne.helpers.weakHapticFeedback import com.starry.myne.ui.common.SlideInAnimatedContainer import com.starry.myne.ui.navigation.BottomBarScreen import com.starry.myne.ui.screens.welcome.viewmodels.WelcomeViewModel -import com.starry.myne.ui.theme.figeronaFont +import com.starry.myne.ui.theme.poppinsFont import com.starry.myne.ui.theme.pacificoFont @Composable @@ -291,7 +291,7 @@ private fun ReaderDialog( text = text, modifier = Modifier.padding(start = 16.dp), color = MaterialTheme.colorScheme.onSurface, - fontFamily = figeronaFont + fontFamily = poppinsFont ) } } diff --git a/app/src/main/java/com/starry/myne/ui/theme/Type.kt b/app/src/main/java/com/starry/myne/ui/theme/Type.kt index 0e8bbb04..9716b1d6 100644 --- a/app/src/main/java/com/starry/myne/ui/theme/Type.kt +++ b/app/src/main/java/com/starry/myne/ui/theme/Type.kt @@ -21,49 +21,59 @@ 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.FontStyle import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.LineHeightStyle import androidx.compose.ui.unit.sp import com.starry.myne.R -val figeronaFont = FontFamily( +val poppinsFont = FontFamily( fonts = listOf( Font( - resId = R.font.figerona_black, - weight = FontWeight.Black + resId = R.font.poppins_black, + weight = FontWeight.Black, + style = FontStyle.Normal ), Font( - resId = R.font.figerona_bold, - weight = FontWeight.Bold + resId = R.font.poppins_bold, + weight = FontWeight.Bold, + style = FontStyle.Normal ), Font( - resId = R.font.figerona_extrabold, - weight = FontWeight.ExtraBold + resId = R.font.poppins_extrabold, + weight = FontWeight.ExtraBold, + style = FontStyle.Normal ), Font( - resId = R.font.figerona_extralight, - weight = FontWeight.ExtraLight + resId = R.font.poppins_extralight, + weight = FontWeight.ExtraLight, + style = FontStyle.Normal ), Font( - resId = R.font.figerona_light, - weight = FontWeight.Light + resId = R.font.poppins_light, + weight = FontWeight.Light, + style = FontStyle.Normal ), Font( - resId = R.font.figerona_medium, - weight = FontWeight.Medium + resId = R.font.poppins_medium, + weight = FontWeight.Medium, + style = FontStyle.Normal ), Font( - resId = R.font.figerona_regular, - weight = FontWeight.Normal + resId = R.font.poppins_regular, + weight = FontWeight.Normal, + style = FontStyle.Normal ), Font( - resId = R.font.figerona_semibold, - weight = FontWeight.SemiBold + resId = R.font.poppins_semibold, + weight = FontWeight.SemiBold, + style = FontStyle.Normal ), Font( - resId = R.font.figerona_thin, - weight = FontWeight.Thin + resId = R.font.poppins_thin, + weight = FontWeight.Thin, + style = FontStyle.Normal ), ) ) @@ -73,7 +83,7 @@ val pacificoFont = FontFamily(Font(R.font.pacifico_regular)) // Set of Material typography styles to start with val Typography = Typography( bodyLarge = TextStyle( - fontFamily = figeronaFont, + fontFamily = poppinsFont, fontWeight = FontWeight.Normal, fontSize = 16.sp, lineHeight = 24.sp, @@ -84,4 +94,4 @@ val Typography = Typography( ), platformStyle = PlatformTextStyle(includeFontPadding = true) ) -) \ No newline at end of file +) diff --git a/app/src/main/res/font/figerona_black.otf b/app/src/main/res/font/figerona_black.otf deleted file mode 100644 index a71fa653..00000000 Binary files a/app/src/main/res/font/figerona_black.otf and /dev/null differ diff --git a/app/src/main/res/font/figerona_bold.otf b/app/src/main/res/font/figerona_bold.otf deleted file mode 100644 index afcf48cd..00000000 Binary files a/app/src/main/res/font/figerona_bold.otf and /dev/null differ diff --git a/app/src/main/res/font/figerona_extrabold.otf b/app/src/main/res/font/figerona_extrabold.otf deleted file mode 100644 index 1b9f3c26..00000000 Binary files a/app/src/main/res/font/figerona_extrabold.otf and /dev/null differ diff --git a/app/src/main/res/font/figerona_extralight.otf b/app/src/main/res/font/figerona_extralight.otf deleted file mode 100644 index c6169dc6..00000000 Binary files a/app/src/main/res/font/figerona_extralight.otf and /dev/null differ diff --git a/app/src/main/res/font/figerona_light.otf b/app/src/main/res/font/figerona_light.otf deleted file mode 100644 index 21896d2d..00000000 Binary files a/app/src/main/res/font/figerona_light.otf and /dev/null differ diff --git a/app/src/main/res/font/figerona_medium.otf b/app/src/main/res/font/figerona_medium.otf deleted file mode 100644 index fbedff13..00000000 Binary files a/app/src/main/res/font/figerona_medium.otf and /dev/null differ diff --git a/app/src/main/res/font/figerona_regular.otf b/app/src/main/res/font/figerona_regular.otf deleted file mode 100644 index 13b40c82..00000000 Binary files a/app/src/main/res/font/figerona_regular.otf and /dev/null differ diff --git a/app/src/main/res/font/figerona_semibold.otf b/app/src/main/res/font/figerona_semibold.otf deleted file mode 100644 index 023a684b..00000000 Binary files a/app/src/main/res/font/figerona_semibold.otf and /dev/null differ diff --git a/app/src/main/res/font/figerona_thin.otf b/app/src/main/res/font/figerona_thin.otf deleted file mode 100644 index e1740fd5..00000000 Binary files a/app/src/main/res/font/figerona_thin.otf and /dev/null differ diff --git a/app/src/main/res/font/poppins_black.ttf b/app/src/main/res/font/poppins_black.ttf new file mode 100644 index 00000000..71c0f995 Binary files /dev/null and b/app/src/main/res/font/poppins_black.ttf differ diff --git a/app/src/main/res/font/poppins_bold.ttf b/app/src/main/res/font/poppins_bold.ttf new file mode 100644 index 00000000..00559eeb Binary files /dev/null and b/app/src/main/res/font/poppins_bold.ttf differ diff --git a/app/src/main/res/font/poppins_extrabold.ttf b/app/src/main/res/font/poppins_extrabold.ttf new file mode 100644 index 00000000..df709360 Binary files /dev/null and b/app/src/main/res/font/poppins_extrabold.ttf differ diff --git a/app/src/main/res/font/poppins_extralight.ttf b/app/src/main/res/font/poppins_extralight.ttf new file mode 100644 index 00000000..e76ec69a Binary files /dev/null and b/app/src/main/res/font/poppins_extralight.ttf differ diff --git a/app/src/main/res/font/poppins_light.ttf b/app/src/main/res/font/poppins_light.ttf new file mode 100644 index 00000000..bc36bcc2 Binary files /dev/null and b/app/src/main/res/font/poppins_light.ttf differ diff --git a/app/src/main/res/font/poppins_medium.ttf b/app/src/main/res/font/poppins_medium.ttf new file mode 100644 index 00000000..6bcdcc27 Binary files /dev/null and b/app/src/main/res/font/poppins_medium.ttf differ diff --git a/app/src/main/res/font/poppins_regular.ttf b/app/src/main/res/font/poppins_regular.ttf new file mode 100644 index 00000000..9f0c71b7 Binary files /dev/null and b/app/src/main/res/font/poppins_regular.ttf differ diff --git a/app/src/main/res/font/poppins_semibold.ttf b/app/src/main/res/font/poppins_semibold.ttf new file mode 100644 index 00000000..74c726e3 Binary files /dev/null and b/app/src/main/res/font/poppins_semibold.ttf differ diff --git a/app/src/main/res/font/poppins_thin.ttf b/app/src/main/res/font/poppins_thin.ttf new file mode 100644 index 00000000..03e73661 Binary files /dev/null and b/app/src/main/res/font/poppins_thin.ttf differ