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.

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

Fix alarm notification not bringing app to foreground when tasks are added #43

Merged
merged 1 commit into from
Dec 17, 2023
Merged

Fix alarm notification not bringing app to foreground when tasks are added #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
buildscript {
ext.kotlin_version = '1.9.0'
ext {
compileSdkVersion = 33
targetSdkVersion = 33
appCompatVersion = "1.4.2"
compileSdkVersion = 34
targetSdkVersion = 34
appCompatVersion = "1.6.1"
}
repositories {
google()
Expand Down
2 changes: 1 addition & 1 deletion lib/app.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ class _AppState extends State<App> {
return MaterialApp(
navigatorKey: App.navigatorKey,
debugShowCheckedModeBanner: false,
title: 'Flux Clock',
title: 'Chrono',
theme: _theme,
initialRoute: Routes.rootRoute,
navigatorObservers: [routeObserver],
Expand Down
6 changes: 3 additions & 3 deletions lib/notifications/types/fullscreen_notification_manager.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,9 @@ class AlarmNotificationManager {
key: _dismissActionKey,
label:
"${tasksRequired ? "Solve tasks to " : ""}${data.dismissActionLabel}",
actionType: ActionType.SilentAction,
autoDismissible: true,
actionType:
tasksRequired ? ActionType.Default : ActionType.SilentAction,
autoDismissible: tasksRequired ? false : true,
));
}

Expand Down Expand Up @@ -137,7 +138,6 @@ class AlarmNotificationManager {
static Future<void> openNotificationScreen(
FullScreenNotificationData data, List<int> scheduleIds) async {
await LockScreenFlagManager.setLockScreenFlags();

// If we're already on the same notification screen, pop it off the
// stack so we don't have two of them on the stack.
if (Routes.currentRoute == data.route) {
Expand Down
Loading