From 1df4bd174e664cd0e3ac62aaa624bf0a4f7e38c6 Mon Sep 17 00:00:00 2001
From: Ash Hier <ashleyhier1@googlemail.com>
Date: Sun, 4 Jan 2026 20:01:25 +0000
Subject: [PATCH 1/6] Increase dimensions of lap_time_size to accomodate full
 text value when lap time is longer than minutes e.g. 00:00.00 (#1)

Co-authored-by: AshBash <ash@tuxbet.com>
---
 app/src/main/res/values/dimens.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index e347031e..19bda009 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -3,7 +3,7 @@
     <dimen name="stopwatch_button_small_size">60dp</dimen>
     <dimen name="stopwatch_button_size">64dp</dimen>
     <dimen name="reminder_background_min_size">70dp</dimen>
-    <dimen name="lap_time_size">80dp</dimen>
+    <dimen name="lap_time_size">120dp</dimen>
     <dimen name="widget_alarm_icon_size">18dp</dimen>
     <dimen name="widget_digital_time_height">48dp</dimen>
     <dimen name="widget_analogue_time_height">96dp</dimen>

From 6657a561910985c2249a532c4809aa45ca3d7bfa Mon Sep 17 00:00:00 2001
From: AshBash <ash@tuxbet.com>
Date: Mon, 5 Jan 2026 14:32:32 +0000
Subject: [PATCH 2/6] Stopwatch Lap Times View:

Adjusted layout width to wrap content so as the number of digits increases, so does the width of the box.

Set the minWidth to the lap size dimension (for initial width)

changed the layoutmethod from Packed to Spread Inside to prevent misalignment when number of digits in different laps is different. e.g when some laps are seconds long and others greater than 1 minute.

Added margins at the end of the Lap Order and Lap Time Size boxes ensuring that when times are greater than 1 minute the values aren't too close together.
---
 app/src/main/res/layout/item_lap.xml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/src/main/res/layout/item_lap.xml b/app/src/main/res/layout/item_lap.xml
index 0a34352d..9aa18c79 100644
--- a/app/src/main/res/layout/item_lap.xml
+++ b/app/src/main/res/layout/item_lap.xml
@@ -11,22 +11,26 @@
 
     <org.fossify.commons.views.MyTextView
         android:id="@+id/lap_order"
-        android:layout_width="@dimen/lap_time_size"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/medium_margin"
+        android:minWidth="@dimen/lap_time_size"
         android:fontFeatureSettings="tnum"
         android:gravity="end"
         android:includeFontPadding="false"
         android:maxLines="1"
         android:textSize="@dimen/bigger_text_size"
         app:layout_constraintEnd_toStartOf="@+id/lap_lap_time"
-        app:layout_constraintHorizontal_chainStyle="packed"
+        app:layout_constraintHorizontal_chainStyle="spread_inside"
         app:layout_constraintStart_toStartOf="parent"
         tools:text="1" />
 
     <org.fossify.commons.views.MyTextView
         android:id="@+id/lap_lap_time"
-        android:layout_width="@dimen/lap_time_size"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/medium_margin"
+        android:minWidth="@dimen/lap_time_size"
         android:fontFeatureSettings="tnum"
         android:gravity="end"
         android:includeFontPadding="false"
@@ -39,9 +43,10 @@
 
     <org.fossify.commons.views.MyTextView
         android:id="@+id/lap_total_time"
-        android:layout_width="@dimen/lap_time_size"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="48dp"
+        android:minWidth="@dimen/lap_time_size"
         android:fontFeatureSettings="tnum"
         android:gravity="end"
         android:includeFontPadding="false"

From 204c003c56fe0f6ea0aee68480f0fd0436df58d3 Mon Sep 17 00:00:00 2001
From: AshBash <ash@tuxbet.com>
Date: Mon, 5 Jan 2026 14:50:37 +0000
Subject: [PATCH 3/6] Reverting dimens back to original value as this is not
 the fix.

---
 app/src/main/res/values/dimens.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 19bda009..e347031e 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -3,7 +3,7 @@
     <dimen name="stopwatch_button_small_size">60dp</dimen>
     <dimen name="stopwatch_button_size">64dp</dimen>
     <dimen name="reminder_background_min_size">70dp</dimen>
-    <dimen name="lap_time_size">120dp</dimen>
+    <dimen name="lap_time_size">80dp</dimen>
     <dimen name="widget_alarm_icon_size">18dp</dimen>
     <dimen name="widget_digital_time_height">48dp</dimen>
     <dimen name="widget_analogue_time_height">96dp</dimen>

From 187b2757114f5c732e0e63038833aadf7441cb8b Mon Sep 17 00:00:00 2001
From: Naveen Singh <snaveen935@gmail.com>
Date: Fri, 23 Jan 2026 00:21:58 +0530
Subject: [PATCH 4/6] fix: ensure proper column alignment

- Removed chaining in favor of weighted columns. Wrapping content and chaining the views to maximize space per column leads to uneven/random column positions per row with large text size.
- Removed hardcoded 48dp end margin. It's not necessary anymore.
- Added even container padding on the right side.
---
 app/src/main/res/layout/item_lap.xml | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/app/src/main/res/layout/item_lap.xml b/app/src/main/res/layout/item_lap.xml
index 9aa18c79..e4868ba3 100644
--- a/app/src/main/res/layout/item_lap.xml
+++ b/app/src/main/res/layout/item_lap.xml
@@ -6,55 +6,54 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center_horizontal"
-    android:paddingVertical="@dimen/small_margin"
-    android:paddingLeft="@dimen/activity_margin">
+    android:paddingHorizontal="@dimen/big_margin"
+    android:paddingVertical="@dimen/small_margin">
 
     <org.fossify.commons.views.MyTextView
         android:id="@+id/lap_order"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/medium_margin"
-        android:minWidth="@dimen/lap_time_size"
         android:fontFeatureSettings="tnum"
-        android:gravity="end"
+        android:gravity="center"
         android:includeFontPadding="false"
         android:maxLines="1"
         android:textSize="@dimen/bigger_text_size"
         app:layout_constraintEnd_toStartOf="@+id/lap_lap_time"
-        app:layout_constraintHorizontal_chainStyle="spread_inside"
+        app:layout_constraintHorizontal_weight="0.8"
         app:layout_constraintStart_toStartOf="parent"
-        tools:text="1" />
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="12" />
 
     <org.fossify.commons.views.MyTextView
         android:id="@+id/lap_lap_time"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/medium_margin"
-        android:minWidth="@dimen/lap_time_size"
         android:fontFeatureSettings="tnum"
         android:gravity="end"
         android:includeFontPadding="false"
         android:maxLines="1"
         android:textSize="@dimen/bigger_text_size"
         app:layout_constraintEnd_toStartOf="@+id/lap_total_time"
+        app:layout_constraintHorizontal_weight="2.1"
         app:layout_constraintStart_toEndOf="@+id/lap_order"
         app:layout_constraintTop_toTopOf="parent"
-        tools:text="0.00" />
+        tools:text="24:43:00" />
 
     <org.fossify.commons.views.MyTextView
         android:id="@+id/lap_total_time"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="48dp"
-        android:minWidth="@dimen/lap_time_size"
         android:fontFeatureSettings="tnum"
         android:gravity="end"
         android:includeFontPadding="false"
         android:maxLines="1"
         android:textSize="@dimen/bigger_text_size"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_weight="2.1"
         app:layout_constraintStart_toEndOf="@+id/lap_lap_time"
         app:layout_constraintTop_toTopOf="parent"
-        tools:text="0.00.00" />
+        tools:text="42:26:43:00" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

From 9260b8679cc5da1d68452fb821738345507a3f18 Mon Sep 17 00:00:00 2001
From: Naveen Singh <snaveen935@gmail.com>
Date: Fri, 23 Jan 2026 00:23:14 +0530
Subject: [PATCH 5/6] fix: align sorting indicator columns with lap columns

They were still using the original 80dp width.
---
 .../main/res/layout-land/fragment_stopwatch.xml | 17 ++++++++++++-----
 app/src/main/res/layout/fragment_stopwatch.xml  | 15 +++++++++++----
 app/src/main/res/values/dimens.xml              |  1 -
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/app/src/main/res/layout-land/fragment_stopwatch.xml b/app/src/main/res/layout-land/fragment_stopwatch.xml
index 772c0202..629de966 100644
--- a/app/src/main/res/layout-land/fragment_stopwatch.xml
+++ b/app/src/main/res/layout-land/fragment_stopwatch.xml
@@ -31,9 +31,10 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/stopwatch_sorting_indicators_holder"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/small_margin"
+        android:paddingHorizontal="@dimen/big_margin"
         android:visibility="invisible"
         app:layout_constraintBottom_toTopOf="@id/stopwatch_list"
         app:layout_constraintEnd_toEndOf="@id/stopwatch_list"
@@ -43,28 +44,34 @@
 
         <ImageView
             android:id="@+id/stopwatch_sorting_indicator_1"
-            android:layout_width="@dimen/lap_time_size"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/medium_margin"
             android:visibility="invisible"
             app:layout_constraintEnd_toStartOf="@+id/stopwatch_sorting_indicator_2"
             app:layout_constraintHorizontal_chainStyle="packed"
-            app:layout_constraintStart_toStartOf="parent" />
+            app:layout_constraintHorizontal_weight="0.8"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <ImageView
             android:id="@+id/stopwatch_sorting_indicator_2"
-            android:layout_width="@dimen/lap_time_size"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/medium_margin"
             android:visibility="invisible"
             app:layout_constraintEnd_toStartOf="@+id/stopwatch_sorting_indicator_3"
+            app:layout_constraintHorizontal_weight="2.1"
             app:layout_constraintStart_toEndOf="@+id/stopwatch_sorting_indicator_1"
             app:layout_constraintTop_toTopOf="parent" />
 
         <ImageView
             android:id="@+id/stopwatch_sorting_indicator_3"
-            android:layout_width="@dimen/lap_time_size"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:visibility="invisible"
             app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_weight="2.1"
             app:layout_constraintStart_toEndOf="@+id/stopwatch_sorting_indicator_2"
             app:layout_constraintTop_toTopOf="parent" />
 
diff --git a/app/src/main/res/layout/fragment_stopwatch.xml b/app/src/main/res/layout/fragment_stopwatch.xml
index 2ffca417..3f0b1420 100644
--- a/app/src/main/res/layout/fragment_stopwatch.xml
+++ b/app/src/main/res/layout/fragment_stopwatch.xml
@@ -35,6 +35,7 @@
         android:id="@+id/stopwatch_sorting_indicators_holder"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:paddingHorizontal="@dimen/big_margin"
         android:visibility="invisible"
         app:layout_constraintBottom_toTopOf="@id/stopwatch_list"
         app:layout_constraintTop_toBottomOf="@+id/stopwatch_time"
@@ -42,28 +43,34 @@
 
         <ImageView
             android:id="@+id/stopwatch_sorting_indicator_1"
-            android:layout_width="@dimen/lap_time_size"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/medium_margin"
             android:visibility="invisible"
             app:layout_constraintEnd_toStartOf="@+id/stopwatch_sorting_indicator_2"
             app:layout_constraintHorizontal_chainStyle="packed"
-            app:layout_constraintStart_toStartOf="parent" />
+            app:layout_constraintHorizontal_weight="0.8"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <ImageView
             android:id="@+id/stopwatch_sorting_indicator_2"
-            android:layout_width="@dimen/lap_time_size"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/medium_margin"
             android:visibility="invisible"
             app:layout_constraintEnd_toStartOf="@+id/stopwatch_sorting_indicator_3"
+            app:layout_constraintHorizontal_weight="2.2"
             app:layout_constraintStart_toEndOf="@+id/stopwatch_sorting_indicator_1"
             app:layout_constraintTop_toTopOf="parent" />
 
         <ImageView
             android:id="@+id/stopwatch_sorting_indicator_3"
-            android:layout_width="@dimen/lap_time_size"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:visibility="invisible"
             app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_weight="2.2"
             app:layout_constraintStart_toEndOf="@+id/stopwatch_sorting_indicator_2"
             app:layout_constraintTop_toTopOf="parent" />
 
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index e347031e..59c03091 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -3,7 +3,6 @@
     <dimen name="stopwatch_button_small_size">60dp</dimen>
     <dimen name="stopwatch_button_size">64dp</dimen>
     <dimen name="reminder_background_min_size">70dp</dimen>
-    <dimen name="lap_time_size">80dp</dimen>
     <dimen name="widget_alarm_icon_size">18dp</dimen>
     <dimen name="widget_digital_time_height">48dp</dimen>
     <dimen name="widget_analogue_time_height">96dp</dimen>

From 3129880c2de9e3c5af76a33ce0dbbce7c7043cdf Mon Sep 17 00:00:00 2001
From: Naveen Singh <snaveen935@gmail.com>
Date: Fri, 23 Jan 2026 00:25:42 +0530
Subject: [PATCH 6/6] docs: update changelog

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d603b7cc..2c12c471 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Fixed
+- Fixed overlap/truncation in stopwatch lap times ([#346])
 
 ## [1.5.0] - 2025-12-16
 ### Changed
@@ -100,6 +102,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [#207]: https://github.com/FossifyOrg/Clock/issues/207
 [#247]: https://github.com/FossifyOrg/Clock/issues/247
 [#335]: https://github.com/FossifyOrg/Clock/issues/335
+[#346]: https://github.com/FossifyOrg/Clock/issues/346
 
 [Unreleased]: https://github.com/FossifyOrg/Clock/compare/1.5.0...HEAD
 [1.5.0]: https://github.com/FossifyOrg/Clock/compare/1.4.0...1.5.0