fix: update base
This commit is contained in:
parent
636ec6ca0e
commit
39fa2543fe
6 changed files with 246 additions and 244 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -17,7 +17,7 @@
|
|||
|
||||
#Visual Studio Code related
|
||||
.vscode/launch.json
|
||||
.vscode/settings.json
|
||||
# .vscode/settings.json
|
||||
|
||||
# Flutter/Dart/Pub related
|
||||
**/doc/api/
|
||||
|
|
3
.vscode/settings.json
vendored
Normal file
3
.vscode/settings.json
vendored
Normal file
|
@ -0,0 +1,3 @@
|
|||
{
|
||||
"dart.flutterSdkPath": "thirdparty/flutter/bin",
|
||||
}
|
|
@ -388,7 +388,7 @@ SPEC CHECKSUMS:
|
|||
FirebaseInstallations: 033d199474164db20c8350736842a94fe717b960
|
||||
FirebaseMessaging: 6b7052cc3da7bc8e5f72bef871243e8f04a14eed
|
||||
fk_user_agent: 1f47ec39291e8372b1d692b50084b0d54103c545
|
||||
Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
|
||||
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
|
||||
flutter_email_sender: 02d7443217d8c41483223627972bfdc09f74276b
|
||||
flutter_image_compress: 5a5e9aee05b6553048b8df1c3bc456d0afaac433
|
||||
flutter_inappwebview: 3d32228f1304635e7c028b0d4252937730bbc6cf
|
||||
|
|
|
@ -108,8 +108,8 @@ Future<List<EnteFile>> convertIncomingSharedMediaToFile(
|
|||
) async {
|
||||
final List<EnteFile> localFiles = [];
|
||||
for (var media in sharedMedia) {
|
||||
if (!(media.type == SharedMediaType.IMAGE ||
|
||||
media.type == SharedMediaType.VIDEO)) {
|
||||
if (!(media.type == SharedMediaType.image ||
|
||||
media.type == SharedMediaType.video)) {
|
||||
_logger.warning(
|
||||
"ignore unsupported file type ${media.type.toString()} path: ${media.path}",
|
||||
);
|
||||
|
@ -149,7 +149,7 @@ Future<List<EnteFile>> convertIncomingSharedMediaToFile(
|
|||
enteFile.localID = sharedMediaIdentifier + enteFile.title!;
|
||||
enteFile.collectionID = collectionID;
|
||||
enteFile.fileType =
|
||||
media.type == SharedMediaType.IMAGE ? FileType.image : FileType.video;
|
||||
media.type == SharedMediaType.image ? FileType.image : FileType.video;
|
||||
if (enteFile.fileType == FileType.image) {
|
||||
final exifTime = await getCreationTimeFromEXIF(ioFile, null);
|
||||
if (exifTime != null) {
|
||||
|
|
450
pubspec.lock
450
pubspec.lock
File diff suppressed because it is too large
Load diff
27
pubspec.yaml
27
pubspec.yaml
|
@ -13,6 +13,7 @@ description: ente photos application
|
|||
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
|
||||
|
||||
version: 0.8.49+569
|
||||
publish_to: none
|
||||
|
||||
environment:
|
||||
sdk: ">=3.0.0 <4.0.0"
|
||||
|
@ -126,7 +127,7 @@ dependencies:
|
|||
path: #dart
|
||||
path_provider: ^2.1.1
|
||||
pedantic: ^1.9.2
|
||||
photo_manager: ^2.5.0
|
||||
photo_manager: ^2.8.1
|
||||
photo_view: ^0.14.0
|
||||
pinput: ^1.2.2
|
||||
pointycastle: ^3.7.3
|
||||
|
@ -171,7 +172,7 @@ 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
|
||||
ffi: ^2.0.0
|
||||
video_player:
|
||||
git:
|
||||
url: https://github.com/ente-io/packages.git
|
||||
|
@ -182,8 +183,6 @@ dependency_overrides:
|
|||
flutter_intl:
|
||||
enabled: true
|
||||
|
||||
|
||||
|
||||
dev_dependencies:
|
||||
build_runner: ^2.4.7
|
||||
flutter_driver:
|
||||
|
@ -234,16 +233,16 @@ flutter:
|
|||
- assets/models/scenes/
|
||||
- assets/models/clip/
|
||||
fonts:
|
||||
- family: Inter
|
||||
fonts:
|
||||
- asset: fonts/Inter-Regular.ttf
|
||||
- asset: fonts/Inter-Medium.ttf
|
||||
- asset: fonts/Inter-Light.ttf
|
||||
- asset: fonts/Inter-SemiBold.ttf
|
||||
- asset: fonts/Inter-Bold.ttf
|
||||
- family: Montserrat
|
||||
fonts:
|
||||
- asset: fonts/Montserrat-Bold.ttf
|
||||
- family: Inter
|
||||
fonts:
|
||||
- asset: fonts/Inter-Regular.ttf
|
||||
- asset: fonts/Inter-Medium.ttf
|
||||
- asset: fonts/Inter-Light.ttf
|
||||
- asset: fonts/Inter-SemiBold.ttf
|
||||
- asset: fonts/Inter-Bold.ttf
|
||||
- family: Montserrat
|
||||
fonts:
|
||||
- asset: fonts/Montserrat-Bold.ttf
|
||||
|
||||
# The following line ensures that the Material Icons font is
|
||||
# included with your application, so that you can use the icons in
|
||||
|
|
Loading…
Add table
Reference in a new issue