From 37c536fc339e73f533eee172f97008a75c46f535 Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Wed, 7 Feb 2024 12:42:25 +0530 Subject: [PATCH 1/2] feat: uptake at_commons:4.0.1 and format files --- .../at_theme_flutter/example/ios/Podfile.lock | 54 +++++++++++++------ .../ios/Runner.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- .../at_theme_flutter/example/lib/main.dart | 8 +-- .../Flutter/GeneratedPluginRegistrant.swift | 2 +- .../at_theme_flutter/example/pubspec.yaml | 7 +++ .../lib/services/theme_service.dart | 7 ++- packages/at_theme_flutter/pubspec.yaml | 2 +- .../test/widget_tests/color_card_test.dart | 3 +- .../widget_tests/theme_mode_card_test.dart | 3 +- .../widget_tests/theme_setting_page_test.dart | 7 +-- 11 files changed, 62 insertions(+), 35 deletions(-) diff --git a/packages/at_theme_flutter/example/ios/Podfile.lock b/packages/at_theme_flutter/example/ios/Podfile.lock index d6104c6b7..d7f6e1810 100644 --- a/packages/at_theme_flutter/example/ios/Podfile.lock +++ b/packages/at_theme_flutter/example/ios/Podfile.lock @@ -7,6 +7,8 @@ PODS: - Flutter - biometric_storage (0.0.1): - Flutter + - device_info_plus (0.0.1): + - Flutter - DKImagePickerController/Core (4.3.4): - DKImagePickerController/ImageDataManager - DKImagePickerController/Resource @@ -41,6 +43,8 @@ PODS: - file_picker (0.0.1): - DKImagePickerController/PhotoGallery - Flutter + - file_selector_ios (0.0.1): + - Flutter - Flutter (1.0.0) - flutter_keychain (0.0.1): - Flutter @@ -50,18 +54,22 @@ PODS: - MTBBarcodeScanner (5.0.11) - package_info_plus (0.4.5): - Flutter - - path_provider_ios (0.0.1): + - path_provider_foundation (0.0.1): - Flutter - - permission_handler_apple (9.0.4): + - FlutterMacOS + - permission_handler_apple (9.1.1): - Flutter - qr_code_scanner (0.2.0): - Flutter - MTBBarcodeScanner - - SDWebImage (5.15.5): - - SDWebImage/Core (= 5.15.5) - - SDWebImage/Core (5.15.5) + - SDWebImage (5.18.10): + - SDWebImage/Core (= 5.18.10) + - SDWebImage/Core (5.18.10) - share_plus (0.0.1): - Flutter + - shared_preferences_foundation (0.0.1): + - Flutter + - FlutterMacOS - SwiftyGif (5.4.4) - Toast (4.0.0) - url_launcher_ios (0.0.1): @@ -74,15 +82,18 @@ DEPENDENCIES: - at_file_saver (from `.symlinks/plugins/at_file_saver/ios`) - at_onboarding_flutter (from `.symlinks/plugins/at_onboarding_flutter/ios`) - biometric_storage (from `.symlinks/plugins/biometric_storage/ios`) + - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`) - file_picker (from `.symlinks/plugins/file_picker/ios`) + - file_selector_ios (from `.symlinks/plugins/file_selector_ios/ios`) - Flutter (from `Flutter`) - flutter_keychain (from `.symlinks/plugins/flutter_keychain/ios`) - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`) - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`) - - path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`) + - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`) - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`) - qr_code_scanner (from `.symlinks/plugins/qr_code_scanner/ios`) - share_plus (from `.symlinks/plugins/share_plus/ios`) + - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`) - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) - webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/ios`) @@ -104,8 +115,12 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/at_onboarding_flutter/ios" biometric_storage: :path: ".symlinks/plugins/biometric_storage/ios" + device_info_plus: + :path: ".symlinks/plugins/device_info_plus/ios" file_picker: :path: ".symlinks/plugins/file_picker/ios" + file_selector_ios: + :path: ".symlinks/plugins/file_selector_ios/ios" Flutter: :path: Flutter flutter_keychain: @@ -114,14 +129,16 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/fluttertoast/ios" package_info_plus: :path: ".symlinks/plugins/package_info_plus/ios" - path_provider_ios: - :path: ".symlinks/plugins/path_provider_ios/ios" + path_provider_foundation: + :path: ".symlinks/plugins/path_provider_foundation/darwin" permission_handler_apple: :path: ".symlinks/plugins/permission_handler_apple/ios" qr_code_scanner: :path: ".symlinks/plugins/qr_code_scanner/ios" share_plus: :path: ".symlinks/plugins/share_plus/ios" + shared_preferences_foundation: + :path: ".symlinks/plugins/shared_preferences_foundation/darwin" url_launcher_ios: :path: ".symlinks/plugins/url_launcher_ios/ios" webview_flutter_wkwebview: @@ -132,24 +149,27 @@ SPEC CHECKSUMS: at_file_saver: c0e052c72d8c0296318bd70f2ae7f510887014ce at_onboarding_flutter: e8219b6d0bfb236d3837ec3528871aebdcc56e8d biometric_storage: 1400f1382af3a4cc2bf05340e13c3d8de873ceb9 + device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6 DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179 - file_picker: ce3938a0df3cc1ef404671531facef740d03f920 + file_picker: 15fd9539e4eb735dc54bae8c0534a7a9511a03de + file_selector_ios: 8c25d700d625e1dcdd6599f2d927072f2254647b Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 flutter_keychain: 01aabf894ffe8b01adfda1d9df21c210c1b4b452 - fluttertoast: 74526702fea2c060ea55dde75895b7e1bde1c86b + fluttertoast: fafc4fa4d01a6a9e4f772ecd190ffa525e9e2d9c MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb - package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e - path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02 - permission_handler_apple: 44366e37eaf29454a1e7b1b7d736c2cceaeb17ce + package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85 + path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943 + permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6 qr_code_scanner: bb67d64904c3b9658ada8c402e8b4d406d5d796e - SDWebImage: fd7e1a22f00303e058058278639bf6196ee431fe - share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68 + SDWebImage: fc8f2d48bbfd72ef39d70e981bd24a3f3be53fec + share_plus: c3fef564749587fc939ef86ffb283ceac0baf9f5 + shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126 SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f Toast: 91b396c56ee72a5790816f40d3a94dd357abc196 - url_launcher_ios: 839c58cdb4279282219f5e248c3321761ff3c4de + url_launcher_ios: bf5ce03e0e2088bad9cc378ea97fa0ed5b49673b webview_flutter_wkwebview: 2e2d318f21a5e036e2c3f26171342e95908bd60a PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3 -COCOAPODS: 1.11.3 +COCOAPODS: 1.12.1 diff --git a/packages/at_theme_flutter/example/ios/Runner.xcodeproj/project.pbxproj b/packages/at_theme_flutter/example/ios/Runner.xcodeproj/project.pbxproj index ec247ac50..296e04aae 100644 --- a/packages/at_theme_flutter/example/ios/Runner.xcodeproj/project.pbxproj +++ b/packages/at_theme_flutter/example/ios/Runner.xcodeproj/project.pbxproj @@ -155,7 +155,7 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1300; + LastUpgradeCheck = 1430; ORGANIZATIONNAME = ""; TargetAttributes = { 97C146ED1CF9000F007C117D = { diff --git a/packages/at_theme_flutter/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/at_theme_flutter/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 3db53b6e1..b52b2e698 100644 --- a/packages/at_theme_flutter/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/packages/at_theme_flutter/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ { switch (result.status) { case AtOnboardingResultStatus.success: await Navigator.pushReplacement( - context, - MaterialPageRoute( - builder: (context) => - const ProfilePage())); + context, + MaterialPageRoute( + builder: (context) => + const ProfilePage())); break; case AtOnboardingResultStatus.error: ScaffoldMessenger.of(context).showSnackBar( diff --git a/packages/at_theme_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/at_theme_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift index 508252dd8..591d027b4 100644 --- a/packages/at_theme_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/at_theme_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -20,7 +20,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { BiometricStorageMacOSPlugin.register(with: registry.registrar(forPlugin: "BiometricStorageMacOSPlugin")) DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin")) - FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin")) + FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin")) SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) diff --git a/packages/at_theme_flutter/example/pubspec.yaml b/packages/at_theme_flutter/example/pubspec.yaml index 141f18fd2..e4c2ceb5b 100644 --- a/packages/at_theme_flutter/example/pubspec.yaml +++ b/packages/at_theme_flutter/example/pubspec.yaml @@ -39,6 +39,13 @@ dependencies: flutter: sdk: flutter +dependency_overrides: + at_onboarding_flutter: + git: + url: https://github.com/atsign-foundation/at_widgets.git + path: packages/at_onboarding_flutter + ref: fix/onboarding_deps_and_pub_points + dev_dependencies: # The "flutter_lints" package below contains a set of recommended lints to # encourage good coding practices. The lint set provided by the package is diff --git a/packages/at_theme_flutter/lib/services/theme_service.dart b/packages/at_theme_flutter/lib/services/theme_service.dart index 7c6b3f2cf..636ac4580 100644 --- a/packages/at_theme_flutter/lib/services/theme_service.dart +++ b/packages/at_theme_flutter/lib/services/theme_service.dart @@ -24,12 +24,11 @@ class ThemeService { currentAtsign = atClientManager.atClient.getCurrentAtSign(); } - Future updateThemeData(AppTheme themeData) async{ + Future updateThemeData(AppTheme themeData) async { AtKey atKey = getAtkey(); try { - var result = await atClientManager - .atClient - .put(atKey, themeData.encoded()); + var result = + await atClientManager.atClient.put(atKey, themeData.encoded()); return result; } catch (e) { _logger.severe('error in updating theme data: ${e.toString()}'); diff --git a/packages/at_theme_flutter/pubspec.yaml b/packages/at_theme_flutter/pubspec.yaml index f947efa91..79b063dd4 100644 --- a/packages/at_theme_flutter/pubspec.yaml +++ b/packages/at_theme_flutter/pubspec.yaml @@ -13,7 +13,7 @@ environment: dependencies: at_client_mobile: ^3.2.12 at_common_flutter: ^2.0.12 - at_commons: ^3.0.55 + at_commons: ^4.0.1 at_utils: ^3.0.15 flutter: sdk: flutter diff --git a/packages/at_theme_flutter/test/widget_tests/color_card_test.dart b/packages/at_theme_flutter/test/widget_tests/color_card_test.dart index 79625a9b4..d98cd2e6f 100644 --- a/packages/at_theme_flutter/test/widget_tests/color_card_test.dart +++ b/packages/at_theme_flutter/test/widget_tests/color_card_test.dart @@ -19,8 +19,7 @@ void main() { // Test Case to Check Color Card is displayed const colorCard = ColorCard(color: Colors.orange, isSelected: true); testWidgets("Color Card is displayed", (WidgetTester tester) async { - await tester.pumpWidget( - _wrapWidgetWithMaterialApp(colorCard: colorCard)); + await tester.pumpWidget(_wrapWidgetWithMaterialApp(colorCard: colorCard)); expect(find.byType(ColorCard), findsOneWidget); }); }); diff --git a/packages/at_theme_flutter/test/widget_tests/theme_mode_card_test.dart b/packages/at_theme_flutter/test/widget_tests/theme_mode_card_test.dart index b6e731c32..3939391e7 100644 --- a/packages/at_theme_flutter/test/widget_tests/theme_mode_card_test.dart +++ b/packages/at_theme_flutter/test/widget_tests/theme_mode_card_test.dart @@ -22,7 +22,8 @@ void main() { brightness: Brightness.light, isSelected: true); testWidgets("Theme Mode Card is displayed", (WidgetTester tester) async { - await tester.pumpWidget(_wrapWidgetWithMaterialApp(themeModeCard: themeModeCard)); + await tester + .pumpWidget(_wrapWidgetWithMaterialApp(themeModeCard: themeModeCard)); expect(find.byType(ThemeModeCard), findsOneWidget); }); }); diff --git a/packages/at_theme_flutter/test/widget_tests/theme_setting_page_test.dart b/packages/at_theme_flutter/test/widget_tests/theme_setting_page_test.dart index 5f864784d..c0cc75562 100644 --- a/packages/at_theme_flutter/test/widget_tests/theme_setting_page_test.dart +++ b/packages/at_theme_flutter/test/widget_tests/theme_setting_page_test.dart @@ -20,10 +20,11 @@ void main() { group('Theme Setting Page Tests:', () { // Test Case to Check Theme Mode Card is displayed final themeSettingPage = ThemeSettingPage( - currentAppTheme: appTheme.AppTheme.from(), primaryColors: const [Colors.blue,Colors.pink]); + currentAppTheme: appTheme.AppTheme.from(), + primaryColors: const [Colors.blue, Colors.pink]); testWidgets("Theme Setting Page is displayed", (WidgetTester tester) async { - await tester - .pumpWidget(_wrapWidgetWithMaterialApp(themeSettingPage: themeSettingPage)); + await tester.pumpWidget( + _wrapWidgetWithMaterialApp(themeSettingPage: themeSettingPage)); expect(find.byType(ThemeSettingPage), findsOneWidget); }); }); From 1c8c49d06ce655e9f01f5a0275c0858990dcc6a7 Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Wed, 7 Feb 2024 18:44:03 +0530 Subject: [PATCH 2/2] chore: updated at_onboarding_flutter dependency --- packages/at_theme_flutter/example/pubspec.yaml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/packages/at_theme_flutter/example/pubspec.yaml b/packages/at_theme_flutter/example/pubspec.yaml index e4c2ceb5b..82ec791bf 100644 --- a/packages/at_theme_flutter/example/pubspec.yaml +++ b/packages/at_theme_flutter/example/pubspec.yaml @@ -32,20 +32,13 @@ dependencies: # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. at_common_flutter: ^2.0.12 - at_onboarding_flutter: ^6.1.3 + at_onboarding_flutter: ^6.1.7 at_theme_flutter: path: ../ cupertino_icons: ^1.0.6 flutter: sdk: flutter -dependency_overrides: - at_onboarding_flutter: - git: - url: https://github.com/atsign-foundation/at_widgets.git - path: packages/at_onboarding_flutter - ref: fix/onboarding_deps_and_pub_points - dev_dependencies: # The "flutter_lints" package below contains a set of recommended lints to # encourage good coding practices. The lint set provided by the package is