Code review
- catch CancellationException explicitly - document the deliberate tradeoff of holding the data mutex across the disk write in persist() - migrate hardcoded strings to R.string.* - Store.mutate: use value equality (==) instead of reference (===) - Store.persist: drop the redundant parent.exists() check - ViewModel: drop the Context parameter from publishNow(id) - Screen: memoize extractPreview via remember(post.id) so JSON scanning doesn't run on every recomposition of a row. - Screen: replace hardcoded Color(0xFF...) literals - Screen.formatPublishMoment: delegate the past-tense branch to the existing timeAgoNoDot() helper instead of hand-rolled TimeUnit math.
This commit is contained in:
+13
-3
@@ -168,7 +168,7 @@ class ScheduledPostStore(
|
|||||||
if (idx < 0) return false
|
if (idx < 0) return false
|
||||||
val before = posts[idx]
|
val before = posts[idx]
|
||||||
val after = transform(before)
|
val after = transform(before)
|
||||||
if (after === before) return false
|
if (after == before) return false
|
||||||
posts[idx] = after
|
posts[idx] = after
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
@@ -190,11 +190,21 @@ class ScheduledPostStore(
|
|||||||
_flow.value = posts.toList()
|
_flow.value = posts.toList()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Writes the snapshot to disk *while holding the data mutex*. This is a
|
||||||
|
* deliberate tradeoff: moving the write outside the lock would require a
|
||||||
|
* separate write-mutex (or a sequence number) to preserve write ordering
|
||||||
|
* across concurrent mutations — otherwise an older snapshot can clobber a
|
||||||
|
* newer one if the OS schedules the second write to finish first. For a
|
||||||
|
* file that's a few KB and a single-process owner with infrequent writes,
|
||||||
|
* holding the mutex across the rename is the simpler and correct choice.
|
||||||
|
* Revisit if the store ever grows past a hundred rows or starts seeing
|
||||||
|
* concurrent multi-writer pressure.
|
||||||
|
*/
|
||||||
private fun persist() {
|
private fun persist() {
|
||||||
val snapshot = posts.toList()
|
val snapshot = posts.toList()
|
||||||
_flow.value = snapshot
|
_flow.value = snapshot
|
||||||
val parent = storageFile.parentFile
|
storageFile.parentFile?.mkdirs()
|
||||||
if (parent != null && !parent.exists()) parent.mkdirs()
|
|
||||||
val tmp = File(storageFile.parentFile, storageFile.name + ".tmp")
|
val tmp = File(storageFile.parentFile, storageFile.name + ".tmp")
|
||||||
try {
|
try {
|
||||||
mapper.writeValue(tmp, ScheduledPostFile(version = 1, posts = snapshot))
|
mapper.writeValue(tmp, ScheduledPostFile(version = 1, posts = snapshot))
|
||||||
|
|||||||
+5
@@ -34,6 +34,7 @@ import com.vitorpamplona.amethyst.Amethyst
|
|||||||
import com.vitorpamplona.quartz.nip01Core.core.Event
|
import com.vitorpamplona.quartz.nip01Core.core.Event
|
||||||
import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
|
import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
|
||||||
import com.vitorpamplona.quartz.utils.Log
|
import com.vitorpamplona.quartz.utils.Log
|
||||||
|
import kotlinx.coroutines.CancellationException
|
||||||
import java.util.concurrent.TimeUnit
|
import java.util.concurrent.TimeUnit
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -152,6 +153,8 @@ class ScheduledPostWorker(
|
|||||||
|
|
||||||
store.markSent(post.id)
|
store.markSent(post.id)
|
||||||
Log.d(TAG) { "client.publish(${post.id}) done; marked SENT" }
|
Log.d(TAG) { "client.publish(${post.id}) done; marked SENT" }
|
||||||
|
} catch (e: CancellationException) {
|
||||||
|
throw e
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
Log.e(TAG, "Failed to publish scheduled post ${post.id}", e)
|
Log.e(TAG, "Failed to publish scheduled post ${post.id}", e)
|
||||||
store.markFailed(post.id, e.message)
|
store.markFailed(post.id, e.message)
|
||||||
@@ -160,6 +163,8 @@ class ScheduledPostWorker(
|
|||||||
|
|
||||||
Log.d(TAG) { "doWork() EXIT success" }
|
Log.d(TAG) { "doWork() EXIT success" }
|
||||||
Result.success()
|
Result.success()
|
||||||
|
} catch (e: CancellationException) {
|
||||||
|
throw e
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
Log.e(TAG, "doWork() unexpected failure", e)
|
Log.e(TAG, "doWork() unexpected failure", e)
|
||||||
Result.retry()
|
Result.retry()
|
||||||
|
|||||||
+8
-4
@@ -25,22 +25,26 @@ import androidx.compose.material3.IconButton
|
|||||||
import androidx.compose.material3.MaterialTheme
|
import androidx.compose.material3.MaterialTheme
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.graphics.Color
|
|
||||||
import androidx.compose.ui.unit.dp
|
import androidx.compose.ui.unit.dp
|
||||||
|
import com.vitorpamplona.amethyst.R
|
||||||
import com.vitorpamplona.amethyst.commons.icons.symbols.Icon
|
import com.vitorpamplona.amethyst.commons.icons.symbols.Icon
|
||||||
import com.vitorpamplona.amethyst.commons.icons.symbols.MaterialSymbols
|
import com.vitorpamplona.amethyst.commons.icons.symbols.MaterialSymbols
|
||||||
|
import com.vitorpamplona.amethyst.ui.stringRes
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun ScheduleAtButton(
|
fun ScheduleAtButton(
|
||||||
isActive: Boolean,
|
isActive: Boolean,
|
||||||
onClick: () -> Unit,
|
onClick: () -> Unit,
|
||||||
) {
|
) {
|
||||||
IconButton(onClick = { onClick() }) {
|
IconButton(onClick = onClick) {
|
||||||
Icon(
|
Icon(
|
||||||
symbol = MaterialSymbols.Schedule,
|
symbol = MaterialSymbols.Schedule,
|
||||||
contentDescription = if (isActive) "Cancel scheduling" else "Schedule post",
|
contentDescription =
|
||||||
|
stringRes(
|
||||||
|
if (isActive) R.string.schedule_post_button_remove else R.string.schedule_post_button_add,
|
||||||
|
),
|
||||||
modifier = Modifier.size(20.dp),
|
modifier = Modifier.size(20.dp),
|
||||||
tint = if (isActive) Color(0xFF1E88E5) else MaterialTheme.colorScheme.onBackground,
|
tint = if (isActive) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.onBackground,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+24
-20
@@ -20,6 +20,7 @@
|
|||||||
*/
|
*/
|
||||||
package com.vitorpamplona.amethyst.ui.note.creators.scheduling
|
package com.vitorpamplona.amethyst.ui.note.creators.scheduling
|
||||||
|
|
||||||
|
import android.text.format.DateFormat
|
||||||
import androidx.compose.foundation.layout.Column
|
import androidx.compose.foundation.layout.Column
|
||||||
import androidx.compose.foundation.layout.Row
|
import androidx.compose.foundation.layout.Row
|
||||||
import androidx.compose.foundation.layout.Spacer
|
import androidx.compose.foundation.layout.Spacer
|
||||||
@@ -49,14 +50,15 @@ import androidx.compose.runtime.remember
|
|||||||
import androidx.compose.runtime.setValue
|
import androidx.compose.runtime.setValue
|
||||||
import androidx.compose.ui.Alignment
|
import androidx.compose.ui.Alignment
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.graphics.Color
|
|
||||||
import androidx.compose.ui.platform.LocalContext
|
import androidx.compose.ui.platform.LocalContext
|
||||||
import androidx.compose.ui.text.font.FontWeight
|
import androidx.compose.ui.text.font.FontWeight
|
||||||
import androidx.compose.ui.unit.dp
|
import androidx.compose.ui.unit.dp
|
||||||
import androidx.compose.ui.unit.sp
|
import androidx.compose.ui.unit.sp
|
||||||
|
import com.vitorpamplona.amethyst.R
|
||||||
import com.vitorpamplona.amethyst.commons.icons.symbols.Icon
|
import com.vitorpamplona.amethyst.commons.icons.symbols.Icon
|
||||||
import com.vitorpamplona.amethyst.commons.icons.symbols.MaterialSymbols
|
import com.vitorpamplona.amethyst.commons.icons.symbols.MaterialSymbols
|
||||||
import com.vitorpamplona.amethyst.ui.note.timeAheadNoDot
|
import com.vitorpamplona.amethyst.ui.note.timeAheadNoDot
|
||||||
|
import com.vitorpamplona.amethyst.ui.stringRes
|
||||||
import com.vitorpamplona.amethyst.ui.theme.DividerThickness
|
import com.vitorpamplona.amethyst.ui.theme.DividerThickness
|
||||||
import com.vitorpamplona.amethyst.ui.theme.placeholderText
|
import com.vitorpamplona.amethyst.ui.theme.placeholderText
|
||||||
import com.vitorpamplona.quartz.utils.TimeUtils
|
import com.vitorpamplona.quartz.utils.TimeUtils
|
||||||
@@ -98,15 +100,15 @@ fun ScheduleAtPicker(
|
|||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
|
val context = LocalContext.current
|
||||||
|
|
||||||
val timePickerState =
|
val timePickerState =
|
||||||
rememberTimePickerState(
|
rememberTimePickerState(
|
||||||
initialHour = currentTime.hour,
|
initialHour = currentTime.hour,
|
||||||
initialMinute = currentTime.minute,
|
initialMinute = currentTime.minute,
|
||||||
is24Hour = false,
|
is24Hour = DateFormat.is24HourFormat(context),
|
||||||
)
|
)
|
||||||
|
|
||||||
val context = LocalContext.current
|
|
||||||
|
|
||||||
Column(Modifier.fillMaxWidth()) {
|
Column(Modifier.fillMaxWidth()) {
|
||||||
Row(
|
Row(
|
||||||
verticalAlignment = Alignment.CenterVertically,
|
verticalAlignment = Alignment.CenterVertically,
|
||||||
@@ -117,13 +119,13 @@ fun ScheduleAtPicker(
|
|||||||
) {
|
) {
|
||||||
Icon(
|
Icon(
|
||||||
symbol = MaterialSymbols.Timer,
|
symbol = MaterialSymbols.Timer,
|
||||||
contentDescription = "Scheduled time",
|
contentDescription = stringRes(R.string.schedule_post_time_label),
|
||||||
modifier = Modifier.size(20.dp),
|
modifier = Modifier.size(20.dp),
|
||||||
tint = Color(0xFF1E88E5),
|
tint = MaterialTheme.colorScheme.primary,
|
||||||
)
|
)
|
||||||
|
|
||||||
Text(
|
Text(
|
||||||
text = "Schedule",
|
text = stringRes(R.string.schedule_post),
|
||||||
fontSize = 20.sp,
|
fontSize = 20.sp,
|
||||||
fontWeight = FontWeight.W500,
|
fontWeight = FontWeight.W500,
|
||||||
modifier = Modifier.padding(start = 10.dp),
|
modifier = Modifier.padding(start = 10.dp),
|
||||||
@@ -133,7 +135,7 @@ fun ScheduleAtPicker(
|
|||||||
HorizontalDivider(thickness = DividerThickness)
|
HorizontalDivider(thickness = DividerThickness)
|
||||||
|
|
||||||
Text(
|
Text(
|
||||||
text = "Posts publish within ~15 minutes of the scheduled time.",
|
text = stringRes(R.string.schedule_post_helper),
|
||||||
color = MaterialTheme.colorScheme.placeholderText,
|
color = MaterialTheme.colorScheme.placeholderText,
|
||||||
modifier = Modifier.padding(vertical = 10.dp),
|
modifier = Modifier.padding(vertical = 10.dp),
|
||||||
)
|
)
|
||||||
@@ -150,14 +152,14 @@ fun ScheduleAtPicker(
|
|||||||
modifier = Modifier.padding(16.dp),
|
modifier = Modifier.padding(16.dp),
|
||||||
verticalAlignment = Alignment.CenterVertically,
|
verticalAlignment = Alignment.CenterVertically,
|
||||||
) {
|
) {
|
||||||
Icon(MaterialSymbols.Timer, contentDescription = "Pick scheduled time")
|
Icon(MaterialSymbols.Timer, contentDescription = stringRes(R.string.schedule_post_pick_time))
|
||||||
Spacer(Modifier.width(12.dp))
|
Spacer(Modifier.width(12.dp))
|
||||||
|
|
||||||
if (scheduledForSec < TimeUtils.oneMinuteFromNow()) {
|
if (scheduledForSec < TimeUtils.oneMinuteFromNow()) {
|
||||||
Text("Schedule for…", style = MaterialTheme.typography.bodyLarge)
|
Text(stringRes(R.string.schedule_post_pick_label), style = MaterialTheme.typography.bodyLarge)
|
||||||
} else {
|
} else {
|
||||||
Text(
|
Text(
|
||||||
text = "Publishes in ${timeAheadNoDot(scheduledForSec, context)}",
|
text = stringRes(R.string.schedule_post_publishes_in, timeAheadNoDot(scheduledForSec, context)),
|
||||||
style = MaterialTheme.typography.bodyLarge,
|
style = MaterialTheme.typography.bodyLarge,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
@@ -172,7 +174,7 @@ fun ScheduleAtPicker(
|
|||||||
TextButton(onClick = {
|
TextButton(onClick = {
|
||||||
showDatePicker = false
|
showDatePicker = false
|
||||||
showTimePicker = true
|
showTimePicker = true
|
||||||
}) { Text("Next") }
|
}) { Text(stringRes(R.string.next)) }
|
||||||
},
|
},
|
||||||
) {
|
) {
|
||||||
DatePicker(state = datePickerState)
|
DatePicker(state = datePickerState)
|
||||||
@@ -181,7 +183,7 @@ fun ScheduleAtPicker(
|
|||||||
|
|
||||||
if (showTimePicker) {
|
if (showTimePicker) {
|
||||||
TimePickerDialog(
|
TimePickerDialog(
|
||||||
title = { Text("Time") },
|
title = { Text(stringRes(R.string.schedule_post_picker_time_title)) },
|
||||||
onDismissRequest = { showTimePicker = false },
|
onDismissRequest = { showTimePicker = false },
|
||||||
confirmButton = {
|
confirmButton = {
|
||||||
TextButton(
|
TextButton(
|
||||||
@@ -199,7 +201,7 @@ fun ScheduleAtPicker(
|
|||||||
onChanged(roundUpToNextQuarterHour(rawSec))
|
onChanged(roundUpToNextQuarterHour(rawSec))
|
||||||
showTimePicker = false
|
showTimePicker = false
|
||||||
},
|
},
|
||||||
) { Text("Confirm") }
|
) { Text(stringRes(R.string.confirm)) }
|
||||||
},
|
},
|
||||||
) {
|
) {
|
||||||
TimePicker(state = timePickerState)
|
TimePicker(state = timePickerState)
|
||||||
@@ -225,7 +227,7 @@ private fun ReliabilityWarning(hasMultipleAccounts: Boolean) {
|
|||||||
tint = MaterialTheme.colorScheme.onErrorContainer,
|
tint = MaterialTheme.colorScheme.onErrorContainer,
|
||||||
)
|
)
|
||||||
Text(
|
Text(
|
||||||
text = "Always-on notifications disabled",
|
text = stringRes(R.string.schedule_post_warning_title),
|
||||||
fontWeight = FontWeight.Bold,
|
fontWeight = FontWeight.Bold,
|
||||||
color = MaterialTheme.colorScheme.onErrorContainer,
|
color = MaterialTheme.colorScheme.onErrorContainer,
|
||||||
modifier = Modifier.padding(start = 8.dp),
|
modifier = Modifier.padding(start = 8.dp),
|
||||||
@@ -233,11 +235,13 @@ private fun ReliabilityWarning(hasMultipleAccounts: Boolean) {
|
|||||||
}
|
}
|
||||||
Text(
|
Text(
|
||||||
text =
|
text =
|
||||||
if (hasMultipleAccounts) {
|
stringRes(
|
||||||
"Scheduled posts may not publish until you reopen the app. Other accounts' scheduled posts won't fire while this account is active. Enable always-on in Settings → UI Preferences for reliable background scheduling."
|
if (hasMultipleAccounts) {
|
||||||
} else {
|
R.string.schedule_post_warning_multi
|
||||||
"Scheduled posts may not publish until you next reopen the app. Enable always-on in Settings → UI Preferences for reliable background scheduling."
|
} else {
|
||||||
},
|
R.string.schedule_post_warning_single
|
||||||
|
},
|
||||||
|
),
|
||||||
color = MaterialTheme.colorScheme.onErrorContainer,
|
color = MaterialTheme.colorScheme.onErrorContainer,
|
||||||
modifier = Modifier.padding(top = 6.dp),
|
modifier = Modifier.padding(top = 6.dp),
|
||||||
)
|
)
|
||||||
|
|||||||
+6
-6
@@ -409,13 +409,13 @@ private fun NewPostScreenBody(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
val alwaysOnEnabled by accountViewModel.account.settings.alwaysOnNotificationService
|
||||||
|
.collectAsStateWithLifecycle()
|
||||||
|
val savedAccounts by com.vitorpamplona.amethyst.LocalPreferences
|
||||||
|
.accountsFlow()
|
||||||
|
.collectAsStateWithLifecycle()
|
||||||
|
val hasMultipleAccounts = (savedAccounts?.size ?: 0) > 1
|
||||||
postViewModel.scheduledForSec?.let { current ->
|
postViewModel.scheduledForSec?.let { current ->
|
||||||
val alwaysOnEnabled by accountViewModel.account.settings.alwaysOnNotificationService
|
|
||||||
.collectAsStateWithLifecycle()
|
|
||||||
val savedAccounts by com.vitorpamplona.amethyst.LocalPreferences
|
|
||||||
.accountsFlow()
|
|
||||||
.collectAsStateWithLifecycle()
|
|
||||||
val hasMultipleAccounts = (savedAccounts?.size ?: 0) > 1
|
|
||||||
Row(
|
Row(
|
||||||
verticalAlignment = CenterVertically,
|
verticalAlignment = CenterVertically,
|
||||||
modifier = Modifier.padding(vertical = Size10dp, horizontal = Size10dp),
|
modifier = Modifier.padding(vertical = Size10dp, horizontal = Size10dp),
|
||||||
|
|||||||
+41
-68
@@ -49,23 +49,26 @@ import androidx.compose.runtime.remember
|
|||||||
import androidx.compose.runtime.setValue
|
import androidx.compose.runtime.setValue
|
||||||
import androidx.compose.ui.Alignment
|
import androidx.compose.ui.Alignment
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.graphics.Color
|
|
||||||
import androidx.compose.ui.platform.LocalContext
|
import androidx.compose.ui.platform.LocalContext
|
||||||
import androidx.compose.ui.text.font.FontWeight
|
import androidx.compose.ui.text.font.FontWeight
|
||||||
import androidx.compose.ui.text.style.TextOverflow
|
import androidx.compose.ui.text.style.TextOverflow
|
||||||
import androidx.compose.ui.unit.dp
|
import androidx.compose.ui.unit.dp
|
||||||
import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
||||||
import androidx.lifecycle.viewmodel.compose.viewModel
|
import androidx.lifecycle.viewmodel.compose.viewModel
|
||||||
|
import com.vitorpamplona.amethyst.R
|
||||||
import com.vitorpamplona.amethyst.commons.icons.symbols.Icon
|
import com.vitorpamplona.amethyst.commons.icons.symbols.Icon
|
||||||
import com.vitorpamplona.amethyst.commons.icons.symbols.MaterialSymbols
|
import com.vitorpamplona.amethyst.commons.icons.symbols.MaterialSymbols
|
||||||
import com.vitorpamplona.amethyst.service.scheduledposts.ScheduledPost
|
import com.vitorpamplona.amethyst.service.scheduledposts.ScheduledPost
|
||||||
import com.vitorpamplona.amethyst.service.scheduledposts.ScheduledPostStatus
|
import com.vitorpamplona.amethyst.service.scheduledposts.ScheduledPostStatus
|
||||||
|
import com.vitorpamplona.amethyst.service.scheduledposts.ScheduledPostWorker
|
||||||
import com.vitorpamplona.amethyst.ui.navigation.navs.INav
|
import com.vitorpamplona.amethyst.ui.navigation.navs.INav
|
||||||
import com.vitorpamplona.amethyst.ui.navigation.topbars.ShorterTopAppBar
|
import com.vitorpamplona.amethyst.ui.navigation.topbars.ShorterTopAppBar
|
||||||
import com.vitorpamplona.amethyst.ui.note.ArrowBackIcon
|
import com.vitorpamplona.amethyst.ui.note.ArrowBackIcon
|
||||||
|
import com.vitorpamplona.amethyst.ui.note.timeAgoNoDot
|
||||||
import com.vitorpamplona.amethyst.ui.note.timeAheadNoDot
|
import com.vitorpamplona.amethyst.ui.note.timeAheadNoDot
|
||||||
import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
|
import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
|
||||||
import java.util.concurrent.TimeUnit
|
import com.vitorpamplona.amethyst.ui.stringRes
|
||||||
|
import com.vitorpamplona.quartz.nip01Core.core.Event
|
||||||
|
|
||||||
@OptIn(ExperimentalMaterial3Api::class)
|
@OptIn(ExperimentalMaterial3Api::class)
|
||||||
@Composable
|
@Composable
|
||||||
@@ -87,7 +90,7 @@ fun ScheduledPostsScreen(
|
|||||||
Scaffold(
|
Scaffold(
|
||||||
topBar = {
|
topBar = {
|
||||||
ShorterTopAppBar(
|
ShorterTopAppBar(
|
||||||
title = { Text("Scheduled posts") },
|
title = { Text(stringRes(R.string.scheduled_posts)) },
|
||||||
navigationIcon = {
|
navigationIcon = {
|
||||||
IconButton(onClick = { nav.popBack() }) { ArrowBackIcon() }
|
IconButton(onClick = { nav.popBack() }) { ArrowBackIcon() }
|
||||||
},
|
},
|
||||||
@@ -115,11 +118,12 @@ fun ScheduledPostsScreen(
|
|||||||
|
|
||||||
pendingPublishId?.let { id ->
|
pendingPublishId?.let { id ->
|
||||||
ConfirmDialog(
|
ConfirmDialog(
|
||||||
title = "Send now?",
|
title = stringRes(R.string.scheduled_posts_send_now_title),
|
||||||
message = "This post will publish to relays immediately. The original schedule will be discarded.",
|
message = stringRes(R.string.scheduled_posts_send_now_message),
|
||||||
confirmLabel = "Send",
|
confirmLabel = stringRes(R.string.scheduled_posts_send_now_confirm),
|
||||||
onConfirm = {
|
onConfirm = {
|
||||||
viewModel.publishNow(id, context)
|
viewModel.publishNow(id)
|
||||||
|
ScheduledPostWorker.scheduleCatchUp(context)
|
||||||
pendingPublishId = null
|
pendingPublishId = null
|
||||||
},
|
},
|
||||||
onDismiss = { pendingPublishId = null },
|
onDismiss = { pendingPublishId = null },
|
||||||
@@ -128,9 +132,9 @@ fun ScheduledPostsScreen(
|
|||||||
|
|
||||||
pendingCancelId?.let { id ->
|
pendingCancelId?.let { id ->
|
||||||
ConfirmDialog(
|
ConfirmDialog(
|
||||||
title = "Delete scheduled post?",
|
title = stringRes(R.string.scheduled_posts_delete_title),
|
||||||
message = "The post will not be published. This cannot be undone.",
|
message = stringRes(R.string.scheduled_posts_delete_message),
|
||||||
confirmLabel = "Delete",
|
confirmLabel = stringRes(R.string.scheduled_posts_delete_confirm),
|
||||||
destructive = true,
|
destructive = true,
|
||||||
onConfirm = {
|
onConfirm = {
|
||||||
viewModel.cancel(id)
|
viewModel.cancel(id)
|
||||||
@@ -148,6 +152,7 @@ private fun ScheduledPostRow(
|
|||||||
onCancel: () -> Unit,
|
onCancel: () -> Unit,
|
||||||
) {
|
) {
|
||||||
val context = LocalContext.current
|
val context = LocalContext.current
|
||||||
|
val preview = remember(post) { extractPreview(post) }
|
||||||
Card(
|
Card(
|
||||||
modifier = Modifier.fillMaxWidth(),
|
modifier = Modifier.fillMaxWidth(),
|
||||||
colors = CardDefaults.outlinedCardColors(),
|
colors = CardDefaults.outlinedCardColors(),
|
||||||
@@ -171,7 +176,7 @@ private fun ScheduledPostRow(
|
|||||||
}
|
}
|
||||||
|
|
||||||
Text(
|
Text(
|
||||||
text = extractPreview(post),
|
text = preview,
|
||||||
style = MaterialTheme.typography.bodyMedium,
|
style = MaterialTheme.typography.bodyMedium,
|
||||||
maxLines = 3,
|
maxLines = 3,
|
||||||
overflow = TextOverflow.Ellipsis,
|
overflow = TextOverflow.Ellipsis,
|
||||||
@@ -179,7 +184,7 @@ private fun ScheduledPostRow(
|
|||||||
|
|
||||||
if (post.status == ScheduledPostStatus.FAILED && post.lastError != null) {
|
if (post.status == ScheduledPostStatus.FAILED && post.lastError != null) {
|
||||||
Text(
|
Text(
|
||||||
text = "Error: ${post.lastError}",
|
text = stringRes(R.string.scheduled_posts_error_prefix, post.lastError),
|
||||||
style = MaterialTheme.typography.bodySmall,
|
style = MaterialTheme.typography.bodySmall,
|
||||||
color = MaterialTheme.colorScheme.error,
|
color = MaterialTheme.colorScheme.error,
|
||||||
maxLines = 2,
|
maxLines = 2,
|
||||||
@@ -194,7 +199,7 @@ private fun ScheduledPostRow(
|
|||||||
IconButton(onClick = onCancel) {
|
IconButton(onClick = onCancel) {
|
||||||
Icon(
|
Icon(
|
||||||
symbol = MaterialSymbols.Delete,
|
symbol = MaterialSymbols.Delete,
|
||||||
contentDescription = "Delete",
|
contentDescription = stringRes(R.string.scheduled_posts_action_delete),
|
||||||
modifier = Modifier.size(22.dp),
|
modifier = Modifier.size(22.dp),
|
||||||
tint = MaterialTheme.colorScheme.error,
|
tint = MaterialTheme.colorScheme.error,
|
||||||
)
|
)
|
||||||
@@ -202,7 +207,7 @@ private fun ScheduledPostRow(
|
|||||||
IconButton(onClick = onPublishNow) {
|
IconButton(onClick = onPublishNow) {
|
||||||
Icon(
|
Icon(
|
||||||
symbol = MaterialSymbols.AutoMirrored.Send,
|
symbol = MaterialSymbols.AutoMirrored.Send,
|
||||||
contentDescription = "Send now",
|
contentDescription = stringRes(R.string.scheduled_posts_action_send_now),
|
||||||
modifier = Modifier.size(22.dp),
|
modifier = Modifier.size(22.dp),
|
||||||
tint = MaterialTheme.colorScheme.primary,
|
tint = MaterialTheme.colorScheme.primary,
|
||||||
)
|
)
|
||||||
@@ -214,17 +219,17 @@ private fun ScheduledPostRow(
|
|||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
private fun StatusChip(status: ScheduledPostStatus) {
|
private fun StatusChip(status: ScheduledPostStatus) {
|
||||||
val (label, tint) =
|
val (labelRes, tint) =
|
||||||
when (status) {
|
when (status) {
|
||||||
ScheduledPostStatus.PENDING -> "Scheduled" to Color(0xFF1E88E5)
|
ScheduledPostStatus.PENDING -> R.string.scheduled_posts_status_pending to MaterialTheme.colorScheme.primary
|
||||||
ScheduledPostStatus.PUBLISHING -> "Sending…" to Color(0xFFFFA000)
|
ScheduledPostStatus.PUBLISHING -> R.string.scheduled_posts_status_publishing to MaterialTheme.colorScheme.tertiary
|
||||||
ScheduledPostStatus.FAILED -> "Failed" to MaterialTheme.colorScheme.error
|
ScheduledPostStatus.FAILED -> R.string.scheduled_posts_status_failed to MaterialTheme.colorScheme.error
|
||||||
ScheduledPostStatus.SENT -> "Sent" to Color(0xFF43A047)
|
ScheduledPostStatus.SENT -> R.string.scheduled_posts_status_sent to MaterialTheme.colorScheme.tertiary
|
||||||
ScheduledPostStatus.CANCELLED -> "Cancelled" to MaterialTheme.colorScheme.onSurfaceVariant
|
ScheduledPostStatus.CANCELLED -> R.string.scheduled_posts_status_cancelled to MaterialTheme.colorScheme.onSurfaceVariant
|
||||||
}
|
}
|
||||||
AssistChip(
|
AssistChip(
|
||||||
onClick = {},
|
onClick = {},
|
||||||
label = { Text(label, fontWeight = FontWeight.Medium) },
|
label = { Text(stringRes(labelRes), fontWeight = FontWeight.Medium) },
|
||||||
colors =
|
colors =
|
||||||
AssistChipDefaults.assistChipColors(
|
AssistChipDefaults.assistChipColors(
|
||||||
labelColor = tint,
|
labelColor = tint,
|
||||||
@@ -249,11 +254,11 @@ private fun EmptyState(modifier: Modifier = Modifier) {
|
|||||||
tint = MaterialTheme.colorScheme.onSurfaceVariant,
|
tint = MaterialTheme.colorScheme.onSurfaceVariant,
|
||||||
)
|
)
|
||||||
Text(
|
Text(
|
||||||
text = "No scheduled posts",
|
text = stringRes(R.string.scheduled_posts_empty_title),
|
||||||
style = MaterialTheme.typography.titleMedium,
|
style = MaterialTheme.typography.titleMedium,
|
||||||
)
|
)
|
||||||
Text(
|
Text(
|
||||||
text = "Compose a note and tap the clock icon to schedule it for later.",
|
text = stringRes(R.string.scheduled_posts_empty_hint),
|
||||||
style = MaterialTheme.typography.bodyMedium,
|
style = MaterialTheme.typography.bodyMedium,
|
||||||
color = MaterialTheme.colorScheme.onSurfaceVariant,
|
color = MaterialTheme.colorScheme.onSurfaceVariant,
|
||||||
)
|
)
|
||||||
@@ -283,60 +288,28 @@ private fun ConfirmDialog(
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
dismissButton = {
|
dismissButton = {
|
||||||
TextButton(onClick = onDismiss) { Text("Cancel") }
|
TextButton(onClick = onDismiss) { Text(stringRes(R.string.cancel)) }
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun extractPreview(post: ScheduledPost): String {
|
private fun extractPreview(post: ScheduledPost): String =
|
||||||
val json = post.signedEventJson
|
runCatching {
|
||||||
val needle = "\"content\":\""
|
Event
|
||||||
val start = json.indexOf(needle)
|
.fromJson(post.signedEventJson)
|
||||||
if (start < 0) return ""
|
.content
|
||||||
val from = start + needle.length
|
.take(200)
|
||||||
val sb = StringBuilder()
|
.trim()
|
||||||
var i = from
|
}.getOrDefault("")
|
||||||
while (i < json.length) {
|
|
||||||
val c = json[i]
|
|
||||||
if (c == '\\' && i + 1 < json.length) {
|
|
||||||
when (json[i + 1]) {
|
|
||||||
'n' -> sb.append('\n')
|
|
||||||
't' -> sb.append('\t')
|
|
||||||
'\\' -> sb.append('\\')
|
|
||||||
'"' -> sb.append('"')
|
|
||||||
else -> sb.append(json[i + 1])
|
|
||||||
}
|
|
||||||
i += 2
|
|
||||||
} else if (c == '"') {
|
|
||||||
break
|
|
||||||
} else {
|
|
||||||
sb.append(c)
|
|
||||||
i++
|
|
||||||
}
|
|
||||||
if (sb.length > 200) break
|
|
||||||
}
|
|
||||||
return sb.toString().trim()
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun formatPublishMoment(
|
private fun formatPublishMoment(
|
||||||
publishAtSec: Long,
|
publishAtSec: Long,
|
||||||
context: android.content.Context,
|
context: android.content.Context,
|
||||||
): String {
|
): String {
|
||||||
val nowSec = System.currentTimeMillis() / 1000
|
val nowSec = System.currentTimeMillis() / 1000
|
||||||
val deltaSec = publishAtSec - nowSec
|
return if (publishAtSec > nowSec) {
|
||||||
return when {
|
stringRes(context, R.string.schedule_post_publishes_in, timeAheadNoDot(publishAtSec, context))
|
||||||
deltaSec > 0 -> {
|
} else {
|
||||||
"Publishes in ${timeAheadNoDot(publishAtSec, context)}"
|
stringRes(context, R.string.schedule_post_was_due, timeAgoNoDot(publishAtSec, context).trim())
|
||||||
}
|
|
||||||
|
|
||||||
else -> {
|
|
||||||
val ago = -deltaSec
|
|
||||||
val mins = TimeUnit.SECONDS.toMinutes(ago)
|
|
||||||
when {
|
|
||||||
mins < 1 -> "Due now"
|
|
||||||
mins < 60 -> "Was due ${mins}m ago"
|
|
||||||
else -> "Was due ${TimeUnit.SECONDS.toHours(ago)}h ago"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-9
@@ -20,14 +20,12 @@
|
|||||||
*/
|
*/
|
||||||
package com.vitorpamplona.amethyst.ui.screen.loggedIn.scheduledposts
|
package com.vitorpamplona.amethyst.ui.screen.loggedIn.scheduledposts
|
||||||
|
|
||||||
import android.content.Context
|
|
||||||
import androidx.lifecycle.ViewModel
|
import androidx.lifecycle.ViewModel
|
||||||
import androidx.lifecycle.viewModelScope
|
import androidx.lifecycle.viewModelScope
|
||||||
import com.vitorpamplona.amethyst.Amethyst
|
import com.vitorpamplona.amethyst.Amethyst
|
||||||
import com.vitorpamplona.amethyst.service.scheduledposts.ScheduledPost
|
import com.vitorpamplona.amethyst.service.scheduledposts.ScheduledPost
|
||||||
import com.vitorpamplona.amethyst.service.scheduledposts.ScheduledPostStatus
|
import com.vitorpamplona.amethyst.service.scheduledposts.ScheduledPostStatus
|
||||||
import com.vitorpamplona.amethyst.service.scheduledposts.ScheduledPostStore
|
import com.vitorpamplona.amethyst.service.scheduledposts.ScheduledPostStore
|
||||||
import com.vitorpamplona.amethyst.service.scheduledposts.ScheduledPostWorker
|
|
||||||
import kotlinx.coroutines.Dispatchers
|
import kotlinx.coroutines.Dispatchers
|
||||||
import kotlinx.coroutines.flow.SharingStarted
|
import kotlinx.coroutines.flow.SharingStarted
|
||||||
import kotlinx.coroutines.flow.StateFlow
|
import kotlinx.coroutines.flow.StateFlow
|
||||||
@@ -70,14 +68,9 @@ class ScheduledPostsViewModel(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fun publishNow(
|
fun publishNow(id: String) {
|
||||||
id: String,
|
|
||||||
context: Context,
|
|
||||||
) {
|
|
||||||
viewModelScope.launch(Dispatchers.IO) {
|
viewModelScope.launch(Dispatchers.IO) {
|
||||||
if (store.publishNow(id)) {
|
store.publishNow(id)
|
||||||
ScheduledPostWorker.scheduleCatchUp(context)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -429,6 +429,35 @@
|
|||||||
<string name="migrate_bookmarks_success">Bookmarks migrated successfully</string>
|
<string name="migrate_bookmarks_success">Bookmarks migrated successfully</string>
|
||||||
<string name="drafts">Drafts</string>
|
<string name="drafts">Drafts</string>
|
||||||
<string name="scheduled_posts">Scheduled posts</string>
|
<string name="scheduled_posts">Scheduled posts</string>
|
||||||
|
<string name="schedule_post">Schedule</string>
|
||||||
|
<string name="schedule_post_time_label">Scheduled time</string>
|
||||||
|
<string name="schedule_post_helper">Posts publish within ~15 minutes of the scheduled time.</string>
|
||||||
|
<string name="schedule_post_pick_time">Pick scheduled time</string>
|
||||||
|
<string name="schedule_post_pick_label">Schedule for…</string>
|
||||||
|
<string name="schedule_post_publishes_in">Publishes in %1$s</string>
|
||||||
|
<string name="schedule_post_was_due">Was due %1$s ago</string>
|
||||||
|
<string name="schedule_post_picker_time_title">Time</string>
|
||||||
|
<string name="schedule_post_button_add">Schedule post</string>
|
||||||
|
<string name="schedule_post_button_remove">Cancel scheduling</string>
|
||||||
|
<string name="schedule_post_warning_title">Always-on notifications disabled</string>
|
||||||
|
<string name="schedule_post_warning_single">Scheduled posts may not publish until you next reopen the app. Enable always-on in Settings → UI Preferences for reliable background scheduling.</string>
|
||||||
|
<string name="schedule_post_warning_multi">Scheduled posts may not publish until you reopen the app. Other accounts\' scheduled posts won\'t fire while this account is active. Enable always-on in Settings → UI Preferences for reliable background scheduling.</string>
|
||||||
|
<string name="scheduled_posts_send_now_title">Send now?</string>
|
||||||
|
<string name="scheduled_posts_send_now_message">This post will publish to relays immediately. The original schedule will be discarded.</string>
|
||||||
|
<string name="scheduled_posts_send_now_confirm">Send</string>
|
||||||
|
<string name="scheduled_posts_delete_title">Delete scheduled post?</string>
|
||||||
|
<string name="scheduled_posts_delete_message">The post will not be published. This cannot be undone.</string>
|
||||||
|
<string name="scheduled_posts_delete_confirm">Delete</string>
|
||||||
|
<string name="scheduled_posts_action_delete">Delete</string>
|
||||||
|
<string name="scheduled_posts_action_send_now">Send now</string>
|
||||||
|
<string name="scheduled_posts_empty_title">No scheduled posts</string>
|
||||||
|
<string name="scheduled_posts_empty_hint">Compose a note and tap the clock icon to schedule it for later.</string>
|
||||||
|
<string name="scheduled_posts_error_prefix">Error: %1$s</string>
|
||||||
|
<string name="scheduled_posts_status_pending">Scheduled</string>
|
||||||
|
<string name="scheduled_posts_status_publishing">Sending…</string>
|
||||||
|
<string name="scheduled_posts_status_failed">Failed</string>
|
||||||
|
<string name="scheduled_posts_status_sent">Sent</string>
|
||||||
|
<string name="scheduled_posts_status_cancelled">Cancelled</string>
|
||||||
<string name="polls">Polls</string>
|
<string name="polls">Polls</string>
|
||||||
<string name="open_polls">Open</string>
|
<string name="open_polls">Open</string>
|
||||||
<string name="closed_polls">Closed</string>
|
<string name="closed_polls">Closed</string>
|
||||||
|
|||||||
Reference in New Issue
Block a user