From c3b8a352539b38af6cc09fe2741e685dfe63ce4f Mon Sep 17 00:00:00 2001 From: moesaid Date: Mon, 6 Jan 2025 18:04:42 -0500 Subject: [PATCH 1/5] up to date --- .../Dashboard/dashboard_controller.dart | 3 +- lib/App/Enums/background_enum.dart | 2 - lib/App/Enums/state_manegment_enum.dart | 3 - .../Bloc/file_gen_bloc_counter_case.dart | 6 +- .../Getx/file_gen_getx_counter_case.dart | 6 +- .../Network/Error/sentry_provider.dart | 2 +- .../Cmd/cmd_read_create_dir_services.dart | 2 +- .../Services/Invoice/invoice_services.dart | 2 + lib/App/Views/Global/build_appbar.dart | 6 +- lib/App/Views/Global/build_dialog.dart | 2 +- .../Global/build_full_page_bottomsheet.dart | 2 +- lib/App/Views/Global/build_layout.dart | 14 +- .../Global/build_preeset_gradient_list.dart | 4 +- lib/App/Views/Global/build_rail.dart | 2 +- lib/App/Views/Global/build_search_form.dart | 3 +- lib/App/Views/Global/build_sidebar.dart | 2 +- lib/App/Views/Global/build_slider.dart | 13 +- .../Views/Global/build_windows_buttons.dart | 6 +- .../Auth/setup_local_flutter_path_page.dart | 3 +- .../build_client_create_or_edit_dialog.dart | 45 +- .../Client/Widgets/build_client_list.dart | 10 +- .../Views/Pages/Client/client_index_page.dart | 4 +- .../Widgets/build_dashboard_chart.dart | 2 +- .../Widgets/build_dashboard_env_check.dart | 14 +- .../Widgets/build_dashboard_numbers_item.dart | 8 +- .../build_dashboard_version_display.dart | 28 +- .../Widgets/build_add_customer_buttom.dart | 4 +- .../Widgets/build_invoice_analytics_item.dart | 6 +- .../Invoice/Widgets/build_invoice_body.dart | 12 +- .../Widgets/build_invoice_body_header.dart | 13 +- .../Widgets/build_invoice_company_info.dart | 12 +- .../build_invoice_highlights_item.dart | 2 +- .../Widgets/build_invoice_single_sidebar.dart | 2 +- .../Widgets/build_invoice_status_dialog.dart | 4 +- .../Sidebar/Steps/build_background_step.dart | 10 +- .../Sidebar/Steps/build_device_step.dart | 6 +- .../Create/Sidebar/Steps/build_icon_step.dart | 6 +- .../Sidebar/Steps/build_layout_step.dart | 18 +- .../Sidebar/Steps/build_title_step.dart | 8 +- .../Widgets/build_color_preset_gradient.dart | 4 +- .../Widgets/build_edit_frame_option.dart | 11 +- .../Widgets/build_select_image_option.dart | 8 +- .../Sidebar/build_alignment_option.dart | 33 +- .../Sidebar/build_change_fontfamily.dart | 22 +- .../Create/Sidebar/build_pick_color.dart | 8 +- .../Sidebar/build_slider_enable_option.dart | 6 +- .../build_create_mockup_choose_template.dart | 12 +- .../Create/build_create_mockup_sidebar.dart | 4 +- .../Templates/template_layout_config.dart | 3 - .../Mockup/Widgets/build_device_card.dart | 2 +- .../Pages/Mockup/mockup_create_page.dart | 3 +- .../Views/Pages/Mockup/mockup_index_page.dart | 10 +- .../Pages/Mockup/mockup_single_page.dart | 7 +- .../project_single_api_gen_page.dart | 6 +- .../InnerPages/project_single_wiki_page.dart | 16 +- .../Project/Pages/project_single_page.dart | 4 +- .../Widgets/ApiGen/build_api_gen_node.dart | 12 +- .../build_code_gen_floating_button.dart | 16 +- .../Widgets/CodeGen/build_code_gen_node.dart | 8 +- .../build_project_single_files_list.dart | 2 +- .../build_project_single_files_sidebar.dart | 4 +- ...d_project_single_files_type_with_size.dart | 4 +- .../Widgets/build_create_or_edit_sheet.dart | 4 +- .../Widgets/build_icon_and_gradients.dart | 31 +- .../build_single_project_head_info.dart | 17 +- .../Widgets/build_single_project_header.dart | 4 +- .../build_single_project_parked_at.dart | 2 +- .../build_single_project_tap_header.dart | 2 +- lib/App/Views/Pages/Team/no_team_page.dart | 3 +- lib/Config/app_gradients.dart | 4 +- lib/Config/app_theme.dart | 14 +- lib/Config/themes/main/colors.dart | 8 +- lib/Helpers/colors_helper.dart | 22 +- lib/main.dart | 2 +- pubspec.lock | 469 ++++++++---------- pubspec.yaml | 15 +- 76 files changed, 523 insertions(+), 576 deletions(-) diff --git a/lib/App/Controllers/Dashboard/dashboard_controller.dart b/lib/App/Controllers/Dashboard/dashboard_controller.dart index 65563ef..6f4cec7 100644 --- a/lib/App/Controllers/Dashboard/dashboard_controller.dart +++ b/lib/App/Controllers/Dashboard/dashboard_controller.dart @@ -13,7 +13,6 @@ import 'package:flutterpp/App/Services/Auth/profile_services.dart'; import 'package:flutterpp/App/Services/Client/client_services.dart'; import 'package:flutterpp/App/Services/Invoice/invoice_services.dart'; import 'package:flutterpp/App/Services/Project/project_services.dart'; -import 'package:flutterpp/App/Services/Project/wiki_services.dart'; import 'package:flutterpp/App/Services/Team/team_member_services.dart'; import 'package:flutterpp/App/Services/Team/team_services.dart'; import 'package:flutterpp/App/Views/Global/build_overlay.dart'; @@ -31,7 +30,7 @@ class DashboardController extends GetxController { final _activeProjectStorage = ActiveProjectStorage(); final _teamMemberServices = TeamMemberServices(); final _profileServices = ProfileServices(); - final _wikiServices = WikiServices(); + // final _wikiServices = WikiServices(); final _clientServices = ClientServices(); final _invoiceServices = InvoiceServices(); diff --git a/lib/App/Enums/background_enum.dart b/lib/App/Enums/background_enum.dart index a05dcd6..2ced83d 100644 --- a/lib/App/Enums/background_enum.dart +++ b/lib/App/Enums/background_enum.dart @@ -12,8 +12,6 @@ enum BackgroundEnum { return 'gradient'; case BackgroundEnum.image: return 'image'; - default: - return 'solid'; } } } diff --git a/lib/App/Enums/state_manegment_enum.dart b/lib/App/Enums/state_manegment_enum.dart index fad739f..f8c575f 100644 --- a/lib/App/Enums/state_manegment_enum.dart +++ b/lib/App/Enums/state_manegment_enum.dart @@ -40,9 +40,6 @@ enum StateManegmentEnum { case StateManegmentEnum.cubit: await cubit?.call(); break; - default: - await getx?.call(); - break; } } } diff --git a/lib/App/Providers/FilesGen/Bloc/file_gen_bloc_counter_case.dart b/lib/App/Providers/FilesGen/Bloc/file_gen_bloc_counter_case.dart index 1c8127b..d803c8c 100644 --- a/lib/App/Providers/FilesGen/Bloc/file_gen_bloc_counter_case.dart +++ b/lib/App/Providers/FilesGen/Bloc/file_gen_bloc_counter_case.dart @@ -301,17 +301,17 @@ class FileGenBlocCounterCase { decoration: BoxDecoration( border: Border.all( width: 2, - color: Colors.grey.withOpacity(0.2), + color: Colors.grey.withValues(alpha:0.2), ), shape: BoxShape.circle, - color: Colors.black.withOpacity( + color: Colors.black.withValues(alpha: state / 100, ), boxShadow: [ BoxShadow( blurRadius: 20, spreadRadius: -6, - color: Colors.black.withOpacity( + color: Colors.black.withValues(alpha: state / 100, ), offset: const Offset(0, 10), diff --git a/lib/App/Providers/FilesGen/Getx/file_gen_getx_counter_case.dart b/lib/App/Providers/FilesGen/Getx/file_gen_getx_counter_case.dart index fa4de13..b2c1514 100644 --- a/lib/App/Providers/FilesGen/Getx/file_gen_getx_counter_case.dart +++ b/lib/App/Providers/FilesGen/Getx/file_gen_getx_counter_case.dart @@ -297,17 +297,17 @@ class FileGenGetxCounterCase { decoration: BoxDecoration( border: Border.all( width: 2, - color: Colors.grey.withOpacity(0.2), + color: Colors.grey.withValues(alpha:0.2), ), shape: BoxShape.circle, - color: Colors.black.withOpacity( + color: Colors.black.withValues(alpha: controller.count / 100, ), boxShadow: [ BoxShadow( blurRadius: 20, spreadRadius: -6, - color: Colors.black.withOpacity( + color: Colors.black.withValues(alpha: controller.count / 100, ), offset: const Offset(0, 10), diff --git a/lib/App/Providers/Network/Error/sentry_provider.dart b/lib/App/Providers/Network/Error/sentry_provider.dart index baac8bb..189894b 100644 --- a/lib/App/Providers/Network/Error/sentry_provider.dart +++ b/lib/App/Providers/Network/Error/sentry_provider.dart @@ -19,7 +19,7 @@ class SentryProvider { final entries = feedback?.extra?.entries; if (entries != null) { for (final extra in entries) { - scope.setExtra(extra.key, extra.value); + scope.setContexts(extra.key, extra.value); } } scope.setUser( diff --git a/lib/App/Services/Cmd/cmd_read_create_dir_services.dart b/lib/App/Services/Cmd/cmd_read_create_dir_services.dart index 6b078d3..fba74bc 100644 --- a/lib/App/Services/Cmd/cmd_read_create_dir_services.dart +++ b/lib/App/Services/Cmd/cmd_read_create_dir_services.dart @@ -65,7 +65,7 @@ class CmdReadCreateDirServices { String version, StateManegmentEnum state, ) { - print('❌ state: $state'); + AppPrint.print('❌ state: $state'); return { 'owner': 'FlutterPP', diff --git a/lib/App/Services/Invoice/invoice_services.dart b/lib/App/Services/Invoice/invoice_services.dart index 229fb81..b2bd045 100644 --- a/lib/App/Services/Invoice/invoice_services.dart +++ b/lib/App/Services/Invoice/invoice_services.dart @@ -1,3 +1,5 @@ +// ignore_for_file: depend_on_referenced_packages + import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; import 'package:flutterpp/App/Models/client_model.dart'; diff --git a/lib/App/Views/Global/build_appbar.dart b/lib/App/Views/Global/build_appbar.dart index 1bda8fb..4a9cad4 100644 --- a/lib/App/Views/Global/build_appbar.dart +++ b/lib/App/Views/Global/build_appbar.dart @@ -115,7 +115,7 @@ class BuildLeading extends StatelessWidget { SizedBox( height: preferredSize.height, width: 0, - child: VerticalDivider(color: Colors.grey.withOpacity(0.35)), + child: VerticalDivider(color: Colors.grey.withValues(alpha: 0.35)), ), if (hasBackButton != null && hasBackButton!) InkWell( @@ -124,7 +124,7 @@ class BuildLeading extends StatelessWidget { height: preferredSize.height, width: preferredSize.height, decoration: BoxDecoration( - color: Colors.grey.withOpacity(0.1), + color: Colors.grey.withValues(alpha: 0.1), ), child: Icon( Icons.arrow_back, @@ -137,7 +137,7 @@ class BuildLeading extends StatelessWidget { height: preferredSize.height, width: 0, child: VerticalDivider( - color: Colors.grey.withOpacity(0.35), + color: Colors.grey.withValues(alpha: 0.35), ), ), ], diff --git a/lib/App/Views/Global/build_dialog.dart b/lib/App/Views/Global/build_dialog.dart index afb3ed6..e780731 100644 --- a/lib/App/Views/Global/build_dialog.dart +++ b/lib/App/Views/Global/build_dialog.dart @@ -19,7 +19,7 @@ class BuildDialog extends StatelessWidget { alignment: Alignment.center, children: [ Container( - color: Get.theme.dialogBackgroundColor.withOpacity(0.5), + color: Get.theme.dialogBackgroundColor.withValues(alpha: 0.5), child: GestureDetector( onTap: () => Get.back(), ), diff --git a/lib/App/Views/Global/build_full_page_bottomsheet.dart b/lib/App/Views/Global/build_full_page_bottomsheet.dart index c82b19f..14ecb9f 100644 --- a/lib/App/Views/Global/build_full_page_bottomsheet.dart +++ b/lib/App/Views/Global/build_full_page_bottomsheet.dart @@ -34,7 +34,7 @@ class BuildFullPageBottomSheet extends StatelessWidget { decoration: decoration ?? BoxDecoration( color: bgColor ?? - Get.theme.scaffoldBackgroundColor.withOpacity(0.9), + Get.theme.scaffoldBackgroundColor.withValues(alpha: 0.9), ), child: child ?? Text( diff --git a/lib/App/Views/Global/build_layout.dart b/lib/App/Views/Global/build_layout.dart index b025471..0570a51 100644 --- a/lib/App/Views/Global/build_layout.dart +++ b/lib/App/Views/Global/build_layout.dart @@ -75,15 +75,17 @@ class BuildAppUpdateWidget extends StatelessWidget { return GetBuilder( init: AppUpdateController(), initState: (_) {}, - builder: (_) { - if (_.isLoading || _.currentVersion.isEmpty || _.lastVersion.isEmpty) { + builder: (controller) { + if (controller.isLoading || + controller.currentVersion.isEmpty || + controller.lastVersion.isEmpty) { return const SizedBox.shrink(); } return UpdatWidget( - currentVersion: _.currentVersion, - getLatestVersion: _.getLatestVersion, - getBinaryUrl: _.getBinaryUrl, + currentVersion: controller.currentVersion, + getLatestVersion: controller.getLatestVersion, + getBinaryUrl: controller.getBinaryUrl, appName: "FlutterPP", updateChipBuilder: floatingExtendedChipWithSilentDownload, ); @@ -102,7 +104,7 @@ class BuildLayoutAppbar extends StatelessWidget { height: 28, width: context.width, decoration: BoxDecoration( - color: Get.theme.colorScheme.background.withOpacity(0.2), + color: Get.theme.colorScheme.surface.withValues(alpha: 0.2), border: Border( bottom: BorderSide( width: 1, diff --git a/lib/App/Views/Global/build_preeset_gradient_list.dart b/lib/App/Views/Global/build_preeset_gradient_list.dart index 709259a..977cc56 100644 --- a/lib/App/Views/Global/build_preeset_gradient_list.dart +++ b/lib/App/Views/Global/build_preeset_gradient_list.dart @@ -31,7 +31,7 @@ class BuildPresetGradientList return Scaffold( backgroundColor: - Get.theme.colorScheme.primaryContainer.withOpacity(0.95), + Get.theme.colorScheme.primaryContainer.withValues(alpha: 0.95), body: SizedBox( width: double.infinity, height: double.infinity, @@ -63,7 +63,7 @@ class BuildPresetGradientList borderRadius: BorderRadius.circular(5), border: Border.all( color: Get.theme.colorScheme.onPrimary - .withOpacity(0.1), + .withValues(alpha: 0.1), ), ), child: Column( diff --git a/lib/App/Views/Global/build_rail.dart b/lib/App/Views/Global/build_rail.dart index 816939f..afedf27 100644 --- a/lib/App/Views/Global/build_rail.dart +++ b/lib/App/Views/Global/build_rail.dart @@ -22,7 +22,7 @@ class BuildRail extends StatelessWidget { return Container( width: AppConfig.rail, decoration: BoxDecoration( - color: Get.theme.colorScheme.background, + color: Get.theme.colorScheme.surface, border: Border( right: BorderSide( width: 1, diff --git a/lib/App/Views/Global/build_search_form.dart b/lib/App/Views/Global/build_search_form.dart index 6600dbf..7054827 100644 --- a/lib/App/Views/Global/build_search_form.dart +++ b/lib/App/Views/Global/build_search_form.dart @@ -59,7 +59,8 @@ class BuildSearchForm extends StatelessWidget { ), ), hintStyle: Get.textTheme.bodyMedium?.copyWith( - color: Get.theme.colorScheme.onSurface.withOpacity(0.4), + color: + Get.theme.colorScheme.onSurface.withValues(alpha: 0.4), ), ), ), diff --git a/lib/App/Views/Global/build_sidebar.dart b/lib/App/Views/Global/build_sidebar.dart index 4d930e9..255f822 100644 --- a/lib/App/Views/Global/build_sidebar.dart +++ b/lib/App/Views/Global/build_sidebar.dart @@ -15,7 +15,7 @@ class BuildSidebar extends StatelessWidget { width: AppConfig.sidebar, height: double.infinity, decoration: BoxDecoration( - color: Get.theme.colorScheme.background.withOpacity(0.7), + color: Get.theme.colorScheme.surface.withValues(alpha: 0.7), border: Border( right: BorderSide( width: 1, diff --git a/lib/App/Views/Global/build_slider.dart b/lib/App/Views/Global/build_slider.dart index e5ad76b..593460c 100644 --- a/lib/App/Views/Global/build_slider.dart +++ b/lib/App/Views/Global/build_slider.dart @@ -34,14 +34,14 @@ class BuildSlider extends StatelessWidget { state.controller?.onChange(value: defaultValue ?? 0); } }, - builder: (_) { + builder: (controller) { final double localMax = max ?? 100; final double localMin = min ?? 0; - final double localValue = _.sliderValue > localMax + final double localValue = controller.sliderValue > localMax ? localMax - : _.sliderValue < localMin + : controller.sliderValue < localMin ? localMin - : _.sliderValue; + : controller.sliderValue; return SliderTheme( data: SliderTheme.of(context).copyWith( @@ -66,7 +66,8 @@ class BuildSlider extends StatelessWidget { max: localMax, divisions: divisions ?? 20, activeColor: Get.theme.primaryColor, - inactiveColor: Get.theme.colorScheme.onBackground.withOpacity(0.1), + inactiveColor: + Get.theme.colorScheme.onSurface.withValues(alpha: 0.1), thumbColor: Get.theme.primaryColor, value: localValue, label: localValue.toStringAsFixed(fractionDigits ?? 0), @@ -81,7 +82,7 @@ class BuildSlider extends StatelessWidget { return; } - _.onChange( + controller.onChange( value: value, callback: onChanged, ); diff --git a/lib/App/Views/Global/build_windows_buttons.dart b/lib/App/Views/Global/build_windows_buttons.dart index ca28ea9..f59cb76 100644 --- a/lib/App/Views/Global/build_windows_buttons.dart +++ b/lib/App/Views/Global/build_windows_buttons.dart @@ -27,7 +27,7 @@ class BuildWindowsButtons extends StatelessWidget { // }, // afterHoverColor: Colors.green, // beforeHoverColor: - // Get.theme.colorScheme.onBackground.withOpacity(0.4), + // Get.theme.colorScheme.onBackground.withValues(alpha:0.4), // ), // const SizedBox(width: 6), BuildAppbarPlatformButton( @@ -37,7 +37,7 @@ class BuildWindowsButtons extends StatelessWidget { onTap: () async => await win.minimize(), afterHoverColor: Colors.yellow, beforeHoverColor: - Get.theme.colorScheme.onBackground.withOpacity(0.4), + Get.theme.colorScheme.onSurface.withValues(alpha: 0.4), ), const SizedBox(width: 6), BuildAppbarPlatformButton( @@ -50,7 +50,7 @@ class BuildWindowsButtons extends StatelessWidget { await systemTray.destroy(); }, beforeHoverColor: - Get.theme.colorScheme.onBackground.withOpacity(0.4), + Get.theme.colorScheme.onSurface.withValues(alpha: 0.4), ), const SizedBox(width: 6), ], diff --git a/lib/App/Views/Pages/Auth/setup_local_flutter_path_page.dart b/lib/App/Views/Pages/Auth/setup_local_flutter_path_page.dart index 253ab51..a0302c7 100644 --- a/lib/App/Views/Pages/Auth/setup_local_flutter_path_page.dart +++ b/lib/App/Views/Pages/Auth/setup_local_flutter_path_page.dart @@ -316,7 +316,8 @@ class BuildListView extends StatelessWidget { fontWeight: FontWeight.w300, color: isFlutter ? Get.theme.colorScheme.onPrimary - : Get.theme.colorScheme.onPrimary.withOpacity(0.5)), + : Get.theme.colorScheme.onPrimary + .withValues(alpha: 0.5)), ), ); }, diff --git a/lib/App/Views/Pages/Client/Widgets/build_client_create_or_edit_dialog.dart b/lib/App/Views/Pages/Client/Widgets/build_client_create_or_edit_dialog.dart index 86e58c4..61c07fd 100644 --- a/lib/App/Views/Pages/Client/Widgets/build_client_create_or_edit_dialog.dart +++ b/lib/App/Views/Pages/Client/Widgets/build_client_create_or_edit_dialog.dart @@ -21,37 +21,37 @@ class BuildClientCreateOrEditDialog extends StatelessWidget { child: GetBuilder( init: ClientIndexController(), initState: (_) {}, - builder: (_) { + builder: (localController) { return FormBuilder( key: formKey, autovalidateMode: AutovalidateMode.onUserInteraction, initialValue: { - 'name': _.activeClient.name, - 'contact_name': _.activeClient.contactName, - 'email': _.activeClient.email, - 'phone': _.activeClient.phone, - 'address': _.activeClient.address, - 'city': _.activeClient.city, - 'state': _.activeClient.state, - 'zip': _.activeClient.zip, - 'country': _.activeClient.country, - 'website': _.activeClient.website, - 'internal_notes': _.activeClient.internalNotes, - 'currency': _.activeClient.currency, - 'currency_symbol': _.activeClient.currencySymbol, + 'name': localController.activeClient.name, + 'contact_name': localController.activeClient.contactName, + 'email': localController.activeClient.email, + 'phone': localController.activeClient.phone, + 'address': localController.activeClient.address, + 'city': localController.activeClient.city, + 'state': localController.activeClient.state, + 'zip': localController.activeClient.zip, + 'country': localController.activeClient.country, + 'website': localController.activeClient.website, + 'internal_notes': localController.activeClient.internalNotes, + 'currency': localController.activeClient.currency, + 'currency_symbol': localController.activeClient.currencySymbol, }, child: Stepper( type: StepperType.vertical, - onStepContinue: () => _.onStepContinue(formKey!), - onStepTapped: _.onStepTapped, - currentStep: _.currentStep, + onStepContinue: () => localController.onStepContinue(formKey!), + onStepTapped: localController.onStepTapped, + currentStep: localController.currentStep, controlsBuilder: ((context, details) { return Column( children: [ SizedBox(height: 4.spa), Row( children: [ - if (_.currentStep != 1) + if (localController.currentStep != 1) FilledButton( onPressed: details.onStepContinue, style: ButtonStyle( @@ -61,9 +61,10 @@ class BuildClientCreateOrEditDialog extends StatelessWidget { ), child: const Text('Next'), ), - if (_.currentStep == 1) + if (localController.currentStep == 1) FilledButton( - onPressed: () => _.onStepContinue(formKey!), + onPressed: () => + localController.onStepContinue(formKey!), child: const Text('Save'), ), ], @@ -75,7 +76,7 @@ class BuildClientCreateOrEditDialog extends StatelessWidget { Step( title: const Text('Contact'), subtitle: const Text('Client Contact Information'), - state: _.currentStep == 0 + state: localController.currentStep == 0 ? StepState.editing : StepState.indexed, content: const BuildClientContactDialogStep(), @@ -83,7 +84,7 @@ class BuildClientCreateOrEditDialog extends StatelessWidget { Step( title: const Text('Billing'), subtitle: const Text('Client Billing Information'), - state: _.currentStep == 1 + state: localController.currentStep == 1 ? StepState.editing : StepState.indexed, content: const BuildClientBillingDialogStep(), diff --git a/lib/App/Views/Pages/Client/Widgets/build_client_list.dart b/lib/App/Views/Pages/Client/Widgets/build_client_list.dart index cf0c6f4..822494d 100644 --- a/lib/App/Views/Pages/Client/Widgets/build_client_list.dart +++ b/lib/App/Views/Pages/Client/Widgets/build_client_list.dart @@ -17,22 +17,22 @@ class BuildClientList extends StatelessWidget { return GetBuilder( init: ClientListController(), initState: (_) {}, - builder: (_) { + builder: (localController) { return Column( mainAxisAlignment: MainAxisAlignment.start, children: [ BuildLoadingOrEmptyLayout( - isLoading: _.isLoading, - isEmpty: _.clients.isEmpty, + isLoading: localController.isLoading, + isEmpty: localController.clients.isEmpty, title: 'No Clients Found', child: ListView.separated( - itemCount: _.clients.length, + itemCount: localController.clients.length, shrinkWrap: true, separatorBuilder: (_, __) { return SizedBox(height: 1.spa); }, itemBuilder: (__, int index) { - ClientModel item = _.clients[index]; + ClientModel item = localController.clients[index]; return Card( elevation: 0, color: Get.theme.colorScheme.primaryContainer, diff --git a/lib/App/Views/Pages/Client/client_index_page.dart b/lib/App/Views/Pages/Client/client_index_page.dart index a4e1a77..3fa33a4 100644 --- a/lib/App/Views/Pages/Client/client_index_page.dart +++ b/lib/App/Views/Pages/Client/client_index_page.dart @@ -15,7 +15,7 @@ class ClientIndexPage extends GetView { return GetBuilder( init: ClientIndexController(), initState: (_) {}, - builder: (_) { + builder: (localController) { final formKey = GlobalKey(); return Scaffold( body: SafeArea( @@ -25,7 +25,7 @@ class ClientIndexPage extends GetView { hasButton: true, buttonText: 'create your first client'.capitalize!, onButtonPressed: () { - _.clearFormState(formKey); + localController.clearFormState(formKey); showDialog( context: context, builder: (_) { diff --git a/lib/App/Views/Pages/Dashboard/Widgets/build_dashboard_chart.dart b/lib/App/Views/Pages/Dashboard/Widgets/build_dashboard_chart.dart index 2d0c79c..174302c 100644 --- a/lib/App/Views/Pages/Dashboard/Widgets/build_dashboard_chart.dart +++ b/lib/App/Views/Pages/Dashboard/Widgets/build_dashboard_chart.dart @@ -86,7 +86,7 @@ class BuildDashboardChart extends StatelessWidget { 'no invoices yet'.capitalize!, style: TextStyle( fontSize: 4.spa, - color: Get.theme.colorScheme.onSurface.withOpacity(0.5), + color: Get.theme.colorScheme.onSurface.withValues(alpha: 0.5), ), ), ), diff --git a/lib/App/Views/Pages/Dashboard/Widgets/build_dashboard_env_check.dart b/lib/App/Views/Pages/Dashboard/Widgets/build_dashboard_env_check.dart index 36afa8c..d970d19 100644 --- a/lib/App/Views/Pages/Dashboard/Widgets/build_dashboard_env_check.dart +++ b/lib/App/Views/Pages/Dashboard/Widgets/build_dashboard_env_check.dart @@ -14,15 +14,15 @@ class BuildDashboardEnvCheck extends GetView { Widget build(BuildContext context) { return GetBuilder( init: DashboardEnvCheckController(), - builder: (_) { + builder: (localController) { return Obx( () => AnimatedGradientBorder( glowSize: 0, borderSize: 1, - animationProgress: - _.isLoading || _.checkEnvModel.dartInstalled != null - ? 0.8 - : null, + animationProgress: localController.isLoading || + localController.checkEnvModel.dartInstalled != null + ? 0.8 + : null, borderRadius: BorderRadius.circular(5), gradientColors: [Colors.transparent, Get.theme.colorScheme.primary], child: Container( @@ -262,11 +262,11 @@ class BuildEnvCheckDataState extends StatelessWidget { color: controller.checkEnvModel.flutterDoctor![index].head == null - ? Colors.yellow.withOpacity(0.8) + ? Colors.yellow.withValues(alpha: 0.8) : controller.checkEnvModel.flutterDoctor![index] .head == true - ? Colors.green.withOpacity(0.8) + ? Colors.green.withValues(alpha: 0.8) : Colors.red, ), ), diff --git a/lib/App/Views/Pages/Dashboard/Widgets/build_dashboard_numbers_item.dart b/lib/App/Views/Pages/Dashboard/Widgets/build_dashboard_numbers_item.dart index d9bf529..54dd497 100644 --- a/lib/App/Views/Pages/Dashboard/Widgets/build_dashboard_numbers_item.dart +++ b/lib/App/Views/Pages/Dashboard/Widgets/build_dashboard_numbers_item.dart @@ -49,8 +49,8 @@ class BuildDashboardNumbersItem extends StatelessWidget { end: Alignment.bottomRight, colors: [ bgColor ?? Colors.indigo, - bgColor?.withOpacity(0.5) ?? - Colors.indigo.withOpacity(0.5), + bgColor?.withValues(alpha: 0.5) ?? + Colors.indigo.withValues(alpha: 0.5), ], ), ), @@ -70,8 +70,8 @@ class BuildDashboardNumbersItem extends StatelessWidget { style: TextStyle( fontSize: context.width * 0.01, fontWeight: FontWeight.w400, - color: Get.theme.colorScheme.onSurface.withOpacity( - 0.3, + color: Get.theme.colorScheme.onSurface.withValues( + alpha: 0.3, ), ), ), diff --git a/lib/App/Views/Pages/Dashboard/Widgets/build_dashboard_version_display.dart b/lib/App/Views/Pages/Dashboard/Widgets/build_dashboard_version_display.dart index 596854a..cfbc0c2 100644 --- a/lib/App/Views/Pages/Dashboard/Widgets/build_dashboard_version_display.dart +++ b/lib/App/Views/Pages/Dashboard/Widgets/build_dashboard_version_display.dart @@ -18,8 +18,8 @@ class BuildDashboardVersionDisplay extends StatelessWidget { return GetBuilder( init: AppUpdateController(), initState: (_) {}, - builder: (_) { - return BuildDashboardVersionDesplayView(controller: _); + builder: (localController) { + return BuildDashboardVersionDesplayView(controller: localController); }, ); } @@ -34,7 +34,7 @@ class BuildDashboardVersionDesplayView extends StatelessWidget { @override Widget build(BuildContext context) { - final _ = controller; + final localController = controller; return Container( height: context.height * 0.23, width: context.width * 0.1, @@ -47,7 +47,7 @@ class BuildDashboardVersionDesplayView extends StatelessWidget { ), ), child: BuildLoadingSwitch( - isLoading: _.isLoading, + isLoading: localController.isLoading, child: Column( mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center, @@ -61,14 +61,14 @@ class BuildDashboardVersionDesplayView extends StatelessWidget { 'current version'.capitalize!, style: TextStyle( fontSize: context.width * 0.01, - color: Get.theme.colorScheme.onPrimary.withOpacity( - 0.5, + color: Get.theme.colorScheme.onPrimary.withValues( + alpha: 0.5, ), ), ), SizedBox(height: 1.spa), Text( - _.currentVersion, + localController.currentVersion, style: TextStyle( fontSize: context.width * 0.013, fontWeight: FontWeight.w500, @@ -87,8 +87,8 @@ class BuildDashboardVersionDesplayView extends StatelessWidget { 'latest version'.capitalize!, style: TextStyle( fontSize: context.width * 0.01, - color: Get.theme.colorScheme.onPrimary.withOpacity( - 0.5, + color: Get.theme.colorScheme.onPrimary.withValues( + alpha: 0.5, ), ), ), @@ -101,7 +101,7 @@ class BuildDashboardVersionDesplayView extends StatelessWidget { context: context, builder: (__) { return BuildDashboardVersionDisplayDialog( - controller: _, + controller: localController, ); }, ); @@ -110,14 +110,14 @@ class BuildDashboardVersionDesplayView extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.center, children: [ Text( - _.lastVersion, + localController.lastVersion, style: TextStyle( fontSize: context.width * 0.013, fontWeight: FontWeight.w500, ), ), SizedBox(width: 2.spa), - if (_.updateAvailable) + if (localController.updateAvailable) AnimatedGradientBorder( borderSize: 1, glowSize: 0, @@ -134,7 +134,7 @@ class BuildDashboardVersionDesplayView extends StatelessWidget { color: Get.theme.colorScheme.onSurface, ), ), - if (!_.updateAvailable) + if (!localController.updateAvailable) Icon( Icons.info_rounded, size: context.width * 0.013, @@ -173,7 +173,7 @@ class BuildDashboardVersionDisplayDialog extends StatelessWidget { styleSheet: MarkdownStyleSheet( p: TextStyle( fontSize: context.width * 0.01, - color: Get.theme.colorScheme.onPrimary.withOpacity(0.5), + color: Get.theme.colorScheme.onPrimary.withValues(alpha: 0.5), ), h1: TextStyle( fontSize: context.width * 0.013, diff --git a/lib/App/Views/Pages/Invoice/Widgets/build_add_customer_buttom.dart b/lib/App/Views/Pages/Invoice/Widgets/build_add_customer_buttom.dart index 7c4435f..bd7e7c2 100644 --- a/lib/App/Views/Pages/Invoice/Widgets/build_add_customer_buttom.dart +++ b/lib/App/Views/Pages/Invoice/Widgets/build_add_customer_buttom.dart @@ -25,8 +25,8 @@ class BuildAddCustomerButtom extends StatelessWidget { width: context.width * 0.2, height: context.height * 0.2, decoration: BoxDecoration( - color: - Get.theme.colorScheme.secondaryContainer.withOpacity(0.2), + color: Get.theme.colorScheme.secondaryContainer + .withValues(alpha: 0.2), border: Border.all( color: Get.theme.colorScheme.secondaryContainer, width: 2, diff --git a/lib/App/Views/Pages/Invoice/Widgets/build_invoice_analytics_item.dart b/lib/App/Views/Pages/Invoice/Widgets/build_invoice_analytics_item.dart index f6f7966..9de739c 100644 --- a/lib/App/Views/Pages/Invoice/Widgets/build_invoice_analytics_item.dart +++ b/lib/App/Views/Pages/Invoice/Widgets/build_invoice_analytics_item.dart @@ -20,7 +20,7 @@ class BuildInvoiceAnalyticsItem extends StatelessWidget { padding: EdgeInsets.all(10.spa), decoration: BoxDecoration( border: Border.all( - color: Get.theme.colorScheme.onSurface.withOpacity(0.1), + color: Get.theme.colorScheme.onSurface.withValues(alpha: 0.1), ), borderRadius: BorderRadius.circular(10), ), @@ -31,7 +31,7 @@ class BuildInvoiceAnalyticsItem extends StatelessWidget { Text( title?.capitalize ?? '', style: Get.textTheme.titleMedium?.copyWith( - color: Get.theme.colorScheme.onSurface.withOpacity(0.5), + color: Get.theme.colorScheme.onSurface.withValues(alpha: 0.5), fontWeight: FontWeight.w600, ), ), @@ -55,7 +55,7 @@ class BuildInvoiceAnalyticsItem extends StatelessWidget { unit ?? 'USD', style: Get.textTheme.bodyLarge?.copyWith( fontWeight: FontWeight.w200, - color: Get.theme.colorScheme.onSurface.withOpacity(0.4), + color: Get.theme.colorScheme.onSurface.withValues(alpha: 0.4), ), ), ], diff --git a/lib/App/Views/Pages/Invoice/Widgets/build_invoice_body.dart b/lib/App/Views/Pages/Invoice/Widgets/build_invoice_body.dart index f101304..1701db4 100644 --- a/lib/App/Views/Pages/Invoice/Widgets/build_invoice_body.dart +++ b/lib/App/Views/Pages/Invoice/Widgets/build_invoice_body.dart @@ -46,7 +46,7 @@ class BuildInvoiceBody extends StatelessWidget { padding: EdgeInsets.symmetric(horizontal: 3.spa), textColor: InvoiceHelper.getStatusColor(invoice.status), backgroundColor: InvoiceHelper.getStatusColor(invoice.status) - .withOpacity(0.1), + .withValues(alpha: 0.1), ), ), ], @@ -59,7 +59,7 @@ class BuildInvoiceBody extends StatelessWidget { invoice.dueDate?.capitalize ?? '', style: TextStyle( color: Get.theme.colorScheme.onSurface - .withOpacity(hasGrey == true ? 0.5 : 1), + .withValues(alpha: hasGrey == true ? 0.5 : 1), ), ), ), @@ -68,7 +68,7 @@ class BuildInvoiceBody extends StatelessWidget { invoice.number.toString(), style: TextStyle( color: Get.theme.colorScheme.onSurface - .withOpacity(hasGrey == true ? 0.5 : 1), + .withValues(alpha: hasGrey == true ? 0.5 : 1), ), ), ), @@ -78,7 +78,7 @@ class BuildInvoiceBody extends StatelessWidget { invoice.clientName?.capitalize ?? '', style: TextStyle( color: Get.theme.colorScheme.onSurface - .withOpacity(hasGrey == true ? 0.5 : 1), + .withValues(alpha: hasGrey == true ? 0.5 : 1), ), ), ), @@ -90,14 +90,14 @@ class BuildInvoiceBody extends StatelessWidget { text: totalAmount.toString(), style: TextStyle( color: Get.theme.colorScheme.onSurface - .withOpacity(hasGrey == true ? 0.5 : 1), + .withValues(alpha: hasGrey == true ? 0.5 : 1), ), ), TextSpan( text: ' ${(invoice.currency?.toUpperCase() ?? '')}', style: TextStyle( color: Get.theme.colorScheme.onSurface - .withOpacity(hasGrey == true ? 0.1 : 0.5), + .withValues(alpha: hasGrey == true ? 0.1 : 0.5), ), ), ], diff --git a/lib/App/Views/Pages/Invoice/Widgets/build_invoice_body_header.dart b/lib/App/Views/Pages/Invoice/Widgets/build_invoice_body_header.dart index a8c61bb..54fc041 100644 --- a/lib/App/Views/Pages/Invoice/Widgets/build_invoice_body_header.dart +++ b/lib/App/Views/Pages/Invoice/Widgets/build_invoice_body_header.dart @@ -17,7 +17,7 @@ class BuildInvoiceBodyHeader extends StatelessWidget { Text( 'Status', style: TextStyle( - color: Get.theme.colorScheme.onSurface.withOpacity(0.5), + color: Get.theme.colorScheme.onSurface.withValues(alpha: 0.5), ), ) ], @@ -28,7 +28,7 @@ class BuildInvoiceBodyHeader extends StatelessWidget { child: Text( 'Due Date', style: TextStyle( - color: Get.theme.colorScheme.onSurface.withOpacity(0.5), + color: Get.theme.colorScheme.onSurface.withValues(alpha: 0.5), ), ), ), @@ -36,7 +36,7 @@ class BuildInvoiceBodyHeader extends StatelessWidget { child: Text( '#', style: TextStyle( - color: Get.theme.colorScheme.onSurface.withOpacity(0.5), + color: Get.theme.colorScheme.onSurface.withValues(alpha: 0.5), ), ), ), @@ -45,7 +45,7 @@ class BuildInvoiceBodyHeader extends StatelessWidget { child: Text( 'Client', style: TextStyle( - color: Get.theme.colorScheme.onSurface.withOpacity(0.5), + color: Get.theme.colorScheme.onSurface.withValues(alpha: 0.5), ), ), ), @@ -56,7 +56,7 @@ class BuildInvoiceBodyHeader extends StatelessWidget { Text( 'Amount', style: TextStyle( - color: Get.theme.colorScheme.onSurface.withOpacity(0.5), + color: Get.theme.colorScheme.onSurface.withValues(alpha: 0.5), ), ), ], @@ -72,7 +72,8 @@ class BuildInvoiceBodyHeader extends StatelessWidget { child: Text( 'Actions', style: TextStyle( - color: Get.theme.colorScheme.onSurface.withOpacity(0.5), + color: + Get.theme.colorScheme.onSurface.withValues(alpha: 0.5), ), ), ), diff --git a/lib/App/Views/Pages/Invoice/Widgets/build_invoice_company_info.dart b/lib/App/Views/Pages/Invoice/Widgets/build_invoice_company_info.dart index 4bd2cd1..f04c0dc 100644 --- a/lib/App/Views/Pages/Invoice/Widgets/build_invoice_company_info.dart +++ b/lib/App/Views/Pages/Invoice/Widgets/build_invoice_company_info.dart @@ -49,7 +49,7 @@ class BuildInvoiceCompanyInfo extends StatelessWidget { style: TextStyle( fontSize: 5.spa, color: inVerseColor == true - ? Colors.white.withOpacity(0.7) + ? Colors.white.withValues(alpha: 0.7) : Colors.black87, ), ), @@ -60,7 +60,7 @@ class BuildInvoiceCompanyInfo extends StatelessWidget { style: TextStyle( fontSize: 5.spa, color: inVerseColor == true - ? Colors.white.withOpacity(0.7) + ? Colors.white.withValues(alpha: 0.7) : Colors.black87, ), ), @@ -71,7 +71,7 @@ class BuildInvoiceCompanyInfo extends StatelessWidget { style: TextStyle( fontSize: 5.spa, color: inVerseColor == true - ? Colors.white.withOpacity(0.7) + ? Colors.white.withValues(alpha: 0.7) : Colors.black87, ), ), @@ -82,7 +82,7 @@ class BuildInvoiceCompanyInfo extends StatelessWidget { style: TextStyle( fontSize: 5.spa, color: inVerseColor == true - ? Colors.white.withOpacity(0.7) + ? Colors.white.withValues(alpha: 0.7) : Colors.black87, ), ), @@ -94,7 +94,7 @@ class BuildInvoiceCompanyInfo extends StatelessWidget { style: TextStyle( fontSize: 6.spa, color: inVerseColor == true - ? Colors.white.withOpacity(0.7) + ? Colors.white.withValues(alpha: 0.7) : Colors.black87, ), ), @@ -105,7 +105,7 @@ class BuildInvoiceCompanyInfo extends StatelessWidget { style: TextStyle( fontSize: 6.spa, color: inVerseColor == true - ? Colors.white.withOpacity(0.7) + ? Colors.white.withValues(alpha: 0.7) : Colors.black87, ), ), diff --git a/lib/App/Views/Pages/Invoice/Widgets/build_invoice_highlights_item.dart b/lib/App/Views/Pages/Invoice/Widgets/build_invoice_highlights_item.dart index ddc828c..f45183d 100644 --- a/lib/App/Views/Pages/Invoice/Widgets/build_invoice_highlights_item.dart +++ b/lib/App/Views/Pages/Invoice/Widgets/build_invoice_highlights_item.dart @@ -52,7 +52,7 @@ class BuildInvoiceHighlightsItem extends StatelessWidget { fontSize: 5.spa, color: isAmount != null ? Colors.black - : Colors.black.withOpacity(0.6), + : Colors.black.withValues(alpha: 0.6), fontWeight: isAmount != null ? FontWeight.bold : null, ), ), diff --git a/lib/App/Views/Pages/Invoice/Widgets/build_invoice_single_sidebar.dart b/lib/App/Views/Pages/Invoice/Widgets/build_invoice_single_sidebar.dart index a823203..0d2a0e8 100644 --- a/lib/App/Views/Pages/Invoice/Widgets/build_invoice_single_sidebar.dart +++ b/lib/App/Views/Pages/Invoice/Widgets/build_invoice_single_sidebar.dart @@ -37,7 +37,7 @@ class BuildInvoiceSingleSidebar extends StatelessWidget { label: Text('download'.capitalize!), style: ButtonStyle( backgroundColor: WidgetStateProperty.all( - Get.theme.colorScheme.secondary.withOpacity(0.6), + Get.theme.colorScheme.secondary.withValues(alpha: 0.6), ), ), ), diff --git a/lib/App/Views/Pages/Invoice/Widgets/build_invoice_status_dialog.dart b/lib/App/Views/Pages/Invoice/Widgets/build_invoice_status_dialog.dart index 40fc79e..cb34de4 100644 --- a/lib/App/Views/Pages/Invoice/Widgets/build_invoice_status_dialog.dart +++ b/lib/App/Views/Pages/Invoice/Widgets/build_invoice_status_dialog.dart @@ -45,8 +45,8 @@ class BuildInvoiceStatusDialog extends StatelessWidget { label: Text(status), padding: EdgeInsets.symmetric(horizontal: 3.spa), textColor: InvoiceHelper.getStatusColor(status), - backgroundColor: - InvoiceHelper.getStatusColor(status).withOpacity(0.1), + backgroundColor: InvoiceHelper.getStatusColor(status) + .withValues(alpha: 0.1), ), ); }, diff --git a/lib/App/Views/Pages/Mockup/Widgets/Create/Sidebar/Steps/build_background_step.dart b/lib/App/Views/Pages/Mockup/Widgets/Create/Sidebar/Steps/build_background_step.dart index 5c67641..e7c9962 100644 --- a/lib/App/Views/Pages/Mockup/Widgets/Create/Sidebar/Steps/build_background_step.dart +++ b/lib/App/Views/Pages/Mockup/Widgets/Create/Sidebar/Steps/build_background_step.dart @@ -22,9 +22,9 @@ ExpansionTileItem buildBackgroundStep({ title: const Text('Background'), leading: const Icon(Icons.crop_original_rounded), collapsedBorderColor: Colors.transparent, - collapsedTextColor: Colors.grey.withOpacity(0.8), - collapsedIconColor: Colors.grey.withOpacity(0.8), - expendedBorderColor: Colors.grey.withOpacity(0.2), + collapsedTextColor: Colors.grey.withValues(alpha: 0.8), + collapsedIconColor: Colors.grey.withValues(alpha: 0.8), + expendedBorderColor: Colors.grey.withValues(alpha: 0.2), textColor: Colors.white, iconColor: Colors.white, children: [ @@ -34,12 +34,12 @@ ExpansionTileItem buildBackgroundStep({ didChangeDependencies: (state) { state.controller?.updateActive(); }, - builder: (_) { + builder: (localController) { return BuildSidebarOption( title: 'Type', rightWidget: Obx( () => DropdownButton( - value: _.activeBackgroundType.name, + value: localController.activeBackgroundType.name, icon: const Expanded( child: Row( mainAxisAlignment: MainAxisAlignment.end, diff --git a/lib/App/Views/Pages/Mockup/Widgets/Create/Sidebar/Steps/build_device_step.dart b/lib/App/Views/Pages/Mockup/Widgets/Create/Sidebar/Steps/build_device_step.dart index 5cd5a3c..7110685 100644 --- a/lib/App/Views/Pages/Mockup/Widgets/Create/Sidebar/Steps/build_device_step.dart +++ b/lib/App/Views/Pages/Mockup/Widgets/Create/Sidebar/Steps/build_device_step.dart @@ -60,9 +60,9 @@ ExpansionTileItem buildDeviceStep({ title: Text(title ?? 'Device'), leading: leading ?? const Icon(Icons.devices), collapsedBorderColor: Colors.transparent, - collapsedTextColor: Colors.grey.withOpacity(0.8), - collapsedIconColor: Colors.grey.withOpacity(0.8), - expendedBorderColor: Colors.grey.withOpacity(0.2), + collapsedTextColor: Colors.grey.withValues(alpha: 0.8), + collapsedIconColor: Colors.grey.withValues(alpha: 0.8), + expendedBorderColor: Colors.grey.withValues(alpha: 0.2), textColor: Colors.white, iconColor: Colors.white, children: [ diff --git a/lib/App/Views/Pages/Mockup/Widgets/Create/Sidebar/Steps/build_icon_step.dart b/lib/App/Views/Pages/Mockup/Widgets/Create/Sidebar/Steps/build_icon_step.dart index b783817..0d59122 100644 --- a/lib/App/Views/Pages/Mockup/Widgets/Create/Sidebar/Steps/build_icon_step.dart +++ b/lib/App/Views/Pages/Mockup/Widgets/Create/Sidebar/Steps/build_icon_step.dart @@ -25,9 +25,9 @@ ExpansionTileItem buildingIconStep({ title: const Text('Icon'), leading: const Icon(Icons.invert_colors_on_sharp), collapsedBorderColor: Colors.transparent, - collapsedTextColor: Colors.grey.withOpacity(0.8), - collapsedIconColor: Colors.grey.withOpacity(0.8), - expendedBorderColor: Colors.grey.withOpacity(0.2), + collapsedTextColor: Colors.grey.withValues(alpha: 0.8), + collapsedIconColor: Colors.grey.withValues(alpha: 0.8), + expendedBorderColor: Colors.grey.withValues(alpha: 0.2), textColor: Colors.white, iconColor: Colors.white, children: [ diff --git a/lib/App/Views/Pages/Mockup/Widgets/Create/Sidebar/Steps/build_layout_step.dart b/lib/App/Views/Pages/Mockup/Widgets/Create/Sidebar/Steps/build_layout_step.dart index 7d56f70..bbefb97 100644 --- a/lib/App/Views/Pages/Mockup/Widgets/Create/Sidebar/Steps/build_layout_step.dart +++ b/lib/App/Views/Pages/Mockup/Widgets/Create/Sidebar/Steps/build_layout_step.dart @@ -20,15 +20,15 @@ ExpansionTileItem buildLayoutStep({ title: const Text('Layout'), leading: const Icon(Icons.crop_free), collapsedBorderColor: Colors.transparent, - collapsedTextColor: Colors.grey.withOpacity(0.8), - collapsedIconColor: Colors.grey.withOpacity(0.8), - expendedBorderColor: Colors.grey.withOpacity(0.2), + collapsedTextColor: Colors.grey.withValues(alpha: 0.8), + collapsedIconColor: Colors.grey.withValues(alpha: 0.8), + expendedBorderColor: Colors.grey.withValues(alpha: 0.2), textColor: Colors.white, iconColor: Colors.white, children: [ GetBuilder( init: BuildLayoutOptionController(), - builder: (_) { + builder: (localController) { return InkWell( onTap: () { aweSideSheet( @@ -56,9 +56,9 @@ ExpansionTileItem buildLayoutStep({ sheetWidth: 100.h, body: Obx( () => BuildScreenLayoutsWidget( - activeLayout: _.activeLayout, - onEnter: _.onEnter, - onExit: _.onExit, + activeLayout: localController.activeLayout, + onEnter: localController.onEnter, + onExit: localController.onExit, onLayoutChanged: onLayoutChanged, ), ), @@ -67,10 +67,10 @@ ExpansionTileItem buildLayoutStep({ child: Container( padding: const EdgeInsets.all(10), decoration: BoxDecoration( - color: Get.theme.primaryColor.withOpacity(0.5), + color: Get.theme.primaryColor.withValues(alpha: 0.5), borderRadius: BorderRadius.circular(5), border: Border.all( - color: Colors.white.withOpacity(0.1), + color: Colors.white.withValues(alpha: 0.1), width: 0.5, ), ), diff --git a/lib/App/Views/Pages/Mockup/Widgets/Create/Sidebar/Steps/build_title_step.dart b/lib/App/Views/Pages/Mockup/Widgets/Create/Sidebar/Steps/build_title_step.dart index 00ddb1a..c7050e5 100644 --- a/lib/App/Views/Pages/Mockup/Widgets/Create/Sidebar/Steps/build_title_step.dart +++ b/lib/App/Views/Pages/Mockup/Widgets/Create/Sidebar/Steps/build_title_step.dart @@ -40,9 +40,9 @@ ExpansionTileItem buildTitleStep({ title: Text(widgetTitle!), leading: const Icon(Icons.text_fields), collapsedBorderColor: Colors.transparent, - collapsedTextColor: Colors.grey.withOpacity(0.8), - collapsedIconColor: Colors.grey.withOpacity(0.8), - expendedBorderColor: Colors.grey.withOpacity(0.2), + collapsedTextColor: Colors.grey.withValues(alpha: 0.8), + collapsedIconColor: Colors.grey.withValues(alpha: 0.8), + expendedBorderColor: Colors.grey.withValues(alpha: 0.2), textColor: Colors.white, iconColor: Colors.white, children: [ @@ -60,7 +60,7 @@ ExpansionTileItem buildTitleStep({ decoration: InputDecoration( hintText: titleText, hintStyle: Get.textTheme.bodyMedium?.copyWith( - color: Colors.grey.withOpacity(0.5), + color: Colors.grey.withValues(alpha: 0.5), ), border: InputBorder.none, ), diff --git a/lib/App/Views/Pages/Mockup/Widgets/Create/Sidebar/Widgets/build_color_preset_gradient.dart b/lib/App/Views/Pages/Mockup/Widgets/Create/Sidebar/Widgets/build_color_preset_gradient.dart index aaf8829..d92aca4 100644 --- a/lib/App/Views/Pages/Mockup/Widgets/Create/Sidebar/Widgets/build_color_preset_gradient.dart +++ b/lib/App/Views/Pages/Mockup/Widgets/Create/Sidebar/Widgets/build_color_preset_gradient.dart @@ -45,10 +45,10 @@ class BuildColorPresetGradient extends StatelessWidget { child: Container( padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 5), decoration: BoxDecoration( - color: Get.theme.primaryColor.withOpacity(0.5), + color: Get.theme.primaryColor.withValues(alpha: 0.5), borderRadius: BorderRadius.circular(5), border: Border.all( - color: Colors.white.withOpacity(0.1), + color: Colors.white.withValues(alpha: 0.1), width: 0.5, ), ), diff --git a/lib/App/Views/Pages/Mockup/Widgets/Create/Sidebar/Widgets/build_edit_frame_option.dart b/lib/App/Views/Pages/Mockup/Widgets/Create/Sidebar/Widgets/build_edit_frame_option.dart index cf25f0a..3c9e24b 100644 --- a/lib/App/Views/Pages/Mockup/Widgets/Create/Sidebar/Widgets/build_edit_frame_option.dart +++ b/lib/App/Views/Pages/Mockup/Widgets/Create/Sidebar/Widgets/build_edit_frame_option.dart @@ -27,7 +27,7 @@ class BuildEditFrame extends StatelessWidget { state.controller?.setupController(fram: initialValue); }, initState: (_) {}, - builder: (_) { + builder: (localController) { return ElevatedButton( onPressed: () { aweSideSheet( @@ -36,8 +36,8 @@ class BuildEditFrame extends StatelessWidget { sheetPosition: SheetPosition.right, header: const SizedBox.shrink(), onCancel: () => Get.back(), - onConfirm: () => _.onConfirm(callback: callback), - body: _BuildBody(controller: _, callback: callback), + onConfirm: () => localController.onConfirm(callback: callback), + body: _BuildBody(controller: localController, callback: callback), ); }, child: Text('edit Frame'.capitalize!), @@ -83,7 +83,7 @@ class _BuildBody extends StatelessWidget { style: TextStyle( fontSize: 5.spa, fontStyle: FontStyle.italic, - color: Get.theme.colorScheme.onSurface.withOpacity(0.5), + color: Get.theme.colorScheme.onSurface.withValues(alpha: 0.5), ), ), Divider(height: 10.spa, thickness: 0.4), @@ -179,7 +179,8 @@ class _BuildDeviceList extends StatelessWidget { fontWeight: FontWeight.w600, color: selectedDevice?.name == device.name ? Get.theme.colorScheme.secondary - : Get.theme.colorScheme.onPrimary.withOpacity(0.5), + : Get.theme.colorScheme.onPrimary + .withValues(alpha: 0.5), ), child: Row( children: [ diff --git a/lib/App/Views/Pages/Mockup/Widgets/Create/Sidebar/Widgets/build_select_image_option.dart b/lib/App/Views/Pages/Mockup/Widgets/Create/Sidebar/Widgets/build_select_image_option.dart index 68f12a5..1bf8ecc 100644 --- a/lib/App/Views/Pages/Mockup/Widgets/Create/Sidebar/Widgets/build_select_image_option.dart +++ b/lib/App/Views/Pages/Mockup/Widgets/Create/Sidebar/Widgets/build_select_image_option.dart @@ -25,7 +25,7 @@ class BuildSelectImageOption extends StatelessWidget { init: SelectImageOptionController(), tag: controllerTag, initState: (_) {}, - builder: (_) { + builder: (localController) { return ElevatedButton( onPressed: () async { // if askForRepeat is true, then we need to ask the user if they want to repeat the image @@ -42,19 +42,19 @@ class BuildSelectImageOption extends StatelessWidget { ); if (result == CustomButton.neutralButton) { - _.getImage( + localController.getImage( mockupId: mockupId, callback: callbackForRepeat, ); } else { - _.getImage( + localController.getImage( mockupId: mockupId, callbackForRepeat: callbackForRepeat, shouldRepeat: true, ); } } else { - _.getImage( + localController.getImage( mockupId: mockupId, callback: callback, ); diff --git a/lib/App/Views/Pages/Mockup/Widgets/Create/Sidebar/build_alignment_option.dart b/lib/App/Views/Pages/Mockup/Widgets/Create/Sidebar/build_alignment_option.dart index c7049f0..3c298ca 100644 --- a/lib/App/Views/Pages/Mockup/Widgets/Create/Sidebar/build_alignment_option.dart +++ b/lib/App/Views/Pages/Mockup/Widgets/Create/Sidebar/build_alignment_option.dart @@ -28,16 +28,16 @@ class BuildAlignmentOption extends GetView { didChangeDependencies: (state) { state.controller?.setAlignment(alignment: initialAlignment); }, - builder: (_) { + builder: (localController) { return BuildSidebarOption( title: title ?? 'Alignment', rightWidget: Container( padding: const EdgeInsets.all(2), decoration: BoxDecoration( - color: Get.theme.colorScheme.background.withOpacity(0.3), + color: Get.theme.colorScheme.surface.withValues(alpha: 0.3), borderRadius: BorderRadius.circular(5), border: Border.all( - color: Colors.white.withOpacity(0.1), + color: Colors.white.withValues(alpha: 0.1), width: 0.5, ), ), @@ -45,15 +45,18 @@ class BuildAlignmentOption extends GetView { children: [ Expanded( child: InkWell( - onTap: () => _.setAlignment( + onTap: () => localController.setAlignment( alignment: MainAxisAlignment.start, onToggle: onToggle, ), child: Container( padding: const EdgeInsets.all(5), decoration: BoxDecoration( - color: Colors.white.withOpacity( - _.alignment == MainAxisAlignment.start ? 0.1 : 0), + color: Colors.white.withValues( + alpha: localController.alignment == + MainAxisAlignment.start + ? 0.1 + : 0), borderRadius: BorderRadius.circular(5), ), child: Icon( @@ -66,15 +69,18 @@ class BuildAlignmentOption extends GetView { ), Expanded( child: InkWell( - onTap: () => _.setAlignment( + onTap: () => localController.setAlignment( alignment: MainAxisAlignment.center, onToggle: onToggle, ), child: Container( padding: const EdgeInsets.all(5), decoration: BoxDecoration( - color: Colors.white.withOpacity( - _.alignment == MainAxisAlignment.center ? 0.1 : 0), + color: Colors.white.withValues( + alpha: localController.alignment == + MainAxisAlignment.center + ? 0.1 + : 0), borderRadius: BorderRadius.circular(5), ), child: Icon( @@ -87,15 +93,18 @@ class BuildAlignmentOption extends GetView { ), Expanded( child: InkWell( - onTap: () => _.setAlignment( + onTap: () => localController.setAlignment( alignment: MainAxisAlignment.end, onToggle: onToggle, ), child: Container( padding: const EdgeInsets.all(5), decoration: BoxDecoration( - color: Colors.white.withOpacity( - _.alignment == MainAxisAlignment.end ? 0.1 : 0), + color: Colors.white.withValues( + alpha: localController.alignment == + MainAxisAlignment.end + ? 0.1 + : 0), borderRadius: BorderRadius.circular(5), ), child: Icon( diff --git a/lib/App/Views/Pages/Mockup/Widgets/Create/Sidebar/build_change_fontfamily.dart b/lib/App/Views/Pages/Mockup/Widgets/Create/Sidebar/build_change_fontfamily.dart index 42567f3..fcd53b5 100644 --- a/lib/App/Views/Pages/Mockup/Widgets/Create/Sidebar/build_change_fontfamily.dart +++ b/lib/App/Views/Pages/Mockup/Widgets/Create/Sidebar/build_change_fontfamily.dart @@ -30,7 +30,7 @@ class BuildChangeFontFamily extends GetView { if (fontFamily == null) return; state.controller?.changeFontFamily(key: fontFamily!); }, - builder: (_) { + builder: (localController) { return InkWell( onTap: () => aweSideSheet( sheetWidth: sheetContext.width, @@ -39,17 +39,17 @@ class BuildChangeFontFamily extends GetView { footer: const SizedBox.shrink(), header: const SizedBox.shrink(), body: BuildChangeFontBottomSheet( - controller: _, + controller: localController, callback: callback, ), ), child: Container( padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 5), decoration: BoxDecoration( - color: Get.theme.primaryColor.withOpacity(0.5), + color: Get.theme.primaryColor.withValues(alpha: 0.5), borderRadius: BorderRadius.circular(5), border: Border.all( - color: Colors.white.withOpacity(0.1), + color: Colors.white.withValues(alpha: 0.1), width: 0.5, ), ), @@ -58,7 +58,7 @@ class BuildChangeFontFamily extends GetView { Expanded( child: Obx( () => Text( - '${_.fontKey} ', + '${localController.fontKey} ', maxLines: 1, ), ), @@ -88,7 +88,7 @@ class BuildChangeFontBottomSheet extends StatelessWidget { @override Widget build(BuildContext context) { return BuildFullPageBottomSheet( - bgColor: Get.theme.colorScheme.background, + bgColor: Get.theme.colorScheme.surface, closeWidget: BuildBottomSheetTopNavFullWidth( onSave: () => controller.saveFontFamily(callback: callback), onCancle: () => controller.onCancle(), @@ -149,8 +149,8 @@ class BuildBottomSheetTopNavFullWidth extends StatelessWidget { color: Get.theme.colorScheme.primaryContainer, border: Border( bottom: BorderSide( - color: Get.theme.colorScheme.onPrimaryContainer.withOpacity( - 0.2, + color: Get.theme.colorScheme.onPrimaryContainer.withValues( + alpha: 0.2, ), width: 0.5, ), @@ -171,8 +171,8 @@ class BuildBottomSheetTopNavFullWidth extends StatelessWidget { children: [ ElevatedButton( style: ElevatedButton.styleFrom( - foregroundColor: Colors.grey.withOpacity(1), - backgroundColor: Colors.grey.withOpacity(0.1), + foregroundColor: Colors.grey.withValues(alpha: 1), + backgroundColor: Colors.grey.withValues(alpha: 0.1), ), onPressed: onCancle ?? () => Get.back(), child: const Text( @@ -283,7 +283,7 @@ class BuildFontList extends StatelessWidget { Text( 'Font Family $e', style: Get.textTheme.bodySmall?.copyWith( - color: Colors.grey.withOpacity(0.5), + color: Colors.grey.withValues(alpha: 0.5), ), ), const SizedBox(height: 20), diff --git a/lib/App/Views/Pages/Mockup/Widgets/Create/Sidebar/build_pick_color.dart b/lib/App/Views/Pages/Mockup/Widgets/Create/Sidebar/build_pick_color.dart index 93f19c4..564ea4d 100644 --- a/lib/App/Views/Pages/Mockup/Widgets/Create/Sidebar/build_pick_color.dart +++ b/lib/App/Views/Pages/Mockup/Widgets/Create/Sidebar/build_pick_color.dart @@ -27,14 +27,14 @@ class BuildPickColor extends GetView { ); } }, - builder: (_) { + builder: (localController) { return InkWell( onTap: () async { await colorPickerDialog( context: context, customColorSwatchesAndNames: {}, - dialogPickerColor: _.dialogPickerColor, - onColorChanged: (Color color) => _.onColorChanged( + dialogPickerColor: localController.dialogPickerColor, + onColorChanged: (Color color) => localController.onColorChanged( color: color, callback: onColorChangedCallback, ), @@ -44,7 +44,7 @@ class BuildPickColor extends GetView { () => Container( height: 30, decoration: BoxDecoration( - color: _.screenPickerColor, + color: localController.screenPickerColor, borderRadius: BorderRadius.circular(5), ), ), diff --git a/lib/App/Views/Pages/Mockup/Widgets/Create/Sidebar/build_slider_enable_option.dart b/lib/App/Views/Pages/Mockup/Widgets/Create/Sidebar/build_slider_enable_option.dart index e20db26..7097446 100644 --- a/lib/App/Views/Pages/Mockup/Widgets/Create/Sidebar/build_slider_enable_option.dart +++ b/lib/App/Views/Pages/Mockup/Widgets/Create/Sidebar/build_slider_enable_option.dart @@ -29,7 +29,7 @@ class BuildSliderEnableOption extends GetView { didChangeDependencies: (state) { state.controller?.setInitialValue(initialValue ?? false); }, - builder: (_) { + builder: (localController) { return BuildSidebarOption( title: title ?? 'Enable', flexLeft: flexLeft, @@ -37,9 +37,9 @@ class BuildSliderEnableOption extends GetView { fontWeight: fontWeight, rightWidget: Obx( () => Switch( - value: _.isOn, + value: localController.isOn, onChanged: (bool value) { - _.toggle(); + localController.toggle(); onToggle?.call(value); }, activeColor: Get.theme.primaryColor, diff --git a/lib/App/Views/Pages/Mockup/Widgets/Create/build_create_mockup_choose_template.dart b/lib/App/Views/Pages/Mockup/Widgets/Create/build_create_mockup_choose_template.dart index 6a395d3..d1f045d 100644 --- a/lib/App/Views/Pages/Mockup/Widgets/Create/build_create_mockup_choose_template.dart +++ b/lib/App/Views/Pages/Mockup/Widgets/Create/build_create_mockup_choose_template.dart @@ -31,17 +31,17 @@ class BuildCreateMockupChooseTemplate extends StatelessWidget { height: 300, decoration: BoxDecoration( color: templateId == array[index] - ? Get.theme.colorScheme.secondary.withOpacity( - 0.4, + ? Get.theme.colorScheme.secondary.withValues( + alpha: 0.4, ) : Get.theme.colorScheme.primaryContainer, border: Border.all( color: templateId == array[index] - ? Get.theme.colorScheme.onPrimaryContainer.withOpacity( - 0.2, + ? Get.theme.colorScheme.onPrimaryContainer.withValues( + alpha: 0.2, ) - : Get.theme.colorScheme.onPrimaryContainer.withOpacity( - 0.1, + : Get.theme.colorScheme.onPrimaryContainer.withValues( + alpha: 0.1, ), ), borderRadius: const BorderRadius.all(Radius.circular(5)), diff --git a/lib/App/Views/Pages/Mockup/Widgets/Create/build_create_mockup_sidebar.dart b/lib/App/Views/Pages/Mockup/Widgets/Create/build_create_mockup_sidebar.dart index fa08836..b4e39a4 100644 --- a/lib/App/Views/Pages/Mockup/Widgets/Create/build_create_mockup_sidebar.dart +++ b/lib/App/Views/Pages/Mockup/Widgets/Create/build_create_mockup_sidebar.dart @@ -235,7 +235,7 @@ class BuildCreateMockupSidebar extends StatelessWidget { color: Get.theme.scaffoldBackgroundColor, border: Border( left: BorderSide( - color: Colors.grey.withOpacity(0.2), + color: Colors.grey.withValues(alpha: 0.2), width: 0.5, ), ), @@ -253,7 +253,7 @@ class BuildCreateMockupSidebar extends StatelessWidget { color: Get.theme.scaffoldBackgroundColor, border: Border( left: BorderSide( - color: Colors.grey.withOpacity(0.2), + color: Colors.grey.withValues(alpha: 0.2), width: 0.5, ), ), diff --git a/lib/App/Views/Pages/Mockup/Widgets/Templates/template_layout_config.dart b/lib/App/Views/Pages/Mockup/Widgets/Templates/template_layout_config.dart index 22cd0a2..1418482 100644 --- a/lib/App/Views/Pages/Mockup/Widgets/Templates/template_layout_config.dart +++ b/lib/App/Views/Pages/Mockup/Widgets/Templates/template_layout_config.dart @@ -52,9 +52,6 @@ class TemplateLayoutConfig { return twoDevicesConnectedRightTitleAbove(); case TemplateLayoutEnum.twoDevicesConnectedLeftTitleAbove: return twoDevicesConnectedLeftTitleAbove(); - - default: - return titleUp(); } } } diff --git a/lib/App/Views/Pages/Mockup/Widgets/build_device_card.dart b/lib/App/Views/Pages/Mockup/Widgets/build_device_card.dart index 839238e..98fbae1 100644 --- a/lib/App/Views/Pages/Mockup/Widgets/build_device_card.dart +++ b/lib/App/Views/Pages/Mockup/Widgets/build_device_card.dart @@ -396,7 +396,7 @@ class BuildDeviceHead extends StatelessWidget { return Container( width: width ?? 350, height: height ?? 50, - color: Colors.grey.withOpacity(0.25), + color: Colors.grey.withValues(alpha: 0.25), padding: const EdgeInsets.symmetric(horizontal: 10), child: Row( crossAxisAlignment: CrossAxisAlignment.center, diff --git a/lib/App/Views/Pages/Mockup/mockup_create_page.dart b/lib/App/Views/Pages/Mockup/mockup_create_page.dart index 8bce7f5..cc17f6b 100644 --- a/lib/App/Views/Pages/Mockup/mockup_create_page.dart +++ b/lib/App/Views/Pages/Mockup/mockup_create_page.dart @@ -36,7 +36,8 @@ class MockupCreatePage extends GetView { ElevatedButton( onPressed: () => controller.onStepCancel(), style: ElevatedButton.styleFrom( - backgroundColor: Colors.grey.withOpacity(0.1), + backgroundColor: + Colors.grey.withValues(alpha: 0.1), ), child: const Text('back'), ), diff --git a/lib/App/Views/Pages/Mockup/mockup_index_page.dart b/lib/App/Views/Pages/Mockup/mockup_index_page.dart index 9c422b6..6dfc6fc 100644 --- a/lib/App/Views/Pages/Mockup/mockup_index_page.dart +++ b/lib/App/Views/Pages/Mockup/mockup_index_page.dart @@ -108,7 +108,7 @@ class BuildMockupIndexItem extends StatelessWidget { borderRadius: BorderRadius.circular(2.spa), border: Border.all( color: controller.hoveredId == item.id - ? ColorHelper.hexToColor(item.color1!).withOpacity(0.5) + ? ColorHelper.hexToColor(item.color1!).withValues(alpha: 0.5) : Get.theme.colorScheme.secondaryContainer, width: 1, ), @@ -116,10 +116,10 @@ class BuildMockupIndexItem extends StatelessWidget { center: Alignment.topLeft, radius: 1, colors: [ - ColorHelper.hexToColor(item.color1 ?? '#000000') - .withOpacity(controller.hoveredId == item.id ? 0.2 : 0.1), - Get.theme.colorScheme.primaryContainer - .withOpacity(controller.hoveredId == item.id ? 0.2 : 0.1), + ColorHelper.hexToColor(item.color1 ?? '#000000').withValues( + alpha: controller.hoveredId == item.id ? 0.2 : 0.1), + Get.theme.colorScheme.primaryContainer.withValues( + alpha: controller.hoveredId == item.id ? 0.2 : 0.1), ], ), ), diff --git a/lib/App/Views/Pages/Mockup/mockup_single_page.dart b/lib/App/Views/Pages/Mockup/mockup_single_page.dart index d0a00c4..1eb767a 100644 --- a/lib/App/Views/Pages/Mockup/mockup_single_page.dart +++ b/lib/App/Views/Pages/Mockup/mockup_single_page.dart @@ -42,14 +42,15 @@ class MockupSinglePage extends GetView { decoration: BoxDecoration( gradient: LinearGradient( colors: [ - Get.theme.colorScheme.secondary.withOpacity(0.1), + Get.theme.colorScheme.secondary + .withValues(alpha: 0.1), Get.theme.colorScheme.secondary, ], begin: Alignment.topCenter, end: Alignment.bottomCenter, ), color: Get.theme.colorScheme.primaryContainer - .withOpacity(0.3), + .withValues(alpha: 0.3), border: Border( top: BorderSide( width: 1, @@ -325,7 +326,7 @@ class BuildMockupSinglePageBuddy extends StatelessWidget { width: 322.5, decoration: BoxDecoration( color: Get.theme.colorScheme.primaryContainer - .withOpacity(0.3), + .withValues(alpha: 0.3), border: Border.all( color: Get.theme.colorScheme.secondaryContainer, width: 1, diff --git a/lib/App/Views/Pages/Project/InnerPages/project_single_api_gen_page.dart b/lib/App/Views/Pages/Project/InnerPages/project_single_api_gen_page.dart index 76d49a6..d195208 100644 --- a/lib/App/Views/Pages/Project/InnerPages/project_single_api_gen_page.dart +++ b/lib/App/Views/Pages/Project/InnerPages/project_single_api_gen_page.dart @@ -94,8 +94,8 @@ class ProjectSingleApiGenPageSidebar extends StatelessWidget { TextSpan( text: ' / 5', style: TextStyle( - color: - Get.theme.colorScheme.onPrimary.withOpacity(0.5), + color: Get.theme.colorScheme.onPrimary + .withValues(alpha: 0.5), ), ), ], @@ -146,7 +146,7 @@ class ProjectSingleApiGenPageSidebar extends StatelessWidget { Icons.more_horiz, size: 8.spa, color: Get.theme.colorScheme.onPrimary - .withOpacity(0.5), + .withValues(alpha: 0.5), ), ) ], diff --git a/lib/App/Views/Pages/Project/InnerPages/project_single_wiki_page.dart b/lib/App/Views/Pages/Project/InnerPages/project_single_wiki_page.dart index 97bcf6c..b327b67 100644 --- a/lib/App/Views/Pages/Project/InnerPages/project_single_wiki_page.dart +++ b/lib/App/Views/Pages/Project/InnerPages/project_single_wiki_page.dart @@ -240,7 +240,7 @@ class BuildEmojiDialog extends StatelessWidget { init: EmojiDialogController(), tag: controllerTag, initState: (_) {}, - builder: (_) { + builder: (localController) { return BuildDefultDialog( child: Column( children: [ @@ -256,12 +256,12 @@ class BuildEmojiDialog extends StatelessWidget { final group = groups[index]; return InkWell( - onTap: () => _.changeActiveGroup(group), + onTap: () => localController.changeActiveGroup(group), child: Container( height: 35, width: 35, decoration: BoxDecoration( - color: _.activeGroup.name == group.name + color: localController.activeGroup.name == group.name ? Get.theme.colorScheme.primary : Get.theme.colorScheme.secondaryContainer, borderRadius: BorderRadius.circular(50), @@ -287,9 +287,9 @@ class BuildEmojiDialog extends StatelessWidget { crossAxisSpacing: 10, mainAxisSpacing: 10, ), - itemCount: _.emojiList.length, + itemCount: localController.emojiList.length, itemBuilder: (context, index) { - final emoji = _.emojiList[index]; + final emoji = localController.emojiList[index]; return InkWell( onTap: () { onEmojiSelected?.call(emoji.char); @@ -322,7 +322,7 @@ EditorStyle customizeEditorStyle() { return EditorStyle( padding: const EdgeInsets.only(left: 20, right: 20, top: 20), cursorColor: Get.theme.colorScheme.onSurface, - selectionColor: Colors.red.withOpacity(0.3), + selectionColor: Colors.red.withValues(alpha: 0.3), textStyleConfiguration: TextStyleConfiguration( text: TextStyle( color: Get.theme.colorScheme.onSurface, @@ -370,8 +370,8 @@ Map customBuilder() { ), textStyleBuilder: (value) { return TextStyle( - color: Get.theme.colorScheme.onSurface.withOpacity( - value ? 0.5 : 1, + color: Get.theme.colorScheme.onSurface.withValues( + alpha: value ? 0.5 : 1, ), fontStyle: value ? FontStyle.italic : FontStyle.normal, decoration: value ? TextDecoration.lineThrough : null, diff --git a/lib/App/Views/Pages/Project/Pages/project_single_page.dart b/lib/App/Views/Pages/Project/Pages/project_single_page.dart index aa71253..5370b46 100644 --- a/lib/App/Views/Pages/Project/Pages/project_single_page.dart +++ b/lib/App/Views/Pages/Project/Pages/project_single_page.dart @@ -27,7 +27,7 @@ class ProjectSinglePage extends GetView { state.controller?.fetchApi(projectId: id); }, initState: (_) {}, - builder: (_) { + builder: (localController) { return Material( child: BuildLoadingOrEmptyLayout( isLoading: controller.isLoading, @@ -37,7 +37,7 @@ class ProjectSinglePage extends GetView { child: Scaffold( appBar: hasAppBar == true ? BuildAppBar( - title: _.project.title ?? '', + title: localController.project.title ?? '', hasBackButton: true, onBack: () => Get.back(), ) diff --git a/lib/App/Views/Pages/Project/Widgets/ApiGen/build_api_gen_node.dart b/lib/App/Views/Pages/Project/Widgets/ApiGen/build_api_gen_node.dart index 501e69c..7c28bf8 100644 --- a/lib/App/Views/Pages/Project/Widgets/ApiGen/build_api_gen_node.dart +++ b/lib/App/Views/Pages/Project/Widgets/ApiGen/build_api_gen_node.dart @@ -16,10 +16,10 @@ class BuildApiGenNode extends GetView { return GetBuilder( init: BuildApiGenNodeController(), tag: 'api-gen-node-${const Uuid().v4()}', - builder: (_) { + builder: (localController) { return MouseRegion( - onHover: (event) => _.toggleHovring(true), - onExit: (event) => _.toggleHovring(false), + onHover: (event) => localController.toggleHovring(true), + onExit: (event) => localController.toggleHovring(false), child: Stack( alignment: Alignment.bottomCenter, children: [ @@ -32,7 +32,7 @@ class BuildApiGenNode extends GetView { color: Get.theme.colorScheme.primaryContainer, borderRadius: BorderRadius.circular(2.spa), border: Border.all( - color: _.isHovring + color: localController.isHovring ? Get.theme.colorScheme.inversePrimary : Get.theme.colorScheme.secondaryContainer, ), @@ -51,10 +51,10 @@ class BuildApiGenNode extends GetView { bottom: context.width * 0.002, child: InkWell( onTap: () => AppPrint.print('add workflow'), - onHover: (value) => _.togglePlusHovring(value), + onHover: (value) => localController.togglePlusHovring(value), child: AnimatedScale( duration: const Duration(milliseconds: 200), - scale: _.isPlusHovering ? 1.2 : 1, + scale: localController.isPlusHovering ? 1.2 : 1, child: Container( width: context.width * 0.015, height: context.width * 0.015, diff --git a/lib/App/Views/Pages/Project/Widgets/CodeGen/build_code_gen_floating_button.dart b/lib/App/Views/Pages/Project/Widgets/CodeGen/build_code_gen_floating_button.dart index f89aead..b4bee9e 100644 --- a/lib/App/Views/Pages/Project/Widgets/CodeGen/build_code_gen_floating_button.dart +++ b/lib/App/Views/Pages/Project/Widgets/CodeGen/build_code_gen_floating_button.dart @@ -56,7 +56,7 @@ class BuildCodeGenFloatingButton extends StatelessWidget { ), ), style: FilledButton.styleFrom( - backgroundColor: Colors.black.withOpacity(0.5), + backgroundColor: Colors.black.withValues(alpha: 0.5), ), child: Badge.count( count: controller.diffCount, @@ -100,7 +100,7 @@ class BuildCodeGenBuildOption extends StatelessWidget { title: const Text('Models'), activeColor: Get.theme.colorScheme.secondary, activeTrackColor: - Get.theme.colorScheme.secondary.withOpacity(0.3), + Get.theme.colorScheme.secondary.withValues(alpha: 0.3), decoration: const InputDecoration( contentPadding: EdgeInsets.symmetric( vertical: 10, @@ -114,7 +114,7 @@ class BuildCodeGenBuildOption extends StatelessWidget { initialValue: false, activeColor: Get.theme.colorScheme.secondary, activeTrackColor: - Get.theme.colorScheme.secondary.withOpacity(0.3), + Get.theme.colorScheme.secondary.withValues(alpha: 0.3), decoration: const InputDecoration( contentPadding: EdgeInsets.symmetric( vertical: 10, @@ -140,7 +140,7 @@ class BuildCodeGenBuildOption extends StatelessWidget { initialValue: false, activeColor: Get.theme.colorScheme.secondary, activeTrackColor: - Get.theme.colorScheme.secondary.withOpacity(0.3), + Get.theme.colorScheme.secondary.withValues(alpha: 0.3), decoration: const InputDecoration( contentPadding: EdgeInsets.symmetric( vertical: 10, @@ -167,7 +167,7 @@ class BuildCodeGenBuildOption extends StatelessWidget { initialValue: false, activeColor: Get.theme.colorScheme.secondary, activeTrackColor: - Get.theme.colorScheme.secondary.withOpacity(0.3), + Get.theme.colorScheme.secondary.withValues(alpha: 0.3), decoration: const InputDecoration( contentPadding: EdgeInsets.symmetric( vertical: 10, @@ -183,7 +183,7 @@ class BuildCodeGenBuildOption extends StatelessWidget { initialValue: false, activeColor: Get.theme.colorScheme.secondary, activeTrackColor: - Get.theme.colorScheme.secondary.withOpacity(0.3), + Get.theme.colorScheme.secondary.withValues(alpha: 0.3), decoration: const InputDecoration( contentPadding: EdgeInsets.symmetric( vertical: 10, @@ -222,7 +222,7 @@ class BuildCodeGenBuildOption extends StatelessWidget { initialValue: false, activeColor: Get.theme.colorScheme.secondary, activeTrackColor: - Get.theme.colorScheme.secondary.withOpacity(0.3), + Get.theme.colorScheme.secondary.withValues(alpha: 0.3), decoration: const InputDecoration( contentPadding: EdgeInsets.symmetric( vertical: 10, @@ -238,7 +238,7 @@ class BuildCodeGenBuildOption extends StatelessWidget { initialValue: false, activeColor: Get.theme.colorScheme.secondary, activeTrackColor: - Get.theme.colorScheme.secondary.withOpacity(0.3), + Get.theme.colorScheme.secondary.withValues(alpha: 0.3), decoration: const InputDecoration( contentPadding: EdgeInsets.symmetric( vertical: 10, diff --git a/lib/App/Views/Pages/Project/Widgets/CodeGen/build_code_gen_node.dart b/lib/App/Views/Pages/Project/Widgets/CodeGen/build_code_gen_node.dart index 042f31e..f6d6800 100644 --- a/lib/App/Views/Pages/Project/Widgets/CodeGen/build_code_gen_node.dart +++ b/lib/App/Views/Pages/Project/Widgets/CodeGen/build_code_gen_node.dart @@ -64,7 +64,7 @@ class BuildCodeGenNode extends StatelessWidget { children: [ Icon( Icons.drag_indicator, - color: Get.theme.colorScheme.onSurface.withOpacity(0.3), + color: Get.theme.colorScheme.onSurface.withValues(alpha: 0.3), ), Text(item.modelName != null ? '${item.modelName}_model'.toPascalCase() @@ -94,7 +94,7 @@ class BuildCodeGenNode extends StatelessWidget { if (propertiesNoRelation.isNotEmpty) Container( color: Get.theme.colorScheme.secondaryContainer - .withOpacity(0.3), + .withValues(alpha: 0.3), child: ListView.separated( itemCount: propertiesNoRelation.length, shrinkWrap: true, @@ -112,7 +112,7 @@ class BuildCodeGenNode extends StatelessWidget { trailing: Badge( label: Text(property.type?.type ?? 'Type11'), backgroundColor: - property.type?.color.withOpacity(0.1), + property.type?.color.withValues(alpha: 0.1), textColor: property.type?.color, textStyle: TextStyle( fontSize: 3.5.spa, @@ -157,7 +157,7 @@ class BuildCodeGenNode extends StatelessWidget { style: TextStyle(fontSize: 3.5.spa), ), backgroundColor: - property.type?.color.withOpacity(0.1), + property.type?.color.withValues(alpha: 0.1), textColor: property.type?.color, padding: EdgeInsets.symmetric(horizontal: 3.spa), largeSize: 8.spa, diff --git a/lib/App/Views/Pages/Project/Widgets/Files/build_project_single_files_list.dart b/lib/App/Views/Pages/Project/Widgets/Files/build_project_single_files_list.dart index 576297c..1f0aba3 100644 --- a/lib/App/Views/Pages/Project/Widgets/Files/build_project_single_files_list.dart +++ b/lib/App/Views/Pages/Project/Widgets/Files/build_project_single_files_list.dart @@ -57,7 +57,7 @@ class BuildProjectSingleFilesList extends StatelessWidget { file.size?.toFileSize() ?? '', style: Get.textTheme.bodyMedium?.copyWith( fontSize: 5.spa, - color: Get.theme.colorScheme.onSurface.withOpacity(0.4), + color: Get.theme.colorScheme.onSurface.withValues(alpha: 0.4), ), ), SizedBox(width: 2.spa), diff --git a/lib/App/Views/Pages/Project/Widgets/Files/build_project_single_files_sidebar.dart b/lib/App/Views/Pages/Project/Widgets/Files/build_project_single_files_sidebar.dart index b86525e..fffe2ca 100644 --- a/lib/App/Views/Pages/Project/Widgets/Files/build_project_single_files_sidebar.dart +++ b/lib/App/Views/Pages/Project/Widgets/Files/build_project_single_files_sidebar.dart @@ -72,7 +72,7 @@ class BuildProjectSingleFilesSidebar extends StatelessWidget { 'used Storage'.capitalize!, style: Get.textTheme.bodyMedium?.copyWith( color: Get.theme.colorScheme.onSurface - .withOpacity(0.4), + .withValues(alpha: 0.4), ), ), Text( @@ -89,7 +89,7 @@ class BuildProjectSingleFilesSidebar extends StatelessWidget { 'total Storage'.capitalize!, style: Get.textTheme.bodyMedium?.copyWith( color: Get.theme.colorScheme.onSurface - .withOpacity(0.4), + .withValues(alpha: 0.4), ), ), Text( diff --git a/lib/App/Views/Pages/Project/Widgets/Files/build_project_single_files_type_with_size.dart b/lib/App/Views/Pages/Project/Widgets/Files/build_project_single_files_type_with_size.dart index af248b5..f174eb6 100644 --- a/lib/App/Views/Pages/Project/Widgets/Files/build_project_single_files_type_with_size.dart +++ b/lib/App/Views/Pages/Project/Widgets/Files/build_project_single_files_type_with_size.dart @@ -22,8 +22,8 @@ class BuildProjectSingleFilesTypeWithSize extends StatelessWidget { horizontal: 4.spa, ), decoration: BoxDecoration( - color: - color?.withOpacity(0.07) ?? Get.theme.colorScheme.primaryContainer, + color: color?.withValues(alpha: 0.07) ?? + Get.theme.colorScheme.primaryContainer, borderRadius: BorderRadius.circular(10), ), child: Row( diff --git a/lib/App/Views/Pages/Project/Widgets/build_create_or_edit_sheet.dart b/lib/App/Views/Pages/Project/Widgets/build_create_or_edit_sheet.dart index eb99ef0..4c67263 100644 --- a/lib/App/Views/Pages/Project/Widgets/build_create_or_edit_sheet.dart +++ b/lib/App/Views/Pages/Project/Widgets/build_create_or_edit_sheet.dart @@ -232,7 +232,7 @@ class BuildAddPropertiesSection extends StatelessWidget { if (controller.tempModel.properties != null) Container( color: Get.theme.colorScheme.secondaryContainer - .withOpacity(0.3), + .withValues(alpha: 0.3), child: ListView.separated( itemCount: controller.tempModel.properties?.length ?? 0, shrinkWrap: true, @@ -253,7 +253,7 @@ class BuildAddPropertiesSection extends StatelessWidget { Badge( label: Text(property.type?.type ?? 'Type'), backgroundColor: - property.type?.color.withOpacity(0.1), + property.type?.color.withValues(alpha: 0.1), textColor: property.type?.color, textStyle: TextStyle( fontSize: 3.5.spa, diff --git a/lib/App/Views/Pages/Project/Widgets/build_icon_and_gradients.dart b/lib/App/Views/Pages/Project/Widgets/build_icon_and_gradients.dart index f5b17fc..6de21c3 100644 --- a/lib/App/Views/Pages/Project/Widgets/build_icon_and_gradients.dart +++ b/lib/App/Views/Pages/Project/Widgets/build_icon_and_gradients.dart @@ -35,7 +35,7 @@ class BuildIconAndGradients extends StatelessWidget { init: BuildIconAndGradientsController(), tag: controllerTag, initState: (_) {}, - builder: (_) { + builder: (localController) { return Stack( clipBehavior: Clip.none, children: [ @@ -51,24 +51,25 @@ class BuildIconAndGradients extends StatelessWidget { ), ), ), - child: (_.colors.isEmpty || _.svgs.isEmpty) + child: (localController.colors.isEmpty || + localController.svgs.isEmpty) ? const BuildLoadingPage() : alignment == PossionAlignment.sideBySide ? Row( children: [ _BuildIconSection( - svgs: _.svgs, + svgs: localController.svgs, onSvgChange: (val) { - _.onSVGChange(val); + localController.onSVGChange(val); onSvgChange.call(val); }, - colors: _.colors, + colors: localController.colors, ), const VerticalDivider(width: 0), _BuildColorsSection( - colors: _.colors, + colors: localController.colors, onColorChange: (val) { - _.onColorChange(val); + localController.onColorChange(val); onColorChange.call(val); }, ), @@ -77,19 +78,19 @@ class BuildIconAndGradients extends StatelessWidget { : Column( children: [ _BuildIconSection( - svgs: _.svgs, + svgs: localController.svgs, onSvgChange: (val) { - _.onSVGChange(val); + localController.onSVGChange(val); onSvgChange.call(val); }, - colors: _.colors, + colors: localController.colors, crossAxisCount: 10, ), const Divider(), _BuildColorsSection( - colors: _.colors, + colors: localController.colors, onColorChange: (val) { - _.onColorChange(val); + localController.onColorChange(val); onColorChange.call(val); }, crossAxisCount: 10, @@ -225,15 +226,15 @@ class _BuildIconSection extends StatelessWidget { Container( padding: EdgeInsets.all(3.spa), decoration: BoxDecoration( - color: Colors.grey.withOpacity(0.1), + color: Colors.grey.withValues(alpha: 0.1), border: Border.all( - color: Colors.grey.withOpacity(0.1), + color: Colors.grey.withValues(alpha: 0.1), ), borderRadius: BorderRadius.circular(6), ), child: SvgPicture.asset( 'assets/svg/${svgs[i]}', - // color: Colors.grey.withOpacity(0.5), + // color: Colors.grey.withValues(alpha:0.5), colorFilter: const ColorFilter.mode( Colors.white, BlendMode.srcATop, diff --git a/lib/App/Views/Pages/Project/Widgets/build_single_project_head_info.dart b/lib/App/Views/Pages/Project/Widgets/build_single_project_head_info.dart index d556a93..b2b092e 100644 --- a/lib/App/Views/Pages/Project/Widgets/build_single_project_head_info.dart +++ b/lib/App/Views/Pages/Project/Widgets/build_single_project_head_info.dart @@ -116,7 +116,7 @@ class BuildEditProject extends StatelessWidget { state.controller?.updateIcon(controller.project.icon ?? ''); }, initState: (_) {}, - builder: (_) { + builder: (localController) { return FormBuilder( key: formKey, initialValue: { @@ -136,8 +136,9 @@ class BuildEditProject extends StatelessWidget { header: const SizedBox.shrink(), footer: const SizedBox.shrink(), body: BuildIconAndGradients( - onColorChange: (val) => _.updateColors(val), - onSvgChange: (val) => _.updateIcon(val), + onColorChange: (val) => + localController.updateColors(val), + onSvgChange: (val) => localController.updateIcon(val), hasCloseButton: false, alignment: PossionAlignment.topBottom, ), @@ -145,10 +146,11 @@ class BuildEditProject extends StatelessWidget { }, child: BuildProjectAvatar( colors: [ - ColorHelper.hexToColor(_.activeColors.first), - ColorHelper.hexToColor(_.activeColors.last), + ColorHelper.hexToColor( + localController.activeColors.first), + ColorHelper.hexToColor(localController.activeColors.last), ], - icon: _.activeIcon, + icon: localController.activeIcon, ), ), SizedBox(height: 8.spa), @@ -173,7 +175,8 @@ class BuildEditProject extends StatelessWidget { children: [ FilledButton( onPressed: () async { - ProjectModel? item = await _.updateProject( + ProjectModel? item = + await localController.updateProject( project: controller.project.copyWith( title: formKey.currentState?.fields['title']?.value, diff --git a/lib/App/Views/Pages/Project/Widgets/build_single_project_header.dart b/lib/App/Views/Pages/Project/Widgets/build_single_project_header.dart index d9d9577..5b70036 100644 --- a/lib/App/Views/Pages/Project/Widgets/build_single_project_header.dart +++ b/lib/App/Views/Pages/Project/Widgets/build_single_project_header.dart @@ -24,9 +24,9 @@ class BuildSingleProjectHeader extends StatelessWidget { gradient: LinearGradient( colors: [ ColorHelper.hexToColor(controller.project.color1 ?? '#000000') - .withOpacity(0.1), + .withValues(alpha: 0.1), ColorHelper.hexToColor(controller.project.color2 ?? '#000000') - .withOpacity(0.06), + .withValues(alpha: 0.06), ], begin: Alignment.topLeft, end: Alignment.bottomRight, diff --git a/lib/App/Views/Pages/Project/Widgets/build_single_project_parked_at.dart b/lib/App/Views/Pages/Project/Widgets/build_single_project_parked_at.dart index 1876647..8e91c8b 100644 --- a/lib/App/Views/Pages/Project/Widgets/build_single_project_parked_at.dart +++ b/lib/App/Views/Pages/Project/Widgets/build_single_project_parked_at.dart @@ -47,7 +47,7 @@ class BuildSingleProjectParkedAt extends StatelessWidget { path ?? 'No path', style: Get.textTheme.bodySmall!.copyWith( color: Get.theme.colorScheme.onPrimaryContainer - .withOpacity(0.7), + .withValues(alpha: 0.7), fontStyle: FontStyle.italic, ), ), diff --git a/lib/App/Views/Pages/Project/Widgets/build_single_project_tap_header.dart b/lib/App/Views/Pages/Project/Widgets/build_single_project_tap_header.dart index b79d4c2..1da696a 100644 --- a/lib/App/Views/Pages/Project/Widgets/build_single_project_tap_header.dart +++ b/lib/App/Views/Pages/Project/Widgets/build_single_project_tap_header.dart @@ -12,7 +12,7 @@ class BuildSingleProjectTapHeader extends StatelessWidget { dividerColor: Get.theme.colorScheme.secondaryContainer, indicatorColor: Get.theme.primaryColorLight, labelColor: Get.theme.primaryColorLight, - unselectedLabelColor: Get.theme.colorScheme.onBackground, + unselectedLabelColor: Get.theme.colorScheme.onSurface, indicatorSize: TabBarIndicatorSize.label, isScrollable: true, enableFeedback: true, diff --git a/lib/App/Views/Pages/Team/no_team_page.dart b/lib/App/Views/Pages/Team/no_team_page.dart index 7ecf66d..9da49fd 100644 --- a/lib/App/Views/Pages/Team/no_team_page.dart +++ b/lib/App/Views/Pages/Team/no_team_page.dart @@ -177,7 +177,8 @@ class _BuildTabs extends StatelessWidget { automaticIndicatorColorAdjustment: true, dividerColor: Colors.transparent, labelColor: Get.theme.colorScheme.secondary, - unselectedLabelColor: Get.theme.colorScheme.secondary.withOpacity(0.5), + unselectedLabelColor: + Get.theme.colorScheme.secondary.withValues(alpha: 0.5), tabs: const [ Tab(text: 'Create Team'), Tab(text: 'Join Team'), diff --git a/lib/Config/app_gradients.dart b/lib/Config/app_gradients.dart index 04982b5..20639d1 100644 --- a/lib/Config/app_gradients.dart +++ b/lib/Config/app_gradients.dart @@ -11,8 +11,8 @@ class AppGradients { }) { return LinearGradient( colors: [ - colors[0].withOpacity(firstOpacity), - colors[1].withOpacity(secondOpacity), + colors[0].withValues(alpha: firstOpacity), + colors[1].withValues(alpha: secondOpacity), ], begin: Alignment.topLeft, end: Alignment.bottomRight, diff --git a/lib/Config/app_theme.dart b/lib/Config/app_theme.dart index a4e6b83..5b0d407 100644 --- a/lib/Config/app_theme.dart +++ b/lib/Config/app_theme.dart @@ -38,8 +38,7 @@ class AppTheme { onPrimary: Colors.black, secondary: lightColors['secondary']!, onSecondary: Colors.black, - background: lightColors['background']!, - onBackground: Colors.black, + onSurface: Colors.black, primaryContainer: lightColors['primaryContainer']!, secondaryContainer: lightColors['secondaryContainer']!, surface: lightColors['scaffoldBackgroundColor']!, @@ -53,7 +52,8 @@ class AppTheme { outlinedButtonTheme: OutlinedButtonThemeData( style: OutlinedButton.styleFrom( side: BorderSide(color: lightColors['secondaryContainer']!), - backgroundColor: lightColors['primaryContainer']!.withOpacity(0.3), + backgroundColor: + lightColors['primaryContainer']!.withValues(alpha: 0.3), padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 16), shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(5)), foregroundColor: lightColors['secondary']!, @@ -286,11 +286,10 @@ class AppTheme { onPrimary: Colors.white, secondary: darkColors['secondary']!, onSecondary: Colors.white, - background: darkColors['background']!, - onBackground: Colors.white, primaryContainer: darkColors['primaryContainer']!, secondaryContainer: darkColors['secondaryContainer']!, surface: darkColors['scaffoldBackgroundColor']!, + onSurface: Colors.white, ), dialogBackgroundColor: darkColors['primaryContainer']!, hoverColor: Colors.transparent, @@ -301,7 +300,8 @@ class AppTheme { outlinedButtonTheme: OutlinedButtonThemeData( style: OutlinedButton.styleFrom( side: BorderSide(color: darkColors['secondaryContainer']!), - backgroundColor: darkColors['primaryContainer']!.withOpacity(0.3), + backgroundColor: + darkColors['primaryContainer']!.withValues(alpha: 0.3), padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 16), shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(5)), foregroundColor: darkColors['secondary']!, @@ -491,7 +491,7 @@ class AppTheme { letterSpacing: 1.25, ), bodySmall: TextStyle( - color: Colors.white.withOpacity(0.5), + color: Colors.white.withValues(alpha: 0.5), fontSize: 12, fontWeight: FontWeight.w400, letterSpacing: 0.4, diff --git a/lib/Config/themes/main/colors.dart b/lib/Config/themes/main/colors.dart index 2bedbc4..832a704 100644 --- a/lib/Config/themes/main/colors.dart +++ b/lib/Config/themes/main/colors.dart @@ -18,11 +18,9 @@ const lightColorScheme = ColorScheme( errorContainer: Color(0xFFFFDAD6), onError: Color(0xFFFFFFFF), onErrorContainer: Color(0xFF410002), - background: Color(0xFFF8FDFF), - onBackground: Color(0xFF001F25), surface: Color(0xFFF8FDFF), onSurface: Color(0xFF001F25), - surfaceVariant: Color(0xFFE6E0EC), + surfaceContainerHighest: Color(0xFFE6E0EC), onSurfaceVariant: Color(0xFF48454E), outline: Color(0xFF79757F), onInverseSurface: Color(0xFFD6F6FF), @@ -52,11 +50,9 @@ const darkColorScheme = ColorScheme( errorContainer: Color(0xFF93000A), onError: Color(0xFF690005), onErrorContainer: Color(0xFFFFDAD6), - background: Color(0xFF001F25), - onBackground: Color(0xFFA6EEFF), surface: Color(0xFF001F25), onSurface: Color(0xFFA6EEFF), - surfaceVariant: Color(0xFF48454E), + surfaceContainerHighest: Color(0xFF48454E), onSurfaceVariant: Color(0xFFCAC4CF), outline: Color(0xFF938F99), onInverseSurface: Color(0xFF001F25), diff --git a/lib/Helpers/colors_helper.dart b/lib/Helpers/colors_helper.dart index 3afff5d..a072a1e 100644 --- a/lib/Helpers/colors_helper.dart +++ b/lib/Helpers/colors_helper.dart @@ -1,3 +1,5 @@ +// ignore_for_file: deprecated_member_use + import 'package:flutter/material.dart'; class ColorHelper { @@ -29,16 +31,16 @@ class ColorHelper { extension ColorExtension on Color { MaterialColor toMaterialColor() { Map swatch = { - 50: withOpacity(0.1), - 100: withOpacity(0.2), - 200: withOpacity(0.3), - 300: withOpacity(0.4), - 400: withOpacity(0.5), - 500: withOpacity(0.6), - 600: withOpacity(0.7), - 700: withOpacity(0.8), - 800: withOpacity(0.9), - 900: withOpacity(1.0), + 50: withValues(alpha: 0.1), + 100: withValues(alpha: 0.2), + 200: withValues(alpha: 0.3), + 300: withValues(alpha: 0.4), + 400: withValues(alpha: 0.5), + 500: withValues(alpha: 0.6), + 600: withValues(alpha: 0.7), + 700: withValues(alpha: 0.8), + 800: withValues(alpha: 0.9), + 900: withValues(alpha: 1.0), }; MaterialColor materialColor = MaterialColor(value, swatch); diff --git a/lib/main.dart b/lib/main.dart index 364b239..cd9a70e 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -34,7 +34,7 @@ class MyApp extends StatelessWidget { @override Widget build(BuildContext context) { - return ResponsiveSizer( + return Sizer( builder: (context, orientation, deviceType) { return GetMaterialApp( title: 'Flutter ++', diff --git a/pubspec.lock b/pubspec.lock index 40e3c77..1550340 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1,27 +1,6 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: - _fe_analyzer_shared: - dependency: transitive - description: - name: _fe_analyzer_shared - sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834 - url: "https://pub.dev" - source: hosted - version: "72.0.0" - _macros: - dependency: transitive - description: dart - source: sdk - version: "0.3.2" - analyzer: - dependency: transitive - description: - name: analyzer - sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139 - url: "https://pub.dev" - source: hosted - version: "6.7.0" animated_flip_counter: dependency: "direct main" description: @@ -34,10 +13,10 @@ packages: dependency: transitive description: name: app_links - sha256: "4acba851087b25136e8f6e32a53bd4536eb3bec69947ddb66e7b9a5792ceb0c7" + sha256: "433df2e61b10519407475d7f69e470789d23d593f28224c38ba1068597be7950" url: "https://pub.dev" source: hosted - version: "6.2.0" + version: "6.3.3" app_links_linux: dependency: transitive description: @@ -66,10 +45,10 @@ packages: dependency: "direct main" description: name: appflowy_editor - sha256: "6908405eef0703dbfc3f8d633d717cb5fb8009b7fd2b9f598795110bf849a6e4" + sha256: "568a9e73315442157fdd0ff892aa5abed418bec0c1bf8885bb352c26d078a57f" url: "https://pub.dev" source: hosted - version: "3.1.0" + version: "4.0.0" archive: dependency: transitive description: @@ -82,10 +61,10 @@ packages: dependency: transitive description: name: args - sha256: "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a" + sha256: bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6 url: "https://pub.dev" source: hosted - version: "2.5.0" + version: "2.6.0" arrow_path: dependency: transitive description: @@ -122,10 +101,10 @@ packages: dependency: transitive description: name: bidi - sha256: "1a7d0c696324b2089f72e7671fd1f1f64fef44c980f3cebc84e803967c597b63" + sha256: "9a712c7ddf708f7c41b1923aa83648a3ed44cfd75b04f72d598c45e5be287f9d" url: "https://pub.dev" source: hosted - version: "2.0.10" + version: "2.0.12" boolean_selector: dependency: transitive description: @@ -146,10 +125,10 @@ packages: dependency: transitive description: name: charcode - sha256: fb98c0f6d12c920a02ee2d998da788bca066ca5f148492b7085ee23372b12306 + sha256: fb0f1107cac15a5ea6ef0a6ef71a807b9e4267c713bb93e00e92d737cc8dbd8a url: "https://pub.dev" source: hosted - version: "1.3.1" + version: "1.4.0" checked_yaml: dependency: transitive description: @@ -162,10 +141,10 @@ packages: dependency: transitive description: name: cli_util - sha256: c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19 + sha256: ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c url: "https://pub.dev" source: hosted - version: "0.4.1" + version: "0.4.2" clipboard: dependency: "direct main" description: @@ -186,10 +165,10 @@ packages: dependency: transitive description: name: collection - sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf url: "https://pub.dev" source: hosted - version: "1.18.0" + version: "1.19.0" console: dependency: transitive description: @@ -198,14 +177,6 @@ packages: url: "https://pub.dev" source: hosted version: "4.1.0" - convert: - dependency: transitive - description: - name: convert - sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592" - url: "https://pub.dev" - source: hosted - version: "3.1.1" cross_file: dependency: transitive description: @@ -218,18 +189,18 @@ packages: dependency: transitive description: name: crypto - sha256: ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27 + sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855" url: "https://pub.dev" source: hosted - version: "3.0.5" + version: "3.0.6" csslib: dependency: transitive description: name: csslib - sha256: "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb" + sha256: "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e" url: "https://pub.dev" source: hosted - version: "1.0.0" + version: "1.0.2" cupertino_icons: dependency: "direct main" description: @@ -246,14 +217,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.21" - dart_style: - dependency: transitive - description: - name: dart_style - sha256: "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9" - url: "https://pub.dev" - source: hosted - version: "2.3.6" dashed_circular_progress_bar: dependency: "direct main" description: @@ -282,10 +245,10 @@ packages: dependency: transitive description: name: device_info_plus_platform_interface - sha256: "282d3cf731045a2feb66abfe61bbc40870ae50a3ed10a4d3d217556c35c8c2ba" + sha256: "0b04e02b30791224b31969eb1b50d723498f402971bff3630bca2ba839bd1ed2" url: "https://pub.dev" source: hosted - version: "7.0.1" + version: "7.0.2" diff_match_patch: dependency: transitive description: @@ -306,10 +269,10 @@ packages: dependency: "direct main" description: name: expansion_tile_group - sha256: "9226c6da4759b7c69dc78514d151a05765d7b6e75415eba70c95b032c534d74e" + sha256: "4e54d21767241c1922ccee1b18636d8447835b82f94c9e177b31c21b968644cb" url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "2.1.0" fake_async: dependency: transitive description: @@ -338,18 +301,18 @@ packages: dependency: transitive description: name: file - sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c" + sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4 url: "https://pub.dev" source: hosted - version: "7.0.0" + version: "7.0.1" file_picker: dependency: transitive description: name: file_picker - sha256: "167bb619cdddaa10ef2907609feb8a79c16dfa479d3afaf960f8e223f754bf12" + sha256: c904b4ab56d53385563c7c39d8e9fa9af086f91495dfc48717ad84a42c3cf204 url: "https://pub.dev" source: hosted - version: "8.1.2" + version: "8.1.7" file_selector: dependency: "direct main" description: @@ -362,34 +325,34 @@ packages: dependency: transitive description: name: file_selector_android - sha256: "77f23eb5916fd0875946720d1f286f809a28a867d4882db6ac2cf053e2d5f7c6" + sha256: "98ac58e878b05ea2fdb204e7f4fc4978d90406c9881874f901428e01d3b18fbc" url: "https://pub.dev" source: hosted - version: "0.5.1+6" + version: "0.5.1+12" file_selector_ios: dependency: transitive description: name: file_selector_ios - sha256: "38ebf91ecbcfa89a9639a0854ccaed8ab370c75678938eebca7d34184296f0bb" + sha256: "94b98ad950b8d40d96fee8fa88640c2e4bd8afcdd4817993bd04e20310f45420" url: "https://pub.dev" source: hosted - version: "0.5.3" + version: "0.5.3+1" file_selector_linux: dependency: transitive description: name: file_selector_linux - sha256: "045d372bf19b02aeb69cacf8b4009555fb5f6f0b7ad8016e5f46dd1387ddd492" + sha256: "54cbbd957e1156d29548c7d9b9ec0c0ebb6de0a90452198683a7d23aed617a33" url: "https://pub.dev" source: hosted - version: "0.9.2+1" + version: "0.9.3+2" file_selector_macos: dependency: transitive description: name: file_selector_macos - sha256: f42eacb83b318e183b1ae24eead1373ab1334084404c8c16e0354f9a3e55d385 + sha256: "271ab9986df0c135d45c3cdb6bd0faa5db6f4976d3e4b437cf7d0f258d941bfc" url: "https://pub.dev" source: hosted - version: "0.9.4" + version: "0.9.4+2" file_selector_platform_interface: dependency: transitive description: @@ -410,42 +373,42 @@ packages: dependency: transitive description: name: file_selector_windows - sha256: "2ad726953f6e8affbc4df8dc78b77c3b4a060967a291e528ef72ae846c60fb69" + sha256: "8f5d2f6590d51ecd9179ba39c64f722edc15226cc93dcc8698466ad36a4a85a4" url: "https://pub.dev" source: hosted - version: "0.9.3+2" + version: "0.9.3+3" fixnum: dependency: transitive description: name: fixnum - sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1" + sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.1.1" flex_color_picker: dependency: "direct main" description: name: flex_color_picker - sha256: "5c846437069fb7afdd7ade6bf37e628a71d2ab0787095ddcb1253bf9345d5f3a" + sha256: c083b79f1c57eaeed9f464368be376951230b3cb1876323b784626152a86e480 url: "https://pub.dev" source: hosted - version: "3.4.1" + version: "3.7.0" flex_color_scheme: dependency: "direct main" description: name: flex_color_scheme - sha256: "32914024a4f404d90ff449f58d279191675b28e7c08824046baf06826e99d984" + sha256: "09bea5d776f694c5a67f2229f2aa500cc7cce369322dc6500ab01cf9ad1b4e1a" url: "https://pub.dev" source: hosted - version: "7.3.1" + version: "8.1.0" flex_seed_scheme: dependency: transitive description: name: flex_seed_scheme - sha256: "4cee2f1d07259f77e8b36f4ec5f35499d19e74e17c7dce5b819554914082bc01" + sha256: d3ba3c5c92d2d79d45e94b4c6c71d01fac3c15017da1545880c53864da5dfeb0 url: "https://pub.dev" source: hosted - version: "1.5.0" + version: "3.5.0" flutter: dependency: "direct main" description: flutter @@ -455,34 +418,34 @@ packages: dependency: "direct main" description: name: flutter_dotenv - sha256: "9357883bdd153ab78cbf9ffa07656e336b8bbb2b5a3ca596b0b27e119f7c7d77" + sha256: b7c7be5cd9f6ef7a78429cabd2774d3c4af50e79cb2b7593e3d5d763ef95c61b url: "https://pub.dev" source: hosted - version: "5.1.0" + version: "5.2.1" flutter_form_builder: dependency: "direct main" description: name: flutter_form_builder - sha256: b42ad8a9b3e8a629eb0fee8e4feaf7c2862fc40808ebf9f7ddc9da798e890136 + sha256: "375da52998c72f80dec9187bd93afa7ab202b89d5d066699368ff96d39fd4876" url: "https://pub.dev" source: hosted - version: "9.4.1" + version: "9.7.0" flutter_launcher_icons: dependency: "direct main" description: name: flutter_launcher_icons - sha256: "526faf84284b86a4cb36d20a5e45147747b7563d921373d4ee0559c54fcdbcea" + sha256: "31cd0885738e87c72d6f055564d37fabcdacee743b396b78c7636c169cac64f5" url: "https://pub.dev" source: hosted - version: "0.13.1" + version: "0.14.2" flutter_lints: dependency: "direct dev" description: name: flutter_lints - sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c" + sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1" url: "https://pub.dev" source: hosted - version: "4.0.0" + version: "5.0.0" flutter_localizations: dependency: "direct main" description: flutter @@ -500,26 +463,26 @@ packages: dependency: "direct main" description: name: flutter_platform_alert - sha256: caf2d6350f7fe7aae2a89a7d39fcb6bedaba477a4383f321ef475b8f9cde0a4b + sha256: "29a27c81660468bfb7746bc78205f79e07f18ca785e0aeaf70eac28d7a011edb" url: "https://pub.dev" source: hosted - version: "0.5.3" + version: "0.6.1" flutter_plugin_android_lifecycle: dependency: transitive description: name: flutter_plugin_android_lifecycle - sha256: "9d98bd47ef9d34e803d438f17fd32b116d31009f534a6fa5ce3a1167f189a6de" + sha256: "615a505aef59b151b46bbeef55b36ce2b6ed299d160c51d84281946f0aa0ce0e" url: "https://pub.dev" source: hosted - version: "2.0.21" + version: "2.0.24" flutter_svg: dependency: "direct main" description: name: flutter_svg - sha256: "7b4ca6cf3304575fe9c8ec64813c8d02ee41d2afe60bcfe0678bcb5375d596a2" + sha256: "54900a1a1243f3c4a5506d853a2b5c2dbc38d5f27e52a52618a8054401431123" url: "https://pub.dev" source: hosted - version: "2.0.10+1" + version: "2.0.16" flutter_test: dependency: "direct dev" description: flutter @@ -534,10 +497,10 @@ packages: dependency: "direct main" description: name: form_builder_validators - sha256: c61ed7b1deecf0e1ebe49e2fa79e3283937c5a21c7e48e3ed9856a4a14e1191a + sha256: "517fb884183fff7a0ef3db7d375981011da26ee452f20fb3d2e788ad527ad01d" url: "https://pub.dev" source: hosted - version: "11.0.0" + version: "11.1.1" freezed_annotation: dependency: transitive description: @@ -550,10 +513,10 @@ packages: dependency: transitive description: name: functions_client - sha256: e63f49cd3b41727f47b3bde284a11a4ac62839e0604f64077d4257487510e484 + sha256: "61597ed93be197b1be6387855e4b760e6aac2355fcfc4df6d20d2b4579982158" url: "https://pub.dev" source: hosted - version: "2.3.2" + version: "2.4.0" get: dependency: "direct main" description: @@ -578,14 +541,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.1" - glob: - dependency: transitive - description: - name: glob - sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63" - url: "https://pub.dev" - source: hosted - version: "2.1.2" glowy_borders: dependency: "direct main" description: @@ -606,10 +561,10 @@ packages: dependency: transitive description: name: gotrue - sha256: "8703db795511f69194fe77125a0c838bbb6befc2f95717b6e40331784a8bdecb" + sha256: d6362dff9a54f8c1c372bb137c858b4024c16407324d34e6473e59623c9b9f50 url: "https://pub.dev" source: hosted - version: "2.8.4" + version: "2.11.1" graphite: dependency: "direct main" description: @@ -630,18 +585,18 @@ packages: dependency: "direct main" description: name: heroicons - sha256: "762f907af146105a3956e61e16e0a2cafadd39317e88cc4e4d0ed32846a0452e" + sha256: "4da0ce23d7c25b35390cb6cf485e33b959e811541e9d9cb33a1fceb3d6705f0c" url: "https://pub.dev" source: hosted - version: "0.10.0" + version: "0.11.0" html: dependency: transitive description: name: html - sha256: "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a" + sha256: "1fc58edeaec4307368c60d59b7e15b9d658b57d7f3125098b6294153c75337ec" url: "https://pub.dev" source: hosted - version: "0.15.4" + version: "0.15.5" http: dependency: transitive description: @@ -654,18 +609,18 @@ packages: dependency: transitive description: name: http_parser - sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b" + sha256: "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571" url: "https://pub.dev" source: hosted - version: "4.0.2" + version: "4.1.2" image: dependency: "direct main" description: name: image - sha256: "2237616a36c0d69aef7549ab439b833fb7f9fb9fc861af2cc9ac3eedddd69ca8" + sha256: f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d url: "https://pub.dev" source: hosted - version: "4.2.0" + version: "4.3.0" intl: dependency: transitive description: @@ -674,14 +629,6 @@ packages: url: "https://pub.dev" source: hosted version: "0.19.0" - intl_utils: - dependency: transitive - description: - name: intl_utils - sha256: c2b1f5c72c25512cbeef5ab015c008fc50fe7e04813ba5541c25272300484bf4 - url: "https://pub.dev" - source: hosted - version: "2.8.7" json2yaml: dependency: "direct main" description: @@ -710,10 +657,10 @@ packages: dependency: transitive description: name: keyboard_height_plugin - sha256: bbb32804bf93601249c17c33125cd2e654f5ef650fc6acf1b031d69b478b35ce + sha256: "3a51c8ebb43465ebe0b3bad17f3b6d945421e58011f3f5a08134afe69a3d775f" url: "https://pub.dev" source: hosted - version: "0.0.5" + version: "0.1.5" launch_at_startup: dependency: "direct main" description: @@ -726,18 +673,18 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" + sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06" url: "https://pub.dev" source: hosted - version: "10.0.5" + version: "10.0.7" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" + sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379" url: "https://pub.dev" source: hosted - version: "3.0.5" + version: "3.0.8" leak_tracker_testing: dependency: transitive description: @@ -750,50 +697,42 @@ packages: dependency: transitive description: name: lints - sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235" + sha256: c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7 url: "https://pub.dev" source: hosted - version: "4.0.0" + version: "5.1.1" loading_animation_widget: dependency: "direct main" description: name: loading_animation_widget - sha256: ee3659035528d19145d50cf0107632bf647e7306c88b6a32f35f3bed63f6d728 + sha256: "9fe23381f3096e902f39e87e487648ff7f74925e86234353fa885bb9f6c98004" url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.3.0" logger: dependency: "direct main" description: name: logger - sha256: "697d067c60c20999686a0add96cf6aba723b3aa1f83ecf806a8097231529ec32" + sha256: be4b23575aac7ebf01f225a241eb7f6b5641eeaf43c6a8613510fc2f8cf187d1 url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "2.5.0" logging: dependency: transitive description: name: logging - sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340" + sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61 url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.3.0" lottie: dependency: "direct main" description: name: lottie - sha256: "6a24ade5d3d918c306bb1c21a6b9a04aab0489d51a2582522eea820b4093b62b" - url: "https://pub.dev" - source: hosted - version: "3.1.2" - macros: - dependency: transitive - description: - name: macros - sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536" + sha256: "377d87b8dcef640c04717e93afb86a510f0e1117a399ab94dc4b3f39c85eaa87" url: "https://pub.dev" source: hosted - version: "0.1.2-main.4" + version: "3.3.0" markdown: dependency: transitive description: @@ -830,10 +769,10 @@ packages: dependency: transitive description: name: mime - sha256: "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2" + sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6" url: "https://pub.dev" source: hosted - version: "1.0.5" + version: "2.0.0" msix: dependency: "direct dev" description: @@ -862,34 +801,34 @@ packages: dependency: transitive description: name: numerus - sha256: "49cd96fe774dd1f574fc9117ed67e8a2b06a612f723e87ef3119456a7729d837" + sha256: a17a3f34527497e89378696a76f382b40dc534c4a57b3778de246ebc1ce2ca99 url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.3.0" package_config: dependency: transitive description: name: package_config - sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd" + sha256: "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67" url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" package_info_plus: dependency: "direct main" description: name: package_info_plus - sha256: a75164ade98cb7d24cfd0a13c6408927c6b217fa60dee5a7ff5c116a58f28918 + sha256: "70c421fe9d9cc1a9a7f3b05ae56befd469fe4f8daa3b484823141a55442d858d" url: "https://pub.dev" source: hosted - version: "8.0.2" + version: "8.1.2" package_info_plus_platform_interface: dependency: transitive description: name: package_info_plus_platform_interface - sha256: ac1f4a4847f1ade8e6a87d1f39f5d7c67490738642e2542f559ec38c37489a66 + sha256: a5ef9986efc7bf772f2696183a3992615baa76c1ffb1189318dd8803778fb05b url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.0.2" path: dependency: transitive description: @@ -902,34 +841,34 @@ packages: dependency: transitive description: name: path_parsing - sha256: e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf + sha256: "883402936929eac138ee0a45da5b0f2c80f89913e6dc3bf77eb65b84b409c6ca" url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "1.1.0" path_provider: dependency: transitive description: name: path_provider - sha256: fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378 + sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd" url: "https://pub.dev" source: hosted - version: "2.1.4" + version: "2.1.5" path_provider_android: dependency: transitive description: name: path_provider_android - sha256: "6f01f8e37ec30b07bc424b4deabac37cacb1bc7e2e515ad74486039918a37eb7" + sha256: "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2" url: "https://pub.dev" source: hosted - version: "2.2.10" + version: "2.2.15" path_provider_foundation: dependency: transitive description: name: path_provider_foundation - sha256: f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16 + sha256: "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942" url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "2.4.1" path_provider_linux: dependency: transitive description: @@ -982,10 +921,10 @@ packages: dependency: transitive description: name: platform - sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65" + sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984" url: "https://pub.dev" source: hosted - version: "3.1.5" + version: "3.1.6" plugin_platform_interface: dependency: transitive description: @@ -998,26 +937,26 @@ packages: dependency: transitive description: name: postgrest - sha256: c4197238601c7c3103b03a4bb77f2050b17d0064bf8b968309421abdebbb7f0e + sha256: b74dc0f57b5dca5ce9f57a54b08110bf41d6fc8a0483c0fec10c79e9aa0fb2bb url: "https://pub.dev" source: hosted - version: "2.1.4" + version: "2.4.1" printing: - dependency: transitive + dependency: "direct main" description: name: printing - sha256: de1889f30b34029fc46e5de6a9841498850b23d32942a9ee810ca36b0cb1b234 + sha256: b535d177fc6e8f8908e19b0ff5c1d4a87e3c4d0bf675e05aa2562af1b7853906 url: "https://pub.dev" source: hosted - version: "5.13.2" + version: "5.13.4" process_run: dependency: "direct main" description: name: process_run - sha256: c917dfb5f7afad4c7485bc00a4df038621248fce046105020cea276d1a87c820 + sha256: a68fa9727392edad97a2a96a77ce8b0c17d28336ba1b284b1dfac9595a4299ea url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.2.2+1" provider: dependency: transitive description: @@ -1030,10 +969,10 @@ packages: dependency: transitive description: name: pub_semver - sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c" + sha256: "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd" url: "https://pub.dev" source: hosted - version: "2.1.4" + version: "2.1.5" qr: dependency: transitive description: @@ -1046,10 +985,10 @@ packages: dependency: transitive description: name: realtime_client - sha256: d897a65ee3b1b5ddc1cf606f0b83792262d38fd5679c2df7e38da29c977513da + sha256: "1bfcb7455fdcf15953bf18ac2817634ea5b8f7f350c7e8c9873141a3ee2c3e9c" url: "https://pub.dev" source: hosted - version: "2.2.1" + version: "2.4.1" retry: dependency: transitive description: @@ -1082,46 +1021,54 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.0" + scroll_to_index: + dependency: transitive + description: + name: scroll_to_index + sha256: b707546e7500d9f070d63e5acf74fd437ec7eeeb68d3412ef7b0afada0b4f176 + url: "https://pub.dev" + source: hosted + version: "3.0.1" sentry: dependency: transitive description: name: sentry - sha256: "3b6d9413663d501824453963e37c4dd7a08dbef808bbe792bd467c12f4a15fcb" + sha256: "576ad83415102ba2060142a6701611abc6e67a55af1d7ab339cedd3ba1b0f84c" url: "https://pub.dev" source: hosted - version: "8.8.0-alpha.1" + version: "8.12.0" sentry_flutter: dependency: "direct main" description: name: sentry_flutter - sha256: "2f0d993dcc96348d71312977584441c3752ba1116c08ed92dbcc966279af8ebb" + sha256: dc3761e8659839cc67a18432d9f12e5531affb7ff68e196dbb56846909b5dfdc url: "https://pub.dev" source: hosted - version: "8.8.0-alpha.1" + version: "8.12.0" shared_preferences: dependency: transitive description: name: shared_preferences - sha256: "746e5369a43170c25816cc472ee016d3a66bc13fcf430c0bc41ad7b4b2922051" + sha256: a752ce92ea7540fc35a0d19722816e04d0e72828a4200e83a98cf1a1eb524c9a url: "https://pub.dev" source: hosted - version: "2.3.2" + version: "2.3.5" shared_preferences_android: dependency: transitive description: name: shared_preferences_android - sha256: a7e8467e9181cef109f601e3f65765685786c1a738a83d7fbbde377589c0d974 + sha256: "02a7d8a9ef346c9af715811b01fbd8e27845ad2c41148eefd31321471b41863d" url: "https://pub.dev" source: hosted - version: "2.3.1" + version: "2.4.0" shared_preferences_foundation: dependency: transitive description: name: shared_preferences_foundation - sha256: c4b35f6cb8f63c147312c054ce7c2254c8066745125264f0c88739c417fc9d9f + sha256: "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03" url: "https://pub.dev" source: hosted - version: "2.5.2" + version: "2.5.4" shared_preferences_linux: dependency: transitive description: @@ -1158,15 +1105,15 @@ packages: dependency: "direct main" description: name: sizer - sha256: "3b8dee49425829d90365dc582336de24bdbb70f08c5e017d8fe1e9b2c1ceb957" + sha256: "6f68f574b6dd052e87c4abf67fe4feb316651fab02430ef7e53e991c15acfcb7" url: "https://pub.dev" source: hosted - version: "3.0.3" + version: "3.0.5" sky_engine: dependency: transitive description: flutter source: sdk - version: "0.0.99" + version: "0.0.0" source_span: dependency: transitive description: @@ -1187,18 +1134,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377" url: "https://pub.dev" source: hosted - version: "1.11.1" + version: "1.12.0" storage_client: dependency: transitive description: name: storage_client - sha256: "28c147c805304dbc2b762becd1fc26ee0cb621ace3732b9ae61ef979aab8b367" + sha256: d80d34f0aa60e5199646bc301f5750767ee37310c2ecfe8d4bbdd29351e09ab0 url: "https://pub.dev" source: hosted - version: "2.0.3" + version: "2.3.0" stream_channel: dependency: transitive description: @@ -1211,10 +1158,10 @@ packages: dependency: transitive description: name: string_scanner - sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3" url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.3.0" string_validator: dependency: transitive description: @@ -1227,26 +1174,26 @@ packages: dependency: transitive description: name: supabase - sha256: "4ed1cf3298f39865c05b2d8557f92eb131a9b9af70e32e218672a0afce01a6bc" + sha256: "270f63cd87a16578fee87e40cbf61062e8cdbce68d5e723e665f4651d70ddd8c" url: "https://pub.dev" source: hosted - version: "2.3.0" + version: "2.6.2" supabase_flutter: dependency: "direct main" description: name: supabase_flutter - sha256: ff6ba3048fd47d831fdc0027d3efb99346d99b95becfcb406562454bd9b229c5 + sha256: ca8dfe3d4b109e7338cdf7778f3ec2c660a0178006876bfac343eb39b0f3d1e3 url: "https://pub.dev" source: hosted - version: "2.6.0" + version: "2.8.3" synchronized: dependency: transitive description: name: synchronized - sha256: a824e842b8a054f91a728b783c177c1e4731f6b124f9192468457a8913371255 + sha256: "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225" url: "https://pub.dev" source: hosted - version: "3.2.0" + version: "3.3.0+3" syntax_highlight: dependency: "direct main" description: @@ -1283,10 +1230,10 @@ packages: dependency: transitive description: name: test_api - sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" + sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c" url: "https://pub.dev" source: hosted - version: "0.7.2" + version: "0.7.3" touchable: dependency: transitive description: @@ -1295,22 +1242,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.2" - tuple: - dependency: transitive - description: - name: tuple - sha256: a97ce2013f240b2f3807bcbaf218765b6f301c3eff91092bcfa23a039e7dd151 - url: "https://pub.dev" - source: hosted - version: "2.0.2" typed_data: dependency: transitive description: name: typed_data - sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c + sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006 url: "https://pub.dev" source: hosted - version: "1.3.2" + version: "1.4.0" universal_html: dependency: transitive description: @@ -1327,6 +1266,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.2.2" + universal_platform: + dependency: transitive + description: + name: universal_platform + sha256: "64e16458a0ea9b99260ceb5467a214c1f298d647c659af1bff6d3bf82536b1ec" + url: "https://pub.dev" + source: hosted + version: "1.1.0" updat: dependency: "direct main" description: @@ -1339,42 +1286,42 @@ packages: dependency: "direct main" description: name: url_launcher - sha256: "21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3" + sha256: "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603" url: "https://pub.dev" source: hosted - version: "6.3.0" + version: "6.3.1" url_launcher_android: dependency: transitive description: name: url_launcher_android - sha256: f0c73347dfcfa5b3db8bc06e1502668265d39c08f310c29bff4e28eea9699f79 + sha256: "6fc2f56536ee873eeb867ad176ae15f304ccccc357848b351f6f0d8d4a40d193" url: "https://pub.dev" source: hosted - version: "6.3.9" + version: "6.3.14" url_launcher_ios: dependency: transitive description: name: url_launcher_ios - sha256: e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e + sha256: "16a513b6c12bb419304e72ea0ae2ab4fed569920d1c7cb850263fe3acc824626" url: "https://pub.dev" source: hosted - version: "6.3.1" + version: "6.3.2" url_launcher_linux: dependency: transitive description: name: url_launcher_linux - sha256: e2b9622b4007f97f504cd64c0128309dfb978ae66adbe944125ed9e1750f06af + sha256: "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935" url: "https://pub.dev" source: hosted - version: "3.2.0" + version: "3.2.1" url_launcher_macos: dependency: transitive description: name: url_launcher_macos - sha256: "9a1a42d5d2d95400c795b2914c36fdcb525870c752569438e4ebb09a2b5d90de" + sha256: "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2" url: "https://pub.dev" source: hosted - version: "3.2.0" + version: "3.2.2" url_launcher_platform_interface: dependency: transitive description: @@ -1395,42 +1342,42 @@ packages: dependency: transitive description: name: url_launcher_windows - sha256: "49c10f879746271804767cb45551ec5592cdab00ee105c06dddde1a98f73b185" + sha256: "44cf3aabcedde30f2dba119a9dea3b0f2672fbe6fa96e85536251d678216b3c4" url: "https://pub.dev" source: hosted - version: "3.1.2" + version: "3.1.3" uuid: dependency: "direct main" description: name: uuid - sha256: "83d37c7ad7aaf9aa8e275490669535c8080377cfa7a7004c24dfac53afffaa90" + sha256: a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff url: "https://pub.dev" source: hosted - version: "4.4.2" + version: "4.5.1" vector_graphics: dependency: transitive description: name: vector_graphics - sha256: "32c3c684e02f9bc0afb0ae0aa653337a2fe022e8ab064bcd7ffda27a74e288e3" + sha256: "27d5fefe86fb9aace4a9f8375b56b3c292b64d8c04510df230f849850d912cb7" url: "https://pub.dev" source: hosted - version: "1.1.11+1" + version: "1.1.15" vector_graphics_codec: dependency: transitive description: name: vector_graphics_codec - sha256: c86987475f162fadff579e7320c7ddda04cd2fdeffbe1129227a85d9ac9e03da + sha256: "2430b973a4ca3c4dbc9999b62b8c719a160100dcbae5c819bae0cacce32c9cdb" url: "https://pub.dev" source: hosted - version: "1.1.11+1" + version: "1.1.12" vector_graphics_compiler: dependency: transitive description: name: vector_graphics_compiler - sha256: "12faff3f73b1741a36ca7e31b292ddeb629af819ca9efe9953b70bd63fc8cd81" + sha256: "1b4b9e706a10294258727674a340ae0d6e64a7231980f9f9a3d12e4b42407aad" url: "https://pub.dev" source: hosted - version: "1.1.11+1" + version: "1.1.16" vector_math: dependency: transitive description: @@ -1439,38 +1386,22 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" - visibility_detector: - dependency: transitive - description: - name: visibility_detector - sha256: dd5cc11e13494f432d15939c3aa8ae76844c42b723398643ce9addb88a5ed420 - url: "https://pub.dev" - source: hosted - version: "0.4.0+2" vm_service: dependency: transitive description: name: vm_service - sha256: f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc - url: "https://pub.dev" - source: hosted - version: "14.2.4" - watcher: - dependency: transitive - description: - name: watcher - sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8" + sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "14.3.0" web: dependency: transitive description: name: web - sha256: d43c1d6b787bf0afad444700ae7f4db8827f701bc61c255ac8d328c6f4d52062 + sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb url: "https://pub.dev" source: hosted - version: "1.0.0" + version: "1.1.0" web_socket: dependency: transitive description: @@ -1499,18 +1430,18 @@ packages: dependency: transitive description: name: win32 - sha256: "68d1e89a91ed61ad9c370f9f8b6effed9ae5e0ede22a270bdfa6daf79fc2290a" + sha256: "154360849a56b7b67331c21f09a386562d88903f90a1099c5987afc1912e1f29" url: "https://pub.dev" source: hosted - version: "5.5.4" + version: "5.10.0" win32_registry: dependency: transitive description: name: win32_registry - sha256: "723b7f851e5724c55409bb3d5a32b203b3afe8587eaf5dafb93a5fed8ecda0d6" + sha256: "21ec76dfc731550fd3e2ce7a33a9ea90b828fdf19a5c3bcf556fa992cfa99852" url: "https://pub.dev" source: hosted - version: "1.1.4" + version: "1.1.5" window_manager: dependency: "direct main" description: @@ -1523,10 +1454,10 @@ packages: dependency: transitive description: name: xdg_directories - sha256: faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d + sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15" url: "https://pub.dev" source: hosted - version: "1.0.4" + version: "1.1.0" xml: dependency: transitive description: @@ -1539,18 +1470,18 @@ packages: dependency: "direct main" description: name: yaml - sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5" + sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce url: "https://pub.dev" source: hosted - version: "3.1.2" + version: "3.1.3" yet_another_json_isolate: dependency: transitive description: name: yet_another_json_isolate - sha256: "47ed3900e6b0e4dfe378811a4402e85b7fc126a7daa94f840fef65ea9c8e46f4" + sha256: "56155e9e0002cc51ea7112857bbcdc714d4c35e176d43e4d3ee233009ff410c9" url: "https://pub.dev" source: hosted - version: "2.0.2" + version: "2.0.3" sdks: - dart: ">=3.5.0 <4.0.0" - flutter: ">=3.24.0" + dart: ">=3.6.0 <4.0.0" + flutter: ">=3.27.0" diff --git a/pubspec.yaml b/pubspec.yaml index 91f2ceb..6d85db0 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -18,7 +18,7 @@ dependencies: supabase_flutter: ^2.3.4 flutter_form_builder: ^9.0.0 form_builder_validators: ^11.0.0 - heroicons: ^0.10.0 + heroicons: ^0.11.0 loading_animation_widget: ^1.2.0+4 uuid: ^4.3.3 flutter_svg: ^2.0.6 @@ -29,7 +29,7 @@ dependencies: file_selector: ^1.0.2 awesome_side_sheet: ^0.0.3 device_frame: ^1.1.0 - flutter_platform_alert: ^0.5.1 + flutter_platform_alert: ^0.6.1 screenshot: ^3.0.0 image: ^4.1.4 process_run: ^1.1.0 @@ -40,14 +40,14 @@ dependencies: yaml: ^3.1.2 widget_arrows: ^0.6.0 graphite: ^1.1.2 - appflowy_editor: ^3.1.0 + appflowy_editor: ^4.0.0 emojis: ^0.9.9 launch_at_startup: ^0.3.1 package_info_plus: ^8.0.2 dashed_circular_progress_bar: ^0.0.6 animated_flip_counter: ^0.3.4 currency_picker: ^2.0.20 - flutter_launcher_icons: ^0.13.1 + flutter_launcher_icons: ^0.14.2 tab_container: ^3.5.3 syntax_highlight: ^0.4.0 clipboard: ^0.1.3 @@ -58,14 +58,15 @@ dependencies: flutter_markdown: ^0.6.20+1 logger: ^2.0.2+1 url_launcher: ^6.2.5 - flex_color_scheme: ^7.3.1 + flex_color_scheme: ^8.1.0 flutter_dotenv: ^5.1.0 + printing: ^5.13.4 # pdf: ^3.10.7 dependency_overrides: - uuid: ^4.3.3 + uuid: ^4.5.1 # printing: # git: # url: https://github.com/DavBfr/dart_pdf.git @@ -76,7 +77,7 @@ dependency_overrides: dev_dependencies: flutter_test: sdk: flutter - flutter_lints: ^4.0.0 + flutter_lints: ^5.0.0 msix: ^3.16.7 flutter: From d77477a322051fbaf1ae4d483522d1f133d9f6a4 Mon Sep 17 00:00:00 2001 From: moesaid Date: Mon, 6 Jan 2025 18:38:59 -0500 Subject: [PATCH 2/5] added -- style updates --- .gitignore | 2 + .../Single/project_single_controller.dart | 8 ++-- lib/App/Views/Global/build_rail.dart | 1 + lib/App/Views/Global/build_time_overlay.dart | 8 ++-- .../Create/build_create_mockup_sidebar.dart | 2 +- .../Widgets/build_create_or_edit_sheet.dart | 38 +++++++++++-------- .../build_create_or_load_project_path.dart | 2 + .../build_single_project_head_info.dart | 2 +- lib/Config/app_initializer.dart | 20 ++++++---- macos/Podfile.lock | 20 +++++----- 10 files changed, 61 insertions(+), 42 deletions(-) diff --git a/.gitignore b/.gitignore index 0643e1d..d11448e 100644 --- a/.gitignore +++ b/.gitignore @@ -5,9 +5,11 @@ *.swp .DS_Store .atom/ +.build/ .buildlog/ .history .svn/ +.swiftpm/ migrate_working_dir/ # IntelliJ related diff --git a/lib/App/Controllers/Project/Single/project_single_controller.dart b/lib/App/Controllers/Project/Single/project_single_controller.dart index 21ed4af..d20112a 100644 --- a/lib/App/Controllers/Project/Single/project_single_controller.dart +++ b/lib/App/Controllers/Project/Single/project_single_controller.dart @@ -124,14 +124,16 @@ class ProjectSingleController extends GetxController { } // if project id is empty - if (project.id == null || project.id!.isEmpty) return; + if (project.id == null || project.id?.isEmpty == true) return; - Get.showOverlay( + await Get.showOverlay( asyncFunction: () async { String? path = await createProjectPathBasedOnState( - type: project.stateManagement, + type: project.stateManagement ?? StateManegmentEnum.getx.name, ); + if (path == null || path.isEmpty) return; + // save project path await _projectLocalPathStorage.write( project: ProjectLocalPathModel( diff --git a/lib/App/Views/Global/build_rail.dart b/lib/App/Views/Global/build_rail.dart index afedf27..eb37140 100644 --- a/lib/App/Views/Global/build_rail.dart +++ b/lib/App/Views/Global/build_rail.dart @@ -47,6 +47,7 @@ class BuildRail extends StatelessWidget { ), Expanded( child: NavigationRail( + backgroundColor: Get.theme.colorScheme.surface, minWidth: AppConfig.rail * 0.7, selectedIndex: selectedIndex, onDestinationSelected: (int index) => diff --git a/lib/App/Views/Global/build_time_overlay.dart b/lib/App/Views/Global/build_time_overlay.dart index cd864e5..0eb7690 100644 --- a/lib/App/Views/Global/build_time_overlay.dart +++ b/lib/App/Views/Global/build_time_overlay.dart @@ -13,7 +13,7 @@ class BuildTimeOverlay extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.center, children: [ Container( - width: 200.spa, + width: context.width * 0.5, clipBehavior: Clip.antiAlias, decoration: BoxDecoration( color: Get.theme.colorScheme.surface, @@ -22,8 +22,8 @@ class BuildTimeOverlay extends StatelessWidget { child: Column( children: [ SizedBox( - width: 200.spa, - height: 80.spa, + width: context.width, + height: context.width * 0.3, child: Image.asset( 'assets/images/time.gif', fit: BoxFit.cover, @@ -38,7 +38,7 @@ class BuildTimeOverlay extends StatelessWidget { 'Hold tight!', textAlign: TextAlign.center, style: TextStyle( - fontSize: 6.spa, + fontSize: context.textTheme.titleLarge?.fontSize, fontWeight: FontWeight.bold, ), ), diff --git a/lib/App/Views/Pages/Mockup/Widgets/Create/build_create_mockup_sidebar.dart b/lib/App/Views/Pages/Mockup/Widgets/Create/build_create_mockup_sidebar.dart index b4e39a4..2000a01 100644 --- a/lib/App/Views/Pages/Mockup/Widgets/Create/build_create_mockup_sidebar.dart +++ b/lib/App/Views/Pages/Mockup/Widgets/Create/build_create_mockup_sidebar.dart @@ -245,7 +245,7 @@ class BuildCreateMockupSidebar extends StatelessWidget { height: 600, padding: EdgeInsets.only( top: 15, - bottom: 40.spa, + bottom: 30.spa, left: 15, right: 15, ), diff --git a/lib/App/Views/Pages/Project/Widgets/build_create_or_edit_sheet.dart b/lib/App/Views/Pages/Project/Widgets/build_create_or_edit_sheet.dart index 4c67263..10282f9 100644 --- a/lib/App/Views/Pages/Project/Widgets/build_create_or_edit_sheet.dart +++ b/lib/App/Views/Pages/Project/Widgets/build_create_or_edit_sheet.dart @@ -111,8 +111,8 @@ class BuildCreateOrEditSheet extends StatelessWidget { ), SizedBox(width: 4.spa), SizedBox( - width: 20.spa, - height: 16.spa, + width: context.width * 0.05, + height: context.width * 0.035, child: BuildPickColor( controllerTag: 'tempModel', initialColor: ColorHelper.hexToColor( @@ -122,7 +122,8 @@ class BuildCreateOrEditSheet extends StatelessWidget { controller.updateTempModel( ModelConfigModel( color: ColorHelper.colorToHexWithoutHash( - color), + color, + ), ), ); }, @@ -231,8 +232,11 @@ class BuildAddPropertiesSection extends StatelessWidget { children: [ if (controller.tempModel.properties != null) Container( - color: Get.theme.colorScheme.secondaryContainer - .withValues(alpha: 0.3), + decoration: BoxDecoration( + color: Get.theme.colorScheme.secondaryContainer + .withValues(alpha: 0.3), + borderRadius: BorderRadius.circular(5), + ), child: ListView.separated( itemCount: controller.tempModel.properties?.length ?? 0, shrinkWrap: true, @@ -245,7 +249,7 @@ class BuildAddPropertiesSection extends StatelessWidget { return ListTile( title: Text( property.name ?? 'Property', - style: TextStyle(fontSize: 4.spa), + style: Get.textTheme.bodyMedium, ), trailing: Row( mainAxisSize: MainAxisSize.min, @@ -255,22 +259,26 @@ class BuildAddPropertiesSection extends StatelessWidget { backgroundColor: property.type?.color.withValues(alpha: 0.1), textColor: property.type?.color, - textStyle: TextStyle( - fontSize: 3.5.spa, + textStyle: Get.textTheme.bodyMedium?.copyWith( + fontSize: context.width * 0.01, color: property.type?.color, ), - padding: - EdgeInsets.symmetric(horizontal: 3.spa), + padding: EdgeInsets.symmetric( + horizontal: context.width * 0.008, + vertical: context.width * 0.002, + ), ), - SizedBox(width: 5.spa), + SizedBox(width: context.width * 0.001), IconButton( + visualDensity: VisualDensity.compact, onPressed: () { - controller - .removePropertiesFromTempModel(index); + controller.removePropertiesFromTempModel( + index, + ); }, icon: Icon( - Icons.close, - size: 4.spa, + Icons.close_rounded, + size: context.width * 0.014, color: Get.theme.colorScheme.error, ), ), diff --git a/lib/App/Views/Pages/Project/Widgets/build_create_or_load_project_path.dart b/lib/App/Views/Pages/Project/Widgets/build_create_or_load_project_path.dart index 0681bc8..3531392 100644 --- a/lib/App/Views/Pages/Project/Widgets/build_create_or_load_project_path.dart +++ b/lib/App/Views/Pages/Project/Widgets/build_create_or_load_project_path.dart @@ -19,6 +19,7 @@ class BuildCreateOrLoadProjectPath extends StatelessWidget { onPressed: onCreate, icon: Icon( Icons.add_circle_sharp, + color: Get.theme.colorScheme.onSurface.withValues(alpha: 0.7), size: 6.spa, ), label: const Text('Create'), @@ -35,6 +36,7 @@ class BuildCreateOrLoadProjectPath extends StatelessWidget { onPressed: onLoad, icon: Icon( Icons.folder, + color: Get.theme.colorScheme.onSurface.withValues(alpha: 0.7), size: 6.spa, ), label: const Text('Load'), diff --git a/lib/App/Views/Pages/Project/Widgets/build_single_project_head_info.dart b/lib/App/Views/Pages/Project/Widgets/build_single_project_head_info.dart index b2b092e..9aeb1c7 100644 --- a/lib/App/Views/Pages/Project/Widgets/build_single_project_head_info.dart +++ b/lib/App/Views/Pages/Project/Widgets/build_single_project_head_info.dart @@ -57,7 +57,7 @@ class BuildSingleProjectHeadInfo extends StatelessWidget { Colors.transparent, ), ), - icon: const Icon( + icon: Icon( Icons.settings, ), ), diff --git a/lib/Config/app_initializer.dart b/lib/Config/app_initializer.dart index 1fa4b69..28e1809 100644 --- a/lib/Config/app_initializer.dart +++ b/lib/Config/app_initializer.dart @@ -6,6 +6,7 @@ import 'package:flutter/services.dart'; import 'package:flutter_dotenv/flutter_dotenv.dart'; import 'package:flutterpp/App/Providers/Local/app_mode.dart'; import 'package:flutterpp/Config/app_config.dart'; +import 'package:flutterpp/Config/app_print.dart'; import 'package:flutterpp/Config/app_window_config.dart'; import 'package:get_storage/get_storage.dart'; // ignore: depend_on_referenced_packages @@ -54,14 +55,17 @@ class AppInitializer { static Future _lunchAppOnStartup() async { PackageInfo packageInfo = await PackageInfo.fromPlatform(); - launchAtStartup.setup( - appName: packageInfo.appName, - appPath: Platform.resolvedExecutable, - ); - - bool isEnabled = await launchAtStartup.isEnabled(); - if (!isEnabled) { - launchAtStartup.enable(); + try { + launchAtStartup.setup( + appName: packageInfo.appName, + appPath: Platform.resolvedExecutable, + ); + bool isEnabled = await launchAtStartup.isEnabled(); + if (!isEnabled) { + launchAtStartup.enable(); + } + } catch (e) { + AppPrint.print('Error: $e'); } } diff --git a/macos/Podfile.lock b/macos/Podfile.lock index de00817..8131255 100644 --- a/macos/Podfile.lock +++ b/macos/Podfile.lock @@ -17,11 +17,11 @@ PODS: - FlutterMacOS - screen_retriever (0.0.1): - FlutterMacOS - - Sentry/HybridSDK (8.33.0) - - sentry_flutter (8.8.0-alpha.1): + - Sentry/HybridSDK (8.42.0) + - sentry_flutter (8.12.0): - Flutter - FlutterMacOS - - Sentry/HybridSDK (= 8.33.0) + - Sentry/HybridSDK (= 8.42.0) - shared_preferences_foundation (0.0.1): - Flutter - FlutterMacOS @@ -85,20 +85,20 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: app_links: 10e0a0ab602ffaf34d142cd4862f29d34b303b2a device_info_plus: ce1b7762849d3ec103d0e0517299f2db7ad60720 - file_selector_macos: 54fdab7caa3ac3fc43c9fac4d7d8d231277f8cf2 - flutter_platform_alert: b21b2b7d801e71c12ce9ffab618ff114ca9fc903 + file_selector_macos: cc3858c981fe6889f364731200d6232dac1d812d + flutter_platform_alert: 49f22b31593e29e7a5e65f1b80f8d3de02b95dd4 FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24 - package_info_plus: fa739dd842b393193c5ca93c26798dff6e3d0e0c + package_info_plus: 12f1c5c2cfe8727ca46cbd0b26677728972d9a5b path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46 printing: 1dd6a1fce2209ec240698e2439a4adbb9b427637 screen_retriever: 59634572a57080243dd1bf715e55b6c54f241a38 - Sentry: 8560050221424aef0bebc8e31eedf00af80f90a6 - sentry_flutter: e2d185fd49e88c3a016a0dc0c16dabc776d97c53 + Sentry: 38ed8bf38eab5812787274bf591e528074c19e02 + sentry_flutter: 7d1f1df30f3768c411603ed449519bbb90a7d87b shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78 system_tray: e53c972838c69589ff2e77d6d3abfd71332f9e5d - url_launcher_macos: 5f437abeda8c85500ceb03f5c1938a8c5a705399 + url_launcher_macos: c82c93949963e55b228a30115bd219499a6fe404 window_manager: 3a1844359a6295ab1e47659b1a777e36773cd6e8 PODFILE CHECKSUM: a1604d6ceef77743b0be14ce0a076d42c645fcfa -COCOAPODS: 1.15.2 +COCOAPODS: 1.16.2 From 6f9c380bab6cb6cf650c884886b1ba34f2b56371 Mon Sep 17 00:00:00 2001 From: moesaid Date: Mon, 6 Jan 2025 18:43:21 -0500 Subject: [PATCH 3/5] Update project_single_code_gen_controller.dart --- .../Project/Single/project_single_code_gen_controller.dart | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/App/Controllers/Project/Single/project_single_code_gen_controller.dart b/lib/App/Controllers/Project/Single/project_single_code_gen_controller.dart index 225c0f7..1a514c2 100644 --- a/lib/App/Controllers/Project/Single/project_single_code_gen_controller.dart +++ b/lib/App/Controllers/Project/Single/project_single_code_gen_controller.dart @@ -205,7 +205,9 @@ class ProjectSingleCodeGenController extends GetxController { } // if name already exists - if (_models.any((el) => el.modelName == _tempModel.value.modelName)) { + if (_models.any((el) => + el.modelName == _tempModel.value.modelName && + el.id != _tempModel.value.id)) { FlutterPlatformAlert.playAlertSound(); FlutterPlatformAlert.showAlert( windowTitle: 'Oops!', From 0e0c9f21fab49c0db6dcf266b331ee9698fe2ab2 Mon Sep 17 00:00:00 2001 From: moesaid Date: Mon, 6 Jan 2025 18:43:41 -0500 Subject: [PATCH 4/5] Update pubspec.yaml --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index 6d85db0..ca8ad74 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: flutterpp description: flutterpp is a desktop app for creating and managing Flutter projects. publish_to: "none" -version: 0.0.9 +version: 0.0.10 environment: sdk: ^3.5.0 From d1b49427147da58cd1ec201f79da085086e6c704 Mon Sep 17 00:00:00 2001 From: moesaid Date: Mon, 6 Jan 2025 18:53:00 -0500 Subject: [PATCH 5/5] Update app_update_controller.dart --- lib/App/Controllers/Global/app_update_controller.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/App/Controllers/Global/app_update_controller.dart b/lib/App/Controllers/Global/app_update_controller.dart index 4abb5b3..0eae883 100644 --- a/lib/App/Controllers/Global/app_update_controller.dart +++ b/lib/App/Controllers/Global/app_update_controller.dart @@ -44,7 +44,7 @@ class AppUpdateController extends GetxController { _fetchApi() async { final data = await http.get( Uri.parse( - "https://api.github.com/repos/moesaid/FlutterPP_Public/releases/latest", + "https://api.github.com/repos/moesaid/FlutterPP/releases/latest", ), );