Update libraries, add predictive back in settings

This commit is contained in:
MM20
2024-04-12 00:15:32 +02:00
parent b82ecb7f2a
commit 3008849b15
6 changed files with 14 additions and 11 deletions
+3 -1
View File
@@ -55,7 +55,9 @@
android:launchMode="singleTask"
android:parentActivityName=".launcher.SharedLauncherActivity"
android:taskAffinity="de.mm20.launcher2.settings"
android:theme="@style/SettingsTheme.NoActionBar">
android:theme="@style/SettingsTheme.NoActionBar"
android:enableOnBackInvokedCallback="true"
>
<intent-filter>
<action android:name="android.intent.action.APPLICATION_PREFERENCES" />
<category android:name="android.intent.category.DEFAULT" />
@@ -398,7 +398,7 @@ fun PagerScaffold(
modifier = Modifier
.fillMaxSize()
.nestedScroll(pagerNestedScrollConnection),
outOfBoundsPageCount = 1,
beyondViewportPageCount = 1,
reverseLayout = reverse == (LocalLayoutDirection.current == LayoutDirection.Ltr),
state = pagerState,
userScrollEnabled = false,//!isWidgetEditMode,
@@ -401,7 +401,7 @@ fun PullDownScaffold(
) {
VerticalPager(
modifier = Modifier.fillMaxSize(),
outOfBoundsPageCount = 1,
beyondViewportPageCount = 1,
state = pagerState,
reverseLayout = true,
userScrollEnabled = false,
@@ -102,16 +102,16 @@ class SettingsActivity : BaseActivity() {
navController = navController,
startDestination = "settings",
exitTransition = {
fadeOut() + scaleOut(targetScale = 0.5f)
slideOutHorizontally { it / 2 } + fadeOut()
},
enterTransition = {
slideInHorizontally { it }
slideInHorizontally { it / 2 } + scaleIn(initialScale = 0.95f)
},
popEnterTransition = {
fadeIn() + scaleIn(initialScale = 0.5f)
slideInHorizontally { -it / 2 } + fadeIn()
},
popExitTransition = {
slideOutHorizontally { it }
slideOutHorizontally { it / 2 } + scaleOut(targetScale = 0.95f)
},
) {
composable("settings") {
@@ -51,6 +51,7 @@ import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.OutlinedButton
import androidx.compose.material3.OutlinedCard
import androidx.compose.material3.OutlinedTextField
import androidx.compose.material3.OutlinedTextFieldDefaults
import androidx.compose.material3.Surface
import androidx.compose.material3.Switch
import androidx.compose.material3.Text
@@ -572,7 +573,7 @@ fun CustomizeAppSearch(viewModel: EditSearchActionSheetVM, paddingValues: Paddin
Box(modifier = Modifier
.fillMaxWidth()
.clickable { showAppDropdown = !showAppDropdown }) {
TextFieldDefaults.OutlinedTextFieldDecorationBox(
OutlinedTextFieldDefaults.DecorationBox(
value = selectedApp?.label ?: "",
enabled = true,
label = { Text(stringResource(R.string.search_action_app)) },