From 8120f1a5754e56eeb782a9f6d2a226a34821d6ee Mon Sep 17 00:00:00 2001
From: humster <jrik2308@gmail.com>
Date: Sat, 18 Jul 2026 00:04:20 +0300
Subject: [PATCH] =?UTF-8?q?fix:=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=20layout=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80?=
 =?UTF-8?q?=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B4=D0=BE=D1=85=D0=BE?=
 =?UTF-8?q?=D0=B4=D0=BE=D0=B2=20=D0=BD=D0=B0=20=D1=8D=D0=BA=D1=80=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=B5=20=D1=81=D1=82=D0=B0=D1=82=D0=B8=D1=81=D1=82=D0=B8?=
 =?UTF-8?q?=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- EarningsCard: добавлен Spacer между описанием и суммой, ограничение
  описания до 2 строк с Ellipsis, выравнивание суммы по правому краю
- BreakdownRow: padding vertical 2→4dp, label получает weight(1f),
  сумма выровнена по правому краю через TextAlign.End
- SummaryRow: те же правки — padding 2→4dp, weight(1f) для label,
  TextAlign.End для значения
- EarningsBarChart: добавлен TextOverflow.Clip для меток оси X
---
 .../com/yaros/shiftmanager/EarningsChart.kt   |  1 +
 .../com/yaros/shiftmanager/Staticanager.kt    | 41 ++++++++++++++-----
 2 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/yaros/shiftmanager/EarningsChart.kt b/app/src/main/java/com/yaros/shiftmanager/EarningsChart.kt
index bc42ed0..d2674dc 100644
--- a/app/src/main/java/com/yaros/shiftmanager/EarningsChart.kt
+++ b/app/src/main/java/com/yaros/shiftmanager/EarningsChart.kt
@@ -85,6 +85,7 @@ fun EarningsBarChart(
                     color = labelColor,
                     textAlign = TextAlign.Center,
                     maxLines = 1,
+                    overflow = androidx.compose.ui.text.style.TextOverflow.Clip,
                     modifier = Modifier.weight(1f)
                 )
             }
diff --git a/app/src/main/java/com/yaros/shiftmanager/Staticanager.kt b/app/src/main/java/com/yaros/shiftmanager/Staticanager.kt
index 066c42c..2e3e4c1 100644
--- a/app/src/main/java/com/yaros/shiftmanager/Staticanager.kt
+++ b/app/src/main/java/com/yaros/shiftmanager/Staticanager.kt
@@ -237,14 +237,19 @@ private fun EarningsCard(
                 Text(
                     text = description,
                     style = MaterialTheme.typography.bodySmall,
-                    color = MaterialTheme.colorScheme.onSurfaceVariant
+                    color = MaterialTheme.colorScheme.onSurfaceVariant,
+                    maxLines = 2,
+                    overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis
                 )
             }
+            Spacer(Modifier.width(8.dp))
             Text(
                 text = "${currencySymbol}${String.format(Locale.getDefault(), "%.2f", amount)}",
                 style = MaterialTheme.typography.titleLarge,
                 fontWeight = FontWeight.Bold,
-                color = color
+                color = color,
+                maxLines = 1,
+                textAlign = androidx.compose.ui.text.style.TextAlign.End
             )
         }
     }
@@ -295,13 +300,19 @@ private fun BreakdownRow(
     style: androidx.compose.ui.text.TextStyle
 ) {
     Row(
-        modifier = Modifier.fillMaxWidth().padding(vertical = 2.dp),
-        horizontalArrangement = Arrangement.SpaceBetween
+        modifier = Modifier.fillMaxWidth().padding(vertical = 4.dp),
+        horizontalArrangement = Arrangement.SpaceBetween,
+        verticalAlignment = Alignment.CenterVertically
     ) {
-        Text(label, style = style)
+        Text(
+            label,
+            style = style,
+            modifier = Modifier.weight(1f)
+        )
         Text(
             "${currencySymbol}${String.format(Locale.getDefault(), "%.2f", amount)}",
-            style = style
+            style = style,
+            textAlign = androidx.compose.ui.text.style.TextAlign.End
         )
     }
 }
@@ -384,11 +395,21 @@ private fun ShiftsSummary(shifts: List<Shift>, currencySymbol: String, templates
 @Composable
 private fun SummaryRow(label: String, value: String) {
     Row(
-        modifier = Modifier.fillMaxWidth().padding(vertical = 2.dp),
-        horizontalArrangement = Arrangement.SpaceBetween
+        modifier = Modifier.fillMaxWidth().padding(vertical = 4.dp),
+        horizontalArrangement = Arrangement.SpaceBetween,
+        verticalAlignment = Alignment.CenterVertically
     ) {
-        Text(label, style = MaterialTheme.typography.bodyMedium)
-        Text(value, style = MaterialTheme.typography.bodyMedium, fontWeight = FontWeight.Medium)
+        Text(
+            label,
+            style = MaterialTheme.typography.bodyMedium,
+            modifier = Modifier.weight(1f)
+        )
+        Text(
+            value,
+            style = MaterialTheme.typography.bodyMedium,
+            fontWeight = FontWeight.Medium,
+            textAlign = androidx.compose.ui.text.style.TextAlign.End
+        )
     }
 }