diff --git a/app/build.gradle b/app/build.gradle index 1a1c997e..e62a25df 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -114,6 +114,10 @@ android { } } +aboutLibraries { + configPath = "config" +} + dependencies { // Jetpack Compose def composeVersion = "1.5.0" @@ -164,7 +168,7 @@ dependencies { implementation "de.c1710:filemojicompat-autoinit:3.2.5" // OSS licenses - implementation "com.mikepenz:aboutlibraries-compose:10.8.3" + implementation "com.mikepenz:aboutlibraries-compose:11.1.3" // Feature flags implementation "io.getunleash:unleash-android-proxy-sdk:0.5.5" diff --git a/app/src/main/kotlin/de/hbch/traewelling/theme/Type.kt b/app/src/main/kotlin/de/hbch/traewelling/theme/Type.kt index 30c5d975..a004e5cf 100644 --- a/app/src/main/kotlin/de/hbch/traewelling/theme/Type.kt +++ b/app/src/main/kotlin/de/hbch/traewelling/theme/Type.kt @@ -5,25 +5,28 @@ import androidx.compose.ui.text.font.Font import androidx.compose.ui.text.font.FontFamily import de.hbch.traewelling.R -val raleway = FontFamily(Font(R.font.raleway)) +val RalewayFont = Font(R.font.raleway) +val TwindexxFont = Font(R.font.ae_matrix16_twindexx_standard) +val Raleway = FontFamily(RalewayFont) +val Twindexx = FontFamily(TwindexxFont) private val defaultTypography = Typography() val AppTypography = Typography( - displayLarge = defaultTypography.displayLarge.copy(fontFamily = raleway), - displayMedium = defaultTypography.displayMedium.copy(fontFamily = raleway), - displaySmall = defaultTypography.displaySmall.copy(fontFamily = raleway), - headlineLarge = defaultTypography.headlineLarge.copy(fontFamily = raleway), - headlineMedium = defaultTypography.headlineMedium.copy(fontFamily = raleway), - headlineSmall = defaultTypography.headlineSmall.copy(fontFamily = raleway), - titleLarge = defaultTypography.titleLarge.copy(fontFamily = raleway), - titleMedium = defaultTypography.titleMedium.copy(fontFamily = raleway), - titleSmall = defaultTypography.titleSmall.copy(fontFamily = raleway), - bodyLarge = defaultTypography.bodyLarge.copy(fontFamily = raleway), - bodyMedium = defaultTypography.bodyMedium.copy(fontFamily = raleway), - bodySmall = defaultTypography.bodySmall.copy(fontFamily = raleway), - labelLarge = defaultTypography.labelLarge.copy(fontFamily = raleway), - labelMedium = defaultTypography.labelMedium.copy(fontFamily = raleway), - labelSmall = defaultTypography.labelSmall.copy(fontFamily = raleway) + displayLarge = defaultTypography.displayLarge.copy(fontFamily = Raleway), + displayMedium = defaultTypography.displayMedium.copy(fontFamily = Raleway), + displaySmall = defaultTypography.displaySmall.copy(fontFamily = Raleway), + headlineLarge = defaultTypography.headlineLarge.copy(fontFamily = Raleway), + headlineMedium = defaultTypography.headlineMedium.copy(fontFamily = Raleway), + headlineSmall = defaultTypography.headlineSmall.copy(fontFamily = Raleway), + titleLarge = defaultTypography.titleLarge.copy(fontFamily = Raleway), + titleMedium = defaultTypography.titleMedium.copy(fontFamily = Raleway), + titleSmall = defaultTypography.titleSmall.copy(fontFamily = Raleway), + bodyLarge = defaultTypography.bodyLarge.copy(fontFamily = Raleway), + bodyMedium = defaultTypography.bodyMedium.copy(fontFamily = Raleway), + bodySmall = defaultTypography.bodySmall.copy(fontFamily = Raleway), + labelLarge = defaultTypography.labelLarge.copy(fontFamily = Raleway), + labelMedium = defaultTypography.labelMedium.copy(fontFamily = Raleway), + labelSmall = defaultTypography.labelSmall.copy(fontFamily = Raleway) ) val LineIconStyle = defaultTypography.bodyMedium diff --git a/app/src/main/kotlin/de/hbch/traewelling/ui/include/cardSearchStation/CardSearch.kt b/app/src/main/kotlin/de/hbch/traewelling/ui/include/cardSearchStation/CardSearch.kt index 903bd7e0..7ea863bd 100644 --- a/app/src/main/kotlin/de/hbch/traewelling/ui/include/cardSearchStation/CardSearch.kt +++ b/app/src/main/kotlin/de/hbch/traewelling/ui/include/cardSearchStation/CardSearch.kt @@ -14,6 +14,8 @@ import androidx.lifecycle.LiveData import de.hbch.traewelling.api.models.station.Station import de.hbch.traewelling.api.models.user.User import de.hbch.traewelling.theme.AppTypography +import de.hbch.traewelling.theme.LocalColorScheme +import de.hbch.traewelling.theme.Twindexx import de.hbch.traewelling.ui.search.Search import de.hbch.traewelling.util.getGreeting @@ -38,8 +40,10 @@ fun CardSearch( ) { Text( text = getGreeting(), - style = AppTypography.headlineSmall, - modifier = Modifier.padding(8.dp) + style = AppTypography.headlineLarge, + modifier = Modifier.padding(8.dp), + fontFamily = Twindexx, + color = LocalColorScheme.current.onPrimaryContainer ) Search( homelandStation = homelandStation, diff --git a/app/src/main/kotlin/de/hbch/traewelling/ui/info/Info.kt b/app/src/main/kotlin/de/hbch/traewelling/ui/info/Info.kt index 3c38ef7d..c0bcbc3f 100644 --- a/app/src/main/kotlin/de/hbch/traewelling/ui/info/Info.kt +++ b/app/src/main/kotlin/de/hbch/traewelling/ui/info/Info.kt @@ -51,7 +51,7 @@ fun InfoScreen( IconButton(onClick = backPressed) { Icon( imageVector = Icons.AutoMirrored.Filled.ArrowBack, - contentDescription = stringResource(id = R.string.jwt_expiration) + contentDescription = null ) } } diff --git a/app/src/main/res/font/ae_matrix16_twindexx_standard.ttf b/app/src/main/res/font/ae_matrix16_twindexx_standard.ttf new file mode 100644 index 00000000..4aef94ca Binary files /dev/null and b/app/src/main/res/font/ae_matrix16_twindexx_standard.ttf differ diff --git a/app/src/main/res/font/nunito.ttf b/app/src/main/res/font/nunito.ttf deleted file mode 100644 index 93a3f3e7..00000000 Binary files a/app/src/main/res/font/nunito.ttf and /dev/null differ diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml index 7755a053..014a825b 100644 --- a/app/src/main/res/values-de-rDE/strings.xml +++ b/app/src/main/res/values-de-rDE/strings.xml @@ -231,10 +231,10 @@ Hier kannst du die Linien-Icons aktualisieren. Zuletzt aktualisiert: %1$s Aktualisieren - Guten Morgen! โ˜• - Guten Tag! ๐ŸŒž - Guten Abend! - Na, noch wach? ๐Ÿ˜ด + Guten Morgen zZz + Hab einen schรถnen Tag + Guten Abend :) + Du bist ja lang wach :O Haltestellen Benutzer Haltestelle oder Benutzer suchen diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7d669c78..26f52b64 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -236,10 +236,10 @@ Here you can update the line icons. Last updated: %1$s Refresh - Good morning! โ˜• - Have a nice day! ๐ŸŒž - Good evening! - Still awake? ๐Ÿ˜ด + Good morning zZz + Have a nice day + Good evening :) + You are awake long :O Stops Users Find stops or users diff --git a/build.gradle b/build.gradle index 29785b53..b42a3b8d 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ buildscript { classpath 'com.android.tools.build:gradle:8.3.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.0" classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.7.7" - classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:10.8.3" + classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:11.1.3" classpath "com.google.gms:google-services:4.4.1" // NOTE: Do not place your application dependencies here; they belong diff --git a/config/libraries/ae-matrix16-twindexx-standard.ttf.json b/config/libraries/ae-matrix16-twindexx-standard.ttf.json new file mode 100644 index 00000000..301c67c7 --- /dev/null +++ b/config/libraries/ae-matrix16-twindexx-standard.ttf.json @@ -0,0 +1,14 @@ +{ + "uniqueId": "ae:matrix16.twindexx", + "developers": [ + { + "organisationUrl": "", + "name": "AEBahn" + } + ], + "artifactVersion": "001.0000", + "name": "AE_Matrix16_Twindexx", + "licenses": [ + "SIL Open Font License" + ] +} \ No newline at end of file