Skip to content

fix: ui tweaks#4696

Merged
jamesarich merged 4 commits intomainfrom
fix/notif-string
Mar 3, 2026
Merged

fix: ui tweaks#4696
jamesarich merged 4 commits intomainfrom
fix/notif-string

Conversation

@jamesarich
Copy link
Collaborator

This pull request introduces improvements to layout handling and code consistency in the map-related UI components, with a focus on better window insets management, safer padding, and composable modifier usage. The changes also streamline string formatting and enhance the maintainability of the codebase.

Layout and window insets improvements:

  • Added recalculateWindowInsets and safeDrawingPadding to the NavHost modifier in MainScreen to better handle system window insets and ensure content is safely padded. [1] [2]
  • Updated MapView composables (both F-Droid and Google versions) to accept a modifier parameter, enabling more flexible layout composition and consistent use of modifiers for padding and sizing. [1] [2] [3] [4] [5] [6]

String formatting improvements:

  • Refactored getString and getStringSuspend extension functions to separate string pattern retrieval from formatting, ensuring correct formatting only when arguments are provided. [1] [2]

Code consistency and cleanup:

  • Fixed formatting and parameter alignment in GoogleMap usage, and removed unnecessary Scaffold wrapper in the Google Map implementation for cleaner code. [1] [2] [3] [4]

These changes collectively improve UI reliability across devices, make the code more maintainable, and ensure correct string handling.

Signed-off-by: James Rich <2199651+jamesarich@users.noreply.github.com>
- Update `MapScreen` to pass layout modifiers to `MapView`.
- Remove internal `Scaffold` from Google Maps `MapView` implementation.
- Reformat `MapView.kt` for improved code style and readability.

Signed-off-by: James Rich <2199651+jamesarich@users.noreply.github.com>
Signed-off-by: James Rich <2199651+jamesarich@users.noreply.github.com>
Signed-off-by: James Rich <2199651+jamesarich@users.noreply.github.com>
@github-actions github-actions bot added the bugfix PR tag label Mar 3, 2026
@jamesarich jamesarich enabled auto-merge March 3, 2026 15:18
@codecov
Copy link

codecov bot commented Mar 3, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 8.12%. Comparing base (4d21278) to head (aeb84c8).
⚠️ Report is 5 commits behind head on main.
✅ All tests successful. No failed tests found.

Additional details and impacted files
@@          Coverage Diff          @@
##            main   #4696   +/-   ##
=====================================
  Coverage   8.12%   8.12%           
=====================================
  Files         64      64           
  Lines       2499    2499           
  Branches     289     289           
=====================================
  Hits         203     203           
  Misses      2264    2264           
  Partials      32      32           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@jamesarich jamesarich added this pull request to the merge queue Mar 3, 2026
Merged via the queue into main with commit c234ace Mar 3, 2026
9 checks passed
@jamesarich jamesarich deleted the fix/notif-string branch March 3, 2026 15:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bugfix PR tag

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant