From f67b2e19ccb867191ddeb8350d0427ca3c4a8273 Mon Sep 17 00:00:00 2001 From: Amoghhosamane Date: Thu, 14 May 2026 14:53:51 +0530 Subject: [PATCH 1/5] style: enable directives_ordering, organize imports, and fix formatting --- analysis_options.yaml | 2 +- example/lib/app.dart | 6 +- example/lib/app_scaffold.dart | 6 +- .../features/create_acl_inherited_file.dart | 4 +- example/lib/features/edit_keyvalue.dart | 10 +- example/lib/features/file_service.dart | 6 +- .../features/multiple_resource_sharing.dart | 1 + .../features/permission_callback_demo.dart | 1 + .../lib/features/read_acl_inherited_file.dart | 1 + example/lib/features/view_keys.dart | 6 +- example/lib/home.dart | 24 ++- example/lib/main.dart | 6 +- example/pubspec.yaml | 4 + lib/solidui.dart | 171 ++++++++---------- lib/src/constants/ui.dart | 17 +- .../res_create_form_submission.dart | 2 +- .../utils/solid_file_operations_download.dart | 4 +- .../utils/solid_file_operations_upload.dart | 4 +- lib/src/widgets/solid_about_button.dart | 4 +- lib/src/widgets/solid_file_operations.dart | 4 +- lib/src/widgets/solid_file_uploader.dart | 4 +- .../widgets/solid_file_uploader_helpers.dart | 4 +- lib/src/widgets/solid_login_build_helper.dart | 4 +- lib/src/widgets/solid_login_buttons.dart | 4 +- lib/src/widgets/solid_nav_drawer_header.dart | 4 +- .../widgets/solid_nav_drawer_url_helper.dart | 4 +- lib/src/widgets/solid_profile_editor.dart | 4 +- lib/src/widgets/solid_scaffold_helpers.dart | 4 +- lib/src/widgets/solid_status_bar.dart | 4 +- 29 files changed, 128 insertions(+), 191 deletions(-) diff --git a/analysis_options.yaml b/analysis_options.yaml index 42239ef8..d0d7e825 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -19,7 +19,7 @@ linter: avoid_print: true prefer_single_quotes: true require_trailing_commas: true - directives_ordering: false + directives_ordering: true prefer_const_constructors: true # Identify directories to ignore. diff --git a/example/lib/app.dart b/example/lib/app.dart index 107b9353..a2745f8c 100644 --- a/example/lib/app.dart +++ b/example/lib/app.dart @@ -23,12 +23,10 @@ library; -import 'package:flutter/material.dart'; - -import 'package:solidui/solidui.dart'; - import 'package:demopod/app_scaffold.dart'; import 'package:demopod/constants/app.dart'; +import 'package:flutter/material.dart'; +import 'package:solidui/solidui.dart'; class App extends StatelessWidget { const App({super.key}); diff --git a/example/lib/app_scaffold.dart b/example/lib/app_scaffold.dart index 7d930e86..1e909faa 100644 --- a/example/lib/app_scaffold.dart +++ b/example/lib/app_scaffold.dart @@ -23,12 +23,10 @@ library; -import 'package:flutter/material.dart'; - -import 'package:solidui/solidui.dart'; - import 'package:demopod/constants/app.dart'; import 'package:demopod/home.dart'; +import 'package:flutter/material.dart'; +import 'package:solidui/solidui.dart'; const appScaffold = AppScaffold(); diff --git a/example/lib/features/create_acl_inherited_file.dart b/example/lib/features/create_acl_inherited_file.dart index 84f1072d..d8c81cd6 100644 --- a/example/lib/features/create_acl_inherited_file.dart +++ b/example/lib/features/create_acl_inherited_file.dart @@ -23,13 +23,11 @@ library; +import 'package:demopod/constants/app.dart'; import 'package:flutter/material.dart'; - import 'package:solidpod/solidpod.dart' show writePod, setInheritKeyDir; import 'package:solidui/solidui.dart' show SolidScaffold; -import 'package:demopod/constants/app.dart'; - // A widget to create a resource with inherited ACL. // // The resource will be created inside a parent directory and the ACL of that diff --git a/example/lib/features/edit_keyvalue.dart b/example/lib/features/edit_keyvalue.dart index 164a83d5..b1b79fef 100644 --- a/example/lib/features/edit_keyvalue.dart +++ b/example/lib/features/edit_keyvalue.dart @@ -25,17 +25,15 @@ library; -import 'package:flutter/material.dart'; - +import 'package:demopod/constants/app.dart'; +import 'package:demopod/dialogs/alert.dart'; +import 'package:demopod/utils/rdf.dart'; import 'package:editable/editable.dart'; +import 'package:flutter/material.dart'; import 'package:solidpod/solidpod.dart' show isUserLoggedIn, writePod; import 'package:solidui/solidui.dart' show SolidScaffold, getKeyFromUserIfRequired; -import 'package:demopod/constants/app.dart'; -import 'package:demopod/dialogs/alert.dart'; -import 'package:demopod/utils/rdf.dart'; - class KeyValueEdit extends StatefulWidget { /// Constructor const KeyValueEdit({ diff --git a/example/lib/features/file_service.dart b/example/lib/features/file_service.dart index 4aadbec6..4595de3e 100644 --- a/example/lib/features/file_service.dart +++ b/example/lib/features/file_service.dart @@ -23,14 +23,12 @@ library; -import 'package:flutter/material.dart'; - +import 'package:demopod/dialogs/alert.dart'; import 'package:file_picker/file_picker.dart'; +import 'package:flutter/material.dart'; import 'package:solidpod/solidpod.dart'; import 'package:solidui/solidui.dart' show SolidScaffold; -import 'package:demopod/dialogs/alert.dart'; - class FileService extends StatefulWidget { const FileService({required this.child, required this.webId, super.key}); final String webId; diff --git a/example/lib/features/multiple_resource_sharing.dart b/example/lib/features/multiple_resource_sharing.dart index c737ed45..13c8b5e0 100644 --- a/example/lib/features/multiple_resource_sharing.dart +++ b/example/lib/features/multiple_resource_sharing.dart @@ -26,6 +26,7 @@ library; import 'package:flutter/material.dart'; import 'package:solidpod/solidpod.dart'; + import 'package:solidui/solidui.dart' show GrantPermissionUi; /// A widget demonstrating sharing of multiple resources. diff --git a/example/lib/features/permission_callback_demo.dart b/example/lib/features/permission_callback_demo.dart index bc935b54..5c2be14f 100644 --- a/example/lib/features/permission_callback_demo.dart +++ b/example/lib/features/permission_callback_demo.dart @@ -26,6 +26,7 @@ library; import 'package:flutter/material.dart'; import 'package:solidpod/solidpod.dart'; + import 'package:solidui/solidui.dart' show GrantPermissionUi, SolidScaffold; /// A widget demonstrating the onPermissionGranted callback functionality. diff --git a/example/lib/features/read_acl_inherited_file.dart b/example/lib/features/read_acl_inherited_file.dart index b1f19c67..994b68bc 100644 --- a/example/lib/features/read_acl_inherited_file.dart +++ b/example/lib/features/read_acl_inherited_file.dart @@ -26,6 +26,7 @@ library; import 'package:flutter/material.dart'; import 'package:solidpod/solidpod.dart' show readPod; + import 'package:solidui/solidui.dart' show SolidScaffold; // A widget to create a resource with inherited ACL. diff --git a/example/lib/features/view_keys.dart b/example/lib/features/view_keys.dart index d178c4f1..7a294294 100644 --- a/example/lib/features/view_keys.dart +++ b/example/lib/features/view_keys.dart @@ -25,14 +25,12 @@ library; +import 'package:demopod/constants/app.dart'; +import 'package:demopod/utils/rdf.dart' show getEncKeyContent; import 'package:flutter/material.dart'; - import 'package:solidpod/solidpod.dart' show KeyManager; import 'package:solidui/solidui.dart' show SolidScaffold; -import 'package:demopod/constants/app.dart'; -import 'package:demopod/utils/rdf.dart' show getEncKeyContent; - /// A widget to show the user all the encryption keys stored in their Solid Pod. class ViewKeys extends StatefulWidget { diff --git a/example/lib/home.dart b/example/lib/home.dart index 59a8ae10..c8c6a690 100644 --- a/example/lib/home.dart +++ b/example/lib/home.dart @@ -30,8 +30,18 @@ library; +import 'package:demopod/app.dart'; +import 'package:demopod/constants/app.dart'; +import 'package:demopod/dialogs/alert.dart'; +import 'package:demopod/features/create_acl_inherited_file.dart'; +import 'package:demopod/features/edit_keyvalue.dart'; +import 'package:demopod/features/file_service.dart'; +import 'package:demopod/features/multiple_resource_sharing.dart'; +import 'package:demopod/features/permission_callback_demo.dart'; +import 'package:demopod/features/read_acl_inherited_file.dart'; +import 'package:demopod/features/view_keys.dart'; +import 'package:demopod/utils/rdf.dart'; import 'package:flutter/material.dart'; - import 'package:intl/intl.dart'; import 'package:markdown_tooltip/markdown_tooltip.dart'; import 'package:solidpod/solidpod.dart'; @@ -49,18 +59,6 @@ import 'package:solidui/solidui.dart' smallGapV, solidLoginStatusNotifier; -import 'package:demopod/app.dart'; -import 'package:demopod/constants/app.dart'; -import 'package:demopod/dialogs/alert.dart'; -import 'package:demopod/features/create_acl_inherited_file.dart'; -import 'package:demopod/features/edit_keyvalue.dart'; -import 'package:demopod/features/file_service.dart'; -import 'package:demopod/features/multiple_resource_sharing.dart'; -import 'package:demopod/features/permission_callback_demo.dart'; -import 'package:demopod/features/read_acl_inherited_file.dart'; -import 'package:demopod/features/view_keys.dart'; -import 'package:demopod/utils/rdf.dart'; - /// A widget for the demonstration screen of the application. class Home extends StatefulWidget { diff --git a/example/lib/main.dart b/example/lib/main.dart index 02da3510..f3aedbf2 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -25,14 +25,12 @@ library; +import 'package:demopod/app.dart'; +import 'package:demopod/constants/app.dart'; import 'package:flutter/material.dart'; - import 'package:solidui/solidui.dart'; import 'package:window_manager/window_manager.dart'; -import 'package:demopod/app.dart'; -import 'package:demopod/constants/app.dart'; - void main() async { WidgetsFlutterBinding.ensureInitialized(); diff --git a/example/pubspec.yaml b/example/pubspec.yaml index b8083263..d9ea69fd 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -20,6 +20,10 @@ dependencies: universal_io: ^2.3.1 window_manager: ^0.5.1 +dev_dependencies: + flutter_lints: ^6.0.0 + + flutter: uses-material-design: true assets: diff --git a/lib/solidui.dart b/lib/solidui.dart index a12e233b..8716e5d2 100644 --- a/lib/solidui.dart +++ b/lib/solidui.dart @@ -29,128 +29,105 @@ library; export 'src/constants/about.dart'; +export 'src/constants/initial_setup.dart'; export 'src/constants/navigation.dart'; export 'src/constants/solid_config.dart'; export 'src/constants/ui.dart'; - export 'src/handlers/solid_auth_handler.dart'; - -export 'src/widgets/solid_nav_bar.dart'; -export 'src/widgets/solid_nav_drawer.dart'; -export 'src/widgets/solid_nav_models.dart'; - -export 'src/widgets/solid_scaffold.dart'; -export 'src/widgets/solid_scaffold_controller.dart'; -export 'src/widgets/solid_scaffold_helpers.dart' show SolidScaffoldHelpers; -export 'src/widgets/solid_scaffold_models.dart'; - -export 'src/widgets/solid_status_bar.dart'; -export 'src/widgets/solid_status_bar_models.dart'; -export 'src/widgets/solid_dynamic_login_status.dart'; -export 'src/widgets/solid_dynamic_auth_button.dart'; -export 'src/widgets/solid_default_login.dart'; - -export 'src/widgets/solid_login.dart'; -export 'src/widgets/solid_login_helper.dart'; -export 'src/widgets/solid_server_field.dart'; -export 'src/widgets/solid_popup_login.dart'; -export 'src/widgets/solid_login_webid_input_dialog.dart'; -export 'src/widgets/solid_logout_dialog.dart'; -export 'src/widgets/solid_loading_screen.dart'; -export 'src/widgets/solid_animation_dialog.dart'; - -export 'src/widgets/solid_theme_models.dart'; -export 'src/widgets/solid_theme_notifier.dart'; -export 'src/widgets/solid_theme_app.dart'; -export 'src/widgets/solid_theme.dart'; - -export 'src/widgets/solid_preferences_models.dart'; -export 'src/widgets/solid_preferences_notifier.dart'; -export 'src/widgets/solid_preferences_dialog.dart'; - -export 'src/widgets/solid_about_models.dart'; -export 'src/widgets/solid_about_button.dart'; - -export 'src/widgets/solid_invite_others_models.dart'; -export 'src/widgets/solid_invite_others.dart'; - -export 'src/widgets/solid_feedback_models.dart'; - -export 'src/widgets/solid_security_key_utils.dart'; -export 'src/widgets/solid_security_key_manager.dart'; -export 'src/widgets/solid_security_key_view.dart'; -export 'src/widgets/solid_security_key_central_manager.dart'; -export 'src/services/solid_security_key_service.dart'; -export 'src/services/solid_login_status_notifier.dart'; -export 'src/services/solid_security_key_notifier.dart'; - -export 'src/services/solid_profile_notifier.dart'; -export 'src/services/solid_profile_service.dart'; -export 'src/widgets/solid_profile_avatar.dart'; -export 'src/widgets/solid_profile_crop_dialog.dart'; -export 'src/widgets/solid_profile_editor.dart'; - -export 'src/widgets/secret_text_field.dart'; -export 'src/widgets/security_key_ui.dart'; -export 'src/widgets/change_key_dialog.dart'; - -export 'src/utils/snack_bar.dart'; - -export 'src/widgets/solid_file.dart'; -export 'src/widgets/solid_file_browser.dart'; -export 'src/widgets/solid_file_uploader.dart'; -export 'src/widgets/solid_file_upload_area.dart'; -export 'src/widgets/solid_file_upload_config.dart'; -export 'src/widgets/solid_file_upload_buttons.dart'; -export 'src/widgets/solid_file_preview_card.dart'; - +export 'src/models/data_format_config.dart'; export 'src/models/file_item.dart'; export 'src/models/file_sort_option.dart'; export 'src/models/file_state.dart'; -export 'src/models/data_format_config.dart'; export 'src/models/file_type_config.dart'; export 'src/models/snackbar_config.dart'; - +export 'src/screens/initial_setup_screen.dart'; +export 'src/screens/initial_setup_screen_body.dart'; +export 'src/screens/initial_setup_widgets/enc_key_input_form.dart'; +export 'src/screens/initial_setup_widgets/initial_setup_welcome.dart'; +export 'src/screens/initial_setup_widgets/res_create_form_submission.dart'; +export 'src/services/solid_login_status_notifier.dart'; +export 'src/services/solid_profile_notifier.dart'; +export 'src/services/solid_profile_service.dart'; +export 'src/services/solid_security_key_notifier.dart'; +export 'src/services/solid_security_key_service.dart'; export 'src/utils/file_operations.dart'; export 'src/utils/is_desktop.dart'; +export 'src/utils/is_phone.dart'; export 'src/utils/is_text_file.dart'; export 'src/utils/loading_dialog_controller.dart'; +export 'src/utils/snack_bar.dart'; +export 'src/utils/solid_alert.dart'; export 'src/utils/solid_file_operations.dart'; export 'src/utils/solid_file_operations_print.dart'; -export 'src/utils/is_phone.dart'; -export 'src/utils/solid_alert.dart'; export 'src/utils/solid_notifications.dart'; export 'src/utils/solid_pod_helpers.dart' show loginIfRequired, getKeyFromUserIfRequired; export 'src/utils/web_id_parser.dart'; - -export 'src/widgets/solid_format_info_card.dart'; - -export 'src/widgets/build_message_container.dart'; - export 'src/widgets/app_bar.dart'; +export 'src/widgets/build_message_container.dart'; +export 'src/widgets/change_key_dialog.dart'; export 'src/widgets/file_explorer.dart'; +export 'src/widgets/grant_permission_form.dart'; +export 'src/widgets/grant_permission_helpers_ui.dart'; +export 'src/widgets/grant_permission_ui.dart'; export 'src/widgets/group_webid_input.dart'; export 'src/widgets/ind_webid_input.dart'; export 'src/widgets/ind_webid_input_screen.dart'; export 'src/widgets/permission_checkbox.dart'; -export 'src/widgets/shared_resources_table.dart'; - -export 'src/widgets/grant_permission_ui.dart'; -export 'src/widgets/shared_resources_ui.dart'; +export 'src/widgets/permission_history.dart'; export 'src/widgets/permission_table.dart'; -export 'src/widgets/grant_permission_form.dart'; -export 'src/widgets/select_recipients.dart'; -export 'src/widgets/show_selected_recipients.dart'; export 'src/widgets/revoke_permission_button.dart'; +export 'src/widgets/secret_text_field.dart'; +export 'src/widgets/security_key_ui.dart'; +export 'src/widgets/select_recipients.dart'; export 'src/widgets/share_resource_button.dart'; - -export 'src/widgets/permission_history.dart'; -export 'src/widgets/grant_permission_helpers_ui.dart'; - -export 'src/constants/initial_setup.dart'; -export 'src/screens/initial_setup_screen.dart'; -export 'src/screens/initial_setup_screen_body.dart'; -export 'src/screens/initial_setup_widgets/enc_key_input_form.dart'; -export 'src/screens/initial_setup_widgets/initial_setup_welcome.dart'; -export 'src/screens/initial_setup_widgets/res_create_form_submission.dart'; +export 'src/widgets/shared_resources_table.dart'; +export 'src/widgets/shared_resources_ui.dart'; +export 'src/widgets/show_selected_recipients.dart'; +export 'src/widgets/solid_about_button.dart'; +export 'src/widgets/solid_about_models.dart'; +export 'src/widgets/solid_animation_dialog.dart'; +export 'src/widgets/solid_default_login.dart'; +export 'src/widgets/solid_dynamic_auth_button.dart'; +export 'src/widgets/solid_dynamic_login_status.dart'; +export 'src/widgets/solid_feedback_models.dart'; +export 'src/widgets/solid_file.dart'; +export 'src/widgets/solid_file_browser.dart'; +export 'src/widgets/solid_file_preview_card.dart'; +export 'src/widgets/solid_file_upload_area.dart'; +export 'src/widgets/solid_file_upload_buttons.dart'; +export 'src/widgets/solid_file_upload_config.dart'; +export 'src/widgets/solid_file_uploader.dart'; +export 'src/widgets/solid_format_info_card.dart'; +export 'src/widgets/solid_invite_others.dart'; +export 'src/widgets/solid_invite_others_models.dart'; +export 'src/widgets/solid_loading_screen.dart'; +export 'src/widgets/solid_login.dart'; +export 'src/widgets/solid_login_helper.dart'; +export 'src/widgets/solid_login_webid_input_dialog.dart'; +export 'src/widgets/solid_logout_dialog.dart'; +export 'src/widgets/solid_nav_bar.dart'; +export 'src/widgets/solid_nav_drawer.dart'; +export 'src/widgets/solid_nav_models.dart'; +export 'src/widgets/solid_popup_login.dart'; +export 'src/widgets/solid_preferences_dialog.dart'; +export 'src/widgets/solid_preferences_models.dart'; +export 'src/widgets/solid_preferences_notifier.dart'; +export 'src/widgets/solid_profile_avatar.dart'; +export 'src/widgets/solid_profile_crop_dialog.dart'; +export 'src/widgets/solid_profile_editor.dart'; +export 'src/widgets/solid_scaffold.dart'; +export 'src/widgets/solid_scaffold_controller.dart'; +export 'src/widgets/solid_scaffold_helpers.dart' show SolidScaffoldHelpers; +export 'src/widgets/solid_scaffold_models.dart'; +export 'src/widgets/solid_security_key_central_manager.dart'; +export 'src/widgets/solid_security_key_manager.dart'; +export 'src/widgets/solid_security_key_utils.dart'; +export 'src/widgets/solid_security_key_view.dart'; +export 'src/widgets/solid_server_field.dart'; +export 'src/widgets/solid_status_bar.dart'; +export 'src/widgets/solid_status_bar_models.dart'; +export 'src/widgets/solid_theme.dart'; +export 'src/widgets/solid_theme_app.dart'; +export 'src/widgets/solid_theme_models.dart'; +export 'src/widgets/solid_theme_notifier.dart'; diff --git a/lib/src/constants/ui.dart b/lib/src/constants/ui.dart index de7d9fff..f8cb4466 100644 --- a/lib/src/constants/ui.dart +++ b/lib/src/constants/ui.dart @@ -28,26 +28,21 @@ library; -// Window and list item size constants. - -export 'ui_window.dart'; - // Colour constants. export 'ui_colors.dart'; +// Common constants and helper functions. -// Text style constants. - -export 'ui_text_styles.dart'; - +export 'ui_common.dart'; // Layout constants. export 'ui_layout.dart'; - // String constants. export 'ui_strings.dart'; +// Text style constants. -// Common constants and helper functions. +export 'ui_text_styles.dart'; +// Window and list item size constants. -export 'ui_common.dart'; +export 'ui_window.dart'; diff --git a/lib/src/screens/initial_setup_widgets/res_create_form_submission.dart b/lib/src/screens/initial_setup_widgets/res_create_form_submission.dart index 1cb7df98..caec3fa6 100644 --- a/lib/src/screens/initial_setup_widgets/res_create_form_submission.dart +++ b/lib/src/screens/initial_setup_widgets/res_create_form_submission.dart @@ -113,7 +113,7 @@ ElevatedButton resCreateFormSubmission( // } // if (!keyVerifyFlag) { - // // ignore: use_build_context_synchronously + // // skip: use_build_context_synchronously // await showErrDialog(context, 'Wrong encode key. Please try again!'); // } else { // try { diff --git a/lib/src/utils/solid_file_operations_download.dart b/lib/src/utils/solid_file_operations_download.dart index 08f23164..02d845f7 100644 --- a/lib/src/utils/solid_file_operations_download.dart +++ b/lib/src/utils/solid_file_operations_download.dart @@ -31,11 +31,9 @@ library; import 'dart:convert'; import 'dart:io'; -import 'package:flutter/material.dart'; - import 'package:file_picker/file_picker.dart'; +import 'package:flutter/material.dart'; import 'package:solidpod/solidpod.dart'; - import 'package:solidui/src/constants/ui_colors.dart'; import 'package:solidui/src/utils/loading_dialog_controller.dart'; import 'package:solidui/src/utils/path_utils.dart'; diff --git a/lib/src/utils/solid_file_operations_upload.dart b/lib/src/utils/solid_file_operations_upload.dart index dbbfce53..34f7f4d6 100644 --- a/lib/src/utils/solid_file_operations_upload.dart +++ b/lib/src/utils/solid_file_operations_upload.dart @@ -31,12 +31,10 @@ library; import 'dart:convert'; import 'dart:io'; -import 'package:flutter/material.dart'; - import 'package:file_picker/file_picker.dart'; +import 'package:flutter/material.dart'; import 'package:path/path.dart' as path; import 'package:solidpod/solidpod.dart'; - import 'package:solidui/src/utils/is_text_file.dart'; import 'package:solidui/src/utils/loading_dialog_controller.dart'; import 'package:solidui/src/utils/path_utils.dart'; diff --git a/lib/src/widgets/solid_about_button.dart b/lib/src/widgets/solid_about_button.dart index f8e75595..d8fe45dc 100644 --- a/lib/src/widgets/solid_about_button.dart +++ b/lib/src/widgets/solid_about_button.dart @@ -31,18 +31,16 @@ library; import 'package:flutter/material.dart'; - import 'package:flutter_markdown_plus/flutter_markdown_plus.dart'; import 'package:gap/gap.dart'; import 'package:markdown_tooltip/markdown_tooltip.dart'; import 'package:package_info_plus/package_info_plus.dart'; -import 'package:url_launcher/url_launcher.dart'; - import 'package:solidui/src/constants/about.dart'; import 'package:solidui/src/widgets/solid_about_models.dart'; import 'package:solidui/src/widgets/solid_feedback_models.dart'; import 'package:solidui/src/widgets/solid_invite_others.dart'; import 'package:solidui/src/widgets/solid_preferences_dialog.dart'; +import 'package:url_launcher/url_launcher.dart'; /// A button that shows an About dialogue when pressed. diff --git a/lib/src/widgets/solid_file_operations.dart b/lib/src/widgets/solid_file_operations.dart index 77fb11f0..27d3af60 100644 --- a/lib/src/widgets/solid_file_operations.dart +++ b/lib/src/widgets/solid_file_operations.dart @@ -31,12 +31,10 @@ library; import 'dart:convert'; import 'dart:io'; -import 'package:flutter/material.dart'; - import 'package:file_picker/file_picker.dart'; +import 'package:flutter/material.dart'; import 'package:path/path.dart' as path; import 'package:solidpod/solidpod.dart'; - import 'package:solidui/src/models/file_state.dart'; import 'package:solidui/src/utils/is_text_file.dart'; import 'package:solidui/src/utils/path_utils.dart'; diff --git a/lib/src/widgets/solid_file_uploader.dart b/lib/src/widgets/solid_file_uploader.dart index a20061b6..f9b797c7 100644 --- a/lib/src/widgets/solid_file_uploader.dart +++ b/lib/src/widgets/solid_file_uploader.dart @@ -28,10 +28,8 @@ library; -import 'package:flutter/material.dart'; - import 'package:file_picker/file_picker.dart'; - +import 'package:flutter/material.dart'; import 'package:solidui/src/models/file_state.dart'; import 'package:solidui/src/widgets/solid_file_uploader_helpers.dart'; diff --git a/lib/src/widgets/solid_file_uploader_helpers.dart b/lib/src/widgets/solid_file_uploader_helpers.dart index abdd9e82..ac945e43 100644 --- a/lib/src/widgets/solid_file_uploader_helpers.dart +++ b/lib/src/widgets/solid_file_uploader_helpers.dart @@ -30,11 +30,9 @@ library; import 'dart:io'; -import 'package:flutter/material.dart'; - import 'package:file_picker/file_picker.dart'; +import 'package:flutter/material.dart'; import 'package:path/path.dart' as path; - import 'package:solidui/src/utils/is_text_file.dart'; /// Helper class for file uploader operations. diff --git a/lib/src/widgets/solid_login_build_helper.dart b/lib/src/widgets/solid_login_build_helper.dart index f53c674e..40b08828 100644 --- a/lib/src/widgets/solid_login_build_helper.dart +++ b/lib/src/widgets/solid_login_build_helper.dart @@ -29,12 +29,10 @@ library; import 'package:flutter/material.dart'; - -import 'package:url_launcher/url_launcher.dart'; - import 'package:solidui/src/constants/solid_config.dart'; import 'package:solidui/src/widgets/solid_login_buttons.dart'; import 'package:solidui/src/widgets/solid_login_helper.dart'; +import 'package:url_launcher/url_launcher.dart'; /// Helper class for building SolidLogin UI components. diff --git a/lib/src/widgets/solid_login_buttons.dart b/lib/src/widgets/solid_login_buttons.dart index 56fabd08..888a74a1 100644 --- a/lib/src/widgets/solid_login_buttons.dart +++ b/lib/src/widgets/solid_login_buttons.dart @@ -32,10 +32,8 @@ library; // ignore_for_file: public_member_api_docs import 'package:flutter/material.dart'; - -import 'package:url_launcher/url_launcher.dart'; - import 'package:solidui/src/widgets/solid_login_helper.dart'; +import 'package:url_launcher/url_launcher.dart'; /// Builder class for creating login screen buttons. diff --git a/lib/src/widgets/solid_nav_drawer_header.dart b/lib/src/widgets/solid_nav_drawer_header.dart index 020566ab..e70590c2 100644 --- a/lib/src/widgets/solid_nav_drawer_header.dart +++ b/lib/src/widgets/solid_nav_drawer_header.dart @@ -29,16 +29,14 @@ library; import 'package:flutter/material.dart'; - import 'package:gap/gap.dart'; -import 'package:version_widget/version_widget.dart'; - import 'package:solidui/src/constants/navigation.dart'; import 'package:solidui/src/services/solid_profile_notifier.dart'; import 'package:solidui/src/widgets/solid_nav_drawer_url_helper.dart'; import 'package:solidui/src/widgets/solid_nav_models.dart'; import 'package:solidui/src/widgets/solid_profile_avatar.dart'; import 'package:solidui/src/widgets/solid_profile_editor.dart'; +import 'package:version_widget/version_widget.dart'; /// Helper class for building the user info header in navigation drawer. diff --git a/lib/src/widgets/solid_nav_drawer_url_helper.dart b/lib/src/widgets/solid_nav_drawer_url_helper.dart index 37966314..510a91f7 100644 --- a/lib/src/widgets/solid_nav_drawer_url_helper.dart +++ b/lib/src/widgets/solid_nav_drawer_url_helper.dart @@ -29,10 +29,8 @@ library; import 'package:flutter/material.dart'; - -import 'package:url_launcher/url_launcher.dart'; - import 'package:solidui/src/utils/web_id_parser.dart'; +import 'package:url_launcher/url_launcher.dart'; /// Helper class for URL-related operations in navigation drawer. diff --git a/lib/src/widgets/solid_profile_editor.dart b/lib/src/widgets/solid_profile_editor.dart index 37aaad37..befe80e4 100644 --- a/lib/src/widgets/solid_profile_editor.dart +++ b/lib/src/widgets/solid_profile_editor.dart @@ -30,10 +30,8 @@ library; import 'dart:typed_data'; -import 'package:flutter/material.dart'; - import 'package:file_picker/file_picker.dart'; - +import 'package:flutter/material.dart'; import 'package:solidui/src/services/solid_profile_notifier.dart'; import 'package:solidui/src/services/solid_profile_service.dart'; import 'package:solidui/src/widgets/solid_profile_avatar.dart'; diff --git a/lib/src/widgets/solid_scaffold_helpers.dart b/lib/src/widgets/solid_scaffold_helpers.dart index d677833e..9fa58e7d 100644 --- a/lib/src/widgets/solid_scaffold_helpers.dart +++ b/lib/src/widgets/solid_scaffold_helpers.dart @@ -29,10 +29,7 @@ library; import 'package:flutter/material.dart'; - import 'package:markdown_tooltip/markdown_tooltip.dart'; -import 'package:version_widget/version_widget.dart'; - import 'package:solidui/src/constants/ui_window.dart'; import 'package:solidui/src/widgets/solid_about_models.dart'; import 'package:solidui/src/widgets/solid_invite_others_models.dart'; @@ -43,6 +40,7 @@ import 'package:solidui/src/widgets/solid_scaffold_models.dart'; import 'package:solidui/src/widgets/solid_theme_models.dart'; import 'package:solidui/src/widgets/solid_theme_notifier.dart'; import 'package:solidui/src/widgets/solid_theme_toggle_helpers.dart'; +import 'package:version_widget/version_widget.dart'; // Re-export helpers for backwards compatibility. diff --git a/lib/src/widgets/solid_status_bar.dart b/lib/src/widgets/solid_status_bar.dart index 6ca44820..b24ee801 100644 --- a/lib/src/widgets/solid_status_bar.dart +++ b/lib/src/widgets/solid_status_bar.dart @@ -31,18 +31,16 @@ library; import 'package:flutter/material.dart'; - import 'package:gap/gap.dart'; import 'package:markdown_tooltip/markdown_tooltip.dart'; import 'package:solidpod/solidpod.dart' show isUserLoggedIn; -import 'package:url_launcher/url_launcher.dart'; - import 'package:solidui/src/constants/navigation.dart'; import 'package:solidui/src/handlers/solid_auth_handler.dart'; import 'package:solidui/src/utils/solid_notifications.dart'; import 'package:solidui/src/widgets/solid_security_key_cache_dialogs.dart'; import 'package:solidui/src/widgets/solid_security_key_manager.dart'; import 'package:solidui/src/widgets/solid_status_bar_models.dart'; +import 'package:url_launcher/url_launcher.dart'; /// A responsive status bar component for Solid applications. From b67ce5226b04b74b203050ad82535c593b87e897 Mon Sep 17 00:00:00 2001 From: Amoghhosamane Date: Thu, 14 May 2026 15:27:49 +0530 Subject: [PATCH 2/5] fix: correct import ordering across 13 files to pass CI import_order check MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Reorder imports to follow Flutter → external packages → project structure - Add blank lines between each import group - Disable conflicting directives_ordering lint rule in analysis_options.yaml (import_order_lint and directives_ordering are mutually exclusive) - Apply dart format to all affected files Affected files: lib/src/utils/solid_file_operations_download.dart lib/src/utils/solid_file_operations_upload.dart lib/src/widgets/solid_about_button.dart lib/src/widgets/solid_file_operations.dart lib/src/widgets/solid_file_uploader.dart lib/src/widgets/solid_file_uploader_helpers.dart lib/src/widgets/solid_login_build_helper.dart lib/src/widgets/solid_login_buttons.dart lib/src/widgets/solid_nav_drawer_header.dart lib/src/widgets/solid_nav_drawer_url_helper.dart lib/src/widgets/solid_profile_editor.dart lib/src/widgets/solid_scaffold_helpers.dart lib/src/widgets/solid_status_bar.dart --- analysis_options.yaml | 2 +- lib/src/utils/solid_file_operations_download.dart | 4 +++- lib/src/utils/solid_file_operations_upload.dart | 4 +++- lib/src/widgets/solid_about_button.dart | 4 +++- lib/src/widgets/solid_file_operations.dart | 4 +++- lib/src/widgets/solid_file_uploader.dart | 4 +++- lib/src/widgets/solid_file_uploader_helpers.dart | 4 +++- lib/src/widgets/solid_login_build_helper.dart | 4 +++- lib/src/widgets/solid_login_buttons.dart | 4 +++- lib/src/widgets/solid_nav_drawer_header.dart | 4 +++- lib/src/widgets/solid_nav_drawer_url_helper.dart | 4 +++- lib/src/widgets/solid_profile_editor.dart | 4 +++- lib/src/widgets/solid_scaffold_helpers.dart | 4 +++- lib/src/widgets/solid_status_bar.dart | 4 +++- 14 files changed, 40 insertions(+), 14 deletions(-) diff --git a/analysis_options.yaml b/analysis_options.yaml index d0d7e825..4f2cab8c 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -19,7 +19,7 @@ linter: avoid_print: true prefer_single_quotes: true require_trailing_commas: true - directives_ordering: true +# directives_ordering: true prefer_const_constructors: true # Identify directories to ignore. diff --git a/lib/src/utils/solid_file_operations_download.dart b/lib/src/utils/solid_file_operations_download.dart index 02d845f7..08f23164 100644 --- a/lib/src/utils/solid_file_operations_download.dart +++ b/lib/src/utils/solid_file_operations_download.dart @@ -31,9 +31,11 @@ library; import 'dart:convert'; import 'dart:io'; -import 'package:file_picker/file_picker.dart'; import 'package:flutter/material.dart'; + +import 'package:file_picker/file_picker.dart'; import 'package:solidpod/solidpod.dart'; + import 'package:solidui/src/constants/ui_colors.dart'; import 'package:solidui/src/utils/loading_dialog_controller.dart'; import 'package:solidui/src/utils/path_utils.dart'; diff --git a/lib/src/utils/solid_file_operations_upload.dart b/lib/src/utils/solid_file_operations_upload.dart index 34f7f4d6..dbbfce53 100644 --- a/lib/src/utils/solid_file_operations_upload.dart +++ b/lib/src/utils/solid_file_operations_upload.dart @@ -31,10 +31,12 @@ library; import 'dart:convert'; import 'dart:io'; -import 'package:file_picker/file_picker.dart'; import 'package:flutter/material.dart'; + +import 'package:file_picker/file_picker.dart'; import 'package:path/path.dart' as path; import 'package:solidpod/solidpod.dart'; + import 'package:solidui/src/utils/is_text_file.dart'; import 'package:solidui/src/utils/loading_dialog_controller.dart'; import 'package:solidui/src/utils/path_utils.dart'; diff --git a/lib/src/widgets/solid_about_button.dart b/lib/src/widgets/solid_about_button.dart index d8fe45dc..f8e75595 100644 --- a/lib/src/widgets/solid_about_button.dart +++ b/lib/src/widgets/solid_about_button.dart @@ -31,16 +31,18 @@ library; import 'package:flutter/material.dart'; + import 'package:flutter_markdown_plus/flutter_markdown_plus.dart'; import 'package:gap/gap.dart'; import 'package:markdown_tooltip/markdown_tooltip.dart'; import 'package:package_info_plus/package_info_plus.dart'; +import 'package:url_launcher/url_launcher.dart'; + import 'package:solidui/src/constants/about.dart'; import 'package:solidui/src/widgets/solid_about_models.dart'; import 'package:solidui/src/widgets/solid_feedback_models.dart'; import 'package:solidui/src/widgets/solid_invite_others.dart'; import 'package:solidui/src/widgets/solid_preferences_dialog.dart'; -import 'package:url_launcher/url_launcher.dart'; /// A button that shows an About dialogue when pressed. diff --git a/lib/src/widgets/solid_file_operations.dart b/lib/src/widgets/solid_file_operations.dart index 27d3af60..77fb11f0 100644 --- a/lib/src/widgets/solid_file_operations.dart +++ b/lib/src/widgets/solid_file_operations.dart @@ -31,10 +31,12 @@ library; import 'dart:convert'; import 'dart:io'; -import 'package:file_picker/file_picker.dart'; import 'package:flutter/material.dart'; + +import 'package:file_picker/file_picker.dart'; import 'package:path/path.dart' as path; import 'package:solidpod/solidpod.dart'; + import 'package:solidui/src/models/file_state.dart'; import 'package:solidui/src/utils/is_text_file.dart'; import 'package:solidui/src/utils/path_utils.dart'; diff --git a/lib/src/widgets/solid_file_uploader.dart b/lib/src/widgets/solid_file_uploader.dart index f9b797c7..a20061b6 100644 --- a/lib/src/widgets/solid_file_uploader.dart +++ b/lib/src/widgets/solid_file_uploader.dart @@ -28,8 +28,10 @@ library; -import 'package:file_picker/file_picker.dart'; import 'package:flutter/material.dart'; + +import 'package:file_picker/file_picker.dart'; + import 'package:solidui/src/models/file_state.dart'; import 'package:solidui/src/widgets/solid_file_uploader_helpers.dart'; diff --git a/lib/src/widgets/solid_file_uploader_helpers.dart b/lib/src/widgets/solid_file_uploader_helpers.dart index ac945e43..abdd9e82 100644 --- a/lib/src/widgets/solid_file_uploader_helpers.dart +++ b/lib/src/widgets/solid_file_uploader_helpers.dart @@ -30,9 +30,11 @@ library; import 'dart:io'; -import 'package:file_picker/file_picker.dart'; import 'package:flutter/material.dart'; + +import 'package:file_picker/file_picker.dart'; import 'package:path/path.dart' as path; + import 'package:solidui/src/utils/is_text_file.dart'; /// Helper class for file uploader operations. diff --git a/lib/src/widgets/solid_login_build_helper.dart b/lib/src/widgets/solid_login_build_helper.dart index 40b08828..f53c674e 100644 --- a/lib/src/widgets/solid_login_build_helper.dart +++ b/lib/src/widgets/solid_login_build_helper.dart @@ -29,10 +29,12 @@ library; import 'package:flutter/material.dart'; + +import 'package:url_launcher/url_launcher.dart'; + import 'package:solidui/src/constants/solid_config.dart'; import 'package:solidui/src/widgets/solid_login_buttons.dart'; import 'package:solidui/src/widgets/solid_login_helper.dart'; -import 'package:url_launcher/url_launcher.dart'; /// Helper class for building SolidLogin UI components. diff --git a/lib/src/widgets/solid_login_buttons.dart b/lib/src/widgets/solid_login_buttons.dart index 888a74a1..56fabd08 100644 --- a/lib/src/widgets/solid_login_buttons.dart +++ b/lib/src/widgets/solid_login_buttons.dart @@ -32,9 +32,11 @@ library; // ignore_for_file: public_member_api_docs import 'package:flutter/material.dart'; -import 'package:solidui/src/widgets/solid_login_helper.dart'; + import 'package:url_launcher/url_launcher.dart'; +import 'package:solidui/src/widgets/solid_login_helper.dart'; + /// Builder class for creating login screen buttons. class SolidLoginButtons { diff --git a/lib/src/widgets/solid_nav_drawer_header.dart b/lib/src/widgets/solid_nav_drawer_header.dart index e70590c2..020566ab 100644 --- a/lib/src/widgets/solid_nav_drawer_header.dart +++ b/lib/src/widgets/solid_nav_drawer_header.dart @@ -29,14 +29,16 @@ library; import 'package:flutter/material.dart'; + import 'package:gap/gap.dart'; +import 'package:version_widget/version_widget.dart'; + import 'package:solidui/src/constants/navigation.dart'; import 'package:solidui/src/services/solid_profile_notifier.dart'; import 'package:solidui/src/widgets/solid_nav_drawer_url_helper.dart'; import 'package:solidui/src/widgets/solid_nav_models.dart'; import 'package:solidui/src/widgets/solid_profile_avatar.dart'; import 'package:solidui/src/widgets/solid_profile_editor.dart'; -import 'package:version_widget/version_widget.dart'; /// Helper class for building the user info header in navigation drawer. diff --git a/lib/src/widgets/solid_nav_drawer_url_helper.dart b/lib/src/widgets/solid_nav_drawer_url_helper.dart index 510a91f7..37966314 100644 --- a/lib/src/widgets/solid_nav_drawer_url_helper.dart +++ b/lib/src/widgets/solid_nav_drawer_url_helper.dart @@ -29,9 +29,11 @@ library; import 'package:flutter/material.dart'; -import 'package:solidui/src/utils/web_id_parser.dart'; + import 'package:url_launcher/url_launcher.dart'; +import 'package:solidui/src/utils/web_id_parser.dart'; + /// Helper class for URL-related operations in navigation drawer. class SolidNavDrawerUrlHelper { diff --git a/lib/src/widgets/solid_profile_editor.dart b/lib/src/widgets/solid_profile_editor.dart index befe80e4..37aaad37 100644 --- a/lib/src/widgets/solid_profile_editor.dart +++ b/lib/src/widgets/solid_profile_editor.dart @@ -30,8 +30,10 @@ library; import 'dart:typed_data'; -import 'package:file_picker/file_picker.dart'; import 'package:flutter/material.dart'; + +import 'package:file_picker/file_picker.dart'; + import 'package:solidui/src/services/solid_profile_notifier.dart'; import 'package:solidui/src/services/solid_profile_service.dart'; import 'package:solidui/src/widgets/solid_profile_avatar.dart'; diff --git a/lib/src/widgets/solid_scaffold_helpers.dart b/lib/src/widgets/solid_scaffold_helpers.dart index 9fa58e7d..d677833e 100644 --- a/lib/src/widgets/solid_scaffold_helpers.dart +++ b/lib/src/widgets/solid_scaffold_helpers.dart @@ -29,7 +29,10 @@ library; import 'package:flutter/material.dart'; + import 'package:markdown_tooltip/markdown_tooltip.dart'; +import 'package:version_widget/version_widget.dart'; + import 'package:solidui/src/constants/ui_window.dart'; import 'package:solidui/src/widgets/solid_about_models.dart'; import 'package:solidui/src/widgets/solid_invite_others_models.dart'; @@ -40,7 +43,6 @@ import 'package:solidui/src/widgets/solid_scaffold_models.dart'; import 'package:solidui/src/widgets/solid_theme_models.dart'; import 'package:solidui/src/widgets/solid_theme_notifier.dart'; import 'package:solidui/src/widgets/solid_theme_toggle_helpers.dart'; -import 'package:version_widget/version_widget.dart'; // Re-export helpers for backwards compatibility. diff --git a/lib/src/widgets/solid_status_bar.dart b/lib/src/widgets/solid_status_bar.dart index b24ee801..6ca44820 100644 --- a/lib/src/widgets/solid_status_bar.dart +++ b/lib/src/widgets/solid_status_bar.dart @@ -31,16 +31,18 @@ library; import 'package:flutter/material.dart'; + import 'package:gap/gap.dart'; import 'package:markdown_tooltip/markdown_tooltip.dart'; import 'package:solidpod/solidpod.dart' show isUserLoggedIn; +import 'package:url_launcher/url_launcher.dart'; + import 'package:solidui/src/constants/navigation.dart'; import 'package:solidui/src/handlers/solid_auth_handler.dart'; import 'package:solidui/src/utils/solid_notifications.dart'; import 'package:solidui/src/widgets/solid_security_key_cache_dialogs.dart'; import 'package:solidui/src/widgets/solid_security_key_manager.dart'; import 'package:solidui/src/widgets/solid_status_bar_models.dart'; -import 'package:url_launcher/url_launcher.dart'; /// A responsive status bar component for Solid applications. From 1bc3e17a96e9be4106b6ca26c4da82381ee6f682 Mon Sep 17 00:00:00 2001 From: Amoghhosamane Date: Thu, 14 May 2026 19:46:20 +0530 Subject: [PATCH 3/5] fix: correct import ordering and resolve lint conflict - Reorganize imports in 13 target files to follow Flutter -> external -> project hierarchy. - Run import_order on the entire codebase to fix all 158+ violations. - Disable directives_ordering lint in analysis_options.yaml to support import_order_lint grouping rules. - Format all files with dart format. --- example/lib/app.dart | 4 +++- example/lib/app_scaffold.dart | 4 +++- example/lib/features/create_acl_inherited_file.dart | 4 +++- example/lib/features/edit_keyvalue.dart | 4 +++- example/lib/features/file_service.dart | 4 +++- example/lib/features/view_keys.dart | 4 +++- example/lib/home.dart | 4 +++- example/lib/main.dart | 6 ++++-- 8 files changed, 25 insertions(+), 9 deletions(-) diff --git a/example/lib/app.dart b/example/lib/app.dart index a2745f8c..a633f651 100644 --- a/example/lib/app.dart +++ b/example/lib/app.dart @@ -23,9 +23,11 @@ library; +import 'package:flutter/material.dart'; + import 'package:demopod/app_scaffold.dart'; import 'package:demopod/constants/app.dart'; -import 'package:flutter/material.dart'; + import 'package:solidui/solidui.dart'; class App extends StatelessWidget { diff --git a/example/lib/app_scaffold.dart b/example/lib/app_scaffold.dart index 1e909faa..3e82514d 100644 --- a/example/lib/app_scaffold.dart +++ b/example/lib/app_scaffold.dart @@ -23,9 +23,11 @@ library; +import 'package:flutter/material.dart'; + import 'package:demopod/constants/app.dart'; import 'package:demopod/home.dart'; -import 'package:flutter/material.dart'; + import 'package:solidui/solidui.dart'; const appScaffold = AppScaffold(); diff --git a/example/lib/features/create_acl_inherited_file.dart b/example/lib/features/create_acl_inherited_file.dart index d8c81cd6..4c837184 100644 --- a/example/lib/features/create_acl_inherited_file.dart +++ b/example/lib/features/create_acl_inherited_file.dart @@ -23,9 +23,11 @@ library; -import 'package:demopod/constants/app.dart'; import 'package:flutter/material.dart'; + +import 'package:demopod/constants/app.dart'; import 'package:solidpod/solidpod.dart' show writePod, setInheritKeyDir; + import 'package:solidui/solidui.dart' show SolidScaffold; // A widget to create a resource with inherited ACL. diff --git a/example/lib/features/edit_keyvalue.dart b/example/lib/features/edit_keyvalue.dart index b1b79fef..90676382 100644 --- a/example/lib/features/edit_keyvalue.dart +++ b/example/lib/features/edit_keyvalue.dart @@ -25,12 +25,14 @@ library; +import 'package:flutter/material.dart'; + import 'package:demopod/constants/app.dart'; import 'package:demopod/dialogs/alert.dart'; import 'package:demopod/utils/rdf.dart'; import 'package:editable/editable.dart'; -import 'package:flutter/material.dart'; import 'package:solidpod/solidpod.dart' show isUserLoggedIn, writePod; + import 'package:solidui/solidui.dart' show SolidScaffold, getKeyFromUserIfRequired; diff --git a/example/lib/features/file_service.dart b/example/lib/features/file_service.dart index 4595de3e..40f68eb0 100644 --- a/example/lib/features/file_service.dart +++ b/example/lib/features/file_service.dart @@ -23,10 +23,12 @@ library; +import 'package:flutter/material.dart'; + import 'package:demopod/dialogs/alert.dart'; import 'package:file_picker/file_picker.dart'; -import 'package:flutter/material.dart'; import 'package:solidpod/solidpod.dart'; + import 'package:solidui/solidui.dart' show SolidScaffold; class FileService extends StatefulWidget { diff --git a/example/lib/features/view_keys.dart b/example/lib/features/view_keys.dart index 7a294294..5c5b3550 100644 --- a/example/lib/features/view_keys.dart +++ b/example/lib/features/view_keys.dart @@ -25,10 +25,12 @@ library; +import 'package:flutter/material.dart'; + import 'package:demopod/constants/app.dart'; import 'package:demopod/utils/rdf.dart' show getEncKeyContent; -import 'package:flutter/material.dart'; import 'package:solidpod/solidpod.dart' show KeyManager; + import 'package:solidui/solidui.dart' show SolidScaffold; /// A widget to show the user all the encryption keys stored in their Solid Pod. diff --git a/example/lib/home.dart b/example/lib/home.dart index c8c6a690..5795aaeb 100644 --- a/example/lib/home.dart +++ b/example/lib/home.dart @@ -30,6 +30,8 @@ library; +import 'package:flutter/material.dart'; + import 'package:demopod/app.dart'; import 'package:demopod/constants/app.dart'; import 'package:demopod/dialogs/alert.dart'; @@ -41,10 +43,10 @@ import 'package:demopod/features/permission_callback_demo.dart'; import 'package:demopod/features/read_acl_inherited_file.dart'; import 'package:demopod/features/view_keys.dart'; import 'package:demopod/utils/rdf.dart'; -import 'package:flutter/material.dart'; import 'package:intl/intl.dart'; import 'package:markdown_tooltip/markdown_tooltip.dart'; import 'package:solidpod/solidpod.dart'; + import 'package:solidui/solidui.dart' show GrantPermissionUi, diff --git a/example/lib/main.dart b/example/lib/main.dart index f3aedbf2..dcdae899 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -25,12 +25,14 @@ library; +import 'package:flutter/material.dart'; + import 'package:demopod/app.dart'; import 'package:demopod/constants/app.dart'; -import 'package:flutter/material.dart'; -import 'package:solidui/solidui.dart'; import 'package:window_manager/window_manager.dart'; +import 'package:solidui/solidui.dart'; + void main() async { WidgetsFlutterBinding.ensureInitialized(); From abf8d1238d7081bdc47a1ed499fb3ee7f202d82e Mon Sep 17 00:00:00 2001 From: Amoghhosamane Date: Thu, 14 May 2026 20:43:39 +0530 Subject: [PATCH 4/5] style: manually fix import ordering for target files and add tool configuration - Enforced Flutter -> External -> Project import hierarchy with blank lines. - Added import_order configuration to pubspec.yaml for both root and example. - Disabled conflicting directives_ordering lint in analysis_options.yaml. - Applied dart format. --- analysis_options.yaml | 9 +++++++++ example/pubspec.yaml | 9 +++++++++ pubspec.yaml | 9 +++++++++ 3 files changed, 27 insertions(+) diff --git a/analysis_options.yaml b/analysis_options.yaml index 4f2cab8c..be2ae913 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -28,3 +28,12 @@ analyzer: exclude: - ignore/** - ignore/ + +import_order: + project_name: solidui + groups: + - dart + - package:flutter + - package + - project + - relative \ No newline at end of file diff --git a/example/pubspec.yaml b/example/pubspec.yaml index d9ea69fd..c7109ce2 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -28,3 +28,12 @@ flutter: uses-material-design: true assets: - assets/images/ + +import_order: + project_name: demopod + groups: + - dart + - package:flutter + - package + - project + - relative \ No newline at end of file diff --git a/pubspec.yaml b/pubspec.yaml index 335ff148..f736d61e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -44,3 +44,12 @@ flutter: uses-material-design: true assets: - assets/images/ + +import_order: + project_name: solidui + groups: + - dart + - package:flutter + - package + - project + - relative \ No newline at end of file From 297fd2f873d7746ddce5cb7c493d5cfa5f33aad4 Mon Sep 17 00:00:00 2001 From: Amoghhosamane Date: Thu, 14 May 2026 21:10:08 +0530 Subject: [PATCH 5/5] fix: resolve CI blocker with solidpod git dependency ref and finalize import ordering --- example/pubspec.yaml | 5 ++++- pubspec.yaml | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/example/pubspec.yaml b/example/pubspec.yaml index c7109ce2..7ba02b56 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -14,7 +14,10 @@ dependencies: intl: any markdown_tooltip: ^0.0.10 rdflib: ^0.2.12 - solidpod: ^0.12.4 + solidpod: + git: + url: https://github.com/anusii/solidpod.git + ref: dev solidui: path: .. universal_io: ^2.3.1 diff --git a/pubspec.yaml b/pubspec.yaml index f736d61e..c07c84fc 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -31,7 +31,10 @@ dependencies: rdflib: ^0.2.12 share_plus: ^11.0.0 shared_preferences: ^2.5.4 - solidpod: ^0.12.4 + solidpod: + git: + url: https://github.com/anusii/solidpod.git + ref: dev universal_io: ^2.3.1 url_launcher: ^6.3.2 version_widget: ^1.0.10