From 06c60356e55174d17e3c1a3fc91a3c6109aeb98c Mon Sep 17 00:00:00 2001
From: Joe Tretter <j.tretter@gmail.com>
Date: Mon, 8 Jun 2026 14:38:10 -0500
Subject: [PATCH] Unify Git editor presentation

- place Save before Dismiss in Git-backed editors
- rename the Git editor Close action to Dismiss
- match Git editor dialog and content sizing to the vi file editor
---
 app/build.gradle.kts                                      | 4 ++--
 .../tretter/githugandroid/GitMessageEditorDialog.kt       | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 5d0ec81..2266143 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -19,8 +19,8 @@ android {
         applicationId = "solutions.tretter.githugandroid"
         minSdk = 26
         targetSdk = 35
-        versionCode = 168
-        versionName = "0.1.167"
+        versionCode = 169
+        versionName = "0.1.168"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
diff --git a/app/src/main/java/solutions/tretter/githugandroid/GitMessageEditorDialog.kt b/app/src/main/java/solutions/tretter/githugandroid/GitMessageEditorDialog.kt
index 021520a..fe628fe 100644
--- a/app/src/main/java/solutions/tretter/githugandroid/GitMessageEditorDialog.kt
+++ b/app/src/main/java/solutions/tretter/githugandroid/GitMessageEditorDialog.kt
@@ -76,7 +76,7 @@ fun GitMessageEditorDialog(
             Surface(
                 modifier = Modifier
                     .fillMaxWidth()
-                    .heightIn(min = 320.dp, max = 620.dp),
+                    .heightIn(min = 360.dp, max = 720.dp),
                 color = PanelPrimary,
                 shape = RoundedCornerShape(8.dp),
             ) {
@@ -94,8 +94,8 @@ fun GitMessageEditorDialog(
                         modifier = Modifier.fillMaxWidth(),
                         horizontalArrangement = Arrangement.spacedBy(8.dp),
                     ) {
-                        EditorButton(label = "Close", onClick = onClose)
                         EditorButton(label = "Save", enabled = state.content.isNotBlank(), onClick = onSave)
+                        EditorButton(label = "Dismiss", onClick = onClose)
                     }
                     Text(
                         text = state.invocation.command,
@@ -107,7 +107,7 @@ fun GitMessageEditorDialog(
                         modifier = Modifier
                             .fillMaxWidth()
                             .weight(1f)
-                            .heightIn(min = 220.dp)
+                            .heightIn(min = 260.dp)
                             .background(TerminalBackground, RoundedCornerShape(6.dp))
                             .padding(10.dp)
                             .horizontalScroll(horizontalScroll)
@@ -117,7 +117,7 @@ fun GitMessageEditorDialog(
                             value = state.content,
                             onValueChange = onContentChange,
                             modifier = Modifier
-                                .sizeIn(minWidth = 1000.dp, minHeight = 700.dp)
+                                .sizeIn(minWidth = 1200.dp, minHeight = 1200.dp)
                                 .focusRequester(contentFocusRequester),
                             textStyle = TextStyle(
                                 color = TextPrimary,