From 1d9dc662658e63cf369dacf6a3f964616083df5e Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Thu, 8 Jun 2023 17:36:11 -0300 Subject: [PATCH] Update several androidx dependencies. Navigation to 1.6.0 Fragment to 1.6.0 Compose BOM to 2023.05.01 Lifecycle to 2.6.1 Activity to 1.7.2 --- .../components/WrapperDialogFragment.kt | 1 + .../paypal/PayPalCompleteOrderBottomSheet.kt | 1 + .../PayPalConfirmationDialogFragment.kt | 1 + .../donate/stripe/Stripe3DSDialogFragment.kt | 1 + ...ForYourSupportBottomSheetDialogFragment.kt | 1 + .../insights/InsightsModalDialogFragment.java | 1 + .../scribbles/TextEntryDialogFragment.kt | 1 + dependencies.gradle | 13 +- gradle/verification-metadata.xml | 588 +++++++----------- 9 files changed, 225 insertions(+), 383 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/WrapperDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/WrapperDialogFragment.kt index bcb12ed926..f0d7a8b13c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/WrapperDialogFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/WrapperDialogFragment.kt @@ -62,6 +62,7 @@ abstract class WrapperDialogFragment : DialogFragment(R.layout.fragment_containe } override fun onDismiss(dialog: DialogInterface) { + super.onDismiss(dialog) findListener()?.onWrapperDialogFragmentDismissed() } diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/paypal/PayPalCompleteOrderBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/paypal/PayPalCompleteOrderBottomSheet.kt index bd1d1ea1b0..fc4cfd5b71 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/paypal/PayPalCompleteOrderBottomSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/paypal/PayPalCompleteOrderBottomSheet.kt @@ -35,6 +35,7 @@ class PayPalCompleteOrderBottomSheet : DSLSettingsBottomSheetFragment() { } override fun onDismiss(dialog: DialogInterface) { + super.onDismiss(dialog) setFragmentResult(REQUEST_KEY, bundleOf(REQUEST_KEY to didConfirmOrder)) } diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/paypal/PayPalConfirmationDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/paypal/PayPalConfirmationDialogFragment.kt index fc975e2fab..e494eac9fd 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/paypal/PayPalConfirmationDialogFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/paypal/PayPalConfirmationDialogFragment.kt @@ -68,6 +68,7 @@ class PayPalConfirmationDialogFragment : DialogFragment(R.layout.donation_webvie } override fun onDismiss(dialog: DialogInterface) { + super.onDismiss(dialog) val result = this.result this.result = null setFragmentResult(REQUEST_KEY, result ?: Bundle()) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/stripe/Stripe3DSDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/stripe/Stripe3DSDialogFragment.kt index 23bb4caf55..9b009a98b6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/stripe/Stripe3DSDialogFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/stripe/Stripe3DSDialogFragment.kt @@ -60,6 +60,7 @@ class Stripe3DSDialogFragment : DialogFragment(R.layout.donation_webview_fragmen } override fun onDismiss(dialog: DialogInterface) { + super.onDismiss(dialog) val result = this.result this.result = null setFragmentResult(REQUEST_KEY, result ?: Bundle()) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/thanks/ThanksForYourSupportBottomSheetDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/thanks/ThanksForYourSupportBottomSheetDialogFragment.kt index 1a399b2e7b..49c09a54b9 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/thanks/ThanksForYourSupportBottomSheetDialogFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/thanks/ThanksForYourSupportBottomSheetDialogFragment.kt @@ -128,6 +128,7 @@ class ThanksForYourSupportBottomSheetDialogFragment : FixedRoundedCornerBottomSh } override fun onDismiss(dialog: DialogInterface) { + super.onDismiss(dialog) val controlChecked = switch.isChecked val args = ThanksForYourSupportBottomSheetDialogFragmentArgs.fromBundle(requireArguments()) diff --git a/app/src/main/java/org/thoughtcrime/securesms/insights/InsightsModalDialogFragment.java b/app/src/main/java/org/thoughtcrime/securesms/insights/InsightsModalDialogFragment.java index af918f0905..5249498477 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/insights/InsightsModalDialogFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/insights/InsightsModalDialogFragment.java @@ -111,6 +111,7 @@ public final class InsightsModalDialogFragment extends DialogFragment { @Override public void onDismiss(@NonNull DialogInterface dialog) { + super.onDismiss(dialog); InsightsOptOut.userRequestedOptOut(requireContext()); } diff --git a/app/src/main/java/org/thoughtcrime/securesms/scribbles/TextEntryDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/scribbles/TextEntryDialogFragment.kt index e6635763b2..1ac245bc8d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/scribbles/TextEntryDialogFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/scribbles/TextEntryDialogFragment.kt @@ -99,6 +99,7 @@ class TextEntryDialogFragment : KeyboardEntryDialogFragment(R.layout.v2_media_im } override fun onDismiss(dialog: DialogInterface) { + super.onDismiss(dialog) controller.onTextEntryDialogDismissed(!hiddenTextEntry.text.isNullOrEmpty()) } diff --git a/dependencies.gradle b/dependencies.gradle index 5cac3dcd24..146d5313e7 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -5,10 +5,11 @@ dependencyResolutionManagement { versionCatalogs { libs { version('androidx-appcompat', '1.6.1') + version('androidx-activity', '1.7.2') version('androidx-camera', '1.2.3') - version('androidx-fragment', '1.5.5') - version('androidx-lifecycle', '2.5.1') - version('androidx-navigation', '2.5.3') + version('androidx-fragment', '1.6.0') + version('androidx-lifecycle', '2.6.1') + version('androidx-navigation', '2.6.0') version('androidx-window', '1.0.0') version('exoplayer', '2.18.1') version('glide', '4.13.2') @@ -23,8 +24,8 @@ dependencyResolutionManagement { alias('android-application').to('com.android.application', 'com.android.application.gradle.plugin').versionRef('android-gradle-plugin') // Compose - alias('androidx-compose-bom').to('androidx.compose:compose-bom:2023.01.00') - alias('androidx-compose-material3').to('androidx.compose.material3', 'material3').withoutVersion(); + alias('androidx-compose-bom').to('androidx.compose:compose-bom:2023.05.01') + alias('androidx-compose-material3').to('androidx.compose.material3', 'material3').withoutVersion() alias('androidx-compose-ui-tooling-preview').to('androidx.compose.ui', 'ui-tooling-preview').withoutVersion() alias('androidx-compose-ui-tooling-core').to('androidx.compose.ui', 'ui-tooling').withoutVersion() alias('androidx-compose-runtime-livedata').to('androidx.compose.runtime', 'runtime-livedata').withoutVersion() @@ -44,7 +45,7 @@ dependencyResolutionManagement { alias('ktlint').to('org.jlleitschuh.gradle:ktlint-gradle:11.1.0') // Android X - alias('androidx-activity-ktx').to('androidx.activity', 'activity-ktx').versionRef('androidx-appcompat') + alias('androidx-activity-ktx').to('androidx.activity', 'activity-ktx').versionRef('androidx-activity') alias('androidx-appcompat').to('androidx.appcompat', 'appcompat').versionRef('androidx-appcompat') alias('androidx-core-ktx').to('androidx.core:core-ktx:1.10.0') alias('androidx-fragment-ktx').to('androidx.fragment', 'fragment-ktx').versionRef('androidx-fragment') diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index c0f03ac0a5..f114efad44 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -36,6 +36,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -52,6 +60,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -84,6 +97,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -442,36 +463,20 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - + + - - - + + + - - - - - - - - - - - - - - - - - - + + @@ -483,125 +488,61 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - - + + + - - + + - - - - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -612,6 +553,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -620,6 +569,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -628,38 +585,25 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - - - - - - - - - - - - - - + + - - - - - - + + + + + + @@ -672,36 +616,20 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - + + - - - + + + - - - - - - - - - - - - - - - - - - + + @@ -709,20 +637,12 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - - - - - - - - - + + @@ -730,84 +650,44 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -815,25 +695,12 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - - - - - - - - - - - - - - + + @@ -1074,28 +941,36 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + + + + + + + + + @@ -1193,14 +1068,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - - - - @@ -1246,14 +1113,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - - - - @@ -1270,14 +1129,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - - - - @@ -1286,14 +1137,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - - - - @@ -1302,14 +1145,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - - - - @@ -1384,14 +1219,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - - - - @@ -1455,60 +1282,52 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - - - - - - - - - + + @@ -1527,20 +1346,20 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - + + - - - + + + - - + + @@ -3579,6 +3398,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -5260,6 +5084,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -5305,6 +5134,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + +