Skip to content

Commit

Permalink
Merge pull request #179 from vicolo-dev/release/0.4.1
Browse files Browse the repository at this point in the history
Release 0.4.1
  • Loading branch information
AhsanSarwar45 authored Apr 18, 2024
2 parents c90b487 + 1905353 commit 0e8ab17
Show file tree
Hide file tree
Showing 82 changed files with 1,059 additions and 534 deletions.
6 changes: 6 additions & 0 deletions android/app/src/dev/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
<application
tools:replace="android:icon"
android:icon="@mipmap/ic_launcher" />
</manifest>
12 changes: 12 additions & 0 deletions android/app/src/dev/res/drawable-v21/ic_launcher_background.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Modify this file to customize your launch splash screen -->
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="?android:colorBackground" />

<!-- You can insert your own image assets here -->
<!-- <item>
<bitmap
android:gravity="center"
android:src="@mipmap/launch_image" />
</item> -->
</layer-list>
Binary file added android/app/src/dev/res/drawable/alarm_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added android/app/src/dev/res/drawable/clock_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions android/app/src/dev/res/drawable/ic_launcher_background.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Modify this file to customize your launch splash screen -->
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@android:color/white" />

<!-- You can insert your own image assets here -->
<!-- <item>
<bitmap
android:gravity="center"
android:src="@mipmap/launch_image" />
</item> -->
</layer-list>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added android/app/src/dev/res/drawable/timer_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions android/app/src/dev/res/mipmap-anydpi-v26/ic_launcher.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@mipmap/ic_launcher_background" />
<foreground android:drawable="@mipmap/ic_launcher_foreground" />
<monochrome android:drawable="@mipmap/ic_launcher_monochrome" />
</adaptive-icon>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions android/app/src/dev/res/values-night/styles.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
<style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
<!-- Show a splash screen on the activity. Automatically removed when
the Flutter engine draws its first frame -->
<item name="android:windowBackground">@drawable/ic_launcher_background</item>
</style>
<!-- Theme applied to the Android Window as soon as the process has started.
This theme determines the color of the Android Window while your
Flutter UI initializes, as well as behind your Flutter UI while its
running.
This Theme is only used starting with V2 of Flutter's Android embedding. -->
<style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
<item name="android:windowBackground">?android:colorBackground</item>
</style>
</resources>
18 changes: 18 additions & 0 deletions android/app/src/dev/res/values/styles.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
<style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
<!-- Show a splash screen on the activity. Automatically removed when
the Flutter engine draws its first frame -->
<item name="android:windowBackground">@drawable/ic_launcher_background</item>
</style>
<!-- Theme applied to the Android Window as soon as the process has started.
This theme determines the color of the Android Window while your
Flutter UI initializes, as well as behind your Flutter UI while its
running.
This Theme is only used starting with V2 of Flutter's Android embedding. -->
<style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
<item name="android:windowBackground">?android:colorBackground</item>
</style>
</resources>
2 changes: 1 addition & 1 deletion android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
android:name="android.permission.USE_EXACT_ALARM" />

<application
android:label="Chrono"
android:label="@string/app_name"
tools:replace="android:label"
android:name="${applicationName}"
android:icon="@mipmap/ic_launcher">
Expand Down
40 changes: 40 additions & 0 deletions fastlane/metadata/android/en-US/changelogs/161.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
Changes since 0.3.4

🚀 Features

* Notifications
* Upcoming alarm notification with support for adjusting lead time
* Notification to show if an alarm is snoozed
* Timer progress notification
* Stopwatch notification
* Advanced filtering and tags support for alarms and timers
* Added filter actions to timers and alarms to change a bunch of them at once
* Added option to sort alarms and filters

✨ Enhancements

* Added support for swiping between tabs
* Added alarm logs in developer options
* Added action drop down to city cards
* Made stopwatch smoother and more accurate
* Made timer progress bar smoother
* Added option to change app animations speed (Settings > General > Animations)
* Added option to turn on extra animations (off by default, might decrease performance)
* Optimized alarm scheduling and cancelling

🐛 Fixes

* Fixed random and disabled alarms ringing
* Fixed alarm ringing on booting up
* Fixed timers not editing and running correctly
* Fixed settings not synchronizing between isolates
* Fixed app appearing over lock screen
* Fixed calendar range colors
* Fixed tasks in default settings not getting saved
* Fixed volume setting not working in alarms and timers
* Fixed alarm not stopping on dismissing notification by swiping
* Fixed timer getting stuck if it got triggered when device was off
* Fixed task cards having no edit menu
* Fixed alarms not appearing on lock screen on Android 8 and below
* Fixed Kotlin version mismatch

40 changes: 40 additions & 0 deletions fastlane/metadata/android/en-US/changelogs/162.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
Changes since 0.3.4

🚀 Features

* Notifications
* Upcoming alarm notification with support for adjusting lead time
* Notification to show if an alarm is snoozed
* Timer progress notification
* Stopwatch notification
* Advanced filtering and tags support for alarms and timers
* Added filter actions to timers and alarms to change a bunch of them at once
* Added option to sort alarms and filters

✨ Enhancements

* Added support for swiping between tabs
* Added alarm logs in developer options
* Added action drop down to city cards
* Made stopwatch smoother and more accurate
* Made timer progress bar smoother
* Added option to change app animations speed (Settings > General > Animations)
* Added option to turn on extra animations (off by default, might decrease performance)
* Optimized alarm scheduling and cancelling

🐛 Fixes

* Fixed random and disabled alarms ringing
* Fixed alarm ringing on booting up
* Fixed timers not editing and running correctly
* Fixed settings not synchronizing between isolates
* Fixed app appearing over lock screen
* Fixed calendar range colors
* Fixed tasks in default settings not getting saved
* Fixed volume setting not working in alarms and timers
* Fixed alarm not stopping on dismissing notification by swiping
* Fixed timer getting stuck if it got triggered when device was off
* Fixed task cards having no edit menu
* Fixed alarms not appearing on lock screen on Android 8 and below
* Fixed Kotlin version mismatch

40 changes: 40 additions & 0 deletions fastlane/metadata/android/en-US/changelogs/163.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
Changes since 0.3.4

🚀 Features

* Notifications
* Upcoming alarm notification with support for adjusting lead time
* Notification to show if an alarm is snoozed
* Timer progress notification
* Stopwatch notification
* Advanced filtering and tags support for alarms and timers
* Added filter actions to timers and alarms to change a bunch of them at once
* Added option to sort alarms and filters

✨ Enhancements

* Added support for swiping between tabs
* Added alarm logs in developer options
* Added action drop down to city cards
* Made stopwatch smoother and more accurate
* Made timer progress bar smoother
* Added option to change app animations speed (Settings > General > Animations)
* Added option to turn on extra animations (off by default, might decrease performance)
* Optimized alarm scheduling and cancelling

🐛 Fixes

* Fixed random and disabled alarms ringing
* Fixed alarm ringing on booting up
* Fixed timers not editing and running correctly
* Fixed settings not synchronizing between isolates
* Fixed app appearing over lock screen
* Fixed calendar range colors
* Fixed tasks in default settings not getting saved
* Fixed volume setting not working in alarms and timers
* Fixed alarm not stopping on dismissing notification by swiping
* Fixed timer getting stuck if it got triggered when device was off
* Fixed task cards having no edit menu
* Fixed alarms not appearing on lock screen on Android 8 and below
* Fixed Kotlin version mismatch

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

* Improve UI in landscape mode
* Add skip-alarm filter action
* Add option to reset and add time to timer from dropdown menu on cards

🐛 Fixes

* Fixed dates schedule not working
* Fixed disabled alarms not scheduling on editing
* Fixed weird behaviours when alarms were sorted
* Fixed alarm logs not updating correctly when changing alarm or timer
* Fixed sort order not being saved correctly
* Fixed card color in style preview not appearing correctly
* Fixed stopwatch flashing when resetting
* Fixed timer not editable in landscape mode
* Fixed timer notification not updating correctly
* Fixed date and range schedule not updating after finishing
* Fixed date and range schedule not duplicating correctly after finishing
* Fixed animation speed not applying correctly on start
20 changes: 20 additions & 0 deletions fastlane/metadata/android/en-US/changelogs/172.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
✨ Enhancements

* Improve UI in landscape mode
* Add skip-alarm filter action
* Add option to reset and add time to timer from dropdown menu on cards

🐛 Fixes

* Fixed dates schedule not working
* Fixed disabled alarms not scheduling on editing
* Fixed weird behaviours when alarms were sorted
* Fixed alarm logs not updating correctly when changing alarm or timer
* Fixed sort order not being saved correctly
* Fixed card color in style preview not appearing correctly
* Fixed stopwatch flashing when resetting
* Fixed timer not editable in landscape mode
* Fixed timer notification not updating correctly
* Fixed date and range schedule not updating after finishing
* Fixed date and range schedule not duplicating correctly after finishing
* Fixed animation speed not applying correctly on start
20 changes: 20 additions & 0 deletions fastlane/metadata/android/en-US/changelogs/173.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
✨ Enhancements

* Improve UI in landscape mode
* Add skip-alarm filter action
* Add option to reset and add time to timer from dropdown menu on cards

🐛 Fixes

* Fixed dates schedule not working
* Fixed disabled alarms not scheduling on editing
* Fixed weird behaviours when alarms were sorted
* Fixed alarm logs not updating correctly when changing alarm or timer
* Fixed sort order not being saved correctly
* Fixed card color in style preview not appearing correctly
* Fixed stopwatch flashing when resetting
* Fixed timer not editable in landscape mode
* Fixed timer notification not updating correctly
* Fixed date and range schedule not updating after finishing
* Fixed date and range schedule not duplicating correctly after finishing
* Fixed animation speed not applying correctly on start
10 changes: 5 additions & 5 deletions lib/alarm/logic/alarm_reminder_notifications.dart
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Future<void> cancelAlarmReminderNotification(int id) async {
await AwesomeNotifications().cancel(id);
}

Future<void> createAlarmReminderNotification(int id, DateTime time) async {
Future<void> createAlarmReminderNotification(int id, DateTime time, bool tasksRequired) async {
bool shouldShow = appSettings
.getGroup("Alarm")
.getGroup("Notifications")
Expand All @@ -35,10 +35,10 @@ Future<void> createAlarmReminderNotification(int id, DateTime time) async {
}
String timeFormatString = await loadTextFile("time_format_string");

Alarm? alarm = getAlarmById(id);
if (alarm == null) return;
bool tasksRequired = alarm.tasks.isNotEmpty;

// Alarm? alarm = getAlarmById(id);
// if (alarm == null) return;
// bool tasksRequired = alarm.tasks.isNotEmpty;
//
// debugPrint(
// "Createing alarm reminder notification for $id at $time with title $title");

Expand Down
16 changes: 8 additions & 8 deletions lib/alarm/logic/schedule_alarm.dart
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ Future<void> scheduleAlarm(
: 'timer_schedule_ids';
List<ScheduleId> scheduleIds = await loadList<ScheduleId>(name);
scheduleIds.removeWhere((id) => id.id == scheduleId);

if (type == ScheduledNotificationType.alarm) {
await cancelAlarmReminderNotification(scheduleId);
}
//
// if (type == ScheduledNotificationType.alarm) {
// await cancelAlarmReminderNotification(scheduleId);
// }

AndroidAlarmManager.cancel(scheduleId);

Expand Down Expand Up @@ -68,10 +68,10 @@ Future<void> scheduleAlarm(
scheduleIds.add(ScheduleId(id: scheduleId));
await saveList<ScheduleId>(name, scheduleIds);

if (type == ScheduledNotificationType.alarm && !snooze) {
await createAlarmReminderNotification(scheduleId, startDate);
}

//
// if (type == ScheduledNotificationType.alarm && !snooze) {
// }
//
// Scheduling the actual alarm
AndroidAlarmManager.oneShotAt(
startDate,
Expand Down
1 change: 0 additions & 1 deletion lib/alarm/screens/alarm_events_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ class _AlarmEventsScreenState extends State<AlarmEventsScreen> {
@override
Widget build(BuildContext context) {
ThemeData theme = Theme.of(context);
ColorScheme colorScheme = theme.colorScheme;
TextTheme textTheme = theme.textTheme;

return Scaffold(
Expand Down
Loading

0 comments on commit 0e8ab17

Please sign in to comment.