ADFA-2883: Git pull and push

app/src/main/java/com/itsaky/androidide/di/AppModule.kt

@@ -6,13 +6,15 @@ import com.itsaky.androidide.agent.GeminiMacroProcessor
 import com.itsaky.androidide.agent.viewmodel.ChatViewModel
 import com.itsaky.androidide.analytics.AnalyticsManager
 import com.itsaky.androidide.analytics.IAnalyticsManager
+import com.itsaky.androidide.git.core.GitCredentialsManager
 import com.itsaky.androidide.roomData.recentproject.RecentProjectRoomDatabase
 import com.itsaky.androidide.viewmodel.GitBottomSheetViewModel
 import com.itsaky.androidide.viewmodel.MainViewModel
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import org.koin.android.ext.koin.androidApplication
+import org.koin.android.ext.koin.androidContext
 import org.koin.dsl.module
 import org.koin.core.module.dsl.viewModel
 
@@ -28,8 +30,10 @@ val coreModule =
 			ChatViewModel()
 		}
 		viewModel {
-            GitBottomSheetViewModel()
+            GitBottomSheetViewModel(get())
 		}
+        viewModel { MainViewModel(get()) }
+
 
         single<CoroutineScope> {
             CoroutineScope(SupervisorJob() + Dispatchers.IO)
@@ -43,5 +47,6 @@ val coreModule =
             get<RecentProjectRoomDatabase>().recentProjectDao()
         }
 
-        viewModel { MainViewModel(get()) }
+        single { GitCredentialsManager(get()) }
+
 	}

app/src/main/java/com/itsaky/androidide/fragments/git/GitBottomSheetFragment.kt

@@ -10,31 +10,36 @@ import android.view.View
 import android.widget.TextView
 import androidx.core.widget.doAfterTextChanged
 import androidx.fragment.app.Fragment
-import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.itsaky.androidide.R
 import com.itsaky.androidide.activities.PreferencesActivity
+import com.itsaky.androidide.databinding.DialogGitCredentialsBinding
 import com.itsaky.androidide.databinding.FragmentGitBottomSheetBinding
 import com.itsaky.androidide.fragments.git.adapter.GitFileChangeAdapter
+import com.itsaky.androidide.git.core.GitCredentialsManager
 import com.itsaky.androidide.preferences.internal.GitPreferences
+import com.itsaky.androidide.utils.flashSuccess
 import com.itsaky.androidide.viewmodel.GitBottomSheetViewModel
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.launch
+import org.koin.androidx.viewmodel.ext.android.activityViewModel
 
 class GitBottomSheetFragment : Fragment(R.layout.fragment_git_bottom_sheet) {
 
-    private val viewModel: GitBottomSheetViewModel by activityViewModels()
+    private val viewModel: GitBottomSheetViewModel by activityViewModel()
     private lateinit var fileChangeAdapter: GitFileChangeAdapter
+    private lateinit var credentialsManager: GitCredentialsManager
 
     private var _binding: FragmentGitBottomSheetBinding? = null
     private val binding get() = _binding!!
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         _binding = FragmentGitBottomSheetBinding.bind(view)
+        credentialsManager = GitCredentialsManager(requireContext())
 
         fileChangeAdapter = GitFileChangeAdapter(
             onFileClicked = { change ->
@@ -51,6 +56,17 @@ class GitBottomSheetFragment : Fragment(R.layout.fragment_git_bottom_sheet) {
         binding.recyclerView.adapter = fileChangeAdapter
 
         viewLifecycleOwner.lifecycleScope.launch {
+            launch {
+                viewModel.currentBranch.collectLatest { branchName ->
+                    if (branchName != null) {
+                        binding.tvBranchName.visibility = View.VISIBLE
+                        binding.tvBranchName.text = getString(R.string.current_branch_name, branchName)
+                    } else {
+                        binding.tvBranchName.visibility = View.GONE
+                    }
+                }
+            }
+
             combine(
                 viewModel.isGitRepository,
                 viewModel.gitStatus
@@ -95,6 +111,7 @@ class GitBottomSheetFragment : Fragment(R.layout.fragment_git_bottom_sheet) {
             dialog.show(childFragmentManager, "CommitHistoryDialog")
         }
 
+        setupPullUI()
     }
 
     override fun onResume() {
@@ -187,6 +204,80 @@ class GitBottomSheetFragment : Fragment(R.layout.fragment_git_bottom_sheet) {
         binding.commitButton.isEnabled = hasSummary && hasSelection && hasAuthor
     }
 
+    private fun setupPullUI() {
+        viewLifecycleOwner.lifecycleScope.launch {
+            viewModel.isGitRepository.collectLatest { isRepo ->
+                binding.btnPull.visibility = if (isRepo) View.VISIBLE else View.GONE
+            }
+        }
+
+        viewLifecycleOwner.lifecycleScope.launch {
+            viewModel.pullState.collectLatest { state ->
+                when (state) {
+                    is GitBottomSheetViewModel.PullUiState.Idle -> {
+                        binding.btnPull.isEnabled = true
+                        binding.pullProgress.visibility = View.GONE
+                    }
+                    is GitBottomSheetViewModel.PullUiState.Pulling -> {
+                        binding.btnPull.isEnabled = false
+                        binding.pullProgress.visibility = View.VISIBLE
+                    }
+                    is GitBottomSheetViewModel.PullUiState.Success -> {
+                        binding.btnPull.isEnabled = true
+                        binding.pullProgress.visibility = View.GONE
+                        flashSuccess(R.string.pull_successful)
+                        viewModel.resetPullState()
+                    }
+                    is GitBottomSheetViewModel.PullUiState.Error -> {
+                        binding.btnPull.isEnabled = true
+                        binding.pullProgress.visibility = View.GONE
+                        val message =
+                            state.errorResId?.let { getString(it) } ?: state.message
+                        MaterialAlertDialogBuilder(requireContext())
+                            .setTitle(R.string.pull_failed)
+                            .setMessage(message)
+                            .setPositiveButton(android.R.string.ok, null)
+                            .show()
+                    }
+                }
+            }
+        }
+
+        binding.btnPull.setOnClickListener {
+            val username = credentialsManager.getUsername()
+            val token = credentialsManager.getToken()
+            if (!username.isNullOrBlank() && !token.isNullOrBlank()) {
+                viewModel.pull(username, token)
+            } else {
+                showCredentialsDialog()
+            }
+        }
+    }
+
+    private fun showCredentialsDialog() {
+        val context = requireContext()
+        val dialogBinding = DialogGitCredentialsBinding.inflate(layoutInflater)
+
+        dialogBinding.username.setText(credentialsManager.getUsername())
+        dialogBinding.token.setText(credentialsManager.getToken())
+
+        MaterialAlertDialogBuilder(context)
+            .setTitle(R.string.git_credentials_title)
+            .setView(dialogBinding.root)
+            .setPositiveButton(R.string.pull) { _, _ ->
+                val username = dialogBinding.username.text?.toString()?.trim()
+                val token = dialogBinding.token.text?.toString()?.trim()
+                if (!username.isNullOrBlank() && !token.isNullOrBlank()) {
+                    viewModel.pull(username, token)
+                }
+            }
+            .setNeutralButton(R.string.git_credentials_clear) { _, _ ->
+                credentialsManager.clearCredentials()
+            }
+            .setNegativeButton(android.R.string.cancel, null)
+            .show()
+    }
+
     override fun onDestroyView() {
         super.onDestroyView()
         _binding = null

app/src/main/java/com/itsaky/androidide/fragments/git/GitCommitHistoryDialog.kt

@@ -5,24 +5,30 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.DialogFragment
-import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.itsaky.androidide.R
 import com.itsaky.androidide.databinding.DialogGitCommitHistoryBinding
+import com.itsaky.androidide.databinding.DialogGitCredentialsBinding
 import com.itsaky.androidide.fragments.git.adapter.GitCommitHistoryAdapter
+import com.itsaky.androidide.git.core.GitCredentialsManager
 import com.itsaky.androidide.git.core.models.CommitHistoryUiState
+import com.itsaky.androidide.utils.flashSuccess
 import com.itsaky.androidide.viewmodel.GitBottomSheetViewModel
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
+import org.koin.android.ext.android.inject
+import org.koin.androidx.viewmodel.ext.android.activityViewModel
 
 class GitCommitHistoryDialog : DialogFragment() {
 
     private var _binding: DialogGitCommitHistoryBinding? = null
     private val binding get() = _binding!!
-    private val viewModel: GitBottomSheetViewModel by activityViewModels()
+    private val viewModel: GitBottomSheetViewModel by activityViewModel()
     private lateinit var commitHistoryAdapter: GitCommitHistoryAdapter
+    private val credentialsManager: GitCredentialsManager by inject()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -83,6 +89,84 @@ class GitCommitHistoryDialog : DialogFragment() {
                 }
             }
         }
+
+        setupPushUI()
+    }
+
+    private fun setupPushUI() {
+        binding.btnPush.setOnClickListener {
+            val username = credentialsManager.getUsername()
+            val token = credentialsManager.getToken()
+            if (!username.isNullOrBlank() && !token.isNullOrBlank()) {
+                viewModel.push(username, token)
+            } else {
+                showCredentialsDialog()
+            }
+        }
+
+        viewLifecycleOwner.lifecycleScope.launch {
+            viewModel.localCommitsCount.collectLatest { count ->
+                binding.btnPush.visibility = if (count > 0) View.VISIBLE else View.GONE
+            }
+        }
+
+        viewLifecycleOwner.lifecycleScope.launch {
+            viewModel.pushState.collectLatest { state ->
+                when (state) {
+                    is GitBottomSheetViewModel.PushUiState.Idle -> {
+                        binding.btnPush.isEnabled = true
+                        binding.btnPush.text = getString(R.string.push)
+                        binding.pushProgress.visibility = View.GONE
+                    }
+                    is GitBottomSheetViewModel.PushUiState.Pushing -> {
+                        binding.btnPush.isEnabled = false
+                        binding.pushProgress.visibility = View.VISIBLE
+                    }
+                    is GitBottomSheetViewModel.PushUiState.Success -> {
+                        binding.btnPush.isEnabled = true
+                        binding.pushProgress.visibility = View.GONE
+                        flashSuccess(R.string.push_successful)
+                        viewModel.resetPushState()
+                        dismiss()
+                    }
+                    is GitBottomSheetViewModel.PushUiState.Error -> {
+                        binding.btnPush.isEnabled = true
+                        binding.pushProgress.visibility = View.GONE
+                        val message =
+                            state.errorResId?.let { getString(it) } ?: state.message
+                        MaterialAlertDialogBuilder(requireContext())
+                            .setTitle(R.string.push_failed)
+                            .setMessage(message)
+                            .setPositiveButton(android.R.string.ok, null)
+                            .show()
+                    }
+                }
+            }
+        }
+
+    }
+
+    private fun showCredentialsDialog() {
+        val dialogBinding = DialogGitCredentialsBinding.inflate(layoutInflater)
+
+        dialogBinding.username.setText(credentialsManager.getUsername())
+        dialogBinding.token.setText(credentialsManager.getToken())
+
+        MaterialAlertDialogBuilder(requireContext())
+            .setTitle(R.string.git_credentials_title)
+            .setView(dialogBinding.root)
+            .setPositiveButton(R.string.push) { _, _ ->
+                val username = dialogBinding.username.text?.toString()?.trim()
+                val token = dialogBinding.token.text?.toString()?.trim()
+                if (!username.isNullOrBlank() && !token.isNullOrBlank()) {
+                    viewModel.push(username, token)
+                }
+            }
+            .setNeutralButton(R.string.git_credentials_clear) { _, _ ->
+                credentialsManager.clearCredentials()
+            }
+            .setNegativeButton(android.R.string.cancel, null)
+            .show()
     }
 
     override fun onDestroyView() {

app/src/main/java/com/itsaky/androidide/fragments/git/GitDiffViewerDialog.kt

@@ -12,19 +12,19 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.core.content.ContextCompat.getColor
 import androidx.fragment.app.DialogFragment
-import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.lifecycleScope
 import com.itsaky.androidide.R
 import com.itsaky.androidide.databinding.DialogGitDiffBinding
 import com.itsaky.androidide.viewmodel.GitBottomSheetViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import org.koin.androidx.viewmodel.ext.android.activityViewModel
 import java.io.File
 
 class GitDiffViewerDialog : DialogFragment() {
 
-    private val viewModel: GitBottomSheetViewModel by activityViewModels()
+    private val viewModel: GitBottomSheetViewModel by activityViewModel()
 
     private var filePath: String = ""
 

app/src/main/java/com/itsaky/androidide/fragments/git/adapter/GitCommitHistoryAdapter.kt

@@ -38,8 +38,8 @@ class GitCommitHistoryAdapter :
                 tvCommitMessage.text = commit.message
                 tvCommitAuthor.text = commit.authorName
                 tvCommitTime.text = dateFormat.format(Date(commit.timestamp))
-                imgNotPushedCommit.setImageResource(if (commit.hasBeenPushed) R.drawable.ic_cloud_done else R.drawable.ic_upload)
-                imgNotPushedCommit.contentDescription = if (commit.hasBeenPushed) {
+                imgCommitStatus.setImageResource(if (commit.hasBeenPushed) R.drawable.ic_cloud_done else R.drawable.ic_upload)
+                imgCommitStatus.contentDescription = if (commit.hasBeenPushed) {
                     binding.root.context.getString(R.string.commit_pushed)
                 } else {
                     binding.root.context.getString(R.string.commit_not_pushed)