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

(fix) open keyboard preference

Browse Source 
Fix #1434
This commit is contained in:
MM20 2025-06-01 18:48:56 +02:00
parent 7abff7998e
commit 9d3bdb4600
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/ui/src/main/java/de/mm20/launcher2/ui/launcher/SharedLauncherActivity.kt
View File

@ -138,6 +138,7 @@ abstract class SharedLauncherActivity(
val gestures by viewModel.gestureState.collectAsState() val gestures by viewModel.gestureState.collectAsState()
val searchBarStyle by viewModel.searchBarStyle.collectAsState() val searchBarStyle by viewModel.searchBarStyle.collectAsState()
val searchBarColor by viewModel.searchBarColor.collectAsState() val searchBarColor by viewModel.searchBarColor.collectAsState()
val searchBarAutofocus by viewModel.autoFocusSearch.collectAsState(false)
val widgetsOnHomeScreen by viewModel.widgetsOnHomeScreen.collectAsState() val widgetsOnHomeScreen by viewModel.widgetsOnHomeScreen.collectAsState()
val fixedRotation by viewModel.fixedRotation.collectAsState() val fixedRotation by viewModel.fixedRotation.collectAsState()
@ -218,10 +219,12 @@ abstract class SharedLauncherActivity(
hideStatus, hideStatus,
hideNav, hideNav,
widgetsOnHomeScreen, widgetsOnHomeScreen,
searchBarAutofocus,
) { ) {
if (mode == LauncherActivityMode.Assistant) { if (mode == LauncherActivityMode.Assistant) {
val searchComponent = SearchComponent( val searchComponent = SearchComponent(
reverse = reverseSearchResults, reverse = reverseSearchResults,
openKeyboard = searchBarAutofocus,
) )
val dismissComponent = val dismissComponent =
DismissComponent(this@SharedLauncherActivity) DismissComponent(this@SharedLauncherActivity)
@ -245,6 +248,7 @@ abstract class SharedLauncherActivity(
} else { } else {
val searchComponent = SearchComponent( val searchComponent = SearchComponent(
reverse = reverseSearchResults, reverse = reverseSearchResults,
openKeyboard = searchBarAutofocus,
) )
val widgetComponent by lazy { WidgetsComponent } val widgetComponent by lazy { WidgetsComponent }

5
app/ui/src/main/java/de/mm20/launcher2/ui/launcher/scaffold/SearchComponent.kt
View File

@ -21,6 +21,7 @@ import de.mm20.launcher2.ui.launcher.search.SearchVM
internal class SearchComponent( internal class SearchComponent(
private val reverse: Boolean = false, private val reverse: Boolean = false,
private val openKeyboard: Boolean = true,
) : ScaffoldComponent() { ) : ScaffoldComponent() {
override val isAtTop: MutableState<Boolean?> = mutableStateOf(true) override val isAtTop: MutableState<Boolean?> = mutableStateOf(true)
@ -84,7 +85,9 @@ internal class SearchComponent(
override suspend fun onPreActivate(state: LauncherScaffoldState) { override suspend fun onPreActivate(state: LauncherScaffoldState) {
super.onPreActivate(state) super.onPreActivate(state)
state.isSearchBarFocused = true if (openKeyboard) {
state.isSearchBarFocused = true
}
} }
override suspend fun onPreDismiss(state: LauncherScaffoldState) { override suspend fun onPreDismiss(state: LauncherScaffoldState) {