diff --git a/base/src/main/java/de/mm20/launcher2/licenses/OpenSourceLicenses.kt b/base/src/main/java/de/mm20/launcher2/licenses/OpenSourceLicenses.kt
index d41a0be8..6d08741b 100644
--- a/base/src/main/java/de/mm20/launcher2/licenses/OpenSourceLicenses.kt
+++ b/base/src/main/java/de/mm20/launcher2/licenses/OpenSourceLicenses.kt
@@ -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",
diff --git a/base/src/main/res/font/outfit_100.otf b/base/src/main/res/font/outfit_100.otf
new file mode 100644
index 00000000..523181b9
Binary files /dev/null and b/base/src/main/res/font/outfit_100.otf differ
diff --git a/base/src/main/res/font/outfit_200.otf b/base/src/main/res/font/outfit_200.otf
new file mode 100644
index 00000000..972eca10
Binary files /dev/null and b/base/src/main/res/font/outfit_200.otf differ
diff --git a/base/src/main/res/font/outfit_300.otf b/base/src/main/res/font/outfit_300.otf
new file mode 100644
index 00000000..560cc0ac
Binary files /dev/null and b/base/src/main/res/font/outfit_300.otf differ
diff --git a/base/src/main/res/font/outfit_400.otf b/base/src/main/res/font/outfit_400.otf
new file mode 100644
index 00000000..8e2b369c
Binary files /dev/null and b/base/src/main/res/font/outfit_400.otf differ
diff --git a/base/src/main/res/font/outfit_500.otf b/base/src/main/res/font/outfit_500.otf
new file mode 100644
index 00000000..407de2b8
Binary files /dev/null and b/base/src/main/res/font/outfit_500.otf differ
diff --git a/base/src/main/res/font/outfit_600.otf b/base/src/main/res/font/outfit_600.otf
new file mode 100644
index 00000000..23dfddda
Binary files /dev/null and b/base/src/main/res/font/outfit_600.otf differ
diff --git a/base/src/main/res/font/outfit_700.otf b/base/src/main/res/font/outfit_700.otf
new file mode 100644
index 00000000..061483aa
Binary files /dev/null and b/base/src/main/res/font/outfit_700.otf differ
diff --git a/base/src/main/res/font/outfit_800.otf b/base/src/main/res/font/outfit_800.otf
new file mode 100644
index 00000000..afb1abeb
Binary files /dev/null and b/base/src/main/res/font/outfit_800.otf differ
diff --git a/base/src/main/res/font/outfit_900.otf b/base/src/main/res/font/outfit_900.otf
new file mode 100644
index 00000000..888d844c
Binary files /dev/null and b/base/src/main/res/font/outfit_900.otf differ
diff --git a/base/src/main/res/font/poppins.xml b/base/src/main/res/font/poppins.xml
deleted file mode 100644
index f185b67d..00000000
--- a/base/src/main/res/font/poppins.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/base/src/main/res/font/poppins100.ttf b/base/src/main/res/font/poppins100.ttf
deleted file mode 100644
index e3878f3e..00000000
Binary files a/base/src/main/res/font/poppins100.ttf and /dev/null differ
diff --git a/base/src/main/res/font/poppins100i.ttf b/base/src/main/res/font/poppins100i.ttf
deleted file mode 100644
index 55d9e7fa..00000000
Binary files a/base/src/main/res/font/poppins100i.ttf and /dev/null differ
diff --git a/base/src/main/res/font/poppins200.ttf b/base/src/main/res/font/poppins200.ttf
deleted file mode 100644
index 2a9f277a..00000000
Binary files a/base/src/main/res/font/poppins200.ttf and /dev/null differ
diff --git a/base/src/main/res/font/poppins200i.ttf b/base/src/main/res/font/poppins200i.ttf
deleted file mode 100644
index 51ba2b08..00000000
Binary files a/base/src/main/res/font/poppins200i.ttf and /dev/null differ
diff --git a/base/src/main/res/font/poppins300.ttf b/base/src/main/res/font/poppins300.ttf
deleted file mode 100644
index 7f6e4999..00000000
Binary files a/base/src/main/res/font/poppins300.ttf and /dev/null differ
diff --git a/base/src/main/res/font/poppins300i.ttf b/base/src/main/res/font/poppins300i.ttf
deleted file mode 100644
index 58b58264..00000000
Binary files a/base/src/main/res/font/poppins300i.ttf and /dev/null differ
diff --git a/base/src/main/res/font/poppins400.ttf b/base/src/main/res/font/poppins400.ttf
deleted file mode 100644
index 94a55ed1..00000000
Binary files a/base/src/main/res/font/poppins400.ttf and /dev/null differ
diff --git a/base/src/main/res/font/poppins400i.ttf b/base/src/main/res/font/poppins400i.ttf
deleted file mode 100644
index 883408e1..00000000
Binary files a/base/src/main/res/font/poppins400i.ttf and /dev/null differ
diff --git a/base/src/main/res/font/poppins500.ttf b/base/src/main/res/font/poppins500.ttf
deleted file mode 100644
index 1f1f3de8..00000000
Binary files a/base/src/main/res/font/poppins500.ttf and /dev/null differ
diff --git a/base/src/main/res/font/poppins500i.ttf b/base/src/main/res/font/poppins500i.ttf
deleted file mode 100644
index 7cdb7477..00000000
Binary files a/base/src/main/res/font/poppins500i.ttf and /dev/null differ
diff --git a/base/src/main/res/font/poppins600.ttf b/base/src/main/res/font/poppins600.ttf
deleted file mode 100644
index 1e241152..00000000
Binary files a/base/src/main/res/font/poppins600.ttf and /dev/null differ
diff --git a/base/src/main/res/font/poppins600i.ttf b/base/src/main/res/font/poppins600i.ttf
deleted file mode 100644
index 8fb27e0a..00000000
Binary files a/base/src/main/res/font/poppins600i.ttf and /dev/null differ
diff --git a/base/src/main/res/font/poppins700.ttf b/base/src/main/res/font/poppins700.ttf
deleted file mode 100644
index 9451a269..00000000
Binary files a/base/src/main/res/font/poppins700.ttf and /dev/null differ
diff --git a/base/src/main/res/font/poppins700i.ttf b/base/src/main/res/font/poppins700i.ttf
deleted file mode 100644
index 92d4085e..00000000
Binary files a/base/src/main/res/font/poppins700i.ttf and /dev/null differ
diff --git a/base/src/main/res/font/poppins800.ttf b/base/src/main/res/font/poppins800.ttf
deleted file mode 100644
index 2712edc3..00000000
Binary files a/base/src/main/res/font/poppins800.ttf and /dev/null differ
diff --git a/base/src/main/res/font/poppins800i.ttf b/base/src/main/res/font/poppins800i.ttf
deleted file mode 100644
index 67c1b256..00000000
Binary files a/base/src/main/res/font/poppins800i.ttf and /dev/null differ
diff --git a/base/src/main/res/font/poppins900.ttf b/base/src/main/res/font/poppins900.ttf
deleted file mode 100644
index c14fc1ef..00000000
Binary files a/base/src/main/res/font/poppins900.ttf and /dev/null differ
diff --git a/base/src/main/res/font/poppins900i.ttf b/base/src/main/res/font/poppins900i.ttf
deleted file mode 100644
index ce487ef0..00000000
Binary files a/base/src/main/res/font/poppins900i.ttf and /dev/null differ
diff --git a/base/src/main/res/values/themes.xml b/base/src/main/res/values/themes.xml
index b4c70fbf..1ba9a084 100644
--- a/base/src/main/res/values/themes.xml
+++ b/base/src/main/res/values/themes.xml
@@ -1,21 +1,6 @@
diff --git a/base/src/main/res/values/typography.xml b/base/src/main/res/values/typography.xml
deleted file mode 100644
index e693cf0c..00000000
--- a/base/src/main/res/values/typography.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/docs/src/css/custom.css b/docs/src/css/custom.css
index 7f27b3f0..d4f130a2 100644
--- a/docs/src/css/custom.css
+++ b/docs/src/css/custom.css
@@ -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+ */
}
diff --git a/docs/static/fonts/outfit/outfit-v6-latin-700.woff b/docs/static/fonts/outfit/outfit-v6-latin-700.woff
new file mode 100644
index 00000000..075e3639
Binary files /dev/null and b/docs/static/fonts/outfit/outfit-v6-latin-700.woff differ
diff --git a/docs/static/fonts/outfit/outfit-v6-latin-700.woff2 b/docs/static/fonts/outfit/outfit-v6-latin-700.woff2
new file mode 100644
index 00000000..1bf36b41
Binary files /dev/null and b/docs/static/fonts/outfit/outfit-v6-latin-700.woff2 differ
diff --git a/docs/static/fonts/outfit/outfit-v6-latin-regular.woff b/docs/static/fonts/outfit/outfit-v6-latin-regular.woff
new file mode 100644
index 00000000..845d3624
Binary files /dev/null and b/docs/static/fonts/outfit/outfit-v6-latin-regular.woff differ
diff --git a/docs/static/fonts/outfit/outfit-v6-latin-regular.woff2 b/docs/static/fonts/outfit/outfit-v6-latin-regular.woff2
new file mode 100644
index 00000000..f7217c50
Binary files /dev/null and b/docs/static/fonts/outfit/outfit-v6-latin-regular.woff2 differ
diff --git a/docs/static/fonts/poppins/poppins-v20-latin-700.woff b/docs/static/fonts/poppins/poppins-v20-latin-700.woff
deleted file mode 100644
index b8b8ce59..00000000
Binary files a/docs/static/fonts/poppins/poppins-v20-latin-700.woff and /dev/null differ
diff --git a/docs/static/fonts/poppins/poppins-v20-latin-700.woff2 b/docs/static/fonts/poppins/poppins-v20-latin-700.woff2
deleted file mode 100644
index bf022fc7..00000000
Binary files a/docs/static/fonts/poppins/poppins-v20-latin-700.woff2 and /dev/null differ
diff --git a/docs/static/fonts/poppins/poppins-v20-latin-regular.woff b/docs/static/fonts/poppins/poppins-v20-latin-regular.woff
deleted file mode 100644
index 2a04ae32..00000000
Binary files a/docs/static/fonts/poppins/poppins-v20-latin-regular.woff and /dev/null differ
diff --git a/docs/static/fonts/poppins/poppins-v20-latin-regular.woff2 b/docs/static/fonts/poppins/poppins-v20-latin-regular.woff2
deleted file mode 100644
index b69e0091..00000000
Binary files a/docs/static/fonts/poppins/poppins-v20-latin-regular.woff2 and /dev/null differ
diff --git a/preferences/src/main/java/de/mm20/launcher2/preferences/Defaults.kt b/preferences/src/main/java/de/mm20/launcher2/preferences/Defaults.kt
index 7dd0ef14..70bc3034 100644
--- a/preferences/src/main/java/de/mm20/launcher2/preferences/Defaults.kt
+++ b/preferences/src/main/java/de/mm20/launcher2/preferences/Defaults.kt
@@ -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(
diff --git a/preferences/src/main/proto/settings.proto b/preferences/src/main/proto/settings.proto
index 87d5a065..19307519 100644
--- a/preferences/src/main/proto/settings.proto
+++ b/preferences/src/main/proto/settings.proto
@@ -76,7 +76,7 @@ message Settings {
Layout layout = 9;
enum Font {
- Poppins = 0;
+ Outfit = 0;
SystemDefault = 1;
}
Font font = 10;
diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/clocks/DigitalClock1.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/clocks/DigitalClock1.kt
index 9dec5752..56470f6d 100644
--- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/clocks/DigitalClock1.kt
+++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/clocks/DigitalClock1.kt
@@ -38,7 +38,6 @@ fun DigitalClock1(
fontWeight = FontWeight.Black,
textAlign = TextAlign.Center,
lineHeight = 0.8.em,
- letterSpacing = -0.1.em,
)
)
}
\ No newline at end of file
diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/appearance/AppearanceSettingsScreen.kt b/ui/src/main/java/de/mm20/launcher2/ui/settings/appearance/AppearanceSettingsScreen.kt
index 530412b1..6b1c712e 100644
--- a/ui/src/main/java/de/mm20/launcher2/ui/settings/appearance/AppearanceSettingsScreen.kt
+++ b/ui/src/main/java/de/mm20/launcher2/ui/settings/appearance/AppearanceSettingsScreen.kt
@@ -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,
diff --git a/ui/src/main/java/de/mm20/launcher2/ui/theme/LauncherTheme.kt b/ui/src/main/java/de/mm20/launcher2/ui/theme/LauncherTheme.kt
index 49a33acc..de928804 100644
--- a/ui/src/main/java/de/mm20/launcher2/ui/theme/LauncherTheme.kt
+++ b/ui/src/main/java/de/mm20/launcher2/ui/theme/LauncherTheme.kt
@@ -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) {
diff --git a/ui/src/main/java/de/mm20/launcher2/ui/theme/typography/Default.kt b/ui/src/main/java/de/mm20/launcher2/ui/theme/typography/Default.kt
index 9cce7953..8f5eb3b2 100644
--- a/ui/src/main/java/de/mm20/launcher2/ui/theme/typography/Default.kt
+++ b/ui/src/main/java/de/mm20/launcher2/ui/theme/typography/Default.kt
@@ -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)
\ No newline at end of file
+val DefaultTypography = makeTypography(headlineFamily = Outfit)
\ No newline at end of file
diff --git a/ui/src/main/java/de/mm20/launcher2/ui/theme/typography/fontfamily/Outfit.kt b/ui/src/main/java/de/mm20/launcher2/ui/theme/typography/fontfamily/Outfit.kt
new file mode 100644
index 00000000..34c70d1b
--- /dev/null
+++ b/ui/src/main/java/de/mm20/launcher2/ui/theme/typography/fontfamily/Outfit.kt
@@ -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),
+)
\ No newline at end of file
diff --git a/ui/src/main/java/de/mm20/launcher2/ui/theme/typography/fontfamily/Poppins.kt b/ui/src/main/java/de/mm20/launcher2/ui/theme/typography/fontfamily/Poppins.kt
deleted file mode 100644
index 79ef5c71..00000000
--- a/ui/src/main/java/de/mm20/launcher2/ui/theme/typography/fontfamily/Poppins.kt
+++ /dev/null
@@ -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),
-)
\ No newline at end of file