diff --git a/android/app/build.gradle b/android/app/build.gradle index 0cbdb6e..3a5430a 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -8,7 +8,7 @@ if (localPropertiesFile.exists()) { def flutterRoot = localProperties.getProperty('flutter.sdk') if (flutterRoot == null) { - throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") + throw GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") } def flutterVersionCode = localProperties.getProperty('flutter.versionCode') diff --git a/android/build.gradle b/android/build.gradle index 58a8c74..713d7f6 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -26,6 +26,6 @@ subprojects { project.evaluationDependsOn(':app') } -task clean(type: Delete) { +tasks.register("clean", Delete) { delete rootProject.buildDir } diff --git a/ios/Podfile.lock b/ios/Podfile.lock index d308160..48b9666 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -78,9 +78,9 @@ DEPENDENCIES: - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`) - objectbox_flutter_libs (from `.symlinks/plugins/objectbox_flutter_libs/ios`) - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`) - - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/ios`) + - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`) - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`) - - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/ios`) + - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`) - sqflite (from `.symlinks/plugins/sqflite/ios`) - wakelock (from `.symlinks/plugins/wakelock/ios`) - webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/ios`) @@ -120,11 +120,11 @@ EXTERNAL SOURCES: package_info_plus: :path: ".symlinks/plugins/package_info_plus/ios" path_provider_foundation: - :path: ".symlinks/plugins/path_provider_foundation/ios" + :path: ".symlinks/plugins/path_provider_foundation/darwin" permission_handler_apple: :path: ".symlinks/plugins/permission_handler_apple/ios" shared_preferences_foundation: - :path: ".symlinks/plugins/shared_preferences_foundation/ios" + :path: ".symlinks/plugins/shared_preferences_foundation/darwin" sqflite: :path: ".symlinks/plugins/sqflite/ios" wakelock: diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 93b743f..59029e7 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -227,6 +227,7 @@ files = ( ); inputPaths = ( + "${TARGET_BUILD_DIR}/${INFOPLIST_PATH}", ); name = "Thin Binary"; outputPaths = ( diff --git a/lib/main.dart b/lib/main.dart index c676a9f..2549e1f 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -60,8 +60,10 @@ Future main() async { await package_info_plus().initPackageInfo(); // set device screenWidth/height - SharedPrefs().screenWidth = window.physicalSize.width; - SharedPrefs().screenHeight = window.physicalSize.height; + SharedPrefs().screenWidth = + PlatformDispatcher.instance.views.first.physicalSize.width; + SharedPrefs().screenHeight = + PlatformDispatcher.instance.views.first.physicalSize.height; // initialize directories await directories().initDirectories(); diff --git a/lib/network/api_provider.dart b/lib/network/api_provider.dart index 47278ed..31bea63 100644 --- a/lib/network/api_provider.dart +++ b/lib/network/api_provider.dart @@ -33,9 +33,9 @@ class ApiProvider { } return await _dio.get(url); - } on DioError catch (e) { + } on DioException catch (e) { //print(e.toString()+' | '+url.toString()); - if (e.type == DioErrorType.badResponse) { + if (e.type == DioExceptionType.badResponse) { int? statusCode = e.response!.statusCode; if (statusCode == STATUS_NOT_FOUND) { throw "Api not found"; @@ -44,9 +44,9 @@ class ApiProvider { } else { throw e.error.toString(); } - } else if (e.type == DioErrorType.connectionTimeout) { + } else if (e.type == DioExceptionType.connectionTimeout) { throw e.message.toString(); - } else if (e.type == DioErrorType.cancel) { + } else if (e.type == DioExceptionType.cancel) { throw 'cancel'; } throw connErr; @@ -62,9 +62,9 @@ class ApiProvider { _dio.options.receiveTimeout = Duration(seconds: 4); return await _dio.post(url, cancelToken: apiToken); - } on DioError catch (e) { + } on DioException catch (e) { //print(e.toString()+' | '+url.toString()); - if (e.type == DioErrorType.badResponse) { + if (e.type == DioExceptionType.badResponse) { int? statusCode = e.response!.statusCode; if (statusCode == STATUS_NOT_FOUND) { throw "Api not found"; @@ -73,9 +73,9 @@ class ApiProvider { } else { throw e.error.toString(); } - } else if (e.type == DioErrorType.connectionTimeout) { + } else if (e.type == DioExceptionType.connectionTimeout) { throw e.message.toString(); - } else if (e.type == DioErrorType.cancel) { + } else if (e.type == DioExceptionType.cancel) { throw 'cancel'; } throw connErr; @@ -92,9 +92,9 @@ class ApiProvider { _dio.options.receiveTimeout = Duration(seconds: 4); return await _dio.post(url, data: data, cancelToken: apiToken); - } on DioError catch (e) { + } on DioException catch (e) { //print(e.toString()+' | '+url.toString()); - if (e.type == DioErrorType.badResponse) { + if (e.type == DioExceptionType.badResponse) { int? statusCode = e.response!.statusCode; if (statusCode == STATUS_NOT_FOUND) { throw "Api not found"; @@ -103,9 +103,9 @@ class ApiProvider { } else { throw e.error.toString(); } - } else if (e.type == DioErrorType.connectionTimeout) { + } else if (e.type == DioExceptionType.connectionTimeout) { throw e.message.toString(); - } else if (e.type == DioErrorType.cancel) { + } else if (e.type == DioExceptionType.cancel) { throw 'cancel'; } throw connErr; diff --git a/pubspec.lock b/pubspec.lock index a98caa4..ef81716 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -37,10 +37,10 @@ packages: dependency: transitive description: name: async - sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0 + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" url: "https://pub.dev" source: hosted - version: "2.10.0" + version: "2.11.0" audioplayers: dependency: "direct main" description: @@ -261,10 +261,10 @@ packages: dependency: transitive description: name: characters - sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c + sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.3.0" checked_yaml: dependency: transitive description: @@ -293,10 +293,10 @@ packages: dependency: transitive description: name: collection - sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0 + sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" url: "https://pub.dev" source: hosted - version: "1.17.0" + version: "1.17.1" connectivity_plus: dependency: "direct main" description: @@ -397,10 +397,10 @@ packages: dependency: "direct main" description: name: dio - sha256: "0894a098594263fe1caaba3520e3016d8a855caeb010a882273189cca10f11e9" + sha256: a9d76e72985d7087eb7c5e7903224ae52b337131518d127c554b9405936752b8 url: "https://pub.dev" source: hosted - version: "5.1.1" + version: "5.2.1+1" equatable: dependency: transitive description: @@ -609,10 +609,10 @@ packages: dependency: "direct main" description: name: image_gallery_saver - sha256: "009b7722cd8507fd72c7f2cb7cbc46d6e15ad0895469cfcc39a10f86e3556979" + sha256: "0aba74216a4d9b0561510cb968015d56b701ba1bd94aace26aacdd8ae5761816" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "2.0.3" image_picker: dependency: "direct main" description: @@ -657,10 +657,10 @@ packages: dependency: "direct main" description: name: intl - sha256: "910f85bce16fb5c6f614e117efa303e85a1731bb0081edf3604a2ae6e9a3cc91" + sha256: a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6 url: "https://pub.dev" source: hosted - version: "0.17.0" + version: "0.18.0" io: dependency: transitive description: @@ -673,10 +673,10 @@ packages: dependency: transitive description: name: js - sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" + sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 url: "https://pub.dev" source: hosted - version: "0.6.5" + version: "0.6.7" json_annotation: dependency: transitive description: @@ -705,10 +705,10 @@ packages: dependency: transitive description: name: matcher - sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72" + sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" url: "https://pub.dev" source: hosted - version: "0.12.13" + version: "0.12.15" material_color_utilities: dependency: transitive description: @@ -721,10 +721,10 @@ packages: dependency: transitive description: name: meta - sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42" + sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" url: "https://pub.dev" source: hosted - version: "1.8.0" + version: "1.9.1" mime: dependency: transitive description: @@ -809,10 +809,10 @@ packages: dependency: transitive description: name: path - sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b + sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" url: "https://pub.dev" source: hosted - version: "1.8.2" + version: "1.8.3" path_provider: dependency: transitive description: @@ -1190,10 +1190,10 @@ packages: dependency: transitive description: name: test_api - sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206 + sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb url: "https://pub.dev" source: hosted - version: "0.4.16" + version: "0.5.1" timing: dependency: transitive description: @@ -1355,5 +1355,5 @@ packages: source: hosted version: "3.1.1" sdks: - dart: ">=2.19.2 <3.0.0" + dart: ">=3.0.0-0 <4.0.0" flutter: ">=3.3.0" diff --git a/pubspec.yaml b/pubspec.yaml index 2a3a221..465359b 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -32,7 +32,7 @@ dependencies: sdk: flutter # https://pub.dev/packages/dio - dio: 5.1.1 + dio: 5.2.1+1 # https://pub.dev/packages/objectbox objectbox: ^2.0.0 @@ -82,7 +82,7 @@ dependencies: cached_network_image: 3.2.3 # https://pub.dev/packages/intl - intl: 0.17.0 + intl: 0.18.0 # https://pub.dev/packages/carousel_slider carousel_slider: 4.2.1