Skip to content

Unofficial YouTube Music / Spotify Premium client for Android, built in Liquid Glass. Audio effects, Spotify Connect, listening history, 8 languages. Rust core on librespot.

The settings, rebuilt

Lelonio5a91689d88fc
diff --git a/app/src/main/java/dev/lelonio/square/ui/settings/GlassSettings.kt b/app/src/main/java/dev/lelonio/square/ui/settings/GlassSettings.kt
index 5ebdd18..dad3c80 100644
--- a/app/src/main/java/dev/lelonio/square/ui/settings/GlassSettings.kt
+++ b/app/src/main/java/dev/lelonio/square/ui/settings/GlassSettings.kt
@@ -14,6 +14,26 @@ import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
+import com.adamglin.phosphoricons.fill.SquaresFour
+import com.adamglin.phosphoricons.fill.MusicNotes
+import com.adamglin.phosphoricons.fill.Broadcast
+import com.adamglin.phosphoricons.bold.MagnifyingGlass
+import com.adamglin.phosphoricons.Bold
+import androidx.compose.ui.unit.sp
+import androidx.annotation.StringRes
+import androidx.compose.foundation.layout.BoxWithConstraints
+import androidx.compose.foundation.layout.offset
+import androidx.compose.foundation.gestures.detectTapGestures
+import androidx.compose.foundation.gestures.detectHorizontalDragGestures
+import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.platform.LocalDensity
+import android.os.Build
+import androidx.compose.runtime.mutableLongStateOf
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.ui.graphics.toArgb
+import dev.lelonio.square.ui.theme.softShadow
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
@@ -33,6 +53,19 @@ import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.adamglin.PhosphorIcons
+import com.adamglin.phosphoricons.regular.Drop
+import com.adamglin.phosphoricons.regular.Aperture
+import com.adamglin.phosphoricons.regular.Swatches
+import com.adamglin.phosphoricons.regular.Highlighter
+import com.adamglin.phosphoricons.regular.Sparkle
+import com.adamglin.phosphoricons.regular.Waves
+import com.adamglin.phosphoricons.regular.MagicWand
+import com.adamglin.phosphoricons.regular.Sun
+import com.adamglin.phosphoricons.regular.Stack
+import com.adamglin.phosphoricons.regular.Rows
+import com.adamglin.phosphoricons.regular.DeviceMobile
+import com.adamglin.phosphoricons.regular.ArrowsInLineHorizontal
+import com.adamglin.phosphoricons.regular.Palette
import com.adamglin.phosphoricons.Fill
import com.adamglin.phosphoricons.Regular
import com.adamglin.phosphoricons.fill.House
@@ -69,18 +102,31 @@ import kotlin.math.roundToInt
* is live — the settings screen is made of the same glass, so a slider moved
* shows its own answer on the way past.
*/
+/**
+ * The glass page: the preview above, pinned, and its settings under it.
+ *
+ * The preview used to scroll away with everything else, which left the numbers
+ * being moved with nothing on screen to show what they did — the one thing the
+ * preview is for. It is its own page now, and the settings are in the
+ * material's own groups rather than one long list behind a "more" row: the
+ * list had grown past what a person will read, and what they came for is
+ * usually one group of it.
+ */
@Composable
-fun GlassSection(backdrop: Backdrop) {
+fun GlassPage(backdrop: Backdrop, contentPadding: PaddingValues, header: @Composable () -> Unit) {
val context = LocalContext.current
- val store = remember(context) {
- (context.applicationContext as SquareApplication).glass
- }
+ val store = remember(context) { (context.applicationContext as SquareApplication).glass }
val profile by store.profile.collectAsStateWithLifecycle()
val config by store.config.collectAsStateWithLifecycle()
- val folds by store.barFolds.collectAsStateWithLifecycle()
- var expanded by remember { mutableStateOf(false) }
+ val liquid = config.style != GlassStyle.TRANSPARENT
+
+ Column(
+ Modifier
+ .fillMaxSize()
+ .padding(top = contentPadding.calculateTopPadding()),
+ ) {
+ header()
- SettingsSection(stringResource(R.string.glass)) {
// Phones below Android 12 have no RenderEffect and so no blur at all:
// they already run the translucent film the fastest profile picks, and
// offering the other two would be offering something that cannot happen.
@@ -91,184 +137,185 @@ fun GlassSection(backdrop: Backdrop) {
color = InkDim,
modifier = Modifier.padding(horizontal = 18.dp, vertical = 14.dp),
)
- return@SettingsSection
- }
-
- GlassProfile.entries.forEachIndexed { index, entry ->
- if (index > 0) SettingsDivider()
- SettingsChoiceRow(
- label = stringResource(entry.label),
- selected = entry == profile,
- ) { store.setProfile(entry) }
+ return@Column
}
- SettingsDivider()
GlassPreview(config = config, backdrop = backdrop)
- SettingsDivider()
- Row(
- Modifier
- .fillMaxWidth()
- .clickable { expanded = !expanded }
- .padding(horizontal = 18.dp, vertical = 16.dp),
- verticalAlignment = Alignment.CenterVertically,
+ LazyColumn(
+ Modifier.weight(1f),
+ contentPadding = PaddingValues(bottom = contentPadding.calculateBottomPadding() + 24.dp),
) {
- Text(
- stringResource(R.string.glass_advanced),
- style = MaterialTheme.typography.bodyLarge,
- fontWeight = FontWeight.Medium,
- modifier = Modifier.weight(1f),
- )
- Icon(
- if (expanded) PhosphorIcons.Regular.CaretUp else PhosphorIcons.Regular.CaretDown,
- contentDescription = null,
- tint = InkDim,
- modifier = Modifier.size(18.dp),
- )
- }
-
- AnimatedVisibility(expanded) {
- Column {
- SettingsDivider()
-
- // The saturation of what shows through. Blur averages colour
- // towards grey, and this is what puts it back — at zero the
- // glass is honest and looks washed out.
- GlassSlider(
- label = stringResource(R.string.glass_vibrancy),
- value = config.vibrancy,
- range = 0f..2f,
- readout = { "${(it * 50).roundToInt()}%" },
- backdrop = backdrop,
- onChange = store::setVibrancy,
- )
-
- // Everything below is the liquid treatment, and the fastest
- // profile does not have one: no capture is taken, so there is
- // nothing to blur or bend. Shown as absent rather than as
- // sliders that do nothing.
- if (config.style != GlassStyle.TRANSPARENT) {
+ item("material") {
+ SettingsSection(stringResource(R.string.glass_group_material)) {
+ GlassProfile.entries.forEachIndexed { index, entry ->
+ if (index > 0) SettingsDivider()
+ SettingsChoiceRow(
+ label = stringResource(entry.label),
+ selected = entry == profile,
+ ) { store.setProfile(entry) }
+ }
SettingsDivider()
+ // The saturation of what shows through. Blur averages colour
+ // towards grey, and this is what puts it back — at zero the
+ // glass is honest and looks washed out.
GlassSlider(
- label = stringResource(R.string.glass_blur),
- value = config.blurRadius,
- range = 0f..24f,
- readout = { "${it.roundToInt()} dp" },
+ label = stringResource(R.string.glass_vibrancy),
+ icon = PhosphorIcons.Regular.Drop,
+ value = config.vibrancy,
+ range = 0f..2f,
+ readout = { "${(it * 50).roundToInt()}%" },
backdrop = backdrop,
- onChange = store::setBlur,
+ onChange = store::setVibrancy,
)
- SettingsDivider()
- GlassSlider(
- label = stringResource(R.string.glass_refraction_depth),
- value = config.lensHeight,
- range = 0f..1f,
- readout = { "${(it * LENS_MAX_DP).roundToInt()} dp" },
+ // The liquid treatment, which the fastest profile does not
+ // have: no capture is taken, so there is nothing to blur.
+ // Shown as absent rather than as a slider that does nothing.
+ if (liquid) {
+ SettingsDivider()
+ GlassSlider(
+ label = stringResource(R.string.glass_blur),
+ icon = PhosphorIcons.Regular.Aperture,
+ value = config.blurRadius,
+ range = 0f..24f,
+ readout = { "${it.roundToInt()} dp" },
+ backdrop = backdrop,
+ onChange = store::setBlur,
+ )
+ }
+ }
+ }
+
+ item("colour") {
+ SettingsSection(stringResource(R.string.glass_group_colour)) {
+ TintRow(
+ hue = config.tintHue,
+ strength = config.tintStrength,
+ fromSystem = store.tintFromSystem,
backdrop = backdrop,
- onChange = store::setLensHeight,
+ onHue = store::setTintHue,
+ onSystem = store::setTintFromSystem,
+ onStrength = store::setTintStrength,
)
SettingsDivider()
GlassSlider(
- label = stringResource(R.string.glass_refraction_amount),
- value = config.lensAmount,
+ label = stringResource(R.string.glass_film),
+ icon = PhosphorIcons.Regular.Swatches,
+ value = config.surfaceOpacity,
range = 0f..1f,
- readout = { "${(it * LENS_MAX_DP).roundToInt()} dp" },
+ readout = { "${(it * 100).roundToInt()}%" },
backdrop = backdrop,
- onChange = store::setLensAmount,
+ onChange = store::setSurfaceOpacity,
)
SettingsDivider()
GlassSlider(
- label = stringResource(R.string.glass_rim),
- value = config.highlightOpacity,
+ label = stringResource(R.string.glass_indicator),
+ icon = PhosphorIcons.Regular.Highlighter,
+ value = config.puckOpacity,
range = 0f..1f,
readout = { "${(it * 100).roundToInt()}%" },
backdrop = backdrop,
- onChange = store::setHighlightOpacity,
+ onChange = store::setPuckOpacity,
)
}
+ }
- SettingsDivider()
- GlassSlider(
- label = stringResource(R.string.glass_indicator),
- value = config.puckOpacity,
- range = 0f..1f,
- readout = { "${(it * 100).roundToInt()}%" },
- backdrop = backdrop,
- onChange = store::setPuckOpacity,
- )
-
- SettingsDivider()
- GlassSlider(
- label = stringResource(R.string.glass_film),
- value = config.surfaceOpacity,
- range = 0f..1f,
- readout = { "${(it * 100).roundToInt()}%" },
- backdrop = backdrop,
- onChange = store::setSurfaceOpacity,
- )
+ if (liquid) {
+ item("edges") {
+ SettingsSection(stringResource(R.string.glass_group_edges)) {
+ GlassSlider(
+ label = stringResource(R.string.glass_rim),
+ icon = PhosphorIcons.Regular.Sparkle,
+ value = config.highlightOpacity,
+ range = 0f..1f,
+ readout = { "${(it * 100).roundToInt()}%" },
+ backdrop = backdrop,
+ onChange = store::setHighlightOpacity,
+ )
+ SettingsDivider()
+ GlassSlider(
+ label = stringResource(R.string.glass_refraction_depth),
+ icon = PhosphorIcons.Regular.Waves,
+ value = config.lensHeight,
+ range = 0f..1f,
+ readout = { "${(it * LENS_MAX_DP).roundToInt()} dp" },
+ backdrop = backdrop,
+ onChange = store::setLensHeight,
+ )
+ SettingsDivider()
+ GlassSlider(
+ label = stringResource(R.string.glass_refraction_amount),
+ icon = PhosphorIcons.Regular.MagicWand,
+ value = config.lensAmount,
+ range = 0f..1f,
+ readout = { "${(it * LENS_MAX_DP).roundToInt()} dp" },
+ backdrop = backdrop,
+ onChange = store::setLensAmount,
+ )
+ SettingsDivider()
+ GlassSwitch(
+ label = stringResource(R.string.glass_dispersion),
+ icon = PhosphorIcons.Regular.Sun,
+ checked = config.chromaticAberration,
+ backdrop = backdrop,
+ onChange = store::setChromaticAberration,
+ )
+ SettingsDivider()
+ GlassSwitch(
+ label = stringResource(R.string.glass_depth),
+ icon = PhosphorIcons.Regular.Stack,
+ checked = config.depthEffect,
+ backdrop = backdrop,
+ onChange = store::setDepthEffect,
+ )
+ }
+ }
+ }
- if (config.style != GlassStyle.TRANSPARENT) {
+ // Where the glass is allowed to be: the blunt instrument, kept
+ // last. Turning the player's off saves more than any slider above,
+ // since it is by far the largest surface in the app.
+ item("where") {
+ SettingsSection(stringResource(R.string.glass_group_where)) {
+ GlassSwitch(
+ label = stringResource(R.string.glass_where_bar),
+ icon = PhosphorIcons.Regular.Rows,
+ checked = config.navBarEnabled,
+ backdrop = backdrop,
+ onChange = store::setNavBarEnabled,
+ )
SettingsDivider()
GlassSwitch(
- label = stringResource(R.string.glass_dispersion),
- checked = config.chromaticAberration,
- backdrop = backdrop,
- onChange = store::setChromaticAberration,
+ label = stringResource(R.string.glass_where_mini_player),
+ icon = PhosphorIcons.Regular.MusicNotes,
+ checked = config.miniPlayerEnabled,
+ backdrop = backdrop,
+ onChange = store::setMiniPlayerEnabled,
)
SettingsDivider()
GlassSwitch(
- label = stringResource(R.string.glass_depth),
- checked = config.depthEffect,
- backdrop = backdrop,
- onChange = store::setDepthEffect,
+ label = stringResource(R.string.glass_where_player),
+ icon = PhosphorIcons.Regular.DeviceMobile,
+ checked = config.playerEnabled,
+ backdrop = backdrop,
+ onChange = store::setPlayerEnabled,
)
}
+ }
- // Where the glass is allowed to be. Kept last because it is the
- // blunt instrument: turning the player's off is a bigger saving
- // than any slider above, since it is by far the largest surface
- // in the app.
- SettingsDivider()
- GlassSwitch(
- label = stringResource(R.string.glass_where_bar),
- checked = config.navBarEnabled,
- backdrop = backdrop,
- onChange = store::setNavBarEnabled,
- )
- SettingsDivider()
- GlassSwitch(
- label = stringResource(R.string.glass_where_mini_player),
- checked = config.miniPlayerEnabled,
- backdrop = backdrop,
- onChange = store::setMiniPlayerEnabled,
- )
- SettingsDivider()
- GlassSwitch(
- label = stringResource(R.string.glass_where_player),
- checked = config.playerEnabled,
- backdrop = backdrop,
- onChange = store::setPlayerEnabled,
- )
-
-
- SettingsDivider()
- GlassSwitch(
- label = stringResource(R.string.bar_folds),
- checked = folds,
- backdrop = backdrop,
- onChange = store::setBarFolds,
- )
-
- SettingsDivider()
- Text(
- stringResource(R.string.glass_reset),
- style = MaterialTheme.typography.bodyLarge,
- fontWeight = FontWeight.Medium,
- color = Ink,
- modifier = Modifier
- .fillMaxWidth()
- .clickable { store.reset() }
- .padding(horizontal = 18.dp, vertical = 16.dp),
- )
+ item("reset") {
+ SettingsSection(null) {
+ Text(
+ stringResource(R.string.glass_reset),
+ style = MaterialTheme.typography.bodyLarge,
+ fontWeight = FontWeight.Medium,
+ color = Ink,
+ modifier = Modifier
+ .fillMaxWidth()
+ .clickable { store.reset() }
+ .padding(horizontal = 18.dp, vertical = 16.dp),
+ )
+ }
}
}
}
@@ -393,43 +440,28 @@ private fun GlassPreview(config: GlassEffectConfig, backdrop: Backdrop) {
)
}
+ // The bar as it is: five places across one capsule, the first lit,
+ // search among them rather than in a circle of its own — the circle
+ // only exists once the bar has folded, which this preview does not do.
Row(
- Modifier.padding(top = 10.dp),
- horizontalArrangement = Arrangement.spacedBy(8.dp),
+ Modifier
+ .padding(top = 10.dp)
+ .fillMaxWidth(0.94f)
+ .liquidGlass(
+ config = barConfig,
+ shape = ContinuousCapsule(),
+ highlightAlpha = 0.3f,
+ ownBackdrop = stage,
+ )
+ .padding(vertical = 5.dp, horizontal = 2.dp),
+ horizontalArrangement = Arrangement.spacedBy(2.dp),
verticalAlignment = Alignment.CenterVertically,
) {
- Row(
- Modifier
- .liquidGlass(
- config = barConfig,
- shape = ContinuousCapsule(),
- highlightAlpha = 0.3f,
- ownBackdrop = stage,
- )
- .padding(4.dp),
- horizontalArrangement = Arrangement.spacedBy(4.dp),
- ) {
- PreviewTab(PhosphorIcons.Fill.House, selected = true, config = barConfig)
- PreviewTab(PhosphorIcons.Regular.MusicNotes, selected = false, config = barConfig)
- }
- Box(
- Modifier
- .size(48.dp)
- .liquidGlass(
- config = barConfig,
- shape = ContinuousCapsule(),
- highlightAlpha = 0.3f,
- ownBackdrop = stage,
- ),
- contentAlignment = Alignment.Center,
- ) {
- Icon(
- PhosphorIcons.Regular.MagnifyingGlass,
- contentDescription = null,
- tint = Ink,
- modifier = Modifier.size(20.dp),
- )
- }
+ PreviewTab(PhosphorIcons.Fill.House, R.string.home, selected = true, config = barConfig)
+ PreviewTab(PhosphorIcons.Fill.SquaresFour, R.string.tab_new, selected = false, config = barConfig)
+ PreviewTab(PhosphorIcons.Fill.Broadcast, R.string.tab_radio, selected = false, config = barConfig)
+ PreviewTab(PhosphorIcons.Fill.MusicNotes, R.string.library, selected = false, config = barConfig)
+ PreviewTab(PhosphorIcons.Bold.MagnifyingGlass, R.string.search, selected = false, config = barConfig)
}
}
}
@@ -437,11 +469,17 @@ private fun GlassPreview(config: GlassEffectConfig, backdrop: Backdrop) {
/** One tab of the dummy bar, with the selection wash the real puck draws. */
@Composable
-private fun PreviewTab(icon: ImageVector, selected: Boolean, config: GlassEffectConfig) {
+private fun androidx.compose.foundation.layout.RowScope.PreviewTab(
+ icon: ImageVector,
+ @StringRes label: Int,
+ selected: Boolean,
+ config: GlassEffectConfig,
+) {
val wash = if (config.puckColor.isSpecified) config.puckColor else Ink
Box(
Modifier
- .size(width = 62.dp, height = 40.dp)
+ .weight(1f, fill = true)
+ .height(44.dp)
.then(
if (selected) {
Modifier
@@ -453,15 +491,198 @@ private fun PreviewTab(icon: ImageVector, selected: Boolean, config: GlassEffect
),
contentAlignment = Alignment.Center,
) {
- Icon(
- icon,
- contentDescription = null,
- tint = if (selected) Ink else InkDim,
- modifier = Modifier.size(22.dp),
- )
+ Column(
+ horizontalAlignment = Alignment.CenterHorizontally,
+ verticalArrangement = Arrangement.spacedBy(1.dp),
+ ) {
+ Icon(
+ icon,
+ contentDescription = null,
+ tint = if (selected) Ink else InkDim,
+ modifier = Modifier.size(19.dp),
+ )
+ Text(
+ stringResource(label),
+ style = MaterialTheme.typography.labelSmall,
+ fontSize = 7.sp,
+ lineHeight = 8.sp,
+ fontWeight = FontWeight.Bold,
+ color = if (selected) Ink else InkDim,
+ maxLines = 1,
+ )
+ }
+ }
+}
+
+/**
+ * The glass's own colour, picked off a strip of every hue there is.
+ *
+ * A strip rather than a row of swatches: the request was any colour, and a
+ * gradient the width of the page holds all of them in the height of one row,
+ * where a palette of presets would hold eight and still answer "not that one".
+ * The circle on the left is the way back to no colour at all, and the strength
+ * below it only appears once there is a colour to weaken; see #29.
+ */
+@Composable
+private fun TintRow(
+ hue: Float,
+ strength: Float,
+ fromSystem: Boolean,
+ backdrop: Backdrop,
+ onHue: (Float?) -> Unit,
+ onSystem: () -> Unit,
+ onStrength: (Float) -> Unit,
+) {
+ val on = hue >= 0f
+ Column(Modifier.padding(horizontal = 18.dp, vertical = 10.dp)) {
+ Row(
+ verticalAlignment = Alignment.CenterVertically,
+ horizontalArrangement = Arrangement.spacedBy(12.dp),
+ ) {
+ RowIcon(PhosphorIcons.Regular.Palette)
+ Text(
+ stringResource(R.string.glass_tint),
+ style = MaterialTheme.typography.bodyLarge,
+ modifier = Modifier.weight(1f),
+ )
+ Text(
+ stringResource(if (on) R.string.glass_tint_clear else R.string.glass_tint_none),
+ style = MaterialTheme.typography.bodyMedium,
+ color = if (on) MaterialTheme.colorScheme.primary else InkDim,
+ modifier = Modifier
+ .clip(ContinuousCapsule())
+ .clickable(enabled = on) { onHue(null) }
+ .padding(horizontal = 8.dp, vertical = 2.dp),
+ )
+ }
+ // What the strip shows while a finger is on it.
+ //
+ // Every write rebuilds the material and redraws every pane of glass on
+ // the page, and a drag reports a position per frame: writing each one
+ // held the main thread long enough for Android to call the app
+ // unresponsive. The thumb follows the finger from here, and the
+ // setting is written at most every [TINT_WRITE_MS] and again when the
+ // finger lifts.
+ var dragHue by remember { mutableStateOf<Float?>(null) }
+ var lastWrite by remember { mutableLongStateOf(0L) }
+ val shown = dragHue ?: hue
+ val hues = remember {
+ List(HUE_STOPS) { Color(android.graphics.Color.HSVToColor(floatArrayOf(it * 360f / (HUE_STOPS - 1), 0.8f, 1f))) }
+ }
+ BoxWithConstraints(
+ Modifier
+ .fillMaxWidth()
+ .padding(top = 8.dp, bottom = 2.dp)
+ .height(30.dp),
+ ) {
+ val width = constraints.maxWidth.toFloat()
+ val pick = { x: Float, settled: Boolean ->
+ val picked = (x / width).coerceIn(0f, 1f) * 360f
+ dragHue = picked
+ val now = android.os.SystemClock.uptimeMillis()
+ if (settled || now - lastWrite >= TINT_WRITE_MS) {
+ lastWrite = now
+ onHue(picked)
+ }
+ if (settled) dragHue = null
+ }
+ Box(
+ Modifier
+ .fillMaxWidth()
+ .height(14.dp)
+ .align(Alignment.CenterStart)
+ .clip(ContinuousCapsule())
+ .background(Brush.horizontalGradient(hues))
+ .pointerInput(width) {
+ detectTapGestures { pick(it.x, true) }
+ }
+ .pointerInput(width) {
+ detectHorizontalDragGestures(
+ onDragEnd = { dragHue?.let { pick(width * (it / 360f), true) } },
+ onDragCancel = { dragHue = null },
+ ) { change, _ -> pick(change.position.x, false) }
+ },
+ )
+ if (on || dragHue != null) {
+ val x = with(LocalDensity.current) { (width * (shown / 360f)).toDp() }
+ Box(
+ Modifier
+ .offset(x = x - 11.dp)
+ .size(22.dp)
+ .clip(ContinuousCapsule())
+ .background(Color.White)
+ .padding(3.dp)
+ .clip(ContinuousCapsule())
+ .background(Color(android.graphics.Color.HSVToColor(floatArrayOf(shown, 0.8f, 1f))))
+ .align(Alignment.CenterStart),
+ )
+ }
+ }
+ // The handful worth a tap, and the phone's own accent beside them: the
+ // strip has every colour, but nobody drags to find plain red.
+ Row(
+ Modifier.padding(top = 6.dp),
+ horizontalArrangement = Arrangement.spacedBy(8.dp),
+ verticalAlignment = Alignment.CenterVertically,
+ ) {
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+ val accent = Color(LocalContext.current.getColor(android.R.color.system_accent1_400))
+ Swatch(colour = accent, selected = fromSystem, onClick = onSystem)
+ }
+ PRESET_HUES.forEach { preset ->
+ Swatch(
+ colour = Color(android.graphics.Color.HSVToColor(floatArrayOf(preset, 0.8f, 1f))),
+ selected = !fromSystem && on && kotlin.math.abs(hue - preset) < 1f,
+ onClick = { onHue(preset) },
+ )
+ }
+ }
+ if (on) {
+ GlassSlider(
+ label = stringResource(R.string.glass_tint_strength),
+ value = strength,
+ range = 0f..1f,
+ readout = { "${(it * 100).roundToInt()}%" },
+ backdrop = backdrop,
+ onChange = onStrength,
+ padded = false,
+ )
+ }
}
}
+/** One colour to tap, lit while it is the one in use. */
+@Composable
+private fun Swatch(colour: Color, selected: Boolean, onClick: () -> Unit) {
+ Box(
+ Modifier
+ .size(26.dp)
+ .clip(ContinuousCapsule())
+ .background(if (selected) Ink else Color.Transparent)
+ .padding(if (selected) 3.dp else 0.dp)
+ .clip(ContinuousCapsule())
+ .background(colour)
+ .clickable(onClick = onClick),
+ )
+}
+
+/**
+ * How often a drag along the strip is allowed to write the setting.
+ *
+ * Every write rebuilds the material, and this page is made of it: a dozen
+ * panes, each re-applying a chain of shaders. At sixteen writes a second the
+ * main thread never caught up and Android called the app unresponsive, twice.
+ * The strip's own thumb follows the finger at full speed from state that costs
+ * nothing; this is only how often the rest of the app is told.
+ */
+private const val TINT_WRITE_MS = 250L
+
+/** Stops in the hue strip: enough that the gradient has no visible banding. */
+private const val HUE_STOPS = 13
+
+/** Red, orange, yellow, green, cyan, blue, violet, magenta. */
+private val PRESET_HUES = listOf(0f, 32f, 52f, 130f, 186f, 220f, 268f, 310f)
+
/**
* One number, with what it currently is.
*
@@ -476,10 +697,19 @@ private fun GlassSlider(
range: ClosedFloatingPointRange<Float>,
readout: (Float) -> String,
backdrop: Backdrop,
+ icon: ImageVector? = null,
onChange: (Float) -> Unit,
+ /** False where the caller has already indented it; see TintRow. */
+ padded: Boolean = true,
) {
- Column(Modifier.padding(horizontal = 18.dp, vertical = 10.dp)) {
- Row(verticalAlignment = Alignment.CenterVertically) {
+ Column(
+ if (padded) Modifier.padding(horizontal = 18.dp, vertical = 8.dp) else Modifier.padding(top = 10.dp),
+ ) {
+ Row(
+ verticalAlignment = Alignment.CenterVertically,
+ horizontalArrangement = Arrangement.spacedBy(12.dp),
+ ) {
+ icon?.let { RowIcon(it) }
Text(
label,
style = MaterialTheme.typography.bodyLarge,
@@ -491,19 +721,16 @@ private fun GlassSlider(
color = InkDim,
)
}
- // The app's own slider rather than Material's, which is the argument
- // this whole page is about: a screen for tuning glass, made of chrome
- // that is not glass, is showing you somebody else's material while you
- // adjust yours.
- LiquidSlider(
- value = { value },
- onValueChange = onChange,
- valueRange = range,
- // The smallest step worth animating the thumb to.
- visibilityThreshold = 0.001f,
- backdrop = backdrop,
- accentColor = MaterialTheme.colorScheme.primary,
- trackColor = Ink.copy(alpha = 0.22f),
+ // Drawn rather than made of glass, which every row of this page used
+ // to be. Each liquid slider and toggle records a backdrop layer of its
+ // own, and a page with a dozen of them on screen rebuilds a dozen
+ // layers per frame: scrolling it held the main thread long enough for
+ // Android to call the app unresponsive. The real material is above, in
+ // the preview, where one surface shows what all these numbers do.
+ PlainSlider(
+ value = value,
+ range = range,
+ onChange = onChange,
modifier = Modifier.padding(top = 6.dp, bottom = 2.dp),
)
}
@@ -514,25 +741,22 @@ private fun GlassSwitch(
label: String,
checked: Boolean,
backdrop: Backdrop,
+ icon: ImageVector? = null,
onChange: (Boolean) -> Unit,
) {
Row(
Modifier
.fillMaxWidth()
.clickable { onChange(!checked) }
- .padding(start = 18.dp, end = 12.dp, top = 12.dp, bottom = 12.dp),
+ .padding(start = 18.dp, end = 12.dp, top = 10.dp, bottom = 10.dp),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(12.dp),
) {
+ icon?.let { RowIcon(it) }
Column(Modifier.weight(1f)) {
Text(label, style = MaterialTheme.typography.bodyLarge)
}
- LiquidToggle(
- selected = { checked },
- onSelect = onChange,
- backdrop = backdrop,
- accent = MaterialTheme.colorScheme.primary,
- )
+ PlainToggle(checked = checked, onChange = onChange)
}
}
@@ -543,9 +767,9 @@ private fun GlassSwitch(
* [SettingsScreen]; if a third file ever needs them they should move.
*/
@Composable
-internal fun SettingsSection(title: String, content: @Composable () -> Unit) {
+internal fun SettingsSection(title: String?, content: @Composable () -> Unit) {
Column(Modifier.padding(horizontal = 20.dp, vertical = 10.dp)) {
- Text(
+ if (title != null) Text(
title.uppercase(),
style = MaterialTheme.typography.labelLarge,
color = InkDim,
@@ -565,19 +789,95 @@ internal fun SettingsSection(title: String, content: @Composable () -> Unit) {
internal fun SettingsDivider() {
androidx.compose.material3.HorizontalDivider(
color = Ink.copy(alpha = 0.06f),
- modifier = Modifier.padding(horizontal = 18.dp),
+ // Indented to where the words start, not to the card's edge: a line
+ // that runs under the icons cuts the column of them in half.
+ modifier = Modifier.padding(start = ROW_TEXT_START, end = 18.dp),
)
}
+/**
+ * The mark at the head of a row.
+ *
+ * Every row used to be the same: a word on the left and a number on the right,
+ * a dozen of them stacked, and finding the one you came for meant reading all
+ * of them. A glyph in a tinted tile gives each row something to recognise it
+ * by before the word is read, and gives the column a rhythm.
+ */
+@Composable
+internal fun RowIcon(icon: ImageVector) {
+ val accent = settingsAccent()
+ Box(
+ Modifier
+ .size(30.dp)
+ .clip(RoundedCornerShape(10.dp))
+ .background(accent.copy(alpha = 0.18f)),
+ contentAlignment = Alignment.Center,
+ ) {
+ Icon(icon, contentDescription = null, tint = accent, modifier = Modifier.size(17.dp))
+ }
+}
+
+/** Where a row's words begin, icon and its gap included. */
+internal val ROW_TEXT_START = 60.dp
+
+/**
+ * What the settings are marked in: the glass's colour where it has been given
+ * one, and the app's own accent otherwise.
+ *
+ * Somebody who has just made every pane of the app cyan does not want the page
+ * that did it marked in green; the tiles and the ticks follow the choice.
+ */
@Composable
-internal fun SettingsChoiceRow(label: String, selected: Boolean, onClick: () -> Unit) {
+internal fun settingsAccent(): Color = LocalSettingsAccent.current ?: MaterialTheme.colorScheme.primary
+
+/**
+ * The accent for one whole page, worked out once.
+ *
+ * Every mark and every control used to read the glass settings for itself, and
+ * each read is a collector on a flow, made and thrown away as the list
+ * recycles its rows. A page has one answer; it is provided here.
+ */
+internal val LocalSettingsAccent = androidx.compose.runtime.compositionLocalOf<Color?> { null }
+
+/** The colour that local carries, worked out from the glass and the theme. */
+@Composable
+internal fun rememberSettingsAccent(): Color {
+ val context = LocalContext.current
+ val store = remember(context) { (context.applicationContext as SquareApplication).glass }
+ val config by store.config.collectAsStateWithLifecycle()
+ val accent = MaterialTheme.colorScheme.primary
+ if (config.tintHue < 0f) return accent
+ val hsv = FloatArray(3)
+ android.graphics.Color.colorToHSV(accent.toArgb(), hsv)
+ val strength = config.tintStrength.coerceIn(0f, 1f)
+ val saturation = (hsv[1] + (ACCENT_SATURATION - hsv[1]) * strength).coerceIn(0f, 1f)
+ return Color(
+ android.graphics.Color.HSVToColor(
+ floatArrayOf(config.tintHue, saturation, hsv[2].coerceAtLeast(ACCENT_MIN_VALUE)),
+ ),
+ )
+}
+
+/** How coloured a tinted mark goes, and how dark it is allowed to be. */
+private const val ACCENT_SATURATION = 0.7f
+private const val ACCENT_MIN_VALUE = 0.75f
+
+@Composable
+internal fun SettingsChoiceRow(
+ label: String,
+ selected: Boolean,
+ icon: ImageVector? = null,
+ onClick: () -> Unit,
+) {
Row(
Modifier
.fillMaxWidth()
.clickable(onClick = onClick)
- .padding(horizontal = 18.dp, vertical = 14.dp),
+ .padding(horizontal = 18.dp, vertical = 12.dp),
verticalAlignment = Alignment.CenterVertically,
+ horizontalArrangement = Arrangement.spacedBy(12.dp),
) {
+ icon?.let { RowIcon(it) }
Text(
label,
style = MaterialTheme.typography.bodyLarge,
@@ -594,3 +894,85 @@ internal fun SettingsChoiceRow(label: String, selected: Boolean, onClick: () ->
}
}
}
+
+/**
+ * A slider that costs nothing to draw: a track, a fill and a knob.
+ *
+ * See the note where this replaced the liquid one — a settings list is a dozen
+ * controls at once, and the glass ones each record a layer of the screen.
+ */
+@Composable
+internal fun PlainSlider(
+ value: Float,
+ range: ClosedFloatingPointRange<Float>,
+ onChange: (Float) -> Unit,
+ modifier: Modifier = Modifier,
+) {
+ val accent = settingsAccent()
+ val span = (range.endInclusive - range.start).takeIf { it > 0f } ?: 1f
+ BoxWithConstraints(modifier.fillMaxWidth().height(28.dp)) {
+ val width = constraints.maxWidth.toFloat()
+ val fraction = ((value - range.start) / span).coerceIn(0f, 1f)
+ val pick = { x: Float -> onChange(range.start + (x / width).coerceIn(0f, 1f) * span) }
+ Box(
+ Modifier
+ .fillMaxWidth()
+ .height(6.dp)
+ .align(Alignment.CenterStart)
+ .clip(ContinuousCapsule())
+ .background(Ink.copy(alpha = 0.22f)),
+ )
+ Box(
+ Modifier
+ .fillMaxWidth(fraction)
+ .height(6.dp)
+ .align(Alignment.CenterStart)
+ .clip(ContinuousCapsule())
+ .background(accent),
+ )
+ Box(
+ Modifier
+ .offset(x = with(LocalDensity.current) { (width * fraction).toDp() } - 11.dp)
+ .size(22.dp)
+ .align(Alignment.CenterStart)
+ .softShadow(ContinuousCapsule(), elevation = 6.dp)
+ .clip(ContinuousCapsule())
+ .background(Color.White),
+ )
+ Box(
+ Modifier
+ .matchParentSize()
+ .pointerInput(width, range) { detectTapGestures { pick(it.x) } }
+ .pointerInput(width, range) {
+ detectHorizontalDragGestures { change, _ -> pick(change.position.x) }
+ },
+ )
+ }
+}
+
+/** The same trade as [PlainSlider], for a switch. */
+@Composable
+internal fun PlainToggle(checked: Boolean, onChange: (Boolean) -> Unit) {
+ val accent = settingsAccent()
+ val knob by androidx.compose.animation.core.animateDpAsState(
+ if (checked) 22.dp else 2.dp,
+ label = "toggleKnob",
+ )
+ Box(
+ Modifier
+ .size(width = 46.dp, height = 28.dp)
+ .clip(ContinuousCapsule())
+ .background(if (checked) accent else Ink.copy(alpha = 0.22f))
+ .clickable { onChange(!checked) },
+ ) {
+ Box(
+ Modifier
+ .offset(x = knob)
+ .align(Alignment.CenterStart)
+ .size(24.dp)
+ .softShadow(ContinuousCapsule(), elevation = 4.dp)
+ .clip(ContinuousCapsule())
+ .background(Color.White),
+ )
+ }
+}
diff --git a/app/src/main/java/dev/lelonio/square/ui/settings/SettingsScreen.kt b/app/src/main/java/dev/lelonio/square/ui/settings/SettingsScreen.kt
index 19d6cb5..a6d75aa 100644
--- a/app/src/main/java/dev/lelonio/square/ui/settings/SettingsScreen.kt
+++ b/app/src/main/java/dev/lelonio/square/ui/settings/SettingsScreen.kt
@@ -53,6 +53,43 @@ import com.adamglin.phosphoricons.regular.CaretRight
import com.adamglin.phosphoricons.regular.CaretUp
import dev.lelonio.square.ui.glass.backdrop.Backdrop
import dev.lelonio.square.BuildConfig
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.foundation.layout.heightIn
+import com.adamglin.phosphoricons.regular.UserCircle
+import com.adamglin.phosphoricons.regular.Waveform
+import com.adamglin.phosphoricons.regular.Drop
+import com.adamglin.phosphoricons.regular.SlidersHorizontal
+import com.adamglin.phosphoricons.regular.Info
+import com.adamglin.phosphoricons.regular.DownloadSimple
+import androidx.compose.ui.res.pluralStringResource
+import dev.lelonio.square.ui.glass.shapes.ContinuousCapsule
+import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.togetherWith
+import androidx.compose.animation.slideInHorizontally
+import androidx.compose.animation.slideOutHorizontally
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.core.tween
+import com.adamglin.phosphoricons.regular.DeviceMobile
+import com.adamglin.phosphoricons.regular.Package
+import com.adamglin.phosphoricons.regular.FilmStrip
+import com.adamglin.phosphoricons.regular.Repeat
+import com.adamglin.phosphoricons.regular.Scissors
+import com.adamglin.phosphoricons.regular.WifiHigh
+import com.adamglin.phosphoricons.regular.Heart
+import com.adamglin.phosphoricons.regular.AirplaneTilt
+import com.adamglin.phosphoricons.regular.HardDrives
+import com.adamglin.phosphoricons.regular.Key
+import com.adamglin.phosphoricons.regular.ArrowClockwise
+import com.adamglin.phosphoricons.regular.Image
+import com.adamglin.phosphoricons.regular.Gear
+import com.adamglin.phosphoricons.regular.BatteryCharging
+import com.adamglin.phosphoricons.regular.Broom
+import com.adamglin.phosphoricons.regular.ArrowsInLineHorizontal
+import com.adamglin.phosphoricons.regular.Playlist
+import androidx.compose.foundation.layout.fillMaxHeight
+import com.adamglin.phosphoricons.regular.Trash
+import com.adamglin.phosphoricons.regular.HandHeart
import dev.lelonio.square.R
import dev.lelonio.square.data.AppLanguages
import dev.lelonio.square.backend.BackendId
@@ -132,6 +169,114 @@ fun SettingsScreen(
// which is the order the screen is read in.
BackHandler(enabled = open != null) { open = null }
+ // One accent for the whole screen; see LocalSettingsAccent.
+ val accent = rememberSettingsAccent()
+
+ // Registered once for the screen, not once per row.
+ //
+ // Both of these used to be made inside a row of the About page, and a row
+ // of a lazy list is made and thrown away every time it scrolls past the
+ // edge: registering and unregistering an activity launcher on every pass
+ // is what froze that page when it was scrolled down and back up.
+ val scope = rememberCoroutineScope()
+ var pendingReport by remember { mutableStateOf<java.io.File?>(null) }
+ val saveReport = rememberLauncherForActivityResult(
+ ActivityResultContracts.CreateDocument("text/plain"),
+ ) { uri ->
+ val file = pendingReport
+ pendingReport = null
+ if (uri == null || file == null) return@rememberLauncherForActivityResult
+ scope.launch {
+ runCatching {
+ kotlinx.coroutines.withContext(kotlinx.coroutines.Dispatchers.IO) {
+ context.contentResolver.openOutputStream(uri)?.use { out ->
+ file.inputStream().use { it.copyTo(out) }
+ } ?: error("no stream for $uri")
+ }
+ android.widget.Toast.makeText(context, context.getString(R.string.report_saved), android.widget.Toast.LENGTH_SHORT).show()
+ }.onFailure {
+ android.util.Log.w("SquareReport", "report not saved: $it")
+ android.widget.Toast.makeText(context, context.getString(R.string.report_failed), android.widget.Toast.LENGTH_SHORT).show()
+ }
+ }
+ }
+ val askToSaveReport: (java.io.File) -> Unit = { file ->
+ pendingReport = file
+ saveReport.launch(file.name)
+ }
+
+ val updater = remember(context) {
+ (context.applicationContext as dev.lelonio.square.SquareApplication).updater
+ }
+ var pendingUpdate by remember { mutableStateOf<Updater.State.Available?>(null) }
+ val installPermission = rememberLauncherForActivityResult(
+ ActivityResultContracts.StartActivityForResult(),
+ ) {
+ val update = pendingUpdate ?: return@rememberLauncherForActivityResult
+ pendingUpdate = null
+ scope.launch { if (updater.canInstall()) updater.install(update) }
+ }
+ val askToInstall: (Updater.State.Available) -> Unit = { update ->
+ pendingUpdate = update
+ installPermission.launch(updater.permissionIntent())
+ }
+
+ // Set rather than assigned from inside, because the page being drawn is a
+ // value handed to the animation below and cannot be written to.
+ val goTo: (SettingsPage?) -> Unit = { open = it }
+
+ // The page's own heading, wherever the page puts it: in the scrolling list
+ // for most of them, above a pinned preview for the glass.
+ val heading: @Composable (SettingsPage?) -> Unit = { shown ->
+ Row(
+ Modifier
+ .fillMaxWidth()
+ .padding(start = 16.dp, end = 24.dp, top = 8.dp, bottom = 4.dp),
+ verticalAlignment = Alignment.CenterVertically,
+ ) {
+ LiquidButton(
+ onClick = { if (shown != null) goTo(null) else onBack() },
+ backdrop = backdrop,
+ ) {
+ Icon(PhosphorIcons.Regular.ArrowLeft, contentDescription = stringResource(R.string.back))
+ }
+ Text(
+ stringResource(shown?.title ?: R.string.settings),
+ style = MaterialTheme.typography.displayLarge,
+ modifier = Modifier.padding(start = 14.dp),
+ )
+ }
+ }
+
+ // A page arrives from the side it was opened from and leaves the other way,
+ // which is the one thing that said "this is a different page" and was
+ // missing: the list simply swapped its rows for other rows.
+ androidx.compose.runtime.CompositionLocalProvider(LocalSettingsAccent provides accent) {
+ AnimatedContent(
+ targetState = open,
+ transitionSpec = {
+ val forward = initialState == null
+ val width = { w: Int -> if (forward) w / 4 else -w / 4 }
+ val back = { w: Int -> if (forward) -w / 4 else w / 4 }
+ (
+ slideInHorizontally(tween(PAGE_TRAVEL_MS), width) +
+ fadeIn(tween(PAGE_TRAVEL_MS))
+ ) togetherWith (
+ slideOutHorizontally(tween(PAGE_TRAVEL_MS), back) +
+ fadeOut(tween(PAGE_FADE_MS))
+ )
+ },
+ label = "settingsPage",
+ ) { shown ->
+ if (shown == SettingsPage.Glass) {
+ GlassPage(
+ backdrop = backdrop,
+ contentPadding = contentPadding,
+ header = { heading(shown) },
+ )
+ return@AnimatedContent
+ }
+
LazyColumn(
Modifier.fillMaxSize(),
contentPadding = PaddingValues(
@@ -139,84 +284,63 @@ fun SettingsScreen(
bottom = contentPadding.calculateBottomPadding() + 24.dp,
),
) {
- item("top") {
- Row(
+ item("top") { heading(shown) }
+
+ if (shown == null) item("pages") {
+ SettingsIndex(
+ name = ready?.displayName,
+ note = if (ready != null) {
+ stringResource(R.string.playlist_count, ready.playlists.size)
+ } else {
+ stringResource(R.string.log_in_to_resume)
+ },
+ avatarUrl = ready?.avatarUrl,
+ ) { goTo(it) }
+ }
+
+ // Who this is, before anything that can be done about it. Nothing else
+ // on the page is worth as much room: the picture and the name answer
+ // the question people open this page with.
+ if (shown == SettingsPage.Account && showSpotify) item("account") {
+ Column(
Modifier
.fillMaxWidth()
- .padding(start = 16.dp, end = 24.dp, top = 8.dp, bottom = 4.dp),
- verticalAlignment = Alignment.CenterVertically,
+ .padding(horizontal = 20.dp, vertical = 18.dp),
+ horizontalAlignment = Alignment.CenterHorizontally,
+ verticalArrangement = Arrangement.spacedBy(10.dp),
) {
- LiquidButton(
- onClick = { if (open != null) open = null else onBack() },
- backdrop = backdrop,
- ) {
- Icon(PhosphorIcons.Regular.ArrowLeft, contentDescription = stringResource(R.string.back))
- }
+ Artwork(
+ url = ready?.avatarUrl,
+ title = ready?.displayName.orEmpty(),
+ modifier = Modifier
+ .size(96.dp)
+ .softShadow(CircleShape, elevation = 16.dp),
+ corner = 48.dp,
+ decodeSize = 96.dp,
+ )
Text(
- stringResource(open?.title ?: R.string.settings),
- style = MaterialTheme.typography.displayLarge,
- modifier = Modifier.padding(start = 14.dp),
+ ready?.displayName ?: stringResource(R.string.not_connected),
+ style = MaterialTheme.typography.headlineSmall,
+ fontWeight = FontWeight.Bold,
+ maxLines = 1,
+ overflow = TextOverflow.Ellipsis,
+ )
+ Text(
+ if (ready != null) {
+ stringResource(R.string.playlist_count, ready.playlists.size)
+ } else {
+ stringResource(R.string.log_in_to_resume)
+ },
+ style = MaterialTheme.typography.bodyMedium,
+ color = InkDim,
)
}
- }
-
- if (open == null) item("pages") {
Section(null) {
- SettingsPage.entries.forEachIndexed { index, page ->
- if (index > 0) RowDivider()
- PageRow(stringResource(page.title), stringResource(page.summary)) {
- open = page
- }
- }
+ InfoRow(stringResource(R.string.connect_device), deviceName, icon = PhosphorIcons.Regular.DeviceMobile)
}
}
- if (open == SettingsPage.Account && showSpotify) item("account") {
- Section(stringResource(R.string.account)) {
- Row(
- Modifier
- .fillMaxWidth()
- .padding(horizontal = 18.dp, vertical = 16.dp),
- verticalAlignment = Alignment.CenterVertically,
- ) {
- Artwork(
- url = ready?.avatarUrl,
- title = ready?.displayName.orEmpty(),
- modifier = Modifier
- .size(54.dp)
- .softShadow(CircleShape, elevation = 10.dp),
- corner = 27.dp,
- decodeSize = 54.dp,
- )
- Column(
- Modifier
- .weight(1f)
- .padding(start = 14.dp),
- ) {
- Text(
- ready?.displayName ?: stringResource(R.string.not_connected),
- style = MaterialTheme.typography.titleMedium,
- maxLines = 1,
- overflow = TextOverflow.Ellipsis,
- )
- Text(
- if (ready != null) {
- stringResource(R.string.playlist_count, ready.playlists.size)
- } else {
- stringResource(R.string.log_in_to_resume)
- },
- style = MaterialTheme.typography.bodySmall,
- color = InkDim,
- )
- }
- }
-
- RowDivider()
- InfoRow(stringResource(R.string.connect_device), deviceName)
- }
- }
-
- if (open == SettingsPage.Account && showSpotify) item("webapi") {
+ if (shown == SettingsPage.Account && showSpotify) item("webapi") {
Section(stringResource(R.string.web_api)) {
if (webApi.connected) {
InfoRow(stringResource(R.string.application), stringResource(R.string.connected))
@@ -236,7 +360,7 @@ fun SettingsScreen(
}
}
- if (open == SettingsPage.Account && showSpotify) item("tutorial") {
+ if (shown == SettingsPage.Account && showSpotify) item("tutorial") {
Section(stringResource(R.string.guide)) {
ActionRow(stringResource(R.string.see_setup_again), destructive = false) {
onShowTutorial()
@@ -244,11 +368,11 @@ fun SettingsScreen(
}
}
- if (open == SettingsPage.Playback) item("backend") {
+ if (shown == SettingsPage.Playback) item("backend") {
BackendSection()
}
- if (open == SettingsPage.Account) item("youtube-account") {
+ if (shown == SettingsPage.Account) item("youtube-account") {
YouTubeAccountSection(
onSignIn = onYouTubeSignIn,
onChannelChange = onYouTubeChannelChange,
@@ -258,43 +382,118 @@ fun SettingsScreen(
// What is kept on the phone. Under Playback rather than Account: it is
// about how the music arrives, and it belongs beside the bitrate it
// shares its wording with.
- if (open == SettingsPage.Playback && showSpotify) item("downloads") {
+ // First on the page: where the space went, before anything that can be
+ // done about it.
+ if (shown == SettingsPage.Downloads) item("storage-chart") {
+ StorageChart()
+ }
+
+ if (shown == SettingsPage.Downloads && showSpotify) item("downloads") {
DownloadsSection(backdrop)
}
// The bitrate is librespot's; ExoPlayer takes what YouTube serves.
- if (open == SettingsPage.Playback && showSpotify) item("quality") {
+ if (shown == SettingsPage.Playback && showSpotify) item("quality") {
QualitySection()
}
// Crossfade: mixed by the engine on Spotify, volume-shaped on YouTube Music.
- if (open == SettingsPage.Playback) item("crossfade") {
+ // What happens when the app is swiped away, which is a playback
+ // decision rather than an app one; asked for in #27.
+ if (shown == SettingsPage.Playback) item("keep-playing") {
+ val prefs = remember(context) {
+ (context.applicationContext as dev.lelonio.square.SquareApplication).preferences
+ }
+ val keepPlaying by prefs.keepPlayingOnClose.collectAsStateWithLifecycle()
+ Section(stringResource(R.string.page_playback)) {
+ DownloadSwitch(
+ label = stringResource(R.string.keep_playing_on_close),
+ checked = keepPlaying,
+ backdrop = backdrop,
+ icon = PhosphorIcons.Regular.Playlist,
+ onChange = prefs::setKeepPlayingOnClose,
+ )
+ Text(
+ stringResource(R.string.keep_playing_on_close_note),
+ style = MaterialTheme.typography.bodySmall,
+ color = InkDim,
+ modifier = Modifier.padding(start = ROW_TEXT_START, end = 18.dp, bottom = 14.dp),
+ )
+ }
+ }
+
+ if (shown == SettingsPage.Playback) item("crossfade") {
CrossfadeSection(backdrop)
}
// Autoplay: automatically append similar tracks when queue reaches the end.
- if (open == SettingsPage.Playback) item("autoplay") {
+ if (shown == SettingsPage.Playback) item("autoplay") {
AutoplaySection(backdrop)
}
// Spotify's own, served by its access point: on another source there is
// no clip to ask for and nothing this switch could turn off.
- if (open == SettingsPage.Playback && showSpotify) item("canvas") {
+ if (shown == SettingsPage.Playback && showSpotify) item("canvas") {
CanvasSection(backdrop)
}
// The effects run on our own output, so this one holds for both backends.
- if (open == SettingsPage.Playback) item("effect-quality") {
+ if (shown == SettingsPage.Playback) item("effect-quality") {
EffectQualitySection()
}
- // How the app looks and what that costs, so under the app rather than
- // under playback: nothing here touches a note of audio.
- if (open == SettingsPage.App) item("glass") {
- GlassSection(backdrop)
+ // The cleaning up, under everything it cleans: the songs first, then
+ // the copies of playlists that make a long list open at once, then the
+ // app's own working files. Each says what goes and what stays.
+ if (shown == SettingsPage.Downloads) item("cleanup") {
+ var clearedLists by remember { mutableStateOf(false) }
+ var clearedCache by remember { mutableStateOf(false) }
+ Section(stringResource(R.string.storage_cleanup)) {
+ ActionRow(
+ stringResource(R.string.app_clear_list_cache),
+ destructive = false,
+ icon = PhosphorIcons.Regular.Broom,
+ ) {
+ scope.launch {
+ dev.lelonio.square.data.ContextCacheStore(context).clear()
+ clearedLists = true
+ android.widget.Toast.makeText(
+ context,
+ context.getString(R.string.app_clear_list_cache_done),
+ android.widget.Toast.LENGTH_SHORT,
+ ).show()
+ }
+ }
+ RowDivider()
+ // Everything the app keeps to work faster and nothing it was
+ // asked to keep: images it has drawn, pages it has read, the
+ // engine's own scratch files. The music is not in here.
+ ActionRow(
+ stringResource(R.string.app_clear_cache),
+ destructive = false,
+ icon = PhosphorIcons.Regular.Trash,
+ ) {
+ scope.launch {
+ kotlinx.coroutines.withContext(kotlinx.coroutines.Dispatchers.IO) {
+ runCatching {
+ context.cacheDir.listFiles()?.forEach { it.deleteRecursively() }
+ }
+ }
+ clearedCache = true
+ android.widget.Toast.makeText(
+ context,
+ context.getString(R.string.app_clear_cache_done),
+ android.widget.Toast.LENGTH_SHORT,
+ ).show()
+ }
+ }
+ }
+ // Read so the two flags are used; they keep the rows from being
+ // pressed twice in a row with nothing to show for it.
+ if (clearedLists && clearedCache) Spacer(Modifier.height(0.dp))
}
- if (open == SettingsPage.App) item("language") {
+ if (shown == SettingsPage.App) item("language") {
Section(stringResource(R.string.language)) {
AppLanguages.forEachIndexed { index, (tag, name) ->
if (index > 0) RowDivider()
@@ -306,7 +505,59 @@ fun SettingsScreen(
}
}
- if (open == SettingsPage.App && android.os.Build.VERSION.SDK_INT >= 31) {
+ // What the bar does, which is behaviour rather than material: the glass
+ // page says what it is made of, this says how it acts.
+ if (shown == SettingsPage.App) item("bar") {
+ val glass = remember(context) {
+ (context.applicationContext as dev.lelonio.square.SquareApplication).glass
+ }
+ val folds by glass.barFolds.collectAsStateWithLifecycle()
+ Section(stringResource(R.string.page_app_bar)) {
+ DownloadSwitch(
+ label = stringResource(R.string.bar_folds),
+ checked = folds,
+ backdrop = backdrop,
+ icon = PhosphorIcons.Regular.ArrowsInLineHorizontal,
+ onChange = glass::setBarFolds,
+ )
+ }
+ }
+
+ // The two settings that are Android's rather than the app's, and the
+ // two people are sent to when the music stops in the background or a
+ // notification never arrives.
+ if (shown == SettingsPage.App) item("system") {
+ Section(stringResource(R.string.page_app_system)) {
+ ActionRow(
+ stringResource(R.string.app_system_settings),
+ destructive = false,
+ icon = PhosphorIcons.Regular.Gear,
+ ) {
+ runCatching {
+ context.startActivity(
+ android.content.Intent(
+ android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS,
+ android.net.Uri.fromParts("package", context.packageName, null),
+ ),
+ )
+ }
+ }
+ RowDivider()
+ ActionRow(
+ stringResource(R.string.app_battery_settings),
+ destructive = false,
+ icon = PhosphorIcons.Regular.BatteryCharging,
+ ) {
+ runCatching {
+ context.startActivity(
+ android.content.Intent(android.provider.Settings.ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS),
+ )
+ }
+ }
+ }
+ }
+
+ if (shown == SettingsPage.App && android.os.Build.VERSION.SDK_INT >= 31) {
item("links") {
Section(stringResource(R.string.spotify_links)) {
Text(
@@ -338,7 +589,7 @@ fun SettingsScreen(
}
}
- if (open == SettingsPage.About) item("author") {
+ if (shown == SettingsPage.About) item("author") {
Section(stringResource(R.string.developed_by)) {
val uriHandler = LocalUriHandler.current
Row(
@@ -407,30 +658,71 @@ fun SettingsScreen(
}
}
- if (open == SettingsPage.About) item("about") {
+ // The version as a statement rather than a row: it is the one fact
+ // anybody is asked for when they report something, and it was the
+ // smallest line on the page.
+ if (shown == SettingsPage.About) item("version") {
+ Column(
+ Modifier
+ .fillMaxWidth()
+ .padding(horizontal = 20.dp, vertical = 14.dp),
+ horizontalAlignment = Alignment.CenterHorizontally,
+ verticalArrangement = Arrangement.spacedBy(2.dp),
+ ) {
+ Text(
+ "Square ${BuildConfig.VERSION_NAME}",
+ style = MaterialTheme.typography.headlineSmall,
+ fontWeight = FontWeight.Bold,
+ )
+ Text(
+ BuildConfig.BUILD_TYPE,
+ style = MaterialTheme.typography.bodySmall,
+ color = InkDim,
+ )
+ }
+ }
+
+ if (shown == SettingsPage.About) item("about") {
Section(stringResource(R.string.about)) {
- InfoRow(stringResource(R.string.version), "${BuildConfig.VERSION_NAME} (${BuildConfig.BUILD_TYPE})")
- RowDivider()
- UpdateRow()
+ UpdateRow(askToInstall)
RowDivider()
Licences()
RowDivider()
- ReportRows(name = ready?.displayName)
+ ReportRows(name = ready?.displayName, onSave = askToSaveReport)
}
}
- // Last: a reference for whoever wants to check, not something to do.
- if (open == SettingsPage.About) item("permissions") {
+ // Last, and tighter than the rest: a reference for whoever wants to
+ // check what the app asks Spotify for, not something anyone does.
+ if (shown == SettingsPage.About) item("permissions") {
Section(stringResource(R.string.permissions_asked)) {
Text(
stringResource(R.string.permissions_note),
style = MaterialTheme.typography.bodySmall,
color = InkDim,
- modifier = Modifier.padding(horizontal = 18.dp, vertical = 14.dp),
+ modifier = Modifier.padding(horizontal = 18.dp, vertical = 12.dp),
)
SCOPES.forEach { (scope, why) ->
RowDivider()
- InfoRow(scope, stringResource(why))
+ Row(
+ Modifier
+ .fillMaxWidth()
+ .padding(horizontal = 18.dp, vertical = 8.dp),
+ verticalAlignment = Alignment.CenterVertically,
+ horizontalArrangement = Arrangement.spacedBy(12.dp),
+ ) {
+ Text(
+ scope,
+ style = MaterialTheme.typography.bodySmall,
+ color = InkDim,
+ modifier = Modifier.weight(0.9f),
+ )
+ Text(
+ stringResource(why),
+ style = MaterialTheme.typography.bodySmall,
+ modifier = Modifier.weight(1.1f),
+ )
+ }
}
}
}
@@ -438,7 +730,7 @@ fun SettingsScreen(
// Spotify's sign-out, so only while Spotify is the source. On YouTube
// Music the account section above has its own, and this one signed the
// app out of Spotify from a page about a Google account.
- if (ready != null && open == SettingsPage.Account && showSpotify) {
+ if (ready != null && shown == SettingsPage.Account && showSpotify) {
item("logout") {
Section(null) {
ActionRow(stringResource(R.string.log_out), destructive = true, onClick = onLogOut)
@@ -446,6 +738,8 @@ fun SettingsScreen(
}
}
}
+ }
+ }
}
/**
@@ -462,11 +756,274 @@ private enum class SettingsPage(
@StringRes val title: Int,
/** One line under the name, so a page can be chosen without opening it. */
@StringRes val summary: Int,
+ /** The mark on its tile; see SettingsIndex. */
+ val icon: ImageVector,
+) {
+ Account(R.string.account, R.string.page_account_summary, PhosphorIcons.Regular.UserCircle),
+ Playback(R.string.page_playback, R.string.page_playback_summary, PhosphorIcons.Regular.Waveform),
+ // Its own page rather than a section of the app's: the preview has to stay
+ // on screen while the numbers under it move, and a section inside a list
+ // scrolls away. See GlassPage.
+ Glass(R.string.glass, R.string.page_glass_summary, PhosphorIcons.Regular.Drop),
+ Downloads(R.string.page_downloads, R.string.page_downloads_summary, PhosphorIcons.Regular.DownloadSimple),
+ App(R.string.page_app, R.string.page_app_summary, PhosphorIcons.Regular.SlidersHorizontal),
+ About(R.string.about, R.string.page_about_summary, PhosphorIcons.Regular.Info),
+}
+
+/** How long a page takes to arrive, and how quickly the last one goes. */
+private const val PAGE_TRAVEL_MS = 260
+private const val PAGE_FADE_MS = 140
+
+/**
+ * The way in: whose account this is, and the four places to go.
+ *
+ * Five identical rows was a list of words where the first thing anyone wants
+ * to see is whether they are signed in and as whom. The account is a card with
+ * their picture on it, and the rest are tiles two abreast — a shape you can
+ * aim at, and one that says these are four places rather than four settings.
+ */
+@Composable
+private fun SettingsIndex(
+ name: String?,
+ note: String,
+ avatarUrl: String?,
+ onOpen: (SettingsPage) -> Unit,
+) {
+ Column(
+ Modifier.padding(horizontal = 20.dp, vertical = 10.dp),
+ verticalArrangement = Arrangement.spacedBy(12.dp),
+ ) {
+ Row(
+ Modifier
+ .fillMaxWidth()
+ .clip(RoundedCornerShape(24.dp))
+ .background(Ink.copy(alpha = 0.07f))
+ .clickable { onOpen(SettingsPage.Account) }
+ .padding(16.dp),
+ verticalAlignment = Alignment.CenterVertically,
+ ) {
+ Artwork(
+ url = avatarUrl,
+ title = name.orEmpty(),
+ modifier = Modifier
+ .size(56.dp)
+ .softShadow(CircleShape, elevation = 10.dp),
+ corner = 28.dp,
+ decodeSize = 56.dp,
+ )
+ Column(
+ Modifier
+ .weight(1f)
+ .padding(start = 14.dp),
+ ) {
+ Text(
+ name ?: stringResource(R.string.not_connected),
+ style = MaterialTheme.typography.titleMedium,
+ maxLines = 1,
+ overflow = TextOverflow.Ellipsis,
+ )
+ Text(
+ note,
+ style = MaterialTheme.typography.bodySmall,
+ color = InkDim,
+ maxLines = 1,
+ overflow = TextOverflow.Ellipsis,
+ )
+ }
+ Icon(
+ PhosphorIcons.Regular.CaretRight,
+ contentDescription = null,
+ tint = InkDim,
+ modifier = Modifier.size(18.dp),
+ )
+ }
+
+ // Five places, and a sixth tile that is not a place: it leaves the app
+ // for the Ko-fi page. Last, and in the same shape as the rest, because
+ // it is an offer rather than a setting — asking louder than that would
+ // be asking on a screen somebody opened to change something.
+ val uriHandler = LocalUriHandler.current
+ val pages = SettingsPage.entries.filter { it != SettingsPage.Account }
+ val rows = pages.chunked(2)
+ rows.forEachIndexed { index, pair ->
+ val last = index == rows.lastIndex
+ Row(horizontalArrangement = Arrangement.spacedBy(12.dp)) {
+ pair.forEach { page -> PageTile(page, Modifier.weight(1f)) { onOpen(page) } }
+ // The support tile fills the gap a row of one would leave, and
+ // makes its own row when the pages divide evenly.
+ if (last && pair.size == 1) {
+ SupportTile(Modifier.weight(1f)) { uriHandler.openUri(KOFI_URL) }
+ }
+ }
+ if (last && pair.size == 2) {
+ Row(horizontalArrangement = Arrangement.spacedBy(12.dp)) {
+ SupportTile(Modifier.weight(1f)) { uriHandler.openUri(KOFI_URL) }
+ Spacer(Modifier.weight(1f))
+ }
+ }
+ }
+
+ IndexFooter()
+ }
+}
+
+/**
+ * What Square is keeping, as a bar and a legend.
+ *
+ * Three answers to one question — where did the space go — and they are not
+ * the same kind of thing: the music is what was asked for, the covers and
+ * words beside it are what make it read as music offline, and the caches are
+ * the app's own workings, which it rebuilds if they go. A number for each
+ * would make them look alike; a bar says which one is the space.
+ */
+@Composable
+private fun StorageChart() {
+ val context = LocalContext.current
+ val app = remember(context) { context.applicationContext as dev.lelonio.square.SquareApplication }
+ val files by app.downloads.files.collectAsStateWithLifecycle()
+
+ // Measured off the disk rather than from the index: a Canvas is video, and
+ // the caches have nothing to be counted from but their own directories.
+ val sizes by androidx.compose.runtime.produceState(Triple(0L, 0L, 0L), files.size) {
+ value = kotlinx.coroutines.withContext(kotlinx.coroutines.Dispatchers.IO) {
+ val audio = files.values.sumOf { it.bytes }
+ val extras = runCatching { dev.lelonio.square.download.DownloadExtras.bytes() }.getOrDefault(0L)
+ val caches = runCatching {
+ context.cacheDir.walkBottomUp().filter { it.isFile }.sumOf { it.length() }
+ }.getOrDefault(0L)
+ Triple(audio, extras, caches)
+ }
+ }
+ val (audio, extras, caches) = sizes
+ val total = (audio + extras + caches).coerceAtLeast(1L)
+ val accent = settingsAccent()
+ val parts = listOf(
+ Triple(R.string.storage_music, audio, accent),
+ Triple(R.string.storage_extras, extras, accent.copy(alpha = 0.55f)),
+ Triple(R.string.storage_caches, caches, Ink.copy(alpha = 0.3f)),
+ )
+
+ Column(
+ Modifier
+ .padding(horizontal = 20.dp, vertical = 10.dp)
+ .fillMaxWidth()
+ .clip(RoundedCornerShape(24.dp))
+ .background(Ink.copy(alpha = 0.07f))
+ .padding(18.dp),
+ verticalArrangement = Arrangement.spacedBy(14.dp),
+ ) {
+ Text(
+ android.text.format.Formatter.formatShortFileSize(context, audio + extras + caches),
+ style = MaterialTheme.typography.headlineSmall,
+ fontWeight = FontWeight.Bold,
+ )
+ Row(
+ Modifier
+ .fillMaxWidth()
+ .height(14.dp)
+ .clip(ContinuousCapsule()),
+ horizontalArrangement = Arrangement.spacedBy(2.dp),
+ ) {
+ parts.forEach { (_, bytes, colour) ->
+ // A share too small to see is left out rather than drawn as a
+ // sliver nobody can read.
+ val share = bytes.toFloat() / total
+ if (share > 0.004f) {
+ Box(Modifier.fillMaxHeight().weight(share).background(colour))
+ }
+ }
+ }
+ parts.forEach { (label, bytes, colour) ->
+ Row(
+ verticalAlignment = Alignment.CenterVertically,
+ horizontalArrangement = Arrangement.spacedBy(10.dp),
+ ) {
+ Box(Modifier.size(10.dp).clip(ContinuousCapsule()).background(colour))
+ Text(
+ stringResource(label),
+ style = MaterialTheme.typography.bodyMedium,
+ modifier = Modifier.weight(1f),
+ )
+ Text(
+ android.text.format.Formatter.formatShortFileSize(context, bytes),
+ style = MaterialTheme.typography.bodyMedium,
+ color = InkDim,
+ )
+ }
+ }
+ }
+}
+
+/** What the page ends on: which build this is. */
+@Composable
+private fun IndexFooter() {
+ Text(
+ "Square ${BuildConfig.VERSION_NAME}",
+ style = MaterialTheme.typography.bodySmall,
+ color = InkDim,
+ modifier = Modifier.fillMaxWidth().padding(top = 8.dp),
+ textAlign = androidx.compose.ui.text.style.TextAlign.Center,
+ )
+}
+
+/** One place to go, as a tile: its mark, its name, and what is in it. */
+@Composable
+private fun PageTile(page: SettingsPage, modifier: Modifier = Modifier, onClick: () -> Unit) {
+ Tile(
+ icon = page.icon,
+ title = stringResource(page.title),
+ summary = stringResource(page.summary),
+ modifier = modifier,
+ onClick = onClick,
+ )
+}
+
+/** Not a page: the one tile that leaves the app. */
+@Composable
+private fun SupportTile(modifier: Modifier = Modifier, onClick: () -> Unit) {
+ Tile(
+ icon = PhosphorIcons.Regular.HandHeart,
+ title = stringResource(R.string.support_development),
+ summary = KOFI_URL.removePrefix("https://"),
+ modifier = modifier,
+ onClick = onClick,
+ )
+}
+
+/** The shape every tile on the index has. */
+@Composable
+private fun Tile(
+ icon: ImageVector,
+ title: String,
+ summary: String,
+ modifier: Modifier = Modifier,
+ onClick: () -> Unit,
) {
- Account(R.string.account, R.string.page_account_summary),
- Playback(R.string.page_playback, R.string.page_playback_summary),
- App(R.string.page_app, R.string.page_app_summary),
- About(R.string.about, R.string.page_about_summary),
+ Column(
+ modifier
+ .heightIn(min = 132.dp)
+ .clip(RoundedCornerShape(24.dp))
+ .background(Ink.copy(alpha = 0.07f))
+ .clickable(onClick = onClick)
+ .padding(16.dp),
+ verticalArrangement = Arrangement.spacedBy(10.dp),
+ ) {
+ RowIcon(icon)
+ Spacer(Modifier.weight(1f))
+ Text(
+ title,
+ style = MaterialTheme.typography.titleMedium,
+ maxLines = 1,
+ overflow = TextOverflow.Ellipsis,
+ )
+ Text(
+ summary,
+ style = MaterialTheme.typography.bodySmall,
+ color = InkDim,
+ maxLines = 2,
+ overflow = TextOverflow.Ellipsis,
+ )
+ }
}
/** A row that opens a page. */
@@ -669,6 +1226,7 @@ private fun CanvasSection(backdrop: Backdrop) {
Section(stringResource(R.string.canvas)) {
DownloadSwitch(
label = stringResource(R.string.canvas_show),
+ icon = PhosphorIcons.Regular.FilmStrip,
checked = enabled,
backdrop = backdrop,
onChange = store::setCanvasEnabled,
@@ -687,6 +1245,7 @@ private fun AutoplaySection(backdrop: Backdrop) {
Section(stringResource(R.string.autoplay)) {
DownloadSwitch(
label = stringResource(R.string.autoplay_infinite_title),
+ icon = PhosphorIcons.Regular.Repeat,
checked = enabled,
backdrop = backdrop,
onChange = store::setAutoplayInfinite,
@@ -741,6 +1300,7 @@ private fun CrossfadeSection(backdrop: Backdrop) {
RowDivider()
DownloadSwitch(
label = stringResource(R.string.trim_silence),
+ icon = PhosphorIcons.Regular.Scissors,
checked = trimSilence,
backdrop = backdrop,
onChange = preferences::setTrimSilence,
@@ -752,6 +1312,7 @@ private fun CrossfadeSection(backdrop: Backdrop) {
// has heard enough.
DownloadSwitch(
label = stringResource(R.string.skip_fade),
+ icon = PhosphorIcons.Regular.Waveform,
checked = skipFade,
backdrop = backdrop,
onChange = preferences::setSkipFade,
@@ -822,7 +1383,7 @@ private fun QualitySection() {
* automatic.
*/
@Composable
-private fun UpdateRow() {
+private fun UpdateRow(onNeedsPermission: (Updater.State.Available) -> Unit) {
val context = LocalContext.current
val updater = remember(context) {
(context.applicationContext as dev.lelonio.square.SquareApplication).updater
@@ -847,26 +1408,11 @@ private fun UpdateRow() {
state is Updater.State.Downloading ||
state is Updater.State.Installing
- // Held across the trip to the system settings, so granting the permission
- // continues the install instead of ending in a row that has to be pressed
- // again.
- var pending by remember { mutableStateOf<Updater.State.Available?>(null) }
- val permission = rememberLauncherForActivityResult(
- ActivityResultContracts.StartActivityForResult(),
- ) {
- val update = pending ?: return@rememberLauncherForActivityResult
- pending = null
- scope.launch { if (updater.canInstall()) updater.install(update) }
- }
-
Row(
Modifier
.fillMaxWidth()
.clickable(enabled = !busy) {
- scope.launch {
- pending = updater.checkAndInstall()
- pending?.let { permission.launch(updater.permissionIntent()) }
- }
+ scope.launch { updater.checkAndInstall()?.let(onNeedsPermission) }
}
.padding(horizontal = 18.dp, vertical = 14.dp),
verticalAlignment = Alignment.CenterVertically,
@@ -996,6 +1542,7 @@ private fun DownloadsSection(backdrop: Backdrop) {
RowDivider()
DownloadSwitch(
label = stringResource(R.string.download_wifi_only),
+ icon = PhosphorIcons.Regular.WifiHigh,
checked = wifiOnly,
backdrop = backdrop,
onChange = settings::setWifiOnly,
@@ -1004,6 +1551,7 @@ private fun DownloadsSection(backdrop: Backdrop) {
RowDivider()
DownloadSwitch(
label = stringResource(R.string.download_liked_songs),
+ icon = PhosphorIcons.Regular.Heart,
checked = likedSongs,
backdrop = backdrop,
onChange = { enable ->
@@ -1038,11 +1586,34 @@ private fun DownloadsSection(backdrop: Backdrop) {
RowDivider()
DownloadSwitch(
label = stringResource(R.string.offline_mode),
+ icon = PhosphorIcons.Regular.AirplaneTilt,
checked = offline,
backdrop = backdrop,
onChange = settings::setOfflineMode,
)
+ // Always offered, unlike the retry above: the music being here is not
+ // the same as its covers and words being here, and a song kept by an
+ // older build has none of them. Nothing is re-downloaded but the
+ // extras; the audio stays where it is.
+ RowDivider()
+ ActionRow(
+ stringResource(R.string.download_refetch_extras),
+ destructive = false,
+ icon = PhosphorIcons.Regular.Image,
+ ) {
+ scope.launch {
+ (context.applicationContext as dev.lelonio.square.SquareApplication)
+ .downloadQueue.refetchExtras()
+ dev.lelonio.square.download.DownloadService.start(context)
+ android.widget.Toast.makeText(
+ context,
+ context.getString(R.string.download_refetch_started),
+ android.widget.Toast.LENGTH_SHORT,
+ ).show()
+ }
+ }
+
// Only when there is something to say. A row reporting zero failures is
// a row about nothing, on a screen that is already long.
val givenUp = failures.count {
@@ -1054,12 +1625,17 @@ private fun DownloadsSection(backdrop: Backdrop) {
stringResource(R.string.downloads),
stringResource(R.string.download_failed_count, givenUp),
)
- ActionRow(stringResource(R.string.download_retry_failed), destructive = false) {
+ ActionRow(
+ stringResource(R.string.download_retry_failed),
+ destructive = false,
+ icon = PhosphorIcons.Regular.ArrowClockwise,
+ ) {
scope.launch {
store.retryFailed()
dev.lelonio.square.download.DownloadService.start(context)
}
}
+
}
if (files.isNotEmpty()) {
@@ -1088,6 +1664,7 @@ private fun DownloadSwitch(
label: String,
checked: Boolean,
backdrop: Backdrop,
+ icon: ImageVector? = null,
onChange: (Boolean) -> Unit,
) {
Row(
@@ -1098,13 +1675,10 @@ private fun DownloadSwitch(
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(12.dp),
) {
+ icon?.let { RowIcon(it) }
Text(label, style = MaterialTheme.typography.bodyLarge, modifier = Modifier.weight(1f))
- dev.lelonio.square.ui.glass.LiquidToggle(
- selected = { checked },
- onSelect = onChange,
- backdrop = backdrop,
- accent = MaterialTheme.colorScheme.primary,
- )
+ // Drawn, not glass; see PlainToggle.
+ PlainToggle(checked = checked, onChange = onChange)
}
}
@@ -1130,14 +1704,15 @@ private fun Section(title: String?, content: @Composable () -> Unit) {
}
@Composable
-private fun InfoRow(label: String, value: String) {
+private fun InfoRow(label: String, value: String, icon: ImageVector? = null) {
Row(
Modifier
.fillMaxWidth()
- .padding(horizontal = 18.dp, vertical = 14.dp),
+ .padding(horizontal = 18.dp, vertical = 12.dp),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(12.dp),
) {
+ icon?.let { RowIcon(it) }
Text(label, style = MaterialTheme.typography.bodyLarge, modifier = Modifier.weight(1f))
Text(
value,
@@ -1159,36 +1734,16 @@ private fun InfoRow(label: String, value: String) {
* cannot be attached to an issue from the browser.
*/
@Composable
-private fun ReportRows(name: String?) {
+private fun ReportRows(name: String?, onSave: (java.io.File) -> Unit) {
val context = LocalContext.current
val scope = rememberCoroutineScope()
var busy by remember { mutableStateOf(false) }
- // The report waiting for the folder picker to say where it goes.
- var pending by remember { mutableStateOf<java.io.File?>(null) }
fun failed(error: Throwable) {
android.util.Log.w("SquareReport", "report failed: $error")
android.widget.Toast.makeText(context, context.getString(R.string.report_failed), android.widget.Toast.LENGTH_SHORT).show()
}
- val save = androidx.activity.compose.rememberLauncherForActivityResult(
- androidx.activity.result.contract.ActivityResultContracts.CreateDocument("text/plain"),
- ) { uri ->
- val file = pending
- pending = null
- if (uri == null || file == null) return@rememberLauncherForActivityResult
- scope.launch {
- runCatching {
- kotlinx.coroutines.withContext(kotlinx.coroutines.Dispatchers.IO) {
- context.contentResolver.openOutputStream(uri)?.use { out ->
- file.inputStream().use { it.copyTo(out) }
- } ?: error("no stream for $uri")
- }
- android.widget.Toast.makeText(context, context.getString(R.string.report_saved), android.widget.Toast.LENGTH_SHORT).show()
- }.onFailure(::failed)
- }
- }
-
fun prepare(then: (java.io.File) -> Unit) {
if (busy) return
busy = true
@@ -1204,12 +1759,7 @@ private fun ReportRows(name: String?) {
ActionRow(
stringResource(if (busy) R.string.report_preparing else R.string.save_report),
destructive = false,
- ) {
- prepare { file ->
- pending = file
- save.launch(file.name)
- }
- }
+ ) { prepare(onSave) }
RowDivider()
ActionRow(stringResource(R.string.send_report), destructive = false) {
prepare { file ->
@@ -1226,7 +1776,32 @@ private fun ReportRows(name: String?) {
}
@Composable
-private fun ActionRow(label: String, destructive: Boolean, onClick: () -> Unit) {
+private fun ActionRow(
+ label: String,
+ destructive: Boolean,
+ icon: ImageVector? = null,
+ onClick: () -> Unit,
+) {
+ if (icon != null) {
+ Row(
+ Modifier
+ .fillMaxWidth()
+ .clickable(onClick = onClick)
+ .padding(horizontal = 18.dp, vertical = 12.dp),
+ verticalAlignment = Alignment.CenterVertically,
+ horizontalArrangement = Arrangement.spacedBy(12.dp),
+ ) {
+ RowIcon(icon)
+ Text(
+ label,
+ style = MaterialTheme.typography.bodyLarge,
+ fontWeight = FontWeight.Medium,
+ color = if (destructive) MaterialTheme.colorScheme.error else Ink,
+ modifier = Modifier.weight(1f),
+ )
+ }
+ return
+ }
Text(
label,
style = MaterialTheme.typography.bodyLarge,
@@ -1241,14 +1816,21 @@ private fun ActionRow(label: String, destructive: Boolean, onClick: () -> Unit)
/** A row of a list where one is picked, with a tick on the one that is. */
@Composable
-private fun ChoiceRow(label: String, selected: Boolean, onClick: () -> Unit) {
+private fun ChoiceRow(
+ label: String,
+ selected: Boolean,
+ icon: ImageVector? = null,
+ onClick: () -> Unit,
+) {
Row(
Modifier
.fillMaxWidth()
.clickable(onClick = onClick)
- .padding(horizontal = 18.dp, vertical = 14.dp),
+ .padding(horizontal = 18.dp, vertical = 12.dp),
verticalAlignment = Alignment.CenterVertically,
+ horizontalArrangement = Arrangement.spacedBy(12.dp),
) {
+ icon?.let { RowIcon(it) }
Text(
label,
style = MaterialTheme.typography.bodyLarge,
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index d583d56..303681b 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -304,8 +304,25 @@
<string name="page_playback">Wiedergabe</string>
<string name="page_app">App</string>
<string name="page_account_summary">Ihr Konto, die Web-API-Anwendung und das Abmelden</string>
- <string name="page_playback_summary">Woher die Musik kommt, Qualität und Überblendung</string>
- <string name="page_app_summary">Sprache, Glas und untere Leiste</string>
+ <string name="page_playback_summary">Woher die Musik kommt, Qualität und Wiedergabe</string>
+ <string name="page_app_summary">Sprache, Leiste, System und Links</string>
+ <string name="page_downloads">Downloads und Speicher</string>
+ <string name="storage_cleanup">Aufräumen</string>
+ <string name="app_clear_cache">App-Caches löschen</string>
+ <string name="app_clear_cache_done">Gelöscht — die App baut sie wieder auf</string>
+ <string name="storage_music">Musik</string>
+ <string name="storage_extras">Cover, Texte und Canvases</string>
+ <string name="storage_caches">App-Caches</string>
+ <string name="page_downloads_summary">Was auf dem Telefon liegt und was geladen wird</string>
+ <string name="keep_playing_on_close">Weiterspielen, wenn die App geschlossen wird</string>
+ <string name="keep_playing_on_close_note">Square aus den zuletzt geöffneten Apps zu wischen lässt die Musik laufen. Über die Benachrichtigung lässt sie sich stoppen.</string>
+ <string name="page_app_bar">Untere Leiste</string>
+ <string name="page_app_system">System</string>
+ <string name="page_app_storage">Speicher</string>
+ <string name="app_system_settings">App-Einstellungen in Android</string>
+ <string name="app_battery_settings">Akku-Einstellungen</string>
+ <string name="app_clear_list_cache">Gespeicherte Playlists leeren</string>
+ <string name="app_clear_list_cache_done">Geleert — sie werden beim Öffnen neu geladen</string>
<string name="page_about_summary">Version, Berechtigungen, Lizenzen und Entwickler</string>
<string name="playing_on">Wiedergabe auf %1$s</string>
<string name="switching">Wechsel…</string>
@@ -339,6 +356,15 @@
<string name="glass_refraction_amount">Krümmung</string>
<string name="glass_rim">Kantenlicht</string>
<string name="glass_film">Film</string>
+ <string name="glass_tint">Färbung</string>
+ <string name="page_glass_summary">Das Material, seine Farbe und wo es verwendet wird</string>
+ <string name="glass_group_material">Material</string>
+ <string name="glass_group_colour">Farbe</string>
+ <string name="glass_group_edges">Kanten</string>
+ <string name="glass_group_where">Wo es verwendet wird</string>
+ <string name="glass_tint_none">Keine</string>
+ <string name="glass_tint_clear">Entfernen</string>
+ <string name="glass_tint_strength">Stärke der Färbung</string>
<string name="glass_dispersion">Farbaufspaltung</string>
<string name="glass_dispersion_note">Licht, das sich an den Kanten in Farben zerlegt, wie in dickem Glas.</string>
<string name="glass_depth">Tiefe</string>
@@ -384,6 +410,8 @@
<string name="download_artist_confirm">%1$d Titel von %2$s herunterladen? Das sind etwa %3$s.</string>
<string name="download_failed_count">%1$d konnten nicht heruntergeladen werden</string>
<string name="download_retry_failed">Erneut versuchen</string>
+ <string name="download_refetch_extras">Cover und Texte neu laden</string>
+ <string name="download_refetch_started">Werden erneut angefragt und kommen mit den Downloads</string>
<string name="downloaded_tracks">Heruntergeladene Songs</string>
<string name="offline_mode">Offlinemodus</string>
<string name="offline_mode_note">Nur abspielen, was heruntergeladen ist, und Spotify nach nichts fragen.</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index ca94533..c1d6671 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -304,8 +304,25 @@
<string name="page_playback">Reproducción</string>
<string name="page_app">Aplicación</string>
<string name="page_account_summary">Tu cuenta, la aplicación de la Web API y cerrar sesión</string>
- <string name="page_playback_summary">De dónde viene la música, calidad y fundido</string>
- <string name="page_app_summary">Idioma, cristal y barra inferior</string>
+ <string name="page_playback_summary">De dónde viene la música, calidad y reproducción</string>
+ <string name="page_app_summary">Idioma, barra, sistema y enlaces</string>
+ <string name="page_downloads">Descargas y almacenamiento</string>
+ <string name="storage_cleanup">Limpieza</string>
+ <string name="app_clear_cache">Borrar las cachés de la app</string>
+ <string name="app_clear_cache_done">Borradas: la app las reconstruye sobre la marcha</string>
+ <string name="storage_music">Música</string>
+ <string name="storage_extras">Portadas, letras y Canvas</string>
+ <string name="storage_caches">Cachés de la app</string>
+ <string name="page_downloads_summary">Qué hay en el teléfono y qué se descarga</string>
+ <string name="keep_playing_on_close">Seguir sonando al cerrar la app</string>
+ <string name="keep_playing_on_close_note">Quitar Square de recientes deja la música sonando. Desde la notificación se detiene igual.</string>
+ <string name="page_app_bar">Barra inferior</string>
+ <string name="page_app_system">Sistema</string>
+ <string name="page_app_storage">Almacenamiento</string>
+ <string name="app_system_settings">Ajustes de la app en Android</string>
+ <string name="app_battery_settings">Ajustes de batería</string>
+ <string name="app_clear_list_cache">Vaciar las playlists guardadas</string>
+ <string name="app_clear_list_cache_done">Vaciadas: se leen otra vez al abrirlas</string>
<string name="page_about_summary">Versión, permisos, licencias y desarrollador</string>
<string name="playing_on">Reproduciendo en %1$s</string>
<string name="switching">Cambiando…</string>
@@ -339,6 +356,15 @@
<string name="glass_refraction_amount">Curvatura</string>
<string name="glass_rim">Luz del borde</string>
<string name="glass_film">Película</string>
+ <string name="glass_tint">Tinte</string>
+ <string name="page_glass_summary">El material, su color y dónde se usa</string>
+ <string name="glass_group_material">Material</string>
+ <string name="glass_group_colour">Color</string>
+ <string name="glass_group_edges">Bordes</string>
+ <string name="glass_group_where">Dónde se usa</string>
+ <string name="glass_tint_none">Ninguno</string>
+ <string name="glass_tint_clear">Quitar</string>
+ <string name="glass_tint_strength">Intensidad del tinte</string>
<string name="glass_dispersion">Separación de color</string>
<string name="glass_dispersion_note">La luz que se descompone en colores en los bordes, como en el vidrio grueso.</string>
<string name="glass_depth">Profundidad</string>
@@ -384,6 +410,8 @@
<string name="download_artist_confirm">¿Descargar %1$d canciones de %2$s? Son unos %3$s.</string>
<string name="download_failed_count">%1$d no se pudieron descargar</string>
<string name="download_retry_failed">Reintentar</string>
+ <string name="download_refetch_extras">Volver a descargar portadas y letras</string>
+ <string name="download_refetch_started">Se piden de nuevo y llegan mientras siguen las descargas</string>
<string name="downloaded_tracks">Música descargada</string>
<string name="offline_mode">Modo sin conexión</string>
<string name="offline_mode_note">Reproduce solo lo descargado, sin pedirle nada a Spotify.</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 5bfc39c..44a8a6f 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -304,8 +304,25 @@
<string name="page_playback">Lecture</string>
<string name="page_app">Application</string>
<string name="page_account_summary">Votre compte, l’application Web API et la déconnexion</string>
- <string name="page_playback_summary">D’où vient la musique, qualité et fondu enchaîné</string>
- <string name="page_app_summary">Langue, verre et barre du bas</string>
+ <string name="page_playback_summary">D\'où vient la musique, qualité et lecture</string>
+ <string name="page_app_summary">Langue, barre, système et liens</string>
+ <string name="page_downloads">Téléchargements et stockage</string>
+ <string name="storage_cleanup">Nettoyage</string>
+ <string name="app_clear_cache">Effacer les caches de l\'appli</string>
+ <string name="app_clear_cache_done">Effacés : l\'appli les reconstruit au fur et à mesure</string>
+ <string name="storage_music">Musique</string>
+ <string name="storage_extras">Pochettes, paroles et Canvas</string>
+ <string name="storage_caches">Caches de l\'appli</string>
+ <string name="page_downloads_summary">Ce qui est sur le téléphone et ce qui est téléchargé</string>
+ <string name="keep_playing_on_close">Continuer la lecture quand l\'appli est fermée</string>
+ <string name="keep_playing_on_close_note">Retirer Square des applis récentes laisse la musique jouer. La notification l\'arrête toujours.</string>
+ <string name="page_app_bar">Barre du bas</string>
+ <string name="page_app_system">Système</string>
+ <string name="page_app_storage">Stockage</string>
+ <string name="app_system_settings">Réglages de l\'appli dans Android</string>
+ <string name="app_battery_settings">Réglages de batterie</string>
+ <string name="app_clear_list_cache">Vider les playlists enregistrées</string>
+ <string name="app_clear_list_cache_done">Vidées : elles sont relues à l\'ouverture</string>
<string name="page_about_summary">Version, autorisations, licences et développeur</string>
<string name="playing_on">Lecture sur %1$s</string>
<string name="switching">Transfert…</string>
@@ -339,6 +356,15 @@
<string name="glass_refraction_amount">Courbure</string>
<string name="glass_rim">Lumière du bord</string>
<string name="glass_film">Film</string>
+ <string name="glass_tint">Teinte</string>
+ <string name="page_glass_summary">La matière, sa couleur et où elle est utilisée</string>
+ <string name="glass_group_material">Matière</string>
+ <string name="glass_group_colour">Couleur</string>
+ <string name="glass_group_edges">Bords</string>
+ <string name="glass_group_where">Où l\'appliquer</string>
+ <string name="glass_tint_none">Aucune</string>
+ <string name="glass_tint_clear">Retirer</string>
+ <string name="glass_tint_strength">Intensité de la teinte</string>
<string name="glass_dispersion">Séparation des couleurs</string>
<string name="glass_dispersion_note">La lumière qui se décompose en couleurs sur les bords, comme dans le verre épais.</string>
<string name="glass_depth">Profondeur</string>
@@ -384,6 +410,8 @@
<string name="download_artist_confirm">Télécharger %1$d titres de %2$s ? Cela représente environ %3$s.</string>
<string name="download_failed_count">%1$d n\'ont pas pu être téléchargés</string>
<string name="download_retry_failed">Réessayer</string>
+ <string name="download_refetch_extras">Retélécharger pochettes et paroles</string>
+ <string name="download_refetch_started">Redemandées : elles arrivent au fil des téléchargements</string>
<string name="downloaded_tracks">Titres téléchargés</string>
<string name="offline_mode">Mode hors connexion</string>
<string name="offline_mode_note">Ne lire que ce qui est téléchargé, sans rien demander à Spotify.</string>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index 450d496..500db66 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -319,8 +319,25 @@
<string name="page_playback">प्लेबैक</string>
<string name="page_app">ऐप</string>
<string name="page_account_summary">आपका खाता, Web API ऐप्लिकेशन और साइन आउट</string>
- <string name="page_playback_summary">संगीत का स्रोत, गुणवत्ता और क्रॉसफ़ेड</string>
- <string name="page_app_summary">भाषा, काँच और नीचे की पट्टी</string>
+ <string name="page_playback_summary">संगीत कहाँ से आता है, गुणवत्ता और प्लेबैक</string>
+ <string name="page_app_summary">भाषा, पट्टी, सिस्टम और लिंक</string>
+ <string name="page_downloads">डाउनलोड और स्टोरेज</string>
+ <string name="storage_cleanup">सफ़ाई</string>
+ <string name="app_clear_cache">ऐप की कैश हटाएँ</string>
+ <string name="app_clear_cache_done">हटा दी गई: ऐप चलते-चलते फिर बना लेगा</string>
+ <string name="storage_music">संगीत</string>
+ <string name="storage_extras">कवर, बोल और Canvas</string>
+ <string name="storage_caches">ऐप कैश</string>
+ <string name="page_downloads_summary">फ़ोन में क्या है और क्या डाउनलोड होता है</string>
+ <string name="keep_playing_on_close">ऐप बंद करने पर भी बजता रहे</string>
+ <string name="keep_playing_on_close_note">Square को हाल की ऐप्स से हटाने पर संगीत चलता रहता है। नोटिफिकेशन से बंद किया जा सकता है।</string>
+ <string name="page_app_bar">नीचे की पट्टी</string>
+ <string name="page_app_system">सिस्टम</string>
+ <string name="page_app_storage">स्टोरेज</string>
+ <string name="app_system_settings">Android में ऐप सेटिंग</string>
+ <string name="app_battery_settings">बैटरी सेटिंग</string>
+ <string name="app_clear_list_cache">सेव की गई प्लेलिस्ट हटाएँ</string>
+ <string name="app_clear_list_cache_done">हटा दी गईं: खोलने पर फिर पढ़ी जाएँगी</string>
<string name="page_about_summary">संस्करण, अनुमतियाँ, लाइसेंस और डेवलपर</string>
<string name="playing_on">%1$s पर चल रहा है</string>
<string name="switching">बदला जा रहा है…</string>
@@ -354,6 +371,15 @@
<string name="glass_refraction_amount">मोड़</string>
<string name="glass_rim">किनारे की रोशनी</string>
<string name="glass_film">परत</string>
+ <string name="glass_tint">रंगत</string>
+ <string name="page_glass_summary">मटीरियल, उसका रंग और वह कहाँ इस्तेमाल होता है</string>
+ <string name="glass_group_material">मटीरियल</string>
+ <string name="glass_group_colour">रंग</string>
+ <string name="glass_group_edges">किनारे</string>
+ <string name="glass_group_where">कहाँ इस्तेमाल हो</string>
+ <string name="glass_tint_none">कोई नहीं</string>
+ <string name="glass_tint_clear">हटाएँ</string>
+ <string name="glass_tint_strength">रंगत की तीव्रता</string>
<string name="glass_dispersion">रंगों का बँटवारा</string>
<string name="glass_dispersion_note">मोटे काँच की तरह, किनारों पर रोशनी का रंगों में टूटना।</string>
<string name="glass_depth">गहराई</string>
@@ -399,6 +425,8 @@
<string name="download_artist_confirm">%2$s के %1$d गाने डाउनलोड करें? लगभग %3$s।</string>
<string name="download_failed_count">%1$d डाउनलोड नहीं हो सके</string>
<string name="download_retry_failed">फिर कोशिश करें</string>
+ <string name="download_refetch_extras">कवर और बोल फिर से लाएँ</string>
+ <string name="download_refetch_started">फिर से माँगे जा रहे हैं, डाउनलोड के साथ आएँगे</string>
<string name="downloaded_tracks">डाउनलोड किए गीत</string>
<string name="offline_mode">ऑफ़लाइन मोड</string>
<string name="offline_mode_note">केवल डाउनलोड किया हुआ चलाएँ, Spotify से कुछ न मांगें।</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index f406eab..29b96da 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -305,8 +305,25 @@
<string name="page_playback">Riproduzione</string>
<string name="page_app">App</string>
<string name="page_account_summary">Il tuo account, l’applicazione Web API e la disconnessione</string>
- <string name="page_playback_summary">Da dove arriva la musica, qualità e dissolvenza</string>
- <string name="page_app_summary">Lingua, vetro e barra in basso</string>
+ <string name="page_playback_summary">Da dove arriva la musica, qualità e riproduzione</string>
+ <string name="page_app_summary">Lingua, barra, sistema e collegamenti</string>
+ <string name="page_downloads">Download e spazio</string>
+ <string name="storage_cleanup">Pulizia</string>
+ <string name="app_clear_cache">Cancella la cache dell\'app</string>
+ <string name="app_clear_cache_done">Cancellata: l\'app la ricostruisce mentre la usi</string>
+ <string name="storage_music">Musica</string>
+ <string name="storage_extras">Copertine, testi e Canvas</string>
+ <string name="storage_caches">Cache dell\'app</string>
+ <string name="page_downloads_summary">Cosa c\'è sul telefono e cosa viene scaricato</string>
+ <string name="keep_playing_on_close">Continua a suonare chiudendo l\'app</string>
+ <string name="keep_playing_on_close_note">Togliendo Square dalle recenti la musica va avanti. Dalla notifica si ferma come sempre.</string>
+ <string name="page_app_bar">Barra in basso</string>
+ <string name="page_app_system">Sistema</string>
+ <string name="page_app_storage">Spazio</string>
+ <string name="app_system_settings">Impostazioni dell\'app in Android</string>
+ <string name="app_battery_settings">Impostazioni della batteria</string>
+ <string name="app_clear_list_cache">Svuota le playlist salvate</string>
+ <string name="app_clear_list_cache_done">Svuotate: vengono rilette quando le apri</string>
<string name="page_about_summary">Versione, permessi, licenze e sviluppatore</string>
<string name="playing_on">In riprod. su %1$s</string>
<string name="switching">Passaggio in corso…</string>
@@ -340,6 +357,15 @@
<string name="glass_refraction_amount">Curvatura</string>
<string name="glass_rim">Luce sul bordo</string>
<string name="glass_film">Pellicola</string>
+ <string name="glass_tint">Tinta</string>
+ <string name="page_glass_summary">Il materiale, il suo colore e dove usarlo</string>
+ <string name="glass_group_material">Materiale</string>
+ <string name="glass_group_colour">Colore</string>
+ <string name="glass_group_edges">Bordi</string>
+ <string name="glass_group_where">Dove usarlo</string>
+ <string name="glass_tint_none">Nessuna</string>
+ <string name="glass_tint_clear">Togli</string>
+ <string name="glass_tint_strength">Intensità della tinta</string>
<string name="glass_dispersion">Separazione dei colori</string>
<string name="glass_dispersion_note">La luce che si scompone in colori ai bordi, come nel vetro spesso.</string>
<string name="glass_depth">Profondità</string>
@@ -385,6 +411,8 @@
<string name="download_artist_confirm">Scaricare %1$d brani di %2$s? Sono circa %3$s.</string>
<string name="download_failed_count">%1$d non si sono potuti scaricare</string>
<string name="download_retry_failed">Riprova</string>
+ <string name="download_refetch_extras">Riscarica copertine e testi</string>
+ <string name="download_refetch_started">Le richiedo di nuovo: arrivano mentre i download vanno avanti</string>
<string name="downloaded_tracks">Brani scaricati</string>
<string name="offline_mode">Modalità offline</string>
<string name="offline_mode_note">Riproduci solo ciò che è scaricato, senza chiedere niente a Spotify.</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 2252287..3f5aef3 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -304,8 +304,25 @@
<string name="page_playback">Reprodução</string>
<string name="page_app">Aplicativo</string>
<string name="page_account_summary">Sua conta, o aplicativo da Web API e sair</string>
- <string name="page_playback_summary">De onde vem a música, qualidade e transição</string>
- <string name="page_app_summary">Idioma, vidro e barra inferior</string>
+ <string name="page_playback_summary">De onde vem a música, qualidade e reprodução</string>
+ <string name="page_app_summary">Idioma, barra, sistema e links</string>
+ <string name="page_downloads">Downloads e armazenamento</string>
+ <string name="storage_cleanup">Limpeza</string>
+ <string name="app_clear_cache">Apagar os caches do app</string>
+ <string name="app_clear_cache_done">Apagados: o app os reconstrói conforme usa</string>
+ <string name="storage_music">Música</string>
+ <string name="storage_extras">Capas, letras e Canvas</string>
+ <string name="storage_caches">Caches do app</string>
+ <string name="page_downloads_summary">O que está no telefone e o que é baixado</string>
+ <string name="keep_playing_on_close">Continuar tocando ao fechar o app</string>
+ <string name="keep_playing_on_close_note">Tirar o Square dos recentes deixa a música tocando. Pela notificação ela para como sempre.</string>
+ <string name="page_app_bar">Barra inferior</string>
+ <string name="page_app_system">Sistema</string>
+ <string name="page_app_storage">Armazenamento</string>
+ <string name="app_system_settings">Configurações do app no Android</string>
+ <string name="app_battery_settings">Configurações de bateria</string>
+ <string name="app_clear_list_cache">Limpar as playlists salvas</string>
+ <string name="app_clear_list_cache_done">Limpas: são lidas de novo ao abrir</string>
<string name="page_about_summary">Versão, permissões, licenças e desenvolvedor</string>
<string name="playing_on">Reproduzindo em %1$s</string>
<string name="switching">Trocando…</string>
@@ -339,6 +356,15 @@
<string name="glass_refraction_amount">Curvatura</string>
<string name="glass_rim">Luz da borda</string>
<string name="glass_film">Película</string>
+ <string name="glass_tint">Tom</string>
+ <string name="page_glass_summary">O material, a cor e onde é usado</string>
+ <string name="glass_group_material">Material</string>
+ <string name="glass_group_colour">Cor</string>
+ <string name="glass_group_edges">Bordas</string>
+ <string name="glass_group_where">Onde é usado</string>
+ <string name="glass_tint_none">Nenhum</string>
+ <string name="glass_tint_clear">Remover</string>
+ <string name="glass_tint_strength">Intensidade do tom</string>
<string name="glass_dispersion">Separação de cor</string>
<string name="glass_dispersion_note">A luz a decompor-se em cores nas bordas, como no vidro espesso.</string>
<string name="glass_depth">Profundidade</string>
@@ -384,6 +410,8 @@
<string name="download_artist_confirm">Baixar %1$d faixas de %2$s? São cerca de %3$s.</string>
<string name="download_failed_count">%1$d não puderam ser baixadas</string>
<string name="download_retry_failed">Tentar de novo</string>
+ <string name="download_refetch_extras">Baixar capas e letras de novo</string>
+ <string name="download_refetch_started">Pedidas de novo: chegam enquanto os downloads seguem</string>
<string name="downloaded_tracks">Músicas baixadas</string>
<string name="offline_mode">Modo offline</string>
<string name="offline_mode_note">Toca só o que está baixado, sem pedir nada ao Spotify.</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 5b3fb7a..8ee2c2a 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -321,8 +321,25 @@
<string name="page_playback">Воспроизведение</string>
<string name="page_app">Приложение</string>
<string name="page_account_summary">Ваш аккаунт, приложение Web API и выход</string>
- <string name="page_playback_summary">Источник музыки, качество и кроссфейд</string>
- <string name="page_app_summary">Язык, стекло и нижняя панель</string>
+ <string name="page_playback_summary">Откуда музыка, качество и воспроизведение</string>
+ <string name="page_app_summary">Язык, панель, система и ссылки</string>
+ <string name="page_downloads">Загрузки и память</string>
+ <string name="storage_cleanup">Очистка</string>
+ <string name="app_clear_cache">Очистить кэш приложения</string>
+ <string name="app_clear_cache_done">Очищено: приложение соберёт его заново</string>
+ <string name="storage_music">Музыка</string>
+ <string name="storage_extras">Обложки, тексты и Canvas</string>
+ <string name="storage_caches">Кэш приложения</string>
+ <string name="page_downloads_summary">Что лежит на телефоне и что скачивается</string>
+ <string name="keep_playing_on_close">Продолжать играть при закрытии приложения</string>
+ <string name="keep_playing_on_close_note">Если убрать Square из недавних, музыка продолжит играть. Остановить можно из уведомления.</string>
+ <string name="page_app_bar">Нижняя панель</string>
+ <string name="page_app_system">Система</string>
+ <string name="page_app_storage">Память</string>
+ <string name="app_system_settings">Настройки приложения в Android</string>
+ <string name="app_battery_settings">Настройки батареи</string>
+ <string name="app_clear_list_cache">Очистить сохранённые плейлисты</string>
+ <string name="app_clear_list_cache_done">Очищено: они загрузятся заново при открытии</string>
<string name="page_about_summary">Версия, разрешения, лицензии и разработчик</string>
<string name="playing_on">Играет на %1$s</string>
<string name="switching">Переключение…</string>
@@ -356,6 +373,15 @@
<string name="glass_refraction_amount">Изгиб</string>
<string name="glass_rim">Свет по краю</string>
<string name="glass_film">Плёнка</string>
+ <string name="glass_tint">Оттенок</string>
+ <string name="page_glass_summary">Материал, его цвет и где он используется</string>
+ <string name="glass_group_material">Материал</string>
+ <string name="glass_group_colour">Цвет</string>
+ <string name="glass_group_edges">Края</string>
+ <string name="glass_group_where">Где используется</string>
+ <string name="glass_tint_none">Нет</string>
+ <string name="glass_tint_clear">Убрать</string>
+ <string name="glass_tint_strength">Сила оттенка</string>
<string name="glass_dispersion">Разложение цвета</string>
<string name="glass_dispersion_note">Свет, распадающийся на цвета по краям, как в толстом стекле.</string>
<string name="glass_depth">Глубина</string>
@@ -401,6 +427,8 @@
<string name="download_artist_confirm">Скачать %1$d треков исполнителя %2$s? Это примерно %3$s.</string>
<string name="download_failed_count">Не удалось скачать: %1$d</string>
<string name="download_retry_failed">Попробовать снова</string>
+ <string name="download_refetch_extras">Загрузить обложки и тексты заново</string>
+ <string name="download_refetch_started">Запрошу снова: они придут по ходу загрузок</string>
<string name="downloaded_tracks">Скачанные треки</string>
<string name="offline_mode">Офлайн-режим</string>
<string name="offline_mode_note">Играть только скачанное и ничего не запрашивать у Spotify.</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index dfec59c..26cfd17 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -319,8 +319,25 @@
<string name="page_playback">Çalma</string>
<string name="page_app">Uygulama</string>
<string name="page_account_summary">Hesabın, Web API uygulaması ve çıkış</string>
- <string name="page_playback_summary">Müziğin kaynağı, kalite ve çapraz geçiş</string>
- <string name="page_app_summary">Dil, cam ve alt çubuk</string>
+ <string name="page_playback_summary">Müzik nereden geliyor, kalite ve çalma</string>
+ <string name="page_app_summary">Dil, çubuk, sistem ve bağlantılar</string>
+ <string name="page_downloads">İndirmeler ve depolama</string>
+ <string name="storage_cleanup">Temizlik</string>
+ <string name="app_clear_cache">Uygulama önbelleklerini sil</string>
+ <string name="app_clear_cache_done">Silindi: uygulama kullandıkça yeniden oluşturur</string>
+ <string name="storage_music">Müzik</string>
+ <string name="storage_extras">Kapaklar, sözler ve Canvas</string>
+ <string name="storage_caches">Uygulama önbellekleri</string>
+ <string name="page_downloads_summary">Telefonda ne var ve ne indiriliyor</string>
+ <string name="keep_playing_on_close">Uygulama kapatılınca çalmaya devam et</string>
+ <string name="keep_playing_on_close_note">Square\'i son kullanılanlardan kaydırmak müziği çalar bırakır. Bildirimden yine durdurulur.</string>
+ <string name="page_app_bar">Alt çubuk</string>
+ <string name="page_app_system">Sistem</string>
+ <string name="page_app_storage">Depolama</string>
+ <string name="app_system_settings">Android\'deki uygulama ayarları</string>
+ <string name="app_battery_settings">Pil ayarları</string>
+ <string name="app_clear_list_cache">Kayıtlı çalma listelerini temizle</string>
+ <string name="app_clear_list_cache_done">Temizlendi: açtığında yeniden okunur</string>
<string name="page_about_summary">Sürüm, izinler, lisanslar ve geliştirici</string>
<string name="playing_on">%1$s cihazında çalıyor</string>
<string name="switching">Geçiliyor…</string>
@@ -354,6 +371,15 @@
<string name="glass_refraction_amount">Bükülme</string>
<string name="glass_rim">Kenar ışığı</string>
<string name="glass_film">Film</string>
+ <string name="glass_tint">Renk tonu</string>
+ <string name="page_glass_summary">Malzeme, rengi ve nerede kullanıldığı</string>
+ <string name="glass_group_material">Malzeme</string>
+ <string name="glass_group_colour">Renk</string>
+ <string name="glass_group_edges">Kenarlar</string>
+ <string name="glass_group_where">Nerede kullanılsın</string>
+ <string name="glass_tint_none">Yok</string>
+ <string name="glass_tint_clear">Kaldır</string>
+ <string name="glass_tint_strength">Ton yoğunluğu</string>
<string name="glass_dispersion">Renk ayrışması</string>
<string name="glass_dispersion_note">Kalın camda olduğu gibi, kenarlarda ışığın renklere ayrılması.</string>
<string name="glass_depth">Derinlik</string>
@@ -399,6 +425,8 @@
<string name="download_artist_confirm">%2$s sanatçısından %1$d parça indirilsin mi? Yaklaşık %3$s.</string>
<string name="download_failed_count">%1$d tanesi indirilemedi</string>
<string name="download_retry_failed">Yeniden dene</string>
+ <string name="download_refetch_extras">Kapakları ve sözleri yeniden indir</string>
+ <string name="download_refetch_started">Yeniden isteniyor: indirmeler sürerken gelirler</string>
<string name="downloaded_tracks">İndirilen şarkılar</string>
<string name="offline_mode">Çevrimdışı mod</string>
<string name="offline_mode_note">Yalnızca indirilenleri çal, Spotify\'dan hiçbir şey isteme.</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4e4f09a..2af5df6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -325,8 +325,25 @@
<string name="page_playback">Playback</string>
<string name="page_app">App</string>
<string name="page_account_summary">Your account, the Web API application and signing out</string>
- <string name="page_playback_summary">Where music comes from, quality and crossfade</string>
- <string name="page_app_summary">Language, glass and the bottom bar</string>
+ <string name="page_playback_summary">Where the music comes from, quality and playing</string>
+ <string name="page_app_summary">Language, bar, system and links</string>
+ <string name="page_downloads">Downloads and storage</string>
+ <string name="storage_cleanup">Cleaning up</string>
+ <string name="app_clear_cache">Clear the app\'s caches</string>
+ <string name="app_clear_cache_done">Cleared — the app rebuilds them as it goes</string>
+ <string name="storage_music">Music</string>
+ <string name="storage_extras">Covers, lyrics and Canvases</string>
+ <string name="storage_caches">App caches</string>
+ <string name="page_downloads_summary">What is on the phone, and what is fetched</string>
+ <string name="keep_playing_on_close">Keep playing when the app is closed</string>
+ <string name="keep_playing_on_close_note">Swiping Square out of the recents leaves the music playing. The notification still stops it.</string>
+ <string name="page_app_bar">Bottom bar</string>
+ <string name="page_app_system">System</string>
+ <string name="page_app_storage">Storage</string>
+ <string name="app_system_settings">App settings on Android</string>
+ <string name="app_battery_settings">Battery settings</string>
+ <string name="app_clear_list_cache">Clear the saved playlists</string>
+ <string name="app_clear_list_cache_done">Cleared — they are read again as you open them</string>
<string name="page_about_summary">Version, permissions, licences and the developer</string>
<string name="playing_on">Playing on %1$s</string>
<string name="switching">Switching…</string>
@@ -360,6 +377,15 @@
<string name="glass_refraction_amount">Bend</string>
<string name="glass_rim">Edge light</string>
<string name="glass_film">Film</string>
+ <string name="glass_tint">Tint</string>
+ <string name="page_glass_summary">The material, its colour and where it is used</string>
+ <string name="glass_group_material">Material</string>
+ <string name="glass_group_colour">Colour</string>
+ <string name="glass_group_edges">Edges</string>
+ <string name="glass_group_where">Where it is used</string>
+ <string name="glass_tint_none">None</string>
+ <string name="glass_tint_clear">Clear</string>
+ <string name="glass_tint_strength">Tint strength</string>
<string name="glass_dispersion">Colour splitting</string>
<string name="glass_dispersion_note">Light breaking into colour at the edges, as thick glass does.</string>
<string name="glass_depth">Depth</string>
@@ -405,6 +431,8 @@
<string name="download_artist_confirm">Download %1$d tracks by %2$s? That is about %3$s.</string>
<string name="download_failed_count">%1$d could not be downloaded</string>
<string name="download_retry_failed">Try again</string>
+ <string name="download_refetch_extras">Re-fetch covers and lyrics</string>
+ <string name="download_refetch_started">Asking for them again — they arrive as the downloads run</string>
<string name="downloaded_tracks">Downloaded songs</string>
<string name="offline_mode">Offline mode</string>
<string name="offline_mode_note">Play only what is downloaded, and ask Spotify for nothing.</string>