Skip to content

Commit 81836f4

Browse files
JetpackDubaJetpackDuba
committed
Refactored remotes in side panel
1 parent 22088a3 commit 81836f4

File tree

10 files changed

+258
-402
lines changed

10 files changed

+258
-402
lines changed

‎src/main/kotlin/com/jetpackduba/gitnuro/Icons.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ object AppIcons {
2222
const val DOWNLOAD = "download.svg"
2323
const val DRAG = "drag.svg"
2424
const val DROPDOWN = "dropdown.svg"
25+
const val EDIT = "edit.svg"
2526
const val ERROR = "error.svg"
2627
const val EXPAND_MORE = "expand_more.svg"
2728
const val FETCH = "fetch.svg"

‎src/main/kotlin/com/jetpackduba/gitnuro/git/remote_operations/FetchAllBranchesUseCase.kt‎ renamed to ‎src/main/kotlin/com/jetpackduba/gitnuro/git/remote_operations/FetchAllRemotesUseCase.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import javax.inject.Inject
1414

1515
private const val TAG = "FetchAllBranchesUseCase"
1616

17-
class FetchAllBranchesUseCase @Inject constructor(
17+
class FetchAllRemotesUseCase @Inject constructor(
1818
private val handleTransportUseCase: HandleTransportUseCase,
1919
) {
2020
suspend operator fun invoke(git: Git) = withContext(Dispatchers.IO) {

‎src/main/kotlin/com/jetpackduba/gitnuro/models/RemoteWrapper.kt‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
package com.jetpackduba.gitnuro.models
2+
3+
import org.eclipse.jgit.transport.RemoteConfig
4+
5+
data class RemoteWrapper constructor(
6+
val remoteName: String,
7+
val fetchUri: String,
8+
val pushUri: String,
9+
val isNew: Boolean,
10+
)
11+
12+
fun RemoteConfig.toRemoteWrapper(): RemoteWrapper {
13+
val fetchUri = this.urIs.firstOrNull()
14+
val pushUri = this.pushURIs.firstOrNull()
15+
?: this.urIs.firstOrNull() // If push URI == null, take fetch URI
16+
17+
return RemoteWrapper(
18+
remoteName = this.name,
19+
fetchUri = fetchUri?.toString().orEmpty(),
20+
pushUri = pushUri?.toString().orEmpty(),
21+
isNew = false,
22+
)
23+
}
24+
25+
fun newRemoteWrapper(): RemoteWrapper {
26+
return RemoteWrapper(
27+
remoteName = "",
28+
fetchUri = "",
29+
pushUri = "",
30+
isNew = true,
31+
)
32+
}

‎src/main/kotlin/com/jetpackduba/gitnuro/ui/SidePanel.kt‎

Lines changed: 40 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,18 @@ import com.jetpackduba.gitnuro.extensions.handOnHover
1717
import com.jetpackduba.gitnuro.extensions.isLocal
1818
import com.jetpackduba.gitnuro.extensions.isValid
1919
import com.jetpackduba.gitnuro.extensions.simpleName
20+
import com.jetpackduba.gitnuro.models.RemoteWrapper
21+
import com.jetpackduba.gitnuro.models.newRemoteWrapper
22+
import com.jetpackduba.gitnuro.models.toRemoteWrapper
2023
import com.jetpackduba.gitnuro.theme.onBackgroundSecondary
21-
import com.jetpackduba.gitnuro.ui.components.*
24+
import com.jetpackduba.gitnuro.ui.components.AdjustableOutlinedTextField
25+
import com.jetpackduba.gitnuro.ui.components.ScrollableLazyColumn
26+
import com.jetpackduba.gitnuro.ui.components.SideMenuHeader
27+
import com.jetpackduba.gitnuro.ui.components.SideMenuSubentry
2228
import com.jetpackduba.gitnuro.ui.components.tooltip.DelayedTooltip
2329
import com.jetpackduba.gitnuro.ui.context_menu.*
30+
import com.jetpackduba.gitnuro.ui.dialogs.AddEditRemoteDialog
2431
import com.jetpackduba.gitnuro.ui.dialogs.AddSubmodulesDialog
25-
import com.jetpackduba.gitnuro.ui.dialogs.EditRemotesDialog
2632
import com.jetpackduba.gitnuro.ui.dialogs.SetDefaultUpstreamBranchDialog
2733
import com.jetpackduba.gitnuro.viewmodels.ChangeDefaultUpstreamBranchViewModel
2834
import com.jetpackduba.gitnuro.viewmodels.sidepanel.*
@@ -50,7 +56,7 @@ fun SidePanel(
5056
val stashesState by stashesViewModel.stashesState.collectAsState()
5157
val submodulesState by submodulesViewModel.submodules.collectAsState()
5258

53-
var showEditRemotesDialog by remember { mutableStateOf(false) }
59+
val (showAddEditRemote, setShowAddEditRemote) = remember { mutableStateOf<RemoteWrapper?>(null) }
5460
val (branchToChangeUpstream, setBranchToChangeUpstream) = remember { mutableStateOf<Ref?>(null) }
5561
var showEditSubmodulesDialog by remember { mutableStateOf(false) }
5662

@@ -80,7 +86,7 @@ fun SidePanel(
8086
remotes(
8187
remotesState = remotesState,
8288
remotesViewModel = remotesViewModel,
83-
onShowEditRemotesDialog = { showEditRemotesDialog = true },
89+
onShowAddEditRemoteDialog = { setShowAddEditRemote(it) },
8490
)
8591

8692
tags(
@@ -103,11 +109,12 @@ fun SidePanel(
103109
}
104110
}
105111

106-
if (showEditRemotesDialog) {
107-
EditRemotesDialog(
112+
if (showAddEditRemote != null) {
113+
AddEditRemoteDialog(
108114
remotesViewModel = remotesViewModel,
115+
remoteWrapper = showAddEditRemote,
109116
onDismiss = {
110-
showEditRemotesDialog = false
117+
setShowAddEditRemote(null)
111118
},
112119
)
113120
}
@@ -218,7 +225,7 @@ fun LazyListScope.localBranches(
218225
fun LazyListScope.remotes(
219226
remotesState: RemotesState,
220227
remotesViewModel: RemotesViewModel,
221-
onShowEditRemotesDialog: () -> Unit,
228+
onShowAddEditRemoteDialog: (RemoteWrapper) -> Unit,
222229
) {
223230
val isExpanded = remotesState.isExpanded
224231
val remotes = remotesState.remotes
@@ -230,14 +237,14 @@ fun LazyListScope.remotes(
230237
itemsCount = remotes.count(),
231238
hoverIcon = {
232239
IconButton(
233-
onClick = onShowEditRemotesDialog,
240+
onClick = { onShowAddEditRemoteDialog(newRemoteWrapper()) },
234241
modifier = Modifier
235242
.padding(end = 16.dp)
236243
.size(16.dp)
237244
.handOnHover(),
238245
) {
239246
Icon(
240-
painter = painterResource(AppIcons.SETTINGS),
247+
painter = painterResource(AppIcons.ADD),
241248
contentDescription = null,
242249
modifier = Modifier
243250
.fillMaxSize(),
@@ -255,7 +262,12 @@ fun LazyListScope.remotes(
255262
item {
256263
Remote(
257264
remote = remote,
258-
onRemoteClicked = { remotesViewModel.onRemoteClicked(remote) }
265+
onEditRemote = {
266+
val wrapper = remote.remoteInfo.remoteConfig.toRemoteWrapper()
267+
onShowAddEditRemoteDialog(wrapper)
268+
},
269+
onDeleteRemote = { remotesViewModel.deleteRemote(remote.remoteInfo.remoteConfig.name) },
270+
onRemoteClicked = { remotesViewModel.onRemoteClicked(remote) },
259271
)
260272
}
261273

@@ -461,14 +473,25 @@ private fun Branch(
461473
@Composable
462474
private fun Remote(
463475
remote: RemoteView,
476+
onEditRemote: () -> Unit,
477+
onDeleteRemote: () -> Unit,
464478
onRemoteClicked: () -> Unit,
465479
) {
466-
SideMenuSubentry(
467-
text = remote.remoteInfo.remoteConfig.name,
468-
iconResourcePath = AppIcons.CLOUD,
469-
onClick = onRemoteClicked,
470-
isSelected = false,
471-
)
480+
ContextMenu(
481+
items = {
482+
remoteContextMenu(
483+
onEdit = onEditRemote,
484+
onDelete = onDeleteRemote,
485+
)
486+
}
487+
) {
488+
SideMenuSubentry(
489+
text = remote.remoteInfo.remoteConfig.name,
490+
iconResourcePath = AppIcons.CLOUD,
491+
onClick = onRemoteClicked,
492+
isSelected = false,
493+
)
494+
}
472495
}
473496

474497

‎src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/RemoteContextMenu.kt‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,20 @@
11
package com.jetpackduba.gitnuro.ui.context_menu
22

3+
import androidx.compose.ui.res.painterResource
4+
import com.jetpackduba.gitnuro.AppIcons
5+
36
fun remoteContextMenu(
4-
onEditRemotes: () -> Unit,
7+
onEdit: () -> Unit,
8+
onDelete: () -> Unit,
59
): List<ContextMenuElement> = listOf(
610
ContextMenuElement.ContextTextEntry(
7-
label = "Edit remotes",
8-
onClick = onEditRemotes
11+
label = "Edit",
12+
icon = { painterResource(AppIcons.EDIT) },
13+
onClick = onEdit
14+
),
15+
ContextMenuElement.ContextTextEntry(
16+
label = "Delete",
17+
icon = { painterResource(AppIcons.DELETE) },
18+
onClick = onDelete
919
),
1020
)

‎src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/AddEditRemoteDialog.kt‎

Lines changed: 159 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,159 @@
1+
package com.jetpackduba.gitnuro.ui.dialogs
2+
3+
import androidx.compose.foundation.layout.*
4+
import androidx.compose.material.Icon
5+
import androidx.compose.material.IconButton
6+
import androidx.compose.material.MaterialTheme
7+
import androidx.compose.material.Text
8+
import androidx.compose.material.icons.Icons
9+
import androidx.compose.material.icons.filled.Clear
10+
import androidx.compose.runtime.*
11+
import androidx.compose.ui.Alignment
12+
import androidx.compose.ui.Modifier
13+
import androidx.compose.ui.graphics.Color
14+
import androidx.compose.ui.unit.dp
15+
import com.jetpackduba.gitnuro.extensions.handOnHover
16+
import com.jetpackduba.gitnuro.models.RemoteWrapper
17+
import com.jetpackduba.gitnuro.theme.outlinedTextFieldColors
18+
import com.jetpackduba.gitnuro.ui.components.AdjustableOutlinedTextField
19+
import com.jetpackduba.gitnuro.ui.components.PrimaryButton
20+
import com.jetpackduba.gitnuro.viewmodels.sidepanel.RemotesViewModel
21+
import kotlinx.coroutines.flow.collectLatest
22+
23+
@Composable
24+
fun AddEditRemoteDialog(
25+
remotesViewModel: RemotesViewModel,
26+
remoteWrapper: RemoteWrapper,
27+
onDismiss: () -> Unit,
28+
) {
29+
var remote: RemoteWrapper by remember(remoteWrapper) { mutableStateOf(remoteWrapper) }
30+
31+
LaunchedEffect(Unit) {
32+
remotesViewModel.remoteUpdated.collectLatest { onDismiss() }
33+
}
34+
35+
MaterialDialog(
36+
paddingVertical = 8.dp,
37+
paddingHorizontal = 16.dp,
38+
background = MaterialTheme.colors.surface,
39+
onCloseRequested = onDismiss
40+
) {
41+
Column(
42+
modifier = Modifier
43+
.width(600.dp),
44+
horizontalAlignment = Alignment.CenterHorizontally,
45+
verticalArrangement = Arrangement.Center,
46+
) {
47+
Row(
48+
modifier = Modifier,
49+
verticalAlignment = Alignment.CenterVertically,
50+
) {
51+
Text(
52+
text = if (remote.isNew) "New remote" else "Edit remote \"${remote.remoteName}\"",
53+
color = MaterialTheme.colors.onBackground,
54+
style = MaterialTheme.typography.h3,
55+
modifier = Modifier
56+
.padding(start = 8.dp, top = 8.dp, bottom = 8.dp)
57+
.fillMaxWidth(),
58+
)
59+
}
60+
Row(
61+
modifier = Modifier
62+
.padding(bottom = 8.dp)
63+
) {
64+
Column(
65+
modifier = Modifier
66+
.fillMaxWidth()
67+
.padding(horizontal = 8.dp)
68+
) {
69+
Column {
70+
if (remote.isNew) {
71+
Text(
72+
text = "Remote name",
73+
color = MaterialTheme.colors.onBackground,
74+
modifier = Modifier.padding(top = 8.dp),
75+
)
76+
77+
AdjustableOutlinedTextField(
78+
value = remote.remoteName,
79+
onValueChange = { newValue ->
80+
remote = remote.copy(remoteName = newValue)
81+
},
82+
singleLine = true,
83+
modifier = Modifier
84+
.fillMaxWidth()
85+
.padding(vertical = 8.dp)
86+
)
87+
}
88+
89+
Text(
90+
text = "Fetch URL",
91+
color = MaterialTheme.colors.onBackground,
92+
modifier = Modifier.padding(top = 8.dp),
93+
)
94+
95+
AdjustableOutlinedTextField(
96+
value = remote.fetchUri,
97+
onValueChange = { newValue ->
98+
remote = remote.copy(fetchUri = newValue)
99+
},
100+
singleLine = true,
101+
colors = outlinedTextFieldColors(),
102+
modifier = Modifier
103+
.fillMaxWidth()
104+
.padding(vertical = 8.dp)
105+
)
106+
107+
Text(
108+
text = "Push URL",
109+
color = MaterialTheme.colors.onBackground,
110+
modifier = Modifier.padding(top = 8.dp),
111+
)
112+
113+
AdjustableOutlinedTextField(
114+
value = remote.pushUri,
115+
onValueChange = { newValue ->
116+
remote = remote.copy(pushUri = newValue)
117+
},
118+
singleLine = true,
119+
modifier = Modifier
120+
.fillMaxWidth()
121+
.padding(vertical = 8.dp)
122+
)
123+
124+
Row(
125+
modifier = Modifier
126+
.padding(top = 32.dp)
127+
.align(Alignment.End),
128+
verticalAlignment = Alignment.CenterVertically,
129+
) {
130+
Spacer(modifier = Modifier.weight(1f))
131+
132+
PrimaryButton(
133+
text = "Cancel",
134+
modifier = Modifier.padding(end = 8.dp),
135+
onClick = onDismiss,
136+
backgroundColor = Color.Transparent,
137+
backgroundDisabled = Color.Transparent,
138+
textColor = MaterialTheme.colors.onBackground,
139+
disabledTextColor = MaterialTheme.colors.onBackground.copy(alpha = 0.5f),
140+
)
141+
142+
143+
PrimaryButton(
144+
modifier = Modifier,
145+
onClick = {
146+
if (remote.isNew)
147+
remotesViewModel.addRemote(remote)
148+
else
149+
remotesViewModel.updateRemote(remote)
150+
},
151+
text = "Save changes",
152+
)
153+
}
154+
}
155+
}
156+
}
157+
}
158+
}
159+
}

0 commit comments

Comments
 (0)