lun_admin/NeoLaunch_From_Kvaesitso
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Replace Poppins with Outfit

Browse Source
This commit is contained in:
MM20 2022-10-19 16:19:08 +02:00
parent ef93ec0010
commit 28fec3532d
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
48 changed files with 36 additions and 355 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
base/src/main/java/de/mm20/launcher2/licenses/OpenSourceLicenses.kt
View File

@ -147,12 +147,12 @@ val OpenSourceLicenses = arrayOf(
url = "https://insert-koin.io/"
),
OpenSourceLibrary(
name = "Poppins",
name = "Outfit",
description = "A geometric sans serif typeface",
copyrightNote = "Copyright 2020 The Poppins Project Authors",
copyrightNote = "Copyright 2021 The Outfit Project Authors",
licenseName = R.string.open_font_license_name,
licenseText = R.raw.license_ofl,
url = "https://github.com/itfoundry/poppins"
url = "https://github.com/Outfitio/Outfit-Fonts"
),
OpenSourceLibrary(
name = "Coil",

BIN
base/src/main/res/font/outfit_100.otf Normal file
View File

Binary file not shown.

BIN
base/src/main/res/font/outfit_200.otf Normal file
View File

Binary file not shown.

BIN
base/src/main/res/font/outfit_300.otf Normal file
View File

Binary file not shown.

BIN
base/src/main/res/font/outfit_400.otf Normal file
View File

Binary file not shown.

BIN
base/src/main/res/font/outfit_500.otf Normal file
View File

Binary file not shown.

BIN
base/src/main/res/font/outfit_600.otf Normal file
View File

Binary file not shown.

BIN
base/src/main/res/font/outfit_700.otf Normal file
View File

Binary file not shown.

BIN
base/src/main/res/font/outfit_800.otf Normal file
View File

Binary file not shown.

BIN
base/src/main/res/font/outfit_900.otf Normal file
View File

Binary file not shown.

74
base/src/main/res/font/poppins.xml
View File

@ -1,74 +0,0 @@
<font-family xmlns:app="http://schemas.android.com/apk/res-auto">
<font
app:font="@font/poppins100"
app:fontStyle="normal"
app:fontWeight="100" />
<font
app:font="@font/poppins100i"
app:fontStyle="italic"
app:fontWeight="100" />
<font
app:font="@font/poppins200"
app:fontStyle="normal"
app:fontWeight="200" />
<font
app:font="@font/poppins200i"
app:fontStyle="italic"
app:fontWeight="200" />
<font
app:font="@font/poppins300"
app:fontStyle="normal"
app:fontWeight="300" />
<font
app:font="@font/poppins300i"
app:fontStyle="italic"
app:fontWeight="300" />
<font
app:font="@font/poppins400"
app:fontStyle="normal"
app:fontWeight="400" />
<font
app:font="@font/poppins400i"
app:fontStyle="italic"
app:fontWeight="400" />
<font
app:font="@font/poppins500"
app:fontStyle="normal"
app:fontWeight="500" />
<font
app:font="@font/poppins500i"
app:fontStyle="italic"
app:fontWeight="500" />
<font
app:font="@font/poppins600"
app:fontStyle="normal"
app:fontWeight="600" />
<font
app:font="@font/poppins600i"
app:fontStyle="italic"
app:fontWeight="600" />
<font
app:font="@font/poppins700"
app:fontStyle="normal"
app:fontWeight="700" />
<font
app:font="@font/poppins700i"
app:fontStyle="italic"
app:fontWeight="700" />
<font
app:font="@font/poppins800"
app:fontStyle="normal"
app:fontWeight="800" />
<font
app:font="@font/poppins800i"
app:fontStyle="italic"
app:fontWeight="800" />
<font
app:font="@font/poppins900"
app:fontStyle="normal"
app:fontWeight="900" />
<font
app:font="@font/poppins900i"
app:fontStyle="italic"
app:fontWeight="900" />
</font-family>

BIN
base/src/main/res/font/poppins100.ttf
View File

Binary file not shown.

BIN
base/src/main/res/font/poppins100i.ttf
View File

Binary file not shown.

BIN
base/src/main/res/font/poppins200.ttf
View File

Binary file not shown.

BIN
base/src/main/res/font/poppins200i.ttf
View File

Binary file not shown.

BIN
base/src/main/res/font/poppins300.ttf
View File

Binary file not shown.

BIN
base/src/main/res/font/poppins300i.ttf
View File

Binary file not shown.

BIN
base/src/main/res/font/poppins400.ttf
View File

Binary file not shown.

BIN
base/src/main/res/font/poppins400i.ttf
View File

Binary file not shown.

BIN
base/src/main/res/font/poppins500.ttf
View File

Binary file not shown.

BIN
base/src/main/res/font/poppins500i.ttf
View File

Binary file not shown.

BIN
base/src/main/res/font/poppins600.ttf
View File

Binary file not shown.

BIN
base/src/main/res/font/poppins600i.ttf
View File

Binary file not shown.

BIN
base/src/main/res/font/poppins700.ttf
View File

Binary file not shown.

BIN
base/src/main/res/font/poppins700i.ttf
View File

Binary file not shown.

BIN
base/src/main/res/font/poppins800.ttf
View File

Binary file not shown.

BIN
base/src/main/res/font/poppins800i.ttf
View File

Binary file not shown.

BIN
base/src/main/res/font/poppins900.ttf
View File

Binary file not shown.

BIN
base/src/main/res/font/poppins900i.ttf
View File

Binary file not shown.

15
base/src/main/res/values/themes.xml
View File

@ -1,21 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="BaseTheme" parent="Theme.Material3.DayNight">
<item name="textAppearanceDisplayLarge">@style/Typography.Display.Large</item>
<item name="textAppearanceDisplayMedium">@style/Typography.Display.Medium</item>
<item name="textAppearanceDisplaySmall">@style/Typography.Display.Small</item>
<item name="textAppearanceHeadlineLarge">@style/Typography.Headline.Large</item>
<item name="textAppearanceHeadlineMedium">@style/Typography.Headline.Medium</item>
<item name="textAppearanceHeadlineSmall">@style/Typography.Headline.Small</item>
<item name="textAppearanceTitleLarge">@style/Typography.Title.Large</item>
<item name="textAppearanceTitleMedium">@style/Typography.Title.Medium</item>
<item name="textAppearanceTitleSmall">@style/Typography.Title.Small</item>
<item name="textAppearanceBodyLarge">@style/Typography.Body.Large</item>
<item name="textAppearanceBodyMedium">@style/Typography.Body.Medium</item>
<item name="textAppearanceBodySmall">@style/Typography.Body.Small</item>
<item name="textAppearanceLabelLarge">@style/Typography.Label.Large</item>
<item name="textAppearanceLabelMedium">@style/Typography.Label.Medium</item>
<item name="textAppearanceLabelSmall">@style/Typography.Label.Small</item>
<item name="popupMenuStyle">@style/PopupMenu</item>
</style>

114
base/src/main/res/values/typography.xml
View File

@ -1,114 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="TextAppearance">
</style>
<style name="TextAppearance.Heading1">
<item name="android:textColor">@color/text_color_primary</item>
<item name="android:textSize">18sp</item>
<item name="android:fontFamily">sans-serif-medium</item>
</style>
<style name="TextAppearance.Heading2">
<item name="android:textColor">@color/text_color_primary</item>
<item name="android:textSize">13sp</item>
<item name="android:textStyle">bold</item>
</style>
<style name="TextAppearance.Heading3">
<item name="android:textColor">@color/text_color_primary</item>
<item name="android:textSize">13sp</item>
</style>
<style name="TextAppearance.Body1">
<item name="android:textColor">@color/text_color_primary</item>
<item name="android:textSize">13sp</item>
</style>
<style name="TextAppearance.Body2">
<item name="android:textColor">@color/text_color_secondary</item>
<item name="android:textSize">13sp</item>
</style>
<style name="Typography.Display.Large" parent="TextAppearance.Material3.DisplayLarge">
<item name="fontFamily">@font/poppins</item>
<item name="fontWeight">500</item>
<item name="android:textFontWeight">500</item>
</style>
<style name="Typography.Display.Medium" parent="TextAppearance.Material3.DisplayMedium">
<item name="fontFamily">@font/poppins</item>
<item name="fontWeight">500</item>
<item name="android:textFontWeight">500</item>
</style>
<style name="Typography.Display.Small" parent="TextAppearance.Material3.DisplaySmall">
<item name="fontFamily">@font/poppins</item>
<item name="fontWeight">500</item>
<item name="android:textFontWeight">500</item>
</style>
<style name="Typography.Headline.Large" parent="TextAppearance.Material3.HeadlineLarge">
<item name="fontFamily">@font/poppins</item>
<item name="fontWeight">600</item>
<item name="android:textFontWeight">600</item>
</style>
<style name="Typography.Headline.Medium" parent="TextAppearance.Material3.HeadlineMedium">
<item name="fontFamily">@font/poppins</item>
<item name="fontWeight">600</item>
<item name="android:textFontWeight">600</item>
</style>
<style name="Typography.Headline.Small" parent="TextAppearance.Material3.HeadlineSmall">
<item name="fontFamily">@font/poppins</item>
<item name="fontWeight">600</item>
<item name="android:textFontWeight">600</item>
</style>
<style name="Typography.Title.Large" parent="TextAppearance.Material3.TitleLarge">
<item name="fontFamily">@font/poppins</item>
<item name="fontWeight">600</item>
<item name="android:textFontWeight">600</item>
</style>
<style name="Typography.Title.Medium" parent="TextAppearance.Material3.TitleMedium">
<item name="fontFamily">@font/poppins</item>
<item name="fontWeight">600</item>
<item name="android:textFontWeight">600</item>
</style>
<style name="Typography.Title.Small" parent="TextAppearance.Material3.TitleSmall">
<item name="fontFamily">@font/poppins</item>
<item name="fontWeight">600</item>
<item name="android:textFontWeight">600</item>
</style>
<style name="Typography.Label.Large" parent="TextAppearance.Material3.LabelLarge">
<item name="fontFamily">@font/poppins</item>
<item name="fontWeight">600</item>
<item name="android:textFontWeight">600</item>
</style>
<style name="Typography.Label.Medium" parent="TextAppearance.Material3.LabelMedium">
<item name="fontFamily">@font/poppins</item>
<item name="fontWeight">600</item>
<item name="android:textFontWeight">600</item>
</style>
<style name="Typography.Label.Small" parent="TextAppearance.Material3.LabelSmall">
<item name="fontFamily">@font/poppins</item>
<item name="fontWeight">600</item>
<item name="android:textFontWeight">600</item>
</style>
<style name="Typography.Body.Large" parent="TextAppearance.Material3.BodyLarge" />
<style name="Typography.Body.Medium" parent="TextAppearance.Material3.BodyMedium" />
<style name="Typography.Body.Small" parent="TextAppearance.Material3.BodySmall" />
</resources>

123
docs/src/css/custom.css
View File

@ -18,7 +18,7 @@
--ifm-font-family-base: 'Roboto';
--ifm-font-family-monospace: 'Roboto Mono';
--ifm-heading-font-family: 'Poppins';
--ifm-heading-font-family: 'Outfit';
}
/* For readability concerns, you should choose a lighter palette in dark mode. */
@ -39,127 +39,22 @@
padding: 2px;
}
/* poppins-regular - latin */
/* outfit-regular - latin */
@font-face {
font-family: 'Poppins';
font-family: 'Outfit';
font-style: normal;
font-weight: 400;
src: local(''),
url('/fonts/poppins/poppins-v20-latin-regular.woff2') format('woff2'),
/* Chrome 26+, Opera 23+, Firefox 39+ */
url('/fonts/poppins/poppins-v20-latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
url('/fonts/outfit/outfit-v6-latin-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
url('/fonts/outfit/outfit-v6-latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
}
/* poppins-700 - latin */
/* outfit-700 - latin */
@font-face {
font-family: 'Poppins';
font-family: 'Outfit';
font-style: normal;
font-weight: 700;
src: local(''),
url('/fonts/poppins/poppins-v20-latin-700.woff2') format('woff2'),
/* Chrome 26+, Opera 23+, Firefox 39+ */
url('/fonts/poppins/poppins-v20-latin-700.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
}
/* roboto-regular - latin */
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 400;
src: local(''),
url('/fonts/roboto/roboto-v30-latin-regular.woff2') format('woff2'),
/* Chrome 26+, Opera 23+, Firefox 39+ */
url('/fonts/roboto/roboto-v30-latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
}
/* roboto-500 - latin */
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 500;
src: local(''),
url('/fonts/roboto/roboto-v30-latin-500.woff2') format('woff2'),
/* Chrome 26+, Opera 23+, Firefox 39+ */
url('/fonts/roboto/roboto-v30-latin-500.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
}
/* roboto-italic - latin */
@font-face {
font-family: 'Roboto';
font-style: italic;
font-weight: 400;
src: local(''),
url('/fonts/roboto/roboto-v30-latin-italic.woff2') format('woff2'),
/* Chrome 26+, Opera 23+, Firefox 39+ */
url('/fonts/roboto/roboto-v30-latin-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
}
/* roboto-700 - latin */
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 700;
src: local(''),
url('/fonts/roboto/roboto-v30-latin-700.woff2') format('woff2'),
/* Chrome 26+, Opera 23+, Firefox 39+ */
url('/fonts/roboto/roboto-v30-latin-700.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
}
/* roboto-700italic - latin */
@font-face {
font-family: 'Roboto';
font-style: italic;
font-weight: 700;
src: local(''),
url('/fonts/roboto/roboto-v30-latin-700italic.woff2') format('woff2'),
/* Chrome 26+, Opera 23+, Firefox 39+ */
url('/fonts/roboto/roboto-v30-latin-700italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
}
/* roboto-mono-regular - latin */
@font-face {
font-family: 'Roboto Mono';
font-style: normal;
font-weight: 400;
src: local(''),
url('/fonts/roboto-mono/roboto-mono-v22-latin-regular.woff2')
format('woff2'),
/* Chrome 26+, Opera 23+, Firefox 39+ */
url('/fonts/roboto-mono/roboto-mono-v22-latin-regular.woff')
format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
}
/* roboto-mono-700 - latin */
@font-face {
font-family: 'Roboto Mono';
font-style: normal;
font-weight: 700;
src: local(''),
url('/fonts/roboto-mono/roboto-mono-v22-latin-700.woff2') format('woff2'),
/* Chrome 26+, Opera 23+, Firefox 39+ */
url('/fonts/roboto-mono/roboto-mono-v22-latin-700.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
}
/* roboto-mono-italic - latin */
@font-face {
font-family: 'Roboto Mono';
font-style: italic;
font-weight: 400;
src: local(''),
url('/fonts/roboto-mono/roboto-mono-v22-latin-italic.woff2') format('woff2'),
/* Chrome 26+, Opera 23+, Firefox 39+ */
url('/fonts/roboto-mono/roboto-mono-v22-latin-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
}
/* roboto-mono-700italic - latin */
@font-face {
font-family: 'Roboto Mono';
font-style: italic;
font-weight: 700;
src: local(''),
url('/fonts/roboto-mono/roboto-mono-v22-latin-700italic.woff2')
format('woff2'),
/* Chrome 26+, Opera 23+, Firefox 39+ */
url('/fonts/roboto-mono/roboto-mono-v22-latin-700italic.woff')
format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
url('/fonts/outfit/outfit-v6-latin-700.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
url('/fonts/outfit/outfit-v6-latin-700.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
}

BIN
docs/static/fonts/outfit/outfit-v6-latin-700.woff vendored Normal file
View File

Binary file not shown.

BIN
docs/static/fonts/outfit/outfit-v6-latin-700.woff2 vendored Normal file
View File

Binary file not shown.

BIN
docs/static/fonts/outfit/outfit-v6-latin-regular.woff vendored Normal file
View File

Binary file not shown.

BIN
docs/static/fonts/outfit/outfit-v6-latin-regular.woff2 vendored Normal file
View File

Binary file not shown.

BIN
docs/static/fonts/poppins/poppins-v20-latin-700.woff vendored
View File

Binary file not shown.

BIN
docs/static/fonts/poppins/poppins-v20-latin-700.woff2 vendored
View File

Binary file not shown.

BIN
docs/static/fonts/poppins/poppins-v20-latin-regular.woff vendored
View File

Binary file not shown.

BIN
docs/static/fonts/poppins/poppins-v20-latin-regular.woff2 vendored
View File

Binary file not shown.

2
preferences/src/main/java/de/mm20/launcher2/preferences/Defaults.kt
View File

@ -19,7 +19,7 @@ fun createFactorySettings(context: Context): Settings {
.setLightScheme(DefaultLightCustomColorScheme)
.setDarkScheme(DefaultDarkCustomColorScheme)
)
.setFont(Settings.AppearanceSettings.Font.Poppins)
.setFont(Settings.AppearanceSettings.Font.Outfit)
.build()
)
.setWeather(

2
preferences/src/main/proto/settings.proto
View File

@ -76,7 +76,7 @@ message Settings {
Layout layout = 9;
enum Font {
Poppins = 0;
Outfit = 0;
SystemDefault = 1;
}
Font font = 10;

1
ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/clocks/DigitalClock1.kt
View File

@ -38,7 +38,6 @@ fun DigitalClock1(
fontWeight = FontWeight.Black,
textAlign = TextAlign.Center,
lineHeight = 0.8.em,
letterSpacing = -0.1.em,
)
)
}

2
ui/src/main/java/de/mm20/launcher2/ui/settings/appearance/AppearanceSettingsScreen.kt
View File

@ -90,7 +90,7 @@ fun AppearanceSettingsScreen() {
ListPreference(
title = stringResource(R.string.preference_font),
items = listOf(
"Poppins" to AppearanceSettings.Font.Poppins,
"Outfit" to AppearanceSettings.Font.Outfit,
stringResource(R.string.preference_font_system) to AppearanceSettings.Font.SystemDefault,
),
value = font,

2
ui/src/main/java/de/mm20/launcher2/ui/theme/LauncherTheme.kt
View File

@ -62,7 +62,7 @@ fun LauncherTheme(
val colorScheme by colorSchemeAsState(colorSchemePreference, darkTheme)
val font by remember { dataStore.data.map { it.appearance.font } }.collectAsState(
AppearanceSettings.Font.Poppins
AppearanceSettings.Font.Outfit
)
val typography = remember(font) {

4
ui/src/main/java/de/mm20/launcher2/ui/theme/typography/Default.kt
View File

@ -1,5 +1,5 @@
package de.mm20.launcher2.ui.theme.typography
import de.mm20.launcher2.ui.theme.typography.fontfamily.Poppins
import de.mm20.launcher2.ui.theme.typography.fontfamily.Outfit
val DefaultTypography = makeTypography(headlineFamily = Poppins)
val DefaultTypography = makeTypography(headlineFamily = Outfit)

18
ui/src/main/java/de/mm20/launcher2/ui/theme/typography/fontfamily/Outfit.kt Normal file
View File

@ -0,0 +1,18 @@
package de.mm20.launcher2.ui.theme.typography.fontfamily
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 de.mm20.launcher2.ui.R
val Outfit = FontFamily(
Font(R.font.outfit_100, weight = FontWeight.Thin, style = FontStyle.Normal),
Font(R.font.outfit_200, weight = FontWeight.ExtraLight, style = FontStyle.Normal),
Font(R.font.outfit_300, weight = FontWeight.Light, style = FontStyle.Normal),
Font(R.font.outfit_400, weight = FontWeight.Normal, style = FontStyle.Normal),
Font(R.font.outfit_600, weight = FontWeight.SemiBold, style = FontStyle.Normal),
Font(R.font.outfit_700, weight = FontWeight.Bold, style = FontStyle.Normal),
Font(R.font.outfit_800, weight = FontWeight.ExtraBold, style = FontStyle.Normal),
Font(R.font.outfit_900, weight = FontWeight.Black, style = FontStyle.Normal),
)

28
ui/src/main/java/de/mm20/launcher2/ui/theme/typography/fontfamily/Poppins.kt
View File

@ -1,28 +0,0 @@
package de.mm20.launcher2.ui.theme.typography.fontfamily
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 de.mm20.launcher2.ui.R
val Poppins = FontFamily(
Font(R.font.poppins100, weight = FontWeight.Thin, style = FontStyle.Normal),
Font(R.font.poppins200, weight = FontWeight.ExtraLight, style = FontStyle.Normal),
Font(R.font.poppins300, weight = FontWeight.Light, style = FontStyle.Normal),
Font(R.font.poppins400, weight = FontWeight.Normal, style = FontStyle.Normal),
Font(R.font.poppins500, weight = FontWeight.Medium, style = FontStyle.Normal),
Font(R.font.poppins600, weight = FontWeight.SemiBold, style = FontStyle.Normal),
Font(R.font.poppins700, weight = FontWeight.Bold, style = FontStyle.Normal),
Font(R.font.poppins800, weight = FontWeight.ExtraBold, style = FontStyle.Normal),
Font(R.font.poppins900, weight = FontWeight.Black, style = FontStyle.Normal),
Font(R.font.poppins100i, weight = FontWeight.Thin, style = FontStyle.Italic),
Font(R.font.poppins200i, weight = FontWeight.ExtraLight, style = FontStyle.Italic),
Font(R.font.poppins300i, weight = FontWeight.Light, style = FontStyle.Italic),
Font(R.font.poppins400i, weight = FontWeight.Normal, style = FontStyle.Italic),
Font(R.font.poppins500i, weight = FontWeight.Medium, style = FontStyle.Italic),
Font(R.font.poppins600i, weight = FontWeight.SemiBold, style = FontStyle.Italic),
Font(R.font.poppins700i, weight = FontWeight.Bold, style = FontStyle.Italic),
Font(R.font.poppins800i, weight = FontWeight.ExtraBold, style = FontStyle.Italic),
Font(R.font.poppins900i, weight = FontWeight.Black, style = FontStyle.Italic),
)