diff --git a/amethyst/build.gradle b/amethyst/build.gradle index 893a8e8f6..924e1ee7b 100644 --- a/amethyst/build.gradle +++ b/amethyst/build.gradle @@ -16,8 +16,8 @@ android { applicationId "com.vitorpamplona.amethyst" minSdk libs.versions.android.minSdk.get().toInteger() targetSdk libs.versions.android.targetSdk.get().toInteger() - versionCode 409 - versionName "0.92.4" + versionCode 410 + versionName "0.92.5" buildConfigField "String", "RELEASE_NOTES_ID", "\"98f2acaf9b3eb70d87607942e576f9a086ac28adf37869da9a29f4815cecac86\"" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/Amethyst.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/Amethyst.kt index 37914e356..fe2d755b6 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/Amethyst.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/Amethyst.kt @@ -140,7 +140,10 @@ class Amethyst : Application() { override fun onTrimMemory(level: Int) { super.onTrimMemory(level) println("Trim Memory $level") - GlobalScope.launch(Dispatchers.Default) { serviceManager.trimMemory() } + GlobalScope.launch(Dispatchers.Default) { + println("Trim Memory Inside $level") + serviceManager.trimMemory() + } } companion object { diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppNavigation.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppNavigation.kt index c18608e6a..50dd3e058 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppNavigation.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppNavigation.kt @@ -336,13 +336,25 @@ private fun NavigateIfIntentRequested( var newAccount by remember { mutableStateOf(null) } if (activity.intent.action == Intent.ACTION_SEND) { - activity.intent.getStringExtra(Intent.EXTRA_TEXT)?.let { - nav.newStack(buildNewPostRoute(draftMessage = it)) + // saves the intent to avoid processing again + var message by remember { + mutableStateOf( + activity.intent.getStringExtra(Intent.EXTRA_TEXT)?.let { + it.ifBlank { null } + }, + ) } - (activity.intent.getParcelableExtra(Intent.EXTRA_STREAM) as? Uri)?.let { - nav.newStack(buildNewPostRoute(attachment = it)) + var media by remember { + mutableStateOf( + (activity.intent.getParcelableExtra(Intent.EXTRA_STREAM) as? Uri), + ) } + + nav.newStack(buildNewPostRoute(draftMessage = message, attachment = media)) + + media = null + message = null } else { var currentIntentNextPage by remember { mutableStateOf( diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/ReactionsRow.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/ReactionsRow.kt index f908d1014..9a9fd900d 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/ReactionsRow.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/ReactionsRow.kt @@ -1309,6 +1309,7 @@ private fun BoostTypeChoicePopup( alignment = Alignment.BottomCenter, offset = IntOffset(0, iconSizePx), onDismissRequest = { visibilityState.targetState = false }, + properties = PopupProperties(focusable = true), ) { AnimatedVisibility( visibleState = visibilityState, diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index fdc19d72d..a153cbf84 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] accompanistAdaptive = "0.34.0" -activityCompose = "1.9.2" +activityCompose = "1.9.3" agp = "8.7.1" android-compileSdk = "35" android-minSdk = "26" @@ -9,12 +9,12 @@ androidKotlinGeohash = "1.0" androidxJunit = "1.2.1" appcompat = "1.7.0" audiowaveform = "1.1.1" -benchmark = "1.3.2" -benchmarkJunit4 = "1.3.2" +benchmark = "1.3.3" +benchmarkJunit4 = "1.3.3" biometricKtx = "1.2.0-alpha05" blurhash = "1.0.0" coil = "2.7.0" -composeBom = "2024.09.03" +composeBom = "2024.10.00" coreKtx = "1.13.1" espressoCore = "3.6.1" firebaseBom = "33.4.0" @@ -36,7 +36,7 @@ markdown = "077a2cde64" media3 = "1.4.1" mockk = "1.13.12" kotlinx-coroutines-test = "1.9.0-RC.2" -navigationCompose = "2.8.2" +navigationCompose = "2.8.3" okhttp = "5.0.0-alpha.14" runner = "1.6.2" rfc3986 = "0.1.0"