diff --git a/lib/app.dart b/lib/app.dart index 456631ed..059f7461 100644 --- a/lib/app.dart +++ b/lib/app.dart @@ -1,9 +1,9 @@ -import "package:flutter/material.dart"; import "package:gitdone/core/models/token_handler.dart"; import "package:gitdone/core/theme/app_color.dart"; import "package:gitdone/core/utils/navigation.dart"; import "package:gitdone/ui/main_screen.dart"; import "package:gitdone/ui/welcome/welcome_view.dart"; +import "package:material_ui/material_ui.dart"; /// The main entry point of the GitDone application. class App extends StatelessWidget { diff --git a/lib/core/models/token_handler.dart b/lib/core/models/token_handler.dart index b955153d..dda544cf 100644 --- a/lib/core/models/token_handler.dart +++ b/lib/core/models/token_handler.dart @@ -1,7 +1,7 @@ -import "package:flutter/material.dart"; import "package:flutter_secure_storage/flutter_secure_storage.dart"; import "package:gitdone/core/utils/navigation.dart"; import "package:gitdone/ui/welcome/welcome_view.dart"; +import "package:material_ui/material_ui.dart"; /// A class to handle token storage and retrieval using Flutter Secure Storage. class TokenHandler { diff --git a/lib/core/theme/app_color.dart b/lib/core/theme/app_color.dart index b814f4ac..05e05874 100644 --- a/lib/core/theme/app_color.dart +++ b/lib/core/theme/app_color.dart @@ -1,4 +1,4 @@ -import "package:flutter/material.dart"; +import "package:material_ui/material_ui.dart"; /// A class that defines the color scheme for the application. class AppColor { diff --git a/lib/core/utils/navigation.dart b/lib/core/utils/navigation.dart index 3076c5fd..7a1f84c4 100644 --- a/lib/core/utils/navigation.dart +++ b/lib/core/utils/navigation.dart @@ -1,4 +1,4 @@ -import "package:flutter/material.dart"; +import "package:material_ui/material_ui.dart"; /// Singleton class for navigation throughout the app lifecycle. class Navigation { diff --git a/lib/core/utils/snack_bar.dart b/lib/core/utils/snack_bar.dart index ea51b738..04445bf5 100644 --- a/lib/core/utils/snack_bar.dart +++ b/lib/core/utils/snack_bar.dart @@ -1,4 +1,4 @@ -import "package:flutter/material.dart"; +import "package:material_ui/material_ui.dart"; /// Utility class for showing Snack bars safely. class SnackBarUtils { diff --git a/lib/main.dart b/lib/main.dart index 936c2886..43cbe807 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,7 +1,7 @@ -import "package:flutter/material.dart"; import "package:gitdone/app.dart"; import "package:gitdone/app_environment.dart"; import "package:gitdone/core/settings_handler.dart"; +import "package:material_ui/material_ui.dart"; Future main() async { WidgetsFlutterBinding.ensureInitialized(); diff --git a/lib/ui/_widgets/app_bar.dart b/lib/ui/_widgets/app_bar.dart index 517aa5fd..29e67666 100644 --- a/lib/ui/_widgets/app_bar.dart +++ b/lib/ui/_widgets/app_bar.dart @@ -1,8 +1,8 @@ import "package:flutter/foundation.dart"; -import "package:flutter/material.dart"; import "package:gitdone/core/theme/app_color.dart"; import "package:gitdone/core/utils/navigation.dart"; import "package:gitdone/ui/_widgets/app_title.dart"; +import "package:material_ui/material_ui.dart"; /// A normal app bar that is used in most of the views. class NormalAppBar extends StatelessWidget implements PreferredSizeWidget { diff --git a/lib/ui/_widgets/app_title.dart b/lib/ui/_widgets/app_title.dart index 95985ede..88c1e2da 100644 --- a/lib/ui/_widgets/app_title.dart +++ b/lib/ui/_widgets/app_title.dart @@ -1,6 +1,6 @@ import "package:flutter/foundation.dart"; -import "package:flutter/material.dart"; import "package:gitdone/core/theme/app_color.dart"; +import "package:material_ui/material_ui.dart"; /// A widget that displays the application title with a specific font size. class AppTitleWidget extends StatelessWidget { diff --git a/lib/ui/_widgets/confirm_dialog.dart b/lib/ui/_widgets/confirm_dialog.dart index 33412701..b7d350ae 100644 --- a/lib/ui/_widgets/confirm_dialog.dart +++ b/lib/ui/_widgets/confirm_dialog.dart @@ -1,5 +1,5 @@ -import "package:flutter/material.dart"; import "package:gitdone/core/utils/navigation.dart"; +import "package:material_ui/material_ui.dart"; /// A dialog that asks the user to confirm an action. class ConfirmDialog extends StatelessWidget { diff --git a/lib/ui/_widgets/filter_chip/filter_chip_dropdown.dart b/lib/ui/_widgets/filter_chip/filter_chip_dropdown.dart index 794b8315..9799cfb0 100644 --- a/lib/ui/_widgets/filter_chip/filter_chip_dropdown.dart +++ b/lib/ui/_widgets/filter_chip/filter_chip_dropdown.dart @@ -1,7 +1,7 @@ import "package:flutter/foundation.dart"; -import "package:flutter/material.dart"; import "package:gitdone/ui/_widgets/filter_chip/filter_chip_dropdown_view_model.dart"; import "package:gitdone/ui/_widgets/filter_chip/filter_chip_item.dart"; +import "package:material_ui/material_ui.dart"; import "package:provider/provider.dart"; /// A dropdown widget that displays a list of filter chips for selection. diff --git a/lib/ui/_widgets/filter_chip/filter_chip_dropdown_view_model.dart b/lib/ui/_widgets/filter_chip/filter_chip_dropdown_view_model.dart index 3c7e6ef3..cb7dfa11 100644 --- a/lib/ui/_widgets/filter_chip/filter_chip_dropdown_view_model.dart +++ b/lib/ui/_widgets/filter_chip/filter_chip_dropdown_view_model.dart @@ -1,5 +1,5 @@ -import "package:flutter/material.dart"; import "package:gitdone/ui/_widgets/filter_chip/filter_chip_item.dart"; +import "package:material_ui/material_ui.dart"; /// A ViewModel for managing the state of a filter chip dropdown widget. class FilterChipDropdownViewModel extends ChangeNotifier { diff --git a/lib/ui/_widgets/mark_task_confirmation_dialog.dart b/lib/ui/_widgets/mark_task_confirmation_dialog.dart index 62efbfb7..59747616 100644 --- a/lib/ui/_widgets/mark_task_confirmation_dialog.dart +++ b/lib/ui/_widgets/mark_task_confirmation_dialog.dart @@ -1,7 +1,7 @@ -import "package:flutter/material.dart"; import "package:gitdone/core/settings_handler.dart"; import "package:gitdone/core/task_handler.dart"; import "package:gitdone/ui/_widgets/confirm_dialog.dart"; +import "package:material_ui/material_ui.dart"; /// Shows a confirmation dialog for marking a task as done or open. /// diff --git a/lib/ui/_widgets/octo_cat.dart b/lib/ui/_widgets/octo_cat.dart index 0ff96fef..7dc5cd38 100644 --- a/lib/ui/_widgets/octo_cat.dart +++ b/lib/ui/_widgets/octo_cat.dart @@ -1,7 +1,7 @@ -import "package:flutter/material.dart"; import "package:gitdone/core/github_api_handler.dart"; import "package:gitdone/core/models/token_handler.dart"; import "package:http/http.dart"; +import "package:material_ui/material_ui.dart"; import "package:provider/provider.dart"; /// A widget that fetches and displays the octocat from the GitHub API. diff --git a/lib/ui/_widgets/page_title.dart b/lib/ui/_widgets/page_title.dart index de56e7ba..8442a30c 100644 --- a/lib/ui/_widgets/page_title.dart +++ b/lib/ui/_widgets/page_title.dart @@ -1,6 +1,6 @@ import "package:flutter/foundation.dart"; -import "package:flutter/material.dart"; import "package:gitdone/core/theme/app_color.dart"; +import "package:material_ui/material_ui.dart"; /// A widget that displays a page title with a specific style. class PageTitleWidget extends StatelessWidget { diff --git a/lib/ui/_widgets/task_card.dart b/lib/ui/_widgets/task_card.dart index f73a9ca2..05aec9c9 100644 --- a/lib/ui/_widgets/task_card.dart +++ b/lib/ui/_widgets/task_card.dart @@ -1,10 +1,10 @@ import "package:flutter/foundation.dart"; -import "package:flutter/material.dart"; import "package:gitdone/core/models/task.dart"; import "package:gitdone/core/theme/app_color.dart"; import "package:gitdone/core/utils/navigation.dart"; import "package:gitdone/ui/_widgets/task_labels.dart"; import "package:gitdone/ui/task_details/task_details_view.dart"; +import "package:material_ui/material_ui.dart"; /// A widget that displays a card for a task item. class TaskCard extends StatefulWidget { diff --git a/lib/ui/_widgets/task_labels.dart b/lib/ui/_widgets/task_labels.dart index 8262b889..1962421d 100644 --- a/lib/ui/_widgets/task_labels.dart +++ b/lib/ui/_widgets/task_labels.dart @@ -1,7 +1,7 @@ -import "package:flutter/material.dart"; import "package:gitdone/core/models/task.dart"; import "package:gitdone/core/theme/app_color.dart"; import "package:github_flutter/github.dart"; +import "package:material_ui/material_ui.dart"; /// A widget that displays the labels of a to do item. class TaskLabels extends StatelessWidget { diff --git a/lib/ui/_widgets/text_link.dart b/lib/ui/_widgets/text_link.dart index 4a992f88..b63c0a14 100644 --- a/lib/ui/_widgets/text_link.dart +++ b/lib/ui/_widgets/text_link.dart @@ -1,6 +1,6 @@ import "package:flutter/gestures.dart"; -import "package:flutter/material.dart"; import "package:gitdone/core/theme/app_color.dart"; +import "package:material_ui/material_ui.dart"; import "package:url_launcher/url_launcher.dart"; /// A widget that displays a clickable text link. diff --git a/lib/ui/login/oauth/login_oauth_screen.dart b/lib/ui/login/oauth/login_oauth_screen.dart index 47651f66..68965ed8 100644 --- a/lib/ui/login/oauth/login_oauth_screen.dart +++ b/lib/ui/login/oauth/login_oauth_screen.dart @@ -1,6 +1,6 @@ -import "package:flutter/material.dart"; import "package:gitdone/ui/login/oauth/login_oauth_view.dart"; import "package:gitdone/ui/login/oauth/login_oauth_view_model.dart"; +import "package:material_ui/material_ui.dart"; import "package:provider/provider.dart"; /// A screen for logging in with GitHub OAuth. diff --git a/lib/ui/login/oauth/login_oauth_view.dart b/lib/ui/login/oauth/login_oauth_view.dart index 41a398f4..1efab148 100644 --- a/lib/ui/login/oauth/login_oauth_view.dart +++ b/lib/ui/login/oauth/login_oauth_view.dart @@ -1,7 +1,7 @@ -import "package:flutter/material.dart"; import "package:gitdone/ui/_widgets/app_bar.dart"; import "package:gitdone/ui/_widgets/page_title.dart"; import "package:gitdone/ui/login/oauth/login_oauth_view_model.dart"; +import "package:material_ui/material_ui.dart"; import "package:provider/provider.dart"; /// A view for logging in with GitHub OAuth. diff --git a/lib/ui/login/oauth/login_oauth_view_model.dart b/lib/ui/login/oauth/login_oauth_view_model.dart index 8e0823fe..7194092e 100644 --- a/lib/ui/login/oauth/login_oauth_view_model.dart +++ b/lib/ui/login/oauth/login_oauth_view_model.dart @@ -1,9 +1,9 @@ -import "package:flutter/material.dart"; import "package:gitdone/core/exceptions/oauth_exception.dart"; import "package:gitdone/core/models/github_oauth_model.dart"; import "package:gitdone/core/utils/logger.dart"; import "package:gitdone/core/utils/navigation.dart"; import "package:gitdone/ui/main_screen.dart"; +import "package:material_ui/material_ui.dart"; /// ViewModel for managing the login process using GitHub OAuth. class LoginGithubViewModel extends ChangeNotifier { diff --git a/lib/ui/login/token/login_token_view.dart b/lib/ui/login/token/login_token_view.dart index f9ddbda2..97a09a66 100644 --- a/lib/ui/login/token/login_token_view.dart +++ b/lib/ui/login/token/login_token_view.dart @@ -1,9 +1,9 @@ -import "package:flutter/material.dart"; import "package:gitdone/ui/_widgets/app_bar.dart"; import "package:gitdone/ui/_widgets/page_title.dart"; import "package:gitdone/ui/_widgets/text_link.dart"; import "package:gitdone/ui/login/token/widgets/login_token_input.dart"; import "package:gitdone/ui/login/token/widgets/permission_chip.dart"; +import "package:material_ui/material_ui.dart"; /// A view for logging in with a personal access token. class LoginTokenView extends StatefulWidget { diff --git a/lib/ui/login/token/widgets/login_token_input.dart b/lib/ui/login/token/widgets/login_token_input.dart index 238f2923..43203fe5 100644 --- a/lib/ui/login/token/widgets/login_token_input.dart +++ b/lib/ui/login/token/widgets/login_token_input.dart @@ -1,8 +1,8 @@ -import "package:flutter/material.dart"; import "package:gitdone/core/github_api_handler.dart"; import "package:gitdone/core/models/token_handler.dart"; import "package:gitdone/core/utils/navigation.dart"; import "package:gitdone/ui/main_screen.dart"; +import "package:material_ui/material_ui.dart"; /// A widget that provides an input field for the user to enter their GitHub class LoginTokenInput extends StatefulWidget { diff --git a/lib/ui/login/token/widgets/permission_chip.dart b/lib/ui/login/token/widgets/permission_chip.dart index 8365889c..3910828f 100644 --- a/lib/ui/login/token/widgets/permission_chip.dart +++ b/lib/ui/login/token/widgets/permission_chip.dart @@ -1,5 +1,5 @@ import "package:flutter/foundation.dart"; -import "package:flutter/material.dart"; +import "package:material_ui/material_ui.dart"; /// A widget that represents a permission chip. class PermissionChip extends StatelessWidget { diff --git a/lib/ui/main_screen.dart b/lib/ui/main_screen.dart index e8d69a8b..16fc90e4 100644 --- a/lib/ui/main_screen.dart +++ b/lib/ui/main_screen.dart @@ -1,7 +1,7 @@ -import "package:flutter/material.dart"; import "package:gitdone/ui/_widgets/app_bar.dart"; import "package:gitdone/ui/settings/settings_view.dart"; import "package:gitdone/ui/task_list/task_list_view.dart"; +import "package:material_ui/material_ui.dart"; import "package:provider/provider.dart"; /// The main screen of the app, which contains the home view and settings view. diff --git a/lib/ui/settings/settings_view.dart b/lib/ui/settings/settings_view.dart index b7337c52..d5ef4c80 100644 --- a/lib/ui/settings/settings_view.dart +++ b/lib/ui/settings/settings_view.dart @@ -1,10 +1,10 @@ -import "package:flutter/material.dart"; import "package:gitdone/app_environment.dart"; import "package:gitdone/ui/_widgets/page_title.dart"; import "package:gitdone/ui/settings/widgets/account_management.dart"; import "package:gitdone/ui/settings/widgets/general_settings.dart"; import "package:gitdone/ui/settings/widgets/import_export/import_export_settings.dart"; import "package:gitdone/ui/settings/widgets/repository_selector/repository_selector_view.dart"; +import "package:material_ui/material_ui.dart"; /// A view that displays settings and allows users to manage their account and repository preferences. class SettingsView extends StatelessWidget { diff --git a/lib/ui/settings/widgets/account_management.dart b/lib/ui/settings/widgets/account_management.dart index 631dfdcd..2e963087 100644 --- a/lib/ui/settings/widgets/account_management.dart +++ b/lib/ui/settings/widgets/account_management.dart @@ -1,7 +1,7 @@ -import "package:flutter/material.dart"; import "package:gitdone/core/models/current_user_model.dart"; import "package:gitdone/core/models/token_handler.dart"; import "package:github_flutter/github.dart"; +import "package:material_ui/material_ui.dart"; import "package:provider/provider.dart"; import "package:url_launcher/url_launcher.dart"; diff --git a/lib/ui/settings/widgets/confirm_task_status_change_setting.dart b/lib/ui/settings/widgets/confirm_task_status_change_setting.dart index 01c88cef..fb445fa3 100644 --- a/lib/ui/settings/widgets/confirm_task_status_change_setting.dart +++ b/lib/ui/settings/widgets/confirm_task_status_change_setting.dart @@ -1,5 +1,5 @@ -import "package:flutter/material.dart"; import "package:gitdone/core/settings_handler.dart"; +import "package:material_ui/material_ui.dart"; /// A setting widget that allows users to toggle the confirmation dialog for task status changes. class ConfirmTaskStatusChangeSetting extends StatelessWidget { diff --git a/lib/ui/settings/widgets/general_settings.dart b/lib/ui/settings/widgets/general_settings.dart index d303d3a1..f578bda2 100644 --- a/lib/ui/settings/widgets/general_settings.dart +++ b/lib/ui/settings/widgets/general_settings.dart @@ -1,5 +1,5 @@ -import "package:flutter/material.dart"; import "package:gitdone/ui/settings/widgets/confirm_task_status_change_setting.dart"; +import "package:material_ui/material_ui.dart"; /// A widget that allows users to manage general application settings. class GeneralSettings extends StatelessWidget { diff --git a/lib/ui/settings/widgets/import_export/import_export_settings.dart b/lib/ui/settings/widgets/import_export/import_export_settings.dart index 0afb3ca2..8fe53815 100644 --- a/lib/ui/settings/widgets/import_export/import_export_settings.dart +++ b/lib/ui/settings/widgets/import_export/import_export_settings.dart @@ -1,6 +1,6 @@ -import "package:flutter/material.dart"; import "package:gitdone/core/utils/navigation.dart"; import "package:gitdone/ui/settings/widgets/import_export/import_export_settings_view_model.dart"; +import "package:material_ui/material_ui.dart"; /// A widget that provides buttons to import and export application settings. class ImportExportSettings extends StatelessWidget { diff --git a/lib/ui/settings/widgets/import_export/import_export_settings_view_model.dart b/lib/ui/settings/widgets/import_export/import_export_settings_view_model.dart index 10dc7c17..8587a795 100644 --- a/lib/ui/settings/widgets/import_export/import_export_settings_view_model.dart +++ b/lib/ui/settings/widgets/import_export/import_export_settings_view_model.dart @@ -1,7 +1,7 @@ -import "package:flutter/material.dart"; import "package:flutter/services.dart"; import "package:gitdone/core/settings_handler.dart"; import "package:gitdone/core/utils/snack_bar.dart"; +import "package:material_ui/material_ui.dart"; /// ViewModel for importing and exporting settings. class ImportExportSettingsViewModel extends ChangeNotifier { diff --git a/lib/ui/settings/widgets/repository_selector/repository_selector_model.dart b/lib/ui/settings/widgets/repository_selector/repository_selector_model.dart index b8a0678c..b2a0c115 100644 --- a/lib/ui/settings/widgets/repository_selector/repository_selector_model.dart +++ b/lib/ui/settings/widgets/repository_selector/repository_selector_model.dart @@ -1,8 +1,8 @@ -import "package:flutter/material.dart"; import "package:gitdone/core/models/github_model.dart"; import "package:gitdone/core/models/repository_details.dart"; import "package:gitdone/core/settings_handler.dart"; import "package:gitdone/core/utils/logger.dart"; +import "package:material_ui/material_ui.dart"; /// Model for managing repository selection in the settings. class RepositorySelectorModel extends ChangeNotifier { diff --git a/lib/ui/settings/widgets/repository_selector/repository_selector_view.dart b/lib/ui/settings/widgets/repository_selector/repository_selector_view.dart index 82964f45..a8c98c2a 100644 --- a/lib/ui/settings/widgets/repository_selector/repository_selector_view.dart +++ b/lib/ui/settings/widgets/repository_selector/repository_selector_view.dart @@ -1,7 +1,7 @@ -import "package:flutter/material.dart"; import "package:gitdone/core/models/repository_details.dart"; import "package:gitdone/core/utils/snack_bar.dart"; import "package:gitdone/ui/settings/widgets/repository_selector/repository_selector_view_model.dart"; +import "package:material_ui/material_ui.dart"; import "package:provider/provider.dart"; /// A widget that allows users to select a repository from a dropdown list. diff --git a/lib/ui/settings/widgets/repository_selector/repository_selector_view_model.dart b/lib/ui/settings/widgets/repository_selector/repository_selector_view_model.dart index 116efe85..06b3f113 100644 --- a/lib/ui/settings/widgets/repository_selector/repository_selector_view_model.dart +++ b/lib/ui/settings/widgets/repository_selector/repository_selector_view_model.dart @@ -1,7 +1,7 @@ -import "package:flutter/material.dart"; import "package:gitdone/core/models/repository_details.dart"; import "package:gitdone/core/task_handler.dart"; import "package:gitdone/ui/settings/widgets/repository_selector/repository_selector_model.dart"; +import "package:material_ui/material_ui.dart"; /// ViewModel for managing the state of the repository selector widget. class RepositorySelectorViewModel extends ChangeNotifier { diff --git a/lib/ui/task_details/_widgets/task_details_floating_action_button.dart b/lib/ui/task_details/_widgets/task_details_floating_action_button.dart index ac5edfdd..f5a64438 100644 --- a/lib/ui/task_details/_widgets/task_details_floating_action_button.dart +++ b/lib/ui/task_details/_widgets/task_details_floating_action_button.dart @@ -1,8 +1,8 @@ import "package:flutter/foundation.dart"; -import "package:flutter/material.dart"; import "package:gitdone/core/task_handler.dart"; import "package:gitdone/ui/_widgets/mark_task_confirmation_dialog.dart"; import "package:gitdone/ui/task_details/task_details_view_model.dart"; +import "package:material_ui/material_ui.dart"; /// Floating action buttons for the task details view. class TaskDetailsFloatingActionButton extends StatelessWidget { diff --git a/lib/ui/task_details/task_details_view.dart b/lib/ui/task_details/task_details_view.dart index 73c9d940..795b9798 100644 --- a/lib/ui/task_details/task_details_view.dart +++ b/lib/ui/task_details/task_details_view.dart @@ -1,5 +1,4 @@ import "package:flutter/foundation.dart"; -import "package:flutter/material.dart"; import "package:gitdone/core/models/task.dart"; import "package:gitdone/core/utils/navigation.dart"; import "package:gitdone/core/utils/snack_bar.dart"; @@ -11,6 +10,7 @@ import "package:gitdone/ui/task_details/_widgets/task_details_floating_action_bu import "package:gitdone/ui/task_details/task_details_view_model.dart"; import "package:intl/intl.dart"; import "package:markdown_widget/markdown_widget.dart"; +import "package:material_ui/material_ui.dart"; import "package:provider/provider.dart"; /// A widget that displays a card for a task item. diff --git a/lib/ui/task_edit/task_edit_view.dart b/lib/ui/task_edit/task_edit_view.dart index 5fc20dde..08f19770 100644 --- a/lib/ui/task_edit/task_edit_view.dart +++ b/lib/ui/task_edit/task_edit_view.dart @@ -1,11 +1,10 @@ import "package:flutter/foundation.dart"; -import "package:flutter/material.dart"; import "package:gitdone/core/models/task.dart"; import "package:gitdone/core/theme/app_color.dart"; import "package:gitdone/ui/_widgets/app_bar.dart"; import "package:gitdone/ui/task_edit/task_edit_view_model.dart"; import "package:github_flutter/github.dart"; -import "package:material_ui/material_ui.dart" as mui; +import "package:material_ui/material_ui.dart"; import "package:multi_dropdown/multi_dropdown.dart"; import "package:provider/provider.dart"; @@ -104,11 +103,11 @@ class _TaskEditViewState extends State { fieldDecoration: FieldDecoration( labelText: "Labels", showClearIcon: false, - border: mui.OutlineInputBorder( - borderSide: mui.BorderSide(color: AppColor.colorScheme.onSurface), + border: OutlineInputBorder( + borderSide: BorderSide(color: AppColor.colorScheme.onSurface), ), - focusedBorder: mui.OutlineInputBorder( - borderSide: mui.BorderSide(color: AppColor.colorScheme.primary), + focusedBorder: OutlineInputBorder( + borderSide: BorderSide(color: AppColor.colorScheme.primary), ), ), dropdownDecoration: DropdownDecoration( diff --git a/lib/ui/task_edit/task_edit_view_model.dart b/lib/ui/task_edit/task_edit_view_model.dart index 0ae81288..f2e62519 100644 --- a/lib/ui/task_edit/task_edit_view_model.dart +++ b/lib/ui/task_edit/task_edit_view_model.dart @@ -1,4 +1,4 @@ -import "package:flutter/cupertino.dart"; +import "package:cupertino_ui/cupertino_ui.dart"; import "package:gitdone/core/models/task.dart"; import "package:gitdone/core/task_handler.dart"; import "package:gitdone/core/utils/logger.dart"; diff --git a/lib/ui/task_list/_widgets/task_list_item.dart b/lib/ui/task_list/_widgets/task_list_item.dart index b3b813c7..f56b543a 100644 --- a/lib/ui/task_list/_widgets/task_list_item.dart +++ b/lib/ui/task_list/_widgets/task_list_item.dart @@ -1,10 +1,10 @@ import "package:flutter/foundation.dart"; -import "package:flutter/material.dart"; import "package:gitdone/core/models/task.dart"; import "package:gitdone/core/task_handler.dart"; import "package:gitdone/core/theme/app_color.dart"; import "package:gitdone/ui/_widgets/mark_task_confirmation_dialog.dart"; import "package:gitdone/ui/_widgets/task_card.dart"; +import "package:material_ui/material_ui.dart"; /// A widget that displays a single task item in the task list with swipe-to-dismiss functionality. class TaskListItem extends StatelessWidget { diff --git a/lib/ui/task_list/task_list_view.dart b/lib/ui/task_list/task_list_view.dart index a1efdac8..776b91ab 100644 --- a/lib/ui/task_list/task_list_view.dart +++ b/lib/ui/task_list/task_list_view.dart @@ -1,8 +1,8 @@ -import "package:flutter/material.dart"; import "package:gitdone/ui/_widgets/filter_chip/filter_chip_dropdown.dart"; import "package:gitdone/ui/_widgets/filter_chip/filter_chip_item.dart"; import "package:gitdone/ui/task_list/_widgets/task_list_item.dart"; import "package:gitdone/ui/task_list/task_list_view_model.dart"; +import "package:material_ui/material_ui.dart"; import "package:provider/provider.dart"; /// A widget that displays a list of task items with search and filter options. diff --git a/lib/ui/task_list/task_list_view_model.dart b/lib/ui/task_list/task_list_view_model.dart index 2efdbf99..e75d2fdf 100644 --- a/lib/ui/task_list/task_list_view_model.dart +++ b/lib/ui/task_list/task_list_view_model.dart @@ -1,4 +1,3 @@ -import "package:flutter/material.dart"; import "package:gitdone/core/models/repository_details.dart"; import "package:gitdone/core/models/task.dart"; import "package:gitdone/core/settings_handler.dart"; @@ -9,6 +8,7 @@ import "package:gitdone/ui/_widgets/filter_chip/filter_chip_item.dart"; import "package:gitdone/ui/task_details/task_details_view.dart"; import "package:gitdone/ui/task_edit/task_edit_view.dart"; import "package:github_flutter/github.dart"; +import "package:material_ui/material_ui.dart"; /// ViewModel for the Home View. class TaskListViewModel extends ChangeNotifier { diff --git a/lib/ui/welcome/welcome_view.dart b/lib/ui/welcome/welcome_view.dart index c774e53f..fb8b41f4 100644 --- a/lib/ui/welcome/welcome_view.dart +++ b/lib/ui/welcome/welcome_view.dart @@ -1,10 +1,10 @@ -import "package:flutter/material.dart"; import "package:flutter_svg/svg.dart"; import "package:gitdone/app_environment.dart"; import "package:gitdone/core/utils/navigation.dart"; import "package:gitdone/ui/_widgets/app_title.dart"; import "package:gitdone/ui/login/oauth/login_oauth_screen.dart"; import "package:gitdone/ui/login/token/login_token_view.dart"; +import "package:material_ui/material_ui.dart"; /// A view that displays the welcome screen of the application. class WelcomeView extends StatefulWidget { diff --git a/mise.toml b/mise.toml index be7bb3b3..84392358 100644 --- a/mise.toml +++ b/mise.toml @@ -1,3 +1,3 @@ [tools] -flutter = "3.47.9" +flutter = "3.50.0" node = "26.13.1" diff --git a/pubspec.lock b/pubspec.lock index 715be6e5..88cf6263 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -82,7 +82,7 @@ packages: source: hosted version: "2.0.0" cupertino_ui: - dependency: transitive + dependency: "direct main" description: name: cupertino_ui sha256: "369e39a1c5c030a6212589c3da1809920b1c2cfade7b02aade7695bfa4b88c3a" @@ -437,6 +437,14 @@ packages: url: "https://pub.dev" source: hosted version: "6.1.0" + listen: + dependency: transitive + description: + name: listen + sha256: "47501a08016a43fcad79252439d723f50f14f88fa7bfd8a177e0a417e5c9e1f2" + url: "https://pub.dev" + source: hosted + version: "1.0.1" logging: dependency: transitive description: @@ -790,10 +798,10 @@ packages: dependency: transitive description: name: test_api - sha256: "2a122cbe059f8b610d3a5415f42e255b6c17b1f21eee1d960f31080237fb4f11" + sha256: "0a10344e901e5b2e63819567951cb6a06673ed6b84f40462188ff5a0c41f371f" url: "https://pub.dev" source: hosted - version: "0.7.12" + version: "0.7.14" typed_data: dependency: transitive description: @@ -987,5 +995,5 @@ packages: source: hosted version: "3.1.4" sdks: - dart: "3.13.7" - flutter: "3.47.9" + dart: "3.14.0" + flutter: "3.50.0" diff --git a/pubspec.yaml b/pubspec.yaml index 47e32cda..22c41875 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -19,8 +19,8 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev version: 1.0.0-alpha.2 environment: - sdk: 3.13.7 - flutter: 3.47.9 + sdk: 3.14.0 + flutter: 3.50.0 # Dependencies specify other packages that your package needs in order to work. # To automatically upgrade your package dependencies to the latest versions @@ -49,6 +49,7 @@ dependencies: multi_dropdown: 4.0.0 material_ui: 1.11.0 github_flutter: 0.0.1 + cupertino_ui: 1.1.6 dev_dependencies: flutter_test: