Ellipsize title in side panel if collapsed and always in actionbar

mtotschnig · Oct 19, 2024 · 3eba2b2 · 3eba2b2
1 parent e22ad6b
commit 3eba2b2
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 11 deletions.
diff --git a/myExpenses/src/main/java/org/totschnig/myexpenses/compose/AccountList.kt b/myExpenses/src/main/java/org/totschnig/myexpenses/compose/AccountList.kt
@@ -41,6 +41,7 @@ import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
@@ -196,8 +197,6 @@ fun AccountCard(
     val showMenu = remember { mutableStateOf(false) }
     val activatedBackgroundColor = colorResource(id = R.color.activatedBackground)
 
-    Timber.i("Account %s isCollapsed: %b", account.label, isCollapsed)
-
     Column(
         modifier = Modifier
             .conditional(isSelected) {
@@ -264,14 +263,18 @@ fun AccountCard(
             }
 
             Column(modifier = Modifier.weight(1f)) {
-                Text(text = account.label)
+                Text(
+                    text = account.label,
+                    maxLines =  if (isCollapsed) 1 else Int.MAX_VALUE,
+                    overflow = if (isCollapsed) TextOverflow.Ellipsis else TextOverflow.Clip
+                )
                 AnimatedVisibility(visible = isCollapsed) {
                     Text(
                         text = format.convAmount(account.currentBalance, account.currencyUnit)
                     )
                 }
-
             }
+
             ExpansionHandle(isExpanded = !isCollapsed, toggle = toggleExpansion)
             val menu = Menu(
                 buildList {

diff --git a/myExpenses/src/main/res/layout/toolbar_with_progress.xml b/myExpenses/src/main/res/layout/toolbar_with_progress.xml
@@ -16,46 +16,50 @@
             android:id="@+id/donut_view"
             android:layout_width="42dp"
             android:layout_height="42dp"
+            android:layout_marginEnd="5dp"
             app:donut_cap="100"
             app:donut_gapAngle="0"
             app:donut_gapWidth="0"
             app:donut_strokeWidth="@dimen/progress_donut_stroke_width"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/title"
             app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
             android:id="@+id/progress_percent"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:layout_constraintTop_toTopOf="@id/donut_view"
+            android:textSize="12dp"
             app:layout_constraintBottom_toBottomOf="@id/donut_view"
-            app:layout_constraintStart_toStartOf="@id/donut_view"
             app:layout_constraintEnd_toEndOf="@id/donut_view"
-            android:textSize="12dp"
+            app:layout_constraintStart_toStartOf="@id/donut_view"
+            app:layout_constraintTop_toTopOf="@id/donut_view"
             tools:ignore="SpUsage" />
 
         <TextView
             android:id="@+id/title"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="5dp"
-            android:layout_marginTop="2dp"
+            android:ellipsize="end"
+            android:singleLine="true"
             android:textAppearance="@style/ToolbarTitleTextAppearance"
             app:layout_constraintBottom_toTopOf="@id/subtitle"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/donut_view"
             app:layout_constraintTop_toTopOf="parent" />
+
         <TextView
             android:id="@+id/subtitle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="5dp"
             android:layout_marginTop="2dp"
+            android:ellipsize="end"
+            android:singleLine="true"
             android:textAppearance="@style/ToolbarSubtitleTextAppearance"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/donut_view"
+            app:layout_constraintStart_toStartOf="@id/title"
             app:layout_constraintTop_toBottomOf="@id/title" />