💄 Add Twindexx font for greetings

Traewelldroid · Apr 24, 2024 · 922ee59 · 922ee59
1 parent 726bccd
commit 922ee59
Show file tree

Hide file tree

Showing 10 changed files with 54 additions and 29 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
diff --git a/app/src/main/res/font/nunito.ttf b/app/src/main/res/font/nunito.ttf
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
@@ -231,10 +231,10 @@
     <string name="update_line_icons">Hier kannst du die Linien-Icons aktualisieren.</string>
     <string name="last_updated">Zuletzt aktualisiert: %1$s</string>
     <string name="refresh">Aktualisieren</string>
-    <string name="greeting_morning">Guten Morgen! ☕</string>
-    <string name="greeting_day">Guten Tag! 🌞</string>
-    <string name="greeting_evening">Guten Abend!</string>
-    <string name="greeting_night">Na, noch wach? 😴</string>
+    <string name="greeting_morning">Guten Morgen zZz</string>
+    <string name="greeting_day">Hab einen schönen Tag</string>
+    <string name="greeting_evening">Guten Abend :)</string>
+    <string name="greeting_night">Du bist ja lang wach :O</string>
     <string name="stops">Haltestellen</string>
     <string name="users">Benutzer</string>
     <string name="search_stop_users">Haltestelle oder Benutzer suchen</string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -236,10 +236,10 @@
     <string name="update_line_icons">Here you can update the line icons.</string>
     <string name="last_updated">Last updated: %1$s</string>
     <string name="refresh">Refresh</string>
-    <string name="greeting_morning">Good morning! ☕</string>
-    <string name="greeting_day">Have a nice day! 🌞</string>
-    <string name="greeting_evening">Good evening!</string>
-    <string name="greeting_night">Still awake? 😴</string>
+    <string name="greeting_morning">Good morning zZz</string>
+    <string name="greeting_day">Have a nice day</string>
+    <string name="greeting_evening">Good evening :)</string>
+    <string name="greeting_night">You are awake long :O</string>
     <string name="stops">Stops</string>
     <string name="users">Users</string>
     <string name="search_stop_users">Find stops or users</string>

diff --git 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
@@ -0,0 +1,14 @@
+{
+  "uniqueId": "ae:matrix16.twindexx",
+  "developers": [
+    {
+      "organisationUrl": "",
+      "name": "AEBahn"
+    }
+  ],
+  "artifactVersion": "001.0000",
+  "name": "AE_Matrix16_Twindexx",
+  "licenses": [
+    "SIL Open Font License"
+  ]
+}