The widget's foot: a white mark and title, counts of unread, reviews and assigned issues that open their screens, and the phone's runner job; Assigned to you on the dashboard (closes #31) aa627197ec18

<?xml version="1.0" encoding="utf-8"?>

<!-- An envelope, in the hub's 16-unit line icons: the widget's unread count (#31). -->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="16dp" android:height="16dp" android:viewportWidth="16" android:viewportHeight="16">

    <path android:strokeColor="#FFFFFFFF" android:strokeWidth="1.4" android:strokeLineCap="round" android:strokeLineJoin="round"

        android:pathData="M3.5,3.5H12.5A1.5,1.5 0,0 1,14 5V11A1.5,1.5 0,0 1,12.5 12.5H3.5A1.5,1.5 0,0 1,2 11V5A1.5,1.5 0,0 1,3.5 3.5Z" />

    <path android:strokeColor="#FFFFFFFF" android:strokeWidth="1.4" android:strokeLineCap="round" android:strokeLineJoin="round"

        android:pathData="M2.6,4.6L8,8.8L13.4,4.6" />

</vector>

<?xml version="1.0" encoding="utf-8"?>

<!-- An open issue (a ring with its dot), in the hub's 16-unit line icons: the widget's assigned count (#31). -->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="16dp" android:height="16dp" android:viewportWidth="16" android:viewportHeight="16">

    <path android:strokeColor="#FFFFFFFF" android:strokeWidth="1.4"

        android:pathData="M2,8a6,6 0,1 0,12 0a6,6 0,1 0,-12 0" />

    <path android:fillColor="#FFFFFFFF"

        android:pathData="M6.6,8a1.4,1.4 0,1 0,2.8 0a1.4,1.4 0,1 0,-2.8 0" />

</vector>

<?xml version="1.0" encoding="utf-8"?>

<!-- A proposal (two lines joining), in the hub's 16-unit line icons: the widget's reviews count (#31). -->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="16dp" android:height="16dp" android:viewportWidth="16" android:viewportHeight="16">

    <path android:strokeColor="#FFFFFFFF" android:strokeWidth="1.4" android:strokeLineCap="round" android:strokeLineJoin="round"

        android:pathData="M3,3.5a1.5,1.5 0,1 0,3 0a1.5,1.5 0,1 0,-3 0M3,12.5a1.5,1.5 0,1 0,3 0a1.5,1.5 0,1 0,-3 0M10,12.5a1.5,1.5 0,1 0,3 0a1.5,1.5 0,1 0,-3 0" />

    <path android:strokeColor="#FFFFFFFF" android:strokeWidth="1.4" android:strokeLineCap="round" android:strokeLineJoin="round"

        android:pathData="M4.5,5V11M11.5,11V7.5A3,3 0,0 0,8.5 4.5H7M8.5,3L7,4.5L8.5,6" />

</vector>

<?xml version="1.0" encoding="utf-8"?>

<!-- A phone running something, in the hub's 16-unit line icons: the job the phone runs (#31). -->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="16dp" android:height="16dp" android:viewportWidth="16" android:viewportHeight="16">

    <path android:strokeColor="#FFFFFFFF" android:strokeWidth="1.4" android:strokeLineCap="round" android:strokeLineJoin="round"

        android:pathData="M5.5,1.5H10.5A1.5,1.5 0,0 1,12 3V13A1.5,1.5 0,0 1,10.5 14.5H5.5A1.5,1.5 0,0 1,4 13V3A1.5,1.5 0,0 1,5.5 1.5Z" />

    <path android:fillColor="#FFFFFFFF"

        android:pathData="M7,5.6V10.4L10.4,8Z" />

</vector>

## Unreleased

- **The widget's foot (#31):** the OxygenHub mark and title are white on the dark widget, and a row of counts runs along the bottom: an envelope with your unread messages, proposals waiting for your review, and issues assigned to you (from OxygenHub's `GET /user/issues`, oxygenhub#359; a hub without it leaves that count out), each dimmed at zero and opening its screen (the one proposal or issue when there is just one), then, while the phone serves as an OxygenFlow runner, the job it runs, redrawn as that changes. The dashboard gains **Assigned to you**, the same issues, each opening.

import io.oxygenhub.android.widget.WidgetTaps

    /** A screen to open, as a notification or the widget asks: a route of the app's navigation. */

    private val opening = mutableStateOf<Any?>(null)

        if (savedInstanceState == null) opening.value = routeIn(intent)

        routeIn(intent)?.let { opening.value = it }

    /** A land alert's proposal, or the screen a tap on the widget's counts names (#31). */

    private fun routeIn(intent: Intent?): Any? = proposalIn(intent) ?: WidgetTaps.route(intent)

    /** The open issues assigned to the caller, across repositories (#31, oxygenhub#359); a hub before it answers 404. */

    suspend fun userIssues(): List<IssueBrief>

    override suspend fun userIssues(): List<IssueBrief> = get(url("user", "issues"), ListSerializer(IssueBrief.serializer()))

/** An issue in a list across repositories (`GET /user/issues`, oxygenhub#359). */

@Serializable

data class IssueBrief(

    /** `owner/name`. */

    val repository: String,

    val number: Long,

    val title: String = "",

    @SerialName("updated_ms") val updatedMs: Long = 0,

    val url: String = "",

)

import androidx.glance.appwidget.updateAll

import io.oxygenhub.android.widget.HubWidget

import kotlinx.coroutines.runBlocking

                    refreshWidget()

            refreshWidget()

    /** The widget shows what the runner runs (#31): redrawn on this thread when that changes. */

    private fun refreshWidget() {

        runCatching { runBlocking { HubWidget().updateAll(this@RunnerService) } }

    }

import androidx.compose.material.icons.outlined.RadioButtonUnchecked

import io.oxygenhub.android.api.IssueBrief

    onOpenIssue: (IssueBrief) -> Unit = {},

                DashboardContent(d, inbox, onOpenRepository, onAllRepositories, onInbox, onOpenProposal, onOpenIssue)

    onOpenIssue: (IssueBrief) -> Unit = {},

                        Assigned(d, onOpenIssue)

                    Assigned(d, onOpenIssue)

/** Open issues assigned to the account (#31), as the hub's dashboard lists them; each opens. */

private fun Assigned(d: Dashboard, onOpen: (IssueBrief) -> Unit) {

    val list = d.assigned?.takeIf { it.isNotEmpty() } ?: return

    Panel(Modifier.fillMaxWidth(), colors = panelColors(alpha = 0.9f)) {

        Text(

            "Assigned to you · ${list.size}",

            style = MaterialTheme.typography.titleMedium,

            modifier = Modifier.padding(start = 16.dp, top = 16.dp, end = 16.dp, bottom = 4.dp),

        )

        list.forEachIndexed { i, b ->

            if (i > 0) HorizontalDivider()

            ListItem(

                modifier = Modifier.clickable { onOpen(b) },

                colors = ListItemDefaults.colors(containerColor = Color.Transparent),

                leadingContent = { Icon(Icons.Outlined.RadioButtonUnchecked, contentDescription = "Open", tint = LocalStatusColors.current.ok) },

                headlineContent = { Text(b.title, maxLines = 2, overflow = TextOverflow.Ellipsis) },

                supportingContent = { Text("${b.repository} #${b.number} · ${relativeTime(b.updatedMs)}", maxLines = 1, overflow = TextOverflow.Ellipsis) },

            )

        }

    }

}

@Composable

import io.oxygenhub.android.api.IssueBrief

    /** Open issues assigned to the account (#31); null when the hub cannot say. */

    val assigned: List<IssueBrief>? = null,

        // As are the issues assigned to it (a hub before oxygenhub#359 answers 404).

        val assigned = async {

            try {

                api.userIssues()

            } catch (e: CancellationException) {

                throw e

            } catch (_: Exception) {

                null

            }

        }

            assigned = assigned.await(),

    /** A screen to open, as a notification (#20) or the widget (#31) asks; [onOpened] once it is. */

    open: Any? = null,

                    onOpenIssue = { nav.navigate(IssueRoute(it.repository.substringBefore('/'), it.repository.substringAfter('/'), it.number)) },

                nav.navigate(it) { launchSingleTop = true }

import android.content.Intent

import androidx.glance.ColorFilter

import androidx.glance.action.Action

import androidx.glance.action.ActionParameters

import androidx.glance.action.actionParametersOf

import io.oxygenhub.android.api.IssueBrief

import io.oxygenhub.android.api.ProposalBrief

import io.oxygenhub.android.runner.PhoneRunner

import io.oxygenhub.android.ui.nav.AccountRoute

import io.oxygenhub.android.ui.nav.DashboardRoute

import io.oxygenhub.android.ui.nav.InboxRoute

import io.oxygenhub.android.ui.nav.IssueRoute

import io.oxygenhub.android.ui.nav.ProposalRoute

    /** The one proposal waiting for review, when there is just one: a tap opens it (#31). */

    val onlyReview: ProposalBrief? = null,

    /** Open issues assigned to you (#31); null when the hub cannot say. */

    val assigned: Int? = null,

    /** The one assigned issue, when there is just one: a tap opens it. */

    val onlyAssigned: IssueBrief? = null,

    /** What the phone runs as an OxygenFlow runner while it serves (#31); null when it is not serving. */

    val runnerJobs: List<String>? = null,

        /**

         * Each part on its own: one the hub cannot give is left out, not the

         * whole widget. [runnerJobs] is what this phone's runner runs, null

         * when it is not serving.

         */

        suspend fun load(api: HubApi?, runnerJobs: List<String>? = null): WidgetData = coroutineScope {

            val reviews = async { quietly { api.userProposals().review } }

            val assigned = async { quietly { api.userIssues() } }

            val review = reviews.await()

            val issues = assigned.await()

            WidgetData(

                signedIn = true,

                runs = runs.await().orEmpty().take(MAX_RUNS),

                unread = unread.await(),

                reviews = review?.size,

                sky = sky.await(),

                onlyReview = review?.singleOrNull(),

                assigned = issues?.size,

                onlyAssigned = issues?.singleOrNull(),

                runnerJobs = runnerJobs,

            )

        /** What this phone's runner runs, for [load]: null unless it is serving. */

        fun runnerJobs(): List<String>? = when (PhoneRunner.state.value) {

            PhoneRunner.State.Running, is PhoneRunner.State.Draining, is PhoneRunner.State.Leaving -> PhoneRunner.jobs.value

            else -> null

        }

 * sky is drawn behind it, at the widget's own size (#30); a row of counts

 * and the phone's runner job runs along its foot (#31).

        val data = WidgetData.load(api, WidgetData.runnerJobs())

/**

 * Where a tap on the widget's counts goes (#31): the extras it puts on the

 * app's intent, and the screen they name.

 */

object WidgetTaps {

    const val OPEN = "io.oxygenhub.android.widget.open"

    const val REPOSITORY = "io.oxygenhub.android.widget.repository"

    const val NUMBER = "io.oxygenhub.android.widget.number"

    /** The screen an intent's extras name, or null for none (the app opens as it would). */

    fun route(open: String?, repository: String?, number: Long): Any? {

        val owner = repository?.substringBefore('/', "")?.takeIf { it.isNotEmpty() }

        val name = repository?.substringAfter('/', "")?.takeIf { it.isNotEmpty() }

        return when (open) {

            "inbox" -> InboxRoute

            "dashboard" -> DashboardRoute

            "account" -> AccountRoute

            "proposal" -> if (owner != null && name != null && number > 0) ProposalRoute(owner, name, number) else DashboardRoute

            "issue" -> if (owner != null && name != null && number > 0) IssueRoute(owner, name, number) else DashboardRoute

            else -> null

        }

    }

    fun route(intent: Intent?): Any? =

        intent?.let { route(it.getStringExtra(OPEN), it.getStringExtra(REPOSITORY), it.getLongExtra(NUMBER, 0)) }

    internal fun action(open: String, repository: String? = null, number: Long = 0) = actionStartActivity<MainActivity>(

        actionParametersOf(

            ActionParameters.Key<String>(OPEN) to open,

            ActionParameters.Key<String>(REPOSITORY) to (repository ?: ""),

            ActionParameters.Key<Long>(NUMBER) to number,

        ),

    )

}

/** The mark and the title: white on the dark widget, the text colour on the light one (#31). */

private val headline = ColorProvider(LightColorScheme.onSurface, Color.White)

    val title = TextStyle(color = headline, fontSize = 15.sp, fontWeight = FontWeight.Bold)

    Column(GlanceModifier.fillMaxSize()) {

            Image(

                ImageProvider(R.drawable.mark),

                contentDescription = null,

                colorFilter = ColorFilter.tint(headline),

                modifier = GlanceModifier.size(width = 28.dp, height = 14.dp),

            )

        }

        Spacer(GlanceModifier.defaultWeight())

        Counts(d)

    }

}

/**

 * The row along the bottom (#31): unread messages, proposals to review and

 * issues assigned, each an icon and its number (dimmed at zero, left out

 * when the hub cannot say), then what the phone runs while it serves as a

 * runner. Each opens its screen in the app.

 */

@Composable

private fun Counts(d: WidgetData) {

    Row(GlanceModifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) {

        d.unread?.let { Count(R.drawable.widget_inbox, "unread", it, WidgetTaps.action("inbox")) }

        d.reviews?.let { n ->

            val r = d.onlyReview

            Count(R.drawable.widget_proposal, "to review", n.toLong(), if (r != null) WidgetTaps.action("proposal", r.repository, r.number) else WidgetTaps.action("dashboard"))

        }

        d.assigned?.let { n ->

            val i = d.onlyAssigned

            Count(R.drawable.widget_issue, "assigned", n.toLong(), if (i != null) WidgetTaps.action("issue", i.repository, i.number) else WidgetTaps.action("dashboard"))

        d.runnerJobs?.let { jobs ->

            Row(GlanceModifier.defaultWeight().clickable(WidgetTaps.action("account")), verticalAlignment = Alignment.CenterVertically) {

                Image(ImageProvider(R.drawable.widget_runner), contentDescription = "This phone runs", colorFilter = ColorFilter.tint(ok), modifier = GlanceModifier.size(14.dp))

                Spacer(GlanceModifier.width(4.dp))

                Text(runnerLine(jobs), style = TextStyle(color = GlanceTheme.colors.onSurface, fontSize = 12.sp), maxLines = 1)

            }

    }

}

/** What the runner part of the row says: the job, how many, or that it waits. */

internal fun runnerLine(jobs: List<String>): String = when (jobs.size) {

    0 -> "Waiting for jobs"

    1 -> jobs[0]

    else -> "${jobs.size} jobs"

}

@Composable

private fun Count(icon: Int, what: String, n: Long, open: Action) {

    val colour = if (n == 0L) GlanceTheme.colors.onSurfaceVariant else headline

    Row(GlanceModifier.padding(end = 14.dp).clickable(open), verticalAlignment = Alignment.CenterVertically) {

        Image(ImageProvider(icon), contentDescription = "$n $what", colorFilter = ColorFilter.tint(colour), modifier = GlanceModifier.size(14.dp))

        Spacer(GlanceModifier.width(4.dp))

        Text("$n", style = TextStyle(color = colour, fontSize = 13.sp, fontWeight = FontWeight.Bold))

    var userIssues: () -> List<io.oxygenhub.android.api.IssueBrief> = {

        listOf(io.oxygenhub.android.api.IssueBrief("andymccall/oxygenhub", 359, "GET /user/issues"))

    }

    override suspend fun userIssues() = userIssues.invoke().also { calls += "user issues" }

import io.oxygenhub.android.api.IssueBrief

import io.oxygenhub.android.ui.nav.AccountRoute

import io.oxygenhub.android.ui.nav.DashboardRoute

import io.oxygenhub.android.ui.nav.InboxRoute

import io.oxygenhub.android.ui.nav.IssueRoute

import io.oxygenhub.android.ui.nav.ProposalRoute

import io.oxygenhub.android.widget.WidgetTaps

import io.oxygenhub.android.widget.runnerLine

    @Test

    fun theCountsRowSaysWhatIsAssignedAndOneOfAKindOpensItself() = runTest {

        val api = FakeHubApi()

        val d = WidgetData.load(api)

        assertEquals(1, d.assigned)

        assertEquals(359L, d.onlyAssigned?.number)

        assertEquals(300L, d.onlyReview?.number)

        api.userIssues = { listOf(IssueBrief("andy/a", 1), IssueBrief("andy/a", 2)) }

        val two = WidgetData.load(api)

        assertEquals(2, two.assigned)

        assertNull("two open the dashboard, not one of them", two.onlyAssigned)

        api.userIssues = { throw HubException.Http(404, "no such API route") }

        val old = WidgetData.load(api)

        assertNull("a hub before /user/issues: the count is left out", old.assigned)

        assertEquals(1, old.reviews)

    }

    @Test

    fun theRunnerShowsOnlyWhileThePhoneServes() = runTest {

        val api = FakeHubApi()

        assertNull(WidgetData.load(api).runnerJobs)

        assertEquals(listOf("andy/a #7 test"), WidgetData.load(api, listOf("andy/a #7 test")).runnerJobs)

        assertEquals("Waiting for jobs", runnerLine(emptyList()))

        assertEquals("andy/a #7 test", runnerLine(listOf("andy/a #7 test")))

        assertEquals("2 jobs", runnerLine(listOf("andy/a #7 test", "andy/b #2 build")))

    }

    @Test

    fun aTapOnACountOpensItsScreen() {

        assertEquals(InboxRoute, WidgetTaps.route("inbox", "", 0))

        assertEquals(DashboardRoute, WidgetTaps.route("dashboard", "", 0))

        assertEquals(AccountRoute, WidgetTaps.route("account", "", 0))

        assertEquals(ProposalRoute("andy", "a", 3), WidgetTaps.route("proposal", "andy/a", 3))

        assertEquals(IssueRoute("andy", "a", 4), WidgetTaps.route("issue", "andy/a", 4))

        assertEquals("a broken reference falls back to the dashboard", DashboardRoute, WidgetTaps.route("issue", "nonsense", 4))

        assertNull("not from the widget", WidgetTaps.route(null, null, 0))

    }