Add additional row in vertical and horizontal pager in horizontal clock mode showing favorites (#246)
* Add setting for clock widget to show two DynamicZones, one of them always being favorites * implementing horizontal pager * undoing changes * checking if withFavoriteBar is set in horizontal layout * Clock widget: use compose pager, not accompanist pager * Pull favorites part provider from view model * Clock widget settings: remove divider * Remove date_part from settings.proto * Remove datePart settings references --------- Co-authored-by: MM20 <15646950+MM2-0@users.noreply.github.com>
This commit is contained in:
Christoph
GitHub
parent
9fb514dc68
commit
0a63a104bb
@ -4,6 +4,7 @@ import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.clickable
|
||||
import androidx.compose.foundation.interaction.MutableInteractionSource
|
||||
import androidx.compose.foundation.layout.*
|
||||
import androidx.compose.foundation.pager.HorizontalPager
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.rounded.ExpandLess
|
||||
import androidx.compose.material3.Icon
|
||||
@ -16,12 +17,12 @@ import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.platform.LocalContext
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.lifecycle.viewmodel.compose.viewModel
|
||||
import de.mm20.launcher2.preferences.Settings
|
||||
import de.mm20.launcher2.preferences.Settings.ClockWidgetSettings.ClockStyle
|
||||
import de.mm20.launcher2.preferences.Settings.ClockWidgetSettings.ClockWidgetColors
|
||||
import de.mm20.launcher2.preferences.Settings.ClockWidgetSettings.ClockWidgetLayout
|
||||
import de.mm20.launcher2.ui.base.LocalTime
|
||||
import de.mm20.launcher2.ui.launcher.widgets.clock.clocks.*
|
||||
import de.mm20.launcher2.ui.launcher.widgets.clock.parts.FavoritesPartProvider
|
||||
import de.mm20.launcher2.ui.launcher.widgets.clock.parts.PartProvider
|
||||
import de.mm20.launcher2.ui.locals.LocalPreferDarkContentOverWallpaper
|
||||
|
||||
@ -40,7 +41,8 @@ fun ClockWidget(
|
||||
viewModel.updateTime(time)
|
||||
}
|
||||
|
||||
val partProvider by viewModel.getActivePart(LocalContext.current).collectAsState(null)
|
||||
val partProvider by remember { viewModel.getActivePart(context) }.collectAsState(null)
|
||||
val withFavoriteBar by viewModel.withFavorites.observeAsState()
|
||||
|
||||
Box(
|
||||
modifier = Modifier
|
||||
@ -48,7 +50,8 @@ fun ClockWidget(
|
||||
contentAlignment = Alignment.BottomCenter
|
||||
) {
|
||||
|
||||
val contentColor = if (color == ClockWidgetColors.Auto && LocalPreferDarkContentOverWallpaper.current || color == ClockWidgetColors.Dark) {
|
||||
val contentColor =
|
||||
if (color == ClockWidgetColors.Auto && LocalPreferDarkContentOverWallpaper.current || color == ClockWidgetColors.Dark) {
|
||||
Color(0, 0, 0, 180)
|
||||
} else {
|
||||
Color.White
|
||||
@ -74,10 +77,22 @@ fun ClockWidget(
|
||||
}
|
||||
|
||||
DynamicZone(
|
||||
modifier = Modifier.padding(bottom = 16.dp),
|
||||
ClockWidgetLayout.Vertical,
|
||||
modifier = if (true == withFavoriteBar) {
|
||||
Modifier.padding(bottom = 8.dp, top = 8.dp)
|
||||
} else {
|
||||
Modifier.padding(bottom = 16.dp)
|
||||
},
|
||||
layout = ClockWidgetLayout.Vertical,
|
||||
provider = partProvider,
|
||||
)
|
||||
|
||||
if (true == withFavoriteBar) {
|
||||
DynamicZone(
|
||||
modifier = Modifier.padding(bottom = 16.dp),
|
||||
layout = ClockWidgetLayout.Vertical,
|
||||
provider = viewModel.favoritesPartProvider,
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
if (layout == ClockWidgetLayout.Horizontal) {
|
||||
@ -95,11 +110,28 @@ fun ClockWidget(
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
horizontalArrangement = Arrangement.SpaceBetween
|
||||
) {
|
||||
if (true == withFavoriteBar) {
|
||||
HorizontalPager(
|
||||
pageCount = 2,
|
||||
beyondBoundsPageCount = 1,
|
||||
modifier = Modifier.weight(1f)
|
||||
) {
|
||||
DynamicZone(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
layout = ClockWidgetLayout.Horizontal,
|
||||
provider = when (it) {
|
||||
0 -> viewModel.favoritesPartProvider
|
||||
else -> partProvider
|
||||
}
|
||||
)
|
||||
}
|
||||
} else {
|
||||
DynamicZone(
|
||||
modifier = Modifier.weight(1f),
|
||||
ClockWidgetLayout.Horizontal,
|
||||
provider = partProvider,
|
||||
layout = ClockWidgetLayout.Horizontal,
|
||||
provider = partProvider
|
||||
)
|
||||
}
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.padding(horizontal = 16.dp)
|
||||
@ -124,7 +156,6 @@ fun ClockWidget(
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -27,17 +27,20 @@ class ClockWidgetVM : ViewModel(), KoinComponent {
|
||||
init {
|
||||
viewModelScope.launch {
|
||||
dataStore.data.map { it.clockWidget }.distinctUntilChanged().collectLatest {
|
||||
val providers = mutableListOf<PartProvider>()
|
||||
if (it.datePart) providers += DatePartProvider()
|
||||
val providers = mutableListOf<PartProvider>(
|
||||
DatePartProvider()
|
||||
)
|
||||
if (it.musicPart) providers += MusicPartProvider()
|
||||
if (it.batteryPart) providers += BatteryPartProvider()
|
||||
if (it.alarmPart) providers += AlarmPartProvider()
|
||||
if (it.favoritesPart) providers += FavoritesPartProvider()
|
||||
partProviders.value = providers
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
val withFavorites = dataStore.data.map { it.clockWidget.favoritesPart }.asLiveData()
|
||||
val favoritesPartProvider = FavoritesPartProvider()
|
||||
|
||||
val time = MutableStateFlow(System.currentTimeMillis())
|
||||
|
||||
fun getActivePart(context: Context): Flow<PartProvider?> = channelFlow {
|
||||
|
||||
@ -65,7 +65,6 @@ class FavoritesPartProvider : PartProvider, KoinComponent {
|
||||
SearchResultGrid(
|
||||
items = favorites, showLabels = false, columns = columns,
|
||||
)
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -41,7 +41,7 @@ fun ClockWidgetSettingsScreen() {
|
||||
value = layout,
|
||||
items = listOf(
|
||||
stringResource(R.string.preference_clockwidget_layout_vertical) to ClockWidgetLayout.Vertical,
|
||||
stringResource(R.string.preference_clockwidget_layout_horizontal) to ClockWidgetLayout.Horizontal
|
||||
stringResource(R.string.preference_clockwidget_layout_horizontal) to ClockWidgetLayout.Horizontal,
|
||||
),
|
||||
onValueChanged = {
|
||||
if (it != null) viewModel.setLayout(it)
|
||||
@ -75,20 +75,6 @@ fun ClockWidgetSettingsScreen() {
|
||||
value = fillHeight == true,
|
||||
onValueChanged = { viewModel.setFillHeight(it) }
|
||||
)
|
||||
}
|
||||
}
|
||||
item {
|
||||
PreferenceCategory {
|
||||
val datePart by viewModel.datePart.observeAsState()
|
||||
SwitchPreference(
|
||||
title = stringResource(R.string.preference_clockwidget_date_part),
|
||||
summary = stringResource(R.string.preference_clockwidget_date_part_summary),
|
||||
icon = Icons.Rounded.CalendarToday,
|
||||
value = datePart == true,
|
||||
onValueChanged = {
|
||||
viewModel.setDatePart(it)
|
||||
}
|
||||
)
|
||||
val favoritesPart by viewModel.favoritesPart.observeAsState()
|
||||
SwitchPreference(
|
||||
title = stringResource(R.string.preference_clockwidget_favorites_part),
|
||||
@ -97,7 +83,7 @@ fun ClockWidgetSettingsScreen() {
|
||||
value = favoritesPart == true,
|
||||
onValueChanged = {
|
||||
viewModel.setFavoritesPart(it)
|
||||
}
|
||||
},
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@ -6,6 +6,7 @@ import androidx.lifecycle.viewModelScope
|
||||
import de.mm20.launcher2.preferences.LauncherDataStore
|
||||
import de.mm20.launcher2.preferences.Settings.ClockWidgetSettings
|
||||
import de.mm20.launcher2.preferences.Settings.ClockWidgetSettings.ClockWidgetColors
|
||||
import de.mm20.launcher2.preferences.Settings.ClockWidgetSettings.ClockWidgetLayout
|
||||
import kotlinx.coroutines.flow.map
|
||||
import kotlinx.coroutines.launch
|
||||
import org.koin.core.component.KoinComponent
|
||||
@ -65,24 +66,6 @@ class ClockWidgetSettingsScreenVM : ViewModel(), KoinComponent {
|
||||
}
|
||||
}
|
||||
|
||||
val datePart = dataStore.data.map { it.clockWidget.datePart }.asLiveData()
|
||||
fun setDatePart(datePart: Boolean) {
|
||||
viewModelScope.launch {
|
||||
dataStore.updateData {
|
||||
it.toBuilder()
|
||||
.setClockWidget(
|
||||
it.clockWidget.toBuilder()
|
||||
.setDatePart(datePart)
|
||||
.also {
|
||||
if (datePart) {
|
||||
it.setFavoritesPart(false)
|
||||
}
|
||||
}
|
||||
).build()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
val favoritesPart = dataStore.data.map { it.clockWidget.favoritesPart }.asLiveData()
|
||||
fun setFavoritesPart(favoritesPart: Boolean) {
|
||||
viewModelScope.launch {
|
||||
@ -91,11 +74,6 @@ class ClockWidgetSettingsScreenVM : ViewModel(), KoinComponent {
|
||||
.setClockWidget(
|
||||
it.clockWidget.toBuilder()
|
||||
.setFavoritesPart(favoritesPart)
|
||||
.also {
|
||||
if (favoritesPart) {
|
||||
it.setDatePart(false)
|
||||
}
|
||||
}
|
||||
).build()
|
||||
}
|
||||
}
|
||||
|
||||
@ -50,9 +50,8 @@ fun createFactorySettings(context: Context): Settings {
|
||||
.setColor(Settings.ClockWidgetSettings.ClockWidgetColors.Auto)
|
||||
.setAlarmPart(true)
|
||||
.setBatteryPart(true)
|
||||
.setDatePart(true)
|
||||
.setMusicPart(true)
|
||||
.setFavoritesPart(false)
|
||||
.setFavoritesPart(true)
|
||||
.setFillHeight(true)
|
||||
.build()
|
||||
)
|
||||
|
||||
@ -8,7 +8,6 @@ class Migration_2_3: VersionedMigration(2, 3) {
|
||||
builder.clockWidget.toBuilder()
|
||||
.setAlarmPart(true)
|
||||
.setBatteryPart(true)
|
||||
.setDatePart(true)
|
||||
.setMusicPart(true)
|
||||
)
|
||||
}
|
||||
|
||||
@ -115,7 +115,7 @@ message Settings {
|
||||
EmptyClock = 4;
|
||||
}
|
||||
ClockStyle clock_style = 2;
|
||||
bool date_part = 3;
|
||||
reserved 3;
|
||||
bool music_part = 4;
|
||||
bool battery_part = 5;
|
||||
bool alarm_part = 6;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user