Merge pull request #16 from pyramidzzzzz/master

truncate display name on ComposeView

Author: ihateblueb

.github/workflows/android.yml

@@ -1,40 +1,40 @@
 name: Build Android APK
 
 on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
+    push:
+        branches: [ master ]
+    pull_request:
+        branches: [ master ]
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+    group: ${{ github.workflow }}-${{ github.ref }}
+    cancel-in-progress: true
 
 jobs:
-  build:
-    name: Build APK
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Set up JDK
-        uses: actions/setup-java@v4
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-          cache: 'gradle'
-
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
-
-      - name: Build APK
-        run: ./gradlew assembleDebug --no-daemon
-
-      - name: Upload APK
-        uses: actions/upload-artifact@v4
-        with:
-          name: apk
-          path: androidApp/build/outputs/apk/debug/*.apk
+    build:
+        name: Build APK
+        runs-on: ubuntu-latest
+        timeout-minutes: 30
+
+        steps:
+            - name: Checkout repository
+              uses: actions/checkout@v4
+
+            - name: Set up JDK
+              uses: actions/setup-java@v4
+              with:
+                  java-version: '17'
+                  distribution: 'temurin'
+                  cache: 'gradle'
+
+            - name: Grant execute permission for gradlew
+              run: chmod +x gradlew
+
+            - name: Build APK
+              run: ./gradlew assembleDebug --no-daemon
+
+            - name: Upload APK
+              uses: actions/upload-artifact@v4
+              with:
+                  name: apk
+                  path: androidApp/build/outputs/apk/debug/*.apk

shared/src/commonMain/kotlin/site/remlit/snowdrop/view/ComposeView.kt

@@ -102,27 +102,32 @@ fun ComposeView() = ViewSurface {
 	) {
 		if (currentAccount != null) {
 			Row(
-				modifier = Modifier.padding(10.dp),
+				modifier = Modifier.padding(10.dp)
+					.fillMaxWidth(),
 				horizontalArrangement = Arrangement.spacedBy(10.dp),
 				verticalAlignment = Alignment.CenterVertically
 			) {
 				Avatar(currentAccount!!)
 
-				Column {
+				Column(
+					modifier = Modifier.weight(1f)
+				) {
 					Text(
 						currentAccount!!.displayName ?: currentAccount!!.username,
-						fontWeight = FontWeight.Medium
+						fontWeight = FontWeight.Medium,
+						overflow = TextOverflow.Ellipsis,
+						maxLines = 1
 					)
 					Text(
 						"@${currentAccount!!.acct}",
 						overflow = TextOverflow.Ellipsis,
 						color = MaterialTheme.colorScheme.onSurfaceVariant,
-						fontSize = 13.sp
+						fontSize = 13.sp,
+						maxLines = 1
 					)
 				}
 
 				Row(
-					modifier = Modifier.fillMaxWidth(),
 					horizontalArrangement = Arrangement.End
 				) {
 					Row {