diff --git a/filcnaplo/android/app/src/main/AndroidManifest.xml b/filcnaplo/android/app/src/main/AndroidManifest.xml index 6e3adbd..38ae1d5 100644 --- a/filcnaplo/android/app/src/main/AndroidManifest.xml +++ b/filcnaplo/android/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ - + diff --git a/filcnaplo/android/build.gradle b/filcnaplo/android/build.gradle index 403212e..edc4862 100644 --- a/filcnaplo/android/build.gradle +++ b/filcnaplo/android/build.gradle @@ -1,9 +1,9 @@ buildscript { - ext.kotlin_version = '1.3.50' + ext.kotlin_version = '1.6.10' ext { - compileSdkVersion = 30 - targetSdkVersion = 30 + compileSdkVersion = 31 + targetSdkVersion = 31 appCompatVersion = "1.1.0" } @@ -33,8 +33,8 @@ subprojects { afterEvaluate {project -> if (project.plugins.hasPlugin('android') || project.plugins.hasPlugin('android-library')) { android { - compileSdkVersion 30 - buildToolsVersion '30.0.3' + compileSdkVersion 31 + buildToolsVersion '31.0.0' } } } diff --git a/filcnaplo/lib/app.dart b/filcnaplo/lib/app.dart index 77941cf..29db3b2 100644 --- a/filcnaplo/lib/app.dart +++ b/filcnaplo/lib/app.dart @@ -33,7 +33,7 @@ import 'package:filcnaplo_kreta_api/providers/timetable_provider.dart'; import 'package:filcnaplo/api/providers/user_provider.dart'; import 'package:filcnaplo/api/providers/update_provider.dart'; import 'package:filcnaplo_mobile_ui/pages/grades/calculator/grade_calculator_provider.dart'; -import 'package:flutter_displaymode/flutter_displaymode.dart'; +// import 'package:flutter_displaymode/flutter_displaymode.dart'; class App extends StatelessWidget { final SettingsProvider settings; @@ -49,7 +49,7 @@ class App extends StatelessWidget { setSystemChrome(context); // Set high refresh mode #28 - if (Platform.isAndroid) FlutterDisplayMode.setHighRefreshRate(); + // if (Platform.isAndroid) FlutterDisplayMode.setHighRefreshRate(); WidgetsBinding.instance?.addPostFrameCallback((_) { FilcAPI.getConfig(settings).then((Config? config) { diff --git a/filcnaplo/pubspec.yaml b/filcnaplo/pubspec.yaml index 25c8bfe..4eab82d 100644 --- a/filcnaplo/pubspec.yaml +++ b/filcnaplo/pubspec.yaml @@ -3,7 +3,7 @@ description: "Nem hivatalos e-napló alkalmazás az e-Kréta rendszerhez" homepage: https://filcnaplo.hu publish_to: "none" -version: 3.1.1+139 +version: 3.2.0+140 environment: sdk: ">=2.16.0-80.1.beta <3.0.0" @@ -36,7 +36,7 @@ dependencies: share_plus: ^3.0.4 package_info_plus: ^1.0.6 connectivity_plus: ^2.0.2 - flutter_displaymode: ^0.3.2 + # flutter_displaymode: ^0.3.2 dev_dependencies: flutter_test: diff --git a/filcnaplo_kreta_api b/filcnaplo_kreta_api index 6110105..1bc77b6 160000 --- a/filcnaplo_kreta_api +++ b/filcnaplo_kreta_api @@ -1 +1 @@ -Subproject commit 61101052badf399014e2abd26f675101f91117a8 +Subproject commit 1bc77b69dc5363c6818be0ee0a9291e40ef128c5 diff --git a/fix-d8dx.sh b/fix-d8dx.sh new file mode 100644 index 0000000..ef172d1 --- /dev/null +++ b/fix-d8dx.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +cd $ANDROID_SDK/build-tools/31.0.0 && + mv -v d8 dx && + cd lib && + mv -v d8.jar dx.jar