From d9b63d3aa2be3afdda0921b806ce60d581817f9e Mon Sep 17 00:00:00 2001 From: Artem Chepurnoy Date: Sun, 15 Sep 2024 16:37:31 +0300 Subject: [PATCH] chore: Bump dependencies and migrate away from deprecated methods --- common/build.gradle.kts | 1 + .../clipboard/KeyguardClipboardService.kt | 2 +- .../copy/SubscriptionServiceAndroid.kt | 6 +-- .../feature/apppicker/AppPickerScreen.kt | 2 +- .../apppicker/AppPickerStateProducer.kt | 2 +- .../biometric/BiometricPromptEffect.kt | 2 +- .../component/SettingPermissionOther.kt | 1 + .../keyguard/feature/qr/ScanQrScreen.kt | 4 +- .../ic_launcher.xml | 0 .../res/xml/network_configuration.xml | 10 +++-- .../keyguard/common/model/DSecret.kt | 2 +- .../keyguard/feature/add/AddScreen.kt | 2 +- .../feature/attachments/AttachmentsScreen.kt | 2 +- .../auth/login/otp/LoginTwofaScreen.kt | 4 +- .../confirmation/ConfirmationScreen.kt | 2 +- .../duplicates/list/DuplicatesListScreen.kt | 2 +- .../feature/feedback/FeedbackScreen.kt | 2 +- .../filter/list/CipherFiltersListScreen.kt | 2 +- .../emailrelay/EmailRelayListScreen.kt | 2 +- .../history/GeneratorHistoryScreen.kt | 2 +- .../wordlist/list/WordlistListScreen.kt | 2 +- .../wordlist/view/WordlistViewScreen.kt | 2 +- .../settings/component/SettingAppIcons.kt | 5 ++- .../component/SettingAutofillCopyTotp.kt | 5 ++- .../SettingAutofillInlineSuggestions.kt | 5 ++- .../SettingAutofillManualSelection.kt | 5 ++- .../SettingAutofillRespectAutofillOff.kt | 5 ++- .../component/SettingAutofillSaveRequest.kt | 5 ++- .../component/SettingAutofillSaveUri.kt | 5 ++- .../settings/component/SettingBiometrics.kt | 5 ++- .../SettingBiometricsRequireConfirmation.kt | 5 ++- .../component/SettingCheckPasskeys.kt | 5 ++- .../component/SettingCheckPwnedPasswords.kt | 5 ++- .../component/SettingCheckPwnedServices.kt | 5 ++- .../settings/component/SettingCheckTwoFA.kt | 5 ++- .../settings/component/SettingCloseToTray.kt | 5 ++- .../component/SettingConcealedFields.kt | 5 ++- .../settings/component/SettingCrashlytics.kt | 5 ++- .../settings/component/SettingGravatar.kt | 5 ++- .../settings/component/SettingKeepScreenOn.kt | 5 ++- .../settings/component/SettingMarkdown.kt | 5 ++- .../settings/component/SettingNavLabel.kt | 5 ++- .../settings/component/SettingScreenDelay.kt | 5 ++- .../settings/component/SettingScreenshots.kt | 5 ++- .../component/SettingSubscriptionsDebug.kt | 5 ++- .../component/SettingThemeUseAmoledDark.kt | 5 ++- .../SettingTwoPanelLayoutLandscape.kt | 5 ++- .../SettingTwoPanelLayoutPortrait.kt | 5 ++- .../component/SettingUseExternalBrowser.kt | 5 ++- .../component/SettingVaultLockAfterReboot.kt | 5 ++- .../SettingVaultLockAfterScreenOff.kt | 5 ++- .../settings/component/SettingVaultPersist.kt | 5 ++- .../settings/component/SettingWebsiteIcons.kt | 5 ++- .../settings/component/SettingWriteAccess.kt | 5 ++- .../home/vault/add/AddStateProducer.kt | 10 ++--- .../vault/collections/CollectionsScreen.kt | 2 +- .../home/vault/component/SearchTextField.kt | 2 +- .../home/vault/component/VaultListItem.kt | 4 +- .../home/vault/folders/FoldersScreen.kt | 2 +- .../organizations/OrganizationsScreen.kt | 2 +- .../home/vault/screen/VaultListScreen.kt | 4 +- .../home/vault/screen/VaultListState.kt | 2 +- .../JustDeleteMeServiceListScreen.kt | 2 +- .../directory/JustGetMyDataListScreen.kt | 2 +- .../keyguard/feature/logs/LogsScreen.kt | 2 +- .../directory/PasskeysServiceListScreen.kt | 2 +- .../keyguard/feature/send/SendListState.kt | 2 +- .../feature/send/list/SendListScreen.kt | 2 +- .../feature/send/view/SendViewScreen.kt | 2 +- .../keyguard/feature/sync/SyncScreen.kt | 2 +- .../tfa/directory/TwoFaServiceListScreen.kt | 2 +- .../urloverride/UrlOverrideListScreen.kt | 2 +- .../alerts/WatchtowerNewAlertsScreen.kt | 2 +- .../keyguard/feature/yubikey/YubiScreen.kt | 2 +- .../platform/lifecycle/LeLifecycleProvider.kt | 2 +- .../keyguard/ui/PasswordFilterItem.kt | 4 +- .../kotlin/com/artemchep/keyguard/ui/popup.kt | 3 +- .../keyguard/crypto/CipherEncryptorImpl.kt | 2 +- .../crypto/CipherInputStreamDecoder.kt | 2 +- .../keyguard/crypto/FileEncryptorImpl.kt | 2 +- .../messagepack/MessagePackHubProtocol.kt | 4 +- gradle.properties | 1 + gradle/libs.versions.toml | 43 ++++++++++--------- 83 files changed, 186 insertions(+), 145 deletions(-) rename common/src/androidMain/res/{mipmap-anydpi-v26 => mipmap-anydpi}/ic_launcher.xml (100%) diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 6cec144..aa3f31a 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -126,6 +126,7 @@ kotlin { api(libs.kodein.kodein.di.framework.compose) api(libs.androidx.lifecycle.common) api(libs.androidx.lifecycle.runtime) + api(libs.androidx.lifecycle.runtime.compose) api(libs.ktor.ktor.client.core) api(libs.ktor.ktor.client.logging) api(libs.ktor.ktor.client.content.negotiation) diff --git a/common/src/androidMain/kotlin/com/artemchep/keyguard/android/clipboard/KeyguardClipboardService.kt b/common/src/androidMain/kotlin/com/artemchep/keyguard/android/clipboard/KeyguardClipboardService.kt index 84625d8..5b66246 100644 --- a/common/src/androidMain/kotlin/com/artemchep/keyguard/android/clipboard/KeyguardClipboardService.kt +++ b/common/src/androidMain/kotlin/com/artemchep/keyguard/android/clipboard/KeyguardClipboardService.kt @@ -114,7 +114,7 @@ class KeyguardClipboardService : Service(), DIAware { ) : Args @Parcelize - object Cancel : Args + data object Cancel : Args } private data class CopyValueEvent( diff --git a/common/src/androidMain/kotlin/com/artemchep/keyguard/copy/SubscriptionServiceAndroid.kt b/common/src/androidMain/kotlin/com/artemchep/keyguard/copy/SubscriptionServiceAndroid.kt index cd38d53..ca65839 100644 --- a/common/src/androidMain/kotlin/com/artemchep/keyguard/copy/SubscriptionServiceAndroid.kt +++ b/common/src/androidMain/kotlin/com/artemchep/keyguard/copy/SubscriptionServiceAndroid.kt @@ -44,12 +44,12 @@ class SubscriptionServiceAndroid( private val billingManager: BillingManager, ) : SubscriptionService { companion object { - private val SkuListSubscription = listOf( + private val SkuListSubscription = setOf( "premium", "premium_3m", ) - private val SkuListProduct = listOf( + private val SkuListProduct = setOf( "premium_lifetime", ) } @@ -144,7 +144,7 @@ class SubscriptionServiceAndroid( .run { val existingPurchase = receipts ?.firstOrNull { - SkuListSubscription.intersect(it.products) + it.products.intersect(SkuListSubscription) .isNotEmpty() } if (existingPurchase != null && it.productId !in existingPurchase.products) { diff --git a/common/src/androidMain/kotlin/com/artemchep/keyguard/feature/apppicker/AppPickerScreen.kt b/common/src/androidMain/kotlin/com/artemchep/keyguard/feature/apppicker/AppPickerScreen.kt index 06f2a03..3d12b3c 100644 --- a/common/src/androidMain/kotlin/com/artemchep/keyguard/feature/apppicker/AppPickerScreen.kt +++ b/common/src/androidMain/kotlin/com/artemchep/keyguard/feature/apppicker/AppPickerScreen.kt @@ -232,7 +232,7 @@ fun ChangePasswordScreen( ) { item -> AppItem( modifier = Modifier - .animateItemPlacement(), + .animateItem(), item = item, ) } diff --git a/common/src/androidMain/kotlin/com/artemchep/keyguard/feature/apppicker/AppPickerStateProducer.kt b/common/src/androidMain/kotlin/com/artemchep/keyguard/feature/apppicker/AppPickerStateProducer.kt index 328b034..ab60dd9 100644 --- a/common/src/androidMain/kotlin/com/artemchep/keyguard/feature/apppicker/AppPickerStateProducer.kt +++ b/common/src/androidMain/kotlin/com/artemchep/keyguard/feature/apppicker/AppPickerStateProducer.kt @@ -409,7 +409,7 @@ private fun getApps( ApplicationInfo.FLAG_SYSTEM or ApplicationInfo.FLAG_UPDATED_SYSTEM_APP applicationInfo.flags.and(mask) != 0 } - val label = info.loadLabel(pm)?.toString().orEmpty() + val label = info.loadLabel(pm).toString() val installTime = packageInfo.firstInstallTime AppInfo( packageName = info.activityInfo.packageName, diff --git a/common/src/androidMain/kotlin/com/artemchep/keyguard/feature/biometric/BiometricPromptEffect.kt b/common/src/androidMain/kotlin/com/artemchep/keyguard/feature/biometric/BiometricPromptEffect.kt index ae57fba..4338c50 100644 --- a/common/src/androidMain/kotlin/com/artemchep/keyguard/feature/biometric/BiometricPromptEffect.kt +++ b/common/src/androidMain/kotlin/com/artemchep/keyguard/feature/biometric/BiometricPromptEffect.kt @@ -5,8 +5,8 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.rememberUpdatedState import androidx.compose.ui.platform.LocalContext -import androidx.compose.ui.platform.LocalLifecycleOwner import androidx.fragment.app.FragmentActivity +import androidx.lifecycle.compose.LocalLifecycleOwner import androidx.lifecycle.whenResumed import arrow.core.left import arrow.core.right diff --git a/common/src/androidMain/kotlin/com/artemchep/keyguard/feature/home/settings/component/SettingPermissionOther.kt b/common/src/androidMain/kotlin/com/artemchep/keyguard/feature/home/settings/component/SettingPermissionOther.kt index e0e0f3d..64cb781 100644 --- a/common/src/androidMain/kotlin/com/artemchep/keyguard/feature/home/settings/component/SettingPermissionOther.kt +++ b/common/src/androidMain/kotlin/com/artemchep/keyguard/feature/home/settings/component/SettingPermissionOther.kt @@ -114,6 +114,7 @@ private fun getPermissionItems(context: Context) = kotlin.run { val result = info .requestedPermissions + .orEmpty() .mapNotNull { permission -> kotlin.runCatching { val permissionInfo = pm.getPermissionInfo(permission, 0) diff --git a/common/src/androidMain/kotlin/com/artemchep/keyguard/feature/qr/ScanQrScreen.kt b/common/src/androidMain/kotlin/com/artemchep/keyguard/feature/qr/ScanQrScreen.kt index 95c1961..4aa7cee 100644 --- a/common/src/androidMain/kotlin/com/artemchep/keyguard/feature/qr/ScanQrScreen.kt +++ b/common/src/androidMain/kotlin/com/artemchep/keyguard/feature/qr/ScanQrScreen.kt @@ -21,10 +21,10 @@ import androidx.compose.runtime.* import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.input.nestedscroll.nestedScroll -import androidx.compose.ui.platform.LocalLifecycleOwner import androidx.compose.ui.unit.dp import androidx.compose.ui.viewinterop.AndroidView import androidx.core.content.ContextCompat +import androidx.lifecycle.compose.LocalLifecycleOwner import com.artemchep.keyguard.feature.navigation.NavigationIcon import com.artemchep.keyguard.feature.navigation.RouteResultTransmitter import com.artemchep.keyguard.res.Res @@ -172,7 +172,7 @@ private fun ScanQrCamera( val preview = Preview.Builder() .build() .also { - it.setSurfaceProvider(previewView.surfaceProvider) + it.surfaceProvider = previewView.surfaceProvider } val imageAnalysis = ImageAnalysis.Builder() .setBackpressureStrategy(ImageAnalysis.STRATEGY_KEEP_ONLY_LATEST) diff --git a/common/src/androidMain/res/mipmap-anydpi-v26/ic_launcher.xml b/common/src/androidMain/res/mipmap-anydpi/ic_launcher.xml similarity index 100% rename from common/src/androidMain/res/mipmap-anydpi-v26/ic_launcher.xml rename to common/src/androidMain/res/mipmap-anydpi/ic_launcher.xml diff --git a/common/src/androidMain/res/xml/network_configuration.xml b/common/src/androidMain/res/xml/network_configuration.xml index 03fd745..932d7a4 100644 --- a/common/src/androidMain/res/xml/network_configuration.xml +++ b/common/src/androidMain/res/xml/network_configuration.xml @@ -1,13 +1,17 @@ - + - + - +