Skip to content

Commit

Permalink
Merge pull request #695 from hpi-studyu/dev
Browse files Browse the repository at this point in the history
Release: Notification hotfix release version (07-10-2024)
  • Loading branch information
johannesvedder authored Oct 7, 2024
2 parents 96fb082 + 28f3b56 commit 9b01d4f
Show file tree
Hide file tree
Showing 7 changed files with 54 additions and 7 deletions.
24 changes: 24 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,30 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## 2024-10-07

### Changes

---

Packages with breaking changes:

- There are no breaking changes in this release.

Packages with other changes:

- [`studyu_app` - `v2.7.12`](#studyu_app---v2712)

---

#### `studyu_app` - `v2.7.12`

- **FIX**: notification icon mipmap 2.
- **FIX**: notification icon mipmap.
- **FIX**: configure AndroidNotificationDetails correctly.
- **FIX**: disable R8 full mode for flutter_local_notifications.


## 2024-10-03

### Changes
Expand Down
7 changes: 7 additions & 0 deletions app/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## 2.7.12

- **FIX**: notification icon mipmap 2.
- **FIX**: notification icon mipmap.
- **FIX**: configure AndroidNotificationDetails correctly.
- **FIX**: disable R8 full mode for flutter_local_notifications.

## 2.7.11

- **FIX**: upgrade deps.
Expand Down
3 changes: 3 additions & 0 deletions app/android/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
org.gradle.jvmargs=-Xmx4G -XX:+HeapDumpOnOutOfMemoryError
android.useAndroidX=true
android.enableJetifier=true
# fixes flutter_local_notifications error
# https://github.com/MaikuB/flutter_local_notifications/issues/2223#issuecomment-1925452782
android.enableR8.fullMode = false
12 changes: 9 additions & 3 deletions app/lib/util/debug_screen.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_local_notifications/flutter_local_notifications.dart';
import 'package:package_info_plus/package_info_plus.dart';
import 'package:path_provider/path_provider.dart';
import 'package:permission_handler/permission_handler.dart';
import 'package:provider/provider.dart';
Expand All @@ -12,7 +13,7 @@ import 'package:studyu_flutter_common/studyu_flutter_common.dart';
import 'package:url_launcher/url_launcher.dart';

class DebugScreen {
static void showDebugScreen(BuildContext context) {
static Future<void> showDebugScreen(BuildContext context) async {
final studyNotifications = context.read<AppState>().studyNotifications;

final pendingNotifications = studyNotifications != null
Expand All @@ -26,7 +27,10 @@ class DebugScreen {
bool? ignoreBatteryOptimizations;
int? pendingNotificationRes;
int? pendingNotificationsPluginRes;

final packageInfo = await PackageInfo.fromPlatform();
final versionString =
'Version: ${packageInfo.version} - ${packageInfo.buildNumber}';
if (!context.mounted) return;
showDialog(
context: context,
builder: (_) => AlertDialog(
Expand All @@ -35,6 +39,7 @@ class DebugScreen {
),
content: Column(
children: [
Text(versionString),
ElevatedButton(
onPressed: () {
AppConfig.getAppContact().then((value) {
Expand All @@ -43,7 +48,8 @@ class DebugScreen {
path: value.email,
queryParameters: {
'subject': '[StudyU] Debug Information',
'body': 'ignoreBatteryOptimizations: ${ignoreBatteryOptimizations ?? 'null'}\n'
'body': 'version: $versionString\n'
'ignoreBatteryOptimizations: ${ignoreBatteryOptimizations ?? 'null'}\n'
'pendingNotificationsNumber: ${pendingNotificationRes ?? 'null'}\n'
'pendingNotificationsPluginNumber: ${pendingNotificationsPluginRes ?? 'null'}\n'
'scheduledNotificationsDebug: ${StudyNotifications.scheduledNotificationsDebug}',
Expand Down
2 changes: 1 addition & 1 deletion app/lib/util/notifications.dart
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ class StudyNotifications {
void _initNotificationsPlugin() {
flutterLocalNotificationsPlugin = FlutterLocalNotificationsPlugin();
const AndroidInitializationSettings initializationSettingsAndroid =
AndroidInitializationSettings('@drawable/ic_notification');
AndroidInitializationSettings('@mipmap/ic_launcher');
final DarwinInitializationSettings initializationSettingsDarwin =
DarwinInitializationSettings(
onDidReceiveLocalNotification: (
Expand Down
11 changes: 9 additions & 2 deletions app/lib/util/schedule_notifications.dart
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,15 @@ Future<int> scheduleReminderForDate(
return currentId;
}

const notificationDetails =
NotificationDetails(android: AndroidNotificationDetails('0', 'StudyU'));
const notificationDetails = NotificationDetails(
android: AndroidNotificationDetails(
'0',
'StudyU',
icon: '@mipmap/ic_launcher',
priority: Priority.max,
importance: Importance.max,
),
);

Future<void> scheduleNotifications(BuildContext context) async {
if (StudyNotifications.debug) {
Expand Down
2 changes: 1 addition & 1 deletion app/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: studyu_app
version: 2.7.11
version: 2.7.12
description: Partake in digital N-of-1 trials with the innovative StudyU Health App
publish_to: none
homepage: https://studyu.health
Expand Down

0 comments on commit 9b01d4f

Please sign in to comment.