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

adding fixedRotation to settings

Browse Source
This commit is contained in:
Sir-Photch 2023-02-02 21:33:12 +01:00
parent 17a8eda910
commit e492a4975d
5 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/ui/src/main/java/de/mm20/launcher2/ui/settings/layout/LayoutSettingsScreen.kt
View File

@ -64,6 +64,15 @@ fun LayoutSettingsScreen() {
if (it != null) viewModel.setReverseSearchResults(it) if (it != null) viewModel.setReverseSearchResults(it)
}, },
) )
val fixedRotation by viewModel.fixedRotation.observeAsState()
SwitchPreference(
title = stringResource(R.string.preference_layout_fixed_rotation),
summary = stringResource(R.string.preference_layout_fixed_rotation_summary),
value = fixedRotation == true,
onValueChanged = {
viewModel.setFixedRotation(it)
},
)
} }
} }
} }

12
app/ui/src/main/java/de/mm20/launcher2/ui/settings/layout/LayoutSettingsScreenVM.kt
View File

@ -1,5 +1,6 @@
package de.mm20.launcher2.ui.settings.layout package de.mm20.launcher2.ui.settings.layout
import android.content.pm.ActivityInfo
import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModel
import androidx.lifecycle.asLiveData import androidx.lifecycle.asLiveData
import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewModelScope
@ -57,4 +58,15 @@ class LayoutSettingsScreenVM: ViewModel(), KoinComponent {
} }
} }
} }
val fixedRotation = dataStore.data.map { it.layout.fixedRoation }.asLiveData()
fun setFixedRotation(fixedRotation: Boolean) {
viewModelScope.launch {
dataStore.updateData {
it.toBuilder()
.setLayout(it.layout.toBuilder().setFixedRotation(fixedRotation))
.build()
}
}
}
} }

2
core/i18n/src/main/res/values/strings.xml
View File

@ -734,6 +734,8 @@
<string name="search_results_order_bottom_up">Bottom-up</string> <string name="search_results_order_bottom_up">Bottom-up</string>
<string name="preference_layout_fixed_search_bar">Fixed search bar</string> <string name="preference_layout_fixed_search_bar">Fixed search bar</string>
<string name="preference_layout_fixed_search_bar_summary">Don\'t scroll the search bar out of view</string> <string name="preference_layout_fixed_search_bar_summary">Don\'t scroll the search bar out of view</string>
<string name="preference_layout_fixed_rotation">Fixed rotation</string>
<string name="preference_layout_fixed_rotation_summary">Lock rotation to portrait mode</string>
<string name="preference_screen_gestures">Gestures</string> <string name="preference_screen_gestures">Gestures</string>
<string name="preference_screen_gestures_summary">Gestures and gesture actions</string> <string name="preference_screen_gestures_summary">Gestures and gesture actions</string>
<string name="preference_gesture_swipe_down">Swipe down</string> <string name="preference_gesture_swipe_down">Swipe down</string>

1
core/preferences/src/main/java/de/mm20/launcher2/preferences/Defaults.kt
View File

@ -168,6 +168,7 @@ fun createFactorySettings(context: Context): Settings {
.setBaseLayout(Settings.LayoutSettings.Layout.PullDown) .setBaseLayout(Settings.LayoutSettings.Layout.PullDown)
.setBottomSearchBar(false) .setBottomSearchBar(false)
.setReverseSearchResults(false) .setReverseSearchResults(false)
.setFixedRotation(false)
) )
.setGestures( .setGestures(
Settings.GestureSettings.newBuilder() Settings.GestureSettings.newBuilder()

1
core/preferences/src/main/proto/settings.proto
View File

@ -298,6 +298,7 @@ message Settings {
bool bottom_search_bar = 2; bool bottom_search_bar = 2;
bool reverse_search_results = 3; bool reverse_search_results = 3;
bool fixed_search_bar = 4; bool fixed_search_bar = 4;
bool fixed_rotation = 5;
} }
LayoutSettings layout = 27; LayoutSettings layout = 27;