Rename of ChangeUpstreamBranchDialogViewModel

JetpackDuba · Feb 15, 2025 · 20a54f6 · 20a54f6
1 parent fd5b12e
commit 20a54f6
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 19 deletions.
diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/RepositoryOpen.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/RepositoryOpen.kt
@@ -334,7 +334,7 @@ fun MainContentView(
         first = {
             SidePanel(
                 repositoryOpenViewModel.tabViewModelsProvider.sidePanelViewModel,
-                changeDefaultUpstreamBranchViewModel = { repositoryOpenViewModel.tabViewModelsProvider.changeDefaultUpstreamBranchViewModel },
+                changeUpstreamBranchDialogViewModel = { repositoryOpenViewModel.tabViewModelsProvider.changeUpstreamBranchDialogViewModel },
                 submoduleDialogViewModel = { repositoryOpenViewModel.tabViewModelsProvider.submoduleDialogViewModel },
             )
         },
@@ -361,7 +361,7 @@ fun MainContentView(
                                         logViewModel = repositoryOpenViewModel.tabViewModelsProvider.logViewModel,
                                         selectedItem = selectedItem,
                                         repositoryState = repositoryState,
-                                        changeDefaultUpstreamBranchViewModel = { repositoryOpenViewModel.tabViewModelsProvider.changeDefaultUpstreamBranchViewModel },
+                                        changeUpstreamBranchDialogViewModel = { repositoryOpenViewModel.tabViewModelsProvider.changeUpstreamBranchDialogViewModel },
                                     )
                                 }
 

diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/SidePanel.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/SidePanel.kt
@@ -33,7 +33,7 @@ import com.jetpackduba.gitnuro.ui.context_menu.*
 import com.jetpackduba.gitnuro.ui.dialogs.AddEditRemoteDialog
 import com.jetpackduba.gitnuro.ui.dialogs.AddSubmodulesDialog
 import com.jetpackduba.gitnuro.ui.dialogs.SetDefaultUpstreamBranchDialog
-import com.jetpackduba.gitnuro.viewmodels.ChangeDefaultUpstreamBranchViewModel
+import com.jetpackduba.gitnuro.viewmodels.ChangeUpstreamBranchDialogViewModel
 import com.jetpackduba.gitnuro.viewmodels.sidepanel.*
 import kotlinx.coroutines.flow.collectLatest
 import org.eclipse.jgit.lib.Ref
@@ -43,7 +43,7 @@ import org.eclipse.jgit.submodule.SubmoduleStatus
 @Composable
 fun SidePanel(
     sidePanelViewModel: SidePanelViewModel,
-    changeDefaultUpstreamBranchViewModel: () -> ChangeDefaultUpstreamBranchViewModel,
+    changeUpstreamBranchDialogViewModel: () -> ChangeUpstreamBranchDialogViewModel,
     submoduleDialogViewModel: () -> SubmoduleDialogViewModel,
     branchesViewModel: BranchesViewModel = sidePanelViewModel.branchesViewModel,
     remotesViewModel: RemotesViewModel = sidePanelViewModel.remotesViewModel,
@@ -140,7 +140,7 @@ fun SidePanel(
 
     if (branchToChangeUpstream != null) {
         SetDefaultUpstreamBranchDialog(
-            viewModel = changeDefaultUpstreamBranchViewModel(),
+            viewModel = changeUpstreamBranchDialogViewModel(),
             branch = branchToChangeUpstream,
             onClose = { setBranchToChangeUpstream(null) }
         )

diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/SetDefaultUpstreamBranchDialog.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/SetDefaultUpstreamBranchDialog.kt
@@ -22,7 +22,7 @@ import com.jetpackduba.gitnuro.git.remotes.RemoteInfo
 import com.jetpackduba.gitnuro.ui.components.FilterDropdown
 import com.jetpackduba.gitnuro.ui.components.PrimaryButton
 import com.jetpackduba.gitnuro.ui.dropdowns.DropDownOption
-import com.jetpackduba.gitnuro.viewmodels.ChangeDefaultUpstreamBranchViewModel
+import com.jetpackduba.gitnuro.viewmodels.ChangeUpstreamBranchDialogViewModel
 import com.jetpackduba.gitnuro.viewmodels.SetDefaultUpstreamBranchState
 import org.eclipse.jgit.lib.ObjectIdRef
 import org.eclipse.jgit.lib.Ref
@@ -47,7 +47,7 @@ fun SetDefaultUpstreamBranchDialogPreview() {
 
 @Composable
 fun SetDefaultUpstreamBranchDialog(
-    viewModel: ChangeDefaultUpstreamBranchViewModel,
+    viewModel: ChangeUpstreamBranchDialogViewModel,
     branch: Ref,
     onClose: () -> Unit,
 ) {

diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/log/Log.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/log/Log.kt
@@ -60,7 +60,7 @@ import com.jetpackduba.gitnuro.ui.dialogs.NewTagDialog
 import com.jetpackduba.gitnuro.ui.dialogs.ResetBranchDialog
 import com.jetpackduba.gitnuro.ui.dialogs.SetDefaultUpstreamBranchDialog
 import com.jetpackduba.gitnuro.ui.resizePointerIconEast
-import com.jetpackduba.gitnuro.viewmodels.ChangeDefaultUpstreamBranchViewModel
+import com.jetpackduba.gitnuro.viewmodels.ChangeUpstreamBranchDialogViewModel
 import com.jetpackduba.gitnuro.viewmodels.LogSearch
 import com.jetpackduba.gitnuro.viewmodels.LogStatus
 import com.jetpackduba.gitnuro.viewmodels.LogViewModel
@@ -104,7 +104,7 @@ fun Log(
     logViewModel: LogViewModel,
     selectedItem: SelectedItem,
     repositoryState: RepositoryState,
-    changeDefaultUpstreamBranchViewModel: () -> ChangeDefaultUpstreamBranchViewModel,
+    changeUpstreamBranchDialogViewModel: () -> ChangeUpstreamBranchDialogViewModel,
 ) {
     val logStatusState = logViewModel.logStatus.collectAsState()
     val logStatus = logStatusState.value
@@ -117,7 +117,7 @@ fun Log(
             showLogDialog = showLogDialog,
             selectedItem = selectedItem,
             repositoryState = repositoryState,
-            changeDefaultUpstreamBranchViewModel = changeDefaultUpstreamBranchViewModel,
+            changeUpstreamBranchDialogViewModel = changeUpstreamBranchDialogViewModel,
             onRequestMoreLogItems = { logViewModel.loadMoreLogItems() }
         )
 
@@ -150,7 +150,7 @@ private fun LogLoaded(
     showLogDialog: LogDialog,
     selectedItem: SelectedItem,
     repositoryState: RepositoryState,
-    changeDefaultUpstreamBranchViewModel: () -> ChangeDefaultUpstreamBranchViewModel,
+    changeUpstreamBranchDialogViewModel: () -> ChangeUpstreamBranchDialogViewModel,
     onRequestMoreLogItems: () -> Unit,
 ) {
     val scope = rememberCoroutineScope()
@@ -202,7 +202,7 @@ private fun LogLoaded(
         logViewModel,
         onResetShowLogDialog = { logViewModel.showDialog(LogDialog.None) },
         showLogDialog = showLogDialog,
-        changeDefaultUpstreamBranchViewModel = changeDefaultUpstreamBranchViewModel,
+        changeUpstreamBranchDialogViewModel = changeUpstreamBranchDialogViewModel,
     )
 
     Column(
@@ -605,7 +605,7 @@ fun CommitsList(
 fun LogDialogs(
     logViewModel: LogViewModel,
     onResetShowLogDialog: () -> Unit,
-    changeDefaultUpstreamBranchViewModel: () -> ChangeDefaultUpstreamBranchViewModel,
+    changeUpstreamBranchDialogViewModel: () -> ChangeUpstreamBranchDialogViewModel,
     showLogDialog: LogDialog,
 ) {
     when (showLogDialog) {
@@ -633,7 +633,7 @@ fun LogDialogs(
 
         is LogDialog.ChangeDefaultBranch -> {
             SetDefaultUpstreamBranchDialog(
-                viewModel = changeDefaultUpstreamBranchViewModel(),
+                viewModel = changeUpstreamBranchDialogViewModel(),
                 branch = showLogDialog.ref,
                 onClose = { onResetShowLogDialog() },
             )

diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/SetDefaultUpstreamBranchViewModel.kt b/src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/SetDefaultUpstreamBranchViewModel.kt
@@ -14,7 +14,7 @@ import kotlinx.coroutines.flow.StateFlow
 import org.eclipse.jgit.lib.Ref
 import javax.inject.Inject
 
-class ChangeDefaultUpstreamBranchViewModel @Inject constructor(
+class ChangeUpstreamBranchDialogViewModel @Inject constructor(
     private val tabState: TabState,
     private val getRemoteBranchesUseCase: GetRemoteBranchesUseCase,
     private val getRemotesUseCase: GetRemotesUseCase,

diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/TabViewModelsProvider.kt b/src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/TabViewModelsProvider.kt
@@ -18,7 +18,7 @@ interface ITabViewModelsProvider {
     val diffViewModel: DiffViewModel
     val historyViewModel: HistoryViewModel
     val authorViewModel: AuthorViewModel
-    val changeDefaultUpstreamBranchViewModel: ChangeDefaultUpstreamBranchViewModel
+    val changeUpstreamBranchDialogViewModel: ChangeUpstreamBranchDialogViewModel
     val submoduleDialogViewModel: SubmoduleDialogViewModel
     val signOffDialogViewModel: SignOffDialogViewModel
 }
@@ -36,7 +36,7 @@ class TabViewModelsProvider @Inject constructor(
     private val diffViewModelProvider: Provider<DiffViewModel>,
     private val historyViewModelProvider: Provider<HistoryViewModel>,
     private val authorViewModelProvider: Provider<AuthorViewModel>,
-    private val changeDefaultUpstreamBranchViewModelProvider: Provider<ChangeDefaultUpstreamBranchViewModel>,
+    private val changeUpstreamBranchDialogViewModelProvider: Provider<ChangeUpstreamBranchDialogViewModel>,
     private val submoduleDialogViewModelProvider: Provider<SubmoduleDialogViewModel>,
     private val signOffDialogViewModelProvider: Provider<SignOffDialogViewModel>,
 ) : ITabViewModelsProvider {
@@ -46,8 +46,8 @@ class TabViewModelsProvider @Inject constructor(
         get() = historyViewModelProvider.get()
     override val authorViewModel: AuthorViewModel
         get() = authorViewModelProvider.get()
-    override val changeDefaultUpstreamBranchViewModel: ChangeDefaultUpstreamBranchViewModel
-        get() = changeDefaultUpstreamBranchViewModelProvider.get()
+    override val changeUpstreamBranchDialogViewModel: ChangeUpstreamBranchDialogViewModel
+        get() = changeUpstreamBranchDialogViewModelProvider.get()
     override val submoduleDialogViewModel: SubmoduleDialogViewModel
         get() = submoduleDialogViewModelProvider.get()
     override val signOffDialogViewModel: SignOffDialogViewModel