diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 00000000..9c1919ed --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,15 @@ +# These are supported funding model platforms + +github: vicolo-dev # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2] +patreon: vicolo # Replace with a single Patreon username +open_collective: # Replace with a single Open Collective username +ko_fi: # Replace with a single Ko-fi username +tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel +community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry +liberapay: # Replace with a single Liberapay username +issuehunt: # Replace with a single IssueHunt username +lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry +polar: # Replace with a single Polar username +buy_me_a_coffee: # Replace with a single Buy Me a Coffee username +thanks_dev: # Replace with a single thanks.dev username +custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2'] diff --git a/README.md b/README.md index dd20d79e..8be82c3a 100644 --- a/README.md +++ b/README.md @@ -10,14 +10,23 @@ ![tests](https://github.com/vicolo-dev/chrono/actions/workflows/tests.yml/badge.svg) [![codecov](https://codecov.io/gh/vicolo-dev/chrono/branch/master/graph/badge.svg?token=cKxMm8KVev)](https://codecov.io/gh/vicolo-dev/chrono) [![Codacy Badge](https://app.codacy.com/project/badge/Grade/7dc1e51c1616482baa5392bc0826c50a)](https://app.codacy.com/gh/vicolo-dev/chrono/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade) + +Translation status + Patreon donate button + +Translation status + + [Get it on F-Droid](https://f-droid.org/packages/com.vicolo.chrono) [Get it on IzzyOnDroid](https://apt.izzysoft.de/fdroid/index/apk/com.vicolo.chrono) [Get it on Github](https://github.com/vicolo-dev/chrono/releases/latest) + + Its usable, but still WIP, so you might encounter some bugs. Make sure to test it out thorougly on your device before using it for critical alarms. Feel free to open an issue. # Table of Content @@ -30,6 +39,7 @@ Its usable, but still WIP, so you might encounter some bugs. Make sure to test i ## Features - Modern and easy to use interface +- Available in variety of [languages](#translations) ### Alarms - Customizable schedules (Daily, Weekly, Specific week days, Specific dates, Date range) - Configure melody/ringtone, rising volume and vibrations @@ -73,6 +83,17 @@ Feel free to create issues regarding any issues you might be facing, any improve Pull Requests are highly welcome. When contributing to this repository, please first discuss the change you wish to make via an issue. Also, please refer to [Effective Dart](https://dart.dev/effective-dart) as a guideline for the coding standards expected from pull requests. ### Translations You can help translate the app into your preferred language using weblate at https://hosted.weblate.org/projects/chrono/. + + +Translation status + + +Current progress: + + +Translation status + + ### Spread the word! If you found the app useful, you can help the project by sharing it with friends and family. ### Donate diff --git a/assets/contributors/avatars/107004413?v=4.jpg b/assets/contributors/avatars/107004413?v=4.jpg new file mode 100644 index 00000000..511244c6 Binary files /dev/null and b/assets/contributors/avatars/107004413?v=4.jpg differ diff --git a/assets/contributors/avatars/10844456?v=4.jpg b/assets/contributors/avatars/10844456?v=4.jpg new file mode 100644 index 00000000..3f52b2a6 Binary files /dev/null and b/assets/contributors/avatars/10844456?v=4.jpg differ diff --git a/assets/contributors/avatars/132745784?v=4.jpg b/assets/contributors/avatars/132745784?v=4.jpg new file mode 100644 index 00000000..1bb8505d Binary files /dev/null and b/assets/contributors/avatars/132745784?v=4.jpg differ diff --git a/assets/contributors/avatars/134877893?v=4.jpg b/assets/contributors/avatars/134877893?v=4.jpg new file mode 100644 index 00000000..966991c7 Binary files /dev/null and b/assets/contributors/avatars/134877893?v=4.jpg differ diff --git a/assets/contributors/avatars/145642963?v=4.jpg b/assets/contributors/avatars/145642963?v=4.jpg new file mode 100644 index 00000000..2c86f12f Binary files /dev/null and b/assets/contributors/avatars/145642963?v=4.jpg differ diff --git a/assets/contributors/avatars/3691490?v=4.jpg b/assets/contributors/avatars/3691490?v=4.jpg new file mode 100644 index 00000000..6ee7a883 Binary files /dev/null and b/assets/contributors/avatars/3691490?v=4.jpg differ diff --git a/assets/contributors/avatars/39169351?v=4.jpg b/assets/contributors/avatars/39169351?v=4.jpg new file mode 100644 index 00000000..a1ed047e Binary files /dev/null and b/assets/contributors/avatars/39169351?v=4.jpg differ diff --git a/assets/contributors/avatars/55799205?v=4.jpg b/assets/contributors/avatars/55799205?v=4.jpg new file mode 100644 index 00000000..9633695a Binary files /dev/null and b/assets/contributors/avatars/55799205?v=4.jpg differ diff --git a/assets/contributors/avatars/56921008?v=4.jpg b/assets/contributors/avatars/56921008?v=4.jpg new file mode 100644 index 00000000..0b82e4fb Binary files /dev/null and b/assets/contributors/avatars/56921008?v=4.jpg differ diff --git a/assets/contributors/avatars/64812183?v=4.jpg b/assets/contributors/avatars/64812183?v=4.jpg new file mode 100644 index 00000000..92a9c802 Binary files /dev/null and b/assets/contributors/avatars/64812183?v=4.jpg differ diff --git a/assets/contributors/avatars/65224669?v=4.jpg b/assets/contributors/avatars/65224669?v=4.jpg index 5e590db0..31476c44 100644 Binary files a/assets/contributors/avatars/65224669?v=4.jpg and b/assets/contributors/avatars/65224669?v=4.jpg differ diff --git a/assets/contributors/avatars/66135366?v=4.jpg b/assets/contributors/avatars/66135366?v=4.jpg new file mode 100644 index 00000000..c2ae5538 Binary files /dev/null and b/assets/contributors/avatars/66135366?v=4.jpg differ diff --git a/assets/contributors/avatars/79972075?v=4.jpg b/assets/contributors/avatars/79972075?v=4.jpg new file mode 100644 index 00000000..1ef2e212 Binary files /dev/null and b/assets/contributors/avatars/79972075?v=4.jpg differ diff --git a/assets/contributors/avatars/81525287?v=4.jpg b/assets/contributors/avatars/81525287?v=4.jpg new file mode 100644 index 00000000..e3ab355c Binary files /dev/null and b/assets/contributors/avatars/81525287?v=4.jpg differ diff --git a/assets/contributors/avatars/84540569?v=4.jpg b/assets/contributors/avatars/84540569?v=4.jpg index a39cb883..30657954 100644 Binary files a/assets/contributors/avatars/84540569?v=4.jpg and b/assets/contributors/avatars/84540569?v=4.jpg differ diff --git a/assets/contributors/git.json b/assets/contributors/git.json index 9964f68a..539a3303 100644 --- a/assets/contributors/git.json +++ b/assets/contributors/git.json @@ -10,15 +10,25 @@ "profile_url": "https://github.com/azeem-io" }, { - "username": "bdOtopsy63", - "avatar_url": "assets/contributors/avatars/108967802?v=4.jpg", - "profile_url": "https://github.com/bdOtopsy63" + "username": "Kuzmich55", + "avatar_url": "assets/contributors/avatars/81525287?v=4.jpg", + "profile_url": "https://github.com/Kuzmich55" }, { "username": "CloneWith", "avatar_url": "assets/contributors/avatars/110881926?v=4.jpg", "profile_url": "https://github.com/CloneWith" }, + { + "username": "bdOtopsy63", + "avatar_url": "assets/contributors/avatars/108967802?v=4.jpg", + "profile_url": "https://github.com/bdOtopsy63" + }, + { + "username": "balaraz", + "avatar_url": "assets/contributors/avatars/134877893?v=4.jpg", + "profile_url": "https://github.com/balaraz" + }, { "username": "weblate", "avatar_url": "assets/contributors/avatars/1607653?v=4.jpg", @@ -29,25 +39,25 @@ "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", "profile_url": "https://github.com/zxrpn" }, + { + "username": "BurnBirdX7", + "avatar_url": "assets/contributors/avatars/24733391?v=4.jpg", + "profile_url": "https://github.com/BurnBirdX7" + }, { "username": "inson1", "avatar_url": "assets/contributors/avatars/75314629?v=4.jpg", "profile_url": "https://github.com/inson1" }, { - "username": "BurnBirdX7", - "avatar_url": "assets/contributors/avatars/24733391?v=4.jpg", - "profile_url": "https://github.com/BurnBirdX7" + "username": "Stzyxh", + "avatar_url": "assets/contributors/avatars/137100988?v=4.jpg", + "profile_url": "https://github.com/Stzyxh" }, { "username": "oersen", @@ -55,93 +65,88 @@ "profile_url": "https://github.com/oersen" }, { - "username": "Akitiltkaas", - "avatar_url": "assets/contributors/avatars/106187527?v=4.jpg", - "profile_url": "https://github.com/Akitiltkaas" - }, - { - "username": "spiderVS", - "avatar_url": "assets/contributors/avatars/79773329?v=4.jpg", - "profile_url": "https://github.com/spiderVS" + "username": "baglayan", + "avatar_url": "assets/contributors/avatars/55799205?v=4.jpg", + "profile_url": "https://github.com/baglayan" }, { - "username": "o101010", - "avatar_url": "assets/contributors/avatars/23003062?v=4.jpg", - "profile_url": "https://github.com/o101010" + "username": "FLVAL", + "avatar_url": "assets/contributors/avatars/56921008?v=4.jpg", + "profile_url": "https://github.com/FLVAL" }, { - "username": "iBabu007", - "avatar_url": "assets/contributors/avatars/65340361?v=4.jpg", - "profile_url": "https://github.com/iBabu007" + "username": "comradekingu", + "avatar_url": "assets/contributors/avatars/13802408?v=4.jpg", + "profile_url": "https://github.com/comradekingu" }, { - "username": "Wopgang215", - "avatar_url": "assets/contributors/avatars/170783727?v=4.jpg", - "profile_url": "https://github.com/Wopgang215" + "username": "crnobog69", + "avatar_url": "assets/contributors/avatars/79972075?v=4.jpg", + "profile_url": "https://github.com/crnobog69" }, { - "username": "Stzyxh", - "avatar_url": "assets/contributors/avatars/137100988?v=4.jpg", - "profile_url": "https://github.com/Stzyxh" + "username": "spiderVS", + "avatar_url": "assets/contributors/avatars/79773329?v=4.jpg", + "profile_url": "https://github.com/spiderVS" }, { - "username": "PatrickRam0s", - "avatar_url": "assets/contributors/avatars/106683928?v=4.jpg", - "profile_url": "https://github.com/PatrickRam0s" + "username": "yurical", + "avatar_url": "assets/contributors/avatars/10844456?v=4.jpg", + "profile_url": "https://github.com/yurical" }, { - "username": "Rafee-M", - "avatar_url": "assets/contributors/avatars/69535896?v=4.jpg", - "profile_url": "https://github.com/Rafee-M" + "username": "Unacceptium", + "avatar_url": "assets/contributors/avatars/145642963?v=4.jpg", + "profile_url": "https://github.com/Unacceptium" }, { - "username": "NathanBnm", - "avatar_url": "assets/contributors/avatars/45366162?v=4.jpg", - "profile_url": "https://github.com/NathanBnm" + "username": "PeterDaveHello", + "avatar_url": "assets/contributors/avatars/3691490?v=4.jpg", + "profile_url": "https://github.com/PeterDaveHello" }, { - "username": "matsukky", - "avatar_url": "assets/contributors/avatars/46320254?v=4.jpg", - "profile_url": "https://github.com/matsukky" + "username": "Kolumb761", + "avatar_url": "assets/contributors/avatars/107004413?v=4.jpg", + "profile_url": "https://github.com/Kolumb761" }, { - "username": "lorenzovngl", - "avatar_url": "assets/contributors/avatars/13767301?v=4.jpg", - "profile_url": "https://github.com/lorenzovngl" + "username": "JoelleJS", + "avatar_url": "assets/contributors/avatars/39169351?v=4.jpg", + "profile_url": "https://github.com/JoelleJS" }, { - "username": "lorenzospadoni", - "avatar_url": "assets/contributors/avatars/11250480?v=4.jpg", - "profile_url": "https://github.com/lorenzospadoni" + "username": "thejenja", + "avatar_url": "assets/contributors/avatars/65224669?v=4.jpg", + "profile_url": "https://github.com/thejenja" }, { - "username": "Josegorn", - "avatar_url": "assets/contributors/avatars/82556573?v=4.jpg", - "profile_url": "https://github.com/Josegorn" + "username": "realgooseman", + "avatar_url": "assets/contributors/avatars/64812183?v=4.jpg", + "profile_url": "https://github.com/realgooseman" }, { - "username": "jona512", - "avatar_url": "assets/contributors/avatars/38784748?v=4.jpg", - "profile_url": "https://github.com/jona512" + "username": "GWarp", + "avatar_url": "assets/contributors/avatars/11271828?v=4.jpg", + "profile_url": "https://github.com/GWarp" }, { - "username": "HeXedek", - "avatar_url": "assets/contributors/avatars/100072714?v=4.jpg", - "profile_url": "https://github.com/HeXedek" + "username": "NathanBnm", + "avatar_url": "assets/contributors/avatars/45366162?v=4.jpg", + "profile_url": "https://github.com/NathanBnm" }, { - "username": "thejenja", - "avatar_url": "assets/contributors/avatars/65224669?v=4.jpg", - "profile_url": "https://github.com/thejenja" + "username": "DuckyCB", + "avatar_url": "assets/contributors/avatars/66135366?v=4.jpg", + "profile_url": "https://github.com/DuckyCB" }, { - "username": "comradekingu", - "avatar_url": "assets/contributors/avatars/13802408?v=4.jpg", - "profile_url": "https://github.com/comradekingu" + "username": "q0ntinuum", + "avatar_url": "assets/contributors/avatars/132745784?v=4.jpg", + "profile_url": "https://github.com/q0ntinuum" }, { - "username": "GWarp", - "avatar_url": "assets/contributors/avatars/11271828?v=4.jpg", - "profile_url": "https://github.com/GWarp" + "username": "Rafee-M", + "avatar_url": "assets/contributors/avatars/69535896?v=4.jpg", + "profile_url": "https://github.com/Rafee-M" } ] \ No newline at end of file diff --git a/assets/patreons/patreons.json b/assets/patreons/patreons.json index c0f874c0..9e94cbfd 100644 --- a/assets/patreons/patreons.json +++ b/assets/patreons/patreons.json @@ -6,7 +6,12 @@ }, { "name": "Potato", - "lifetime_amount": "3.66", + "lifetime_amount": "7.36", "email": "patreon@cinna.boo" + }, + { + "name": "AnotherOnlineAlias", + "lifetime_amount": "3.36", + "email": "jakegbh4949@gmail.com" } ] \ No newline at end of file diff --git a/fastlane/metadata/android/en-US/changelogs/271.txt b/fastlane/metadata/android/en-US/changelogs/271.txt new file mode 100644 index 00000000..de06f1e0 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/271.txt @@ -0,0 +1,14 @@ +This is a beta release. Please report any issues via GitHub or email. + +🚀 Features + +* Added memory (card matching) task + +🐛 Fixes + +* Added option to disable background service +* Fixed data corruption error in some cases +* Fixed minutes not appearing when 0 +* Fixed sound still playing after dismissing alarm in some cases +* Fixed data persisting even after uninstalling app (disabled auto backup) + diff --git a/fastlane/metadata/android/en-US/changelogs/272.txt b/fastlane/metadata/android/en-US/changelogs/272.txt new file mode 100644 index 00000000..de06f1e0 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/272.txt @@ -0,0 +1,14 @@ +This is a beta release. Please report any issues via GitHub or email. + +🚀 Features + +* Added memory (card matching) task + +🐛 Fixes + +* Added option to disable background service +* Fixed data corruption error in some cases +* Fixed minutes not appearing when 0 +* Fixed sound still playing after dismissing alarm in some cases +* Fixed data persisting even after uninstalling app (disabled auto backup) + diff --git a/fastlane/metadata/android/en-US/changelogs/273.txt b/fastlane/metadata/android/en-US/changelogs/273.txt new file mode 100644 index 00000000..de06f1e0 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/273.txt @@ -0,0 +1,14 @@ +This is a beta release. Please report any issues via GitHub or email. + +🚀 Features + +* Added memory (card matching) task + +🐛 Fixes + +* Added option to disable background service +* Fixed data corruption error in some cases +* Fixed minutes not appearing when 0 +* Fixed sound still playing after dismissing alarm in some cases +* Fixed data persisting even after uninstalling app (disabled auto backup) + diff --git a/fastlane/metadata/android/en-US/changelogs/281.txt b/fastlane/metadata/android/en-US/changelogs/281.txt new file mode 100644 index 00000000..5a72a5ca --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/281.txt @@ -0,0 +1,36 @@ +Changes since 0.5.1 + +🚀 Features + +* Added option to select directory for ringtones (random ringtone will be selected from the directory each time) +* Added multiselect for lists +* Added option to shuffle alarm ringtone +* Added backup and restore for alarms, timers, themes etc. +* Added numpad input for timers +* Added option to reduce volume while solving alarm tasks +* Added quick home screen actions for alarms and timers +* Added option to start ringtone at random position +* Added background service to keep app alive +* Added analog clock to clock tab +* Added memory (card matching) task + +✨ Enhancements + +* Made alarm tasks reorderable +* Added better logging system +* Added alarm labels to alarm notifications + +🐛 Fixes + +* Fixed non-deletable items getting deleted by list actions +* Fixed range weekly schedule not working +* Fixed system navigation bar color +* Fixed database for cities +* Fixed skipped alarms being visible to the system +* Fixed foreground notification foreground type +* Fixed date picker being stuck in the past for range alarms +* Fixed minutes not appearing when 0 +* Fixed sound still playing after dismissing alarm in some cases +* Fixed data persisting even after uninstalling app (disabled auto backup) + + diff --git a/fastlane/metadata/android/en-US/changelogs/282.txt b/fastlane/metadata/android/en-US/changelogs/282.txt new file mode 100644 index 00000000..5a72a5ca --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/282.txt @@ -0,0 +1,36 @@ +Changes since 0.5.1 + +🚀 Features + +* Added option to select directory for ringtones (random ringtone will be selected from the directory each time) +* Added multiselect for lists +* Added option to shuffle alarm ringtone +* Added backup and restore for alarms, timers, themes etc. +* Added numpad input for timers +* Added option to reduce volume while solving alarm tasks +* Added quick home screen actions for alarms and timers +* Added option to start ringtone at random position +* Added background service to keep app alive +* Added analog clock to clock tab +* Added memory (card matching) task + +✨ Enhancements + +* Made alarm tasks reorderable +* Added better logging system +* Added alarm labels to alarm notifications + +🐛 Fixes + +* Fixed non-deletable items getting deleted by list actions +* Fixed range weekly schedule not working +* Fixed system navigation bar color +* Fixed database for cities +* Fixed skipped alarms being visible to the system +* Fixed foreground notification foreground type +* Fixed date picker being stuck in the past for range alarms +* Fixed minutes not appearing when 0 +* Fixed sound still playing after dismissing alarm in some cases +* Fixed data persisting even after uninstalling app (disabled auto backup) + + diff --git a/fastlane/metadata/android/en-US/changelogs/283.txt b/fastlane/metadata/android/en-US/changelogs/283.txt new file mode 100644 index 00000000..5a72a5ca --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/283.txt @@ -0,0 +1,36 @@ +Changes since 0.5.1 + +🚀 Features + +* Added option to select directory for ringtones (random ringtone will be selected from the directory each time) +* Added multiselect for lists +* Added option to shuffle alarm ringtone +* Added backup and restore for alarms, timers, themes etc. +* Added numpad input for timers +* Added option to reduce volume while solving alarm tasks +* Added quick home screen actions for alarms and timers +* Added option to start ringtone at random position +* Added background service to keep app alive +* Added analog clock to clock tab +* Added memory (card matching) task + +✨ Enhancements + +* Made alarm tasks reorderable +* Added better logging system +* Added alarm labels to alarm notifications + +🐛 Fixes + +* Fixed non-deletable items getting deleted by list actions +* Fixed range weekly schedule not working +* Fixed system navigation bar color +* Fixed database for cities +* Fixed skipped alarms being visible to the system +* Fixed foreground notification foreground type +* Fixed date picker being stuck in the past for range alarms +* Fixed minutes not appearing when 0 +* Fixed sound still playing after dismissing alarm in some cases +* Fixed data persisting even after uninstalling app (disabled auto backup) + + diff --git a/lib/alarm/data/alarm_events_sort_options.dart b/lib/alarm/data/alarm_events_sort_options.dart index fcbd93a6..9e945a64 100644 --- a/lib/alarm/data/alarm_events_sort_options.dart +++ b/lib/alarm/data/alarm_events_sort_options.dart @@ -4,9 +4,9 @@ import 'package:clock_app/common/types/list_filter.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; final List> alarmEventSortOptions = [ - ListSortOption((context) => "Earlies start date", sortStartDateAscending), + ListSortOption((context) => "Earliest start date", sortStartDateAscending), ListSortOption((context) => "Latest start date", sortStartDateDescending), - ListSortOption((context) => "Earlies event date", sortEventDateAscending), + ListSortOption((context) => "Earliest event date", sortEventDateAscending), ListSortOption((context) => "Latest event date", sortEventDateDescending), ]; diff --git a/lib/alarm/types/schedules/weekly_alarm_schedule.dart b/lib/alarm/types/schedules/weekly_alarm_schedule.dart index b2d1e341..81e5c586 100644 --- a/lib/alarm/types/schedules/weekly_alarm_schedule.dart +++ b/lib/alarm/types/schedules/weekly_alarm_schedule.dart @@ -5,6 +5,8 @@ import 'package:clock_app/alarm/types/schedules/alarm_schedule.dart'; import 'package:clock_app/common/types/json.dart'; import 'package:clock_app/common/types/time.dart'; import 'package:clock_app/common/types/weekday.dart'; +import 'package:clock_app/common/utils/json_serialize.dart'; +import 'package:clock_app/developer/logic/logger.dart'; import 'package:clock_app/settings/types/setting.dart'; import 'package:flutter/foundation.dart'; @@ -84,12 +86,13 @@ class WeeklyAlarmSchedule extends AlarmSchedule { super(); @override - Future schedule(Time time,String description, [bool alarmClock = false]) async { + Future schedule(Time time, String description, + [bool alarmClock = false]) async { // for (WeekdaySchedule weekdaySchedule in _weekdaySchedules) { // await weekdaySchedule.alarmRunner.cancel(); // } - // We schedule the next occurence for each weekday. + // We schedule the next occurence for each weekday. // Subsequent occurences will be scheduled after the first one passes. List weekdays = _weekdaySetting.selected.toList(); @@ -102,8 +105,10 @@ class WeeklyAlarmSchedule extends AlarmSchedule { } for (WeekdaySchedule weekdaySchedule in _weekdaySchedules) { - DateTime alarmDate = getWeeklyScheduleDateForTIme(time, weekdaySchedule.weekday); - await weekdaySchedule.alarmRunner.schedule(alarmDate,description, alarmClock); + DateTime alarmDate = + getWeeklyScheduleDateForTIme(time, weekdaySchedule.weekday); + await weekdaySchedule.alarmRunner + .schedule(alarmDate, description, alarmClock); } } @@ -137,7 +142,8 @@ class WeeklyAlarmSchedule extends AlarmSchedule { @override bool hasId(int id) { return _weekdaySchedules - .any((weekdaySchedule) => weekdaySchedule.alarmRunner.id == id); + .any((weekdaySchedule) => weekdaySchedule.alarmRunner.id == id) || + _alarmRunner.id == id; } @override diff --git a/lib/developer/data/log_sort_options.dart b/lib/developer/data/log_sort_options.dart index f398cadb..ad279586 100644 --- a/lib/developer/data/log_sort_options.dart +++ b/lib/developer/data/log_sort_options.dart @@ -3,7 +3,7 @@ import 'package:clock_app/developer/types/log.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; final List> logSortOptions = [ - ListSortOption((context) => "Earlies first", sortDateAscending), + ListSortOption((context) => "Earliest first", sortDateAscending), ListSortOption((context) => "Latest first", sortDateDescending), ]; diff --git a/lib/l10n/app_ta.arb b/lib/l10n/app_ta.arb index 2bc8cf9b..6a651b3d 100644 --- a/lib/l10n/app_ta.arb +++ b/lib/l10n/app_ta.arb @@ -515,11 +515,11 @@ "@stopwatchFastest": {}, "alarmDescriptionDays": "{days}", "@alarmDescriptionDays": {}, - "alarmDescriptionRange": "{இடைவெளி, தேர்ந்தெடு, நாள்தோறும் {Daily} வாராந்திர {Weekly} பிற {Other}} {startDate} முதல் {endDate} வரை", + "alarmDescriptionRange": "{interval, select, daily {நாள்தோறும்} weekly {வாராந்திர} other {பிற}} {startDate} முதல் {endDate} வர ", "@alarmDescriptionRange": {}, "stopwatchSlowest": "மெதுவாக", "@stopwatchSlowest": {}, - "alarmDescriptionDates": "{date} {எண்ணிக்கை, பன்மை, = 0 {} = 1 { and 1 other date} பிற {மற்றும் {count} பிற தேதிகள்}}", + "alarmDescriptionDates": "{date}{count, plural, = 0 {} = 1 { and 1 other date} other {மற்றும் {count} பிற தேதிகள்}}", "@alarmDescriptionDates": {}, "stopwatchAverage": "சராசரி", "@stopwatchAverage": {}, @@ -603,7 +603,7 @@ "@sameTime": {}, "addLengthSetting": "நீளம் சேர்க்கவும்", "@addLengthSetting": {}, - "relativeTime": "{hours} h {உறவினர், தேர்ந்தெடுக்கவும், முன்னால் {ahead} பின்னால் {behind} பிற {Other}}", + "relativeTime": "{hours} h {relative, select, ahead {முன்னால்} behind {பின்னால்} other {பிற}}", "@relativeTime": {}, "searchSettingPlaceholder": "ஒரு அமைப்பைத் தேடுங்கள்", "@searchSettingPlaceholder": {}, @@ -721,19 +721,19 @@ "@translateDescription": {}, "tagNamePlaceholder": "குறிச்சொல் பெயர்", "@tagNamePlaceholder": {}, - "hoursString": "{எண்ணிக்கை, பன்மை, = 0 {} = 1 {1 hour} பிற {{count} மணிநேரம்}}", + "hoursString": "{count, plural, = 0 {} = 1 {1 hour} other {{count} மணிநேரம்}}", "@hoursString": {}, - "minutesString": "{எண்ணிக்கை, பன்மை, = 0 {} = 1 {1 minute} பிற {{count} நிமிடங்கள்}}", + "minutesString": "{count, plural, = 0 {} = 1 {1 minute} other {{count} நிமிடங்கள்}}", "@minutesString": {}, - "secondsString": "{எண்ணிக்கை, பன்மை, = 0 {} = 1 {1 second} பிற {{count} விநாடிகள்}}", + "secondsString": "{count, plural, = 0 {} = 1 {1 second} other {{count} விநாடிகள்}}", "@secondsString": {}, - "weeksString": "{எண்ணிக்கை, பன்மை, = 0 {} = 1 {1 week} பிற {{count} வாரங்கள்}}", + "weeksString": "{count, plural, = 0 {} = 1 {1 week} other {{count} வாரங்கள்}}", "@weeksString": {}, - "monthsString": "{எண்ணிக்கை, பன்மை, = 0 {} = 1 {1 month} பிற {{count} மாதங்கள்}}", + "monthsString": "{count, plural, = 0 {} = 1 {1 month} other {{count} மாதங்கள்}}", "@monthsString": {}, - "daysString": "{எண்ணிக்கை, பன்மை, = 0 {} = 1 {1 day} பிற {{count} நாட்கள்}}", + "daysString": "{count, plural, = 0 {} = 1 {1 day} other {{count} நாட்கள்}}", "@daysString": {}, - "yearsString": "{எண்ணிக்கை, பன்மை, = 0 {} = 1 {1 year} பிற {{count} ஆண்டுகள்}}", + "yearsString": "{count, plural, = 0 {} = 1 {1 year} other {{count} ஆண்டுகள்}}", "@yearsString": {}, "lessThanOneMinute": "1 நிமிடத்திற்கும் குறைவாக", "@lessThanOneMinute": {}, @@ -795,4 +795,4 @@ "@showDigitalClock": {}, "backgroundServiceIntervalSettingDescription": "சில பேட்டரி ஆயுள் செலவில், பயன்பாட்டை உயிரோடு வைத்திருக்க குறைந்த இடைவெளி உதவும்", "@backgroundServiceIntervalSettingDescription": {} -} +} \ No newline at end of file diff --git a/pubspec.yaml b/pubspec.yaml index 88a1fd13..d9a8519e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -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.6.0-beta1+26 +version: 0.6.0+28 environment: sdk: '>=3.4.0 <4.0.0'