Merge remote-tracking branch 'origin/profiles-list-management' into profiles-list-management

This commit is contained in:
KotlinGeekDev
2024-10-17 09:39:33 +01:00
5 changed files with 28 additions and 12 deletions
+2 -2
View File
@@ -16,8 +16,8 @@ android {
applicationId "com.vitorpamplona.amethyst" applicationId "com.vitorpamplona.amethyst"
minSdk libs.versions.android.minSdk.get().toInteger() minSdk libs.versions.android.minSdk.get().toInteger()
targetSdk libs.versions.android.targetSdk.get().toInteger() targetSdk libs.versions.android.targetSdk.get().toInteger()
versionCode 409 versionCode 410
versionName "0.92.4" versionName "0.92.5"
buildConfigField "String", "RELEASE_NOTES_ID", "\"98f2acaf9b3eb70d87607942e576f9a086ac28adf37869da9a29f4815cecac86\"" buildConfigField "String", "RELEASE_NOTES_ID", "\"98f2acaf9b3eb70d87607942e576f9a086ac28adf37869da9a29f4815cecac86\""
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -140,7 +140,10 @@ class Amethyst : Application() {
override fun onTrimMemory(level: Int) { override fun onTrimMemory(level: Int) {
super.onTrimMemory(level) super.onTrimMemory(level)
println("Trim Memory $level") println("Trim Memory $level")
GlobalScope.launch(Dispatchers.Default) { serviceManager.trimMemory() } GlobalScope.launch(Dispatchers.Default) {
println("Trim Memory Inside $level")
serviceManager.trimMemory()
}
} }
companion object { companion object {
@@ -336,13 +336,25 @@ private fun NavigateIfIntentRequested(
var newAccount by remember { mutableStateOf<String?>(null) } var newAccount by remember { mutableStateOf<String?>(null) }
if (activity.intent.action == Intent.ACTION_SEND) { if (activity.intent.action == Intent.ACTION_SEND) {
activity.intent.getStringExtra(Intent.EXTRA_TEXT)?.let { // saves the intent to avoid processing again
nav.newStack(buildNewPostRoute(draftMessage = it)) var message by remember {
mutableStateOf(
activity.intent.getStringExtra(Intent.EXTRA_TEXT)?.let {
it.ifBlank { null }
},
)
} }
(activity.intent.getParcelableExtra<Parcelable>(Intent.EXTRA_STREAM) as? Uri)?.let { var media by remember {
nav.newStack(buildNewPostRoute(attachment = it)) mutableStateOf(
(activity.intent.getParcelableExtra<Parcelable>(Intent.EXTRA_STREAM) as? Uri),
)
} }
nav.newStack(buildNewPostRoute(draftMessage = message, attachment = media))
media = null
message = null
} else { } else {
var currentIntentNextPage by remember { var currentIntentNextPage by remember {
mutableStateOf( mutableStateOf(
@@ -1309,6 +1309,7 @@ private fun BoostTypeChoicePopup(
alignment = Alignment.BottomCenter, alignment = Alignment.BottomCenter,
offset = IntOffset(0, iconSizePx), offset = IntOffset(0, iconSizePx),
onDismissRequest = { visibilityState.targetState = false }, onDismissRequest = { visibilityState.targetState = false },
properties = PopupProperties(focusable = true),
) { ) {
AnimatedVisibility( AnimatedVisibility(
visibleState = visibilityState, visibleState = visibilityState,
+5 -5
View File
@@ -1,6 +1,6 @@
[versions] [versions]
accompanistAdaptive = "0.34.0" accompanistAdaptive = "0.34.0"
activityCompose = "1.9.2" activityCompose = "1.9.3"
agp = "8.7.1" agp = "8.7.1"
android-compileSdk = "35" android-compileSdk = "35"
android-minSdk = "26" android-minSdk = "26"
@@ -9,12 +9,12 @@ androidKotlinGeohash = "1.0"
androidxJunit = "1.2.1" androidxJunit = "1.2.1"
appcompat = "1.7.0" appcompat = "1.7.0"
audiowaveform = "1.1.1" audiowaveform = "1.1.1"
benchmark = "1.3.2" benchmark = "1.3.3"
benchmarkJunit4 = "1.3.2" benchmarkJunit4 = "1.3.3"
biometricKtx = "1.2.0-alpha05" biometricKtx = "1.2.0-alpha05"
blurhash = "1.0.0" blurhash = "1.0.0"
coil = "2.7.0" coil = "2.7.0"
composeBom = "2024.09.03" composeBom = "2024.10.00"
coreKtx = "1.13.1" coreKtx = "1.13.1"
espressoCore = "3.6.1" espressoCore = "3.6.1"
firebaseBom = "33.4.0" firebaseBom = "33.4.0"
@@ -36,7 +36,7 @@ markdown = "077a2cde64"
media3 = "1.4.1" media3 = "1.4.1"
mockk = "1.13.12" mockk = "1.13.12"
kotlinx-coroutines-test = "1.9.0-RC.2" kotlinx-coroutines-test = "1.9.0-RC.2"
navigationCompose = "2.8.2" navigationCompose = "2.8.3"
okhttp = "5.0.0-alpha.14" okhttp = "5.0.0-alpha.14"
runner = "1.6.2" runner = "1.6.2"
rfc3986 = "0.1.0" rfc3986 = "0.1.0"