A proposal's files and their diffs: Files changed from its Changes section, the change screen's diff list shared (refs #4) 40ab4df121e0

package io.oxygenhub.android.ui.proposals

import androidx.compose.foundation.lazy.LazyColumn

import androidx.compose.material.icons.Icons

import androidx.compose.material.icons.outlined.Description

import androidx.compose.runtime.Composable

import androidx.compose.runtime.getValue

import androidx.compose.runtime.mutableStateOf

import androidx.compose.runtime.saveable.rememberSaveable

import androidx.compose.runtime.setValue

import androidx.lifecycle.ViewModel

import androidx.lifecycle.compose.collectAsStateWithLifecycle

import io.oxygenhub.android.api.FileChange

import io.oxygenhub.android.api.HubApi

import io.oxygenhub.android.ui.code.fileDiffs

import io.oxygenhub.android.ui.code.openByDefault

import io.oxygenhub.android.ui.common.AppScreen

import io.oxygenhub.android.ui.common.EmptyState

import io.oxygenhub.android.ui.common.Load

import io.oxygenhub.android.ui.common.LoadContent

import io.oxygenhub.android.ui.common.load

import io.oxygenhub.android.ui.theme.LocalStatusColors

import kotlinx.coroutines.Job

import kotlinx.coroutines.flow.MutableStateFlow

import kotlinx.coroutines.flow.StateFlow

import kotlinx.coroutines.flow.asStateFlow

/** The files a proposal changes, each with its diff (#4). */

class ProposalFilesViewModel(private val api: HubApi, val owner: String, val name: String, val number: Long) : ViewModel() {

    private val _state = MutableStateFlow<Load<List<FileChange>>>(Load.Loading)

    val state: StateFlow<Load<List<FileChange>>> = _state.asStateFlow()

    private var job: Job? = null

    init {

        refresh()

    }

    fun refresh() {

        job = load(_state, job) { api.proposalDiff(owner, name, number) }

    }

}

/** A proposal's files, as its page on the hub shows them: each folds open to its diff. */

@Composable

fun ProposalFilesScreen(vm: ProposalFilesViewModel, onBack: () -> Unit) {

    val state by vm.state.collectAsStateWithLifecycle()

    val status = LocalStatusColors.current

    AppScreen(title = "Files · #${vm.number}", subtitle = "${vm.owner}/${vm.name}", onBack = onBack) {

        LoadContent(state, onRefresh = vm::refresh) { files ->

            if (files.isEmpty()) {

                EmptyState(Icons.Outlined.Description, "No files changed", "This proposal's changes are already on its target, or change nothing.")

                return@LoadContent

            }

            var open by rememberSaveable(vm.number) { mutableStateOf(openByDefault(files).toList()) }

            LazyColumn {

                fileDiffs(

                    files,

                    open,

                    status.ok,

                    status.bad,

                    onToggle = { path -> open = if (path in open) open - path else open + path },

                    onOpen = { null },

                )

            }

        }

    }

}

package io.oxygenhub.android.ui

import io.oxygenhub.android.FakeHubApi

import io.oxygenhub.android.MainDispatcherRule

import io.oxygenhub.android.api.DiffLine

import io.oxygenhub.android.api.FileChange

import io.oxygenhub.android.api.HubException

import io.oxygenhub.android.ui.common.Load

import io.oxygenhub.android.ui.proposals.ProposalFilesViewModel

import org.junit.Assert.assertEquals

import org.junit.Assert.assertTrue

import org.junit.Rule

import org.junit.Test

class ProposalFilesTest {

    @get:Rule val main = MainDispatcherRule()

    private val api = FakeHubApi()

    @Test

    fun aProposalsFilesComeWithTheirDiffs() {

        api.proposalDiff = {

            listOf(FileChange(path = "a.txt", kind = "modified", added = 1, lines = listOf(DiffLine("context", 1, 1, "a"), DiffLine("add", null, 2, "A"))))

        }

        val files = (ProposalFilesViewModel(api, "andy", "demo", 2).state.value as Load.Ready).value

        assertEquals(listOf("a.txt"), files.map { it.path })

        assertEquals(listOf("context", "add"), files[0].lines.map { it.kind })

        assertTrue("proposalDiff" in api.calls)

    }

    @Test

    fun aHubWithoutTheDiffSaysSo() {

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

        assertTrue(ProposalFilesViewModel(api, "andy", "demo", 2).state.value is Load.Failed)

    }

}

- **A proposal's files and their diffs (#4):** a proposal's Changes section opens Files changed: each file it changes, folding open to its diff (old and new line numbers, added and removed lines tinted), as its page on the hub shows them, from the hub's `GET …/proposals/N/diff` (OxygenHub 0.9.10). The change screen and this one share the same diff list.

    /** The files a proposal changes, each with its diff, as the proposal page shows them (#4). */

    suspend fun proposalDiff(owner: String, name: String, number: Long): List<FileChange>

    override suspend fun proposalDiff(owner: String, name: String, number: Long): List<FileChange> =

        get(url("repos", owner, name, "proposals", number.toString(), "diff"), ListSerializer(FileChange.serializer()))

import androidx.compose.foundation.lazy.LazyListScope

                fileDiffs(

                    d.files,

                    open,

                    status.ok,

                    status.bad,

                    onToggle = { path -> open = if (path in open) open - path else open + path },

                    onOpen = { f -> if (f.kind != "removed") ({ onOpenFile(f.path) }) else null },

                )

            }

        }

    }

}

/**

 * Files with their diffs, each folding open on a tap (a change's, or a

 * proposal's, #4): [open] holds the paths shown open; [onOpen] gives a

 * file's way to open it, if it has one.

 */

fun LazyListScope.fileDiffs(

    files: List<FileChange>,

    open: List<String>,

    added: Color,

    removed: Color,

    onToggle: (String) -> Unit,

    onOpen: (FileChange) -> (() -> Unit)?,

) {

    files.forEach { f ->

        val expanded = f.path in open

        item(key = f.path) { FileRow(f, expanded, added, removed, onToggle = { onToggle(f.path) }, onOpen = onOpen(f)) }

        if (expanded) {

            val numbers = f.lines.maxOfOrNull { maxOf(it.old ?: 0, it.new ?: 0) }?.toString()?.length ?: 1

            itemsIndexed(f.lines, key = { i, _ -> "${f.path}\u0000$i" }) { _, l -> DiffRow(l, numbers, added, removed) }

            if (f.lines.isEmpty() || f.truncated) {

                item(key = "${f.path}\u0000end") {

                    Text(

                        if (f.truncated) "The diff goes on; open the file to see it whole." else "No lines changed (${f.kind}).",

                        modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),

                        style = MaterialTheme.typography.bodySmall,

                        color = MaterialTheme.colorScheme.onSurfaceVariant,

                    )

            item(key = "${f.path}\u0000rule") { HorizontalDivider() }

import io.oxygenhub.android.ui.proposals.ProposalFilesScreen

import io.oxygenhub.android.ui.proposals.ProposalFilesViewModel

/** A proposal's files with their diffs (#4). */

@Serializable data class ProposalFilesRoute(val owner: String, val name: String, val number: Long)

                    onOpenFiles = { nav.navigate(ProposalFilesRoute(r.owner, r.name, r.number)) },

            }

            composable<ProposalFilesRoute> { e ->

                val r = e.toRoute<ProposalFilesRoute>()

                ProposalFilesScreen(rememberViewModel { ProposalFilesViewModel(api, r.owner, r.name, r.number) }, onBack = { nav.popBackStack() })

import androidx.compose.material.icons.automirrored.outlined.KeyboardArrowRight

fun ProposalScreen(vm: ProposalViewModel, canWrite: Boolean, onBack: () -> Unit, onSignInAgain: () -> Unit, onOpenFiles: () -> Unit = {}) {

                    Changes(page.proposal, onOpenFiles)

private fun Changes(p: Proposal, onOpenFiles: () -> Unit) {

            // Its files and their diffs, as the proposal page shows them (#4).

            ListItem(

                modifier = Modifier.clickable(onClick = onOpenFiles),

                headlineContent = { Text("Files changed") },

                supportingContent = { Text("Each file with its diff") },

                trailingContent = { Icon(Icons.AutoMirrored.Outlined.KeyboardArrowRight, contentDescription = null) },

            )

            HorizontalDivider()

import io.oxygenhub.android.api.FileChange

    var proposalDiff: () -> List<FileChange> = { emptyList() }

    override suspend fun proposalDiff(owner: String, name: String, number: Long): List<FileChange> =

        proposalDiff.invoke().also { calls += "proposalDiff" }