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

Migrate grid column count preference

Browse Source
This commit is contained in:
MM20
2022-01-25 21:21:46 +01:00
parent 8799c15682
commit b01f9d3f4d
8 changed files with 149 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
preferences/src/main/java/de/mm20/launcher2/preferences/Defaults.kt
+81 -61
View File
@@ -4,81 +4,101 @@ import android.content.Context
fun createFactorySettings(context: Context): Settings {
return Settings.newBuilder()
.setAppearance(Settings.AppearanceSettings
.newBuilder()
.setTheme(Settings.AppearanceSettings.Theme.System)
.setColorScheme(Settings.AppearanceSettings.ColorScheme.Default)
.build()
.setAppearance(
Settings.AppearanceSettings
.newBuilder()
.setTheme(Settings.AppearanceSettings.Theme.System)
.setColorScheme(Settings.AppearanceSettings.ColorScheme.Default)
.build()
)
.setWeather(Settings.WeatherSettings
.newBuilder()
.setProvider(Settings.WeatherSettings.WeatherProvider.MetNo)
.setImperialUnits(context.resources.getBoolean(R.bool.default_imperialUnits))
.build()
.setWeather(
Settings.WeatherSettings
.newBuilder()
.setProvider(Settings.WeatherSettings.WeatherProvider.MetNo)
.setImperialUnits(context.resources.getBoolean(R.bool.default_imperialUnits))
.build()
)
.setMusicWidget(Settings.MusicWidgetSettings
.newBuilder()
.setFilterSources(true)
.build()
.setMusicWidget(
Settings.MusicWidgetSettings
.newBuilder()
.setFilterSources(true)
.build()
)
.setCalendarWidget(Settings.CalendarWidgetSettings
.newBuilder()
.setHideAlldayEvents(false)
.setCalendarWidget(
Settings.CalendarWidgetSettings
.newBuilder()
.setHideAlldayEvents(false)
)
.setClockWidget(Settings.ClockWidgetSettings
.newBuilder()
.setLayout(Settings.ClockWidgetSettings.ClockWidgetLayout.Vertical)
.setClockStyle(Settings.ClockWidgetSettings.ClockStyle.DigitalClock1)
.build()
.setClockWidget(
Settings.ClockWidgetSettings
.newBuilder()
.setLayout(Settings.ClockWidgetSettings.ClockWidgetLayout.Vertical)
.setClockStyle(Settings.ClockWidgetSettings.ClockStyle.DigitalClock1)
.build()
)
.setFavorites(Settings.FavoritesSettings
.newBuilder()
.setEnabled(true)
.setFavorites(
Settings.FavoritesSettings
.newBuilder()
.setEnabled(true)
)
.setFileSearch(Settings.FilesSearchSettings
.newBuilder()
.setLocalFiles(true)
.setNextcloud(false)
.setGdrive(false)
.setOnedrive(false)
.setNextcloud(false)
.setFileSearch(
Settings.FilesSearchSettings
.newBuilder()
.setLocalFiles(true)
.setNextcloud(false)
.setGdrive(false)
.setOnedrive(false)
.setNextcloud(false)
)
.setContactsSearch(Settings.ContactsSearchSettings
.newBuilder()
.setEnabled(true)
.setContactsSearch(
Settings.ContactsSearchSettings
.newBuilder()
.setEnabled(true)
)
.setCalendarSearch(Settings.CalendarSearchSettings
.newBuilder()
.setEnabled(true)
.setCalendarSearch(
Settings.CalendarSearchSettings
.newBuilder()
.setEnabled(true)
)
.setCalculatorSearch(Settings.CalculatorSearchSettings
.newBuilder()
.setEnabled(true)
.setCalculatorSearch(
Settings.CalculatorSearchSettings
.newBuilder()
.setEnabled(true)
)
.setUnitConverterSearch(Settings.UnitConverterSearchSettings
.newBuilder()
.setEnabled(true)
.setUnitConverterSearch(
Settings.UnitConverterSearchSettings
.newBuilder()
.setEnabled(true)
)
.setWikipediaSearch(Settings.WikipediaSearchSettings
.newBuilder()
.setEnabled(false)
.setImages(false)
.setCustomUrl("")
.setWikipediaSearch(
Settings.WikipediaSearchSettings
.newBuilder()
.setEnabled(false)
.setImages(false)
.setCustomUrl("")
)
.setWebsiteSearch(Settings.WebsiteSearchSettings
.newBuilder()
.setEnabled(false)
.setWebsiteSearch(
Settings.WebsiteSearchSettings
.newBuilder()
.setEnabled(false)
)
.setWebSearch(Settings.WebSearchSettings
.newBuilder()
.setEnabled(true)
.setWebSearch(
Settings.WebSearchSettings
.newBuilder()
.setEnabled(true)
)
.setBadges(Settings.BadgeSettings
.newBuilder()
.setNotifications(true)
.setCloudFiles(true)
.setShortcuts(true)
.setSuspendedApps(true)
.setBadges(
Settings.BadgeSettings
.newBuilder()
.setNotifications(true)
.setCloudFiles(true)
.setShortcuts(true)
.setSuspendedApps(true)
)
.setGrid(
Settings.GridSettings.newBuilder()
.setColumnCount(context.resources.getInteger(R.integer.config_columnCount))
.build()
)
.build()
}
preferences/src/main/java/de/mm20/launcher2/preferences/LauncherPreferences.kt
-13
View File
@@ -74,19 +74,6 @@ class LauncherPreferences(val context: Application, version: Int = 3) {
var easterEggEnabled by BooleanPreference("easter_egg", default = false)
var gridColumnCount by IntPreference("grid_column_count", default = context.resources.getInteger(R.integer.config_columnCount))
fun doOnPreferenceChange(vararg keys: String, action: (String) -> Unit): () -> Unit {
val listener = { _: SharedPreferences, key: String ->
if (keys.contains(key)) action(key)
}
preferences.registerOnSharedPreferenceChangeListener(listener)
return {
preferences.unregisterOnSharedPreferenceChangeListener(listener)
}
}
companion object {
lateinit var instance: LauncherPreferences
fun initialize(app: Application) {
preferences/src/main/proto/settings.proto
+5
View File
@@ -117,4 +117,9 @@ message Settings {
}
BadgeSettings badges = 18;
message GridSettings {
uint32 column_count = 1;
}
GridSettings grid = 19;
}