diff --git a/app/src/main/java/org/nsh07/pomodoro/ui/AppScreen.kt b/app/src/main/java/org/nsh07/pomodoro/ui/AppScreen.kt index e5383fa..1159c92 100644 --- a/app/src/main/java/org/nsh07/pomodoro/ui/AppScreen.kt +++ b/app/src/main/java/org/nsh07/pomodoro/ui/AppScreen.kt @@ -22,6 +22,7 @@ import androidx.compose.material3.MaterialTheme.colorScheme import androidx.compose.material3.MaterialTheme.typography import androidx.compose.material3.Scaffold import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBar import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @@ -31,12 +32,30 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import org.nsh07.pomodoro.R -import org.nsh07.pomodoro.ui.theme.OpenRundeFontFamily.openRundeClock +import org.nsh07.pomodoro.ui.theme.AppFonts.interDisplayBlack +import org.nsh07.pomodoro.ui.theme.AppFonts.openRundeClock @OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class) @Composable fun AppScreen(modifier: Modifier = Modifier) { Scaffold( + topBar = { + TopAppBar( + title = { + Text( + "Focus", + style = TextStyle( + fontFamily = interDisplayBlack, + fontSize = 32.sp, + lineHeight = 32.sp, + color = colorScheme.onPrimaryContainer + ) + ) + }, + subtitle = {}, + titleHorizontalAlignment = Alignment.CenterHorizontally + ) + }, modifier = modifier.fillMaxSize() ) { insets -> Column( diff --git a/app/src/main/java/org/nsh07/pomodoro/ui/theme/Type.kt b/app/src/main/java/org/nsh07/pomodoro/ui/theme/Type.kt index 7963446..a6dd4ac 100644 --- a/app/src/main/java/org/nsh07/pomodoro/ui/theme/Type.kt +++ b/app/src/main/java/org/nsh07/pomodoro/ui/theme/Type.kt @@ -19,8 +19,11 @@ val Typography = Typography( ) ) -object OpenRundeFontFamily { +object AppFonts { val openRundeClock = FontFamily( Font(R.font.open_runde_bold_clock_only, FontWeight.Bold) ) + val interDisplayBlack = FontFamily( + Font(R.font.inter_display_black, FontWeight.Black) + ) } \ No newline at end of file diff --git a/app/src/main/res/font/inter_display_black.otf b/app/src/main/res/font/inter_display_black.otf new file mode 100644 index 0000000..d698536 Binary files /dev/null and b/app/src/main/res/font/inter_display_black.otf differ