From 1fe83829490e11899e8018625398107997bcf9f3 Mon Sep 17 00:00:00 2001 From: Forcosigan Date: Thu, 15 Oct 2026 15:22:40 +0300 Subject: [PATCH 1/2] UI: constrain text views to prevent overflow and enable multiline wrapping --- .../main/res/layout/fragment_remotes_item.xml | 6 +- .../main/res/layout/fragment_tasks_item.xml | 38 +++++------ .../layout/fragment_trigger_item_interval.xml | 15 ++-- .../layout/fragment_trigger_item_schedule.xml | 68 ++++++++++--------- 4 files changed, 67 insertions(+), 60 deletions(-) diff --git a/app/src/main/res/layout/fragment_remotes_item.xml b/app/src/main/res/layout/fragment_remotes_item.xml index fab3e33a4..390b40c75 100644 --- a/app/src/main/res/layout/fragment_remotes_item.xml +++ b/app/src/main/res/layout/fragment_remotes_item.xml @@ -35,12 +35,14 @@ diff --git a/app/src/main/res/layout/fragment_tasks_item.xml b/app/src/main/res/layout/fragment_tasks_item.xml index 2149b9b30..31cc7d6d5 100644 --- a/app/src/main/res/layout/fragment_tasks_item.xml +++ b/app/src/main/res/layout/fragment_tasks_item.xml @@ -33,12 +33,14 @@ @@ -81,7 +83,7 @@ android:id="@+id/task_sync_direction" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginEnd="32dp" + android:layout_marginEnd="16dp" android:text="@string/sync" android:textSize="12sp" android:textStyle="italic" @@ -93,6 +95,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="16dp" + android:layout_marginEnd="8dp" android:orientation="vertical" app:layout_constraintBottom_toBottomOf="@+id/toLabel" app:layout_constraintEnd_toStartOf="@+id/file_options" @@ -103,54 +106,45 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="start" - android:orientation="horizontal"> + android:orientation="vertical"> + tools:text="fromid:" /> + tools:text="fromPath" /> + android:orientation="vertical"> + tools:text="toid:" /> + tools:text="toPath" /> diff --git a/app/src/main/res/layout/fragment_trigger_item_interval.xml b/app/src/main/res/layout/fragment_trigger_item_interval.xml index b19dcb94c..aeb3c154f 100644 --- a/app/src/main/res/layout/fragment_trigger_item_interval.xml +++ b/app/src/main/res/layout/fragment_trigger_item_interval.xml @@ -34,12 +34,14 @@ @@ -59,7 +61,7 @@ + app:layout_constraintTop_toTopOf="@+id/trigger_target_label" + tools:text="Target Task" /> diff --git a/app/src/main/res/layout/fragment_trigger_item_schedule.xml b/app/src/main/res/layout/fragment_trigger_item_schedule.xml index f23e65ff1..166c8f999 100644 --- a/app/src/main/res/layout/fragment_trigger_item_schedule.xml +++ b/app/src/main/res/layout/fragment_trigger_item_schedule.xml @@ -34,12 +34,14 @@ @@ -62,99 +64,103 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4dp" - android:layout_marginBottom="8dp" android:text="@string/trigger_time_label" - app:layout_constraintBottom_toTopOf="@+id/linearLayout" app:layout_constraintStart_toStartOf="@+id/triggerName" app:layout_constraintTop_toBottomOf="@+id/triggerName" /> + app:layout_constraintTop_toTopOf="@+id/text_label_time" + tools:text="04:00" /> + + + + + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/trigger_target"> - - - - From bab41a5356a0ab3b26d1f3248634004d0511fb7e Mon Sep 17 00:00:00 2001 From: Forcosigan Date: Fri, 16 Oct 2026 09:28:03 +0300 Subject: [PATCH 2/2] fix(ui): eliminate bottom padding in tasks and fix weekday overlaps --- .../main/res/layout/fragment_tasks_item.xml | 114 +++++++++--------- .../layout/fragment_trigger_item_schedule.xml | 32 +++-- 2 files changed, 80 insertions(+), 66 deletions(-) diff --git a/app/src/main/res/layout/fragment_tasks_item.xml b/app/src/main/res/layout/fragment_tasks_item.xml index 31cc7d6d5..e0c378a28 100644 --- a/app/src/main/res/layout/fragment_tasks_item.xml +++ b/app/src/main/res/layout/fragment_tasks_item.xml @@ -8,7 +8,7 @@ + android:layout_height="wrap_content"> - - - - + app:layout_constraintStart_toEndOf="@+id/taskIcon" + app:layout_constraintTop_toBottomOf="@+id/taskName"> + android:orientation="horizontal"> + android:text="@string/task_item_label_from" /> - - + android:layout_weight="1" + android:orientation="vertical"> + + + + + + android:layout_marginTop="6dp" + android:orientation="horizontal"> + android:text="@string/task_item_label_to" /> - - + android:layout_weight="1" + android:orientation="vertical"> + + + + + + diff --git a/app/src/main/res/layout/fragment_trigger_item_schedule.xml b/app/src/main/res/layout/fragment_trigger_item_schedule.xml index 166c8f999..59de84afd 100644 --- a/app/src/main/res/layout/fragment_trigger_item_schedule.xml +++ b/app/src/main/res/layout/fragment_trigger_item_schedule.xml @@ -8,7 +8,7 @@ + android:layout_height="wrap_content"> + android:gravity="center" + android:singleLine="true" + android:text="@string/weekday_shorthand_tue" />