From 1f5597a908f0ecc8dcebbe0253d7114b69a9ab45 Mon Sep 17 00:00:00 2001 From: Patryk Michalik Date: Fri, 17 Jun 2022 18:39:24 +0200 Subject: [PATCH] Update dependencies --- build.gradle | 10 +++++----- lawnchair/src/app/lawnchair/DeviceProfileOverrides.kt | 2 +- lawnchair/src/app/lawnchair/LawnchairLauncher.kt | 2 +- lawnchair/src/app/lawnchair/SearchBarStateHandler.kt | 2 +- .../src/app/lawnchair/allapps/AllAppsSearchInput.kt | 2 +- .../lawnchair/allapps/LawnchairAlphabeticalAppsList.kt | 3 +-- .../src/app/lawnchair/gestures/GestureController.kt | 4 ++-- .../src/app/lawnchair/icons/shape/IconShapeManager.kt | 2 +- .../lawnchair/nexuslauncher/OverlayCallbackImpl.java | 2 +- .../src/app/lawnchair/preferences/PreferenceAdapter.kt | 4 ++-- .../app/lawnchair/preferences2/PreferenceManager2.kt | 4 ++-- .../src/app/lawnchair/preferences2/PreferenceUtils.kt | 8 ++++---- lawnchair/src/app/lawnchair/qsb/QsbLayout.kt | 2 +- .../app/lawnchair/qsb/providers/QsbSearchProvider.kt | 2 +- .../lawnchair/search/LawnchairAppSearchAlgorithm.kt | 2 +- .../src/app/lawnchair/smartspace/IcuDateTextView.kt | 2 +- .../smartspace/provider/SmartspaceDataSource.kt | 4 ++-- lawnchair/src/app/lawnchair/theme/ThemeProvider.kt | 4 ++-- .../src/app/lawnchair/ui/popup/LawnchairShortcut.kt | 2 +- .../lawnchair/ui/preferences/DebugMenuPreferences.kt | 7 ++++--- lawnchair/src/app/lawnchair/util/LawnchairUtils.kt | 2 +- .../launcher3/statehandlers/DepthController.java | 8 +++++--- src/com/android/launcher3/DeviceProfile.java | 2 +- src/com/android/launcher3/Hotseat.java | 2 +- src/com/android/launcher3/LauncherRootView.java | 2 +- src/com/android/launcher3/SessionCommitReceiver.java | 2 +- src/com/android/launcher3/Workspace.java | 2 +- src/com/android/launcher3/config/FeatureFlags.java | 2 +- .../android/launcher3/folder/FolderNameEditText.java | 2 +- src/com/android/launcher3/graphics/IconShape.java | 2 +- src/com/android/launcher3/graphics/SysUiScrim.java | 2 +- .../launcher3/popup/PopupContainerWithArrow.java | 2 +- src/com/android/launcher3/popup/SystemShortcut.java | 2 +- .../launcher3/shortcuts/DeepShortcutTextView.java | 2 +- src/com/android/launcher3/views/OptionsPopupView.java | 4 ++-- 35 files changed, 55 insertions(+), 53 deletions(-) diff --git a/build.gradle b/build.gradle index 2bc482b5f1..4c1ece0ff2 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,8 @@ buildscript { ext { kotlin_version = '1.6.21' - compose_version = '1.2.0-beta02' - accompanist_version = '0.24.9-beta' + compose_version = '1.2.0-rc01' + accompanist_version = '0.24.10-beta' libsu_version = '3.1.2' protocVersion = '3.18.0' room_version = '2.4.2' @@ -355,7 +355,7 @@ dependencies { implementation "androidx.compose.ui:ui-text-google-fonts:$compose_version" implementation "androidx.compose.foundation:foundation:$compose_version" implementation "androidx.compose.material:material:$compose_version" - implementation "androidx.compose.material3:material3:1.0.0-alpha12" + implementation "androidx.compose.material3:material3:1.0.0-alpha13" implementation "androidx.compose.runtime:runtime-livedata:$compose_version" implementation "androidx.compose.runtime:runtime-rxjava2:$compose_version" implementation "androidx.compose.compiler:compiler:$compose_version" @@ -372,12 +372,12 @@ dependencies { implementation "com.google.accompanist:accompanist-pager:$accompanist_version" implementation "com.google.accompanist:accompanist-placeholder-material:$accompanist_version" implementation "com.google.accompanist:accompanist-systemuicontroller:$accompanist_version" - implementation 'com.google.android.material:material:1.6.0' + implementation "com.google.android.material:material:1.6.1" implementation "io.github.fornewid:material-motion-compose-core:0.8.4" implementation 'dev.kdrag0n:colorkt:1.0.5' implementation 'io.coil-kt:coil-compose:2.0.0' implementation 'me.xdrop:fuzzywuzzy:1.4.0' - implementation "com.patrykmichalik:preference-manager:1.0.7" + implementation "com.patrykmichalik:opto:1.0.12" implementation "androidx.datastore:datastore-preferences:1.0.0" implementation "com.squareup.retrofit2:retrofit:2.9.0" implementation "com.squareup.retrofit2:converter-gson:2.9.0" diff --git a/lawnchair/src/app/lawnchair/DeviceProfileOverrides.kt b/lawnchair/src/app/lawnchair/DeviceProfileOverrides.kt index 4f0f69232a..13fc6e51c1 100644 --- a/lawnchair/src/app/lawnchair/DeviceProfileOverrides.kt +++ b/lawnchair/src/app/lawnchair/DeviceProfileOverrides.kt @@ -12,7 +12,7 @@ import com.android.launcher3.InvariantDeviceProfile.INDEX_TWO_PANEL_LANDSCAPE import com.android.launcher3.InvariantDeviceProfile.INDEX_ALL_APPS import com.android.launcher3.Utilities import com.android.launcher3.util.MainThreadInitializedObject -import com.patrykmichalik.preferencemanager.firstBlocking +import com.patrykmichalik.opto.core.firstBlocking class DeviceProfileOverrides(context: Context) { private val prefs = PreferenceManager.getInstance(context) diff --git a/lawnchair/src/app/lawnchair/LawnchairLauncher.kt b/lawnchair/src/app/lawnchair/LawnchairLauncher.kt index 95f08ddecc..781ba2ad01 100644 --- a/lawnchair/src/app/lawnchair/LawnchairLauncher.kt +++ b/lawnchair/src/app/lawnchair/LawnchairLauncher.kt @@ -67,7 +67,7 @@ import com.android.launcher3.util.TouchController import com.android.launcher3.widget.RoundedCornerEnforcement import com.android.systemui.plugins.shared.LauncherOverlayManager import com.android.systemui.shared.system.QuickStepContract -import com.patrykmichalik.preferencemanager.onEach +import com.patrykmichalik.opto.core.onEach import dev.kdrag0n.monet.theme.ColorScheme import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.launchIn diff --git a/lawnchair/src/app/lawnchair/SearchBarStateHandler.kt b/lawnchair/src/app/lawnchair/SearchBarStateHandler.kt index 18ba67323c..a70fe09046 100644 --- a/lawnchair/src/app/lawnchair/SearchBarStateHandler.kt +++ b/lawnchair/src/app/lawnchair/SearchBarStateHandler.kt @@ -13,7 +13,7 @@ import com.android.launcher3.anim.PendingAnimation import com.android.launcher3.statemanager.StateManager import com.android.launcher3.states.StateAnimationConfig import com.android.quickstep.AnimatedFloat -import com.patrykmichalik.preferencemanager.onEach +import com.patrykmichalik.opto.core.onEach import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers diff --git a/lawnchair/src/app/lawnchair/allapps/AllAppsSearchInput.kt b/lawnchair/src/app/lawnchair/allapps/AllAppsSearchInput.kt index eb7a2d630c..1803158761 100644 --- a/lawnchair/src/app/lawnchair/allapps/AllAppsSearchInput.kt +++ b/lawnchair/src/app/lawnchair/allapps/AllAppsSearchInput.kt @@ -34,7 +34,7 @@ import com.android.launcher3.allapps.* import com.android.launcher3.allapps.search.AllAppsSearchBarController import com.android.launcher3.search.SearchCallback import com.android.launcher3.util.Themes -import com.patrykmichalik.preferencemanager.firstBlocking +import com.patrykmichalik.opto.core.firstBlocking import java.util.* import kotlin.math.max diff --git a/lawnchair/src/app/lawnchair/allapps/LawnchairAlphabeticalAppsList.kt b/lawnchair/src/app/lawnchair/allapps/LawnchairAlphabeticalAppsList.kt index 96e12f8075..71e88effd8 100644 --- a/lawnchair/src/app/lawnchair/allapps/LawnchairAlphabeticalAppsList.kt +++ b/lawnchair/src/app/lawnchair/allapps/LawnchairAlphabeticalAppsList.kt @@ -8,9 +8,8 @@ import com.android.launcher3.allapps.AllAppsStore import com.android.launcher3.allapps.AlphabeticalAppsList import com.android.launcher3.allapps.WorkAdapterProvider import com.android.launcher3.model.data.AppInfo -import com.android.launcher3.util.ComponentKey import com.android.launcher3.util.ItemInfoMatcher -import com.patrykmichalik.preferencemanager.onEach +import com.patrykmichalik.opto.core.onEach class LawnchairAlphabeticalAppsList( context: Context, diff --git a/lawnchair/src/app/lawnchair/gestures/GestureController.kt b/lawnchair/src/app/lawnchair/gestures/GestureController.kt index 69eef8b275..1fdd0729bc 100644 --- a/lawnchair/src/app/lawnchair/gestures/GestureController.kt +++ b/lawnchair/src/app/lawnchair/gestures/GestureController.kt @@ -23,7 +23,7 @@ import app.lawnchair.gestures.config.GestureHandlerConfig import app.lawnchair.preferences2.PreferenceManager2 import com.android.quickstep.SysUINavigationMode import com.android.quickstep.util.VibratorWrapper -import com.patrykmichalik.preferencemanager.Preference +import com.patrykmichalik.opto.domain.Preference import kotlinx.coroutines.MainScope import kotlinx.coroutines.flow.* import kotlinx.coroutines.launch @@ -72,7 +72,7 @@ class GestureController(private val launcher: LawnchairLauncher) { } } - private fun handler(pref: Preference) = pref.get() + private fun handler(pref: Preference) = pref.get() .distinctUntilChanged() .map { it.createHandler(launcher) } .shareIn( diff --git a/lawnchair/src/app/lawnchair/icons/shape/IconShapeManager.kt b/lawnchair/src/app/lawnchair/icons/shape/IconShapeManager.kt index d35b331913..a95df2d3df 100644 --- a/lawnchair/src/app/lawnchair/icons/shape/IconShapeManager.kt +++ b/lawnchair/src/app/lawnchair/icons/shape/IconShapeManager.kt @@ -28,7 +28,7 @@ import com.android.launcher3.Utilities import com.android.launcher3.icons.GraphicsUtils import com.android.launcher3.icons.IconProvider import com.android.launcher3.util.MainThreadInitializedObject -import com.patrykmichalik.preferencemanager.firstBlocking +import com.patrykmichalik.opto.core.firstBlocking class IconShapeManager(private val context: Context) { diff --git a/lawnchair/src/app/lawnchair/nexuslauncher/OverlayCallbackImpl.java b/lawnchair/src/app/lawnchair/nexuslauncher/OverlayCallbackImpl.java index 9dcc1ff1d1..dc5708c132 100644 --- a/lawnchair/src/app/lawnchair/nexuslauncher/OverlayCallbackImpl.java +++ b/lawnchair/src/app/lawnchair/nexuslauncher/OverlayCallbackImpl.java @@ -15,7 +15,7 @@ import com.google.android.libraries.launcherclient.ISerializableScrollCallback; import com.google.android.libraries.launcherclient.LauncherClient; import com.google.android.libraries.launcherclient.LauncherClientCallbacks; import com.google.android.libraries.launcherclient.StaticInteger; -import com.patrykmichalik.preferencemanager.PreferenceExtensionsKt; +import com.patrykmichalik.opto.core.PreferenceExtensionsKt; import app.lawnchair.FeedBridge; import app.lawnchair.LawnchairLauncher; diff --git a/lawnchair/src/app/lawnchair/preferences/PreferenceAdapter.kt b/lawnchair/src/app/lawnchair/preferences/PreferenceAdapter.kt index 4541d0cffb..73ae36a5f4 100644 --- a/lawnchair/src/app/lawnchair/preferences/PreferenceAdapter.kt +++ b/lawnchair/src/app/lawnchair/preferences/PreferenceAdapter.kt @@ -22,7 +22,7 @@ import app.lawnchair.preferences2.IdpPreference import app.lawnchair.preferences2.asState import app.lawnchair.preferences2.firstBlocking import com.android.launcher3.InvariantDeviceProfile -import com.patrykmichalik.preferencemanager.Preference +import com.patrykmichalik.opto.domain.Preference import kotlinx.coroutines.launch import kotlin.reflect.KProperty @@ -109,7 +109,7 @@ private fun getAdapter( } @Composable -fun Preference.getAdapter(): PreferenceAdapter { +fun Preference.getAdapter(): PreferenceAdapter { return createStateAdapter(state = asState(), set = this::set) } diff --git a/lawnchair/src/app/lawnchair/preferences2/PreferenceManager2.kt b/lawnchair/src/app/lawnchair/preferences2/PreferenceManager2.kt index 392fc9051e..e3ad9a714e 100644 --- a/lawnchair/src/app/lawnchair/preferences2/PreferenceManager2.kt +++ b/lawnchair/src/app/lawnchair/preferences2/PreferenceManager2.kt @@ -35,8 +35,8 @@ import com.android.launcher3.R import com.android.launcher3.Utilities import com.android.launcher3.util.DynamicResource import com.android.launcher3.util.MainThreadInitializedObject -import com.patrykmichalik.preferencemanager.PreferenceManager -import com.patrykmichalik.preferencemanager.firstBlocking +import com.patrykmichalik.opto.core.PreferenceManager +import com.patrykmichalik.opto.core.firstBlocking import kotlinx.coroutines.MainScope import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.drop diff --git a/lawnchair/src/app/lawnchair/preferences2/PreferenceUtils.kt b/lawnchair/src/app/lawnchair/preferences2/PreferenceUtils.kt index 4a8cfe0b78..710f37646f 100644 --- a/lawnchair/src/app/lawnchair/preferences2/PreferenceUtils.kt +++ b/lawnchair/src/app/lawnchair/preferences2/PreferenceUtils.kt @@ -3,14 +3,14 @@ package app.lawnchair.preferences2 import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState import app.lawnchair.util.subscribeBlocking -import com.patrykmichalik.preferencemanager.Preference -import com.patrykmichalik.preferencemanager.firstBlocking +import com.patrykmichalik.opto.core.firstBlocking +import com.patrykmichalik.opto.domain.Preference import kotlinx.coroutines.CoroutineScope @Composable -fun Preference.asState() = get().collectAsState(initial = firstBlocking()) +fun Preference.asState() = get().collectAsState(initial = firstBlocking()) -fun Preference.subscribeBlocking( +fun Preference.subscribeBlocking( scope: CoroutineScope, block: (C) -> Unit, ) { diff --git a/lawnchair/src/app/lawnchair/qsb/QsbLayout.kt b/lawnchair/src/app/lawnchair/qsb/QsbLayout.kt index f6015e04b9..60ba249d37 100644 --- a/lawnchair/src/app/lawnchair/qsb/QsbLayout.kt +++ b/lawnchair/src/app/lawnchair/qsb/QsbLayout.kt @@ -34,7 +34,7 @@ import com.android.launcher3.R import com.android.launcher3.qsb.QsbContainerView import com.android.launcher3.util.Themes import com.android.launcher3.views.ActivityContext -import com.patrykmichalik.preferencemanager.firstBlocking +import com.patrykmichalik.opto.core.firstBlocking import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.collect import kotlinx.coroutines.flow.flatMapLatest diff --git a/lawnchair/src/app/lawnchair/qsb/providers/QsbSearchProvider.kt b/lawnchair/src/app/lawnchair/qsb/providers/QsbSearchProvider.kt index f6bd9e6b5f..23e94a61df 100644 --- a/lawnchair/src/app/lawnchair/qsb/providers/QsbSearchProvider.kt +++ b/lawnchair/src/app/lawnchair/qsb/providers/QsbSearchProvider.kt @@ -14,7 +14,7 @@ import app.lawnchair.resolveIntent import app.lawnchair.util.isPackageInstalled import com.android.launcher3.Launcher import com.android.launcher3.R -import com.patrykmichalik.preferencemanager.first +import com.patrykmichalik.opto.core.first open class QsbSearchProvider( val id: String, diff --git a/lawnchair/src/app/lawnchair/search/LawnchairAppSearchAlgorithm.kt b/lawnchair/src/app/lawnchair/search/LawnchairAppSearchAlgorithm.kt index 81f28d35ec..bef33d38c1 100644 --- a/lawnchair/src/app/lawnchair/search/LawnchairAppSearchAlgorithm.kt +++ b/lawnchair/src/app/lawnchair/search/LawnchairAppSearchAlgorithm.kt @@ -23,7 +23,7 @@ import com.android.launcher3.shortcuts.ShortcutRequest import com.android.launcher3.util.ComponentKey import com.android.launcher3.util.Executors import com.android.launcher3.util.PackageManagerHelper -import com.patrykmichalik.preferencemanager.onEach +import com.patrykmichalik.opto.core.onEach import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import me.xdrop.fuzzywuzzy.FuzzySearch diff --git a/lawnchair/src/app/lawnchair/smartspace/IcuDateTextView.kt b/lawnchair/src/app/lawnchair/smartspace/IcuDateTextView.kt index 3d958845e8..7f669b7a93 100644 --- a/lawnchair/src/app/lawnchair/smartspace/IcuDateTextView.kt +++ b/lawnchair/src/app/lawnchair/smartspace/IcuDateTextView.kt @@ -13,7 +13,7 @@ import app.lawnchair.util.broadcastReceiverFlow import app.lawnchair.util.repeatOnAttached import app.lawnchair.util.subscribeBlocking import com.android.launcher3.R -import com.patrykmichalik.preferencemanager.firstBlocking +import com.patrykmichalik.opto.core.firstBlocking import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.flowOf import kotlinx.coroutines.flow.launchIn diff --git a/lawnchair/src/app/lawnchair/smartspace/provider/SmartspaceDataSource.kt b/lawnchair/src/app/lawnchair/smartspace/provider/SmartspaceDataSource.kt index 7b710aa976..923d364041 100644 --- a/lawnchair/src/app/lawnchair/smartspace/provider/SmartspaceDataSource.kt +++ b/lawnchair/src/app/lawnchair/smartspace/provider/SmartspaceDataSource.kt @@ -5,14 +5,14 @@ import android.content.Context import android.util.Log import app.lawnchair.preferences2.PreferenceManager2 import app.lawnchair.smartspace.model.SmartspaceTarget -import com.patrykmichalik.preferencemanager.Preference +import com.patrykmichalik.opto.domain.Preference import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.* abstract class SmartspaceDataSource( val context: Context, val providerName: Int, - getEnabledPref: PreferenceManager2.() -> Preference + getEnabledPref: PreferenceManager2.() -> Preference ) { val enabledPref = getEnabledPref(PreferenceManager2.getInstance(context)) open val isAvailable: Boolean = true diff --git a/lawnchair/src/app/lawnchair/theme/ThemeProvider.kt b/lawnchair/src/app/lawnchair/theme/ThemeProvider.kt index c5abf9c2ca..9c4eb34d9c 100644 --- a/lawnchair/src/app/lawnchair/theme/ThemeProvider.kt +++ b/lawnchair/src/app/lawnchair/theme/ThemeProvider.kt @@ -18,8 +18,8 @@ import app.lawnchair.ui.theme.getSystemAccent import app.lawnchair.wallpaper.WallpaperManagerCompat import com.android.launcher3.Utilities import com.android.launcher3.util.MainThreadInitializedObject -import com.patrykmichalik.preferencemanager.firstBlocking -import com.patrykmichalik.preferencemanager.onEach +import com.patrykmichalik.opto.core.firstBlocking +import com.patrykmichalik.opto.core.onEach import dev.kdrag0n.colorkt.Color import dev.kdrag0n.colorkt.conversion.ConversionGraph.convert import dev.kdrag0n.colorkt.rgb.Srgb diff --git a/lawnchair/src/app/lawnchair/ui/popup/LawnchairShortcut.kt b/lawnchair/src/app/lawnchair/ui/popup/LawnchairShortcut.kt index e6e1b3f26e..74aad48a6b 100644 --- a/lawnchair/src/app/lawnchair/ui/popup/LawnchairShortcut.kt +++ b/lawnchair/src/app/lawnchair/ui/popup/LawnchairShortcut.kt @@ -17,7 +17,7 @@ import com.android.launcher3.model.data.AppInfo as ModelAppInfo import com.android.launcher3.model.data.ItemInfo import com.android.launcher3.popup.SystemShortcut import com.android.launcher3.util.ComponentKey -import com.patrykmichalik.preferencemanager.firstBlocking +import com.patrykmichalik.opto.core.firstBlocking class LawnchairShortcut { diff --git a/lawnchair/src/app/lawnchair/ui/preferences/DebugMenuPreferences.kt b/lawnchair/src/app/lawnchair/ui/preferences/DebugMenuPreferences.kt index c55dbdc96b..f869bfd3ca 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/DebugMenuPreferences.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/DebugMenuPreferences.kt @@ -4,6 +4,7 @@ import android.content.Intent import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.ui.platform.LocalContext +import androidx.datastore.preferences.core.Preferences import androidx.navigation.NavGraphBuilder import app.lawnchair.preferences.PreferenceManager import app.lawnchair.preferences.getAdapter @@ -13,7 +14,7 @@ import app.lawnchair.preferences2.preferenceManager2 import app.lawnchair.ui.preferences.components.* import com.android.launcher3.settings.DeveloperOptionsFragment import com.android.launcher3.settings.SettingsActivity -import com.patrykmichalik.preferencemanager.Preference +import com.patrykmichalik.opto.domain.Preference fun NavGraphBuilder.debugMenuGraph(route: String) { preferenceGraph(route, { DebugMenuPreferences() }) @@ -75,10 +76,10 @@ fun DebugMenuPreferences() { } } -private val PreferenceManager2.debugFlags: List> +private val PreferenceManager2.debugFlags: List>> get() = listOf(showComponentNames) -private val PreferenceManager2.textFlags: List> +private val PreferenceManager2.textFlags: List>> get() = listOf(additionalFonts) private val PreferenceManager.debugFlags diff --git a/lawnchair/src/app/lawnchair/util/LawnchairUtils.kt b/lawnchair/src/app/lawnchair/util/LawnchairUtils.kt index 83c5d92346..21b6b07f5f 100644 --- a/lawnchair/src/app/lawnchair/util/LawnchairUtils.kt +++ b/lawnchair/src/app/lawnchair/util/LawnchairUtils.kt @@ -44,7 +44,7 @@ import com.android.launcher3.R import com.android.launcher3.util.Executors.MAIN_EXECUTOR import com.android.launcher3.util.Themes import com.android.systemui.shared.system.QuickStepContract -import com.patrykmichalik.preferencemanager.firstBlocking +import com.patrykmichalik.opto.core.firstBlocking import org.json.JSONArray import java.util.concurrent.Callable import java.util.concurrent.ExecutionException diff --git a/quickstep/src/com/android/launcher3/statehandlers/DepthController.java b/quickstep/src/com/android/launcher3/statehandlers/DepthController.java index a025e2a189..1759bfe73d 100644 --- a/quickstep/src/com/android/launcher3/statehandlers/DepthController.java +++ b/quickstep/src/com/android/launcher3/statehandlers/DepthController.java @@ -33,6 +33,8 @@ import android.view.View; import android.view.ViewRootImpl; import android.view.ViewTreeObserver; +import androidx.datastore.preferences.core.Preferences; + import com.android.launcher3.BaseActivity; import com.android.launcher3.Launcher; import com.android.launcher3.LauncherState; @@ -43,8 +45,8 @@ import com.android.launcher3.statemanager.StateManager.StateHandler; import com.android.launcher3.states.StateAnimationConfig; import com.android.systemui.shared.system.BlurUtils; import com.android.systemui.shared.system.WallpaperManagerCompat; -import com.patrykmichalik.preferencemanager.Preference; -import com.patrykmichalik.preferencemanager.PreferenceExtensionsKt; +import com.patrykmichalik.opto.domain.Preference; +import com.patrykmichalik.opto.core.PreferenceExtensionsKt; import app.lawnchair.preferences.BasePreferenceManager; import app.lawnchair.preferences.PreferenceManager; @@ -172,7 +174,7 @@ public class DepthController implements StateHandler, public DepthController(Launcher l) { mLauncher = l; - Preference depthPref = PreferenceManager2.getInstance(l).getWallpaperDepthEffect(); + Preference depthPref = PreferenceManager2.getInstance(l).getWallpaperDepthEffect(); mEnableDepth = PreferenceExtensionsKt.firstBlocking(depthPref); } diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java index 0cffaadcff..487e0ce5aa 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java @@ -46,7 +46,7 @@ import com.android.launcher3.uioverrides.ApiWrapper; import com.android.launcher3.util.DisplayController; import com.android.launcher3.util.DisplayController.Info; import com.android.launcher3.util.WindowBounds; -import com.patrykmichalik.preferencemanager.PreferenceExtensionsKt; +import com.patrykmichalik.opto.core.PreferenceExtensionsKt; import java.io.PrintWriter; diff --git a/src/com/android/launcher3/Hotseat.java b/src/com/android/launcher3/Hotseat.java index 15e9b6c939..9ca306daa6 100644 --- a/src/com/android/launcher3/Hotseat.java +++ b/src/com/android/launcher3/Hotseat.java @@ -31,7 +31,7 @@ import android.widget.FrameLayout; import androidx.annotation.Nullable; -import com.patrykmichalik.preferencemanager.PreferenceExtensionsKt; +import com.patrykmichalik.opto.core.PreferenceExtensionsKt; import java.util.function.Consumer; diff --git a/src/com/android/launcher3/LauncherRootView.java b/src/com/android/launcher3/LauncherRootView.java index 9f6b7deaa4..ee5447ab1b 100644 --- a/src/com/android/launcher3/LauncherRootView.java +++ b/src/com/android/launcher3/LauncherRootView.java @@ -19,7 +19,7 @@ import androidx.annotation.RequiresApi; import com.android.launcher3.graphics.SysUiScrim; import com.android.launcher3.statemanager.StatefulActivity; import com.android.launcher3.uioverrides.ApiWrapper; -import com.patrykmichalik.preferencemanager.PreferenceExtensionsKt; +import com.patrykmichalik.opto.core.PreferenceExtensionsKt; import java.util.Collections; import java.util.List; diff --git a/src/com/android/launcher3/SessionCommitReceiver.java b/src/com/android/launcher3/SessionCommitReceiver.java index 4efa798909..c8d56b9b52 100644 --- a/src/com/android/launcher3/SessionCommitReceiver.java +++ b/src/com/android/launcher3/SessionCommitReceiver.java @@ -31,7 +31,7 @@ import com.android.launcher3.logging.FileLog; import com.android.launcher3.model.ItemInstallQueue; import com.android.launcher3.pm.InstallSessionHelper; import com.android.launcher3.util.Executors; -import com.patrykmichalik.preferencemanager.PreferenceExtensionsKt; +import com.patrykmichalik.opto.core.PreferenceExtensionsKt; import app.lawnchair.preferences2.PreferenceManager2; diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 8dd93cac46..dd13c8bd02 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -122,7 +122,7 @@ import com.android.launcher3.widget.WidgetManagerHelper; import com.android.launcher3.widget.dragndrop.AppWidgetHostViewDragListener; import com.android.launcher3.widget.util.WidgetSizes; import com.android.systemui.plugins.shared.LauncherOverlayManager.LauncherOverlay; -import com.patrykmichalik.preferencemanager.PreferenceExtensionsKt; +import com.patrykmichalik.opto.core.PreferenceExtensionsKt; import java.util.ArrayList; import java.util.Collections; diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java index 58b02291e7..b42d02a210 100644 --- a/src/com/android/launcher3/config/FeatureFlags.java +++ b/src/com/android/launcher3/config/FeatureFlags.java @@ -22,7 +22,7 @@ import com.android.launcher3.BuildConfig; import com.android.launcher3.Utilities; import com.android.launcher3.uioverrides.DeviceFlag; import com.android.systemui.shared.system.BlurUtils; -import com.patrykmichalik.preferencemanager.PreferenceExtensionsKt; +import com.patrykmichalik.opto.core.PreferenceExtensionsKt; import java.io.PrintWriter; import java.util.ArrayList; diff --git a/src/com/android/launcher3/folder/FolderNameEditText.java b/src/com/android/launcher3/folder/FolderNameEditText.java index de5e1fde3e..b87207900f 100644 --- a/src/com/android/launcher3/folder/FolderNameEditText.java +++ b/src/com/android/launcher3/folder/FolderNameEditText.java @@ -27,7 +27,7 @@ import android.view.inputmethod.InputConnectionWrapper; import android.view.inputmethod.InputMethodManager; import com.android.launcher3.ExtendedEditText; -import com.patrykmichalik.preferencemanager.PreferenceExtensionsKt; +import com.patrykmichalik.opto.core.PreferenceExtensionsKt; import java.util.List; diff --git a/src/com/android/launcher3/graphics/IconShape.java b/src/com/android/launcher3/graphics/IconShape.java index 87eed19527..da18c0cba7 100644 --- a/src/com/android/launcher3/graphics/IconShape.java +++ b/src/com/android/launcher3/graphics/IconShape.java @@ -47,7 +47,7 @@ import com.android.launcher3.anim.RoundedRectRevealOutlineProvider; import com.android.launcher3.icons.GraphicsUtils; import com.android.launcher3.icons.IconNormalizer; import com.android.launcher3.views.ClipPathView; -import com.patrykmichalik.preferencemanager.PreferenceExtensionsKt; +import com.patrykmichalik.opto.core.PreferenceExtensionsKt; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; diff --git a/src/com/android/launcher3/graphics/SysUiScrim.java b/src/com/android/launcher3/graphics/SysUiScrim.java index 22b60202db..67e6dc7033 100644 --- a/src/com/android/launcher3/graphics/SysUiScrim.java +++ b/src/com/android/launcher3/graphics/SysUiScrim.java @@ -51,7 +51,7 @@ import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.util.DynamicResource; import com.android.launcher3.util.Themes; import com.android.systemui.plugins.ResourceProvider; -import com.patrykmichalik.preferencemanager.PreferenceExtensionsKt; +import com.patrykmichalik.opto.core.PreferenceExtensionsKt; import app.lawnchair.preferences2.PreferenceManager2; import app.lawnchair.util.ViewExtensionsKt; diff --git a/src/com/android/launcher3/popup/PopupContainerWithArrow.java b/src/com/android/launcher3/popup/PopupContainerWithArrow.java index eabee75cea..93279d18e8 100644 --- a/src/com/android/launcher3/popup/PopupContainerWithArrow.java +++ b/src/com/android/launcher3/popup/PopupContainerWithArrow.java @@ -68,7 +68,7 @@ import com.android.launcher3.util.PackageUserKey; import com.android.launcher3.util.ShortcutUtil; import com.android.launcher3.views.ActivityContext; import com.android.launcher3.views.BaseDragLayer; -import com.patrykmichalik.preferencemanager.PreferenceExtensionsKt; +import com.patrykmichalik.opto.core.PreferenceExtensionsKt; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/com/android/launcher3/popup/SystemShortcut.java b/src/com/android/launcher3/popup/SystemShortcut.java index 81598a79bb..cf88016109 100644 --- a/src/com/android/launcher3/popup/SystemShortcut.java +++ b/src/com/android/launcher3/popup/SystemShortcut.java @@ -27,7 +27,7 @@ import com.android.launcher3.util.PackageManagerHelper; import com.android.launcher3.util.PackageUserKey; import com.android.launcher3.views.ActivityContext; import com.android.launcher3.widget.WidgetsBottomSheet; -import com.patrykmichalik.preferencemanager.PreferenceExtensionsKt; +import com.patrykmichalik.opto.core.PreferenceExtensionsKt; import java.util.List; diff --git a/src/com/android/launcher3/shortcuts/DeepShortcutTextView.java b/src/com/android/launcher3/shortcuts/DeepShortcutTextView.java index a194a630cd..f52708f46e 100644 --- a/src/com/android/launcher3/shortcuts/DeepShortcutTextView.java +++ b/src/com/android/launcher3/shortcuts/DeepShortcutTextView.java @@ -28,7 +28,7 @@ import android.widget.Toast; import com.android.launcher3.BubbleTextView; import com.android.launcher3.R; import com.android.launcher3.Utilities; -import com.patrykmichalik.preferencemanager.PreferenceExtensionsKt; +import com.patrykmichalik.opto.core.PreferenceExtensionsKt; import app.lawnchair.preferences2.PreferenceManager2; diff --git a/src/com/android/launcher3/views/OptionsPopupView.java b/src/com/android/launcher3/views/OptionsPopupView.java index 0b4f2e53cd..797c68e597 100644 --- a/src/com/android/launcher3/views/OptionsPopupView.java +++ b/src/com/android/launcher3/views/OptionsPopupView.java @@ -52,8 +52,8 @@ import com.android.launcher3.shortcuts.DeepShortcutView; import com.android.launcher3.testing.TestLogging; import com.android.launcher3.testing.TestProtocol; import com.android.launcher3.widget.picker.WidgetsFullSheet; -import com.patrykmichalik.preferencemanager.Preference; -import com.patrykmichalik.preferencemanager.PreferenceExtensionsKt; +import com.patrykmichalik.opto.domain.Preference; +import com.patrykmichalik.opto.core.PreferenceExtensionsKt; import java.util.ArrayList; import java.util.List;