From 8f332c94e63e8efe754996a1da8e5c1fa3decd18 Mon Sep 17 00:00:00 2001 From: Joe Tretter Date: Thu, 23 Apr 2026 21:53:30 -0500 Subject: [PATCH] Auto-commit after successful build: update app gameplay/UI, improve build setup Changed files:\napp/build.gradle.kts app/src/main/java/com/kawomi/githugandroid/GitHugApp.kt app/src/main/java/com/kawomi/githugandroid/Panes.kt --- app/build.gradle.kts | 4 ++-- app/src/main/java/com/kawomi/githugandroid/GitHugApp.kt | 3 +-- app/src/main/java/com/kawomi/githugandroid/Panes.kt | 6 ++++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 65aafce..74c7a44 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -11,8 +11,8 @@ android { applicationId = "com.kawomi.githugandroid" minSdk = 26 targetSdk = 34 - versionCode = 47 - versionName = "0.1.46" + versionCode = 49 + versionName = "0.1.48" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true diff --git a/app/src/main/java/com/kawomi/githugandroid/GitHugApp.kt b/app/src/main/java/com/kawomi/githugandroid/GitHugApp.kt index b9cc8b1..1b499f2 100644 --- a/app/src/main/java/com/kawomi/githugandroid/GitHugApp.kt +++ b/app/src/main/java/com/kawomi/githugandroid/GitHugApp.kt @@ -270,8 +270,7 @@ fun GitHugApp() { FixedHeader() PaneWorkspace( modifier = Modifier - .fillMaxWidth() - .height(workspaceHeight), + .fillMaxWidth(), paneLayout = paneLayout, onMovePane = { paneId, delta -> updatePaneLayout(transform = { layout -> movePane(layout, paneId, delta) }) diff --git a/app/src/main/java/com/kawomi/githugandroid/Panes.kt b/app/src/main/java/com/kawomi/githugandroid/Panes.kt index 41cf255..187b2c2 100644 --- a/app/src/main/java/com/kawomi/githugandroid/Panes.kt +++ b/app/src/main/java/com/kawomi/githugandroid/Panes.kt @@ -10,10 +10,12 @@ import androidx.compose.foundation.layout.BoxWithConstraints import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.wrapContentHeight import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.ButtonDefaults import androidx.compose.material3.Card @@ -63,7 +65,7 @@ fun PaneWorkspace( paneId = paneId, modifier = Modifier .fillMaxWidth() - .weight((paneLayout.weights[paneId] ?: 1f).coerceAtLeast(0.6f)), + .wrapContentHeight(), canMoveUp = index > 0, canMoveDown = index < paneLayout.order.lastIndex, onMoveUp = { onMovePane(paneId, -1) }, @@ -82,7 +84,7 @@ fun PaneWorkspace( val upper = paneId val lower = paneLayout.order.getOrNull(index + 1) PaneDivider( - enabled = upper !in paneLayout.collapsed && (lower == null || lower !in paneLayout.collapsed), + enabled = false, onDrag = { deltaPx -> val fraction = deltaPx / heightBasis onResize(upper, lower, fraction)