Skip to content
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.

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

Merge release #280

Merged
merged 8 commits into from
May 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file added assets/contributors/avatars/100072714?v=4.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 15 additions & 10 deletions assets/contributors/git.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,26 @@
"avatar_url": "assets/contributors/avatars/108967802?v=4.jpg",
"profile_url": "https://github.com/bdOtopsy63"
},
{
"username": "weblate",
"avatar_url": "assets/contributors/avatars/1607653?v=4.jpg",
"profile_url": "https://github.com/weblate"
},
{
"username": "CloneWith",
"avatar_url": "assets/contributors/avatars/110881926?v=4.jpg",
"profile_url": "https://github.com/CloneWith"
},
{
"username": "weblate",
"avatar_url": "assets/contributors/avatars/1607653?v=4.jpg",
"profile_url": "https://github.com/weblate"
},
{
"username": "ngocanhtve",
"avatar_url": "assets/contributors/avatars/125894401?v=4.jpg",
"profile_url": "https://github.com/ngocanhtve"
},
{
"username": "Schipunov",
"avatar_url": "assets/contributors/avatars/23407397?v=4.jpg",
"profile_url": "https://github.com/Schipunov"
},
{
"username": "zxrpn",
"avatar_url": "assets/contributors/avatars/91787031?v=4.jpg",
Expand Down Expand Up @@ -89,11 +94,6 @@
"avatar_url": "assets/contributors/avatars/45366162?v=4.jpg",
"profile_url": "https://github.com/NathanBnm"
},
{
"username": "Schipunov",
"avatar_url": "assets/contributors/avatars/23407397?v=4.jpg",
"profile_url": "https://github.com/Schipunov"
},
{
"username": "matsukky",
"avatar_url": "assets/contributors/avatars/46320254?v=4.jpg",
Expand All @@ -119,6 +119,11 @@
"avatar_url": "assets/contributors/avatars/38784748?v=4.jpg",
"profile_url": "https://github.com/jona512"
},
{
"username": "HeXedek",
"avatar_url": "assets/contributors/avatars/100072714?v=4.jpg",
"profile_url": "https://github.com/HeXedek"
},
{
"username": "thejenja",
"avatar_url": "assets/contributors/avatars/65224669?v=4.jpg",
Expand Down
4 changes: 2 additions & 2 deletions fastlane/metadata/android/en-US/changelogs/231.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ Changes since v0.4.3:
* Added analog and digital clock widgets
* Added option to customize size, alignment, color, font weight, formats
* Added localizations
* Chinese, French, Spanish mostly complete
* Partial support for Bengali, German, Italian, Norwegian, Polish, Portuguese, Russian, Turkish, and Vietnamese
* Chinese, French, Spanish, Turkish and Portuguese mostly complete
* Partial support for Bengali, German, Italian, Norwegian, Polish, Russian,and Vietnamese
* Add your favorite language here: https://hosted.weblate.org/projects/chrono

✨ Enhancements
Expand Down
4 changes: 2 additions & 2 deletions fastlane/metadata/android/en-US/changelogs/232.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ Changes since v0.4.3:
* Added analog and digital clock widgets
* Added option to customize size, alignment, color, font weight, formats
* Added localizations
* Chinese, French, Spanish mostly complete
* Partial support for Bengali, German, Italian, Norwegian, Polish, Portuguese, Russian, Turkish, and Vietnamese
* Chinese, French, Spanish, Turkish and Portuguese mostly complete
* Partial support for Bengali, German, Italian, Norwegian, Polish, Russian,and Vietnamese
* Add your favorite language here: https://hosted.weblate.org/projects/chrono

✨ Enhancements
Expand Down
4 changes: 2 additions & 2 deletions fastlane/metadata/android/en-US/changelogs/233.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ Changes since v0.4.3:
* Added analog and digital clock widgets
* Added option to customize size, alignment, color, font weight, formats
* Added localizations
* Chinese, French, Spanish, Turkish, Portugese mostly complete
* Partial support for Bengali, German, Italian, Norwegian, Polish, Russian, and Vietnamese
* Chinese, French, Spanish, Turkish and Portuguese mostly complete
* Partial support for Bengali, German, Italian, Norwegian, Polish, Russian,and Vietnamese
* Add your favorite language here: https://hosted.weblate.org/projects/chrono

✨ Enhancements
Expand Down
9 changes: 9 additions & 0 deletions fastlane/metadata/android/en-US/changelogs/241.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
✨ Enhancements

* Updated translations

🐛 Fixes

* Removed extra space at the end of long date formats
* Fix timer fullscreen notification not dismissing
* Fix fastest and slowest laps of stopwatch not saving
9 changes: 9 additions & 0 deletions fastlane/metadata/android/en-US/changelogs/242.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
✨ Enhancements

* Updated translations

🐛 Fixes

* Removed extra space at the end of long date formats
* Fix timer fullscreen notification not dismissing
* Fix fastest and slowest laps of stopwatch not saving
9 changes: 9 additions & 0 deletions fastlane/metadata/android/en-US/changelogs/243.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
✨ Enhancements

* Updated translations

🐛 Fixes

* Removed extra space at the end of long date formats
* Fix timer fullscreen notification not dismissing
* Fix fastest and slowest laps of stopwatch not saving
4 changes: 2 additions & 2 deletions lib/settings/data/general_settings_schema.dart
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,11 @@ final dateFormatOptions = [

final longDateFormatOptions = [
_getDateSettingOption("EEE, MMM d"),
_getDateSettingOption("EEE, MMMM d "),
_getDateSettingOption("EEE, MMMM d"),
_getDateSettingOption("EEE, d MMM"),
_getDateSettingOption("EEE, d MMMM"),
_getDateSettingOption("EEEE, MMM d"),
_getDateSettingOption("EEEE, MMMM d "),
_getDateSettingOption("EEEE, MMMM d"),
_getDateSettingOption("EEEE, d MMM"),
_getDateSettingOption("EEEE, d MMMM"),
];
Expand Down
3 changes: 3 additions & 0 deletions lib/stopwatch/types/stopwatch.dart
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,9 @@ class ClockStopwatch extends JsonSerializable {
}
}


void updateFastestAndSlowestLap() {
if(laps.isEmpty) return;
_fastestLap = _laps.reduce((value, element) =>
value.lapTime.inMilliseconds < element.lapTime.inMilliseconds
? value
Expand Down Expand Up @@ -144,5 +146,6 @@ class ClockStopwatch extends JsonSerializable {
orElse: () => TimerState.stopped);
_id = json['id'] ?? UniqueKey().hashCode;
_laps = ((json['laps'] ?? []) as List).map((e) => Lap.fromJson(e)).toList();
updateFastestAndSlowestLap();
}
}
8 changes: 4 additions & 4 deletions lib/timer/screens/timer_notification_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@ class _TimerNotificationScreenState extends State<TimerNotificationScreen> {
);

void _addTime() {
AlarmNotificationManager.snoozeAlarm(
widget.scheduleIds[0], ScheduledNotificationType.timer);
AlarmNotificationManager.dismissNotification(widget.scheduleIds[0],
AlarmDismissType.snooze, ScheduledNotificationType.timer);
}

void _stop() {
AlarmNotificationManager.dismissAlarm(
widget.scheduleIds[0], ScheduledNotificationType.timer);
AlarmNotificationManager.dismissNotification(widget.scheduleIds[0],
AlarmDismissType.dismiss, ScheduledNotificationType.timer);
}

@override
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: clock_app
description: An alarm, clock, timer and stowatch app.

publish_to: "none" # Remove this line if you wish to publish to pub.dev
version: 0.5.0+23
version: 0.5.1+24

environment:
sdk: ">=2.18.6 <4.0.0"
Expand Down
Loading