PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Update dependencies, optimize imports, and tweak About page

Browse Source
This commit is contained in:
Patryk Michalik
2022-02-03 17:26:59 +01:00
parent ec733aee05
commit 367378d5a4
24 changed files with 36 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle
+2 -2
View File
@@ -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]
lawnchair/src/app/lawnchair/LawnchairLauncher.kt
+1 -3
View File
@@ -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
lawnchair/src/app/lawnchair/allapps/SearchResultIcon.kt
-1
View File
@@ -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
lawnchair/src/app/lawnchair/allapps/SearchResultIconRow.kt
-1
View File
@@ -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
lawnchair/src/app/lawnchair/data/AppDatabase.kt
+4 -2
View File
@@ -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)
lawnchair/src/app/lawnchair/data/iconoverride/IconOverrideDao.kt
+4 -1
View File
@@ -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
lawnchair/src/app/lawnchair/icons/CustomIconPack.kt
-1
View File
@@ -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) {
lawnchair/src/app/lawnchair/qsb/AssistantIconView.kt
-1
View File
@@ -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")
lawnchair/src/app/lawnchair/search/LawnchairAppSearchAlgorithm.kt
-1
View File
@@ -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) {
lawnchair/src/app/lawnchair/search/SearchTargetCompat.java
-1
View File
@@ -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;
lawnchair/src/app/lawnchair/search/SearchTargetUtils.kt
-1
View File
@@ -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
lawnchair/src/app/lawnchair/theme/ColorSchemeUtils.kt
+1 -1
View File
@@ -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) {
lawnchair/src/app/lawnchair/theme/ThemeProvider.kt
-1
View File
@@ -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) {
lawnchair/src/app/lawnchair/ui/preferences/GeneralPreferences.kt
+1 -1
View File
@@ -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
lawnchair/src/app/lawnchair/ui/preferences/about/About.kt
+6 -5
View File
@@ -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))
lawnchair/src/app/lawnchair/ui/preferences/about/LawnchairLink.kt
+1 -1
View File
@@ -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(
lawnchair/src/app/lawnchair/ui/preferences/components/AppItem.kt
-1
View File
@@ -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
lawnchair/src/app/lawnchair/ui/preferences/components/Chip.kt
+3 -2
View File
@@ -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
lawnchair/src/app/lawnchair/ui/preferences/components/LazyColumnPreferenceGroup.kt
+1 -1
View File
@@ -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,
lawnchair/src/app/lawnchair/ui/preferences/components/NotificationDotsPreference.kt
+4 -3
View File
@@ -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
lawnchair/src/app/lawnchair/ui/preferences/components/PreferenceScaffold.kt
+2 -8
View File
@@ -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
lawnchair/src/app/lawnchair/ui/preferences/components/PreferenceSearchScaffold.kt
+4 -4
View File
@@ -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
lawnchair/src/app/lawnchair/ui/preferences/components/PreferenceTemplate.kt
+1 -1
View File
@@ -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(
lawnchair/src/app/lawnchair/ui/theme/Type.kt
+1 -1
View File
@@ -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),