lun_admin/NeoLaunch_From_Kvaesitso
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Update libraries, add predictive back in settings

Browse Source
This commit is contained in:
MM20 2024-04-12 00:15:32 +02:00
parent b82ecb7f2a
commit 3008849b15
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
6 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/ui/src/main/AndroidManifest.xml
View File

@ -55,7 +55,9 @@
android:launchMode="singleTask" android:launchMode="singleTask"
android:parentActivityName=".launcher.SharedLauncherActivity" android:parentActivityName=".launcher.SharedLauncherActivity"
android:taskAffinity="de.mm20.launcher2.settings" android:taskAffinity="de.mm20.launcher2.settings"
android:theme="@style/SettingsTheme.NoActionBar"> android:theme="@style/SettingsTheme.NoActionBar"
android:enableOnBackInvokedCallback="true"
>
<intent-filter> <intent-filter>
<action android:name="android.intent.action.APPLICATION_PREFERENCES" /> <action android:name="android.intent.action.APPLICATION_PREFERENCES" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />

2
app/ui/src/main/java/de/mm20/launcher2/ui/launcher/PagerScaffold.kt
View File

@ -398,7 +398,7 @@ fun PagerScaffold(
modifier = Modifier modifier = Modifier
.fillMaxSize() .fillMaxSize()
.nestedScroll(pagerNestedScrollConnection), .nestedScroll(pagerNestedScrollConnection),
outOfBoundsPageCount = 1, beyondViewportPageCount = 1,
reverseLayout = reverse == (LocalLayoutDirection.current == LayoutDirection.Ltr), reverseLayout = reverse == (LocalLayoutDirection.current == LayoutDirection.Ltr),
state = pagerState, state = pagerState,
userScrollEnabled = false,//!isWidgetEditMode, userScrollEnabled = false,//!isWidgetEditMode,

2
app/ui/src/main/java/de/mm20/launcher2/ui/launcher/PullDownScaffold.kt
View File

@ -401,7 +401,7 @@ fun PullDownScaffold(
) { ) {
VerticalPager( VerticalPager(
modifier = Modifier.fillMaxSize(), modifier = Modifier.fillMaxSize(),
outOfBoundsPageCount = 1, beyondViewportPageCount = 1,
state = pagerState, state = pagerState,
reverseLayout = true, reverseLayout = true,
userScrollEnabled = false, userScrollEnabled = false,

8
app/ui/src/main/java/de/mm20/launcher2/ui/settings/SettingsActivity.kt
View File

@ -102,16 +102,16 @@ class SettingsActivity : BaseActivity() {
navController = navController, navController = navController,
startDestination = "settings", startDestination = "settings",
exitTransition = { exitTransition = {
fadeOut() + scaleOut(targetScale = 0.5f) slideOutHorizontally { it / 2 } + fadeOut()
}, },
enterTransition = { enterTransition = {
slideInHorizontally { it } slideInHorizontally { it / 2 } + scaleIn(initialScale = 0.95f)
}, },
popEnterTransition = { popEnterTransition = {
fadeIn() + scaleIn(initialScale = 0.5f) slideInHorizontally { -it / 2 } + fadeIn()
}, },
popExitTransition = { popExitTransition = {
slideOutHorizontally { it } slideOutHorizontally { it / 2 } + scaleOut(targetScale = 0.95f)
}, },
) { ) {
composable("settings") { composable("settings") {

3
app/ui/src/main/java/de/mm20/launcher2/ui/settings/searchactions/EditSearchActionSheet.kt
View File

@ -51,6 +51,7 @@ import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.OutlinedButton import androidx.compose.material3.OutlinedButton
import androidx.compose.material3.OutlinedCard import androidx.compose.material3.OutlinedCard
import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.OutlinedTextField
import androidx.compose.material3.OutlinedTextFieldDefaults
import androidx.compose.material3.Surface import androidx.compose.material3.Surface
import androidx.compose.material3.Switch import androidx.compose.material3.Switch
import androidx.compose.material3.Text import androidx.compose.material3.Text
@ -572,7 +573,7 @@ fun CustomizeAppSearch(viewModel: EditSearchActionSheetVM, paddingValues: Paddin
Box(modifier = Modifier Box(modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.clickable { showAppDropdown = !showAppDropdown }) { .clickable { showAppDropdown = !showAppDropdown }) {
TextFieldDefaults.OutlinedTextFieldDecorationBox( OutlinedTextFieldDefaults.DecorationBox(
value = selectedApp?.label ?: "", value = selectedApp?.label ?: "",
enabled = true, enabled = true,
label = { Text(stringResource(R.string.search_action_app)) }, label = { Text(stringResource(R.string.search_action_app)) },

6
gradle/libs.versions.toml
View File

@ -17,8 +17,8 @@ kotlinx-serialization = "1.6.3"
jetbrains-markdown = "0.5.2" jetbrains-markdown = "0.5.2"
androidx-compose = "1.7.0-alpha05" androidx-compose = "1.7.0-alpha06"
androidx-compose-material3 = "1.3.0-alpha03" androidx-compose-material3 = "1.3.0-alpha04"
androidx-compose-compiler = "1.5.11" androidx-compose-compiler = "1.5.11"
androidx-lifecycle = "2.7.0" androidx-lifecycle = "2.7.0"
androidx-core = "1.12.0" androidx-core = "1.12.0"
@ -95,7 +95,7 @@ androidx-exifinterface = { group = "androidx.exifinterface", name = "exifinterfa
androidx-securitycrypto = { group = "androidx.security", name = "security-crypto", version = "1.1.0-alpha03" } androidx-securitycrypto = { group = "androidx.security", name = "security-crypto", version = "1.1.0-alpha03" }
androidx-datastore = { group = "androidx.datastore", name = "datastore", version = "1.0.0" } androidx-datastore = { group = "androidx.datastore", name = "datastore", version = "1.0.0" }
androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version = "2.7.7" } androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version = "2.8.0-alpha06" }
materialcomponents-core = { group = "com.google.android.material", name = "material", version = "1.11.0" } materialcomponents-core = { group = "com.google.android.material", name = "material", version = "1.11.0" }
okhttp = { group = "com.squareup.okhttp3", name = "okhttp", version = "4.12.0" } okhttp = { group = "com.squareup.okhttp3", name = "okhttp", version = "4.12.0" }