diff --git a/android/app/build.gradle b/android/app/build.gradle index 5d92285..4e1ec6e 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -25,7 +25,7 @@ if (flutterVersionName == null) { android { namespace "eu.mhsl.marianum.mobile.client" compileSdk flutter.compileSdkVersion - ndkVersion flutter.ndkVersion + ndkVersion "27.0.12077973" compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 @@ -41,11 +41,8 @@ android { } defaultConfig { - // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "eu.mhsl.marianum.mobile.client" - // You can update the following values to match your application needs. - // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. - minSdkVersion 21 + minSdkVersion 26 targetSdkVersion flutter.targetSdkVersion versionCode flutterVersionCode.toInteger() versionName flutterVersionName @@ -66,5 +63,6 @@ flutter { } dependencies { - implementation 'com.android.support:multidex:1.0.3' + implementation 'com.android.support:multidex:2.0.1' + implementation 'com.android.tools:desugar_jdk_libs:2.0.3' } diff --git a/android/gradle.properties b/android/gradle.properties index 598d13f..73c3168 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,3 +1,6 @@ org.gradle.jvmargs=-Xmx4G android.useAndroidX=true android.enableJetifier=true +android.defaults.buildfeatures.buildconfig=true +android.nonTransitiveRClass=false +android.nonFinalResIds=false diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 5083229..80187ac 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/android/settings.gradle b/android/settings.gradle index 767b939..1a77c08 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -19,7 +19,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "7.3.0" apply false + id "com.android.application" version '8.1.4' apply false id "org.jetbrains.kotlin.android" version "1.8.10" apply false } diff --git a/lib/api/mhsl/server/userIndex/update/updateUserindex.dart b/lib/api/mhsl/server/userIndex/update/updateUserindex.dart index 59af347..9ac1b8c 100644 --- a/lib/api/mhsl/server/userIndex/update/updateUserindex.dart +++ b/lib/api/mhsl/server/userIndex/update/updateUserindex.dart @@ -4,7 +4,7 @@ import 'dart:developer'; import 'package:device_info_plus/device_info_plus.dart'; import 'package:http/http.dart' as http; -import 'package:package_info/package_info.dart'; +import 'package:package_info_plus/package_info_plus.dart'; import '../../../../../model/accountData.dart'; import '../../../mhslApi.dart'; diff --git a/lib/main.dart b/lib/main.dart index 2eb9699..6f20ebb 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -7,13 +7,13 @@ import 'package:firebase_messaging/firebase_messaging.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:flutter_localizations/flutter_localizations.dart'; import 'package:hydrated_bloc/hydrated_bloc.dart'; import 'package:jiffy/jiffy.dart'; import 'package:loader_overlay/loader_overlay.dart'; import 'package:path_provider/path_provider.dart'; import 'package:persistent_bottom_nav_bar_v2/persistent_bottom_nav_bar_v2.dart'; import 'package:provider/provider.dart'; -import 'package:flutter_localizations/flutter_localizations.dart'; import 'api/mhsl/breaker/getBreakers/getBreakersResponse.dart'; import 'app.dart'; @@ -48,7 +48,9 @@ Future main() async { PlatformAssetBundle().load('assets/ca/lets-encrypt-r10.pem').then(addCertificateAsTrusted), Future(() async { - await HydratedStorage.build(storageDirectory: await getTemporaryDirectory()).then((storage) => HydratedBloc.storage = storage); + await HydratedStorage.build( + storageDirectory: HydratedStorageDirectory((await getTemporaryDirectory()).path) + ).then((storage) => HydratedBloc.storage = storage); }) ]; diff --git a/lib/model/breakers/BreakerProps.dart b/lib/model/breakers/BreakerProps.dart index 1c5fed5..ec55ada 100644 --- a/lib/model/breakers/BreakerProps.dart +++ b/lib/model/breakers/BreakerProps.dart @@ -1,4 +1,4 @@ -import 'package:package_info/package_info.dart'; +import 'package:package_info_plus/package_info_plus.dart'; import '../../api/apiResponse.dart'; import '../../api/mhsl/breaker/getBreakers/getBreakersCache.dart'; @@ -10,7 +10,7 @@ class BreakerProps extends DataHolder { GetBreakersResponse get getBreakersResponse => _getBreakersResponse!; PackageInfo? packageInfo; - + String? isBlocked(BreakerArea? type) { if(packageInfo == null) { PackageInfo.fromPlatform().then((value) => packageInfo = value); diff --git a/lib/model/chatList/chatListProps.dart b/lib/model/chatList/chatListProps.dart index 2c4e2b7..e1b7bda 100644 --- a/lib/model/chatList/chatListProps.dart +++ b/lib/model/chatList/chatListProps.dart @@ -1,4 +1,3 @@ - import 'package:flutter_app_badger/flutter_app_badger.dart'; import '../../api/apiResponse.dart'; diff --git a/lib/notification/notificationService.dart b/lib/notification/notificationService.dart index c855db6..85c5e98 100644 --- a/lib/notification/notificationService.dart +++ b/lib/notification/notificationService.dart @@ -15,9 +15,6 @@ class NotificationService { ); final iosSettings = DarwinInitializationSettings( - onDidReceiveLocalNotification: (id, title, body, payload) { - // TODO Navigate to Talk section (This runs when an Notification is tapped) - }, ); diff --git a/lib/view/pages/more/feedback/feedbackDialog.dart b/lib/view/pages/more/feedback/feedbackDialog.dart index f78eea2..8e082c6 100644 --- a/lib/view/pages/more/feedback/feedbackDialog.dart +++ b/lib/view/pages/more/feedback/feedbackDialog.dart @@ -5,7 +5,7 @@ import 'dart:typed_data'; import 'package:flutter/material.dart'; import 'package:image_picker/image_picker.dart'; import 'package:loader_overlay/loader_overlay.dart'; -import 'package:package_info/package_info.dart'; +import 'package:package_info_plus/package_info_plus.dart'; import 'package:provider/provider.dart'; import 'package:badges/badges.dart' as badges; diff --git a/lib/view/pages/talk/components/chatBubble.dart b/lib/view/pages/talk/components/chatBubble.dart index 0539f19..ab1975f 100644 --- a/lib/view/pages/talk/components/chatBubble.dart +++ b/lib/view/pages/talk/components/chatBubble.dart @@ -130,7 +130,7 @@ class _ChatBubbleState extends State with SingleTickerProviderStateM emojis.EmojiPicker( config: emojis.Config( height: 256, - swapCategoryAndBottomBar: true, + // swapCategoryAndBottomBar: true, // TODO this property is no longer supported, need to find an replacement emojiViewConfig: emojis.EmojiViewConfig( backgroundColor: Theme.of(context).canvasColor, recentsLimit: 67, @@ -148,7 +148,7 @@ class _ChatBubbleState extends State with SingleTickerProviderStateM ), searchViewConfig: emojis.SearchViewConfig( backgroundColor: Theme.of(context).dividerColor, - buttonColor: Theme.of(context).dividerColor, + // buttonColor: Theme.of(context).dividerColor, // TODO property no longer supported hintText: 'Suchen', buttonIconColor: Colors.white, ), diff --git a/lib/view/settings/settings.dart b/lib/view/settings/settings.dart index 6bcac72..abda9e5 100644 --- a/lib/view/settings/settings.dart +++ b/lib/view/settings/settings.dart @@ -2,7 +2,7 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:jiffy/jiffy.dart'; -import 'package:package_info/package_info.dart'; +import 'package:package_info_plus/package_info_plus.dart'; import 'package:provider/provider.dart'; import 'package:shared_preferences/shared_preferences.dart'; diff --git a/pubspec.yaml b/pubspec.yaml index c74885e..4fc5eb6 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -30,7 +30,7 @@ environment: # versions available, run `flutter pub outdated`. dependency_overrides: - #xml: ^6.2.2 + intl: any dependencies: flutter: @@ -39,85 +39,82 @@ dependencies: flutter_localizations: sdk: flutter - # The following adds the Cupertino Icons font to your application. - # Use with the CupertinoIcons class for iOS style icons. - cupertino_icons: ^1.0.2 - flutter_native_splash: ^2.2.14 - flutter_login: ^5.0.0 - bubble: ^1.2.1 - http: ^1.1.0 - shared_preferences: ^2.0.15 - provider: ^6.0.4 - jiffy: ^6.1.0 - json_annotation: ^4.8.1 - localstore: ^1.2.3 - intl: ^0.18.0 + cupertino_icons: any + flutter_native_splash: any + flutter_login: any + bubble: any + http: any + shared_preferences: any + provider: any + jiffy: any + json_annotation: any + localstore: any nextcloud: git: url: https://github.com/provokateurin/nextcloud-neon path: packages/nextcloud ref: 3683491a94670393e46cbc83ad85b994f7df7481 - flutter_launcher_icons: ^0.13.1 - pretty_json: ^2.0.0 - cached_network_image: ^3.2.3 - url_launcher: ^6.1.10 - flutter_linkify: ^6.0.0 - filesize: ^2.0.1 - path_provider: ^2.0.13 - better_open_file: ^3.6.4 + flutter_launcher_icons: any + pretty_json: any + cached_network_image: any + url_launcher: any + flutter_linkify: any + filesize: any + path_provider: any + better_open_file: any flowder: git: url: https://github.com/Harsh223/flowder.git - persistent_bottom_nav_bar_v2: ^5.0.0 - badges: ^3.0.2 - image_picker: ^1.0.0 - file_picker: ^8.0.0+1 - loader_overlay: ^4.0.0 - crypto: ^3.0.3 - package_info: ^2.0.2 - syncfusion_flutter_calendar: ^24.1.44 - async: ^2.11.0 - animated_digit: ^3.2.1 - syncfusion_flutter_pdfviewer: ^24.1.44 - photo_view: ^0.14.0 - uuid: ^4.2.2 - firebase_messaging: ^14.6.5 - firebase_core: ^2.15.0 - firebase_in_app_messaging: ^0.7.3+4 - flutter_local_notifications: ^17.0.0 - fast_rsa: ^3.6.1 - share_plus: ^8.0.2 - flutter_split_view: ^0.1.2 - bottom_sheet: ^4.0.0 - device_info_plus: ^9.0.3 - flutter_app_badger: ^1.5.0 - qr_flutter: ^4.1.0 - easy_debounce: ^2.0.3 - rrule_generator: ^0.7.0+1 - rrule: ^0.2.16 - time_range_picker: ^2.2.0 - in_app_review: ^2.0.8 - emoji_picker_flutter: ^2.1.1 - bloc: ^8.1.4 - flutter_bloc: ^8.1.5 - freezed_annotation: ^2.4.1 - connectivity_plus: ^6.0.3 - hydrated_bloc: ^9.1.5 - dio: ^4.0.6 + persistent_bottom_nav_bar_v2: any + badges: any + image_picker: any + file_picker: any + loader_overlay: any + crypto: any + package_info_plus: any + syncfusion_flutter_calendar: any + async: any + animated_digit: any + syncfusion_flutter_pdfviewer: any + photo_view: any + uuid: any + firebase_messaging: any + firebase_core: any + firebase_in_app_messaging: any + flutter_local_notifications: any + fast_rsa: any + share_plus: ^10.1.4 + flutter_split_view: any + bottom_sheet: any + device_info_plus: any + flutter_app_badger: any + qr_flutter: any + easy_debounce: any + rrule_generator: any + rrule: any + time_range_picker: any + in_app_review: any + emoji_picker_flutter: any + bloc: any + flutter_bloc: any + freezed_annotation: any + connectivity_plus: any + hydrated_bloc: any + dio: any dev_dependencies: flutter_test: sdk: flutter - json_serializable: ^6.7.1 - build_runner: ^2.4.9 + json_serializable: any + build_runner: any # The "flutter_lints" package below contains a set of recommended lints to # encourage good coding practices. The lint set provided by the package is # activated in the `analysis_options.yaml` file located at the root of your # package. See that file for information about deactivating specific lint # rules and activating additional ones. - flutter_lints: ^3.0.1 - freezed: ^2.5.2 + flutter_lints: any + freezed: any # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec