refactor(ADFA-2883): Minor changes

Author: dara-abijo-adfa

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

@@ -5,7 +5,6 @@ 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
@@ -20,14 +19,16 @@ 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 lateinit var credentialsManager: GitCredentialsManager
+    private val credentialsManager: GitCredentialsManager by inject()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -46,7 +47,6 @@ class GitCommitHistoryDialog : DialogFragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         commitHistoryAdapter = GitCommitHistoryAdapter()
-        credentialsManager = GitCredentialsManager(requireContext())
         val linearLayoutManager = LinearLayoutManager(requireContext())
         val dividerItemDecoration = DividerItemDecoration(
             binding.rvCommitHistory.context,
@@ -121,7 +121,6 @@ class GitCommitHistoryDialog : DialogFragment() {
                     }
                     is GitBottomSheetViewModel.PushUiState.Pushing -> {
                         binding.btnPush.isEnabled = false
-                        binding.btnPush.text = null
                         binding.pushProgress.visibility = View.VISIBLE
                     }
                     is GitBottomSheetViewModel.PushUiState.Success -> {

app/src/main/java/com/itsaky/androidide/viewmodel/GitBottomSheetViewModel.kt

@@ -307,14 +307,14 @@ class GitBottomSheetViewModel(private val credentialsManager: GitCredentialsMana
         object Idle : PullUiState()
         object Pulling : PullUiState()
         object Success : PullUiState()
-        data class Error(val message: String? = "", val errorResId: Int? = R.string.unknown_error) : PullUiState()
+        data class Error(val message: String? = null, val errorResId: Int? = R.string.unknown_error) : PullUiState()
     }
 
     sealed class PushUiState {
         object Idle : PushUiState()
         object Pushing : PushUiState()
         object Success : PushUiState()
-        data class Error(val message: String? = "", val errorResId: Int? = R.string.unknown_error) : PushUiState()
+        data class Error(val message: String? = null, val errorResId: Int? = R.string.unknown_error) : PushUiState()
     }
 
     @Subscribe(threadMode = ThreadMode.MAIN)

git-core/src/main/java/com/itsaky/androidide/git/core/GitCredentialsManager.kt

@@ -52,8 +52,7 @@ class GitCredentialsManager(
     fun getToken(): String? = decrypt(KEY_TOKEN_IV, KEY_TOKEN_DATA)
 
     fun hasCredentials(): Boolean {
-        val prefs = getPrefs()
-        return prefs.contains(KEY_USERNAME_DATA) && prefs.contains(KEY_TOKEN_DATA)
+        return !getUsername().isNullOrBlank() && !getToken().isNullOrBlank()
     }
 
     private fun decrypt(ivKey: String, dataKey: String): String? {

resources/src/main/res/values/strings.xml

@@ -1216,7 +1216,7 @@
     <string name="desc_file_untracked">File untracked</string>
     <string name="desc_file_renamed">File renamed</string>
     <string name="desc_file_conflicted">File conflicted</string>
-    <string name="cancel_clone">Cancel cl.one</string>
+    <string name="cancel_clone">Cancel clone</string>
     <string name="initialising_clone">Initialising clone…</string>
     <string name="cancelling_clone">Cancelling clone…</string>