Skip to content

Commit 20a54f6

Browse files
JetpackDubaJetpackDuba
committed
Rename of ChangeUpstreamBranchDialogViewModel
1 parent fd5b12e commit 20a54f6

File tree

6 files changed

+19
-19
lines changed

6 files changed

+19
-19
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ fun MainContentView(
334334
first = {
335335
SidePanel(
336336
repositoryOpenViewModel.tabViewModelsProvider.sidePanelViewModel,
337-
changeDefaultUpstreamBranchViewModel = { repositoryOpenViewModel.tabViewModelsProvider.changeDefaultUpstreamBranchViewModel },
337+
changeUpstreamBranchDialogViewModel = { repositoryOpenViewModel.tabViewModelsProvider.changeUpstreamBranchDialogViewModel },
338338
submoduleDialogViewModel = { repositoryOpenViewModel.tabViewModelsProvider.submoduleDialogViewModel },
339339
)
340340
},
@@ -361,7 +361,7 @@ fun MainContentView(
361361
logViewModel = repositoryOpenViewModel.tabViewModelsProvider.logViewModel,
362362
selectedItem = selectedItem,
363363
repositoryState = repositoryState,
364-
changeDefaultUpstreamBranchViewModel = { repositoryOpenViewModel.tabViewModelsProvider.changeDefaultUpstreamBranchViewModel },
364+
changeUpstreamBranchDialogViewModel = { repositoryOpenViewModel.tabViewModelsProvider.changeUpstreamBranchDialogViewModel },
365365
)
366366
}
367367

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import com.jetpackduba.gitnuro.ui.context_menu.*
3333
import com.jetpackduba.gitnuro.ui.dialogs.AddEditRemoteDialog
3434
import com.jetpackduba.gitnuro.ui.dialogs.AddSubmodulesDialog
3535
import com.jetpackduba.gitnuro.ui.dialogs.SetDefaultUpstreamBranchDialog
36-
import com.jetpackduba.gitnuro.viewmodels.ChangeDefaultUpstreamBranchViewModel
36+
import com.jetpackduba.gitnuro.viewmodels.ChangeUpstreamBranchDialogViewModel
3737
import com.jetpackduba.gitnuro.viewmodels.sidepanel.*
3838
import kotlinx.coroutines.flow.collectLatest
3939
import org.eclipse.jgit.lib.Ref
@@ -43,7 +43,7 @@ import org.eclipse.jgit.submodule.SubmoduleStatus
4343
@Composable
4444
fun SidePanel(
4545
sidePanelViewModel: SidePanelViewModel,
46-
changeDefaultUpstreamBranchViewModel: () -> ChangeDefaultUpstreamBranchViewModel,
46+
changeUpstreamBranchDialogViewModel: () -> ChangeUpstreamBranchDialogViewModel,
4747
submoduleDialogViewModel: () -> SubmoduleDialogViewModel,
4848
branchesViewModel: BranchesViewModel = sidePanelViewModel.branchesViewModel,
4949
remotesViewModel: RemotesViewModel = sidePanelViewModel.remotesViewModel,
@@ -140,7 +140,7 @@ fun SidePanel(
140140

141141
if (branchToChangeUpstream != null) {
142142
SetDefaultUpstreamBranchDialog(
143-
viewModel = changeDefaultUpstreamBranchViewModel(),
143+
viewModel = changeUpstreamBranchDialogViewModel(),
144144
branch = branchToChangeUpstream,
145145
onClose = { setBranchToChangeUpstream(null) }
146146
)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import com.jetpackduba.gitnuro.git.remotes.RemoteInfo
2222
import com.jetpackduba.gitnuro.ui.components.FilterDropdown
2323
import com.jetpackduba.gitnuro.ui.components.PrimaryButton
2424
import com.jetpackduba.gitnuro.ui.dropdowns.DropDownOption
25-
import com.jetpackduba.gitnuro.viewmodels.ChangeDefaultUpstreamBranchViewModel
25+
import com.jetpackduba.gitnuro.viewmodels.ChangeUpstreamBranchDialogViewModel
2626
import com.jetpackduba.gitnuro.viewmodels.SetDefaultUpstreamBranchState
2727
import org.eclipse.jgit.lib.ObjectIdRef
2828
import org.eclipse.jgit.lib.Ref
@@ -47,7 +47,7 @@ fun SetDefaultUpstreamBranchDialogPreview() {
4747

4848
@Composable
4949
fun SetDefaultUpstreamBranchDialog(
50-
viewModel: ChangeDefaultUpstreamBranchViewModel,
50+
viewModel: ChangeUpstreamBranchDialogViewModel,
5151
branch: Ref,
5252
onClose: () -> Unit,
5353
) {

‎src/main/kotlin/com/jetpackduba/gitnuro/ui/log/Log.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ import com.jetpackduba.gitnuro.ui.dialogs.NewTagDialog
6060
import com.jetpackduba.gitnuro.ui.dialogs.ResetBranchDialog
6161
import com.jetpackduba.gitnuro.ui.dialogs.SetDefaultUpstreamBranchDialog
6262
import com.jetpackduba.gitnuro.ui.resizePointerIconEast
63-
import com.jetpackduba.gitnuro.viewmodels.ChangeDefaultUpstreamBranchViewModel
63+
import com.jetpackduba.gitnuro.viewmodels.ChangeUpstreamBranchDialogViewModel
6464
import com.jetpackduba.gitnuro.viewmodels.LogSearch
6565
import com.jetpackduba.gitnuro.viewmodels.LogStatus
6666
import com.jetpackduba.gitnuro.viewmodels.LogViewModel
@@ -104,7 +104,7 @@ fun Log(
104104
logViewModel: LogViewModel,
105105
selectedItem: SelectedItem,
106106
repositoryState: RepositoryState,
107-
changeDefaultUpstreamBranchViewModel: () -> ChangeDefaultUpstreamBranchViewModel,
107+
changeUpstreamBranchDialogViewModel: () -> ChangeUpstreamBranchDialogViewModel,
108108
) {
109109
val logStatusState = logViewModel.logStatus.collectAsState()
110110
val logStatus = logStatusState.value
@@ -117,7 +117,7 @@ fun Log(
117117
showLogDialog = showLogDialog,
118118
selectedItem = selectedItem,
119119
repositoryState = repositoryState,
120-
changeDefaultUpstreamBranchViewModel = changeDefaultUpstreamBranchViewModel,
120+
changeUpstreamBranchDialogViewModel = changeUpstreamBranchDialogViewModel,
121121
onRequestMoreLogItems = { logViewModel.loadMoreLogItems() }
122122
)
123123

@@ -150,7 +150,7 @@ private fun LogLoaded(
150150
showLogDialog: LogDialog,
151151
selectedItem: SelectedItem,
152152
repositoryState: RepositoryState,
153-
changeDefaultUpstreamBranchViewModel: () -> ChangeDefaultUpstreamBranchViewModel,
153+
changeUpstreamBranchDialogViewModel: () -> ChangeUpstreamBranchDialogViewModel,
154154
onRequestMoreLogItems: () -> Unit,
155155
) {
156156
val scope = rememberCoroutineScope()
@@ -202,7 +202,7 @@ private fun LogLoaded(
202202
logViewModel,
203203
onResetShowLogDialog = { logViewModel.showDialog(LogDialog.None) },
204204
showLogDialog = showLogDialog,
205-
changeDefaultUpstreamBranchViewModel = changeDefaultUpstreamBranchViewModel,
205+
changeUpstreamBranchDialogViewModel = changeUpstreamBranchDialogViewModel,
206206
)
207207

208208
Column(
@@ -605,7 +605,7 @@ fun CommitsList(
605605
fun LogDialogs(
606606
logViewModel: LogViewModel,
607607
onResetShowLogDialog: () -> Unit,
608-
changeDefaultUpstreamBranchViewModel: () -> ChangeDefaultUpstreamBranchViewModel,
608+
changeUpstreamBranchDialogViewModel: () -> ChangeUpstreamBranchDialogViewModel,
609609
showLogDialog: LogDialog,
610610
) {
611611
when (showLogDialog) {
@@ -633,7 +633,7 @@ fun LogDialogs(
633633

634634
is LogDialog.ChangeDefaultBranch -> {
635635
SetDefaultUpstreamBranchDialog(
636-
viewModel = changeDefaultUpstreamBranchViewModel(),
636+
viewModel = changeUpstreamBranchDialogViewModel(),
637637
branch = showLogDialog.ref,
638638
onClose = { onResetShowLogDialog() },
639639
)

‎src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/SetDefaultUpstreamBranchViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import kotlinx.coroutines.flow.StateFlow
1414
import org.eclipse.jgit.lib.Ref
1515
import javax.inject.Inject
1616

17-
class ChangeDefaultUpstreamBranchViewModel @Inject constructor(
17+
class ChangeUpstreamBranchDialogViewModel @Inject constructor(
1818
private val tabState: TabState,
1919
private val getRemoteBranchesUseCase: GetRemoteBranchesUseCase,
2020
private val getRemotesUseCase: GetRemotesUseCase,

‎src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/TabViewModelsProvider.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ interface ITabViewModelsProvider {
1818
val diffViewModel: DiffViewModel
1919
val historyViewModel: HistoryViewModel
2020
val authorViewModel: AuthorViewModel
21-
val changeDefaultUpstreamBranchViewModel: ChangeDefaultUpstreamBranchViewModel
21+
val changeUpstreamBranchDialogViewModel: ChangeUpstreamBranchDialogViewModel
2222
val submoduleDialogViewModel: SubmoduleDialogViewModel
2323
val signOffDialogViewModel: SignOffDialogViewModel
2424
}
@@ -36,7 +36,7 @@ class TabViewModelsProvider @Inject constructor(
3636
private val diffViewModelProvider: Provider<DiffViewModel>,
3737
private val historyViewModelProvider: Provider<HistoryViewModel>,
3838
private val authorViewModelProvider: Provider<AuthorViewModel>,
39-
private val changeDefaultUpstreamBranchViewModelProvider: Provider<ChangeDefaultUpstreamBranchViewModel>,
39+
private val changeUpstreamBranchDialogViewModelProvider: Provider<ChangeUpstreamBranchDialogViewModel>,
4040
private val submoduleDialogViewModelProvider: Provider<SubmoduleDialogViewModel>,
4141
private val signOffDialogViewModelProvider: Provider<SignOffDialogViewModel>,
4242
) : ITabViewModelsProvider {
@@ -46,8 +46,8 @@ class TabViewModelsProvider @Inject constructor(
4646
get() = historyViewModelProvider.get()
4747
override val authorViewModel: AuthorViewModel
4848
get() = authorViewModelProvider.get()
49-
override val changeDefaultUpstreamBranchViewModel: ChangeDefaultUpstreamBranchViewModel
50-
get() = changeDefaultUpstreamBranchViewModelProvider.get()
49+
override val changeUpstreamBranchDialogViewModel: ChangeUpstreamBranchDialogViewModel
50+
get() = changeUpstreamBranchDialogViewModelProvider.get()
5151
override val submoduleDialogViewModel: SubmoduleDialogViewModel
5252
get() = submoduleDialogViewModelProvider.get()
5353
override val signOffDialogViewModel: SignOffDialogViewModel

0 commit comments

Comments
 (0)