Merge branch 'flutter-3.7' into dev

This commit is contained in:
Ming Ming 2023-05-26 23:28:46 +08:00
commit 69041f19fd
29 changed files with 601 additions and 397 deletions

View file

@ -116,9 +116,10 @@ flutter {
}
dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.0"))
// fix crash on sdk33, need investigation
implementation "androidx.window:window:1.0.0"
implementation 'com.google.android.gms:play-services-maps:18.0.2'
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.8'
implementation 'com.google.android.gms:play-services-maps:18.1.0'
coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:2.0.3"
}

View file

@ -1,12 +1,12 @@
buildscript {
ext.kotlin_version = '1.6.21'
ext.kotlin_version = '1.8.20'
repositories {
google()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.2.2'
classpath 'com.android.tools.build:gradle:7.4.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}

View file

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip

View file

@ -24,7 +24,7 @@
"@settingsMenuLabel": {
"description": "Label of the settings entry in menu"
},
"selectionAppBarTitle": "{count, plural, =1{Vybrána {count}} =2{Vybrány 2} =3{Vybrány 3} =4{Vybrány 4} other{Vybráno {count}}}",
"selectionAppBarTitle": "{count, plural, =1{Vybrána {count}} few{Vybrány {count}} other{Vybráno {count}}}",
"@selectionAppBarTitle": {
"description": "Title of the contextual app bar that shows number of selected items",
"placeholders": {
@ -46,7 +46,7 @@
"@deleteSelectedSuccessNotification": {
"description": "Inform user that the selected items are deleted successfully"
},
"deleteSelectedFailureNotification": "{count, plural, =1{Nepodařilo se odstranit 1 položku} =2{Nepodařilo se odstranit 2 položky} =3{Nepodařilo se odstranit 3 položky} =4{Nepodařilo se odstranit 4 položky} other{Nepodařilo se odstranit {count} položek}}",
"deleteSelectedFailureNotification": "{count, plural, =1{Nepodařilo se odstranit 1 položku} few{Nepodařilo se odstranit {count} položky} other{Nepodařilo se odstranit {count} položek}}",
"@deleteSelectedFailureNotification": {
"description": "Inform user that some/all the selected items cannot be deleted",
"placeholders": {
@ -72,7 +72,7 @@
"@archiveSelectedSuccessNotification": {
"description": "Archived all selected items successfully"
},
"archiveSelectedFailureNotification": "{count, plural, =1{Nepodařilo se archivovat 1 položku} =2{Nepodařilo se archivovat 2 položky} =3{Nepodařilo se archivovat 3 položky} =4{Nepodařilo se archivovat 4 položky} other{Nepodařilo se archivovat {count} položek}}",
"archiveSelectedFailureNotification": "{count, plural, =1{Nepodařilo se archivovat 1 položku} few{Nepodařilo se archivovat {count} položky} other{Nepodařilo se archivovat {count} položek}}",
"@archiveSelectedFailureNotification": {
"description": "Cannot archive some of the selected items",
"placeholders": {
@ -144,7 +144,7 @@
"@createAlbumTooltip": {
"description": "Tooltip of the button that creates a new album"
},
"albumSize": "{count, plural, =0{Prázdné} =1{1 položka} =2{2 položky} =3{3 položky} =4{4 položky} other{{count} položek}}",
"albumSize": "{count, plural, =0{Prázdné} =1{1 položka} few{{count} položky} other{{count} položek}}",
"@albumSize": {
"description": "Number of items inside an album",
"placeholders": {
@ -328,7 +328,7 @@
"@settingsMemoriesRangeTitle": {
"description": "How many adjacent days to be inclded in memories for a particular year"
},
"settingsMemoriesRangeValueText": "{range, plural, =1{+-{range} den} =2{+-{range} dny} =3{+-{range} dny} =4{+-{range} dny} other{+-{range} dní}}",
"settingsMemoriesRangeValueText": "{range, plural, =1{+-{range} den} few{+-{range} dny} other{+-{range} dní}}",
"@settingsMemoriesRangeValueText": {
"description": "How many adjacent days to be inclded in memories for a particular year, could be 0",
"placeholders": {
@ -684,7 +684,7 @@
"@restoreSelectedSuccessNotification": {
"description": "Restored all selected items from trashbin successfully"
},
"restoreSelectedFailureNotification": "{count, plural, =1{Nepodařilo se obnovit 1 položku} =2{Nepodařilo se obnovit 2 položky} =3{Nepodařilo se obnovit 3 položky} =4{Nepodařilo se obnovit 4 položky} other{Nepodařilo se obnovit {count} položek}}",
"restoreSelectedFailureNotification": "{count, plural, =1{Nepodařilo se obnovit 1 položku} few{Nepodařilo se obnovit {count} položky} other{Nepodařilo se obnovit {count} položek}}",
"@restoreSelectedFailureNotification": {
"description": "Cannot restore some of the selected items from trashbin",
"placeholders": {
@ -933,7 +933,7 @@
"@createShareProgressText": {
"description": "Message shown when sharing files"
},
"copyItemsFailureNotification": "{count, plural, =1{Nepodařilo se zkopírovat 1 položku} =2{Nepodařilo se zkopírovat 2 položky} =3{Nepodařilo se zkopírovat 3 položky} =4{Nepodařilo se zkopírovat 4 položky} other{Failed copying {count} items}}",
"copyItemsFailureNotification": "{count, plural, =1{Nepodařilo se zkopírovat 1 položku} few{Nepodařilo se zkopírovat {count} položky} other{Failed copying {count} items}}",
"@copyItemsFailureNotification": {
"description": "Error message shown when some files cannot be copied",
"placeholders": {

View file

@ -651,7 +651,7 @@
"@whitelistCertDialogTitle": {
"description": "Title of the dialog to let user decide whether to whitelist an untrusted SSL certificate"
},
"whitelistCertDialogContent": "Vous pouvez ajouter le certificat à la liste blanche pour que l'application l'accepte. AVERTISSEMENT : Cela pose un grand risque pour la sécurité. Assurez-vous que le certificat est auto-signé par vous ou une partie de confiance\n\nHôte : {hôte}\nEmpreinte digitale : {fingerprint}",
"whitelistCertDialogContent": "Vous pouvez ajouter le certificat à la liste blanche pour que l'application l'accepte. AVERTISSEMENT : Cela pose un grand risque pour la sécurité. Assurez-vous que le certificat est auto-signé par vous ou une partie de confiance\n\nHôte : {host}\nEmpreinte digitale : {fingerprint}",
"@whitelistCertDialogContent": {
"description": "Let user decide whether to whitelist an untrusted SSL certificate",
"placeholders": {

View file

@ -915,7 +915,7 @@
"description": "Migrate database to work with the updated app"
},
"migrateDatabaseFailureNotification": "Migracja bazy danych zakończona niepowodzeniem",
"memoryAlbumName": "{count, plural, =1{W zeszłym roku} =2{2 lata temu} =3{3 lata temu} =4{4 lata temu} =22{22 lata temu} =23{23 lata temu} =24{24 lata temu} other{{count} lat temu}",
"memoryAlbumName": "{count, plural, =1{W zeszłym roku} few{{count} lata temu} other{{count} lat temu}}",
"@memoryAlbumName": {
"description": "Memory albums are generated by the app and include photos in the past years",
"placeholders": {

View file

@ -841,7 +841,7 @@
"@createShareProgressText": {
"description": "Message shown when sharing files"
},
"copyItemsFailureNotification": "{count, plural, =1{Не удалось скопировать 1 элемент} =2{Не удалось скопировать 2 элемента} =3{Не удалось скопировать 3 элемента} =4{Не удалось скопировать 4 элемента} =21{Не удалось скопировать 21 элемент} =22{Не удалось скопировать 22 элемента} =23{Не удалось скопировать 23 элемента} =24{Не удалось скопировать 24 элемента} =31{Не удалось скопировать 31 элемент} =32{Не удалось скопировать 32 элемента} =33{Не удалось скопировать 33 элемента} =34{Не удалось скопировать 34 элемента} =41{Не удалось скопировать 41 элемент} =42{Не удалось скопировать 42 элемента} =43{Не удалось скопировать 43 элемента} =44{Не удалось скопировать 44 элемента} =51{Не удалось скопировать 51 элемент} =52{Не удалось скопировать 52 элемента} =53{Не удалось скопировать 53 элемента} =54{Не удалось скопировать 54 элемента} =61{Не удалось скопировать 61 элемент} =62{Не удалось скопировать 62 элемента} =63{Не удалось скопировать 63 элемента} =64{Не удалось скопировать 64 элемента} =71{Не удалось скопировать 71 элемент} =72{Не удалось скопировать 72 элемента} =73{Не удалось скопировать 73 элемента} =74{Не удалось скопировать 74 элемента} =81{Не удалось скопировать 81 элемент} =82{Не удалось скопировать 82 элемента} =83{Не удалось скопировать 83 элемента} =84{Не удалось скопировать 84 элемента} =91{Не удалось скопировать 91 элемент} =92{Не удалось скопировать 92 элемента} =93{Не удалось скопировать 93 элемента} =94{Не удалось скопировать 94 элемента} other{Не удалось скопировать {count} элементов}}",
"copyItemsFailureNotification": "{count, plural, one{Не удалось скопировать {count} элемент} few{Не удалось скопировать {count} элемента} other{Не удалось скопировать {count} элементов}}",
"@copyItemsFailureNotification": {
"description": "Error message shown when some files cannot be copied",
"placeholders": {
@ -933,7 +933,7 @@
"description": "Migrate database to work with the updated app"
},
"migrateDatabaseFailureNotification": "Не удалось перенести базу данных",
"memoryAlbumName": "{count, plural, =1{1 год назад} =2{2 года назад} =3{3 года назад} =4{4 года назад} other{{count} лет назад}}",
"memoryAlbumName": "{count, plural, one{1 год назад} few{2 года назад} other{{count} лет назад}}",
"@memoryAlbumName": {
"description": "Memory albums are generated by the app and include photos in the past years",
"placeholders": {

View file

@ -95,8 +95,8 @@ class _ConnectState extends State<Connect> {
Text(
L10n.global().connectingToServer(widget.account.url),
textAlign: TextAlign.center,
style: Theme.of(context).textTheme.headline6,
)
style: Theme.of(context).textTheme.titleLarge,
),
],
),
),

View file

@ -79,7 +79,7 @@ class _SignInState extends State<SignIn> {
padding: const EdgeInsets.all(24),
child: Text(
L10n.global().signInHeaderText,
style: Theme.of(context).textTheme.headline5,
style: Theme.of(context).textTheme.headlineSmall,
textAlign: TextAlign.center,
),
),

View file

@ -98,6 +98,9 @@ ThemeData buildDarkModeSwitchTheme(BuildContext context) {
trackColor: MaterialStateProperty.all(theme.colorScheme.surfaceVariant),
thumbColor: MaterialStateProperty.all(Colors.black87),
),
colorScheme: theme.colorScheme.copyWith(
outline: Colors.transparent,
),
);
}

View file

@ -63,7 +63,7 @@ class _AlbumDirPickerState extends State<AlbumDirPicker> {
children: [
Text(
L10n.global().albumDirPickerHeaderText,
style: Theme.of(context).textTheme.headline5,
style: Theme.of(context).textTheme.headlineSmall,
textAlign: TextAlign.center,
),
const SizedBox(height: 8),

View file

@ -111,7 +111,7 @@ class _AlbumImporterState extends State<AlbumImporter> {
children: [
Text(
L10n.global().albumImporterHeaderText,
style: Theme.of(context).textTheme.headline5,
style: Theme.of(context).textTheme.headlineSmall,
textAlign: TextAlign.center,
),
const SizedBox(height: 8),

View file

@ -196,7 +196,7 @@ class _ProviderDescription extends StatelessWidget {
previous.formValue.provider != current.formValue.provider,
builder: (context, state) => Text(
state.formValue.provider.toDescription(context),
style: Theme.of(context).textTheme.bodyText2,
style: Theme.of(context).textTheme.bodyMedium,
),
);
}

View file

@ -271,7 +271,7 @@ class _ProviderDescription extends StatelessWidget {
previous.formValue.provider != current.formValue.provider,
builder: (context, state) => Text(
state.formValue.provider.toDescription(context),
style: Theme.of(context).textTheme.bodyText2,
style: Theme.of(context).textTheme.bodyMedium,
),
);
}

View file

@ -32,7 +32,7 @@ class _PhotoDateTimeEditDialogState extends State<PhotoDateTimeEditDialog> {
children: [
Text(
L10n.global().dateSubtitle,
style: Theme.of(context).textTheme.subtitle2,
style: Theme.of(context).textTheme.titleSmall,
),
Row(
children: [
@ -104,7 +104,7 @@ class _PhotoDateTimeEditDialogState extends State<PhotoDateTimeEditDialog> {
const SizedBox(height: 16),
Text(
L10n.global().timeSubtitle,
style: Theme.of(context).textTheme.subtitle2,
style: Theme.of(context).textTheme.titleSmall,
),
Row(
children: [

View file

@ -93,7 +93,7 @@ class _RootPickerState extends State<RootPicker> {
children: [
Text(
L10n.global().rootPickerHeaderText,
style: Theme.of(context).textTheme.headline5,
style: Theme.of(context).textTheme.headlineSmall,
textAlign: TextAlign.center,
),
const SizedBox(height: 8),

View file

@ -157,11 +157,13 @@ class _ExifState extends State<_Exif> {
const SizedBox(height: 16),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 16),
child: Text(L10n.global().setupSettingsModifyLaterHint,
style: Theme.of(context)
.textTheme
.bodyText2!
.copyWith(fontStyle: FontStyle.italic)),
child: Text(
L10n.global().setupSettingsModifyLaterHint,
style: Theme.of(context)
.textTheme
.bodyMedium
?.copyWith(fontStyle: FontStyle.italic),
),
),
const SizedBox(height: 8),
],

View file

@ -67,7 +67,7 @@ class _ShareFolderPickerState extends State<ShareFolderPicker> {
children: [
Text(
L10n.global().settingsShareFolderDialogTitle,
style: Theme.of(context).textTheme.headline5,
style: Theme.of(context).textTheme.headlineSmall,
textAlign: TextAlign.center,
),
const SizedBox(height: 8),

View file

@ -74,7 +74,7 @@ class _SlideshowDialogState extends State<SlideshowDialog> {
children: [
Text(
L10n.global().slideshowSetupDialogDurationTitle,
style: Theme.of(context).textTheme.subtitle2,
style: Theme.of(context).textTheme.titleSmall,
),
Row(
children: [

View file

@ -91,7 +91,7 @@ class _SplashState extends State<Splash> {
Text(
L10n.global().appTitle,
textAlign: TextAlign.center,
style: Theme.of(context).textTheme.headline4,
style: Theme.of(context).textTheme.headlineMedium,
),
],
),

File diff suppressed because it is too large Load diff

View file

@ -33,20 +33,20 @@ dependencies:
url: https://gitlab.com/nc-photos/plus_plugins
ref: android_intent_plus-v3.1.1-nc-photos-1
path: packages/android_intent_plus
battery_plus: ^3.0.6
battery_plus: ^4.0.1
bloc_concurrency: ^0.2.2
cached_network_image: ^3.2.3
circular_reveal_animation: ^2.0.1
clock: ^1.1.1
collection: ^1.15.0
connectivity_plus: ^2.0.2
connectivity_plus: ^3.0.6
copy_with:
git:
url: https://gitlab.com/nkming2/dart-copy-with
path: copy_with
ref: copy_with-1.3.0
devicelocale: ^0.6.0
device_info_plus: ^8.2.2
device_info_plus: ^9.0.1
draggable_scrollbar:
git:
url: https://gitlab.com/nc-photos/flutter-draggable-scrollbar
@ -129,6 +129,12 @@ dependency_overrides:
url: https://gitlab.com/nc-photos/flutter-plugins
ref: video_player-v2.4.5-nc-photos-1
path: packages/video_player/video_player_android
# https://github.com/creativecreatorormaybenot/wakelock/pull/203
wakelock_windows:
git:
url: https://github.com/timsneath/wakelock
ref: 2a9bca63a540771f241d688562351482b2cf234c
path: wakelock_windows
dev_dependencies:
test: any
@ -139,9 +145,9 @@ dev_dependencies:
url: https://gitlab.com/nkming2/dart-copy-with
path: copy_with_build
ref: copy_with_build-1.6.0
dart_code_metrics: 4.19.1
dart_code_metrics: any
drift_dev: ^1.7.0
flutter_lints: ^2.0.1
flutter_lints: any
flutter_test:
sdk: flutter
# integration_test:

View file

@ -7,4 +7,4 @@ environment:
sdk: '>=2.17.0 <3.0.0'
dev_dependencies:
lints: ^2.0.0
lints: any

View file

@ -16,8 +16,8 @@ dependencies:
dev_dependencies:
build_test: ^2.1.5
lints: ^2.0.0
test: ^1.16.0
lints: any
test: any
code_gen_tester:
git:
url: https://github.com/rrousselGit/functional_widget

View file

@ -13,7 +13,7 @@ dependencies:
flutter:
sdk: flutter
http: ^0.13.5
logging: ^1.1.1
logging: any
np_codegen:
path: ../codegen
np_common:
@ -27,7 +27,7 @@ dependencies:
dev_dependencies:
build_runner: ^2.2.1
flutter_lints: ^2.0.0
flutter_lints: any
np_codegen_build:
path: ../codegen_build
test: any

View file

@ -11,10 +11,10 @@ environment:
dependencies:
flutter:
sdk: flutter
logging: ^1.1.1
logging: any
dev_dependencies:
flutter_lints: ^2.0.0
flutter_lints: any
test: any
# For information on the generic Dart part of this file, see the

View file

@ -2,14 +2,14 @@ group 'com.nkming.nc_photos.plugin'
version '1.0-SNAPSHOT'
buildscript {
ext.kotlin_version = '1.6.21'
ext.kotlin_version = '1.8.20'
repositories {
google()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.0.4'
classpath 'com.android.tools.build:gradle:7.4.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
@ -62,9 +62,9 @@ android {
}
dependencies {
coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:1.1.8"
implementation "androidx.annotation:annotation:1.4.0"
implementation "androidx.core:core-ktx:1.8.0"
implementation "androidx.exifinterface:exifinterface:1.3.3"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:2.0.3"
implementation "androidx.annotation:annotation:1.6.0"
implementation "androidx.core:core-ktx:1.10.1"
implementation "androidx.exifinterface:exifinterface:1.3.6"
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
}

View file

@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip

View file

@ -10,11 +10,10 @@ environment:
dependencies:
flutter:
sdk: flutter
logging: ^1.1.1
logging: any
dev_dependencies:
flutter_lints: ^1.0.0
flutter_lints: any
# For information on the generic Dart part of this file, see the
# following page: https://dart.dev/tools/pub/pubspec