0ct0pu5/ente
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'upgrade_fixes_plus' into flutter_upgrade

Browse source
This commit is contained in:
Neeraj Gupta 2023-08-16 11:20:01 +05:30
commit 80205eed9b
6 changed files with 45 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ios/Podfile.lock
View file

@ -179,7 +179,7 @@ PODS:
- video_thumbnail (0.0.1):
- Flutter
- libwebp
- wakelock (0.0.1):
- wakelock_plus (0.0.1):
- Flutter
DEPENDENCIES:
@ -222,7 +222,7 @@ DEPENDENCIES:
- url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
- video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/ios`)
- video_thumbnail (from `.symlinks/plugins/video_thumbnail/ios`)
- wakelock (from `.symlinks/plugins/wakelock/ios`)
- wakelock_plus (from `.symlinks/plugins/wakelock_plus/ios`)
SPEC REPOS:
trunk:
@ -325,8 +325,8 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/video_player_avfoundation/ios"
video_thumbnail:
:path: ".symlinks/plugins/video_thumbnail/ios"
wakelock:
:path: ".symlinks/plugins/wakelock/ios"
wakelock_plus:
:path: ".symlinks/plugins/wakelock_plus/ios"
SPEC CHECKSUMS:
background_fetch: bc9b44b0bf8b434e282a2ac9be8662800a0296ed
@ -366,7 +366,7 @@ SPEC CHECKSUMS:
nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431
open_mail_app: 794172f6a22cd16319d3ddaf45e945b2f74952b0
OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c
package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e
package_info_plus: fd030dabf36271f146f1f3beacd48f564b0f17f7
path_provider_foundation: eaf5b3e458fc0e5fbb9940fb09980e853fe058b8
photo_manager: 4f6810b7dfc4feb03b461ac1a70dacf91fba7604
PromisesObjC: c50d2056b5253dadbd6c2bea79b0674bd5a52fa4
@ -387,7 +387,7 @@ SPEC CHECKSUMS:
url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4
video_player_avfoundation: 81e49bb3d9fb63dccf9fa0f6d877dc3ddbeac126
video_thumbnail: c4e2a3c539e247d4de13cd545344fd2d26ffafd1
wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f
wakelock_plus: 8b09852c8876491e4b6d179e17dfe2a0b5f60d47
PODFILE CHECKSUM: c1a8f198a245ed1f10e40b617efdb129b021b225

4
ios/Runner.xcodeproj/project.pbxproj
View file

@ -313,7 +313,7 @@
"${BUILT_PRODUCTS_DIR}/url_launcher_ios/url_launcher_ios.framework",
"${BUILT_PRODUCTS_DIR}/video_player_avfoundation/video_player_avfoundation.framework",
"${BUILT_PRODUCTS_DIR}/video_thumbnail/video_thumbnail.framework",
"${BUILT_PRODUCTS_DIR}/wakelock/wakelock.framework",
"${BUILT_PRODUCTS_DIR}/wakelock_plus/wakelock_plus.framework",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
@ -371,7 +371,7 @@
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/url_launcher_ios.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/video_player_avfoundation.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/video_thumbnail.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/wakelock.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/wakelock_plus.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;

4
lib/core/configuration.dart
View file

@ -33,7 +33,7 @@ import 'package:photos/utils/validator_util.dart';
import 'package:shared_preferences/shared_preferences.dart';
import "package:tuple/tuple.dart";
import 'package:uuid/uuid.dart';
import 'package:wakelock/wakelock.dart';
import 'package:wakelock_plus/wakelock_plus.dart';
class Configuration {
Configuration._privateConstructor();
@ -547,7 +547,7 @@ class Configuration {
Future<void> setShouldKeepDeviceAwake(bool value) async {
await _preferences.setBool(keyShouldKeepDeviceAwake, value);
await Wakelock.toggle(enable: value);
await WakelockPlus.toggle(enable: value);
}
Future<void> setShouldBackupVideos(bool value) async {

12
lib/ui/viewer/file/video_widget.dart
View file

@ -18,7 +18,7 @@ import 'package:photos/utils/file_util.dart';
import 'package:photos/utils/toast_util.dart';
import 'package:video_player/video_player.dart';
import 'package:visibility_detector/visibility_detector.dart';
import 'package:wakelock/wakelock.dart';
import 'package:wakelock_plus/wakelock_plus.dart';
class VideoWidget extends StatefulWidget {
final File file;
@ -115,8 +115,8 @@ class _VideoWidgetState extends State<VideoWidget> {
_chewieController?.dispose();
if (_wakeLockEnabledHere) {
unawaited(
Wakelock.enabled.then((isEnabled) {
isEnabled ? Wakelock.disable() : null;
WakelockPlus.enabled.then((isEnabled) {
isEnabled ? WakelockPlus.disable() : null;
}),
);
}
@ -233,9 +233,9 @@ class _VideoWidgetState extends State<VideoWidget> {
Future<void> _keepScreenAliveOnPlaying(bool isPlaying) async {
if (isPlaying) {
return Wakelock.enabled.then((value) {
return WakelockPlus.enabled.then((value) {
if (value == false) {
Wakelock.enable();
WakelockPlus.enable();
//wakeLockEnabledHere will not be set to true if wakeLock is already enabled from settings on iOS.
//We shouldn't disable when video is not playing if it was enabled manually by the user from ente settings by user.
_wakeLockEnabledHere = true;
@ -243,7 +243,7 @@ class _VideoWidgetState extends State<VideoWidget> {
});
}
if (_wakeLockEnabledHere && !isPlaying) {
return Wakelock.disable();
return WakelockPlus.disable();
}
}

66
pubspec.lock
View file

@ -253,11 +253,11 @@ packages:
dependency: "direct main"
description:
path: "."
ref: forked_video_player
resolved-ref: "548fa399c76adc3f1a1c0f9d42fcac954cf0345d"
ref: forked_video_player_plus
resolved-ref: "643b887f6f89aaae12646b0c79991f4f81faaa98"
url: "https://github.com/ente-io/chewie.git"
source: git
version: "1.5.0"
version: "1.7.0"
clock:
dependency: transitive
description:
@ -367,10 +367,10 @@ packages:
dependency: transitive
description:
name: dbus
sha256: "253bfaa3d340778d8bc755e89c3af38e85ef95e65fd5d5670aa3167f8d4f6577"
sha256: "6f07cba3f7b3448d42d015bfd3d53fe12e5b36da2423f23838efc1d5fb31a263"
url: "https://pub.dev"
source: hosted
version: "0.7.4"
version: "0.7.8"
defer_pointer:
dependency: "direct main"
description:
@ -511,10 +511,10 @@ packages:
dependency: "direct overridden"
description:
name: ffi
sha256: "13a6ccf6a459a125b3fcdb6ec73bd5ff90822e071207c663bfd1f70062d51d18"
sha256: "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878"
url: "https://pub.dev"
source: hosted
version: "1.2.1"
version: "2.1.0"
file:
dependency: transitive
description:
@ -1380,10 +1380,10 @@ packages:
dependency: "direct main"
description:
name: package_info_plus
sha256: cbff87676c352d97116af6dbea05aa28c4d65eb0f6d5677a520c11a69ca9a24d
sha256: "6ff267fcd9d48cb61c8df74a82680e8b82e940231bb5f68356672fde0397334a"
url: "https://pub.dev"
source: hosted
version: "3.1.0"
version: "4.1.0"
package_info_plus_platform_interface:
dependency: transitive
description:
@ -1476,10 +1476,10 @@ packages:
dependency: transitive
description:
name: path_provider_windows
sha256: a34ecd7fb548f8e57321fd8e50d865d266941b54e6c3b7758cf8f37c24116905
sha256: "1cb68ba4cd3a795033de62ba1b7b4564dace301f952de6bfb3cd91b202b6ee96"
url: "https://pub.dev"
source: hosted
version: "2.0.7"
version: "2.1.7"
pedantic:
dependency: "direct main"
description:
@ -2207,46 +2207,22 @@ packages:
url: "https://pub.dev"
source: hosted
version: "11.3.0"
wakelock:
wakelock_plus:
dependency: "direct main"
description:
name: wakelock
sha256: "769ecf42eb2d07128407b50cb93d7c10bd2ee48f0276ef0119db1d25cc2f87db"
name: wakelock_plus
sha256: aac3f3258f01781ec9212df94eecef1eb9ba9350e106728def405baa096ba413
url: "https://pub.dev"
source: hosted
version: "0.6.2"
wakelock_macos:
version: "1.1.1"
wakelock_plus_platform_interface:
dependency: transitive
description:
name: wakelock_macos
sha256: "047c6be2f88cb6b76d02553bca5a3a3b95323b15d30867eca53a19a0a319d4cd"
name: wakelock_plus_platform_interface
sha256: "40fabed5da06caff0796dc638e1f07ee395fb18801fbff3255a2372db2d80385"
url: "https://pub.dev"
source: hosted
version: "0.4.0"
wakelock_platform_interface:
dependency: transitive
description:
name: wakelock_platform_interface
sha256: "1f4aeb81fb592b863da83d2d0f7b8196067451e4df91046c26b54a403f9de621"
url: "https://pub.dev"
source: hosted
version: "0.3.0"
wakelock_web:
dependency: transitive
description:
name: wakelock_web
sha256: "1b256b811ee3f0834888efddfe03da8d18d0819317f20f6193e2922b41a501b5"
url: "https://pub.dev"
source: hosted
version: "0.4.0"
wakelock_windows:
dependency: transitive
description:
name: wakelock_windows
sha256: "108b1b73711f1664ee462e73af34a9286ff496e27d4d8371e2fb4da8fde4cdac"
url: "https://pub.dev"
source: hosted
version: "0.2.0"
version: "1.1.0"
wallpaper_manager_flutter:
dependency: "direct main"
description:
@ -2299,10 +2275,10 @@ packages:
dependency: transitive
description:
name: win32
sha256: "6b75ac2ddd42f5c226fdaf4498a2b04071c06f1f2b8f7ab1c3f77cc7f2285ff1"
sha256: "5a751eddf9db89b3e5f9d50c20ab8612296e4e8db69009788d6c8b060a84191c"
url: "https://pub.dev"
source: hosted
version: "2.7.0"
version: "4.1.4"
wkt_parser:
dependency: transitive
description:

15
pubspec.yaml
View file

@ -28,7 +28,7 @@ dependencies:
chewie:
git:
url: https://github.com/ente-io/chewie.git
ref: forked_video_player
ref: forked_video_player_plus
collection: # dart
computer:
git: "https://github.com/ente-io/computer.git"
@ -100,7 +100,7 @@ dependencies:
# open_file: ^3.2.1
open_mail_app: ^0.4.5
package_info_plus: 3.1.0
package_info_plus: ^4.1.0
page_transition: ^2.0.2
password_strength: ^0.2.0
path: #dart
@ -140,18 +140,19 @@ dependencies:
path: packages/video_player/video_player/
video_thumbnail: ^0.5.3
visibility_detector: ^0.3.3
wakelock: ^0.6.2
wakelock_plus: ^1.1.1
wallpaper_manager_flutter: ^0.0.2
widgets_to_image: ^0.0.2
dependency_overrides:
# current fork of tfite_flutter_helper depends on ffi: ^1.x.x
# but we need ffi: ^2.0.1 for newer packages. The original tfite_flutter_helper
#
ffi: ^2.0.1
flutter_intl:
enabled: true
dependency_overrides:
# package_info_plus depends on ffi ^2 but tflite_flutter_helper
# depends on ffi: ^1
ffi: ^1.0.0
dev_dependencies: