Skip to content

fix: add proper spacing and prevent truncation in lap text views #365

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
naveensingh merged 6 commits into from
Jan 22, 2026
Merged

fix: add proper spacing and prevent truncation in lap text views #365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1df4bd1
Increase dimensions of lap_time_size to accomodate full text value wh…
KidScripty Jan 4, 2026
6657a56
Stopwatch Lap Times View:
Jan 5, 2026
204c003
Reverting dimens back to original value as this is not the fix.
Jan 5, 2026
187b275
fix: ensure proper column alignment
naveensingh Jan 22, 2026
9260b86
fix: align sorting indicator columns with lap columns
naveensingh Jan 22, 2026
3129880
docs: update changelog
naveensingh Jan 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
17 changes: 12 additions & 5 deletions app/src/main/res/layout-land/fragment_stopwatch.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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" />

Expand Down
15 changes: 11 additions & 4 deletions app/src/main/res/layout/fragment_stopwatch.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,35 +35,42 @@
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"
tools:visibility="visible">

<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" />

Expand Down
26 changes: 15 additions & 11 deletions app/src/main/res/layout/item_lap.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,50 +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="@dimen/lap_time_size"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/medium_margin"
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="packed"
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="@dimen/lap_time_size"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/medium_margin"
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="@dimen/lap_time_size"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="48dp"
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>
1 change: 0 additions & 1 deletion app/src/main/res/values/dimens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading