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

Add widget resize tooltip

Browse Source
This commit is contained in:
MM20 2023-05-14 14:45:30 +02:00
parent 7ebc662c6f
commit 7d54512962
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
2 changed files with 46 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/ConfigureWidgetSheet.kt
View File

@ -7,6 +7,7 @@ import android.appwidget.AppWidgetProviderInfo
import android.content.Intent import android.content.Intent
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import androidx.compose.foundation.background import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.gestures.Orientation import androidx.compose.foundation.gestures.Orientation
import androidx.compose.foundation.gestures.draggable import androidx.compose.foundation.gestures.draggable
import androidx.compose.foundation.gestures.rememberDraggableState import androidx.compose.foundation.gestures.rememberDraggableState
@ -19,7 +20,6 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.requiredSize import androidx.compose.foundation.layout.requiredSize
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.width
import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.foundation.text.KeyboardOptions
@ -36,14 +36,17 @@ 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.PlainTooltipBox
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.material3.TextButton import androidx.compose.material3.TextButton
import androidx.compose.material3.rememberPlainTooltipState
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.collectAsState import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
@ -55,7 +58,6 @@ import androidx.compose.ui.platform.LocalLifecycleOwner
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.text.input.ImeAction
import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.text.input.KeyboardType
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import de.mm20.launcher2.calendar.CalendarRepository import de.mm20.launcher2.calendar.CalendarRepository
import de.mm20.launcher2.ktx.isAtLeastApiLevel import de.mm20.launcher2.ktx.isAtLeastApiLevel
@ -77,6 +79,7 @@ import de.mm20.launcher2.widgets.MusicWidget
import de.mm20.launcher2.widgets.NotesWidget import de.mm20.launcher2.widgets.NotesWidget
import de.mm20.launcher2.widgets.WeatherWidget import de.mm20.launcher2.widgets.WeatherWidget
import de.mm20.launcher2.widgets.Widget import de.mm20.launcher2.widgets.Widget
import kotlinx.coroutines.launchg
import org.koin.androidx.compose.get import org.koin.androidx.compose.get
import kotlin.math.roundToInt import kotlin.math.roundToInt
@ -348,34 +351,46 @@ fun ColumnScope.ConfigureAppWidget(
.fillMaxWidth(), .fillMaxWidth(),
verticalAlignment = Alignment.CenterVertically verticalAlignment = Alignment.CenterVertically
) { ) {
Box( val scope = rememberCoroutineScope()
modifier = Modifier val tooltipState = rememberPlainTooltipState()
.padding(end = 16.dp) PlainTooltipBox(
.clip(MaterialTheme.shapes.small) tooltipState = tooltipState,
.background(MaterialTheme.colorScheme.primaryContainer) tooltip = { Text(stringResource(R.string.widget_config_appwidget_resize_hint)) }
.height(36.dp) ) {
.width(48.dp) Box(
.draggable( modifier = Modifier
state = draggableState, .padding(end = 16.dp)
orientation = Orientation.Vertical, .clip(MaterialTheme.shapes.small)
startDragImmediately = true, .background(MaterialTheme.colorScheme.primaryContainer)
onDragStopped = { .height(36.dp)
onWidgetUpdated( .width(48.dp)
widget.copy( .draggable(
config = widget.config.copy( state = draggableState,
height = widget.config.height + dragDelta orientation = Orientation.Vertical,
onDragStopped = {
onWidgetUpdated(
widget.copy(
config = widget.config.copy(
height = widget.config.height + dragDelta
)
) )
) )
) dragDelta = 0
dragDelta = 0 }
} )
), .clickable {
contentAlignment = Alignment.Center scope.launch {
) { tooltipState.show()
Icon( }
imageVector = Icons.Rounded.UnfoldMore, },
contentDescription = null, contentAlignment = Alignment.Center
) ) {
Icon(
imageVector = Icons.Rounded.UnfoldMore,
contentDescription = null,
)
}
} }
var textFieldValue by remember(widget.config.height) { mutableStateOf(widget.config.height.toString()) } var textFieldValue by remember(widget.config.height) { mutableStateOf(widget.config.height.toString()) }
OutlinedTextField( OutlinedTextField(
@ -445,7 +460,8 @@ fun ColumnScope.ConfigureAppWidget(
) )
}) { }) {
Text( Text(
stringResource(id = R.string.widget_config_appwidget_configure)) stringResource(id = R.string.widget_config_appwidget_configure)
)
Icon( Icon(
modifier = Modifier modifier = Modifier
.padding(start = ButtonDefaults.IconSpacing) .padding(start = ButtonDefaults.IconSpacing)

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

@ -796,6 +796,7 @@
<string name="widget_config_appwidget_height">Height</string> <string name="widget_config_appwidget_height">Height</string>
<string name="widget_config_appwidget_borderless">Borderless</string> <string name="widget_config_appwidget_borderless">Borderless</string>
<string name="widget_config_appwidget_configure">Configure widget</string> <string name="widget_config_appwidget_configure">Configure widget</string>
<string name="widget_config_appwidget_resize_hint">Drag to resize</string>
<string name="widget_config_weather_integration_settings">Weather integration settings</string> <string name="widget_config_weather_integration_settings">Weather integration settings</string>
<string name="widget_config_calendar_no_calendars">No calendars found</string> <string name="widget_config_calendar_no_calendars">No calendars found</string>
<string name="app_widget_loading_failed">App widget failed to load.</string> <string name="app_widget_loading_failed">App widget failed to load.</string>