Julian/Gitnuro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update UI MultiCommitChanges

Browse Source
This commit is contained in:
dizyaa 2023-01-29 00:42:02 +04:00
parent bbc8132406
commit 0a7741423d
1 changed files with 44 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/main/kotlin/com/jetpackduba/gitnuro/ui/changes/MultiCommitChanges.kt
View File

@ -21,12 +21,15 @@ import androidx.compose.ui.text.buildAnnotatedString
import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import com.jetpackduba.gitnuro.extensions.filePath
import com.jetpackduba.gitnuro.git.DiffEntryType import com.jetpackduba.gitnuro.git.DiffEntryType
import com.jetpackduba.gitnuro.theme.tertiarySurface import com.jetpackduba.gitnuro.theme.tertiarySurface
import com.jetpackduba.gitnuro.ui.SelectedItem import com.jetpackduba.gitnuro.ui.SelectedItem
import com.jetpackduba.gitnuro.ui.components.ScrollableColumn import com.jetpackduba.gitnuro.ui.components.ScrollableColumn
import com.jetpackduba.gitnuro.ui.components.ScrollableLazyColumn import com.jetpackduba.gitnuro.ui.components.ScrollableLazyColumn
import com.jetpackduba.gitnuro.ui.components.gitnuroViewModel import com.jetpackduba.gitnuro.ui.components.gitnuroViewModel
import com.jetpackduba.gitnuro.ui.context_menu.ContextMenu
import com.jetpackduba.gitnuro.ui.context_menu.commitedChangesEntriesContextMenuItems
import com.jetpackduba.gitnuro.viewmodels.CommitChanges import com.jetpackduba.gitnuro.viewmodels.CommitChanges
import com.jetpackduba.gitnuro.viewmodels.MultiCommitChangesStatus import com.jetpackduba.gitnuro.viewmodels.MultiCommitChangesStatus
import com.jetpackduba.gitnuro.viewmodels.MultiCommitChangesViewModel import com.jetpackduba.gitnuro.viewmodels.MultiCommitChangesViewModel
@ -108,28 +111,49 @@ fun MultiCommitChangesView(
ScrollableLazyColumn( ScrollableLazyColumn(
modifier = Modifier modifier = Modifier
) { ) {
items(changes) {commitChanges -> changes.forEach { commitChanges ->
CommitLogChanges( items(commitChanges.changes) { diffEntry ->
diffSelected = diffSelected, ContextMenu(
diffEntries = commitChanges.changes, items = {
onDiffSelected = onDiffSelected, commitedChangesEntriesContextMenuItems(
onBlame = onBlame, diffEntry,
onHistory = onHistory, onBlame = { onBlame(diffEntry.filePath) },
) onHistory = { onHistory(diffEntry.filePath) },
)
}
) {
CommitLogChangesItem(
diffEntry = diffEntry,
diffSelected = diffSelected,
onDiffSelected = { onDiffSelected(diffEntry) }
)
}
}
Text( item {
text = commitChanges.commit.fullMessage, Column (
style = MaterialTheme.typography.body1, modifier = Modifier
color = MaterialTheme.colors.onBackground, .padding(top = 8.dp)
modifier = Modifier ) {
.fillMaxWidth() Text(
.padding(8.dp), text = commitChanges.commit.fullMessage,
) style = MaterialTheme.typography.body1,
color = MaterialTheme.colors.onBackground,
modifier = Modifier
.fillMaxWidth()
.padding(
horizontal = 8.dp,
),
)
Divider( Author(id = commitChanges.commit.id, author = commitChanges.commit.authorIdent)
color = MaterialTheme.colors.onBackground,
modifier = Modifier.fillMaxWidth() Divider(
) color = MaterialTheme.colors.onBackground,
modifier = Modifier.fillMaxWidth()
)
}
}
} }
} }
} }