From 367378d5a4d87f9856e38a48459cdbdc7d255ef9 Mon Sep 17 00:00:00 2001 From: Patryk Michalik Date: Thu, 3 Feb 2022 17:26:59 +0100 Subject: [PATCH] Update dependencies, optimize imports, and tweak About page --- build.gradle | 4 ++-- lawnchair/src/app/lawnchair/LawnchairLauncher.kt | 4 +--- .../src/app/lawnchair/allapps/SearchResultIcon.kt | 1 - .../src/app/lawnchair/allapps/SearchResultIconRow.kt | 1 - lawnchair/src/app/lawnchair/data/AppDatabase.kt | 6 ++++-- .../lawnchair/data/iconoverride/IconOverrideDao.kt | 5 ++++- lawnchair/src/app/lawnchair/icons/CustomIconPack.kt | 1 - lawnchair/src/app/lawnchair/qsb/AssistantIconView.kt | 1 - .../lawnchair/search/LawnchairAppSearchAlgorithm.kt | 1 - .../src/app/lawnchair/search/SearchTargetCompat.java | 1 - .../src/app/lawnchair/search/SearchTargetUtils.kt | 1 - lawnchair/src/app/lawnchair/theme/ColorSchemeUtils.kt | 2 +- lawnchair/src/app/lawnchair/theme/ThemeProvider.kt | 1 - .../lawnchair/ui/preferences/GeneralPreferences.kt | 2 +- .../src/app/lawnchair/ui/preferences/about/About.kt | 11 ++++++----- .../lawnchair/ui/preferences/about/LawnchairLink.kt | 2 +- .../lawnchair/ui/preferences/components/AppItem.kt | 1 - .../app/lawnchair/ui/preferences/components/Chip.kt | 5 +++-- .../components/LazyColumnPreferenceGroup.kt | 2 +- .../components/NotificationDotsPreference.kt | 7 ++++--- .../ui/preferences/components/PreferenceScaffold.kt | 10 ++-------- .../components/PreferenceSearchScaffold.kt | 8 ++++---- .../ui/preferences/components/PreferenceTemplate.kt | 2 +- lawnchair/src/app/lawnchair/ui/theme/Type.kt | 2 +- 24 files changed, 36 insertions(+), 45 deletions(-) diff --git a/build.gradle b/build.gradle index c261e7517f..c7a9a2caca 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ buildscript { ext { kotlin_version = '1.6.10' - compose_version = '1.2.0-alpha01' + compose_version = '1.2.0-alpha02' accompanist_version = '0.24.0-alpha' libsu_version = '3.1.2' protocVersion = '3.18.0' @@ -83,7 +83,7 @@ if (ciBuild) { devReleaseName = "Dev (${buildCommit})" } -def version = "12.0" +def version = "12.0.0" def releaseName = "Alpha 5" def versionDisplayName = "${version} ${isReleaseBuild ? releaseName : devReleaseName}" def majorVersion = versionDisplayName.split("\\.")[0] diff --git a/lawnchair/src/app/lawnchair/LawnchairLauncher.kt b/lawnchair/src/app/lawnchair/LawnchairLauncher.kt index 10a1b463c7..dda0fb0ab3 100644 --- a/lawnchair/src/app/lawnchair/LawnchairLauncher.kt +++ b/lawnchair/src/app/lawnchair/LawnchairLauncher.kt @@ -29,9 +29,7 @@ import androidx.activity.result.ActivityResultRegistry import androidx.activity.result.ActivityResultRegistryOwner import androidx.activity.result.IntentSenderRequest import androidx.activity.result.contract.ActivityResultContract -import androidx.activity.result.contract.ActivityResultContracts.RequestMultiplePermissions -import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult -import androidx.activity.result.contract.ActivityResultContracts.StartIntentSenderForResult +import androidx.activity.result.contract.ActivityResultContracts.* import androidx.core.app.ActivityCompat import androidx.core.app.ActivityOptionsCompat import androidx.core.graphics.ColorUtils diff --git a/lawnchair/src/app/lawnchair/allapps/SearchResultIcon.kt b/lawnchair/src/app/lawnchair/allapps/SearchResultIcon.kt index 0743dd5b93..cfaaa3f50a 100644 --- a/lawnchair/src/app/lawnchair/allapps/SearchResultIcon.kt +++ b/lawnchair/src/app/lawnchair/allapps/SearchResultIcon.kt @@ -6,7 +6,6 @@ import android.content.pm.PackageManager import android.content.pm.ShortcutInfo import android.os.UserHandle import android.util.AttributeSet -import android.util.Log import android.view.View import android.view.ViewGroup import androidx.core.view.isInvisible diff --git a/lawnchair/src/app/lawnchair/allapps/SearchResultIconRow.kt b/lawnchair/src/app/lawnchair/allapps/SearchResultIconRow.kt index a25a68e3b6..1428973490 100644 --- a/lawnchair/src/app/lawnchair/allapps/SearchResultIconRow.kt +++ b/lawnchair/src/app/lawnchair/allapps/SearchResultIconRow.kt @@ -8,7 +8,6 @@ import android.widget.LinearLayout import android.widget.TextView import androidx.core.view.ViewCompat import androidx.core.view.isVisible -import androidx.core.view.setPadding import app.lawnchair.allapps.SearchResultView.Companion.FLAG_HIDE_SUBTITLE import app.lawnchair.search.SearchTargetCompat import com.android.app.search.LayoutType diff --git a/lawnchair/src/app/lawnchair/data/AppDatabase.kt b/lawnchair/src/app/lawnchair/data/AppDatabase.kt index f4a29be215..6b7e62fb7e 100644 --- a/lawnchair/src/app/lawnchair/data/AppDatabase.kt +++ b/lawnchair/src/app/lawnchair/data/AppDatabase.kt @@ -1,9 +1,11 @@ package app.lawnchair.data -import androidx.room.* +import androidx.room.Database +import androidx.room.Room +import androidx.room.RoomDatabase +import androidx.room.TypeConverters import app.lawnchair.data.iconoverride.IconOverride import app.lawnchair.data.iconoverride.IconOverrideDao -import com.android.launcher3.util.ComponentKey import com.android.launcher3.util.MainThreadInitializedObject @Database(entities = [IconOverride::class], version = 1) diff --git a/lawnchair/src/app/lawnchair/data/iconoverride/IconOverrideDao.kt b/lawnchair/src/app/lawnchair/data/iconoverride/IconOverrideDao.kt index 49d1174fca..4ef9767a43 100644 --- a/lawnchair/src/app/lawnchair/data/iconoverride/IconOverrideDao.kt +++ b/lawnchair/src/app/lawnchair/data/iconoverride/IconOverrideDao.kt @@ -1,6 +1,9 @@ package app.lawnchair.data.iconoverride -import androidx.room.* +import androidx.room.Dao +import androidx.room.Insert +import androidx.room.OnConflictStrategy +import androidx.room.Query import com.android.launcher3.util.ComponentKey import kotlinx.coroutines.flow.Flow diff --git a/lawnchair/src/app/lawnchair/icons/CustomIconPack.kt b/lawnchair/src/app/lawnchair/icons/CustomIconPack.kt index c48fc7d9da..b5908f7efe 100644 --- a/lawnchair/src/app/lawnchair/icons/CustomIconPack.kt +++ b/lawnchair/src/app/lawnchair/icons/CustomIconPack.kt @@ -17,7 +17,6 @@ import org.xmlpull.v1.XmlPullParser import org.xmlpull.v1.XmlPullParserException import org.xmlpull.v1.XmlPullParserFactory import java.io.IOException -import java.lang.Exception class CustomIconPack(context: Context, packPackageName: String) : IconPack(context, packPackageName) { diff --git a/lawnchair/src/app/lawnchair/qsb/AssistantIconView.kt b/lawnchair/src/app/lawnchair/qsb/AssistantIconView.kt index 2bb5e2f1bd..76218cad9f 100644 --- a/lawnchair/src/app/lawnchair/qsb/AssistantIconView.kt +++ b/lawnchair/src/app/lawnchair/qsb/AssistantIconView.kt @@ -7,7 +7,6 @@ import android.util.AttributeSet import android.widget.ImageButton import androidx.core.view.isVisible import com.android.launcher3.R -import com.android.launcher3.qsb.QsbContainerView import com.android.launcher3.util.Themes @SuppressLint("AppCompatCustomView") diff --git a/lawnchair/src/app/lawnchair/search/LawnchairAppSearchAlgorithm.kt b/lawnchair/src/app/lawnchair/search/LawnchairAppSearchAlgorithm.kt index ccba51727f..c9d1276223 100644 --- a/lawnchair/src/app/lawnchair/search/LawnchairAppSearchAlgorithm.kt +++ b/lawnchair/src/app/lawnchair/search/LawnchairAppSearchAlgorithm.kt @@ -26,7 +26,6 @@ import com.android.launcher3.util.PackageManagerHelper import me.xdrop.fuzzywuzzy.FuzzySearch import me.xdrop.fuzzywuzzy.algorithms.WeightedRatio import java.util.* -import kotlin.collections.ArrayList class LawnchairAppSearchAlgorithm(context: Context) : LawnchairSearchAlgorithm(context) { diff --git a/lawnchair/src/app/lawnchair/search/SearchTargetCompat.java b/lawnchair/src/app/lawnchair/search/SearchTargetCompat.java index 44bab0560a..9cfb808934 100644 --- a/lawnchair/src/app/lawnchair/search/SearchTargetCompat.java +++ b/lawnchair/src/app/lawnchair/search/SearchTargetCompat.java @@ -15,7 +15,6 @@ */ package app.lawnchair.search; -import android.app.search.SearchAction; import android.app.search.SearchTarget; import android.app.slice.SliceManager; import android.appwidget.AppWidgetProviderInfo; diff --git a/lawnchair/src/app/lawnchair/search/SearchTargetUtils.kt b/lawnchair/src/app/lawnchair/search/SearchTargetUtils.kt index 0c2fe55c0a..607af1b1a7 100644 --- a/lawnchair/src/app/lawnchair/search/SearchTargetUtils.kt +++ b/lawnchair/src/app/lawnchair/search/SearchTargetUtils.kt @@ -4,7 +4,6 @@ import android.content.pm.ShortcutInfo import android.os.Bundle import android.os.Process import com.android.app.search.LayoutType -import com.android.launcher3.BuildConfig import com.android.launcher3.model.data.AppInfo import com.android.launcher3.util.ComponentKey diff --git a/lawnchair/src/app/lawnchair/theme/ColorSchemeUtils.kt b/lawnchair/src/app/lawnchair/theme/ColorSchemeUtils.kt index 77ed29dee6..2e02ba1cb1 100644 --- a/lawnchair/src/app/lawnchair/theme/ColorSchemeUtils.kt +++ b/lawnchair/src/app/lawnchair/theme/ColorSchemeUtils.kt @@ -3,7 +3,6 @@ package app.lawnchair.theme import androidx.compose.material.Colors import androidx.compose.material3.darkColorScheme import androidx.compose.material3.lightColorScheme -import androidx.compose.material3.ColorScheme as M3ColorScheme import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.ui.graphics.Color @@ -12,6 +11,7 @@ import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import dev.kdrag0n.monet.theme.ColorScheme import kotlin.math.ln +import androidx.compose.material3.ColorScheme as M3ColorScheme @Composable fun m3ColorScheme(colorScheme: ColorScheme, isDark: Boolean) = remember(colorScheme, isDark) { diff --git a/lawnchair/src/app/lawnchair/theme/ThemeProvider.kt b/lawnchair/src/app/lawnchair/theme/ThemeProvider.kt index cf832490a1..d458b3df55 100644 --- a/lawnchair/src/app/lawnchair/theme/ThemeProvider.kt +++ b/lawnchair/src/app/lawnchair/theme/ThemeProvider.kt @@ -28,7 +28,6 @@ import dev.kdrag0n.colorkt.tristimulus.CieXyzAbs.Companion.toAbs import dev.kdrag0n.colorkt.ucs.lab.CieLab import dev.kdrag0n.monet.theme.ColorScheme import dev.kdrag0n.monet.theme.DynamicColorScheme -import dev.kdrag0n.monet.theme.GrayColorScheme import dev.kdrag0n.monet.theme.MaterialYouTargets class ThemeProvider(private val context: Context) { diff --git a/lawnchair/src/app/lawnchair/ui/preferences/GeneralPreferences.kt b/lawnchair/src/app/lawnchair/ui/preferences/GeneralPreferences.kt index 87bbec2e2d..29fec64fc2 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/GeneralPreferences.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/GeneralPreferences.kt @@ -26,8 +26,8 @@ import androidx.compose.ui.res.stringResource import androidx.navigation.NavGraphBuilder import app.lawnchair.preferences.getAdapter import app.lawnchair.preferences.preferenceManager -import app.lawnchair.util.Constants.LAWNICONS_PACKAGE_NAME import app.lawnchair.ui.preferences.components.* +import app.lawnchair.util.Constants.LAWNICONS_PACKAGE_NAME import app.lawnchair.util.isPackageInstalled import com.android.launcher3.R diff --git a/lawnchair/src/app/lawnchair/ui/preferences/about/About.kt b/lawnchair/src/app/lawnchair/ui/preferences/about/About.kt index c47e3de8d7..bf4c26f107 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/about/About.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/about/About.kt @@ -193,22 +193,23 @@ fun About() { horizontalAlignment = Alignment.CenterHorizontally, label = stringResource(id = R.string.about_label) ) { - Spacer(modifier = Modifier.requiredHeight(24.dp)) + Spacer(modifier = Modifier.requiredHeight(8.dp)) Image( painter = painterResource(id = R.drawable.ic_launcher_home_comp), contentDescription = null, modifier = Modifier - .width(96.dp) - .height(96.dp) + .width(72.dp) + .height(72.dp) .clip(CircleShape) ) - Spacer(modifier = Modifier.requiredHeight(16.dp)) + Spacer(modifier = Modifier.requiredHeight(12.dp)) Text( text = stringResource(id = R.string.derived_app_name), - style = MaterialTheme.typography.headlineSmall + style = MaterialTheme.typography.titleLarge, ) Text( text = Versioning.versionName, + style = MaterialTheme.typography.bodyLarge, color = LocalContentColor.current.copy(alpha = ContentAlpha.medium) ) Spacer(modifier = Modifier.requiredHeight(16.dp)) diff --git a/lawnchair/src/app/lawnchair/ui/preferences/about/LawnchairLink.kt b/lawnchair/src/app/lawnchair/ui/preferences/about/LawnchairLink.kt index 1ba3ddff13..2c8f1b0412 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/about/LawnchairLink.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/about/LawnchairLink.kt @@ -24,7 +24,6 @@ import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.* import androidx.compose.material.MaterialTheme import androidx.compose.material3.LocalContentColor -import androidx.compose.material3.MaterialTheme as Material3Theme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment @@ -35,6 +34,7 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.painterResource import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp +import androidx.compose.material3.MaterialTheme as Material3Theme @Composable fun LawnchairLink( diff --git a/lawnchair/src/app/lawnchair/ui/preferences/components/AppItem.kt b/lawnchair/src/app/lawnchair/ui/preferences/components/AppItem.kt index 6d188bac6f..a59464d603 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/components/AppItem.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/components/AppItem.kt @@ -20,7 +20,6 @@ import android.graphics.Bitmap import androidx.compose.foundation.Image import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.* -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier diff --git a/lawnchair/src/app/lawnchair/ui/preferences/components/Chip.kt b/lawnchair/src/app/lawnchair/ui/preferences/components/Chip.kt index 3926ad5918..510de0ac11 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/components/Chip.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/components/Chip.kt @@ -4,7 +4,9 @@ import androidx.compose.animation.core.animateFloatAsState import androidx.compose.foundation.background import androidx.compose.foundation.border import androidx.compose.foundation.clickable -import androidx.compose.foundation.layout.* +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text @@ -13,7 +15,6 @@ import androidx.compose.runtime.getValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip -import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.lerp import androidx.compose.ui.unit.dp import kotlin.math.abs diff --git a/lawnchair/src/app/lawnchair/ui/preferences/components/LazyColumnPreferenceGroup.kt b/lawnchair/src/app/lawnchair/ui/preferences/components/LazyColumnPreferenceGroup.kt index 9ea539da0e..4117a108aa 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/components/LazyColumnPreferenceGroup.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/components/LazyColumnPreferenceGroup.kt @@ -22,6 +22,7 @@ import androidx.compose.foundation.lazy.LazyItemScope import androidx.compose.foundation.lazy.LazyListScope import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.Divider +import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.ui.Modifier @@ -30,7 +31,6 @@ import androidx.compose.ui.graphics.SolidColor import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import app.lawnchair.util.smartBorder -import androidx.compose.material3.MaterialTheme fun LazyListScope.preferenceGroupItems( count: Int, diff --git a/lawnchair/src/app/lawnchair/ui/preferences/components/NotificationDotsPreference.kt b/lawnchair/src/app/lawnchair/ui/preferences/components/NotificationDotsPreference.kt index f0e9635df8..a0cc547ba8 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/components/NotificationDotsPreference.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/components/NotificationDotsPreference.kt @@ -27,9 +27,11 @@ import androidx.compose.foundation.layout.requiredWidth import androidx.compose.foundation.layout.size import androidx.compose.material.ContentAlpha import androidx.compose.material.ExperimentalMaterialApi -import androidx.compose.material.ModalBottomSheetValue import androidx.compose.material3.* -import androidx.compose.runtime.* +import androidx.compose.runtime.Composable +import androidx.compose.runtime.DisposableEffect +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.painterResource @@ -45,7 +47,6 @@ import com.android.launcher3.settings.SettingsActivity.EXTRA_FRAGMENT_ARG_KEY import com.android.launcher3.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGS import com.android.launcher3.util.SettingsCache import com.android.launcher3.util.SettingsCache.NOTIFICATION_BADGING_URI -import kotlinx.coroutines.launch @Composable @ExperimentalMaterialApi diff --git a/lawnchair/src/app/lawnchair/ui/preferences/components/PreferenceScaffold.kt b/lawnchair/src/app/lawnchair/ui/preferences/components/PreferenceScaffold.kt index c12a74ed5c..3eee9e1888 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/components/PreferenceScaffold.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/components/PreferenceScaffold.kt @@ -1,21 +1,15 @@ package app.lawnchair.ui.preferences.components import androidx.compose.animation.ExperimentalAnimationApi -import androidx.compose.foundation.background -import androidx.compose.foundation.layout.* -import androidx.compose.material.MaterialTheme +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.RowScope import androidx.compose.runtime.Composable import androidx.compose.runtime.State import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext -import app.lawnchair.ui.util.addIf import com.android.quickstep.SysUINavigationMode import com.google.accompanist.insets.LocalWindowInsets -import com.google.accompanist.insets.navigationBarsHeight -import com.google.accompanist.insets.navigationBarsWithImePadding import com.google.accompanist.insets.rememberInsetsPaddingValues import com.google.accompanist.insets.ui.Scaffold diff --git a/lawnchair/src/app/lawnchair/ui/preferences/components/PreferenceSearchScaffold.kt b/lawnchair/src/app/lawnchair/ui/preferences/components/PreferenceSearchScaffold.kt index 047a591bef..d6594dc554 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/components/PreferenceSearchScaffold.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/components/PreferenceSearchScaffold.kt @@ -2,7 +2,6 @@ package app.lawnchair.ui.preferences.components import androidx.activity.compose.LocalOnBackPressedDispatcherOwner import androidx.compose.animation.ExperimentalAnimationApi -import androidx.compose.foundation.background import androidx.compose.foundation.layout.* import androidx.compose.material.ContentAlpha import androidx.compose.material.LocalContentAlpha @@ -16,9 +15,10 @@ import androidx.compose.ui.platform.LocalLayoutDirection import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.LayoutDirection import androidx.compose.ui.unit.dp -import app.lawnchair.ui.util.addIf -import com.android.quickstep.SysUINavigationMode -import com.google.accompanist.insets.* +import com.google.accompanist.insets.LocalWindowInsets +import com.google.accompanist.insets.navigationBarsPadding +import com.google.accompanist.insets.rememberInsetsPaddingValues +import com.google.accompanist.insets.statusBarsPadding import com.google.accompanist.insets.ui.LocalScaffoldPadding import com.google.accompanist.insets.ui.Scaffold diff --git a/lawnchair/src/app/lawnchair/ui/preferences/components/PreferenceTemplate.kt b/lawnchair/src/app/lawnchair/ui/preferences/components/PreferenceTemplate.kt index 761331c160..39209137ba 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/components/PreferenceTemplate.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/components/PreferenceTemplate.kt @@ -21,7 +21,6 @@ import androidx.compose.material.ContentAlpha import androidx.compose.material.Divider import androidx.compose.material3.LocalContentColor import androidx.compose.material3.LocalTextStyle -import androidx.compose.material3.MaterialTheme as Material3Theme import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.ui.Alignment @@ -30,6 +29,7 @@ import androidx.compose.ui.draw.alpha import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import app.lawnchair.ui.util.addIf +import androidx.compose.material3.MaterialTheme as Material3Theme @Composable fun PreferenceTemplate( diff --git a/lawnchair/src/app/lawnchair/ui/theme/Type.kt b/lawnchair/src/app/lawnchair/ui/theme/Type.kt index 6b6c73b87b..b82c4778bf 100644 --- a/lawnchair/src/app/lawnchair/ui/theme/Type.kt +++ b/lawnchair/src/app/lawnchair/ui/theme/Type.kt @@ -17,13 +17,13 @@ package app.lawnchair.ui.theme import androidx.compose.material.Typography -import androidx.compose.material3.Typography as Material3Typography import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.font.Font import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.sp import com.android.launcher3.R +import androidx.compose.material3.Typography as Material3Typography private val InterFontFamily = FontFamily( Font(R.font.inter_regular, FontWeight.Normal),