Skip to content

Commit 445f7c6

Browse files
committed
Updated Dependencies to latest.
Fixed the compose bug of stuck IME.
1 parent 3713b4e commit 445f7c6

File tree

9 files changed

+40
-22
lines changed

9 files changed

+40
-22
lines changed

app/build.gradle.kts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55

66
android {
77
namespace = "com.autosec.pie"
8-
compileSdk = 34
8+
compileSdk = 35
99

1010
buildFeatures {
1111
buildConfig = true
@@ -18,8 +18,8 @@ android {
1818
minSdk = 27
1919
//noinspection EditedTargetSdkVersion,ExpiredTargetSdkVersion
2020
targetSdk = 28
21-
versionCode = 10
22-
versionName = "\"0.11.2-beta\""
21+
versionCode = 11
22+
versionName = "\"0.11.3-beta\""
2323

2424
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2525
vectorDrawables {
@@ -74,12 +74,12 @@ android {
7474
dependencies {
7575
implementation("com.google.android.material:material:1.12.0")
7676
implementation("com.jakewharton.timber:timber:5.0.1")
77-
implementation("androidx.core:core-ktx:1.13.1")
78-
implementation("androidx.navigation:navigation-compose:2.7.7")
79-
implementation("androidx.compose.material:material-icons-extended:1.6.8")
80-
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.4")
81-
implementation("androidx.activity:activity-compose:1.9.1")
82-
implementation(platform("androidx.compose:compose-bom:2024.06.00"))
77+
implementation("androidx.core:core-ktx:1.15.0")
78+
implementation("androidx.navigation:navigation-compose:2.8.5")
79+
implementation("androidx.compose.material:material-icons-extended:1.7.6")
80+
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.7")
81+
implementation("androidx.activity:activity-compose:1.9.3")
82+
implementation(platform("androidx.compose:compose-bom:2024.12.01"))
8383
implementation("com.google.code.gson:gson:2.11.0")
8484
implementation("org.apache.commons:commons-compress:1.21")
8585
implementation("androidx.datastore:datastore-preferences:1.1.1")
@@ -88,18 +88,18 @@ dependencies {
8888
implementation("androidx.compose.ui:ui")
8989
implementation("com.blacksquircle.ui:editorkit:2.0.0")
9090
implementation("com.blacksquircle.ui:language-shell:2.0.0")
91-
implementation("androidx.work:work-runtime-ktx:2.9.1")
91+
implementation("androidx.work:work-runtime-ktx:2.10.0")
9292

9393
implementation("androidx.compose.ui:ui-graphics")
9494
implementation("androidx.compose.ui:ui-tooling-preview")
9595
implementation("androidx.compose.material3:material3")
9696
implementation("com.google.accompanist:accompanist-permissions:0.35.1-alpha")
9797
implementation("io.insert-koin:koin-android:3.5.6")
98-
implementation("androidx.constraintlayout:constraintlayout-compose:1.0.1")
98+
implementation("androidx.constraintlayout:constraintlayout-compose:1.1.0")
9999
testImplementation("junit:junit:4.13.2")
100100
androidTestImplementation("androidx.test.ext:junit:1.2.1")
101101
androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
102-
androidTestImplementation(platform("androidx.compose:compose-bom:2024.06.00"))
102+
androidTestImplementation(platform("androidx.compose:compose-bom:2024.12.01"))
103103
androidTestImplementation("androidx.compose.ui:ui-test-junit4")
104104
debugImplementation("androidx.compose.ui:ui-tooling")
105105
debugImplementation("androidx.compose.ui:ui-test-manifest")

app/src/main/java/com/autosec/pie/ShareReceiverActivity.kt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.autosec.pie
22

33
import android.app.Activity
4+
import android.content.Context
45
import android.content.Intent
56
import android.net.Uri
67
import android.os.Bundle
@@ -78,6 +79,7 @@ import org.koin.java.KoinJavaComponent.inject
7879
import timber.log.Timber
7980
import java.net.URLDecoder
8081
import java.net.URLEncoder
82+
import com.autosec.pie.utils.getActivity
8183

8284

8385
class ShareReceiverActivity : ComponentActivity() {
@@ -195,7 +197,7 @@ fun ShareContextMenuBottomSheet(
195197
) {
196198
val shareReceiverViewModel: ShareReceiverViewModel by inject(ShareReceiverViewModel::class.java)
197199

198-
val activity = (LocalContext.current as? Activity)
200+
val activity = LocalContext.current.getActivity()
199201

200202
// LaunchedEffect(currentLink, fileUris) {
201203
// try {
@@ -331,8 +333,8 @@ fun ShareCard(
331333
sheetState: SheetState,
332334
) {
333335

334-
val activity = (LocalContext.current as? Activity)
335-
val context = LocalContext.current
336+
337+
val activity = LocalContext.current.getActivity()
336338
var isLoading by remember {
337339
mutableStateOf(false)
338340
}
@@ -352,6 +354,7 @@ fun ShareCard(
352354
shareReceiverViewModel.viewModelScope.launch {
353355
isLoading = true
354356
delay(900)
357+
Timber.d("CLOSING THE AUTOPIE COMMANDS SHEET.")
355358
activity?.finish()
356359
}
357360
}

app/src/main/java/com/autosec/pie/screens/AddShareCommand.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import androidx.compose.ui.Alignment
1919
import androidx.compose.ui.Modifier
2020
import androidx.compose.ui.platform.LocalContext
2121
import androidx.compose.ui.unit.dp
22+
import com.autosec.pie.utils.getActivity
2223
import kotlinx.coroutines.launch
2324

2425

@@ -34,7 +35,7 @@ fun AddShareCommandBottomSheet(
3435

3536
val scope = rememberCoroutineScope()
3637

37-
val activity = (LocalContext.current as? Activity)
38+
val activity = LocalContext.current.getActivity()
3839

3940
@Composable
4041
fun bottomSheetContent() {

app/src/main/java/com/autosec/pie/screens/CommandExtrasBottomSheet.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ import com.autosec.pie.data.CommandModel
4848
import com.autosec.pie.elements.GenericTextFormField
4949
import com.autosec.pie.elements.OptionSelector
5050
import com.autosec.pie.services.ForegroundService
51+
import com.autosec.pie.utils.getActivity
5152
import com.autosec.pie.viewModels.ShareReceiverViewModel
5253
import com.google.gson.Gson
5354
import kotlinx.coroutines.delay
@@ -69,7 +70,7 @@ fun CommandExtrasBottomSheet(
6970

7071
val scope = rememberCoroutineScope()
7172

72-
val activity = (LocalContext.current as? Activity)
73+
val activity = LocalContext.current.getActivity()
7374

7475
LaunchedEffect(key1 = state.targetValue) {
7576
if (state.targetValue == SheetValue.Expanded) {
@@ -130,7 +131,7 @@ fun CommandExtraInputs(command: CommandModel, parentSheetState: SheetState? = nu
130131

131132
val context = LocalContext.current
132133

133-
val activity = (LocalContext.current as? Activity)
134+
val activity = LocalContext.current.getActivity()
134135

135136

136137
val viewModel: ShareReceiverViewModel by inject(ShareReceiverViewModel::class.java)

app/src/main/java/com/autosec/pie/screens/CommandsSearchScreen.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import androidx.compose.ui.Alignment
2222
import androidx.compose.ui.Modifier
2323
import androidx.compose.ui.platform.LocalContext
2424
import androidx.compose.ui.unit.dp
25+
import com.autosec.pie.utils.getActivity
2526
import kotlinx.coroutines.launch
2627

2728
@OptIn(ExperimentalMaterial3Api::class)
@@ -35,7 +36,7 @@ fun CommandsSearchBottomSheet(
3536

3637
val scope = rememberCoroutineScope()
3738

38-
val activity = (LocalContext.current as? Activity)
39+
val activity = LocalContext.current.getActivity()
3940

4041
@Composable
4142
fun bottomSheetContent() {

app/src/main/java/com/autosec/pie/screens/HomeScreen.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ import com.autosec.pie.ui.theme.GreenGrey60
5252
import com.autosec.pie.ui.theme.PastelPurple
5353
import com.autosec.pie.ui.theme.Purple10
5454
import com.autosec.pie.ui.theme.Purple60
55+
import com.autosec.pie.utils.getActivity
5556
import com.autosec.pie.viewModels.CommandsListScreenViewModel
5657
import com.autosec.pie.viewModels.ShareReceiverViewModel
5758
import kotlinx.coroutines.delay
@@ -152,7 +153,7 @@ fun CommandCard(
152153
card: CommandModel
153154
) {
154155

155-
val activity = (LocalContext.current as? Activity)
156+
val activity = LocalContext.current.getActivity()
156157
var isLoading by remember {
157158
mutableStateOf(false)
158159
}

app/src/main/java/com/autosec/pie/screens/InstallNewPackage.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import androidx.compose.ui.Alignment
2222
import androidx.compose.ui.Modifier
2323
import androidx.compose.ui.platform.LocalContext
2424
import androidx.compose.ui.unit.dp
25+
import com.autosec.pie.utils.getActivity
2526
import kotlinx.coroutines.launch
2627

2728
@OptIn(ExperimentalMaterial3Api::class)
@@ -35,7 +36,7 @@ fun InstallNewPackageBottomSheet(
3536

3637
val scope = rememberCoroutineScope()
3738

38-
val activity = (LocalContext.current as? Activity)
39+
val activity = LocalContext.current.getActivity()
3940

4041
@Composable
4142
fun bottomSheetContent() {

app/src/main/java/com/autosec/pie/screens/InstalledPackagesScreen.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import androidx.compose.ui.text.font.FontWeight
3232
import androidx.compose.ui.unit.dp
3333
import androidx.compose.ui.unit.sp
3434
import com.autosec.pie.data.InstalledPackageModel
35+
import com.autosec.pie.utils.getActivity
3536
import com.autosec.pie.viewModels.InstalledPackagesViewModel
3637
import com.autosec.pie.viewModels.ShareReceiverViewModel
3738
import org.koin.java.KoinJavaComponent.inject
@@ -60,7 +61,7 @@ fun PackageCard(
6061
item: InstalledPackageModel
6162
) {
6263

63-
val activity = (LocalContext.current as? Activity)
64+
val activity = LocalContext.current.getActivity()
6465
var isLoading by remember {
6566
mutableStateOf(false)
6667
}

app/src/main/java/com/autosec/pie/utils/Utils.kt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
package com.autosec.pie.utils
22

3+
import android.content.Context
4+
import android.content.ContextWrapper
35
import android.content.Intent
6+
import androidx.activity.ComponentActivity
47
import kotlinx.coroutines.*
58
import timber.log.Timber
69
import java.io.File
@@ -57,6 +60,12 @@ fun Intent.getIntExtraOrNull(key: String): Int? {
5760
return if (hasExtra(key)) getIntExtra(key, -1) else null
5861
}
5962

63+
fun Context.getActivity(): ComponentActivity? = when (this) {
64+
is ComponentActivity -> this
65+
is ContextWrapper -> baseContext.getActivity()
66+
else -> null
67+
}
68+
6069
class Debouncer(
6170
private val coroutineScope: CoroutineScope,
6271
private val delayMillis: Long

0 commit comments

Comments
 (0)