Use Google Sans Flex as the default font

This commit is contained in:
MM20
2026-01-30 15:33:07 +01:00
parent 02cd17312f
commit 8ba55f8345
27 changed files with 98 additions and 132 deletions

View File

@@ -121,12 +121,11 @@ val OpenSourceLicenses = arrayOf(
url = "https://insert-koin.io/"
),
OpenSourceLibrary(
name = "Outfit",
name = "Google Sans Flex",
description = "A geometric sans serif typeface",
copyrightNote = "Copyright 2021 The Outfit Project Authors",
licenseName = R.string.open_font_license_name,
licenseText = R.raw.license_ofl,
url = "https://github.com/Outfitio/Outfit-Fonts"
url = "https://fonts.google.com/specimen/Google+Sans+Flex"
),
OpenSourceLibrary(
name = "Coil",

Binary file not shown.

View File

@@ -24,7 +24,6 @@ data class LauncherSettingsData internal constructor(
val uiTypographyId: UUID = UUID(0L, 0L),
val uiCompatModeColors: Boolean = false,
val uiFont: Font = Font.Outfit,
@Deprecated("No longer in use, only used for migration")
val uiBaseLayout: BaseLayout = BaseLayout.PullDown,
val uiOrientation: ScreenOrientation = ScreenOrientation.Auto,
@@ -220,12 +219,6 @@ enum class ColorScheme {
System,
}
@Serializable
enum class Font {
Outfit,
System,
}
internal enum class ClockWidgetStyleEnum {
Digital1,
Digital2,

View File

@@ -1,7 +1,6 @@
package de.mm20.launcher2.preferences.ui
import de.mm20.launcher2.preferences.ColorScheme
import de.mm20.launcher2.preferences.Font
import de.mm20.launcher2.preferences.IconShape
import de.mm20.launcher2.preferences.LauncherDataStore
import de.mm20.launcher2.preferences.ScreenOrientation
@@ -329,17 +328,6 @@ class UiSettings internal constructor(
}
}
val font
get() = launcherDataStore.data.map {
it.uiFont
}.distinctUntilChanged()
fun setFont(font: Font) {
launcherDataStore.update {
it.copy(uiFont = font)
}
}
fun setColorScheme(colorScheme: ColorScheme) {
launcherDataStore.update {
it.copy(uiColorScheme = colorScheme)