Fabio/aves
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

upgraded Flutter to beta v3.3.0-0.0.pre

Browse source
This commit is contained in:
Thibault Deckers 2022-07-20 22:34:52 +02:00
parent 9cfe043e58
commit c741a141dd
26 changed files with 41 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/check.yml vendored
View file

@ -17,7 +17,7 @@ jobs:
# Available versions may lag behind https://github.com/flutter/flutter.git
- uses: subosito/flutter-action@v2
with:
flutter-version: '3.1.0-9.0.pre'
flutter-version: '3.3.0-0.0.pre'
channel: 'beta'
- name: Clone the repository.

10
.github/workflows/release.yml vendored
View file

@ -19,7 +19,7 @@ jobs:
# Available versions may lag behind https://github.com/flutter/flutter.git
- uses: subosito/flutter-action@v2
with:
flutter-version: '3.1.0-9.0.pre'
flutter-version: '3.3.0-0.0.pre'
channel: 'beta'
# Workaround for this Android Gradle Plugin issue (supposedly fixed in AGP 4.1):
@ -56,15 +56,15 @@ jobs:
rm release.keystore.asc
mkdir outputs
(cd scripts/; ./apply_flavor_play.sh)
flutter build appbundle -t lib/main_play.dart --flavor play --bundle-sksl-path shaders_3.1.0-9.0.pre.sksl.json
flutter build appbundle -t lib/main_play.dart --flavor play --bundle-sksl-path shaders_3.3.0-0.0.pre.sksl.json
cp build/app/outputs/bundle/playRelease/*.aab outputs
flutter build apk -t lib/main_play.dart --flavor play --bundle-sksl-path shaders_3.1.0-9.0.pre.sksl.json
flutter build apk -t lib/main_play.dart --flavor play --bundle-sksl-path shaders_3.3.0-0.0.pre.sksl.json
cp build/app/outputs/apk/play/release/*.apk outputs
(cd scripts/; ./apply_flavor_huawei.sh)
flutter build apk -t lib/main_huawei.dart --flavor huawei --bundle-sksl-path shaders_3.1.0-9.0.pre.sksl.json
flutter build apk -t lib/main_huawei.dart --flavor huawei --bundle-sksl-path shaders_3.3.0-0.0.pre.sksl.json
cp build/app/outputs/apk/huawei/release/*.apk outputs
(cd scripts/; ./apply_flavor_izzy.sh)
flutter build apk -t lib/main_izzy.dart --flavor izzy --split-per-abi --bundle-sksl-path shaders_3.1.0-9.0.pre.sksl.json
flutter build apk -t lib/main_izzy.dart --flavor izzy --split-per-abi --bundle-sksl-path shaders_3.3.0-0.0.pre.sksl.json
cp build/app/outputs/apk/izzy/release/*.apk outputs
rm $AVES_STORE_FILE
env:

2
CHANGELOG.md
View file

@ -14,7 +14,7 @@ All notable changes to this project will be documented in this file.
### Changed
- viewer: black background when overlay is disabled with light theme
- upgraded Flutter to beta v3.1.0-9.0.pre
- upgraded Flutter to beta v3.3.0-0.0.pre
## <a id="v1.6.9"></a>[v1.6.9] - 2022-06-18

4
lib/model/settings/enums/display_refresh_rate_mode.dart
View file

@ -1,5 +1,6 @@
import 'package:aves/services/common/services.dart';
import 'package:aves/widgets/common/extensions/build_context.dart';
import 'package:device_info_plus/device_info_plus.dart';
import 'package:flutter/material.dart';
import 'package:flutter_displaymode/flutter_displaymode.dart';
@ -20,6 +21,9 @@ extension ExtraDisplayRefreshRateMode on DisplayRefreshRateMode {
Future<void> apply() async {
if (!await windowService.isActivity()) return;
final androidInfo = await DeviceInfoPlugin().androidInfo;
if ((androidInfo.version.sdkInt ?? 0) < 23) return;
debugPrint('Apply display refresh rate: $name');
switch (this) {
case DisplayRefreshRateMode.auto:

2
lib/services/android_app_service.dart
View file

@ -1,5 +1,3 @@
import 'dart:typed_data';
import 'package:aves/model/entry.dart';
import 'package:aves/model/filters/filters.dart';
import 'package:aves/services/common/services.dart';

2
lib/services/media/embedded_data_service.dart
View file

@ -1,5 +1,3 @@
import 'dart:typed_data';
import 'package:aves/model/entry.dart';
import 'package:aves/services/common/services.dart';
import 'package:flutter/services.dart';

1
lib/services/media/media_edit_service.dart
View file

@ -1,5 +1,4 @@
import 'dart:async';
import 'dart:typed_data';
import 'package:aves/model/entry.dart';
import 'package:aves/services/common/image_op_events.dart';

2
lib/services/media/media_fetch_service.dart
View file

@ -1,7 +1,5 @@
import 'dart:async';
import 'dart:math';
import 'dart:typed_data';
import 'dart:ui';
import 'package:aves/model/entry.dart';
import 'package:aves/ref/mime_types.dart';

1
lib/services/storage_service.dart
View file

@ -1,5 +1,4 @@
import 'dart:async';
import 'dart:typed_data';
import 'package:aves/services/common/output_buffer.dart';
import 'package:aves/services/common/services.dart';

2
lib/services/wallpaper_service.dart
View file

@ -1,5 +1,3 @@
import 'dart:typed_data';
import 'package:aves/model/wallpaper_target.dart';
import 'package:aves/services/common/services.dart';
import 'package:flutter/services.dart';

4
lib/theme/themes.dart
View file

@ -73,7 +73,7 @@ class Themes {
),
textButtonTheme: TextButtonThemeData(
style: TextButton.styleFrom(
primary: _lightLabelColor,
foregroundColor: _lightLabelColor,
),
),
tooltipTheme: _tooltipTheme,
@ -128,7 +128,7 @@ class Themes {
),
textButtonTheme: TextButtonThemeData(
style: TextButton.styleFrom(
primary: _darkLabelColor,
foregroundColor: _darkLabelColor,
),
),
tooltipTheme: _tooltipTheme,

1
lib/widget_common.dart
View file

@ -1,5 +1,4 @@
import 'dart:async';
import 'dart:typed_data';
import 'package:aves/app_flavor.dart';
import 'package:aves/model/entry.dart';

1
lib/widgets/about/bug_report.dart
View file

@ -1,6 +1,5 @@
import 'dart:convert';
import 'dart:io';
import 'dart:typed_data';
import 'package:aves/app_flavor.dart';
import 'package:aves/flutter_version.dart';

2
lib/widgets/common/action_mixins/overlay_snack_bar.dart
View file

@ -73,7 +73,7 @@ class OverlaySnackBar extends StatelessWidget {
child: TextButtonTheme(
data: TextButtonThemeData(
style: TextButton.styleFrom(
primary: buttonColor,
foregroundColor: buttonColor,
padding: const EdgeInsets.symmetric(horizontal: horizontalPadding),
),
),

1
lib/widgets/common/behaviour/eager_scale_gesture_recognizer.dart
View file

@ -2,7 +2,6 @@
import 'dart:math' as math;
import 'package:flutter/gestures.dart';
import 'package:vector_math/vector_math_64.dart';
// adapted from Flutter `ScaleGestureRecognizer` in `/gestures/scale.dart`
// ignore_for_file: curly_braces_in_flow_control_structures, deprecated_member_use, unnecessary_null_comparison

19
lib/widgets/common/map/leaflet/tile_layers.dart
View file

@ -15,8 +15,8 @@ class OSMHotLayer extends StatelessWidget {
urlTemplate: 'https://{s}.tile.openstreetmap.fr/hot/{z}/{x}/{y}.png',
subdomains: ['a', 'b', 'c'],
backgroundColor: _tileLayerBackgroundColor,
tileProvider: _NetworkTileProvider(),
retinaMode: context.select<MediaQueryData, double>((mq) => mq.devicePixelRatio) > 1,
userAgentPackageName: device.userAgent,
),
);
}
@ -32,8 +32,8 @@ class StamenTonerLayer extends StatelessWidget {
urlTemplate: 'https://stamen-tiles-{s}.a.ssl.fastly.net/toner-lite/{z}/{x}/{y}{r}.png',
subdomains: ['a', 'b', 'c', 'd'],
backgroundColor: _tileLayerBackgroundColor,
tileProvider: _NetworkTileProvider(),
retinaMode: context.select<MediaQueryData, double>((mq) => mq.devicePixelRatio) > 1,
userAgentPackageName: device.userAgent,
),
);
}
@ -49,22 +49,9 @@ class StamenWatercolorLayer extends StatelessWidget {
urlTemplate: 'https://stamen-tiles-{s}.a.ssl.fastly.net/watercolor/{z}/{x}/{y}.jpg',
subdomains: ['a', 'b', 'c', 'd'],
backgroundColor: _tileLayerBackgroundColor,
tileProvider: _NetworkTileProvider(),
retinaMode: context.select<MediaQueryData, double>((mq) => mq.devicePixelRatio) > 1,
userAgentPackageName: device.userAgent,
),
);
}
}
class _NetworkTileProvider extends NetworkTileProvider {
final Map<String, String> headers = {
'User-Agent': device.userAgent,
};
_NetworkTileProvider();
@override
ImageProvider getImage(Coords<num> coords, TileLayerOptions options) {
return NetworkImage(getTileUrl(coords, options), headers: headers);
}
}

1
lib/widgets/viewer/debug/debug_page.dart
View file

@ -1,4 +1,3 @@
import 'dart:typed_data';
import 'dart:ui' as ui;
import 'package:aves/app_mode.dart';

1
lib/widgets/viewer/overlay/wallpaper_buttons.dart
View file

@ -1,6 +1,5 @@
import 'dart:async';
import 'dart:math';
import 'dart:typed_data';
import 'dart:ui' as ui;
import 'package:aves/model/device.dart';

2
lib/widgets/viewer/video/controller.dart
View file

@ -1,5 +1,3 @@
import 'dart:typed_data';
import 'package:aves/model/entry.dart';
import 'package:aves/model/video_playback.dart';
import 'package:aves/services/common/services.dart';

1
plugins/aves_map/lib/src/marker/generator.dart
View file

@ -1,4 +1,3 @@
import 'dart:typed_data';
import 'dart:ui' as ui;
import 'package:collection/collection.dart';

2
plugins/aves_map/lib/src/overlay/tile.dart
View file

@ -1,5 +1,3 @@
import 'dart:typed_data';
import 'package:flutter/foundation.dart';
@immutable

2
plugins/aves_services_google/lib/aves_services_platform.dart
View file

@ -23,7 +23,7 @@ class PlatformMobileServices extends MobileServices {
// cf https://github.com/flutter/flutter/issues/23728
// as of google_maps_flutter v2.1.5, Flutter v3.0.1 makes the map hide overlay widgets on API <=22
final androidInfo = await DeviceInfoPlugin().androidInfo;
_canRenderMaps = (androidInfo.version.sdkInt ?? 0) >= 23;
_canRenderMaps = (androidInfo.version.sdkInt ?? 0) >= 21;
}
@override

1
plugins/aves_services_google/lib/src/map.dart
View file

@ -240,6 +240,7 @@ class _EntryGoogleMapState<T> extends State<EntryGoogleMap<T>> with WidgetsBindi
// sometimes the map does not properly update after changing the widget size,
// so we monitor the size and force refreshing after an arbitrary small delay
// TODO TLAD [map] this workaround no longer works with Flutter beta v3.3.0-0.0.pre
Future<void> _onSizeChange() async {
await Future.delayed(const Duration(milliseconds: 100));
debugPrint('refresh map for size=${_sizeNotifier.value}');

42
pubspec.lock
View file

@ -21,7 +21,7 @@ packages:
name: archive
url: "https://pub.dartlang.org"
source: hosted
version: "3.1.11"
version: "3.3.0"
args:
dependency: transitive
description:
@ -119,7 +119,7 @@ packages:
name: clock
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.0"
version: "1.1.1"
collection:
dependency: "direct main"
description:
@ -133,7 +133,7 @@ packages:
name: connectivity_plus
url: "https://pub.dartlang.org"
source: hosted
version: "2.3.5"
version: "2.3.6"
connectivity_plus_linux:
dependency: transitive
description:
@ -161,7 +161,7 @@ packages:
name: connectivity_plus_web
url: "https://pub.dartlang.org"
source: hosted
version: "1.2.2"
version: "1.2.3"
connectivity_plus_windows:
dependency: transitive
description:
@ -189,7 +189,7 @@ packages:
name: coverage
url: "https://pub.dartlang.org"
source: hosted
version: "1.3.2"
version: "1.5.0"
crypto:
dependency: transitive
description:
@ -296,7 +296,7 @@ packages:
name: fake_async
url: "https://pub.dartlang.org"
source: hosted
version: "1.3.0"
version: "1.3.1"
ffi:
dependency: transitive
description:
@ -326,7 +326,7 @@ packages:
name: firebase_core
url: "https://pub.dartlang.org"
source: hosted
version: "1.19.1"
version: "1.19.2"
firebase_core_platform_interface:
dependency: transitive
description:
@ -340,21 +340,21 @@ packages:
name: firebase_core_web
url: "https://pub.dartlang.org"
source: hosted
version: "1.6.6"
version: "1.7.0"
firebase_crashlytics:
dependency: transitive
description:
name: firebase_crashlytics
url: "https://pub.dartlang.org"
source: hosted
version: "2.8.4"
version: "2.8.5"
firebase_crashlytics_platform_interface:
dependency: transitive
description:
name: firebase_crashlytics_platform_interface
url: "https://pub.dartlang.org"
source: hosted
version: "3.2.10"
version: "3.2.11"
flex_color_picker:
dependency: "direct main"
description:
@ -418,21 +418,21 @@ packages:
name: flutter_map
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.1"
version: "2.0.0"
flutter_markdown:
dependency: "direct main"
description:
name: flutter_markdown
url: "https://pub.dartlang.org"
source: hosted
version: "0.6.10+2"
version: "0.6.10+3"
flutter_plugin_android_lifecycle:
dependency: transitive
description:
name: flutter_plugin_android_lifecycle
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.6"
version: "2.0.7"
flutter_staggered_animations:
dependency: "direct main"
description:
@ -594,7 +594,7 @@ packages:
name: matcher
url: "https://pub.dartlang.org"
source: hosted
version: "0.12.11"
version: "0.12.12"
material_color_utilities:
dependency: "direct main"
description:
@ -1109,7 +1109,7 @@ packages:
name: sync_http
url: "https://pub.dartlang.org"
source: hosted
version: "0.3.0"
version: "0.3.1"
synchronized:
dependency: transitive
description:
@ -1123,28 +1123,28 @@ packages:
name: term_glyph
url: "https://pub.dartlang.org"
source: hosted
version: "1.2.0"
version: "1.2.1"
test:
dependency: "direct dev"
description:
name: test
url: "https://pub.dartlang.org"
source: hosted
version: "1.21.1"
version: "1.21.4"
test_api:
dependency: transitive
description:
name: test_api
url: "https://pub.dartlang.org"
source: hosted
version: "0.4.9"
version: "0.4.12"
test_core:
dependency: transitive
description:
name: test_core
url: "https://pub.dartlang.org"
source: hosted
version: "0.4.13"
version: "0.4.16"
transparent_image:
dependency: "direct main"
description:
@ -1179,7 +1179,7 @@ packages:
name: url_launcher
url: "https://pub.dartlang.org"
source: hosted
version: "6.1.4"
version: "6.1.5"
url_launcher_android:
dependency: transitive
description:
@ -1242,7 +1242,7 @@ packages:
name: vm_service
url: "https://pub.dartlang.org"
source: hosted
version: "8.3.0"
version: "9.0.0"
watcher:
dependency: transitive
description:

1
shaders_3.1.0-9.0.pre.sksl.json
View file

File diff suppressed because one or more lines are too long

1
shaders_3.3.0-0.0.pre.sksl.json Normal file
View file

File diff suppressed because one or more lines are too long