From 40f7613480d33223348db5994bba0dbb0aa8256e Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Fri, 17 Jun 2022 13:24:56 -0700 Subject: [PATCH] translate lux material stuff; upgrade to fixed local notification package; upgrade provide, scrollable_position --- lib/l10n/custom_material_delegate.dart | 116 +++++++++--------- linux/flutter/generated_plugins.cmake | 8 ++ macos/Flutter/GeneratedPluginRegistrant.swift | 4 + pubspec.lock | 24 ++-- pubspec.yaml | 14 +-- windows/flutter/generated_plugins.cmake | 8 ++ 6 files changed, 93 insertions(+), 81 deletions(-) diff --git a/lib/l10n/custom_material_delegate.dart b/lib/l10n/custom_material_delegate.dart index e0cb4fe9..cd91a907 100644 --- a/lib/l10n/custom_material_delegate.dart +++ b/lib/l10n/custom_material_delegate.dart @@ -315,178 +315,178 @@ class MaterialLocalizationLu extends MaterialLocalizations { // ***** NEW ***** @override - String get keyboardKeyAlt => 'Datum'; + String get keyboardKeyAlt => 'Alt'; @override - String get keyboardKeyAltGraph => 'Datum'; + String get keyboardKeyAltGraph => 'AltGr'; @override - String get keyboardKeyBackspace => 'Datum'; + String get keyboardKeyBackspace => 'Backspace'; @override - String get keyboardKeyCapsLock => 'Datum'; + String get keyboardKeyCapsLock => 'Caps Lock'; @override - String get keyboardKeyChannelDown => 'Datum'; + String get keyboardKeyChannelDown => 'Kanal Erof'; @override - String get keyboardKeyChannelUp => 'Datum'; + String get keyboardKeyChannelUp => 'Kanal Up'; @override - String get keyboardKeyControl => 'Datum'; + String get keyboardKeyControl => 'Ctrl'; @override - String get keyboardKeyDelete => 'Datum'; + String get keyboardKeyDelete => 'Del'; @override - String get keyboardKeyEisu => 'Datum'; + String get keyboardKeyEisu => 'Eisū'; @override - String get keyboardKeyEject => 'Datum'; + String get keyboardKeyEject => 'Eject'; @override - String get keyboardKeyEnd => 'Datum'; + String get keyboardKeyEnd => 'End'; @override - String get keyboardKeyEscape => 'Datum'; + String get keyboardKeyEscape => 'Esc'; @override - String get keyboardKeyFn => 'Datum'; + String get keyboardKeyFn => 'Fn'; @override - String get keyboardKeyHangulMode => 'Datum'; + String get keyboardKeyHangulMode => 'Hangul Mode'; @override - String get keyboardKeyHanjaMode => 'Datum'; + String get keyboardKeyHanjaMode => 'Hanja Mode'; @override - String get keyboardKeyHankaku => 'Datum'; + String get keyboardKeyHankaku => 'Hankaku'; @override - String get keyboardKeyHiragana => 'Datum'; + String get keyboardKeyHiragana => 'Hiragana'; @override - String get keyboardKeyHiraganaKatakana => 'Datum'; + String get keyboardKeyHiraganaKatakana => 'Hiragana Katakana'; @override - String get keyboardKeyHome => 'Datum'; + String get keyboardKeyHome => 'Home'; @override - String get keyboardKeyInsert => 'Datum'; + String get keyboardKeyInsert => 'Insert'; @override - String get keyboardKeyKanaMode => 'Datum'; + String get keyboardKeyKanaMode => 'Kana Mode'; @override - String get keyboardKeyKanjiMode => 'Datum'; + String get keyboardKeyKanjiMode => 'Kanji Mode'; @override - String get keyboardKeyKatakana => 'Datum'; + String get keyboardKeyKatakana => 'Katakana'; @override - String get keyboardKeyMeta => 'Datum'; + String get keyboardKeyMeta => 'Meta'; @override - String get keyboardKeyMetaMacOs => 'Datum'; + String get keyboardKeyMetaMacOs => 'Command'; @override - String get keyboardKeyMetaWindows => 'Datum'; + String get keyboardKeyMetaWindows => 'Win'; @override - String get keyboardKeyNumLock => 'Datum'; + String get keyboardKeyNumLock => 'Num Lock'; @override - String get keyboardKeyNumpad1 => 'Datum'; + String get keyboardKeyNumpad0 => 'Num 0'; @override - String get keyboardKeyNumpad2 => 'Datum'; + String get keyboardKeyNumpad1 => 'Num 1'; @override - String get keyboardKeyNumpad3 => 'Datum'; + String get keyboardKeyNumpad2 => 'Num 2'; @override - String get keyboardKeyNumpad4 => 'Datum'; + String get keyboardKeyNumpad3 => 'Num 3'; @override - String get keyboardKeyNumpad5 => 'Datum'; + String get keyboardKeyNumpad4 => 'Num 4'; @override - String get keyboardKeyNumpad6 => 'Datum'; + String get keyboardKeyNumpad5 => 'Num 5'; @override - String get keyboardKeyNumpad7 => 'Datum'; + String get keyboardKeyNumpad6 => 'Num 6'; @override - String get keyboardKeyNumpad8 => 'Datum'; + String get keyboardKeyNumpad7 => 'Num 7'; @override - String get keyboardKeyNumpad9 => 'Datum'; + String get keyboardKeyNumpad8 => 'Num 8'; @override - String get keyboardKeyNumpad0 => 'Datum'; + String get keyboardKeyNumpad9 => 'Num 9'; @override - String get keyboardKeyNumpadAdd => 'Datum'; + String get keyboardKeyNumpadAdd => 'Num +'; @override - String get keyboardKeyNumpadComma => 'Datum'; + String get keyboardKeyNumpadComma => 'Num ,'; @override - String get keyboardKeyNumpadDecimal => 'Datum'; + String get keyboardKeyNumpadDecimal => 'Num .'; @override - String get keyboardKeyNumpadDivide => 'Datum'; + String get keyboardKeyNumpadDivide => 'Num /'; @override - String get keyboardKeyNumpadEnter => 'Datum'; + String get keyboardKeyNumpadEnter => 'Num Enter'; @override - String get keyboardKeyNumpadEqual => 'Datum'; + String get keyboardKeyNumpadEqual => 'Num ='; @override - String get keyboardKeyNumpadMultiply => 'Datum'; + String get keyboardKeyNumpadMultiply => 'Num *'; @override - String get keyboardKeyNumpadParenLeft => 'Datum'; + String get keyboardKeyNumpadParenLeft => 'Num ('; @override - String get keyboardKeyNumpadParenRight => 'Datum'; + String get keyboardKeyNumpadParenRight => 'Num )'; @override - String get keyboardKeyNumpadSubtract => 'Datum'; + String get keyboardKeyNumpadSubtract => 'Num -'; @override - String get keyboardKeyPageDown => 'Datum'; + String get keyboardKeyPageDown => 'PgDown'; @override - String get keyboardKeyPageUp => 'Datum'; + String get keyboardKeyPageUp => 'PgUp'; @override - String get keyboardKeyPower => 'Datum'; + String get keyboardKeyPower => 'Power'; @override - String get keyboardKeyPowerOff => 'Datum'; + String get keyboardKeyPowerOff => 'Power Off'; @override - String get keyboardKeyPrintScreen => 'Datum'; + String get keyboardKeyPrintScreen => 'Print Screen'; @override - String get keyboardKeyRomaji => 'Datum'; + String get keyboardKeyRomaji => 'Romaji'; @override - String get keyboardKeyScrollLock => 'Datum'; + String get keyboardKeyScrollLock => 'Scroll Lock'; @override - String get keyboardKeySelect => 'Datum'; + String get keyboardKeySelect => 'Select'; @override - String get keyboardKeySpace => 'Datum'; + String get keyboardKeySpace => 'Spasie'; @override - String get keyboardKeyZenkaku => 'Datum'; + String get keyboardKeyZenkaku => 'Zenkaku'; @override - String get keyboardKeyZenkakuHankaku => 'Datum'; + String get keyboardKeyZenkakuHankaku => 'Zenkaku Hankaku'; @override String aboutListTileTitle(String applicationName) { diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake index ec48ebfc..ae841bb2 100644 --- a/linux/flutter/generated_plugins.cmake +++ b/linux/flutter/generated_plugins.cmake @@ -7,6 +7,9 @@ list(APPEND FLUTTER_PLUGIN_LIST window_manager ) +list(APPEND FLUTTER_FFI_PLUGIN_LIST +) + set(PLUGIN_BUNDLED_LIBRARIES) foreach(plugin ${FLUTTER_PLUGIN_LIST}) @@ -15,3 +18,8 @@ foreach(plugin ${FLUTTER_PLUGIN_LIST}) list(APPEND PLUGIN_BUNDLED_LIBRARIES $) list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) endforeach(plugin) + +foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/linux plugins/${ffi_plugin}) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) +endforeach(ffi_plugin) diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index c7621f85..14435a7d 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -5,12 +5,16 @@ import FlutterMacOS import Foundation +import flutter_local_notifications import package_info_plus_macos import path_provider_macos import url_launcher_macos +import window_manager func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { + FlutterLocalNotificationsPlugin.register(with: registry.registrar(forPlugin: "FlutterLocalNotificationsPlugin")) FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) + WindowManagerPlugin.register(with: registry.registrar(forPlugin: "WindowManagerPlugin")) } diff --git a/pubspec.lock b/pubspec.lock index 56b9d2a4..f377f459 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -259,17 +259,17 @@ packages: flutter_local_notifications: dependency: "direct main" description: - path: "/home/dan/src/openprivacy/flutter_local_notifications/flutter_local_notifications" - relative: false - source: path - version: "9.5.3+1" + name: flutter_local_notifications + url: "https://pub.dartlang.org" + source: hosted + version: "9.6.1" flutter_local_notifications_linux: - dependency: "direct overridden" + dependency: transitive description: - path: "/home/dan/src/openprivacy/flutter_local_notifications/flutter_local_notifications_linux" - relative: false - source: path - version: "0.4.2" + name: flutter_local_notifications_linux + url: "https://pub.dartlang.org" + source: hosted + version: "0.5.0+1" flutter_local_notifications_platform_interface: dependency: transitive description: @@ -588,7 +588,7 @@ packages: name: provider url: "https://pub.dartlang.org" source: hosted - version: "5.0.0" + version: "6.0.3" pub_semver: dependency: transitive description: @@ -609,7 +609,7 @@ packages: name: scrollable_positioned_list url: "https://pub.dartlang.org" source: hosted - version: "0.2.3" + version: "0.3.2" shelf: dependency: transitive description: @@ -848,4 +848,4 @@ packages: version: "3.1.0" sdks: dart: ">=2.17.0-0 <3.0.0" - flutter: ">=2.5.0" + flutter: ">=2.12.0" diff --git a/pubspec.yaml b/pubspec.yaml index 676e0aad..f6f4a840 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -23,7 +23,7 @@ environment: dependencies: flutter: sdk: flutter - provider: 5.0.0 + provider: ^6.0.3 package_info_plus: ^1.0.0 #intl_translation: any flutter_localizations: @@ -37,24 +37,16 @@ dependencies: crypto: 3.0.1 glob: any - scrollable_positioned_list: ^0.2.0-nullsafety.0 + scrollable_positioned_list: ^0.3.2 file_picker: ^4.3.2 file_picker_desktop: ^1.1.0 url_launcher: ^6.0.18 window_manager: ^0.1.4 # notification plugins win_toast: ^0.0.2 - # 9.3.2 - flutter_local_notifications: - path: /home/dan/src/openprivacy/flutter_local_notifications/flutter_local_notifications - - + flutter_local_notifications: ^9.6.1 desktop_notifications: ^0.6.3 -dependency_overrides: - flutter_local_notifications_linux: - path: /home/dan/src/openprivacy/flutter_local_notifications/flutter_local_notifications_linux - dev_dependencies: msix: ^2.1.3 flutter_gherkin: ^3.0.0-rc.9 diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake index 21bba102..aab3ee94 100644 --- a/windows/flutter/generated_plugins.cmake +++ b/windows/flutter/generated_plugins.cmake @@ -8,6 +8,9 @@ list(APPEND FLUTTER_PLUGIN_LIST window_manager ) +list(APPEND FLUTTER_FFI_PLUGIN_LIST +) + set(PLUGIN_BUNDLED_LIBRARIES) foreach(plugin ${FLUTTER_PLUGIN_LIST}) @@ -16,3 +19,8 @@ foreach(plugin ${FLUTTER_PLUGIN_LIST}) list(APPEND PLUGIN_BUNDLED_LIBRARIES $) list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) endforeach(plugin) + +foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin}) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) +endforeach(ffi_plugin)