diff --git a/android/app/build.gradle b/android/app/build.gradle index c70c0cc8..9eb50919 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -56,7 +56,7 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 29 + compileSdkVersion 31 sourceSets { main.java.srcDirs += 'src/main/kotlin' diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 0c40d825..430921c2 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -24,10 +24,6 @@ android:resource="@drawable/launch_background" /> - diff --git a/pubspec.lock b/pubspec.lock index 7c39fa66..4974483f 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -7,14 +7,14 @@ packages: name: _fe_analyzer_shared url: "https://pub.dartlang.org" source: hosted - version: "31.0.0" + version: "34.0.0" analyzer: dependency: transitive description: name: analyzer url: "https://pub.dartlang.org" source: hosted - version: "2.8.0" + version: "3.2.0" animations: dependency: "direct main" description: @@ -98,7 +98,7 @@ packages: name: built_value url: "https://pub.dartlang.org" source: hosted - version: "8.1.3" + version: "8.1.4" characters: dependency: transitive description: @@ -133,7 +133,7 @@ packages: name: chewie_audio url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.0" cli_util: dependency: transitive description: @@ -278,7 +278,7 @@ packages: name: flutter_keyboard_visibility url: "https://pub.dartlang.org" source: hosted - version: "5.1.0" + version: "5.1.1" flutter_keyboard_visibility_platform_interface: dependency: transitive description: @@ -341,7 +341,42 @@ packages: name: flutter_secure_storage url: "https://pub.dartlang.org" source: hosted - version: "4.2.1" + version: "5.0.2" + flutter_secure_storage_linux: + dependency: transitive + description: + name: flutter_secure_storage_linux + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.0" + flutter_secure_storage_macos: + dependency: transitive + description: + name: flutter_secure_storage_macos + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.0" + flutter_secure_storage_platform_interface: + dependency: transitive + description: + name: flutter_secure_storage_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.0" + flutter_secure_storage_web: + dependency: transitive + description: + name: flutter_secure_storage_web + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.2" + flutter_secure_storage_windows: + dependency: transitive + description: + name: flutter_secure_storage_windows + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.2" flutter_summernote: dependency: "direct main" description: @@ -374,7 +409,7 @@ packages: name: flutter_web_auth url: "https://pub.dartlang.org" source: hosted - version: "0.3.2" + version: "0.4.0" flutter_web_plugins: dependency: transitive description: flutter @@ -421,21 +456,21 @@ packages: name: google_sign_in url: "https://pub.dartlang.org" source: hosted - version: "5.2.1" + version: "5.2.3" google_sign_in_platform_interface: dependency: transitive description: name: google_sign_in_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.1.1" google_sign_in_web: dependency: transitive description: name: google_sign_in_web url: "https://pub.dartlang.org" source: hosted - version: "0.10.0+3" + version: "0.10.0+4" graphs: dependency: transitive description: @@ -463,7 +498,7 @@ packages: name: hive_generator url: "https://pub.dartlang.org" source: hosted - version: "1.1.1" + version: "1.1.2" html: dependency: "direct main" description: @@ -505,21 +540,21 @@ packages: name: image_picker url: "https://pub.dartlang.org" source: hosted - version: "0.8.4+4" + version: "0.8.4+6" image_picker_for_web: dependency: transitive description: name: image_picker_for_web url: "https://pub.dartlang.org" source: hosted - version: "2.1.4" + version: "2.1.5" image_picker_platform_interface: dependency: transitive description: name: image_picker_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.4.1" + version: "2.4.3" intl: dependency: "direct main" description: @@ -576,6 +611,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.12.11" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.3" meta: dependency: transitive description: @@ -617,7 +659,7 @@ packages: name: oauth2_client url: "https://pub.dartlang.org" source: hosted - version: "2.3.1" + version: "2.3.2" package_config: dependency: transitive description: @@ -673,28 +715,28 @@ packages: name: path_provider_linux url: "https://pub.dartlang.org" source: hosted - version: "2.1.4" + version: "2.1.5" path_provider_macos: dependency: transitive description: name: path_provider_macos url: "https://pub.dartlang.org" source: hosted - version: "2.0.4" + version: "2.0.5" path_provider_platform_interface: dependency: transitive description: name: path_provider_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.0.1" + version: "2.0.3" path_provider_windows: dependency: transitive description: name: path_provider_windows url: "https://pub.dartlang.org" source: hosted - version: "2.0.4" + version: "2.0.5" pedantic: dependency: transitive description: @@ -712,9 +754,11 @@ packages: photo_view: dependency: "direct main" description: - name: photo_view - url: "https://pub.dartlang.org" - source: hosted + path: "." + ref: HEAD + resolved-ref: b0668f46e808f6ad708ecc3e9671ac4ca31bb938 + url: "https://github.com/bluefireteam/photo_view.git" + source: git version: "0.13.0" platform: dependency: transitive @@ -729,7 +773,7 @@ packages: name: plugin_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "2.1.2" pool: dependency: transitive description: @@ -750,7 +794,7 @@ packages: name: provider url: "https://pub.dartlang.org" source: hosted - version: "6.0.1" + version: "6.0.2" pub_semver: dependency: transitive description: @@ -799,28 +843,28 @@ packages: name: shared_preferences url: "https://pub.dartlang.org" source: hosted - version: "2.0.11" + version: "2.0.12" shared_preferences_android: dependency: transitive description: name: shared_preferences_android url: "https://pub.dartlang.org" source: hosted - version: "2.0.9" + version: "2.0.10" shared_preferences_ios: dependency: transitive description: name: shared_preferences_ios url: "https://pub.dartlang.org" source: hosted - version: "2.0.8" + version: "2.0.9" shared_preferences_linux: dependency: transitive description: name: shared_preferences_linux url: "https://pub.dartlang.org" source: hosted - version: "2.0.3" + version: "2.0.4" shared_preferences_macos: dependency: transitive description: @@ -841,14 +885,14 @@ packages: name: shared_preferences_web url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "2.0.3" shared_preferences_windows: dependency: transitive description: name: shared_preferences_windows url: "https://pub.dartlang.org" source: hosted - version: "2.0.3" + version: "2.0.4" shelf: dependency: transitive description: @@ -937,7 +981,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.3" + version: "0.4.8" theme_provider: dependency: "direct main" description: @@ -951,7 +995,7 @@ packages: name: timeago url: "https://pub.dartlang.org" source: hosted - version: "3.1.0" + version: "3.2.1" timing: dependency: transitive description: @@ -986,49 +1030,49 @@ packages: name: url_launcher url: "https://pub.dartlang.org" source: hosted - version: "6.0.17" + version: "6.0.18" url_launcher_android: dependency: transitive description: name: url_launcher_android url: "https://pub.dartlang.org" source: hosted - version: "6.0.13" + version: "6.0.14" url_launcher_ios: dependency: transitive description: name: url_launcher_ios url: "https://pub.dartlang.org" source: hosted - version: "6.0.13" + version: "6.0.14" url_launcher_linux: dependency: transitive description: name: url_launcher_linux url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "2.0.3" url_launcher_macos: dependency: transitive description: name: url_launcher_macos url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "2.0.3" url_launcher_platform_interface: dependency: transitive description: name: url_launcher_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.0.4" + version: "2.0.5" url_launcher_web: dependency: transitive description: name: url_launcher_web url: "https://pub.dartlang.org" source: hosted - version: "2.0.5" + version: "2.0.7" url_launcher_windows: dependency: transitive description: @@ -1049,21 +1093,35 @@ packages: name: video_player url: "https://pub.dartlang.org" source: hosted - version: "2.2.10" + version: "2.2.18" + video_player_android: + dependency: transitive + description: + name: video_player_android + url: "https://pub.dartlang.org" + source: hosted + version: "2.2.17" + video_player_avfoundation: + dependency: transitive + description: + name: video_player_avfoundation + url: "https://pub.dartlang.org" + source: hosted + version: "2.2.18" video_player_platform_interface: dependency: transitive description: name: video_player_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "5.0.0" + version: "5.0.1" video_player_web: dependency: transitive description: name: video_player_web url: "https://pub.dartlang.org" source: hosted - version: "2.0.5" + version: "2.0.6" wakelock: dependency: transitive description: @@ -1133,7 +1191,7 @@ packages: name: webview_flutter_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "1.8.0" + version: "1.8.1" webview_flutter_wkwebview: dependency: transitive description: @@ -1147,14 +1205,14 @@ packages: name: win32 url: "https://pub.dartlang.org" source: hosted - version: "2.3.3" + version: "2.3.10" xdg_directories: dependency: transitive description: name: xdg_directories url: "https://pub.dartlang.org" source: hosted - version: "0.2.0" + version: "0.2.0+1" xml: dependency: transitive description: @@ -1170,5 +1228,5 @@ packages: source: hosted version: "3.1.0" sdks: - dart: ">=2.14.0 <3.0.0" - flutter: ">=2.5.0" + dart: ">=2.15.0 <3.0.0" + flutter: ">=2.8.0" diff --git a/pubspec.yaml b/pubspec.yaml index 65ddbb0c..a2e65709 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -32,15 +32,18 @@ dependencies: flutter_summernote: ^1.0.0 flutter_svg: ^0.23.0+1 flutter_typeahead: ^3.1.3 - get: ^4.1.4 - get_it: ^7.1.3 + get: ^4.6.1 + get_it: ^7.2.0 google_sign_in: ^5.0.4 html: ^0.15.0 http: ^0.13.3 intl: ^0.17.0 mockito: ^5.0.17 oauth2_client: ^2.2.2 - photo_view: ^0.13.0 + # photo_view: ^0.13.0 + photo_view: + git: + url: https://github.com/bluefireteam/photo_view.git provider: ^6.0.1 share: ^2.0.4 shared_preferences: ^2.0.6 diff --git a/test/ui_tests/about/about_view_test.dart b/test/ui_tests/about/about_view_test.dart index b2b03b9c..8da76dc0 100644 --- a/test/ui_tests/about/about_view_test.dart +++ b/test/ui_tests/about/about_view_test.dart @@ -10,7 +10,6 @@ import 'package:mobile_app/ui/components/cv_subheader.dart'; import 'package:mobile_app/ui/views/about/about_privacy_policy_view.dart'; import 'package:mobile_app/ui/views/about/about_tos_view.dart'; import 'package:mobile_app/ui/views/about/about_view.dart'; -// import 'package:mobile_app/ui/views/about/components/contributor_avatar.dart'; import '../../utils_tests/image_test_utils.dart'; import 'package:mobile_app/utils/router.dart'; import 'package:mockito/mockito.dart';