fix: merge conflict editor UX

Author: ViscousPot

app/src/main/java/com/viscouspot/gitsync/MainActivity.kt

@@ -643,6 +643,12 @@ class MainActivity : AppCompatActivity() {
                 return@setOnClickListener
             }
 
+            merge.text = "..."
+            merge.isEnabled = false
+            merge.backgroundTintList = ColorStateList.valueOf(getColor(R.color.card_secondary_bg))
+            merge.setTextColor(getColor(R.color.textSecondary))
+            abortMerge.visibility = View.GONE
+
             CoroutineScope(Dispatchers.Default).launch {
                 val authCredentials = settingsManager.getGitAuthCredentials()
                 if (settingsManager.getGitDirUri() == null || authCredentials.first == "" || authCredentials.second == "") return@launch
@@ -714,25 +720,20 @@ class MainActivity : AppCompatActivity() {
                 while (reader.readLine().also { line = it } != null) {
                     lineCount += 1
                     when {
-                        inConflict -> {
-                            conflictBuilder.append(line).append("\n")
-                        }
-                        line!!.startsWith(getString(R.string.conflict_start)) -> {
-                            if (conflictBuilder.isNotEmpty()) {
-                                conflictSections.add(conflictBuilder.toString().trim())
-                                conflictEditorInput.adapter?.notifyItemInserted(conflictSections.size)
-                                conflictBuilder.clear()
-                            }
-                            inConflict = true
-                            conflictBuilder.append(line).append("\n")
-                        }
                         line!!.startsWith(getString(R.string.conflict_end)) -> {
                             conflictBuilder.append(line)
                             conflictSections.add(conflictBuilder.toString().trim())
                             conflictEditorInput.adapter?.notifyItemInserted(conflictSections.size)
                             conflictBuilder.clear()
                             inConflict = false
                         }
+                        inConflict -> {
+                            conflictBuilder.append(line).append("\n")
+                        }
+                        line!!.startsWith(getString(R.string.conflict_start)) -> {
+                            inConflict = true
+                            conflictBuilder.append(line).append("\n")
+                        }
                         else -> {
                             conflictSections.add(line!!.trim())
                             conflictEditorInput.adapter?.notifyItemInserted(conflictSections.size)

app/src/main/java/com/viscouspot/gitsync/ui/adapter/ConflictEditorAdapter.kt

@@ -70,7 +70,7 @@ class ConflictEditorAdapter (
 
                 val lines = dataSet[position].split("\n")
                 val startIndex = lines.indexOfFirst { it.contains(context.getString(R.string.conflict_start)) }
-                val midIndex = lines.indexOfLast { it.contains(context.getString(R.string.conflict_separator)) }
+                val midIndex = lines.indexOfFirst { it.contains(context.getString(R.string.conflict_separator)) }
                 val endIndex = lines.indexOfLast { it.contains(context.getString(R.string.conflict_end)) }
 
                 val localLines = lines.subList(startIndex+1, midIndex)

app/src/main/java/com/viscouspot/gitsync/util/GitManager.kt

@@ -285,10 +285,12 @@ class GitManager(private val context: Context, private val activity: AppCompatAc
                     remote = "origin"
                 }
                 if (result.mergeResult.failingPaths != null && result.mergeResult.failingPaths.containsValue(ResolveMerger.MergeFailureReason.DIRTY_WORKTREE)) {
+                    log(LogType.PullFromRepo, "Merge conflict")
                     return false
                 }
 
                 if (!result.mergeResult.mergeStatus.isSuccessful) {
+                    log(LogType.PullFromRepo, "Checkout conflict")
                     sendCheckoutConflictNotification(context)
                     return null
                 }
@@ -309,6 +311,7 @@ class GitManager(private val context: Context, private val activity: AppCompatAc
             return false
         } catch (e: WrongRepositoryStateException) {
             if (e.message?.contains(context.getString(R.string.merging_exception_message)) == true) {
+                log(LogType.PullFromRepo, "Merge conflict")
                 return false
             }
             log(context, LogType.PullFromRepo, e)