mirror of
https://gitlab.com/nkming2/nc-photos.git
synced 2025-01-22 16:56:19 +01:00
Merge branch 'flutter-3.22'
This commit is contained in:
commit
2938cc9343
34 changed files with 105 additions and 79 deletions
|
@ -15,7 +15,7 @@ class Exif with EquatableMixin {
|
|||
|
||||
@override
|
||||
// ignore: hash_and_equals
|
||||
bool operator ==(Object? other) => equals(other, isDeep: true);
|
||||
bool operator ==(Object other) => equals(other, isDeep: true);
|
||||
|
||||
/// Compare two Exif objects
|
||||
///
|
||||
|
|
|
@ -97,7 +97,7 @@ class Metadata with EquatableMixin {
|
|||
|
||||
@override
|
||||
// ignore: hash_and_equals
|
||||
bool operator ==(Object? other) => equals(other, isDeep: true);
|
||||
bool operator ==(Object other) => equals(other, isDeep: true);
|
||||
|
||||
bool equals(Object? other, {bool isDeep = false}) {
|
||||
if (other is Metadata) {
|
||||
|
@ -326,7 +326,7 @@ class File with EquatableMixin implements FileDescriptor {
|
|||
|
||||
@override
|
||||
// ignore: hash_and_equals
|
||||
bool operator ==(Object? other) => equals(other, isDeep: true);
|
||||
bool operator ==(Object other) => equals(other, isDeep: true);
|
||||
|
||||
bool equals(Object? other, {bool isDeep = false}) {
|
||||
if (other is File) {
|
||||
|
|
|
@ -11,7 +11,7 @@ class SizeInt {
|
|||
SizeInt.square(int dimension) : this(dimension, dimension);
|
||||
|
||||
@override
|
||||
bool operator ==(Object? other) {
|
||||
bool operator ==(Object other) {
|
||||
return other is SizeInt && width == other.width && height == other.height;
|
||||
}
|
||||
|
||||
|
|
|
@ -77,7 +77,7 @@ class _VisibleItem implements Comparable<_VisibleItem> {
|
|||
const _VisibleItem(this.index, this.item);
|
||||
|
||||
@override
|
||||
bool operator ==(Object? other) =>
|
||||
bool operator ==(Object other) =>
|
||||
other is _VisibleItem && index == other.index;
|
||||
|
||||
@override
|
||||
|
|
|
@ -80,9 +80,10 @@ class Draggable<T extends Object> extends StatelessWidget {
|
|||
return buildIndicator(AlignmentDirectional.centerStart,
|
||||
candidateItems.isNotEmpty);
|
||||
},
|
||||
onAccept: (item) {
|
||||
_log.fine("[build] Dropping $item before $data");
|
||||
onDropBefore!(item);
|
||||
onAcceptWithDetails: (details) {
|
||||
_log.fine(
|
||||
"[build] Dropping ${details.data} before $data");
|
||||
onDropBefore!(details.data);
|
||||
},
|
||||
),
|
||||
),
|
||||
|
@ -93,9 +94,10 @@ class Draggable<T extends Object> extends StatelessWidget {
|
|||
return buildIndicator(AlignmentDirectional.centerEnd,
|
||||
candidateItems.isNotEmpty);
|
||||
},
|
||||
onAccept: (item) {
|
||||
_log.fine("[build] Dropping $item after $data");
|
||||
onDropAfter!(item);
|
||||
onAcceptWithDetails: (details) {
|
||||
_log.fine(
|
||||
"[build] Dropping ${details.data} after $data");
|
||||
onDropAfter!(details.data);
|
||||
},
|
||||
),
|
||||
),
|
||||
|
|
|
@ -142,7 +142,7 @@ class _VisibleDate implements Comparable<_VisibleDate> {
|
|||
const _VisibleDate(this.id, this.date);
|
||||
|
||||
@override
|
||||
bool operator ==(Object? other) => other is _VisibleDate && id == other.id;
|
||||
bool operator ==(Object other) => other is _VisibleDate && id == other.id;
|
||||
|
||||
@override
|
||||
int compareTo(_VisibleDate other) => id.compareTo(other.id);
|
||||
|
|
|
@ -280,10 +280,10 @@ packages:
|
|||
dependency: transitive
|
||||
description:
|
||||
name: coverage
|
||||
sha256: "2fb815080e44a09b85e0f2ca8a820b15053982b2e714b59267719e8a9ff17097"
|
||||
sha256: c1fb2dce3c0085f39dc72668e85f8e0210ec7de05345821ff58530567df345a5
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.6.3"
|
||||
version: "1.9.2"
|
||||
cronet_http:
|
||||
dependency: transitive
|
||||
description:
|
||||
|
@ -809,10 +809,10 @@ packages:
|
|||
dependency: "direct main"
|
||||
description:
|
||||
name: intl
|
||||
sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
|
||||
sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.18.1"
|
||||
version: "0.19.0"
|
||||
io:
|
||||
dependency: transitive
|
||||
description:
|
||||
|
@ -878,6 +878,30 @@ packages:
|
|||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.9.1"
|
||||
leak_tracker:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: leak_tracker
|
||||
sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "10.0.4"
|
||||
leak_tracker_flutter_testing:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: leak_tracker_flutter_testing
|
||||
sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "3.0.3"
|
||||
leak_tracker_testing:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: leak_tracker_testing
|
||||
sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "3.0.1"
|
||||
lints:
|
||||
dependency: transitive
|
||||
description:
|
||||
|
@ -954,18 +978,18 @@ packages:
|
|||
dependency: transitive
|
||||
description:
|
||||
name: matcher
|
||||
sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
|
||||
sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.12.16"
|
||||
version: "0.12.16+1"
|
||||
material_color_utilities:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: material_color_utilities
|
||||
sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
|
||||
sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.5.0"
|
||||
version: "0.8.0"
|
||||
memory_info:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
|
@ -986,10 +1010,10 @@ packages:
|
|||
dependency: transitive
|
||||
description:
|
||||
name: meta
|
||||
sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
|
||||
sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.10.0"
|
||||
version: "1.12.0"
|
||||
mgrs_dart:
|
||||
dependency: transitive
|
||||
description:
|
||||
|
@ -1280,10 +1304,10 @@ packages:
|
|||
dependency: "direct main"
|
||||
description:
|
||||
name: path
|
||||
sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
|
||||
sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.8.3"
|
||||
version: "1.9.0"
|
||||
path_provider:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
|
@ -1709,26 +1733,26 @@ packages:
|
|||
dependency: "direct dev"
|
||||
description:
|
||||
name: test
|
||||
sha256: a1f7595805820fcc05e5c52e3a231aedd0b72972cb333e8c738a8b1239448b6f
|
||||
sha256: "7ee446762c2c50b3bd4ea96fe13ffac69919352bd3b4b17bac3f3465edc58073"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.24.9"
|
||||
version: "1.25.2"
|
||||
test_api:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: test_api
|
||||
sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
|
||||
sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.6.1"
|
||||
version: "0.7.0"
|
||||
test_core:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: test_core
|
||||
sha256: a757b14fc47507060a162cc2530d9a4a2f92f5100a952c7443b5cad5ef5b106a
|
||||
sha256: "2bc4b4ecddd75309300d8096f781c0e3280ca1ef85beda558d33fcbedc2eead4"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.5.9"
|
||||
version: "0.6.0"
|
||||
timing:
|
||||
dependency: transitive
|
||||
description:
|
||||
|
@ -1914,10 +1938,10 @@ packages:
|
|||
dependency: transitive
|
||||
description:
|
||||
name: vm_service
|
||||
sha256: e7fb6c2282f7631712b69c19d1bff82f3767eea33a2321c14fa59ad67ea391c7
|
||||
sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "9.4.0"
|
||||
version: "14.2.1"
|
||||
wakelock_plus:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
|
@ -2023,5 +2047,5 @@ packages:
|
|||
source: hosted
|
||||
version: "3.1.2"
|
||||
sdks:
|
||||
dart: ">=3.2.3 <4.0.0"
|
||||
flutter: ">=3.16.6"
|
||||
dart: ">=3.4.0 <4.0.0"
|
||||
flutter: ">=3.22.0"
|
||||
|
|
|
@ -18,8 +18,8 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
|
|||
version: 1.68.0+6800
|
||||
|
||||
environment:
|
||||
sdk: ">=3.2.0 <4.0.0"
|
||||
flutter: ">=3.16.0"
|
||||
sdk: ">=3.4.0 <4.0.0"
|
||||
flutter: ">=3.22.0"
|
||||
|
||||
dependencies:
|
||||
flutter:
|
||||
|
@ -82,7 +82,7 @@ dependencies:
|
|||
url: https://gitlab.com/nc-photos/dart_image_size_getter
|
||||
ref: 1.0.0-nc-photos-2
|
||||
path: library
|
||||
intl: 0.18.1
|
||||
intl: 0.19.0
|
||||
kiwi: ^4.1.0
|
||||
local_auth: ^2.2.0
|
||||
logging: ^1.2.0
|
||||
|
|
|
@ -4,7 +4,7 @@ version: 1.0.0
|
|||
# homepage: https://www.example.com
|
||||
|
||||
environment:
|
||||
sdk: ">=3.2.0 <4.0.0"
|
||||
sdk: ">=3.4.0 <4.0.0"
|
||||
|
||||
dev_dependencies:
|
||||
np_lints:
|
||||
|
|
|
@ -5,7 +5,7 @@ version: 1.0.0
|
|||
publish_to: none
|
||||
|
||||
environment:
|
||||
sdk: ">=3.2.0 <4.0.0"
|
||||
sdk: ">=3.4.0 <4.0.0"
|
||||
|
||||
dependencies:
|
||||
analyzer: ^6.2.0
|
||||
|
|
|
@ -5,8 +5,8 @@ homepage:
|
|||
publish_to: none
|
||||
|
||||
environment:
|
||||
sdk: ">=3.2.0 <4.0.0"
|
||||
flutter: ">=3.16.0"
|
||||
sdk: ">=3.4.0 <4.0.0"
|
||||
flutter: ">=3.22.0"
|
||||
|
||||
dependencies:
|
||||
equatable: ^2.0.5
|
||||
|
|
|
@ -5,8 +5,8 @@ homepage:
|
|||
publish_to: none
|
||||
|
||||
environment:
|
||||
sdk: ">=3.2.0 <4.0.0"
|
||||
flutter: ">=3.16.0"
|
||||
sdk: ">=3.4.0 <4.0.0"
|
||||
flutter: ">=3.22.0"
|
||||
|
||||
dependencies:
|
||||
flutter:
|
||||
|
|
|
@ -5,7 +5,7 @@ version: 1.0.0
|
|||
publish_to: none
|
||||
|
||||
environment:
|
||||
sdk: ">=3.2.0 <4.0.0"
|
||||
sdk: ">=3.4.0 <4.0.0"
|
||||
|
||||
dependencies:
|
||||
collection: ^1.18.0
|
||||
|
|
|
@ -5,7 +5,7 @@ homepage:
|
|||
publish_to: none
|
||||
|
||||
environment:
|
||||
sdk: ">=3.2.0 <4.0.0"
|
||||
sdk: ">=3.4.0 <4.0.0"
|
||||
|
||||
dependencies:
|
||||
to_string:
|
||||
|
|
|
@ -5,7 +5,7 @@ version: 1.0.0
|
|||
publish_to: none
|
||||
|
||||
environment:
|
||||
sdk: ">=3.2.0 <4.0.0"
|
||||
sdk: ">=3.4.0 <4.0.0"
|
||||
|
||||
dependencies:
|
||||
clock: ^1.1.1
|
||||
|
|
|
@ -5,8 +5,8 @@ version: 1.0.0
|
|||
publish_to: 'none'
|
||||
|
||||
environment:
|
||||
sdk: ">=3.2.0 <4.0.0"
|
||||
flutter: ">=3.16.0"
|
||||
sdk: ">=3.4.0 <4.0.0"
|
||||
flutter: ">=3.22.0"
|
||||
|
||||
dependencies:
|
||||
copy_with:
|
||||
|
|
|
@ -5,8 +5,8 @@ version: 1.0.0
|
|||
publish_to: 'none'
|
||||
|
||||
environment:
|
||||
sdk: ">=3.2.0 <4.0.0"
|
||||
flutter: ">=3.16.0"
|
||||
sdk: ">=3.4.0 <4.0.0"
|
||||
flutter: ">=3.22.0"
|
||||
|
||||
dependencies:
|
||||
clock: ^1.1.1
|
||||
|
|
|
@ -5,8 +5,8 @@ homepage:
|
|||
publish_to: none
|
||||
|
||||
environment:
|
||||
sdk: ">=3.2.0 <4.0.0"
|
||||
flutter: ">=3.16.0"
|
||||
sdk: ">=3.4.0 <4.0.0"
|
||||
flutter: ">=3.22.0"
|
||||
|
||||
dependencies:
|
||||
flutter:
|
||||
|
|
|
@ -5,8 +5,8 @@ homepage:
|
|||
publish_to: none
|
||||
|
||||
environment:
|
||||
sdk: ">=3.2.0 <4.0.0"
|
||||
flutter: ">=3.16.0"
|
||||
sdk: ">=3.4.0 <4.0.0"
|
||||
flutter: ">=3.22.0"
|
||||
|
||||
dependencies:
|
||||
flutter:
|
||||
|
|
|
@ -5,7 +5,7 @@ version: 1.0.0
|
|||
publish_to: none
|
||||
|
||||
environment:
|
||||
sdk: ">=3.2.0 <4.0.0"
|
||||
sdk: ">=3.4.0 <4.0.0"
|
||||
|
||||
dependencies:
|
||||
cronet_http: ^1.2.0
|
||||
|
|
|
@ -4,7 +4,7 @@ version: 1.0.0
|
|||
publish_to: none
|
||||
|
||||
environment:
|
||||
sdk: ">=3.2.0 <4.0.0"
|
||||
sdk: ">=3.4.0 <4.0.0"
|
||||
|
||||
dependencies:
|
||||
flutter_lints: ^4.0.0
|
||||
|
|
|
@ -4,7 +4,7 @@ version: 1.0.0
|
|||
publish_to: none
|
||||
|
||||
environment:
|
||||
sdk: ">=3.2.0 <4.0.0"
|
||||
sdk: ">=3.4.0 <4.0.0"
|
||||
|
||||
dependencies:
|
||||
logging: ^1.2.0
|
||||
|
|
|
@ -5,7 +5,7 @@ version: 1.0.0
|
|||
publish_to: none
|
||||
|
||||
environment:
|
||||
sdk: ">=3.2.0 <4.0.0"
|
||||
sdk: ">=3.4.0 <4.0.0"
|
||||
|
||||
dev_dependencies:
|
||||
np_lints:
|
||||
|
|
|
@ -5,8 +5,8 @@ homepage:
|
|||
publish_to: none
|
||||
|
||||
environment:
|
||||
sdk: ">=3.2.0 <4.0.0"
|
||||
flutter: ">=3.16.0"
|
||||
sdk: ">=3.4.0 <4.0.0"
|
||||
flutter: ">=3.22.0"
|
||||
|
||||
dependencies:
|
||||
flutter:
|
||||
|
|
|
@ -5,8 +5,8 @@ homepage:
|
|||
publish_to: none
|
||||
|
||||
environment:
|
||||
sdk: ">=3.2.0 <4.0.0"
|
||||
flutter: ">=3.16.0"
|
||||
sdk: ">=3.4.0 <4.0.0"
|
||||
flutter: ">=3.22.0"
|
||||
|
||||
dependencies:
|
||||
flutter:
|
||||
|
|
|
@ -5,8 +5,8 @@ homepage:
|
|||
publish_to: none
|
||||
|
||||
environment:
|
||||
sdk: ">=3.2.0 <4.0.0"
|
||||
flutter: ">=3.16.0"
|
||||
sdk: ">=3.4.0 <4.0.0"
|
||||
flutter: ">=3.22.0"
|
||||
|
||||
dependencies:
|
||||
flutter:
|
||||
|
|
|
@ -5,8 +5,8 @@ homepage:
|
|||
publish_to: none
|
||||
|
||||
environment:
|
||||
sdk: ">=3.2.0 <4.0.0"
|
||||
flutter: ">=3.16.0"
|
||||
sdk: ">=3.4.0 <4.0.0"
|
||||
flutter: ">=3.22.0"
|
||||
|
||||
dependencies:
|
||||
flutter:
|
||||
|
|
|
@ -5,8 +5,8 @@ homepage:
|
|||
publish_to: none
|
||||
|
||||
environment:
|
||||
sdk: ">=3.2.0 <4.0.0"
|
||||
flutter: ">=3.16.0"
|
||||
sdk: ">=3.4.0 <4.0.0"
|
||||
flutter: ">=3.22.0"
|
||||
|
||||
dependencies:
|
||||
flutter:
|
||||
|
|
|
@ -5,8 +5,8 @@ homepage:
|
|||
publish_to: none
|
||||
|
||||
environment:
|
||||
sdk: ">=3.2.0 <4.0.0"
|
||||
flutter: ">=3.16.0"
|
||||
sdk: ">=3.4.0 <4.0.0"
|
||||
flutter: ">=3.22.0"
|
||||
|
||||
dependencies:
|
||||
flutter:
|
||||
|
|
|
@ -5,8 +5,8 @@ homepage:
|
|||
publish_to: none
|
||||
|
||||
environment:
|
||||
sdk: ">=3.2.0 <4.0.0"
|
||||
flutter: ">=3.16.0"
|
||||
sdk: ">=3.4.0 <4.0.0"
|
||||
flutter: ">=3.22.0"
|
||||
|
||||
dependencies:
|
||||
flutter:
|
||||
|
|
|
@ -5,7 +5,7 @@ version: 1.0.0
|
|||
publish_to: none
|
||||
|
||||
environment:
|
||||
sdk: ">=3.2.0 <4.0.0"
|
||||
sdk: ">=3.4.0 <4.0.0"
|
||||
|
||||
dev_dependencies:
|
||||
np_lints:
|
||||
|
|
|
@ -4,8 +4,8 @@ version: 0.0.1
|
|||
publish_to: none
|
||||
|
||||
environment:
|
||||
sdk: ">=3.2.0 <4.0.0"
|
||||
flutter: ">=3.16.0"
|
||||
sdk: ">=3.4.0 <4.0.0"
|
||||
flutter: ">=3.22.0"
|
||||
|
||||
dependencies:
|
||||
flutter:
|
||||
|
|
|
@ -5,8 +5,8 @@ homepage:
|
|||
publish_to: none
|
||||
|
||||
environment:
|
||||
sdk: ">=3.2.0 <4.0.0"
|
||||
flutter: ">=3.16.0"
|
||||
sdk: ">=3.4.0 <4.0.0"
|
||||
flutter: ">=3.22.0"
|
||||
|
||||
dependencies:
|
||||
flutter:
|
||||
|
|
|
@ -4,8 +4,8 @@ version: 0.0.1
|
|||
homepage:
|
||||
|
||||
environment:
|
||||
sdk: ">=3.2.0 <4.0.0"
|
||||
flutter: ">=3.16.0"
|
||||
sdk: ">=3.4.0 <4.0.0"
|
||||
flutter: ">=3.22.0"
|
||||
|
||||
dependencies:
|
||||
flutter:
|
||||
|
|
Loading…
Reference in a new issue