From 4fa73dba5587bf3f330007694102c57570337008 Mon Sep 17 00:00:00 2001 From: ice-orion <102020833+ice-orion@users.noreply.github.com> Date: Mon, 12 Feb 2024 12:01:40 +0400 Subject: [PATCH 01/13] refactor: shared/widgets to components --- .../auth_header/auth_header.dart | 0 .../widgets => components}/button/button.dart | 0 .../button/widgetbook.dart | 2 +- .../button/widgets/button_icon.dart | 0 .../widgets => components}/decorators.dart | 0 .../drop_down_menu/drop_down_menu.dart | 0 .../widgets => components}/email_input.dart | 0 .../favourite_icon/favorite_icon.dart | 0 .../inputs/input_field_controller.dart | 0 .../inputs/text_fields.dart | 4 +-- .../keyboard_hider.dart | 0 .../list_item/list_item.dart | 0 .../list_item/widgets/list_item_checkbox.dart | 0 .../widgets => components}/modal_wrapper.dart | 2 +- .../nav_header_offset/nav_header_offset.dart | 0 .../navigation_header/navigation_header.dart | 0 .../screen_side_offset.dart | 0 .../widgets => components}/search/search.dart | 0 .../section_header/section_header.dart | 0 .../secured_by/secured_by.dart | 0 .../shadow_text}/shadow_text.dart | 0 .../widgets => components}/side_padding.dart | 0 .../socials/socials.dart | 4 +-- .../terms_privacy/terms_privacy.dart | 0 .../text_field_wrapper.dart | 0 .../title_description_header.dart | 0 .../wallet_header/wallet_header.dart | 2 +- .../auth/views/pages/auth_page/auth_page.dart | 16 ++++----- .../views/pages/check_email/check_email.dart | 4 +-- .../discover_creators/discover_creators.dart | 8 ++--- .../views/pages/enter_code/enter_code.dart | 4 +-- .../pages/fill_profile/fill_profile.dart | 8 ++--- .../views/pages/intro_page/intro_page.dart | 4 +-- .../views/pages/nostr_auth/nostr_auth.dart | 8 ++--- .../views/pages/nostr_login/nostr_login.dart | 8 ++--- .../pages/select_country/select_country.dart | 4 +-- .../select_languages/select_languages.dart | 6 ++-- lib/app/features/dapps/views/pages/dapps.dart | 2 +- .../views/pages/dapps_list/dapps_list.dart | 6 ++-- .../dapps/views/pages/widgets/apps.dart | 2 +- .../views/pages/widgets/apps_collection.dart | 2 +- .../dapps/views/pages/widgets/categories.dart | 2 +- .../dapps/views/pages/widgets/favourites.dart | 2 +- .../dapps/views/pages/widgets/featured.dart | 2 +- .../pages/widgets/featured_collection.dart | 2 +- .../features/feed/views/pages/feed_page.dart | 4 +-- .../article_header/article_header.dart | 2 +- .../feed/widgets/post_image/post_image.dart | 2 +- .../wallet/views/pages/wallet_page.dart | 2 +- pubspec.lock | 34 +++++++++---------- 50 files changed, 74 insertions(+), 74 deletions(-) rename lib/app/{shared/widgets => components}/auth_header/auth_header.dart (100%) rename lib/app/{shared/widgets => components}/button/button.dart (100%) rename lib/app/{shared/widgets => components}/button/widgetbook.dart (92%) rename lib/app/{shared/widgets => components}/button/widgets/button_icon.dart (100%) rename lib/app/{shared/widgets => components}/decorators.dart (100%) rename lib/app/{shared/widgets => components}/drop_down_menu/drop_down_menu.dart (100%) rename lib/app/{shared/widgets => components}/email_input.dart (100%) rename lib/app/{shared/widgets => components}/favourite_icon/favorite_icon.dart (100%) rename lib/app/{shared/widgets => components}/inputs/input_field_controller.dart (100%) rename lib/app/{shared/widgets => components}/inputs/text_fields.dart (98%) rename lib/app/{shared/widgets => components}/keyboard_hider.dart (100%) rename lib/app/{shared/widgets => components}/list_item/list_item.dart (100%) rename lib/app/{shared/widgets => components}/list_item/widgets/list_item_checkbox.dart (100%) rename lib/app/{shared/widgets => components}/modal_wrapper.dart (94%) rename lib/app/{shared/widgets => components}/nav_header_offset/nav_header_offset.dart (100%) rename lib/app/{shared/widgets => components}/navigation_header/navigation_header.dart (100%) rename lib/app/{shared/widgets => components}/screen_side_offset/screen_side_offset.dart (100%) rename lib/app/{shared/widgets => components}/search/search.dart (100%) rename lib/app/{shared/widgets => components}/section_header/section_header.dart (100%) rename lib/app/{shared/widgets => components}/secured_by/secured_by.dart (100%) rename lib/app/{shared/ShadowText => components/shadow_text}/shadow_text.dart (100%) rename lib/app/{shared/widgets => components}/side_padding.dart (100%) rename lib/app/{shared/widgets => components}/socials/socials.dart (95%) rename lib/app/{shared/widgets => components}/terms_privacy/terms_privacy.dart (100%) rename lib/app/{shared/widgets => components}/text_field_wrapper/text_field_wrapper.dart (100%) rename lib/app/{shared/widgets => components}/title_description_header/title_description_header.dart (100%) rename lib/app/{shared/widgets => components}/wallet_header/wallet_header.dart (98%) diff --git a/lib/app/shared/widgets/auth_header/auth_header.dart b/lib/app/components/auth_header/auth_header.dart similarity index 100% rename from lib/app/shared/widgets/auth_header/auth_header.dart rename to lib/app/components/auth_header/auth_header.dart diff --git a/lib/app/shared/widgets/button/button.dart b/lib/app/components/button/button.dart similarity index 100% rename from lib/app/shared/widgets/button/button.dart rename to lib/app/components/button/button.dart diff --git a/lib/app/shared/widgets/button/widgetbook.dart b/lib/app/components/button/widgetbook.dart similarity index 92% rename from lib/app/shared/widgets/button/widgetbook.dart rename to lib/app/components/button/widgetbook.dart index ac81bbb08..c540c01b3 100644 --- a/lib/app/shared/widgets/button/widgetbook.dart +++ b/lib/app/components/button/widgetbook.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:ice/app/shared/widgets/button/button.dart'; +import 'package:ice/app/components/button/button.dart'; import 'package:widgetbook/widgetbook.dart'; import 'package:widgetbook_annotation/widgetbook_annotation.dart' as widgetbook; diff --git a/lib/app/shared/widgets/button/widgets/button_icon.dart b/lib/app/components/button/widgets/button_icon.dart similarity index 100% rename from lib/app/shared/widgets/button/widgets/button_icon.dart rename to lib/app/components/button/widgets/button_icon.dart diff --git a/lib/app/shared/widgets/decorators.dart b/lib/app/components/decorators.dart similarity index 100% rename from lib/app/shared/widgets/decorators.dart rename to lib/app/components/decorators.dart diff --git a/lib/app/shared/widgets/drop_down_menu/drop_down_menu.dart b/lib/app/components/drop_down_menu/drop_down_menu.dart similarity index 100% rename from lib/app/shared/widgets/drop_down_menu/drop_down_menu.dart rename to lib/app/components/drop_down_menu/drop_down_menu.dart diff --git a/lib/app/shared/widgets/email_input.dart b/lib/app/components/email_input.dart similarity index 100% rename from lib/app/shared/widgets/email_input.dart rename to lib/app/components/email_input.dart diff --git a/lib/app/shared/widgets/favourite_icon/favorite_icon.dart b/lib/app/components/favourite_icon/favorite_icon.dart similarity index 100% rename from lib/app/shared/widgets/favourite_icon/favorite_icon.dart rename to lib/app/components/favourite_icon/favorite_icon.dart diff --git a/lib/app/shared/widgets/inputs/input_field_controller.dart b/lib/app/components/inputs/input_field_controller.dart similarity index 100% rename from lib/app/shared/widgets/inputs/input_field_controller.dart rename to lib/app/components/inputs/input_field_controller.dart diff --git a/lib/app/shared/widgets/inputs/text_fields.dart b/lib/app/components/inputs/text_fields.dart similarity index 98% rename from lib/app/shared/widgets/inputs/text_fields.dart rename to lib/app/components/inputs/text_fields.dart index 49cb0d4d2..7f8c3239b 100644 --- a/lib/app/shared/widgets/inputs/text_fields.dart +++ b/lib/app/components/inputs/text_fields.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:ice/app/components/decorators.dart'; +import 'package:ice/app/components/inputs/input_field_controller.dart'; import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/extensions/theme_data.dart'; -import 'package:ice/app/shared/widgets/decorators.dart'; -import 'package:ice/app/shared/widgets/inputs/input_field_controller.dart'; import 'package:ice/app/utils/extensions.dart'; import 'package:ice/app/values/borders.dart'; import 'package:ice/app/values/constants.dart'; diff --git a/lib/app/shared/widgets/keyboard_hider.dart b/lib/app/components/keyboard_hider.dart similarity index 100% rename from lib/app/shared/widgets/keyboard_hider.dart rename to lib/app/components/keyboard_hider.dart diff --git a/lib/app/shared/widgets/list_item/list_item.dart b/lib/app/components/list_item/list_item.dart similarity index 100% rename from lib/app/shared/widgets/list_item/list_item.dart rename to lib/app/components/list_item/list_item.dart diff --git a/lib/app/shared/widgets/list_item/widgets/list_item_checkbox.dart b/lib/app/components/list_item/widgets/list_item_checkbox.dart similarity index 100% rename from lib/app/shared/widgets/list_item/widgets/list_item_checkbox.dart rename to lib/app/components/list_item/widgets/list_item_checkbox.dart diff --git a/lib/app/shared/widgets/modal_wrapper.dart b/lib/app/components/modal_wrapper.dart similarity index 94% rename from lib/app/shared/widgets/modal_wrapper.dart rename to lib/app/components/modal_wrapper.dart index 366336e30..6bacfcfdc 100644 --- a/lib/app/shared/widgets/modal_wrapper.dart +++ b/lib/app/components/modal_wrapper.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:ice/app/shared/widgets/keyboard_hider.dart'; +import 'package:ice/app/components/keyboard_hider.dart'; class ModalWrapper extends StatelessWidget { const ModalWrapper({super.key, required this.child}); diff --git a/lib/app/shared/widgets/nav_header_offset/nav_header_offset.dart b/lib/app/components/nav_header_offset/nav_header_offset.dart similarity index 100% rename from lib/app/shared/widgets/nav_header_offset/nav_header_offset.dart rename to lib/app/components/nav_header_offset/nav_header_offset.dart diff --git a/lib/app/shared/widgets/navigation_header/navigation_header.dart b/lib/app/components/navigation_header/navigation_header.dart similarity index 100% rename from lib/app/shared/widgets/navigation_header/navigation_header.dart rename to lib/app/components/navigation_header/navigation_header.dart diff --git a/lib/app/shared/widgets/screen_side_offset/screen_side_offset.dart b/lib/app/components/screen_side_offset/screen_side_offset.dart similarity index 100% rename from lib/app/shared/widgets/screen_side_offset/screen_side_offset.dart rename to lib/app/components/screen_side_offset/screen_side_offset.dart diff --git a/lib/app/shared/widgets/search/search.dart b/lib/app/components/search/search.dart similarity index 100% rename from lib/app/shared/widgets/search/search.dart rename to lib/app/components/search/search.dart diff --git a/lib/app/shared/widgets/section_header/section_header.dart b/lib/app/components/section_header/section_header.dart similarity index 100% rename from lib/app/shared/widgets/section_header/section_header.dart rename to lib/app/components/section_header/section_header.dart diff --git a/lib/app/shared/widgets/secured_by/secured_by.dart b/lib/app/components/secured_by/secured_by.dart similarity index 100% rename from lib/app/shared/widgets/secured_by/secured_by.dart rename to lib/app/components/secured_by/secured_by.dart diff --git a/lib/app/shared/ShadowText/shadow_text.dart b/lib/app/components/shadow_text/shadow_text.dart similarity index 100% rename from lib/app/shared/ShadowText/shadow_text.dart rename to lib/app/components/shadow_text/shadow_text.dart diff --git a/lib/app/shared/widgets/side_padding.dart b/lib/app/components/side_padding.dart similarity index 100% rename from lib/app/shared/widgets/side_padding.dart rename to lib/app/components/side_padding.dart diff --git a/lib/app/shared/widgets/socials/socials.dart b/lib/app/components/socials/socials.dart similarity index 95% rename from lib/app/shared/widgets/socials/socials.dart rename to lib/app/components/socials/socials.dart index a7bacff3f..59bea935b 100644 --- a/lib/app/shared/widgets/socials/socials.dart +++ b/lib/app/components/socials/socials.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:ice/app/components/button/button.dart'; +import 'package:ice/app/components/screen_side_offset/screen_side_offset.dart'; import 'package:ice/app/extensions/build_context.dart'; -import 'package:ice/app/shared/widgets/button/button.dart'; -import 'package:ice/app/shared/widgets/screen_side_offset/screen_side_offset.dart'; import 'package:ice/generated/assets.gen.dart'; enum SocialButtonType { apple, nostr, x, expand, fb, github, discord, linkedin } diff --git a/lib/app/shared/widgets/terms_privacy/terms_privacy.dart b/lib/app/components/terms_privacy/terms_privacy.dart similarity index 100% rename from lib/app/shared/widgets/terms_privacy/terms_privacy.dart rename to lib/app/components/terms_privacy/terms_privacy.dart diff --git a/lib/app/shared/widgets/text_field_wrapper/text_field_wrapper.dart b/lib/app/components/text_field_wrapper/text_field_wrapper.dart similarity index 100% rename from lib/app/shared/widgets/text_field_wrapper/text_field_wrapper.dart rename to lib/app/components/text_field_wrapper/text_field_wrapper.dart diff --git a/lib/app/shared/widgets/title_description_header/title_description_header.dart b/lib/app/components/title_description_header/title_description_header.dart similarity index 100% rename from lib/app/shared/widgets/title_description_header/title_description_header.dart rename to lib/app/components/title_description_header/title_description_header.dart diff --git a/lib/app/shared/widgets/wallet_header/wallet_header.dart b/lib/app/components/wallet_header/wallet_header.dart similarity index 98% rename from lib/app/shared/widgets/wallet_header/wallet_header.dart rename to lib/app/components/wallet_header/wallet_header.dart index 17f3e0b65..a358db2be 100644 --- a/lib/app/shared/widgets/wallet_header/wallet_header.dart +++ b/lib/app/components/wallet_header/wallet_header.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; +import 'package:ice/app/components/button/button.dart'; import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/extensions/theme_data.dart'; -import 'package:ice/app/shared/widgets/button/button.dart'; import 'package:ice/app/values/constants.dart'; import 'package:ice/generated/assets.gen.dart'; diff --git a/lib/app/features/auth/views/pages/auth_page/auth_page.dart b/lib/app/features/auth/views/pages/auth_page/auth_page.dart index bb1b5eaaa..d4c523ec0 100644 --- a/lib/app/features/auth/views/pages/auth_page/auth_page.dart +++ b/lib/app/features/auth/views/pages/auth_page/auth_page.dart @@ -16,14 +16,14 @@ import 'package:ice/app/features/auth/views/pages/nostr_auth/nostr_auth.dart'; import 'package:ice/app/features/auth/views/pages/select_country/countries.dart'; import 'package:ice/app/features/auth/views/pages/select_country/select_country.dart'; import 'package:ice/app/features/auth/views/pages/select_languages/select_languages.dart'; -import 'package:ice/app/shared/widgets/auth_header/auth_header.dart'; -import 'package:ice/app/shared/widgets/button/button.dart'; -import 'package:ice/app/shared/widgets/inputs/text_fields.dart'; -import 'package:ice/app/shared/widgets/modal_wrapper.dart'; -import 'package:ice/app/shared/widgets/screen_side_offset/screen_side_offset.dart'; -import 'package:ice/app/shared/widgets/secured_by/secured_by.dart'; -import 'package:ice/app/shared/widgets/socials/socials.dart'; -import 'package:ice/app/shared/widgets/terms_privacy/terms_privacy.dart'; +import 'package:ice/app/components/auth_header/auth_header.dart'; +import 'package:ice/app/components/button/button.dart'; +import 'package:ice/app/components/inputs/text_fields.dart'; +import 'package:ice/app/components/modal_wrapper.dart'; +import 'package:ice/app/components/screen_side_offset/screen_side_offset.dart'; +import 'package:ice/app/components/secured_by/secured_by.dart'; +import 'package:ice/app/components/socials/socials.dart'; +import 'package:ice/app/components/terms_privacy/terms_privacy.dart'; import 'package:ice/generated/assets.gen.dart'; class AuthPage extends HookConsumerWidget { diff --git a/lib/app/features/auth/views/pages/check_email/check_email.dart b/lib/app/features/auth/views/pages/check_email/check_email.dart index aacab2879..0ba97f341 100644 --- a/lib/app/features/auth/views/pages/check_email/check_email.dart +++ b/lib/app/features/auth/views/pages/check_email/check_email.dart @@ -4,8 +4,8 @@ import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/extensions/theme_data.dart'; -import 'package:ice/app/shared/widgets/screen_side_offset/screen_side_offset.dart'; -import 'package:ice/app/shared/widgets/terms_privacy/terms_privacy.dart'; +import 'package:ice/app/components/screen_side_offset/screen_side_offset.dart'; +import 'package:ice/app/components/terms_privacy/terms_privacy.dart'; import 'package:ice/generated/assets.gen.dart'; import 'package:pin_code_fields/pin_code_fields.dart'; diff --git a/lib/app/features/auth/views/pages/discover_creators/discover_creators.dart b/lib/app/features/auth/views/pages/discover_creators/discover_creators.dart index 030314045..040b3a3b8 100644 --- a/lib/app/features/auth/views/pages/discover_creators/discover_creators.dart +++ b/lib/app/features/auth/views/pages/discover_creators/discover_creators.dart @@ -4,10 +4,10 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/app/features/auth/views/pages/discover_creators/mocked_creators.dart'; -import 'package:ice/app/shared/widgets/button/button.dart'; -import 'package:ice/app/shared/widgets/navigation_header/navigation_header.dart'; -import 'package:ice/app/shared/widgets/search/search.dart'; -import 'package:ice/app/shared/widgets/title_description_header/title_description_header.dart'; +import 'package:ice/app/components/button/button.dart'; +import 'package:ice/app/components/navigation_header/navigation_header.dart'; +import 'package:ice/app/components/search/search.dart'; +import 'package:ice/app/components/title_description_header/title_description_header.dart'; import 'package:ice/app/values/constants.dart'; import 'package:ice/generated/assets.gen.dart'; diff --git a/lib/app/features/auth/views/pages/enter_code/enter_code.dart b/lib/app/features/auth/views/pages/enter_code/enter_code.dart index c02ab255b..c77edfcfd 100644 --- a/lib/app/features/auth/views/pages/enter_code/enter_code.dart +++ b/lib/app/features/auth/views/pages/enter_code/enter_code.dart @@ -5,8 +5,8 @@ import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/extensions/theme_data.dart'; -import 'package:ice/app/shared/widgets/screen_side_offset/screen_side_offset.dart'; -import 'package:ice/app/shared/widgets/terms_privacy/terms_privacy.dart'; +import 'package:ice/app/components/screen_side_offset/screen_side_offset.dart'; +import 'package:ice/app/components/terms_privacy/terms_privacy.dart'; import 'package:ice/generated/assets.gen.dart'; import 'package:pin_code_fields/pin_code_fields.dart'; diff --git a/lib/app/features/auth/views/pages/fill_profile/fill_profile.dart b/lib/app/features/auth/views/pages/fill_profile/fill_profile.dart index 7ade87b11..8206f7702 100644 --- a/lib/app/features/auth/views/pages/fill_profile/fill_profile.dart +++ b/lib/app/features/auth/views/pages/fill_profile/fill_profile.dart @@ -9,10 +9,10 @@ import 'package:ice/app/features/auth/views/pages/fill_profile/controllers/name_ import 'package:ice/app/features/auth/views/pages/fill_profile/controllers/nickname_controller.dart'; import 'package:ice/app/features/auth/views/pages/fill_profile/validators.dart'; import 'package:ice/app/shared/utility/image_picker_and_cropper/image_picker_and_cropper.dart'; -import 'package:ice/app/shared/widgets/button/button.dart'; -import 'package:ice/app/shared/widgets/inputs/text_fields.dart'; -import 'package:ice/app/shared/widgets/screen_side_offset/screen_side_offset.dart'; -import 'package:ice/app/shared/widgets/text_field_wrapper/text_field_wrapper.dart'; +import 'package:ice/app/components/button/button.dart'; +import 'package:ice/app/components/inputs/text_fields.dart'; +import 'package:ice/app/components/screen_side_offset/screen_side_offset.dart'; +import 'package:ice/app/components/text_field_wrapper/text_field_wrapper.dart'; import 'package:ice/generated/assets.gen.dart'; import 'package:image_cropper/image_cropper.dart'; diff --git a/lib/app/features/auth/views/pages/intro_page/intro_page.dart b/lib/app/features/auth/views/pages/intro_page/intro_page.dart index bef3ba373..5e52f9550 100644 --- a/lib/app/features/auth/views/pages/intro_page/intro_page.dart +++ b/lib/app/features/auth/views/pages/intro_page/intro_page.dart @@ -3,8 +3,8 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/app/features/auth/views/pages/auth_page/auth_page.dart'; -import 'package:ice/app/shared/widgets/modal_wrapper.dart'; -import 'package:ice/app/shared/widgets/side_padding.dart'; +import 'package:ice/app/components/modal_wrapper.dart'; +import 'package:ice/app/components/side_padding.dart'; import 'package:ice/generated/assets.gen.dart'; import 'package:lottie/lottie.dart'; diff --git a/lib/app/features/auth/views/pages/nostr_auth/nostr_auth.dart b/lib/app/features/auth/views/pages/nostr_auth/nostr_auth.dart index b51b709d3..41f9f371e 100644 --- a/lib/app/features/auth/views/pages/nostr_auth/nostr_auth.dart +++ b/lib/app/features/auth/views/pages/nostr_auth/nostr_auth.dart @@ -2,10 +2,10 @@ import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/features/auth/views/pages/nostr_login/nostr_login.dart'; -import 'package:ice/app/shared/widgets/auth_header/auth_header.dart'; -import 'package:ice/app/shared/widgets/button/button.dart'; -import 'package:ice/app/shared/widgets/modal_wrapper.dart'; -import 'package:ice/app/shared/widgets/screen_side_offset/screen_side_offset.dart'; +import 'package:ice/app/components/auth_header/auth_header.dart'; +import 'package:ice/app/components/button/button.dart'; +import 'package:ice/app/components/modal_wrapper.dart'; +import 'package:ice/app/components/screen_side_offset/screen_side_offset.dart'; import 'package:ice/generated/assets.gen.dart'; class NostrAuth extends HookConsumerWidget { diff --git a/lib/app/features/auth/views/pages/nostr_login/nostr_login.dart b/lib/app/features/auth/views/pages/nostr_login/nostr_login.dart index f998565dd..99ddb081b 100644 --- a/lib/app/features/auth/views/pages/nostr_login/nostr_login.dart +++ b/lib/app/features/auth/views/pages/nostr_login/nostr_login.dart @@ -2,10 +2,10 @@ import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/features/auth/views/pages/nostr_login/controllers/name_controller.dart'; -import 'package:ice/app/shared/widgets/auth_header/auth_header.dart'; -import 'package:ice/app/shared/widgets/button/button.dart'; -import 'package:ice/app/shared/widgets/inputs/text_fields.dart'; -import 'package:ice/app/shared/widgets/screen_side_offset/screen_side_offset.dart'; +import 'package:ice/app/components/auth_header/auth_header.dart'; +import 'package:ice/app/components/button/button.dart'; +import 'package:ice/app/components/inputs/text_fields.dart'; +import 'package:ice/app/components/screen_side_offset/screen_side_offset.dart'; import 'package:ice/generated/assets.gen.dart'; class NostrLogin extends HookConsumerWidget { diff --git a/lib/app/features/auth/views/pages/select_country/select_country.dart b/lib/app/features/auth/views/pages/select_country/select_country.dart index 2064d6062..a208cd3bb 100644 --- a/lib/app/features/auth/views/pages/select_country/select_country.dart +++ b/lib/app/features/auth/views/pages/select_country/select_country.dart @@ -4,8 +4,8 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/app/features/auth/views/pages/select_country/countries.dart'; -import 'package:ice/app/shared/widgets/navigation_header/navigation_header.dart'; -import 'package:ice/app/shared/widgets/search/search.dart'; +import 'package:ice/app/components/navigation_header/navigation_header.dart'; +import 'package:ice/app/components/search/search.dart'; class SelectCountries extends HookConsumerWidget { const SelectCountries({super.key}); diff --git a/lib/app/features/auth/views/pages/select_languages/select_languages.dart b/lib/app/features/auth/views/pages/select_languages/select_languages.dart index 404c2d8a0..5a28fb647 100644 --- a/lib/app/features/auth/views/pages/select_languages/select_languages.dart +++ b/lib/app/features/auth/views/pages/select_languages/select_languages.dart @@ -4,9 +4,9 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/app/features/auth/views/pages/select_languages/languages.dart'; -import 'package:ice/app/shared/widgets/navigation_header/navigation_header.dart'; -import 'package:ice/app/shared/widgets/search/search.dart'; -import 'package:ice/app/shared/widgets/title_description_header/title_description_header.dart'; +import 'package:ice/app/components/navigation_header/navigation_header.dart'; +import 'package:ice/app/components/search/search.dart'; +import 'package:ice/app/components/title_description_header/title_description_header.dart'; import 'package:ice/app/values/constants.dart'; import 'package:ice/generated/assets.gen.dart'; diff --git a/lib/app/features/dapps/views/pages/dapps.dart b/lib/app/features/dapps/views/pages/dapps.dart index 0f04c4dbc..b44cbaa14 100644 --- a/lib/app/features/dapps/views/pages/dapps.dart +++ b/lib/app/features/dapps/views/pages/dapps.dart @@ -8,7 +8,7 @@ import 'package:ice/app/features/dapps/views/pages/widgets/apps.dart'; import 'package:ice/app/features/dapps/views/pages/widgets/categories.dart'; import 'package:ice/app/features/dapps/views/pages/widgets/favourites.dart'; import 'package:ice/app/features/dapps/views/pages/widgets/featured.dart'; -import 'package:ice/app/shared/widgets/wallet_header/wallet_header.dart'; +import 'package:ice/app/components/wallet_header/wallet_header.dart'; class DAppsPage extends HookConsumerWidget { const DAppsPage({super.key}); diff --git a/lib/app/features/dapps/views/pages/dapps_list/dapps_list.dart b/lib/app/features/dapps/views/pages/dapps_list/dapps_list.dart index 5687b5680..b630f0452 100644 --- a/lib/app/features/dapps/views/pages/dapps_list/dapps_list.dart +++ b/lib/app/features/dapps/views/pages/dapps_list/dapps_list.dart @@ -5,9 +5,9 @@ import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/app/features/dapps/views/pages/mocks/mocked_apps.dart'; import 'package:ice/app/features/dapps/views/pages/widgets/apps_collection.dart'; -import 'package:ice/app/shared/widgets/nav_header_offset/nav_header_offset.dart'; -import 'package:ice/app/shared/widgets/navigation_header/navigation_header.dart'; -import 'package:ice/app/shared/widgets/search/search.dart'; +import 'package:ice/app/components/nav_header_offset/nav_header_offset.dart'; +import 'package:ice/app/components/navigation_header/navigation_header.dart'; +import 'package:ice/app/components/search/search.dart'; class DAppsList extends HookConsumerWidget { const DAppsList({super.key}); diff --git a/lib/app/features/dapps/views/pages/widgets/apps.dart b/lib/app/features/dapps/views/pages/widgets/apps.dart index 3659f0f16..d511b813a 100644 --- a/lib/app/features/dapps/views/pages/widgets/apps.dart +++ b/lib/app/features/dapps/views/pages/widgets/apps.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:ice/app/features/dapps/views/pages/mocks/mocked_apps.dart'; import 'package:ice/app/features/dapps/views/pages/widgets/apps_collection.dart'; -import 'package:ice/app/shared/widgets/section_header/section_header.dart'; +import 'package:ice/app/components/section_header/section_header.dart'; class AppsRouteData { AppsRouteData({required this.title, this.items = const []}); diff --git a/lib/app/features/dapps/views/pages/widgets/apps_collection.dart b/lib/app/features/dapps/views/pages/widgets/apps_collection.dart index 2df910709..649b121cc 100644 --- a/lib/app/features/dapps/views/pages/widgets/apps_collection.dart +++ b/lib/app/features/dapps/views/pages/widgets/apps_collection.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/app/features/dapps/views/pages/mocks/mocked_apps.dart'; -import 'package:ice/app/shared/widgets/favourite_icon/favorite_icon.dart'; +import 'package:ice/app/components/favourite_icon/favorite_icon.dart'; import 'package:ice/app/utils/extensions.dart'; import 'package:ice/app/values/constants.dart'; diff --git a/lib/app/features/dapps/views/pages/widgets/categories.dart b/lib/app/features/dapps/views/pages/widgets/categories.dart index 3a0040059..d80ae23a2 100644 --- a/lib/app/features/dapps/views/pages/widgets/categories.dart +++ b/lib/app/features/dapps/views/pages/widgets/categories.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/features/dapps/views/pages/widgets/categories_collection.dart'; -import 'package:ice/app/shared/widgets/section_header/section_header.dart'; +import 'package:ice/app/components/section_header/section_header.dart'; class Categories extends StatelessWidget { const Categories({super.key}); diff --git a/lib/app/features/dapps/views/pages/widgets/favourites.dart b/lib/app/features/dapps/views/pages/widgets/favourites.dart index d509f6479..ddc1d8be3 100644 --- a/lib/app/features/dapps/views/pages/widgets/favourites.dart +++ b/lib/app/features/dapps/views/pages/widgets/favourites.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/extensions/theme_data.dart'; -import 'package:ice/app/shared/widgets/favourite_icon/favorite_icon.dart'; +import 'package:ice/app/components/favourite_icon/favorite_icon.dart'; import 'package:ice/app/values/constants.dart'; import 'package:ice/generated/assets.gen.dart'; diff --git a/lib/app/features/dapps/views/pages/widgets/featured.dart b/lib/app/features/dapps/views/pages/widgets/featured.dart index 9baba02b2..df8940213 100644 --- a/lib/app/features/dapps/views/pages/widgets/featured.dart +++ b/lib/app/features/dapps/views/pages/widgets/featured.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/features/dapps/views/pages/mocks/mocked_featured.dart'; import 'package:ice/app/features/dapps/views/pages/widgets/featured_collection.dart'; -import 'package:ice/app/shared/widgets/section_header/section_header.dart'; +import 'package:ice/app/components/section_header/section_header.dart'; class Featured extends StatelessWidget { const Featured({super.key}); diff --git a/lib/app/features/dapps/views/pages/widgets/featured_collection.dart b/lib/app/features/dapps/views/pages/widgets/featured_collection.dart index 6dff20141..f82f51c46 100644 --- a/lib/app/features/dapps/views/pages/widgets/featured_collection.dart +++ b/lib/app/features/dapps/views/pages/widgets/featured_collection.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; +import 'package:ice/app/components/shadow_text/shadow_text.dart'; import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/app/features/dapps/views/pages/mocks/mocked_apps.dart'; -import 'package:ice/app/shared/ShadowText/shadow_text.dart'; class FeaturedCollection extends StatelessWidget { const FeaturedCollection({super.key, required this.items}); diff --git a/lib/app/features/feed/views/pages/feed_page.dart b/lib/app/features/feed/views/pages/feed_page.dart index bcc755b95..77bede15b 100644 --- a/lib/app/features/feed/views/pages/feed_page.dart +++ b/lib/app/features/feed/views/pages/feed_page.dart @@ -3,8 +3,8 @@ import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/extensions/theme_data.dart'; -import 'package:ice/app/shared/widgets/button/button.dart'; -import 'package:ice/app/shared/widgets/drop_down_menu/drop_down_menu.dart'; +import 'package:ice/app/components/button/button.dart'; +import 'package:ice/app/components/drop_down_menu/drop_down_menu.dart'; import 'package:ice/generated/assets.gen.dart'; enum FeedType { feed, videos, stories } diff --git a/lib/app/features/feed/widgets/article_header/article_header.dart b/lib/app/features/feed/widgets/article_header/article_header.dart index a76985818..50c594e62 100644 --- a/lib/app/features/feed/widgets/article_header/article_header.dart +++ b/lib/app/features/feed/widgets/article_header/article_header.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/extensions/theme_data.dart'; -import 'package:ice/app/shared/widgets/screen_side_offset/screen_side_offset.dart'; +import 'package:ice/app/components/screen_side_offset/screen_side_offset.dart'; class ArticleHeader extends StatelessWidget { const ArticleHeader({ diff --git a/lib/app/features/feed/widgets/post_image/post_image.dart b/lib/app/features/feed/widgets/post_image/post_image.dart index d056010e2..1cd04838d 100644 --- a/lib/app/features/feed/widgets/post_image/post_image.dart +++ b/lib/app/features/feed/widgets/post_image/post_image.dart @@ -4,7 +4,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/app/features/feed/widgets/read_time_tile/read_time_tile.dart'; -import 'package:ice/app/shared/widgets/screen_side_offset/screen_side_offset.dart'; +import 'package:ice/app/components/screen_side_offset/screen_side_offset.dart'; import 'package:ice/utils/Image_utils.dart'; double borderRadius = 12.0.w; diff --git a/lib/app/features/wallet/views/pages/wallet_page.dart b/lib/app/features/wallet/views/pages/wallet_page.dart index 4c1355e3e..b30a43f61 100644 --- a/lib/app/features/wallet/views/pages/wallet_page.dart +++ b/lib/app/features/wallet/views/pages/wallet_page.dart @@ -5,7 +5,7 @@ import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/app/features/auth/data/models/auth_state.dart'; import 'package:ice/app/features/auth/providers/auth_provider.dart'; -import 'package:ice/app/shared/widgets/button/button.dart'; +import 'package:ice/app/components/button/button.dart'; import 'package:ice/generated/assets.gen.dart'; enum SampleItem { ice, eth, bnb } diff --git a/pubspec.lock b/pubspec.lock index dba744a97..58d4a8c4d 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -229,10 +229,10 @@ packages: dependency: transitive description: name: cross_file - sha256: fedaadfa3a6996f75211d835aaeb8fede285dae94262485698afd832371b9a5e + sha256: "2f9d2cbccb76127ba28528cb3ae2c2326a122446a83de5a056aaa3880d3882c5" url: "https://pub.flutter-io.cn" source: hosted - version: "0.3.3+8" + version: "0.3.3+7" crypto: dependency: transitive description: @@ -593,10 +593,10 @@ packages: dependency: transitive description: name: http - sha256: a2bbf9d017fcced29139daa8ed2bba4ece450ab222871df93ca9eec6f80c34ba + sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525" url: "https://pub.flutter-io.cn" source: hosted - version: "1.2.0" + version: "1.1.0" http_multi_server: dependency: transitive description: @@ -753,10 +753,10 @@ packages: dependency: "direct dev" description: name: lint - sha256: d758a5211fce7fd3f5e316f804daefecdc34c7e53559716125e6da7388ae8565 + sha256: "77b3777e8e9adca8e942da1e835882ae3248dfa00488a2ebbdbc1f1a4aa3f4a7" url: "https://pub.flutter-io.cn" source: hosted - version: "2.3.0" + version: "2.2.0" lints: dependency: transitive description: @@ -809,10 +809,10 @@ packages: dependency: transitive description: name: mime - sha256: "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2" + sha256: e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e url: "https://pub.flutter-io.cn" source: hosted - version: "1.0.5" + version: "1.0.4" nested: dependency: transitive description: @@ -897,10 +897,10 @@ packages: dependency: transitive description: name: petitparser - sha256: c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27 + sha256: cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750 url: "https://pub.flutter-io.cn" source: hosted - version: "6.0.2" + version: "5.4.0" pin_code_fields: dependency: "direct main" description: @@ -1174,10 +1174,10 @@ packages: dependency: transitive description: name: uuid - sha256: cd210a09f7c18cbe5a02511718e0334de6559871052c90a90c0cca46a4aa81c8 + sha256: "22c94e5ad1e75f9934b766b53c742572ee2677c56bc871d850a57dad0f82127f" url: "https://pub.flutter-io.cn" source: hosted - version: "4.3.3" + version: "4.2.2" vector_math: dependency: transitive description: @@ -1246,10 +1246,10 @@ packages: dependency: transitive description: name: win32 - sha256: "464f5674532865248444b4c3daca12bd9bf2d7c47f759ce2617986e7229494a8" + sha256: b0f37db61ba2f2e9b7a78a1caece0052564d1bc70668156cf3a29d676fe4e574 url: "https://pub.flutter-io.cn" source: hosted - version: "5.2.0" + version: "5.1.1" xdg_directories: dependency: transitive description: @@ -1262,10 +1262,10 @@ packages: dependency: transitive description: name: xml - sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226 + sha256: "5bc72e1e45e941d825fd7468b9b4cc3b9327942649aeb6fc5cdbf135f0a86e84" url: "https://pub.flutter-io.cn" source: hosted - version: "6.5.0" + version: "6.3.0" yaml: dependency: transitive description: @@ -1275,5 +1275,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.2.0 <4.0.0" + dart: ">=3.2.0-194.0.dev <4.0.0" flutter: ">=3.13.0" From 103af55ae0dcbe76b3c949fff42c9cfbe031b7a3 Mon Sep 17 00:00:00 2001 From: ice-orion <102020833+ice-orion@users.noreply.github.com> Date: Mon, 12 Feb 2024 12:29:23 +0400 Subject: [PATCH 02/13] refactor: widgets -> components --- ios/Flutter/AppFrameworkInfo.plist | 2 +- ios/Podfile | 2 +- ios/Podfile.lock | 20 ++++++++++++++++--- ios/Runner.xcodeproj/project.pbxproj | 6 +++--- lib/app/components/button/button.dart | 2 +- .../{widgets => variants}/button_icon.dart | 0 lib/app/components/list_item/list_item.dart | 2 +- .../list_item_checkbox.dart | 0 .../auth/views/pages/auth_page/auth_page.dart | 18 ++++++++--------- .../country_code_input.dart | 0 .../views/pages/check_email/check_email.dart | 4 ++-- .../discover_creators/discover_creators.dart | 6 +++--- .../views/pages/enter_code/enter_code.dart | 4 ++-- .../pages/fill_profile/fill_profile.dart | 8 ++++---- .../views/pages/intro_page/intro_page.dart | 4 ++-- .../views/pages/nostr_auth/nostr_auth.dart | 4 ++-- .../views/pages/nostr_login/nostr_login.dart | 4 ++-- .../pages/select_country/select_country.dart | 4 ++-- .../select_languages/select_languages.dart | 6 +++--- .../pages/{widgets => components}/apps.dart | 4 ++-- .../apps_collection.dart | 2 +- .../{widgets => components}/categories.dart | 4 ++-- .../categories_collection.dart | 0 .../{widgets => components}/favourites.dart | 2 +- .../{widgets => components}/featured.dart | 4 ++-- .../featured_collection.dart | 0 lib/app/features/dapps/views/pages/dapps.dart | 10 +++++----- .../views/pages/dapps_list/dapps_list.dart | 8 ++++---- .../article_header/article_header.dart | 2 +- .../article_header/widgetbook.dart | 2 +- .../post_image/post_image.dart | 4 ++-- .../post_image/widgetbook.dart | 2 +- .../read_time_tile/read_time_tile.dart | 0 .../read_time_tile/widgetbook.dart | 2 +- .../features/feed/views/pages/feed_page.dart | 4 ++-- .../wallet/views/pages/wallet_page.dart | 2 +- 36 files changed, 81 insertions(+), 67 deletions(-) rename lib/app/components/button/{widgets => variants}/button_icon.dart (100%) rename lib/app/components/list_item/{widgets => variants}/list_item_checkbox.dart (100%) rename lib/app/features/auth/views/pages/auth_page/{widgets => components}/country_code_input.dart (100%) rename lib/app/features/dapps/views/pages/{widgets => components}/apps.dart (89%) rename lib/app/features/dapps/views/pages/{widgets => components}/apps_collection.dart (100%) rename lib/app/features/dapps/views/pages/{widgets => components}/categories.dart (83%) rename lib/app/features/dapps/views/pages/{widgets => components}/categories_collection.dart (100%) rename lib/app/features/dapps/views/pages/{widgets => components}/favourites.dart (100%) rename lib/app/features/dapps/views/pages/{widgets => components}/featured.dart (86%) rename lib/app/features/dapps/views/pages/{widgets => components}/featured_collection.dart (100%) rename lib/app/features/feed/{widgets => components}/article_header/article_header.dart (100%) rename lib/app/features/feed/{widgets => components}/article_header/widgetbook.dart (91%) rename lib/app/features/feed/{widgets => components}/post_image/post_image.dart (96%) rename lib/app/features/feed/{widgets => components}/post_image/widgetbook.dart (89%) rename lib/app/features/feed/{widgets => components}/read_time_tile/read_time_tile.dart (100%) rename lib/app/features/feed/{widgets => components}/read_time_tile/widgetbook.dart (87%) diff --git a/ios/Flutter/AppFrameworkInfo.plist b/ios/Flutter/AppFrameworkInfo.plist index 9625e105d..7c5696400 100644 --- a/ios/Flutter/AppFrameworkInfo.plist +++ b/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 11.0 + 12.0 diff --git a/ios/Podfile b/ios/Podfile index 313ea4a15..2c068c404 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -1,5 +1,5 @@ # Uncomment this line to define a global platform for your project -platform :ios, '11.0' +platform :ios, '12.0' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 7534963e5..716332c27 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -7,6 +7,12 @@ PODS: - TOCropViewController (~> 2.6.1) - image_picker_ios (0.0.1): - Flutter + - path_provider_foundation (0.0.1): + - Flutter + - FlutterMacOS + - sqflite (0.0.3): + - Flutter + - FlutterMacOS - TOCropViewController (2.6.1) DEPENDENCIES: @@ -14,6 +20,8 @@ DEPENDENCIES: - flutter_keyboard_visibility (from `.symlinks/plugins/flutter_keyboard_visibility/ios`) - image_cropper (from `.symlinks/plugins/image_cropper/ios`) - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`) + - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`) + - sqflite (from `.symlinks/plugins/sqflite/darwin`) SPEC REPOS: trunk: @@ -28,14 +36,20 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/image_cropper/ios" image_picker_ios: :path: ".symlinks/plugins/image_picker_ios/ios" + path_provider_foundation: + :path: ".symlinks/plugins/path_provider_foundation/darwin" + sqflite: + :path: ".symlinks/plugins/sqflite/darwin" SPEC CHECKSUMS: - Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 + Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 flutter_keyboard_visibility: 0339d06371254c3eb25eeb90ba8d17dca8f9c069 image_cropper: a3291c624a953049bc6a02e1f8c8ceb162a24b25 - image_picker_ios: 4a8aadfbb6dc30ad5141a2ce3832af9214a705b5 + image_picker_ios: 99dfe1854b4fa34d0364e74a78448a0151025425 + path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c + sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec TOCropViewController: edfd4f25713d56905ad1e0b9f5be3fbe0f59c863 -PODFILE CHECKSUM: 7368163408c647b7eb699d0d788ba6718e18fb8d +PODFILE CHECKSUM: 4e8f8b2be68aeea4c0d5beb6ff1e79fface1d048 COCOAPODS: 1.15.2 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 8aacd388e..d0f218842 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -348,7 +348,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -429,7 +429,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -478,7 +478,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; diff --git a/lib/app/components/button/button.dart b/lib/app/components/button/button.dart index 64fbfcf5f..f9101d229 100644 --- a/lib/app/components/button/button.dart +++ b/lib/app/components/button/button.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/extensions/theme_data.dart'; -part './widgets/button_icon.dart'; +part 'variants/button_icon.dart'; enum ButtonType { primary, diff --git a/lib/app/components/button/widgets/button_icon.dart b/lib/app/components/button/variants/button_icon.dart similarity index 100% rename from lib/app/components/button/widgets/button_icon.dart rename to lib/app/components/button/variants/button_icon.dart diff --git a/lib/app/components/list_item/list_item.dart b/lib/app/components/list_item/list_item.dart index b613370c0..ad749a38d 100644 --- a/lib/app/components/list_item/list_item.dart +++ b/lib/app/components/list_item/list_item.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/extensions/theme_data.dart'; -part './widgets/list_item_checkbox.dart'; +part './variants/list_item_checkbox.dart'; class ListItem extends StatelessWidget { const ListItem({ diff --git a/lib/app/components/list_item/widgets/list_item_checkbox.dart b/lib/app/components/list_item/variants/list_item_checkbox.dart similarity index 100% rename from lib/app/components/list_item/widgets/list_item_checkbox.dart rename to lib/app/components/list_item/variants/list_item_checkbox.dart diff --git a/lib/app/features/auth/views/pages/auth_page/auth_page.dart b/lib/app/features/auth/views/pages/auth_page/auth_page.dart index d4c523ec0..445e3b775 100644 --- a/lib/app/features/auth/views/pages/auth_page/auth_page.dart +++ b/lib/app/features/auth/views/pages/auth_page/auth_page.dart @@ -1,13 +1,21 @@ import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; +import 'package:ice/app/components/auth_header/auth_header.dart'; +import 'package:ice/app/components/button/button.dart'; +import 'package:ice/app/components/inputs/text_fields.dart'; +import 'package:ice/app/components/modal_wrapper.dart'; +import 'package:ice/app/components/screen_side_offset/screen_side_offset.dart'; +import 'package:ice/app/components/secured_by/secured_by.dart'; +import 'package:ice/app/components/socials/socials.dart'; +import 'package:ice/app/components/terms_privacy/terms_privacy.dart'; import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/app/features/auth/data/models/auth_state.dart'; import 'package:ice/app/features/auth/providers/auth_provider.dart'; import 'package:ice/app/features/auth/providers/ui_auth_provider.dart'; +import 'package:ice/app/features/auth/views/pages/auth_page/components/country_code_input.dart'; import 'package:ice/app/features/auth/views/pages/auth_page/controllers/email_controller.dart'; import 'package:ice/app/features/auth/views/pages/auth_page/controllers/phone_number_controller.dart'; -import 'package:ice/app/features/auth/views/pages/auth_page/widgets/country_code_input.dart'; import 'package:ice/app/features/auth/views/pages/check_email/check_email.dart'; import 'package:ice/app/features/auth/views/pages/discover_creators/discover_creators.dart'; import 'package:ice/app/features/auth/views/pages/enter_code/enter_code.dart'; @@ -16,14 +24,6 @@ import 'package:ice/app/features/auth/views/pages/nostr_auth/nostr_auth.dart'; import 'package:ice/app/features/auth/views/pages/select_country/countries.dart'; import 'package:ice/app/features/auth/views/pages/select_country/select_country.dart'; import 'package:ice/app/features/auth/views/pages/select_languages/select_languages.dart'; -import 'package:ice/app/components/auth_header/auth_header.dart'; -import 'package:ice/app/components/button/button.dart'; -import 'package:ice/app/components/inputs/text_fields.dart'; -import 'package:ice/app/components/modal_wrapper.dart'; -import 'package:ice/app/components/screen_side_offset/screen_side_offset.dart'; -import 'package:ice/app/components/secured_by/secured_by.dart'; -import 'package:ice/app/components/socials/socials.dart'; -import 'package:ice/app/components/terms_privacy/terms_privacy.dart'; import 'package:ice/generated/assets.gen.dart'; class AuthPage extends HookConsumerWidget { diff --git a/lib/app/features/auth/views/pages/auth_page/widgets/country_code_input.dart b/lib/app/features/auth/views/pages/auth_page/components/country_code_input.dart similarity index 100% rename from lib/app/features/auth/views/pages/auth_page/widgets/country_code_input.dart rename to lib/app/features/auth/views/pages/auth_page/components/country_code_input.dart diff --git a/lib/app/features/auth/views/pages/check_email/check_email.dart b/lib/app/features/auth/views/pages/check_email/check_email.dart index 0ba97f341..b848020bb 100644 --- a/lib/app/features/auth/views/pages/check_email/check_email.dart +++ b/lib/app/features/auth/views/pages/check_email/check_email.dart @@ -2,10 +2,10 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:ice/app/extensions/build_context.dart'; -import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/app/components/screen_side_offset/screen_side_offset.dart'; import 'package:ice/app/components/terms_privacy/terms_privacy.dart'; +import 'package:ice/app/extensions/build_context.dart'; +import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/generated/assets.gen.dart'; import 'package:pin_code_fields/pin_code_fields.dart'; diff --git a/lib/app/features/auth/views/pages/discover_creators/discover_creators.dart b/lib/app/features/auth/views/pages/discover_creators/discover_creators.dart index 040b3a3b8..08a1c1645 100644 --- a/lib/app/features/auth/views/pages/discover_creators/discover_creators.dart +++ b/lib/app/features/auth/views/pages/discover_creators/discover_creators.dart @@ -1,13 +1,13 @@ import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:ice/app/extensions/build_context.dart'; -import 'package:ice/app/extensions/theme_data.dart'; -import 'package:ice/app/features/auth/views/pages/discover_creators/mocked_creators.dart'; import 'package:ice/app/components/button/button.dart'; import 'package:ice/app/components/navigation_header/navigation_header.dart'; import 'package:ice/app/components/search/search.dart'; import 'package:ice/app/components/title_description_header/title_description_header.dart'; +import 'package:ice/app/extensions/build_context.dart'; +import 'package:ice/app/extensions/theme_data.dart'; +import 'package:ice/app/features/auth/views/pages/discover_creators/mocked_creators.dart'; import 'package:ice/app/values/constants.dart'; import 'package:ice/generated/assets.gen.dart'; diff --git a/lib/app/features/auth/views/pages/enter_code/enter_code.dart b/lib/app/features/auth/views/pages/enter_code/enter_code.dart index c77edfcfd..443b4a87e 100644 --- a/lib/app/features/auth/views/pages/enter_code/enter_code.dart +++ b/lib/app/features/auth/views/pages/enter_code/enter_code.dart @@ -3,10 +3,10 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:ice/app/extensions/build_context.dart'; -import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/app/components/screen_side_offset/screen_side_offset.dart'; import 'package:ice/app/components/terms_privacy/terms_privacy.dart'; +import 'package:ice/app/extensions/build_context.dart'; +import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/generated/assets.gen.dart'; import 'package:pin_code_fields/pin_code_fields.dart'; diff --git a/lib/app/features/auth/views/pages/fill_profile/fill_profile.dart b/lib/app/features/auth/views/pages/fill_profile/fill_profile.dart index 8206f7702..c782f3ddb 100644 --- a/lib/app/features/auth/views/pages/fill_profile/fill_profile.dart +++ b/lib/app/features/auth/views/pages/fill_profile/fill_profile.dart @@ -2,6 +2,10 @@ import 'dart:io'; import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; +import 'package:ice/app/components/button/button.dart'; +import 'package:ice/app/components/inputs/text_fields.dart'; +import 'package:ice/app/components/screen_side_offset/screen_side_offset.dart'; +import 'package:ice/app/components/text_field_wrapper/text_field_wrapper.dart'; import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/app/features/auth/views/pages/fill_profile/controllers/inviter_controller.dart'; @@ -9,10 +13,6 @@ import 'package:ice/app/features/auth/views/pages/fill_profile/controllers/name_ import 'package:ice/app/features/auth/views/pages/fill_profile/controllers/nickname_controller.dart'; import 'package:ice/app/features/auth/views/pages/fill_profile/validators.dart'; import 'package:ice/app/shared/utility/image_picker_and_cropper/image_picker_and_cropper.dart'; -import 'package:ice/app/components/button/button.dart'; -import 'package:ice/app/components/inputs/text_fields.dart'; -import 'package:ice/app/components/screen_side_offset/screen_side_offset.dart'; -import 'package:ice/app/components/text_field_wrapper/text_field_wrapper.dart'; import 'package:ice/generated/assets.gen.dart'; import 'package:image_cropper/image_cropper.dart'; diff --git a/lib/app/features/auth/views/pages/intro_page/intro_page.dart b/lib/app/features/auth/views/pages/intro_page/intro_page.dart index 5e52f9550..f36fd110c 100644 --- a/lib/app/features/auth/views/pages/intro_page/intro_page.dart +++ b/lib/app/features/auth/views/pages/intro_page/intro_page.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; +import 'package:ice/app/components/modal_wrapper.dart'; +import 'package:ice/app/components/side_padding.dart'; import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/app/features/auth/views/pages/auth_page/auth_page.dart'; -import 'package:ice/app/components/modal_wrapper.dart'; -import 'package:ice/app/components/side_padding.dart'; import 'package:ice/generated/assets.gen.dart'; import 'package:lottie/lottie.dart'; diff --git a/lib/app/features/auth/views/pages/nostr_auth/nostr_auth.dart b/lib/app/features/auth/views/pages/nostr_auth/nostr_auth.dart index 41f9f371e..9297530de 100644 --- a/lib/app/features/auth/views/pages/nostr_auth/nostr_auth.dart +++ b/lib/app/features/auth/views/pages/nostr_auth/nostr_auth.dart @@ -1,11 +1,11 @@ import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:ice/app/extensions/build_context.dart'; -import 'package:ice/app/features/auth/views/pages/nostr_login/nostr_login.dart'; import 'package:ice/app/components/auth_header/auth_header.dart'; import 'package:ice/app/components/button/button.dart'; import 'package:ice/app/components/modal_wrapper.dart'; import 'package:ice/app/components/screen_side_offset/screen_side_offset.dart'; +import 'package:ice/app/extensions/build_context.dart'; +import 'package:ice/app/features/auth/views/pages/nostr_login/nostr_login.dart'; import 'package:ice/generated/assets.gen.dart'; class NostrAuth extends HookConsumerWidget { diff --git a/lib/app/features/auth/views/pages/nostr_login/nostr_login.dart b/lib/app/features/auth/views/pages/nostr_login/nostr_login.dart index 99ddb081b..3c9568fde 100644 --- a/lib/app/features/auth/views/pages/nostr_login/nostr_login.dart +++ b/lib/app/features/auth/views/pages/nostr_login/nostr_login.dart @@ -1,11 +1,11 @@ import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:ice/app/extensions/build_context.dart'; -import 'package:ice/app/features/auth/views/pages/nostr_login/controllers/name_controller.dart'; import 'package:ice/app/components/auth_header/auth_header.dart'; import 'package:ice/app/components/button/button.dart'; import 'package:ice/app/components/inputs/text_fields.dart'; import 'package:ice/app/components/screen_side_offset/screen_side_offset.dart'; +import 'package:ice/app/extensions/build_context.dart'; +import 'package:ice/app/features/auth/views/pages/nostr_login/controllers/name_controller.dart'; import 'package:ice/generated/assets.gen.dart'; class NostrLogin extends HookConsumerWidget { diff --git a/lib/app/features/auth/views/pages/select_country/select_country.dart b/lib/app/features/auth/views/pages/select_country/select_country.dart index a208cd3bb..2afe6a2fb 100644 --- a/lib/app/features/auth/views/pages/select_country/select_country.dart +++ b/lib/app/features/auth/views/pages/select_country/select_country.dart @@ -1,11 +1,11 @@ import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; +import 'package:ice/app/components/navigation_header/navigation_header.dart'; +import 'package:ice/app/components/search/search.dart'; import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/app/features/auth/views/pages/select_country/countries.dart'; -import 'package:ice/app/components/navigation_header/navigation_header.dart'; -import 'package:ice/app/components/search/search.dart'; class SelectCountries extends HookConsumerWidget { const SelectCountries({super.key}); diff --git a/lib/app/features/auth/views/pages/select_languages/select_languages.dart b/lib/app/features/auth/views/pages/select_languages/select_languages.dart index 5a28fb647..0b30bc2e8 100644 --- a/lib/app/features/auth/views/pages/select_languages/select_languages.dart +++ b/lib/app/features/auth/views/pages/select_languages/select_languages.dart @@ -1,12 +1,12 @@ import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:ice/app/extensions/build_context.dart'; -import 'package:ice/app/extensions/theme_data.dart'; -import 'package:ice/app/features/auth/views/pages/select_languages/languages.dart'; import 'package:ice/app/components/navigation_header/navigation_header.dart'; import 'package:ice/app/components/search/search.dart'; import 'package:ice/app/components/title_description_header/title_description_header.dart'; +import 'package:ice/app/extensions/build_context.dart'; +import 'package:ice/app/extensions/theme_data.dart'; +import 'package:ice/app/features/auth/views/pages/select_languages/languages.dart'; import 'package:ice/app/values/constants.dart'; import 'package:ice/generated/assets.gen.dart'; diff --git a/lib/app/features/dapps/views/pages/widgets/apps.dart b/lib/app/features/dapps/views/pages/components/apps.dart similarity index 89% rename from lib/app/features/dapps/views/pages/widgets/apps.dart rename to lib/app/features/dapps/views/pages/components/apps.dart index d511b813a..240af078a 100644 --- a/lib/app/features/dapps/views/pages/widgets/apps.dart +++ b/lib/app/features/dapps/views/pages/components/apps.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -import 'package:ice/app/features/dapps/views/pages/mocks/mocked_apps.dart'; -import 'package:ice/app/features/dapps/views/pages/widgets/apps_collection.dart'; import 'package:ice/app/components/section_header/section_header.dart'; +import 'package:ice/app/features/dapps/views/pages/components/apps_collection.dart'; +import 'package:ice/app/features/dapps/views/pages/mocks/mocked_apps.dart'; class AppsRouteData { AppsRouteData({required this.title, this.items = const []}); diff --git a/lib/app/features/dapps/views/pages/widgets/apps_collection.dart b/lib/app/features/dapps/views/pages/components/apps_collection.dart similarity index 100% rename from lib/app/features/dapps/views/pages/widgets/apps_collection.dart rename to lib/app/features/dapps/views/pages/components/apps_collection.dart index 649b121cc..bbbf47450 100644 --- a/lib/app/features/dapps/views/pages/widgets/apps_collection.dart +++ b/lib/app/features/dapps/views/pages/components/apps_collection.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; +import 'package:ice/app/components/favourite_icon/favorite_icon.dart'; import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/app/features/dapps/views/pages/mocks/mocked_apps.dart'; -import 'package:ice/app/components/favourite_icon/favorite_icon.dart'; import 'package:ice/app/utils/extensions.dart'; import 'package:ice/app/values/constants.dart'; diff --git a/lib/app/features/dapps/views/pages/widgets/categories.dart b/lib/app/features/dapps/views/pages/components/categories.dart similarity index 83% rename from lib/app/features/dapps/views/pages/widgets/categories.dart rename to lib/app/features/dapps/views/pages/components/categories.dart index d80ae23a2..81c22a896 100644 --- a/lib/app/features/dapps/views/pages/widgets/categories.dart +++ b/lib/app/features/dapps/views/pages/components/categories.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -import 'package:ice/app/extensions/build_context.dart'; -import 'package:ice/app/features/dapps/views/pages/widgets/categories_collection.dart'; import 'package:ice/app/components/section_header/section_header.dart'; +import 'package:ice/app/extensions/build_context.dart'; +import 'package:ice/app/features/dapps/views/pages/components/categories_collection.dart'; class Categories extends StatelessWidget { const Categories({super.key}); diff --git a/lib/app/features/dapps/views/pages/widgets/categories_collection.dart b/lib/app/features/dapps/views/pages/components/categories_collection.dart similarity index 100% rename from lib/app/features/dapps/views/pages/widgets/categories_collection.dart rename to lib/app/features/dapps/views/pages/components/categories_collection.dart diff --git a/lib/app/features/dapps/views/pages/widgets/favourites.dart b/lib/app/features/dapps/views/pages/components/favourites.dart similarity index 100% rename from lib/app/features/dapps/views/pages/widgets/favourites.dart rename to lib/app/features/dapps/views/pages/components/favourites.dart index ddc1d8be3..7e0140953 100644 --- a/lib/app/features/dapps/views/pages/widgets/favourites.dart +++ b/lib/app/features/dapps/views/pages/components/favourites.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; +import 'package:ice/app/components/favourite_icon/favorite_icon.dart'; import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/extensions/theme_data.dart'; -import 'package:ice/app/components/favourite_icon/favorite_icon.dart'; import 'package:ice/app/values/constants.dart'; import 'package:ice/generated/assets.gen.dart'; diff --git a/lib/app/features/dapps/views/pages/widgets/featured.dart b/lib/app/features/dapps/views/pages/components/featured.dart similarity index 86% rename from lib/app/features/dapps/views/pages/widgets/featured.dart rename to lib/app/features/dapps/views/pages/components/featured.dart index df8940213..921af3647 100644 --- a/lib/app/features/dapps/views/pages/widgets/featured.dart +++ b/lib/app/features/dapps/views/pages/components/featured.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; +import 'package:ice/app/components/section_header/section_header.dart'; import 'package:ice/app/extensions/build_context.dart'; +import 'package:ice/app/features/dapps/views/pages/components/featured_collection.dart'; import 'package:ice/app/features/dapps/views/pages/mocks/mocked_featured.dart'; -import 'package:ice/app/features/dapps/views/pages/widgets/featured_collection.dart'; -import 'package:ice/app/components/section_header/section_header.dart'; class Featured extends StatelessWidget { const Featured({super.key}); diff --git a/lib/app/features/dapps/views/pages/widgets/featured_collection.dart b/lib/app/features/dapps/views/pages/components/featured_collection.dart similarity index 100% rename from lib/app/features/dapps/views/pages/widgets/featured_collection.dart rename to lib/app/features/dapps/views/pages/components/featured_collection.dart diff --git a/lib/app/features/dapps/views/pages/dapps.dart b/lib/app/features/dapps/views/pages/dapps.dart index b44cbaa14..431bc765c 100644 --- a/lib/app/features/dapps/views/pages/dapps.dart +++ b/lib/app/features/dapps/views/pages/dapps.dart @@ -1,14 +1,14 @@ import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; +import 'package:ice/app/components/wallet_header/wallet_header.dart'; import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/extensions/theme_data.dart'; +import 'package:ice/app/features/dapps/views/pages/components/apps.dart'; +import 'package:ice/app/features/dapps/views/pages/components/categories.dart'; +import 'package:ice/app/features/dapps/views/pages/components/favourites.dart'; +import 'package:ice/app/features/dapps/views/pages/components/featured.dart'; import 'package:ice/app/features/dapps/views/pages/mocks/mocked_apps.dart'; -import 'package:ice/app/features/dapps/views/pages/widgets/apps.dart'; -import 'package:ice/app/features/dapps/views/pages/widgets/categories.dart'; -import 'package:ice/app/features/dapps/views/pages/widgets/favourites.dart'; -import 'package:ice/app/features/dapps/views/pages/widgets/featured.dart'; -import 'package:ice/app/components/wallet_header/wallet_header.dart'; class DAppsPage extends HookConsumerWidget { const DAppsPage({super.key}); diff --git a/lib/app/features/dapps/views/pages/dapps_list/dapps_list.dart b/lib/app/features/dapps/views/pages/dapps_list/dapps_list.dart index b630f0452..a72163f07 100644 --- a/lib/app/features/dapps/views/pages/dapps_list/dapps_list.dart +++ b/lib/app/features/dapps/views/pages/dapps_list/dapps_list.dart @@ -1,13 +1,13 @@ import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:ice/app/extensions/build_context.dart'; -import 'package:ice/app/extensions/theme_data.dart'; -import 'package:ice/app/features/dapps/views/pages/mocks/mocked_apps.dart'; -import 'package:ice/app/features/dapps/views/pages/widgets/apps_collection.dart'; import 'package:ice/app/components/nav_header_offset/nav_header_offset.dart'; import 'package:ice/app/components/navigation_header/navigation_header.dart'; import 'package:ice/app/components/search/search.dart'; +import 'package:ice/app/extensions/build_context.dart'; +import 'package:ice/app/extensions/theme_data.dart'; +import 'package:ice/app/features/dapps/views/pages/components/apps_collection.dart'; +import 'package:ice/app/features/dapps/views/pages/mocks/mocked_apps.dart'; class DAppsList extends HookConsumerWidget { const DAppsList({super.key}); diff --git a/lib/app/features/feed/widgets/article_header/article_header.dart b/lib/app/features/feed/components/article_header/article_header.dart similarity index 100% rename from lib/app/features/feed/widgets/article_header/article_header.dart rename to lib/app/features/feed/components/article_header/article_header.dart index 50c594e62..b0284dbe1 100644 --- a/lib/app/features/feed/widgets/article_header/article_header.dart +++ b/lib/app/features/feed/components/article_header/article_header.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; +import 'package:ice/app/components/screen_side_offset/screen_side_offset.dart'; import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/extensions/theme_data.dart'; -import 'package:ice/app/components/screen_side_offset/screen_side_offset.dart'; class ArticleHeader extends StatelessWidget { const ArticleHeader({ diff --git a/lib/app/features/feed/widgets/article_header/widgetbook.dart b/lib/app/features/feed/components/article_header/widgetbook.dart similarity index 91% rename from lib/app/features/feed/widgets/article_header/widgetbook.dart rename to lib/app/features/feed/components/article_header/widgetbook.dart index f2ec88dd3..a5e1020ae 100644 --- a/lib/app/features/feed/widgets/article_header/widgetbook.dart +++ b/lib/app/features/feed/components/article_header/widgetbook.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:ice/app/features/feed/widgets/article_header/article_header.dart'; +import 'package:ice/app/features/feed/components/article_header/article_header.dart'; import 'package:widgetbook/widgetbook.dart'; import 'package:widgetbook_annotation/widgetbook_annotation.dart' as widgetbook; diff --git a/lib/app/features/feed/widgets/post_image/post_image.dart b/lib/app/features/feed/components/post_image/post_image.dart similarity index 96% rename from lib/app/features/feed/widgets/post_image/post_image.dart rename to lib/app/features/feed/components/post_image/post_image.dart index 1cd04838d..86bac4135 100644 --- a/lib/app/features/feed/widgets/post_image/post_image.dart +++ b/lib/app/features/feed/components/post_image/post_image.dart @@ -1,10 +1,10 @@ import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:ice/app/components/screen_side_offset/screen_side_offset.dart'; import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/extensions/theme_data.dart'; -import 'package:ice/app/features/feed/widgets/read_time_tile/read_time_tile.dart'; -import 'package:ice/app/components/screen_side_offset/screen_side_offset.dart'; +import 'package:ice/app/features/feed/components/read_time_tile/read_time_tile.dart'; import 'package:ice/utils/Image_utils.dart'; double borderRadius = 12.0.w; diff --git a/lib/app/features/feed/widgets/post_image/widgetbook.dart b/lib/app/features/feed/components/post_image/widgetbook.dart similarity index 89% rename from lib/app/features/feed/widgets/post_image/widgetbook.dart rename to lib/app/features/feed/components/post_image/widgetbook.dart index 80097046a..c1305bded 100644 --- a/lib/app/features/feed/widgets/post_image/widgetbook.dart +++ b/lib/app/features/feed/components/post_image/widgetbook.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:ice/app/features/feed/widgets/post_image/post_image.dart'; +import 'package:ice/app/features/feed/components/post_image/post_image.dart'; import 'package:widgetbook_annotation/widgetbook_annotation.dart' as widgetbook; @widgetbook.UseCase( diff --git a/lib/app/features/feed/widgets/read_time_tile/read_time_tile.dart b/lib/app/features/feed/components/read_time_tile/read_time_tile.dart similarity index 100% rename from lib/app/features/feed/widgets/read_time_tile/read_time_tile.dart rename to lib/app/features/feed/components/read_time_tile/read_time_tile.dart diff --git a/lib/app/features/feed/widgets/read_time_tile/widgetbook.dart b/lib/app/features/feed/components/read_time_tile/widgetbook.dart similarity index 87% rename from lib/app/features/feed/widgets/read_time_tile/widgetbook.dart rename to lib/app/features/feed/components/read_time_tile/widgetbook.dart index 09044e2ff..0f95ae4dd 100644 --- a/lib/app/features/feed/widgets/read_time_tile/widgetbook.dart +++ b/lib/app/features/feed/components/read_time_tile/widgetbook.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/extensions/theme_data.dart'; -import 'package:ice/app/features/feed/widgets/read_time_tile/read_time_tile.dart'; +import 'package:ice/app/features/feed/components/read_time_tile/read_time_tile.dart'; import 'package:widgetbook/widgetbook.dart'; import 'package:widgetbook_annotation/widgetbook_annotation.dart' as widgetbook; diff --git a/lib/app/features/feed/views/pages/feed_page.dart b/lib/app/features/feed/views/pages/feed_page.dart index 77bede15b..a85c91de9 100644 --- a/lib/app/features/feed/views/pages/feed_page.dart +++ b/lib/app/features/feed/views/pages/feed_page.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:ice/app/extensions/build_context.dart'; -import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/app/components/button/button.dart'; import 'package:ice/app/components/drop_down_menu/drop_down_menu.dart'; +import 'package:ice/app/extensions/build_context.dart'; +import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/generated/assets.gen.dart'; enum FeedType { feed, videos, stories } diff --git a/lib/app/features/wallet/views/pages/wallet_page.dart b/lib/app/features/wallet/views/pages/wallet_page.dart index b30a43f61..49ccaf47c 100644 --- a/lib/app/features/wallet/views/pages/wallet_page.dart +++ b/lib/app/features/wallet/views/pages/wallet_page.dart @@ -1,11 +1,11 @@ import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; +import 'package:ice/app/components/button/button.dart'; import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/app/features/auth/data/models/auth_state.dart'; import 'package:ice/app/features/auth/providers/auth_provider.dart'; -import 'package:ice/app/components/button/button.dart'; import 'package:ice/generated/assets.gen.dart'; enum SampleItem { ice, eth, bnb } From 8b94736be356e5d06194282388913e4789997d30 Mon Sep 17 00:00:00 2001 From: ice-orion <102020833+ice-orion@users.noreply.github.com> Date: Mon, 12 Feb 2024 13:59:35 +0400 Subject: [PATCH 03/13] refactor: extentions / utils --- lib/app/components/inputs/text_fields.dart | 3 +- lib/app/extensions/bool.dart | 5 +++ lib/app/extensions/list.dart | 5 +++ .../extensions.dart => extensions/num.dart} | 32 ------------- lib/app/extensions/string.dart | 13 ++++++ .../pages/fill_profile/fill_profile.dart | 4 +- .../pages/components/apps_collection.dart | 2 +- .../components/post_image/post_image.dart | 4 +- .../image_picker_and_cropper.dart | 45 ------------------- lib/app/utils/image.dart | 45 +++++++++++++++++++ lib/app/utils/string.dart | 6 +++ lib/app/values/constants.dart | 2 +- lib/utils/image_utils.dart | 5 --- 13 files changed, 82 insertions(+), 89 deletions(-) create mode 100644 lib/app/extensions/bool.dart create mode 100644 lib/app/extensions/list.dart rename lib/app/{utils/extensions.dart => extensions/num.dart} (58%) create mode 100644 lib/app/extensions/string.dart delete mode 100644 lib/app/shared/utility/image_picker_and_cropper/image_picker_and_cropper.dart create mode 100644 lib/app/utils/image.dart create mode 100644 lib/app/utils/string.dart delete mode 100644 lib/utils/image_utils.dart diff --git a/lib/app/components/inputs/text_fields.dart b/lib/app/components/inputs/text_fields.dart index 7f8c3239b..620ca693e 100644 --- a/lib/app/components/inputs/text_fields.dart +++ b/lib/app/components/inputs/text_fields.dart @@ -4,8 +4,9 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:ice/app/components/decorators.dart'; import 'package:ice/app/components/inputs/input_field_controller.dart'; import 'package:ice/app/extensions/build_context.dart'; +import 'package:ice/app/extensions/num.dart'; +import 'package:ice/app/extensions/string.dart'; import 'package:ice/app/extensions/theme_data.dart'; -import 'package:ice/app/utils/extensions.dart'; import 'package:ice/app/values/borders.dart'; import 'package:ice/app/values/constants.dart'; import 'package:ice/generated/assets.gen.dart'; diff --git a/lib/app/extensions/bool.dart b/lib/app/extensions/bool.dart new file mode 100644 index 000000000..b308718ea --- /dev/null +++ b/lib/app/extensions/bool.dart @@ -0,0 +1,5 @@ +extension BooleanExtension on bool? { + bool get falseOrValue { + return this ?? false; + } +} diff --git a/lib/app/extensions/list.dart b/lib/app/extensions/list.dart new file mode 100644 index 000000000..bc2356de3 --- /dev/null +++ b/lib/app/extensions/list.dart @@ -0,0 +1,5 @@ +extension ListExtension on List? { + List get emptyOrValue => this ?? []; + + Type get genericType => T; +} diff --git a/lib/app/utils/extensions.dart b/lib/app/extensions/num.dart similarity index 58% rename from lib/app/utils/extensions.dart rename to lib/app/extensions/num.dart index acf94f6d6..ee4d44fa5 100644 --- a/lib/app/utils/extensions.dart +++ b/lib/app/extensions/num.dart @@ -1,5 +1,4 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:intl/intl.dart'; extension NumExtension on num? { num get zeroOrValue { @@ -37,34 +36,3 @@ extension DoubleExtension on double { return w; } } - -extension BooleanExtension on bool? { - bool get falseOrValue { - return this ?? false; - } -} - -extension StringExtension on String? { - String get emptyOrValue { - return this ?? ''; - } - - bool get isEmpty { - return emptyOrValue.isEmpty; - } - - bool get isNotEmpty { - return emptyOrValue.isNotEmpty; - } -} - -extension ListExtension on List? { - List get emptyOrValue => this ?? []; - - Type get genericType => T; -} - -String formatDouble(double value) { - final NumberFormat formatter = NumberFormat('#,##0.00', 'en_US'); - return formatter.format(value); -} diff --git a/lib/app/extensions/string.dart b/lib/app/extensions/string.dart new file mode 100644 index 000000000..141351052 --- /dev/null +++ b/lib/app/extensions/string.dart @@ -0,0 +1,13 @@ +extension StringExtension on String? { + String get emptyOrValue { + return this ?? ''; + } + + bool get isEmpty { + return emptyOrValue.isEmpty; + } + + bool get isNotEmpty { + return emptyOrValue.isNotEmpty; + } +} diff --git a/lib/app/features/auth/views/pages/fill_profile/fill_profile.dart b/lib/app/features/auth/views/pages/fill_profile/fill_profile.dart index c782f3ddb..cab4e5f5e 100644 --- a/lib/app/features/auth/views/pages/fill_profile/fill_profile.dart +++ b/lib/app/features/auth/views/pages/fill_profile/fill_profile.dart @@ -12,7 +12,7 @@ import 'package:ice/app/features/auth/views/pages/fill_profile/controllers/invit import 'package:ice/app/features/auth/views/pages/fill_profile/controllers/name_controller.dart'; import 'package:ice/app/features/auth/views/pages/fill_profile/controllers/nickname_controller.dart'; import 'package:ice/app/features/auth/views/pages/fill_profile/validators.dart'; -import 'package:ice/app/shared/utility/image_picker_and_cropper/image_picker_and_cropper.dart'; +import 'package:ice/app/utils/image.dart'; import 'package:ice/generated/assets.gen.dart'; import 'package:image_cropper/image_cropper.dart'; @@ -48,7 +48,7 @@ class FillProfile extends HookConsumerWidget { final InviterController inviterController = InviterController(); Future addPhoto() async { - final CroppedFile? croppedFile = await ImagePickerAndCropper.takePhoto(); + final CroppedFile? croppedFile = await takePhoto(); if (croppedFile != null) { ref.read(croppedFileProvider.notifier).croppedFile = croppedFile; } diff --git a/lib/app/features/dapps/views/pages/components/apps_collection.dart b/lib/app/features/dapps/views/pages/components/apps_collection.dart index bbbf47450..886446693 100644 --- a/lib/app/features/dapps/views/pages/components/apps_collection.dart +++ b/lib/app/features/dapps/views/pages/components/apps_collection.dart @@ -3,7 +3,7 @@ import 'package:ice/app/components/favourite_icon/favorite_icon.dart'; import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/app/features/dapps/views/pages/mocks/mocked_apps.dart'; -import 'package:ice/app/utils/extensions.dart'; +import 'package:ice/app/utils/string.dart'; import 'package:ice/app/values/constants.dart'; const double columnWidthPercentage = 0.68; diff --git a/lib/app/features/feed/components/post_image/post_image.dart b/lib/app/features/feed/components/post_image/post_image.dart index 86bac4135..081ee3f6d 100644 --- a/lib/app/features/feed/components/post_image/post_image.dart +++ b/lib/app/features/feed/components/post_image/post_image.dart @@ -5,7 +5,7 @@ import 'package:ice/app/components/screen_side_offset/screen_side_offset.dart'; import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/app/features/feed/components/read_time_tile/read_time_tile.dart'; -import 'package:ice/utils/Image_utils.dart'; +import 'package:ice/app/utils/image.dart'; double borderRadius = 12.0.w; @@ -53,7 +53,7 @@ class PostImage extends StatelessWidget { alignment: alignment, children: [ CachedNetworkImage( - imageUrl: ImageUtils.getAdaptiveImageUrl(imageUrl, imageWidth), + imageUrl: getAdaptiveImageUrl(imageUrl, imageWidth), width: imageWidth, fit: BoxFit.cover, ), diff --git a/lib/app/shared/utility/image_picker_and_cropper/image_picker_and_cropper.dart b/lib/app/shared/utility/image_picker_and_cropper/image_picker_and_cropper.dart deleted file mode 100644 index 59f5783ef..000000000 --- a/lib/app/shared/utility/image_picker_and_cropper/image_picker_and_cropper.dart +++ /dev/null @@ -1,45 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:image_cropper/image_cropper.dart'; -import 'package:image_picker/image_picker.dart'; - -class ImagePickerAndCropper { - static final ImagePicker _picker = ImagePicker(); - - static Future pickImageFromGallery() async { - final XFile? pickedFile = await _picker.pickImage( - source: ImageSource.gallery, - imageQuality: 50, - ); - return _cropImage(pickedFile?.path); - } - - static Future takePhoto() async { - final XFile? capturedFile = await _picker.pickImage( - source: ImageSource.camera, - imageQuality: 50, - ); - return _cropImage(capturedFile?.path); - } - - static Future _cropImage(String? path) async { - if (path == null) return null; - - return await ImageCropper().cropImage( - sourcePath: path, - aspectRatioPresets: [CropAspectRatioPreset.square], - cropStyle: CropStyle.circle, - uiSettings: [ - AndroidUiSettings( - toolbarTitle: 'Crop Image', - toolbarColor: Colors.blue, - toolbarWidgetColor: Colors.white, - initAspectRatio: CropAspectRatioPreset.original, - lockAspectRatio: false, - ), - IOSUiSettings( - title: 'Crop Image', - ), - ], - ); - } -} diff --git a/lib/app/utils/image.dart b/lib/app/utils/image.dart new file mode 100644 index 000000000..df152faa5 --- /dev/null +++ b/lib/app/utils/image.dart @@ -0,0 +1,45 @@ +import 'package:flutter/material.dart'; +import 'package:image_cropper/image_cropper.dart'; +import 'package:image_picker/image_picker.dart'; + +String getAdaptiveImageUrl(String imageUrl, double imageWidth) { + return '$imageUrl?width=${imageWidth.toInt()}'; +} + +Future pickImageFromGallery() async { + final XFile? pickedFile = await ImagePicker().pickImage( + source: ImageSource.gallery, + imageQuality: 50, + ); + return _cropImage(pickedFile?.path); +} + +Future takePhoto() async { + final XFile? capturedFile = await ImagePicker().pickImage( + source: ImageSource.camera, + imageQuality: 50, + ); + return _cropImage(capturedFile?.path); +} + +Future _cropImage(String? path) async { + if (path == null) return null; + + return await ImageCropper().cropImage( + sourcePath: path, + aspectRatioPresets: [CropAspectRatioPreset.square], + cropStyle: CropStyle.circle, + uiSettings: [ + AndroidUiSettings( + toolbarTitle: 'Crop Image', + toolbarColor: Colors.blue, + toolbarWidgetColor: Colors.white, + initAspectRatio: CropAspectRatioPreset.original, + lockAspectRatio: false, + ), + IOSUiSettings( + title: 'Crop Image', + ), + ], + ); +} diff --git a/lib/app/utils/string.dart b/lib/app/utils/string.dart new file mode 100644 index 000000000..cdcae94e0 --- /dev/null +++ b/lib/app/utils/string.dart @@ -0,0 +1,6 @@ +import 'package:intl/intl.dart'; + +String formatDouble(double value) { + final NumberFormat formatter = NumberFormat('#,##0.00', 'en_US'); + return formatter.format(value); +} diff --git a/lib/app/values/constants.dart b/lib/app/values/constants.dart index fb9cf3212..b8f4728ca 100644 --- a/lib/app/values/constants.dart +++ b/lib/app/values/constants.dart @@ -1,4 +1,4 @@ -import 'package:ice/app/utils/extensions.dart'; +import 'package:ice/app/extensions/num.dart'; final double kDefaultTextInputHeight = 58.0.s; final double kDefaultBorderRadiusValue = 16.0.s; diff --git a/lib/utils/image_utils.dart b/lib/utils/image_utils.dart deleted file mode 100644 index d2c4ba3eb..000000000 --- a/lib/utils/image_utils.dart +++ /dev/null @@ -1,5 +0,0 @@ -mixin ImageUtils { - static String getAdaptiveImageUrl(String imageUrl, double imageWidth) { - return '$imageUrl?width=${imageWidth.toInt()}'; - } -} From 6a21e3fa72cb30cbbde3ff0ab55bf225ddf0521e Mon Sep 17 00:00:00 2001 From: ice-orion <102020833+ice-orion@users.noreply.github.com> Date: Mon, 12 Feb 2024 14:17:12 +0400 Subject: [PATCH 04/13] chore: keyboard service to input --- lib/app/components/inputs/input_field_controller.dart | 2 +- lib/app/{services => components/inputs}/keyboard_service.dart | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) rename lib/app/{services => components/inputs}/keyboard_service.dart (92%) diff --git a/lib/app/components/inputs/input_field_controller.dart b/lib/app/components/inputs/input_field_controller.dart index a099c9eb5..e7e363a82 100644 --- a/lib/app/components/inputs/input_field_controller.dart +++ b/lib/app/components/inputs/input_field_controller.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:ice/app/services/keyboard_service.dart'; +import 'package:ice/app/components/inputs/keyboard_service.dart'; class InputFieldController { InputFieldController({ diff --git a/lib/app/services/keyboard_service.dart b/lib/app/components/inputs/keyboard_service.dart similarity index 92% rename from lib/app/services/keyboard_service.dart rename to lib/app/components/inputs/keyboard_service.dart index 4fb353c70..639a0873b 100644 --- a/lib/app/services/keyboard_service.dart +++ b/lib/app/components/inputs/keyboard_service.dart @@ -1,6 +1,7 @@ import 'package:flutter/foundation.dart'; import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart'; +//TODO::reconsider during input refactoring class KeyboardService { final KeyboardVisibilityController keyboardVisibilityController = KeyboardVisibilityController(); From ddffe57f7db9cbcb47a03743194463b93de367e4 Mon Sep 17 00:00:00 2001 From: ice-orion <102020833+ice-orion@users.noreply.github.com> Date: Mon, 12 Feb 2024 14:39:31 +0400 Subject: [PATCH 05/13] refactor: remove ui constants --- lib/app/components/decorators.dart | 4 +- .../components/inputs/keyboard_service.dart | 2 +- lib/app/components/inputs/text_fields.dart | 25 +- .../section_header/section_header.dart | 62 ++--- .../wallet_header/wallet_header.dart | 180 ++++++------ .../discover_creators/discover_creators.dart | 262 +++++++++--------- .../select_languages/select_languages.dart | 177 ++++++------ .../pages/components/apps_collection.dart | 103 +++---- .../views/pages/components/favourites.dart | 101 +++---- lib/app/values/borders.dart | 9 +- lib/app/values/constants.dart | 8 - 11 files changed, 470 insertions(+), 463 deletions(-) delete mode 100644 lib/app/values/constants.dart diff --git a/lib/app/components/decorators.dart b/lib/app/components/decorators.dart index a3efceab0..1a640ed73 100644 --- a/lib/app/components/decorators.dart +++ b/lib/app/components/decorators.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:ice/app/values/constants.dart'; +import 'package:ice/app/extensions/num.dart'; class RoundedContainer extends Container { RoundedContainer({ @@ -16,7 +16,7 @@ class RoundedContainer extends Container { decoration: BoxDecoration( border: border, borderRadius: BorderRadius.all( - Radius.circular(radius ?? kDefaultBorderRadiusValue), + Radius.circular(radius ?? 16.0.s), ), color: color, ), diff --git a/lib/app/components/inputs/keyboard_service.dart b/lib/app/components/inputs/keyboard_service.dart index 639a0873b..16e14c322 100644 --- a/lib/app/components/inputs/keyboard_service.dart +++ b/lib/app/components/inputs/keyboard_service.dart @@ -1,7 +1,7 @@ import 'package:flutter/foundation.dart'; import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart'; -//TODO::reconsider during input refactoring +//TODO::reconsider during input refactoring (to riverpod?) class KeyboardService { final KeyboardVisibilityController keyboardVisibilityController = KeyboardVisibilityController(); diff --git a/lib/app/components/inputs/text_fields.dart b/lib/app/components/inputs/text_fields.dart index 620ca693e..9cdadd7c8 100644 --- a/lib/app/components/inputs/text_fields.dart +++ b/lib/app/components/inputs/text_fields.dart @@ -1,6 +1,5 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:ice/app/components/decorators.dart'; import 'package:ice/app/components/inputs/input_field_controller.dart'; import 'package:ice/app/extensions/build_context.dart'; @@ -8,11 +7,13 @@ import 'package:ice/app/extensions/num.dart'; import 'package:ice/app/extensions/string.dart'; import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/app/values/borders.dart'; -import 'package:ice/app/values/constants.dart'; import 'package:ice/generated/assets.gen.dart'; const Color _kBackgroundColor = Color(0xFFFFFFFF); -double defaultTextFieldMargin = 44.0.w; +double defaultTextFieldMargin = 44.0.s; +double textInputLeadingPadding = 16.0.s; +double textInputTrailingPadding = 12.0.s; +double defaultTextInputHeight = 58.0.s; class InputField extends StatefulWidget { InputField({ @@ -180,7 +181,7 @@ class InputFormField extends FormField { final Widget field = GestureDetector( onTap: onTap ?? () => controller.focusNode.requestFocus(), child: RoundedContainer( - height: kDefaultTextInputHeight, + height: defaultTextInputHeight, border: _buildBorder( controller, error.isEmpty, @@ -191,8 +192,8 @@ class InputFormField extends FormField { children: [ if (leadingIcon != null) Padding( - padding: const EdgeInsets.symmetric( - horizontal: kTextInputLeadingPadding, + padding: EdgeInsets.symmetric( + horizontal: textInputLeadingPadding, ), child: Row( mainAxisSize: MainAxisSize.min, @@ -203,8 +204,8 @@ class InputFormField extends FormField { width: 1, height: 26, color: context.theme.appColors.strokeElements, - margin: const EdgeInsets.only( - left: kTextInputLeadingPadding, + margin: EdgeInsets.only( + left: textInputLeadingPadding, ), ), ], @@ -262,8 +263,8 @@ class InputFormField extends FormField { ), if (suffix != null) Padding( - padding: const EdgeInsets.symmetric( - horizontal: kTextInputTrailingPadding, + padding: EdgeInsets.symmetric( + horizontal: textInputTrailingPadding, ), child: Row( mainAxisSize: MainAxisSize.min, @@ -273,8 +274,8 @@ class InputFormField extends FormField { width: 1, height: 26, color: context.theme.appColors.strokeElements, - margin: const EdgeInsets.only( - right: kTextInputTrailingPadding, + margin: EdgeInsets.only( + right: textInputTrailingPadding, ), ), suffix, diff --git a/lib/app/components/section_header/section_header.dart b/lib/app/components/section_header/section_header.dart index defdd5791..0173f731c 100644 --- a/lib/app/components/section_header/section_header.dart +++ b/lib/app/components/section_header/section_header.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; +import 'package:ice/app/components/screen_side_offset/screen_side_offset.dart'; import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/extensions/theme_data.dart'; -import 'package:ice/app/values/constants.dart'; import 'package:ice/generated/assets.gen.dart'; class SectionHeader extends StatelessWidget { @@ -19,40 +19,40 @@ class SectionHeader extends StatelessWidget { @override Widget build(BuildContext context) { - return Padding( - padding: EdgeInsets.only( - top: topPadding, - bottom: bottomPadding, - left: kDefaultSidePadding, - right: kDefaultSidePadding, - ), - child: SizedBox( - height: 24, - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - if (title != null && title!.isNotEmpty) - Text( - title!, - textAlign: TextAlign.left, - style: context.theme.appTextThemes.subtitle.copyWith( - color: context.theme.appColors.primaryText, + return ScreenSideOffset.small( + child: Padding( + padding: EdgeInsets.only( + top: topPadding, + bottom: bottomPadding, + ), + child: SizedBox( + height: 24, + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + if (title != null && title!.isNotEmpty) + Text( + title!, + textAlign: TextAlign.left, + style: context.theme.appTextThemes.subtitle.copyWith( + color: context.theme.appColors.primaryText, + ), ), - ), - if (onPress != null) - InkWell( - onTap: onPress, - child: Ink( - width: 24, // Set the width of the button - height: 24, // Set the height of the button - child: Center( - child: Image.asset( - Assets.images.nextArrow.path, + if (onPress != null) + InkWell( + onTap: onPress, + child: Ink( + width: 24, // Set the width of the button + height: 24, // Set the height of the button + child: Center( + child: Image.asset( + Assets.images.nextArrow.path, + ), ), ), ), - ), - ], + ], + ), ), ), ); diff --git a/lib/app/components/wallet_header/wallet_header.dart b/lib/app/components/wallet_header/wallet_header.dart index a358db2be..b2181906b 100644 --- a/lib/app/components/wallet_header/wallet_header.dart +++ b/lib/app/components/wallet_header/wallet_header.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:ice/app/components/button/button.dart'; +import 'package:ice/app/components/screen_side_offset/screen_side_offset.dart'; import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/extensions/theme_data.dart'; -import 'package:ice/app/values/constants.dart'; import 'package:ice/generated/assets.gen.dart'; class WalletHeader extends HookConsumerWidget { @@ -11,108 +11,108 @@ class WalletHeader extends HookConsumerWidget { @override Widget build(BuildContext context, WidgetRef ref) { - return Padding( - padding: const EdgeInsets.only( - top: 56, - left: kDefaultSidePadding, - right: kDefaultSidePadding, - ), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - TextButton( - style: ButtonStyle( - backgroundColor: MaterialStateProperty.all( - context.theme.appColors.tertararyBackground, - ), - foregroundColor: MaterialStateProperty.all( - context.theme.appColors.primaryText, - ), - overlayColor: MaterialStateProperty.resolveWith( - (Set states) { - if (states.contains(MaterialState.pressed)) { + return ScreenSideOffset.small( + child: Padding( + padding: const EdgeInsets.only( + top: 56, + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + TextButton( + style: ButtonStyle( + backgroundColor: MaterialStateProperty.all( + context.theme.appColors.tertararyBackground, + ), + foregroundColor: MaterialStateProperty.all( + context.theme.appColors.primaryText, + ), + overlayColor: MaterialStateProperty.resolveWith( + (Set states) { + if (states.contains(MaterialState.pressed)) { + return null; + } return null; - } - return null; - }, - ), - padding: MaterialStateProperty.all( - const EdgeInsets.only(left: 6, top: 6, bottom: 6, right: 12), - ), - shape: MaterialStateProperty.all( - RoundedRectangleBorder( - borderRadius: BorderRadius.circular(12), - side: BorderSide( - color: context.theme.appColors.onTerararyFill, + }, + ), + padding: MaterialStateProperty.all( + const EdgeInsets.only(left: 6, top: 6, bottom: 6, right: 12), + ), + shape: MaterialStateProperty.all( + RoundedRectangleBorder( + borderRadius: BorderRadius.circular(12), + side: BorderSide( + color: context.theme.appColors.onTerararyFill, + ), ), ), + shadowColor: MaterialStateProperty.all( + Colors.transparent, + ), + elevation: MaterialStateProperty.all(0), ), - shadowColor: MaterialStateProperty.all( - Colors.transparent, + onPressed: () {}, + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ + Image.asset( + Assets.images.walletWalletblue.path, + width: 28, + height: 28, + fit: BoxFit.cover, + ), + const SizedBox(width: 8), + Text(context.i18n.wallet_header_ice_wallet), + const SizedBox(width: 8), + Image.asset( + Assets.images.selectArrows.path, + width: 12, + height: 12, + ), + ], ), - elevation: MaterialStateProperty.all(0), ), - onPressed: () {}, - child: Row( - mainAxisSize: MainAxisSize.min, + Row( children: [ - Image.asset( - Assets.images.walletWalletblue.path, - width: 28, - height: 28, - fit: BoxFit.cover, - ), - const SizedBox(width: 8), - Text(context.i18n.wallet_header_ice_wallet), - const SizedBox(width: 8), - Image.asset( - Assets.images.selectArrows.path, - width: 12, - height: 12, - ), - ], - ), - ), - Row( - children: [ - Button.icon( - onPressed: () {}, - icon: Image.asset( - Assets.images.fieldSearch.path, - width: 24, - height: 24, - ), - type: ButtonType.outlined, - style: ButtonStyle( - fixedSize: MaterialStateProperty.all( - const Size(40, 40), + Button.icon( + onPressed: () {}, + icon: Image.asset( + Assets.images.fieldSearch.path, + width: 24, + height: 24, ), - minimumSize: MaterialStateProperty.all( - const Size(40, 40), + type: ButtonType.outlined, + style: ButtonStyle( + fixedSize: MaterialStateProperty.all( + const Size(40, 40), + ), + minimumSize: MaterialStateProperty.all( + const Size(40, 40), + ), ), ), - ), - const SizedBox(width: 12), - Button.icon( - onPressed: () {}, - icon: Image.asset( - Assets.images.filter.path, - width: 24, - height: 24, - ), - type: ButtonType.outlined, - style: ButtonStyle( - fixedSize: MaterialStateProperty.all( - const Size(40, 40), + const SizedBox(width: 12), + Button.icon( + onPressed: () {}, + icon: Image.asset( + Assets.images.filter.path, + width: 24, + height: 24, ), - minimumSize: MaterialStateProperty.all( - const Size(40, 40), + type: ButtonType.outlined, + style: ButtonStyle( + fixedSize: MaterialStateProperty.all( + const Size(40, 40), + ), + minimumSize: MaterialStateProperty.all( + const Size(40, 40), + ), ), ), - ), - ], - ), - ], + ], + ), + ], + ), ), ); } diff --git a/lib/app/features/auth/views/pages/discover_creators/discover_creators.dart b/lib/app/features/auth/views/pages/discover_creators/discover_creators.dart index 08a1c1645..e495961c8 100644 --- a/lib/app/features/auth/views/pages/discover_creators/discover_creators.dart +++ b/lib/app/features/auth/views/pages/discover_creators/discover_creators.dart @@ -3,12 +3,12 @@ import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:ice/app/components/button/button.dart'; import 'package:ice/app/components/navigation_header/navigation_header.dart'; +import 'package:ice/app/components/screen_side_offset/screen_side_offset.dart'; import 'package:ice/app/components/search/search.dart'; import 'package:ice/app/components/title_description_header/title_description_header.dart'; import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/app/features/auth/views/pages/discover_creators/mocked_creators.dart'; -import 'package:ice/app/values/constants.dart'; import 'package:ice/generated/assets.gen.dart'; class DiscoverCreators extends HookConsumerWidget { @@ -59,151 +59,159 @@ class DiscoverCreators extends HookConsumerWidget { child: Stack( children: [ const NavigationHeader(title: ''), - Padding( - padding: const EdgeInsets.only( - top: navigationHeaderHeight, - left: kDefaultSidePadding, - right: kDefaultSidePadding, - ), - child: Column( - children: [ - TitleDescription( - title: context.i18n.discover_creators_title, - description: context.i18n.discover_creators_description, - ), - Padding( - padding: const EdgeInsets.only(bottom: 12), - child: Search( - onTextChanged: (String value) => searchText.value = value, - onClearText: () { - searchText.value = ''; - }, + ScreenSideOffset.small( + child: Padding( + padding: const EdgeInsets.only( + top: navigationHeaderHeight, + ), + child: Column( + children: [ + TitleDescription( + title: context.i18n.discover_creators_title, + description: context.i18n.discover_creators_description, + ), + Padding( + padding: const EdgeInsets.only(bottom: 12), + child: Search( + onTextChanged: (String value) => + searchText.value = value, + onClearText: () { + searchText.value = ''; + }, + ), ), - ), - Expanded( - child: ListView.builder( - itemCount: filteredCreators.length, - itemBuilder: (BuildContext context, int index) { - final User creator = filteredCreators[index]; - final bool isFollowing = - followedCreators.contains(creator); + Expanded( + child: ListView.builder( + itemCount: filteredCreators.length, + itemBuilder: (BuildContext context, int index) { + final User creator = filteredCreators[index]; + final bool isFollowing = + followedCreators.contains(creator); - return Container( - height: 66, - decoration: BoxDecoration( - color: context.theme.appColors.tertararyBackground, - borderRadius: BorderRadius.circular(12.0), - ), - margin: const EdgeInsets.only( - bottom: 12, - ), - padding: const EdgeInsets.symmetric( - horizontal: kDefaultSidePadding, - ), - child: Row( - children: [ - if (creator.imageUrl != null && - creator.imageUrl!.isNotEmpty) - Container( - width: 30, - height: 30, - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(10.0), - ), - clipBehavior: Clip.hardEdge, - child: Image.network( - creator.imageUrl!, - width: 30, - height: 30, - fit: BoxFit.cover, - ), - ), - const SizedBox( - width: 16, + return ScreenSideOffset.small( + child: Container( + height: 66, + decoration: BoxDecoration( + color: + context.theme.appColors.tertararyBackground, + borderRadius: BorderRadius.circular(12.0), + ), + margin: const EdgeInsets.only( + bottom: 12, ), - Expanded( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Row( + child: Row( + children: [ + if (creator.imageUrl != null && + creator.imageUrl!.isNotEmpty) + Container( + width: 30, + height: 30, + decoration: BoxDecoration( + borderRadius: + BorderRadius.circular(10.0), + ), + clipBehavior: Clip.hardEdge, + child: Image.network( + creator.imageUrl!, + width: 30, + height: 30, + fit: BoxFit.cover, + ), + ), + const SizedBox( + width: 16, + ), + Expanded( + child: Column( + crossAxisAlignment: + CrossAxisAlignment.start, + mainAxisAlignment: + MainAxisAlignment.center, children: [ + Row( + children: [ + Text( + creator.name, + style: context + .theme.appTextThemes.subtitle2 + .copyWith( + color: context.theme.appColors + .primaryText, + ), + ), + if (creator.isVerified ?? false) + Padding( + padding: const EdgeInsets.only( + left: 4, + top: 2, + ), + child: Image.asset( + Assets.images.verifiedBadge + .path, + width: 16, + height: 16, + ), + ), + ], + ), + const SizedBox(height: 2), Text( - creator.name, + creator.nickname, style: context - .theme.appTextThemes.subtitle2 + .theme.appTextThemes.caption .copyWith( color: context - .theme.appColors.primaryText, + .theme.appColors.tertararyText, ), ), - if (creator.isVerified ?? false) - Padding( - padding: const EdgeInsets.only( - left: 4, - top: 2, - ), - child: Image.asset( - Assets.images.verifiedBadge.path, - width: 16, - height: 16, - ), - ), ], ), - const SizedBox(height: 2), - Text( - creator.nickname, - style: context.theme.appTextThemes.caption - .copyWith( - color: context - .theme.appColors.tertararyText, - ), - ), - ], - ), - ), - SizedBox( - child: Button( - onPressed: () => handleOnTap( - creator, - isFollowing, ), - type: isFollowing - ? ButtonType.primary - : ButtonType.outlined, - tintColor: isFollowing - ? null - : context.theme.appColors.primaryAccent, - label: Text( - isFollowing - ? context.i18n.button_following - : context.i18n.button_follow, - style: context.theme.appTextThemes.caption - .copyWith( - color: isFollowing - ? context.theme.appColors - .secondaryBackground + SizedBox( + child: Button( + onPressed: () => handleOnTap( + creator, + isFollowing, + ), + type: isFollowing + ? ButtonType.primary + : ButtonType.outlined, + tintColor: isFollowing + ? null : context .theme.appColors.primaryAccent, + label: Text( + isFollowing + ? context.i18n.button_following + : context.i18n.button_follow, + style: context + .theme.appTextThemes.caption + .copyWith( + color: isFollowing + ? context.theme.appColors + .secondaryBackground + : context.theme.appColors + .primaryAccent, + ), + ), + mainAxisSize: MainAxisSize.max, + style: OutlinedButton.styleFrom( + minimumSize: const Size(77, 28), + padding: const EdgeInsets.symmetric( + horizontal: 5, + ), + ), ), ), - mainAxisSize: MainAxisSize.max, - style: OutlinedButton.styleFrom( - minimumSize: const Size(77, 28), - padding: const EdgeInsets.symmetric( - horizontal: 5, - ), - ), - ), + ], ), - ], - ), - ); - }, + ), + ); + }, + ), ), - ), - ], + ], + ), ), ), ], diff --git a/lib/app/features/auth/views/pages/select_languages/select_languages.dart b/lib/app/features/auth/views/pages/select_languages/select_languages.dart index 0b30bc2e8..1536782db 100644 --- a/lib/app/features/auth/views/pages/select_languages/select_languages.dart +++ b/lib/app/features/auth/views/pages/select_languages/select_languages.dart @@ -2,12 +2,12 @@ import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:ice/app/components/navigation_header/navigation_header.dart'; +import 'package:ice/app/components/screen_side_offset/screen_side_offset.dart'; import 'package:ice/app/components/search/search.dart'; import 'package:ice/app/components/title_description_header/title_description_header.dart'; import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/app/features/auth/views/pages/select_languages/languages.dart'; -import 'package:ice/app/values/constants.dart'; import 'package:ice/generated/assets.gen.dart'; class SelectLanguages extends HookConsumerWidget { @@ -36,101 +36,104 @@ class SelectLanguages extends HookConsumerWidget { child: Stack( children: [ const NavigationHeader(title: ''), - Padding( - padding: const EdgeInsets.only( - top: navigationHeaderHeight, - left: kDefaultSidePadding, - right: kDefaultSidePadding, - ), - child: Column( - children: [ - TitleDescription( - title: context.i18n.select_languages_title, - description: context.i18n.select_languages_description, - ), - Padding( - padding: const EdgeInsets.only(bottom: 12), - child: Search( - onTextChanged: (String value) => searchText.value = value, - onClearText: () { - searchText.value = ''; - }, + ScreenSideOffset.small( + child: Padding( + padding: const EdgeInsets.only( + top: navigationHeaderHeight, + ), + child: Column( + children: [ + TitleDescription( + title: context.i18n.select_languages_title, + description: context.i18n.select_languages_description, + ), + Padding( + padding: const EdgeInsets.only(bottom: 12), + child: Search( + onTextChanged: (String value) => + searchText.value = value, + onClearText: () { + searchText.value = ''; + }, + ), ), - ), - Expanded( - child: ListView.builder( - itemCount: filteredLanguages.length, - itemBuilder: (BuildContext context, int index) { - final Language country = filteredLanguages[index]; - final bool isSelected = - selectedLanguages.contains(country); + Expanded( + child: ListView.builder( + itemCount: filteredLanguages.length, + itemBuilder: (BuildContext context, int index) { + final Language country = filteredLanguages[index]; + final bool isSelected = + selectedLanguages.contains(country); - return InkWell( - onTap: () { - final Set newSelectedLanguages = - Set.from(selectedLanguages); - if (isSelected) { - newSelectedLanguages.remove(country); - } else { - newSelectedLanguages.add(country); - } - selectedLanguagesNotifier.value = - newSelectedLanguages; - }, - child: Container( - height: 44, - decoration: BoxDecoration( - color: - context.theme.appColors.tertararyBackground, - borderRadius: BorderRadius.circular(12.0), - ), - margin: const EdgeInsets.only( - bottom: 12, - ), - padding: const EdgeInsets.symmetric( - horizontal: kDefaultSidePadding, - ), - child: Row( - children: [ - Text( - country.flag, - style: context.theme.appTextThemes.subtitle2 - .copyWith( - color: context.theme.appColors.primaryText, - fontSize: 24, - ), + return InkWell( + onTap: () { + final Set newSelectedLanguages = + Set.from(selectedLanguages); + if (isSelected) { + newSelectedLanguages.remove(country); + } else { + newSelectedLanguages.add(country); + } + selectedLanguagesNotifier.value = + newSelectedLanguages; + }, + child: ScreenSideOffset.small( + child: Container( + height: 44, + decoration: BoxDecoration( + color: context + .theme.appColors.tertararyBackground, + borderRadius: BorderRadius.circular(12.0), ), - const SizedBox( - width: 16, + margin: const EdgeInsets.only( + bottom: 12, ), - Expanded( - child: Text( - country.name, - style: context.theme.appTextThemes.subtitle2 - .copyWith( - color: - context.theme.appColors.primaryText, + child: Row( + children: [ + Text( + country.flag, + style: context + .theme.appTextThemes.subtitle2 + .copyWith( + color: + context.theme.appColors.primaryText, + fontSize: 24, + ), ), - ), - ), - SizedBox( - width: 30, - child: isSelected - ? Image.asset( - Assets.images.checkboxon.path, - ) - : Image.asset( - Assets.images.checkboxoff.path, + const SizedBox( + width: 16, + ), + Expanded( + child: Text( + country.name, + style: context + .theme.appTextThemes.subtitle2 + .copyWith( + color: context + .theme.appColors.primaryText, ), + ), + ), + SizedBox( + width: 30, + child: isSelected + ? Image.asset( + Assets.images.checkboxon.path, + ) + : Image.asset( + Assets.images.checkboxoff.path, + ), + ), + ], ), - ], + ), ), - ), - ); - }, + ); + }, + ), ), - ), - ], + ], + ), ), ), ], diff --git a/lib/app/features/dapps/views/pages/components/apps_collection.dart b/lib/app/features/dapps/views/pages/components/apps_collection.dart index 886446693..8a9c96973 100644 --- a/lib/app/features/dapps/views/pages/components/apps_collection.dart +++ b/lib/app/features/dapps/views/pages/components/apps_collection.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; import 'package:ice/app/components/favourite_icon/favorite_icon.dart'; +import 'package:ice/app/components/screen_side_offset/screen_side_offset.dart'; import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/app/features/dapps/views/pages/mocks/mocked_apps.dart'; import 'package:ice/app/utils/string.dart'; -import 'package:ice/app/values/constants.dart'; const double columnWidthPercentage = 0.68; const double sectionHeight = 200.0; @@ -62,62 +62,63 @@ class DAppGridItem extends StatelessWidget { @override Widget build(BuildContext context) { - return Container( - padding: const EdgeInsets.symmetric( - vertical: 6, - horizontal: kDefaultSidePadding, - ), - width: double.infinity, - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Row( - children: [ - Container( - width: 48, - height: 48, - decoration: BoxDecoration( - color: Colors.white, - borderRadius: BorderRadius.circular(8), - ), - child: Image.asset( - item.iconImage, + return ScreenSideOffset.small( + child: Container( + padding: const EdgeInsets.symmetric( + vertical: 6, + ), + width: double.infinity, + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Row( + children: [ + Container( width: 48, - fit: BoxFit.contain, + height: 48, + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.circular(8), + ), + child: Image.asset( + item.iconImage, + width: 48, + fit: BoxFit.contain, + ), ), - ), - const SizedBox(width: 8), - Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Text( - item.title, - style: context.theme.appTextThemes.body.copyWith( - color: context.theme.appColors.primaryText, + const SizedBox(width: 8), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text( + item.title, + style: context.theme.appTextThemes.body.copyWith( + color: context.theme.appColors.primaryText, + ), ), - ), - Text( - item.description ?? '', - style: context.theme.appTextThemes.caption3.copyWith( - color: context.theme.appColors.secondaryText, + Text( + item.description ?? '', + style: context.theme.appTextThemes.caption3.copyWith( + color: context.theme.appColors.secondaryText, + ), ), - ), - Text( - item.value != null ? formatDouble(item.value!) : '', - style: context.theme.appTextThemes.caption3.copyWith( - color: context.theme.appColors.tertararyText, + Text( + item.value != null ? formatDouble(item.value!) : '', + style: context.theme.appTextThemes.caption3.copyWith( + color: context.theme.appColors.tertararyText, + ), ), - ), - ], - ), - ], - ), - if (showIsFavourite) - FavouriteIcon( - isFavourite: item.isFavourite, + ], + ), + ], ), - ], + if (showIsFavourite) + FavouriteIcon( + isFavourite: item.isFavourite, + ), + ], + ), ), ); } diff --git a/lib/app/features/dapps/views/pages/components/favourites.dart b/lib/app/features/dapps/views/pages/components/favourites.dart index 7e0140953..826c9501a 100644 --- a/lib/app/features/dapps/views/pages/components/favourites.dart +++ b/lib/app/features/dapps/views/pages/components/favourites.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:ice/app/components/favourite_icon/favorite_icon.dart'; +import 'package:ice/app/components/screen_side_offset/screen_side_offset.dart'; import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/extensions/theme_data.dart'; -import 'package:ice/app/values/constants.dart'; import 'package:ice/generated/assets.gen.dart'; const double containerHeight = 60.0; @@ -17,59 +17,62 @@ class Favourites extends StatelessWidget { @override Widget build(BuildContext context) { - return Padding( - padding: const EdgeInsets.symmetric( - horizontal: kDefaultSidePadding, - vertical: 24, - ), - child: GestureDetector( - onTap: onPress, - child: Container( - height: containerHeight, - width: double.infinity, - padding: const EdgeInsets.symmetric(horizontal: kDefaultSidePadding), - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(16), - color: context.theme.appColors.tertararyBackground, - border: Border.all( - color: context.theme.appColors.onTerararyFill, - ), - ), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Row( + return ScreenSideOffset.small( + child: Padding( + padding: const EdgeInsets.symmetric( + vertical: 24, + ), + child: GestureDetector( + onTap: onPress, + child: ScreenSideOffset.small( + child: Container( + height: containerHeight, + width: double.infinity, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(16), + color: context.theme.appColors.tertararyBackground, + border: Border.all( + color: context.theme.appColors.onTerararyFill, + ), + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - const FavouriteIcon(), - const SizedBox(width: 8), - SizedBox( - height: 36, - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Text( - context.i18n.dapps_section_title_favourites, - style: context.theme.appTextThemes.body.copyWith( - color: context.theme.appColors.primaryText, - ), + Row( + children: [ + const FavouriteIcon(), + const SizedBox(width: 8), + SizedBox( + height: 36, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text( + context.i18n.dapps_section_title_favourites, + style: context.theme.appTextThemes.body.copyWith( + color: context.theme.appColors.primaryText, + ), + ), + Text( + context.i18n.dapps_favourites_added(17), + style: + context.theme.appTextThemes.caption3.copyWith( + color: context.theme.appColors.secondaryText, + ), + ), + ], ), - Text( - context.i18n.dapps_favourites_added(17), - style: context.theme.appTextThemes.caption3.copyWith( - color: context.theme.appColors.secondaryText, - ), - ), - ], - ), + ), + ], + ), + Image.asset( + Assets.images.forwardArrow.path, + width: 12, ), ], ), - Image.asset( - Assets.images.forwardArrow.path, - width: 12, - ), - ], + ), ), ), ), diff --git a/lib/app/values/borders.dart b/lib/app/values/borders.dart index 22c788092..5f2d4922f 100644 --- a/lib/app/values/borders.dart +++ b/lib/app/values/borders.dart @@ -1,21 +1,20 @@ import 'package:flutter/material.dart'; +import 'package:ice/app/extensions/num.dart'; import 'package:ice/app/features/core/providers/template_provider.dart'; -import 'package:ice/app/values/constants.dart'; -final Radius kDefaultRadius = Radius.circular(kDefaultBorderRadiusValue); +final Radius kDefaultRadius = Radius.circular(16.0.s); final ShapeBorder kBottomSheetBorder = RoundedRectangleBorder( borderRadius: BorderRadius.vertical(top: kDefaultRadius), ); -final BorderRadius defaultBorderRadius = - BorderRadius.circular(kDefaultBorderRadiusValue); +final BorderRadius defaultBorderRadius = BorderRadius.circular(16.0.s); final BoxDecoration defaultBoxDecoration = BoxDecoration(borderRadius: defaultBorderRadius); const BorderSide defaultBorderSide = BorderSide(color: Colors.transparent); final BorderRadius kFieldBorderRadius = - BorderRadius.all(Radius.circular(kDefaultBorderRadiusValue)); + BorderRadius.all(Radius.circular(16.0.s)); class InputFieldBorder extends OutlineInputBorder { InputFieldBorder({ diff --git a/lib/app/values/constants.dart b/lib/app/values/constants.dart deleted file mode 100644 index b8f4728ca..000000000 --- a/lib/app/values/constants.dart +++ /dev/null @@ -1,8 +0,0 @@ -import 'package:ice/app/extensions/num.dart'; - -final double kDefaultTextInputHeight = 58.0.s; -final double kDefaultBorderRadiusValue = 16.0.s; -const double kTextInputLeadingPadding = 16.0; -const double kTextInputTrailingPadding = 12.0; -const double kTextInputLabelBottomPadding = 22.0; -const double kDefaultSidePadding = 16.0; From 98591b844cb680e9b2db5588b0b818b865bedea3 Mon Sep 17 00:00:00 2001 From: ice-orion <102020833+ice-orion@users.noreply.github.com> Date: Mon, 12 Feb 2024 14:53:49 +0400 Subject: [PATCH 06/13] refactor: input borders to input --- lib/app/components/inputs/borders.dart | 20 +++++++++++++ lib/app/components/inputs/text_fields.dart | 2 +- lib/app/values/borders.dart | 34 ---------------------- 3 files changed, 21 insertions(+), 35 deletions(-) create mode 100644 lib/app/components/inputs/borders.dart delete mode 100644 lib/app/values/borders.dart diff --git a/lib/app/components/inputs/borders.dart b/lib/app/components/inputs/borders.dart new file mode 100644 index 000000000..b9e1cd9d4 --- /dev/null +++ b/lib/app/components/inputs/borders.dart @@ -0,0 +1,20 @@ +import 'package:flutter/material.dart'; +import 'package:ice/app/extensions/num.dart'; +import 'package:ice/app/features/core/providers/template_provider.dart'; + +class InputFieldBorder extends OutlineInputBorder { + InputFieldBorder({ + BorderSide? borderSide, + }) : super( + borderSide: borderSide ?? const BorderSide(color: Colors.transparent), + borderRadius: BorderRadius.all(Radius.circular(16.0.s)), + ); + + factory InputFieldBorder.focused() => InputFieldBorder( + borderSide: BorderSide(color: appTemplate.colors.light.primaryAccent), + ); + + factory InputFieldBorder.error() => InputFieldBorder( + borderSide: BorderSide(color: appTemplate.colors.light.attentionRed), + ); +} diff --git a/lib/app/components/inputs/text_fields.dart b/lib/app/components/inputs/text_fields.dart index 9cdadd7c8..125f50717 100644 --- a/lib/app/components/inputs/text_fields.dart +++ b/lib/app/components/inputs/text_fields.dart @@ -1,12 +1,12 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:ice/app/components/decorators.dart'; +import 'package:ice/app/components/inputs/borders.dart'; import 'package:ice/app/components/inputs/input_field_controller.dart'; import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/extensions/num.dart'; import 'package:ice/app/extensions/string.dart'; import 'package:ice/app/extensions/theme_data.dart'; -import 'package:ice/app/values/borders.dart'; import 'package:ice/generated/assets.gen.dart'; const Color _kBackgroundColor = Color(0xFFFFFFFF); diff --git a/lib/app/values/borders.dart b/lib/app/values/borders.dart deleted file mode 100644 index 5f2d4922f..000000000 --- a/lib/app/values/borders.dart +++ /dev/null @@ -1,34 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:ice/app/extensions/num.dart'; -import 'package:ice/app/features/core/providers/template_provider.dart'; - -final Radius kDefaultRadius = Radius.circular(16.0.s); - -final ShapeBorder kBottomSheetBorder = RoundedRectangleBorder( - borderRadius: BorderRadius.vertical(top: kDefaultRadius), -); - -final BorderRadius defaultBorderRadius = BorderRadius.circular(16.0.s); -final BoxDecoration defaultBoxDecoration = - BoxDecoration(borderRadius: defaultBorderRadius); -const BorderSide defaultBorderSide = BorderSide(color: Colors.transparent); - -final BorderRadius kFieldBorderRadius = - BorderRadius.all(Radius.circular(16.0.s)); - -class InputFieldBorder extends OutlineInputBorder { - InputFieldBorder({ - BorderSide? borderSide, - }) : super( - borderSide: borderSide ?? defaultBorderSide, - borderRadius: kFieldBorderRadius, - ); - - factory InputFieldBorder.focused() => InputFieldBorder( - borderSide: BorderSide(color: appTemplate.colors.light.primaryAccent), - ); - - factory InputFieldBorder.error() => InputFieldBorder( - borderSide: BorderSide(color: appTemplate.colors.light.attentionRed), - ); -} From 4c1ec998b54a290cbe90c82f26f44176d8dfeb6f Mon Sep 17 00:00:00 2001 From: ice-orion <102020833+ice-orion@users.noreply.github.com> Date: Mon, 12 Feb 2024 15:06:01 +0400 Subject: [PATCH 07/13] fix: auth offsets --- .../discover_creators/discover_creators.dart | 201 +++++++++--------- .../select_languages/select_languages.dart | 84 ++++---- .../views/pages/components/favourites.dart | 89 ++++---- 3 files changed, 186 insertions(+), 188 deletions(-) diff --git a/lib/app/features/auth/views/pages/discover_creators/discover_creators.dart b/lib/app/features/auth/views/pages/discover_creators/discover_creators.dart index e495961c8..707633855 100644 --- a/lib/app/features/auth/views/pages/discover_creators/discover_creators.dart +++ b/lib/app/features/auth/views/pages/discover_creators/discover_creators.dart @@ -88,123 +88,120 @@ class DiscoverCreators extends HookConsumerWidget { final bool isFollowing = followedCreators.contains(creator); - return ScreenSideOffset.small( - child: Container( - height: 66, - decoration: BoxDecoration( - color: - context.theme.appColors.tertararyBackground, - borderRadius: BorderRadius.circular(12.0), - ), - margin: const EdgeInsets.only( - bottom: 12, - ), - child: Row( - children: [ - if (creator.imageUrl != null && - creator.imageUrl!.isNotEmpty) - Container( + return Container( + height: 66, + decoration: BoxDecoration( + color: + context.theme.appColors.tertararyBackground, + borderRadius: BorderRadius.circular(12.0), + ), + margin: const EdgeInsets.only( + bottom: 12, + ), + padding: const EdgeInsets.symmetric( + horizontal: 16, + ), + child: Row( + children: [ + if (creator.imageUrl != null && + creator.imageUrl!.isNotEmpty) + Container( + width: 30, + height: 30, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(10.0), + ), + clipBehavior: Clip.hardEdge, + child: Image.network( + creator.imageUrl!, width: 30, height: 30, - decoration: BoxDecoration( - borderRadius: - BorderRadius.circular(10.0), - ), - clipBehavior: Clip.hardEdge, - child: Image.network( - creator.imageUrl!, - width: 30, - height: 30, - fit: BoxFit.cover, - ), + fit: BoxFit.cover, ), - const SizedBox( - width: 16, ), - Expanded( - child: Column( - crossAxisAlignment: - CrossAxisAlignment.start, - mainAxisAlignment: - MainAxisAlignment.center, - children: [ - Row( - children: [ - Text( - creator.name, - style: context - .theme.appTextThemes.subtitle2 - .copyWith( - color: context.theme.appColors - .primaryText, - ), + const SizedBox( + width: 16, + ), + Expanded( + child: Column( + crossAxisAlignment: + CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Row( + children: [ + Text( + creator.name, + style: context + .theme.appTextThemes.subtitle2 + .copyWith( + color: context + .theme.appColors.primaryText, ), - if (creator.isVerified ?? false) - Padding( - padding: const EdgeInsets.only( - left: 4, - top: 2, - ), - child: Image.asset( - Assets.images.verifiedBadge - .path, - width: 16, - height: 16, - ), - ), - ], - ), - const SizedBox(height: 2), - Text( - creator.nickname, - style: context - .theme.appTextThemes.caption - .copyWith( - color: context - .theme.appColors.tertararyText, ), - ), - ], - ), - ), - SizedBox( - child: Button( - onPressed: () => handleOnTap( - creator, - isFollowing, + if (creator.isVerified ?? false) + Padding( + padding: const EdgeInsets.only( + left: 4, + top: 2, + ), + child: Image.asset( + Assets + .images.verifiedBadge.path, + width: 16, + height: 16, + ), + ), + ], ), - type: isFollowing - ? ButtonType.primary - : ButtonType.outlined, - tintColor: isFollowing - ? null - : context - .theme.appColors.primaryAccent, - label: Text( - isFollowing - ? context.i18n.button_following - : context.i18n.button_follow, + const SizedBox(height: 2), + Text( + creator.nickname, style: context .theme.appTextThemes.caption .copyWith( - color: isFollowing - ? context.theme.appColors - .secondaryBackground - : context.theme.appColors - .primaryAccent, + color: context + .theme.appColors.tertararyText, ), ), - mainAxisSize: MainAxisSize.max, - style: OutlinedButton.styleFrom( - minimumSize: const Size(77, 28), - padding: const EdgeInsets.symmetric( - horizontal: 5, - ), + ], + ), + ), + SizedBox( + child: Button( + onPressed: () => handleOnTap( + creator, + isFollowing, + ), + type: isFollowing + ? ButtonType.primary + : ButtonType.outlined, + tintColor: isFollowing + ? null + : context.theme.appColors.primaryAccent, + label: Text( + isFollowing + ? context.i18n.button_following + : context.i18n.button_follow, + style: context.theme.appTextThemes.caption + .copyWith( + color: isFollowing + ? context.theme.appColors + .secondaryBackground + : context + .theme.appColors.primaryAccent, + ), + ), + mainAxisSize: MainAxisSize.max, + style: OutlinedButton.styleFrom( + minimumSize: const Size(77, 28), + padding: const EdgeInsets.symmetric( + horizontal: 5, ), ), ), - ], - ), + ), + ], ), ); }, diff --git a/lib/app/features/auth/views/pages/select_languages/select_languages.dart b/lib/app/features/auth/views/pages/select_languages/select_languages.dart index 1536782db..982243d4b 100644 --- a/lib/app/features/auth/views/pages/select_languages/select_languages.dart +++ b/lib/app/features/auth/views/pages/select_languages/select_languages.dart @@ -77,55 +77,55 @@ class SelectLanguages extends HookConsumerWidget { selectedLanguagesNotifier.value = newSelectedLanguages; }, - child: ScreenSideOffset.small( - child: Container( - height: 44, - decoration: BoxDecoration( - color: context - .theme.appColors.tertararyBackground, - borderRadius: BorderRadius.circular(12.0), - ), - margin: const EdgeInsets.only( - bottom: 12, - ), - child: Row( - children: [ - Text( - country.flag, + child: Container( + height: 44, + decoration: BoxDecoration( + color: + context.theme.appColors.tertararyBackground, + borderRadius: BorderRadius.circular(12.0), + ), + margin: const EdgeInsets.only( + bottom: 12, + ), + padding: const EdgeInsets.symmetric( + horizontal: 16, + ), + child: Row( + children: [ + Text( + country.flag, + style: context.theme.appTextThemes.subtitle2 + .copyWith( + color: + context.theme.appColors.primaryText, + fontSize: 24, + ), + ), + const SizedBox( + width: 16, + ), + Expanded( + child: Text( + country.name, style: context .theme.appTextThemes.subtitle2 .copyWith( color: context.theme.appColors.primaryText, - fontSize: 24, ), ), - const SizedBox( - width: 16, - ), - Expanded( - child: Text( - country.name, - style: context - .theme.appTextThemes.subtitle2 - .copyWith( - color: context - .theme.appColors.primaryText, - ), - ), - ), - SizedBox( - width: 30, - child: isSelected - ? Image.asset( - Assets.images.checkboxon.path, - ) - : Image.asset( - Assets.images.checkboxoff.path, - ), - ), - ], - ), + ), + SizedBox( + width: 30, + child: isSelected + ? Image.asset( + Assets.images.checkboxon.path, + ) + : Image.asset( + Assets.images.checkboxoff.path, + ), + ), + ], ), ), ); diff --git a/lib/app/features/dapps/views/pages/components/favourites.dart b/lib/app/features/dapps/views/pages/components/favourites.dart index 826c9501a..c3b8198fb 100644 --- a/lib/app/features/dapps/views/pages/components/favourites.dart +++ b/lib/app/features/dapps/views/pages/components/favourites.dart @@ -24,54 +24,55 @@ class Favourites extends StatelessWidget { ), child: GestureDetector( onTap: onPress, - child: ScreenSideOffset.small( - child: Container( - height: containerHeight, - width: double.infinity, - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(16), - color: context.theme.appColors.tertararyBackground, - border: Border.all( - color: context.theme.appColors.onTerararyFill, - ), + child: Container( + height: containerHeight, + width: double.infinity, + padding: EdgeInsets.symmetric( + horizontal: ScreenSideOffset.defaultSmallMargin, + ), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(16), + color: context.theme.appColors.tertararyBackground, + border: Border.all( + color: context.theme.appColors.onTerararyFill, ), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Row( - children: [ - const FavouriteIcon(), - const SizedBox(width: 8), - SizedBox( - height: 36, - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Text( - context.i18n.dapps_section_title_favourites, - style: context.theme.appTextThemes.body.copyWith( - color: context.theme.appColors.primaryText, - ), + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Row( + children: [ + const FavouriteIcon(), + const SizedBox(width: 8), + SizedBox( + height: 36, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text( + context.i18n.dapps_section_title_favourites, + style: context.theme.appTextThemes.body.copyWith( + color: context.theme.appColors.primaryText, ), - Text( - context.i18n.dapps_favourites_added(17), - style: - context.theme.appTextThemes.caption3.copyWith( - color: context.theme.appColors.secondaryText, - ), + ), + Text( + context.i18n.dapps_favourites_added(17), + style: + context.theme.appTextThemes.caption3.copyWith( + color: context.theme.appColors.secondaryText, ), - ], - ), + ), + ], ), - ], - ), - Image.asset( - Assets.images.forwardArrow.path, - width: 12, - ), - ], - ), + ), + ], + ), + Image.asset( + Assets.images.forwardArrow.path, + width: 12, + ), + ], ), ), ), From 0dad85c31300078507bf07dec63a5d479ecc6a09 Mon Sep 17 00:00:00 2001 From: ice-orion <102020833+ice-orion@users.noreply.github.com> Date: Mon, 12 Feb 2024 15:47:03 +0400 Subject: [PATCH 08/13] refactor: wrap components in folders, remove unused --- lib/app/components/{ => inputs}/decorators.dart | 0 lib/app/components/{ => inputs}/email_input.dart | 0 lib/app/components/inputs/text_fields.dart | 2 +- .../{ => keyboard_hider}/keyboard_hider.dart | 0 .../{ => modal_wrapper}/modal_wrapper.dart | 2 +- lib/app/components/side_padding.dart | 14 -------------- .../auth/views/pages/auth_page/auth_page.dart | 2 +- .../auth/views/pages/intro_page/intro_page.dart | 6 +++--- .../auth/views/pages/nostr_auth/nostr_auth.dart | 2 +- 9 files changed, 7 insertions(+), 21 deletions(-) rename lib/app/components/{ => inputs}/decorators.dart (100%) rename lib/app/components/{ => inputs}/email_input.dart (100%) rename lib/app/components/{ => keyboard_hider}/keyboard_hider.dart (100%) rename lib/app/components/{ => modal_wrapper}/modal_wrapper.dart (93%) delete mode 100644 lib/app/components/side_padding.dart diff --git a/lib/app/components/decorators.dart b/lib/app/components/inputs/decorators.dart similarity index 100% rename from lib/app/components/decorators.dart rename to lib/app/components/inputs/decorators.dart diff --git a/lib/app/components/email_input.dart b/lib/app/components/inputs/email_input.dart similarity index 100% rename from lib/app/components/email_input.dart rename to lib/app/components/inputs/email_input.dart diff --git a/lib/app/components/inputs/text_fields.dart b/lib/app/components/inputs/text_fields.dart index 125f50717..8e646a4f7 100644 --- a/lib/app/components/inputs/text_fields.dart +++ b/lib/app/components/inputs/text_fields.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:ice/app/components/decorators.dart'; import 'package:ice/app/components/inputs/borders.dart'; +import 'package:ice/app/components/inputs/decorators.dart'; import 'package:ice/app/components/inputs/input_field_controller.dart'; import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/extensions/num.dart'; diff --git a/lib/app/components/keyboard_hider.dart b/lib/app/components/keyboard_hider/keyboard_hider.dart similarity index 100% rename from lib/app/components/keyboard_hider.dart rename to lib/app/components/keyboard_hider/keyboard_hider.dart diff --git a/lib/app/components/modal_wrapper.dart b/lib/app/components/modal_wrapper/modal_wrapper.dart similarity index 93% rename from lib/app/components/modal_wrapper.dart rename to lib/app/components/modal_wrapper/modal_wrapper.dart index 6bacfcfdc..7507b3f60 100644 --- a/lib/app/components/modal_wrapper.dart +++ b/lib/app/components/modal_wrapper/modal_wrapper.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:ice/app/components/keyboard_hider.dart'; +import 'package:ice/app/components/keyboard_hider/keyboard_hider.dart'; class ModalWrapper extends StatelessWidget { const ModalWrapper({super.key, required this.child}); diff --git a/lib/app/components/side_padding.dart b/lib/app/components/side_padding.dart deleted file mode 100644 index ae2cee5bb..000000000 --- a/lib/app/components/side_padding.dart +++ /dev/null @@ -1,14 +0,0 @@ -import 'package:flutter/material.dart'; - -class SidePadding extends StatelessWidget { - const SidePadding({required this.child}); - final Widget child; - - @override - Widget build(BuildContext context) { - return Padding( - padding: const EdgeInsets.only(left: 40.0, right: 40.0), - child: child, - ); - } -} diff --git a/lib/app/features/auth/views/pages/auth_page/auth_page.dart b/lib/app/features/auth/views/pages/auth_page/auth_page.dart index 445e3b775..877283ed1 100644 --- a/lib/app/features/auth/views/pages/auth_page/auth_page.dart +++ b/lib/app/features/auth/views/pages/auth_page/auth_page.dart @@ -3,7 +3,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:ice/app/components/auth_header/auth_header.dart'; import 'package:ice/app/components/button/button.dart'; import 'package:ice/app/components/inputs/text_fields.dart'; -import 'package:ice/app/components/modal_wrapper.dart'; +import 'package:ice/app/components/modal_wrapper/modal_wrapper.dart'; import 'package:ice/app/components/screen_side_offset/screen_side_offset.dart'; import 'package:ice/app/components/secured_by/secured_by.dart'; import 'package:ice/app/components/socials/socials.dart'; diff --git a/lib/app/features/auth/views/pages/intro_page/intro_page.dart b/lib/app/features/auth/views/pages/intro_page/intro_page.dart index f36fd110c..e922b0202 100644 --- a/lib/app/features/auth/views/pages/intro_page/intro_page.dart +++ b/lib/app/features/auth/views/pages/intro_page/intro_page.dart @@ -1,7 +1,6 @@ import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:ice/app/components/modal_wrapper.dart'; -import 'package:ice/app/components/side_padding.dart'; +import 'package:ice/app/components/modal_wrapper/modal_wrapper.dart'; import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/app/features/auth/views/pages/auth_page/auth_page.dart'; @@ -55,7 +54,8 @@ class IntroPage extends HookConsumerWidget { ), ), ), - SidePadding( + Padding( + padding: const EdgeInsets.only(left: 40.0, right: 40.0), child: Align( alignment: Alignment.centerLeft, child: Text( diff --git a/lib/app/features/auth/views/pages/nostr_auth/nostr_auth.dart b/lib/app/features/auth/views/pages/nostr_auth/nostr_auth.dart index 9297530de..63d34ceaf 100644 --- a/lib/app/features/auth/views/pages/nostr_auth/nostr_auth.dart +++ b/lib/app/features/auth/views/pages/nostr_auth/nostr_auth.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:ice/app/components/auth_header/auth_header.dart'; import 'package:ice/app/components/button/button.dart'; -import 'package:ice/app/components/modal_wrapper.dart'; +import 'package:ice/app/components/modal_wrapper/modal_wrapper.dart'; import 'package:ice/app/components/screen_side_offset/screen_side_offset.dart'; import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/features/auth/views/pages/nostr_login/nostr_login.dart'; From 61db951aadbb3e70008aca30d4b82a1b1c7f5428 Mon Sep 17 00:00:00 2001 From: ice-orion <102020833+ice-orion@users.noreply.github.com> Date: Mon, 12 Feb 2024 17:45:12 +0400 Subject: [PATCH 09/13] refator: add .s to sizes --- .../components/auth_header/auth_header.dart | 11 +++-- lib/app/components/button/button.dart | 13 ++--- .../button/variants/button_icon.dart | 4 +- .../favourite_icon/favorite_icon.dart | 7 +-- lib/app/components/inputs/email_input.dart | 19 +++---- lib/app/components/inputs/text_fields.dart | 24 ++++----- lib/app/components/list_item/list_item.dart | 21 +++++--- .../variants/list_item_checkbox.dart | 2 +- .../modal_wrapper/modal_wrapper.dart | 13 ++--- .../nav_header_offset/nav_header_offset.dart | 4 +- .../navigation_header/navigation_header.dart | 11 +++-- .../screen_side_offset.dart | 6 +-- lib/app/components/search/search.dart | 17 ++++--- .../section_header/section_header.dart | 17 ++++--- lib/app/components/secured_by/secured_by.dart | 8 +-- lib/app/components/socials/socials.dart | 4 +- .../terms_privacy/terms_privacy.dart | 3 +- .../text_field_wrapper.dart | 44 ++++++----------- .../title_description_header.dart | 19 +++---- .../wallet_header/wallet_header.dart | 44 ++++++++++------- lib/app/extensions/num.dart | 2 +- .../auth/views/pages/auth_page/auth_page.dart | 25 +++++----- .../components/country_code_input.dart | 7 +-- .../views/pages/check_email/check_email.dart | 29 +++++------ .../discover_creators/discover_creators.dart | 49 ++++++++++--------- .../views/pages/enter_code/enter_code.dart | 29 +++++------ .../pages/fill_profile/fill_profile.dart | 41 ++++++++-------- .../views/pages/intro_page/intro_page.dart | 11 +++-- .../views/pages/nostr_auth/nostr_auth.dart | 17 ++++--- .../views/pages/nostr_login/nostr_login.dart | 19 +++---- .../pages/select_country/select_country.dart | 9 ++-- .../select_languages/select_languages.dart | 23 ++++----- .../pages/components/apps_collection.dart | 15 +++--- .../components/categories_collection.dart | 11 +++-- .../views/pages/components/favourites.dart | 15 +++--- .../pages/components/featured_collection.dart | 19 +++---- .../views/pages/dapps_list/dapps_list.dart | 2 +- .../components/post_image/post_image.dart | 7 ++- .../read_time_tile/read_time_tile.dart | 6 +-- .../features/feed/views/pages/feed_page.dart | 5 +- .../wallet/views/pages/inner_wallet_page.dart | 9 ++-- .../wallet/views/pages/wallet_page.dart | 15 +++--- 42 files changed, 345 insertions(+), 311 deletions(-) diff --git a/lib/app/components/auth_header/auth_header.dart b/lib/app/components/auth_header/auth_header.dart index bd9c30fcb..ce2d014c7 100644 --- a/lib/app/components/auth_header/auth_header.dart +++ b/lib/app/components/auth_header/auth_header.dart @@ -1,16 +1,19 @@ import 'package:flutter/material.dart'; import 'package:ice/app/extensions/build_context.dart'; +import 'package:ice/app/extensions/num.dart'; import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/generated/assets.gen.dart'; class AuthHeaderWidget extends StatelessWidget { AuthHeaderWidget({ - this.topPadding = 65.0, - this.bottomPadding = 30.0, this.title = '', + double? topPadding, + double? bottomPadding, String? description, String? imagePath, - }) : description = description ?? '', // Ensure description is not null + }) : topPadding = topPadding ?? 65.s, + bottomPadding = bottomPadding ?? 30.s, + description = description ?? '', // Ensure description is not null imagePath = imagePath ?? Assets.images.iceRound.path; final double topPadding; @@ -30,7 +33,7 @@ class AuthHeaderWidget extends StatelessWidget { ), ), Padding( - padding: const EdgeInsets.only(top: 19, bottom: 3), + padding: EdgeInsets.only(top: 19.s, bottom: 3.s), child: Text( title, style: context.theme.appTextThemes.headline1, diff --git a/lib/app/components/button/button.dart b/lib/app/components/button/button.dart index f9101d229..0366b5114 100644 --- a/lib/app/components/button/button.dart +++ b/lib/app/components/button/button.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:ice/app/extensions/build_context.dart'; +import 'package:ice/app/extensions/num.dart'; import 'package:ice/app/extensions/theme_data.dart'; part 'variants/button_icon.dart'; @@ -54,11 +55,11 @@ class Button extends StatelessWidget { OutlinedButton.styleFrom( fixedSize: fixedSize, tapTargetSize: MaterialTapTargetSize.shrinkWrap, - shape: const RoundedRectangleBorder( - borderRadius: BorderRadius.all(Radius.circular(12)), + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.all(Radius.circular(12.s)), ), - minimumSize: const Size(56, 56), - padding: const EdgeInsets.symmetric(horizontal: 16), + minimumSize: Size(56.s, 56.s), + padding: EdgeInsets.symmetric(horizontal: 16.s), backgroundColor: _getBackgroundColor(context, type), side: BorderSide( color: _getBorderColor(context, type), @@ -78,8 +79,8 @@ class Button extends StatelessWidget { if (label != null) Padding( padding: EdgeInsets.only( - left: leadingIcon == null ? 0 : 8, // 8 move to constants - right: trailingIcon == null ? 0 : 8, + left: leadingIcon == null ? 0 : 8.s, // 8 move to constants + right: trailingIcon == null ? 0 : 8.s, ), child: label, ), diff --git a/lib/app/components/button/variants/button_icon.dart b/lib/app/components/button/variants/button_icon.dart index 5eba6dcf3..26dc568c3 100644 --- a/lib/app/components/button/variants/button_icon.dart +++ b/lib/app/components/button/variants/button_icon.dart @@ -7,12 +7,12 @@ class _ButtonWithIcon extends Button { required super.onPressed, required Widget icon, ButtonStyle style = const ButtonStyle(), - double size = 56, + double? size, }) : super( leadingIcon: icon, style: style.merge( OutlinedButton.styleFrom( - fixedSize: Size.square(size), + fixedSize: Size.square(size ?? 56.s), padding: EdgeInsets.zero, ), ), diff --git a/lib/app/components/favourite_icon/favorite_icon.dart b/lib/app/components/favourite_icon/favorite_icon.dart index 2d9efad7c..aa90382c3 100644 --- a/lib/app/components/favourite_icon/favorite_icon.dart +++ b/lib/app/components/favourite_icon/favorite_icon.dart @@ -1,9 +1,10 @@ import 'package:flutter/material.dart'; import 'package:ice/app/extensions/build_context.dart'; +import 'package:ice/app/extensions/num.dart'; import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/generated/assets.gen.dart'; -const double iconSideDimension = 36.0; +final double iconSideDimension = 36.s; class FavouriteIcon extends StatelessWidget { const FavouriteIcon({ @@ -27,7 +28,7 @@ class FavouriteIcon extends StatelessWidget { width: iconSideDimension, height: iconSideDimension, decoration: BoxDecoration( - borderRadius: BorderRadius.circular(12), + borderRadius: BorderRadius.circular(12.s), color: iconBackgroundColor, border: Border.all( color: context.theme.appColors.onTerararyFill, @@ -38,7 +39,7 @@ class FavouriteIcon extends StatelessWidget { children: [ Image.asset( iconPath, - width: 24, + width: 24.s, ), ], ), diff --git a/lib/app/components/inputs/email_input.dart b/lib/app/components/inputs/email_input.dart index 12505f6db..484a8e764 100644 --- a/lib/app/components/inputs/email_input.dart +++ b/lib/app/components/inputs/email_input.dart @@ -2,6 +2,7 @@ import 'package:email_validator/email_validator.dart'; import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:ice/app/extensions/build_context.dart'; +import 'package:ice/app/extensions/num.dart'; import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/generated/assets.gen.dart'; @@ -43,19 +44,19 @@ class EmailInput extends HookWidget { child: Row( mainAxisSize: MainAxisSize.min, children: [ - const SizedBox(width: 20), + SizedBox(width: 20.s), Image.asset( Assets.images.fieldEmail.path, color: context.theme.appColors.primaryText, ), - const SizedBox(width: 6), + SizedBox(width: 6.s), VerticalDivider( color: context.theme.appColors.strokeElements, thickness: 1, - indent: 14, - endIndent: 14, + indent: 14.s, + endIndent: 14.s, ), - const SizedBox(width: 8), + SizedBox(width: 8.s), ], ), ), @@ -66,22 +67,22 @@ class EmailInput extends HookWidget { // or extend the InputBorder class to create your own // the default is UnderlineInputBorder border: OutlineInputBorder( - borderRadius: BorderRadius.circular(16), + borderRadius: BorderRadius.circular(16.s), ), // you can also define different border styles for different states // e.g. when the field is enabled / focused / has error enabledBorder: OutlineInputBorder( - borderRadius: BorderRadius.circular(16), + borderRadius: BorderRadius.circular(16.s), borderSide: BorderSide(color: context.theme.appColors.strokeElements), ), focusedBorder: OutlineInputBorder( - borderRadius: BorderRadius.circular(16), + borderRadius: BorderRadius.circular(16.s), borderSide: BorderSide(color: context.theme.appColors.primaryAccent), ), errorBorder: OutlineInputBorder( - borderRadius: BorderRadius.circular(16), + borderRadius: BorderRadius.circular(16.s), borderSide: const BorderSide(color: Colors.red), ), ), diff --git a/lib/app/components/inputs/text_fields.dart b/lib/app/components/inputs/text_fields.dart index 8e646a4f7..cb989ccae 100644 --- a/lib/app/components/inputs/text_fields.dart +++ b/lib/app/components/inputs/text_fields.dart @@ -10,10 +10,10 @@ import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/generated/assets.gen.dart'; const Color _kBackgroundColor = Color(0xFFFFFFFF); -double defaultTextFieldMargin = 44.0.s; -double textInputLeadingPadding = 16.0.s; -double textInputTrailingPadding = 12.0.s; -double defaultTextInputHeight = 58.0.s; +double defaultTextFieldMargin = 44.s; +double textInputLeadingPadding = 16.s; +double textInputTrailingPadding = 12.s; +double defaultTextInputHeight = 58.s; class InputField extends StatefulWidget { InputField({ @@ -201,8 +201,8 @@ class InputFormField extends FormField { leadingIcon, if (showLeadingSeparator != null && showLeadingSeparator) Container( - width: 1, - height: 26, + width: 1.s, + height: 26.s, color: context.theme.appColors.strokeElements, margin: EdgeInsets.only( left: textInputLeadingPadding, @@ -215,7 +215,7 @@ class InputFormField extends FormField { child: Padding( padding: EdgeInsets.only(top: 19.5.s), child: SizedBox( - height: 34, + height: 34.s, child: TextFormField( scrollPadding: EdgeInsets.only( bottom: controller.scrollPadding.zeroOrValue + @@ -271,8 +271,8 @@ class InputFormField extends FormField { children: [ if (showTrailingSeparator != null && showTrailingSeparator) Container( - width: 1, - height: 26, + width: 1.s, + height: 26.s, color: context.theme.appColors.strokeElements, margin: EdgeInsets.only( right: textInputTrailingPadding, @@ -296,7 +296,7 @@ class InputFormField extends FormField { children: [ field, Padding( - padding: EdgeInsets.only(left: defaultTextFieldMargin, top: 4.0.s), + padding: EdgeInsets.only(left: defaultTextFieldMargin, top: 4.s), child: Text( error, overflow: TextOverflow.ellipsis, @@ -358,7 +358,7 @@ class TextFieldToEdit extends StatelessWidget { return GestureDetector( onTap: onEdit, child: RoundedContainer( - height: 56.0.s, + height: 56.s, color: _kBackgroundColor, child: Padding( padding: EdgeInsets.all(defaultTextFieldMargin), @@ -373,7 +373,7 @@ class TextFieldToEdit extends StatelessWidget { ), ), ), - SizedBox(width: 10.0.s), + SizedBox(width: 10.s), Image.asset( Assets.images.iceRound.path, ), diff --git a/lib/app/components/list_item/list_item.dart b/lib/app/components/list_item/list_item.dart index ad749a38d..c44cdd188 100644 --- a/lib/app/components/list_item/list_item.dart +++ b/lib/app/components/list_item/list_item.dart @@ -1,26 +1,31 @@ import 'package:flutter/material.dart'; import 'package:ice/app/extensions/build_context.dart'; +import 'package:ice/app/extensions/num.dart'; import 'package:ice/app/extensions/theme_data.dart'; part './variants/list_item_checkbox.dart'; class ListItem extends StatelessWidget { - const ListItem({ + ListItem({ super.key, this.leading, this.title, this.subtitle, this.trailing, this.border, - this.borderRadius = const BorderRadius.all(Radius.circular(16)), - this.contentPadding = const EdgeInsets.all(12), - this.leadingPadding = const EdgeInsets.only(right: 10), - this.trailingPadding = const EdgeInsets.only(left: 10), - this.constraints = const BoxConstraints(minHeight: 60), this.backgroundColor, - }); + BorderRadius? borderRadius, + EdgeInsets? contentPadding, + EdgeInsets? leadingPadding, + EdgeInsets? trailingPadding, + BoxConstraints? constraints, + }) : borderRadius = borderRadius ?? BorderRadius.all(Radius.circular(16.s)), + contentPadding = contentPadding ?? EdgeInsets.all(12.s), + leadingPadding = leadingPadding ?? EdgeInsets.only(right: 10.s), + trailingPadding = trailingPadding ?? EdgeInsets.only(left: 10.s), + constraints = constraints ?? BoxConstraints(minHeight: 60.s); - const factory ListItem.checkbox({ + factory ListItem.checkbox({ Key? key, Widget? leading, Widget? title, diff --git a/lib/app/components/list_item/variants/list_item_checkbox.dart b/lib/app/components/list_item/variants/list_item_checkbox.dart index c6a3af26a..f0130809d 100644 --- a/lib/app/components/list_item/variants/list_item_checkbox.dart +++ b/lib/app/components/list_item/variants/list_item_checkbox.dart @@ -1,7 +1,7 @@ part of '../list_item.dart'; class _ListItemWithCheckbox extends ListItem { - const _ListItemWithCheckbox({ + _ListItemWithCheckbox({ super.key, super.leading, super.title, diff --git a/lib/app/components/modal_wrapper/modal_wrapper.dart b/lib/app/components/modal_wrapper/modal_wrapper.dart index 7507b3f60..1c956a4d2 100644 --- a/lib/app/components/modal_wrapper/modal_wrapper.dart +++ b/lib/app/components/modal_wrapper/modal_wrapper.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; import 'package:ice/app/components/keyboard_hider/keyboard_hider.dart'; +import 'package:ice/app/extensions/num.dart'; class ModalWrapper extends StatelessWidget { const ModalWrapper({super.key, required this.child}); @@ -11,21 +12,21 @@ class ModalWrapper extends StatelessWidget { alignment: Alignment.bottomCenter, child: KeyboardHider( child: Container( - height: MediaQuery.of(context).size.height - 74, + height: MediaQuery.of(context).size.height - 74.s, decoration: BoxDecoration( color: Colors.black, - borderRadius: const BorderRadius.vertical(top: Radius.circular(30)), + borderRadius: BorderRadius.vertical(top: Radius.circular(30.s)), boxShadow: [ BoxShadow( color: Colors.grey.withOpacity(0.5), - spreadRadius: 5, - blurRadius: 7, - offset: const Offset(0, 3), + spreadRadius: 5.s, + blurRadius: 7.s, + offset: Offset(0, 3.s), ), ], ), child: ClipRRect( - borderRadius: const BorderRadius.vertical(top: Radius.circular(30)), + borderRadius: BorderRadius.vertical(top: Radius.circular(30.s)), child: child, ), ), diff --git a/lib/app/components/nav_header_offset/nav_header_offset.dart b/lib/app/components/nav_header_offset/nav_header_offset.dart index 602efd3a1..419416d6f 100644 --- a/lib/app/components/nav_header_offset/nav_header_offset.dart +++ b/lib/app/components/nav_header_offset/nav_header_offset.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:ice/app/extensions/num.dart'; -double defaultNavHeaderTopPadding = 50.0.w; +double defaultNavHeaderTopPadding = 50.s; EdgeInsets defaultInsets = EdgeInsets.only(top: defaultNavHeaderTopPadding); class NavHeaderOffset extends StatelessWidget { diff --git a/lib/app/components/navigation_header/navigation_header.dart b/lib/app/components/navigation_header/navigation_header.dart index 4331f1f5b..e4102f648 100644 --- a/lib/app/components/navigation_header/navigation_header.dart +++ b/lib/app/components/navigation_header/navigation_header.dart @@ -1,11 +1,12 @@ import 'package:flutter/material.dart'; import 'package:ice/app/extensions/build_context.dart'; +import 'package:ice/app/extensions/num.dart'; import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/generated/assets.gen.dart'; -const double navigationHeaderHeight = 50; -const double backButtonSide = 24.0; -const double backButtonPadding = 10.0; +double navigationHeaderHeight = 50.s; +double backButtonSide = 24.s; +double backButtonPadding = 10.s; class NavigationHeader extends StatelessWidget { const NavigationHeader({ @@ -41,7 +42,7 @@ class NavigationHeader extends StatelessWidget { }, ) else - const SizedBox(width: backButtonSide + backButtonPadding * 2), + SizedBox(width: backButtonSide + backButtonPadding * 2), Expanded( child: Text( title, @@ -49,7 +50,7 @@ class NavigationHeader extends StatelessWidget { style: context.theme.appTextThemes.title, ), ), - const SizedBox(width: backButtonSide + backButtonPadding * 2), + SizedBox(width: backButtonSide + backButtonPadding * 2), ], ), ); diff --git a/lib/app/components/screen_side_offset/screen_side_offset.dart b/lib/app/components/screen_side_offset/screen_side_offset.dart index c4186826a..d49f45e46 100644 --- a/lib/app/components/screen_side_offset/screen_side_offset.dart +++ b/lib/app/components/screen_side_offset/screen_side_offset.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:ice/app/extensions/num.dart'; class ScreenSideOffset extends StatelessWidget { const ScreenSideOffset._({ @@ -36,9 +36,9 @@ class ScreenSideOffset extends StatelessWidget { ); } - static double get defaultSmallMargin => 16.0.w; + static double get defaultSmallMargin => 16.s; - static double get defaultLargeMargin => 44.0.w; + static double get defaultLargeMargin => 44.s; final Widget child; final EdgeInsets insets; diff --git a/lib/app/components/search/search.dart b/lib/app/components/search/search.dart index 965382b9a..2cc73738f 100644 --- a/lib/app/components/search/search.dart +++ b/lib/app/components/search/search.dart @@ -1,6 +1,7 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:ice/app/extensions/build_context.dart'; +import 'package:ice/app/extensions/num.dart'; import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/generated/assets.gen.dart'; @@ -46,17 +47,17 @@ class _SearchState extends State { @override Widget build(BuildContext context) { return Container( - padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 5), + padding: EdgeInsets.symmetric(horizontal: 10.s, vertical: 5.s), child: Row( children: [ Expanded( child: SizedBox( - height: 42, + height: 42.s, child: CupertinoTextField( focusNode: _focusNode, decoration: BoxDecoration( color: context.theme.appColors.primaryBackground, - borderRadius: BorderRadius.circular(16), + borderRadius: BorderRadius.circular(16.s), ), controller: _controller, placeholder: context.i18n.search_placeholder, @@ -64,11 +65,11 @@ class _SearchState extends State { color: context.theme.appColors.tertararyText, ), prefix: Padding( - padding: const EdgeInsets.only(left: 12), + padding: EdgeInsets.only(left: 12.s), child: ImageIcon( AssetImage(Assets.images.search.path), color: context.theme.appColors.tertararyText, - size: 14, + size: 14.s, ), ), clearButtonMode: OverlayVisibilityMode.editing, @@ -77,9 +78,9 @@ class _SearchState extends State { suffix: _controller.text.isNotEmpty ? GestureDetector( onTap: _onClearTapped, - child: const Padding( - padding: EdgeInsets.only(right: 12.0), - child: Icon( + child: Padding( + padding: EdgeInsets.only(right: 12.s), + child: const Icon( CupertinoIcons.clear_circled, color: Colors.grey, ), diff --git a/lib/app/components/section_header/section_header.dart b/lib/app/components/section_header/section_header.dart index 0173f731c..08115a285 100644 --- a/lib/app/components/section_header/section_header.dart +++ b/lib/app/components/section_header/section_header.dart @@ -1,16 +1,18 @@ import 'package:flutter/material.dart'; import 'package:ice/app/components/screen_side_offset/screen_side_offset.dart'; import 'package:ice/app/extensions/build_context.dart'; +import 'package:ice/app/extensions/num.dart'; import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/generated/assets.gen.dart'; class SectionHeader extends StatelessWidget { - const SectionHeader({ - this.topPadding = 24.0, - this.bottomPadding = 16.0, + SectionHeader({ this.title, this.onPress, - }); + double? topPadding, + double? bottomPadding, + }) : topPadding = topPadding ?? 24.s, + bottomPadding = bottomPadding ?? 16.s; final double topPadding; final double bottomPadding; @@ -26,7 +28,7 @@ class SectionHeader extends StatelessWidget { bottom: bottomPadding, ), child: SizedBox( - height: 24, + height: 24.s, child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ @@ -39,11 +41,12 @@ class SectionHeader extends StatelessWidget { ), ), if (onPress != null) + // TODO::why not Button component InkWell( onTap: onPress, child: Ink( - width: 24, // Set the width of the button - height: 24, // Set the height of the button + width: 24.s, // Set the width of the button + height: 24.s, // Set the height of the button child: Center( child: Image.asset( Assets.images.nextArrow.path, diff --git a/lib/app/components/secured_by/secured_by.dart b/lib/app/components/secured_by/secured_by.dart index d5fe2dfa2..e185cf973 100644 --- a/lib/app/components/secured_by/secured_by.dart +++ b/lib/app/components/secured_by/secured_by.dart @@ -1,5 +1,6 @@ import 'package:flutter/widgets.dart'; import 'package:ice/app/extensions/build_context.dart'; +import 'package:ice/app/extensions/num.dart'; import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/generated/assets.gen.dart'; @@ -15,12 +16,13 @@ class SecuredBy extends StatelessWidget { context.i18n.secured_by, style: context.theme.appTextThemes.caption, ), - const SizedBox(width: 5), + SizedBox(width: 5.s), Image.asset(Assets.images.iceIcon.path), - const SizedBox(width: 3), + SizedBox(width: 3.s), Text( context.i18n.secured_by_ice, - style: context.theme.appTextThemes.headline1.copyWith(fontSize: 17), + style: context.theme.appTextThemes.headline1 + .copyWith(fontSize: 17), //TODO::why fixed size here ), ], ); diff --git a/lib/app/components/socials/socials.dart b/lib/app/components/socials/socials.dart index 59bea935b..29bcbb167 100644 --- a/lib/app/components/socials/socials.dart +++ b/lib/app/components/socials/socials.dart @@ -1,13 +1,13 @@ import 'package:flutter/material.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:ice/app/components/button/button.dart'; import 'package:ice/app/components/screen_side_offset/screen_side_offset.dart'; import 'package:ice/app/extensions/build_context.dart'; +import 'package:ice/app/extensions/num.dart'; import 'package:ice/generated/assets.gen.dart'; enum SocialButtonType { apple, nostr, x, expand, fb, github, discord, linkedin } -double defaultSocialIconButtonSide = 44.0.w; +double defaultSocialIconButtonSide = 44.s; Map socialIcons = { SocialButtonType.apple: Assets.images.apple.path, diff --git a/lib/app/components/terms_privacy/terms_privacy.dart b/lib/app/components/terms_privacy/terms_privacy.dart index cf4735a6d..a2aba66ff 100644 --- a/lib/app/components/terms_privacy/terms_privacy.dart +++ b/lib/app/components/terms_privacy/terms_privacy.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; import 'package:ice/app/extensions/build_context.dart'; +import 'package:ice/app/extensions/num.dart'; import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/l10n/I10n.dart'; @@ -25,7 +26,7 @@ class TermsPrivacy extends StatelessWidget { } return SizedBox( - width: 220, + width: 220.s, child: Text.rich( replaceString( context.i18n.auth_privacy, diff --git a/lib/app/components/text_field_wrapper/text_field_wrapper.dart b/lib/app/components/text_field_wrapper/text_field_wrapper.dart index a9b32f272..e8c3aa5fa 100644 --- a/lib/app/components/text_field_wrapper/text_field_wrapper.dart +++ b/lib/app/components/text_field_wrapper/text_field_wrapper.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; import 'package:ice/app/extensions/build_context.dart'; +import 'package:ice/app/extensions/num.dart'; import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/generated/assets.gen.dart'; @@ -96,17 +97,17 @@ class TextFieldWrapperState extends State { return Row( mainAxisSize: MainAxisSize.min, children: [ - const SizedBox(width: 16), + SizedBox(width: 16.s), ImageIcon( widget.defaultIcon, - size: 24, + size: 24.s, color: context.theme.appColors.secondaryText, ), Container( width: 1, - height: 26, + height: 26.s, color: context.theme.appColors.strokeElements, - margin: const EdgeInsets.symmetric(horizontal: 16), + margin: EdgeInsets.symmetric(horizontal: 16.s), ), ], ); @@ -128,19 +129,19 @@ class TextFieldWrapperState extends State { borderSide: BorderSide( color: _getBorderColor(context), ), - borderRadius: BorderRadius.circular(16), + borderRadius: BorderRadius.circular(16.s), ), focusedBorder: OutlineInputBorder( borderSide: BorderSide( color: context.theme.appColors.primaryAccent, ), - borderRadius: BorderRadius.circular(16), + borderRadius: BorderRadius.circular(16.s), ), errorBorder: OutlineInputBorder( borderSide: BorderSide( color: context.theme.appColors.attentionRed, ), - borderRadius: BorderRadius.circular(16), + borderRadius: BorderRadius.circular(16.s), ), label: Text( placeholder(), @@ -150,36 +151,23 @@ class TextFieldWrapperState extends State { ), ), prefixIcon: _buildPrefixIcon(), - suffixIconConstraints: const BoxConstraints( - maxHeight: 15, // Adjust the maxHeight as needed - maxWidth: 15, // Adjust the maxWidth as needed + suffixIconConstraints: BoxConstraints( + maxHeight: 15.s, // Adjust the maxHeight as needed + maxWidth: 15.s, // Adjust the maxWidth as needed ), - contentPadding: const EdgeInsets.only(left: 16), + contentPadding: EdgeInsets.only(left: 16.s), ), ), if (_state == TextFieldState.successState) Positioned( - right: 16, - top: 12, + right: 16.s, + top: 12.s, child: Image.asset( Assets.images.blockCheckboxOn.path, - width: 24, - height: 24, + width: 24.s, + height: 24.s, ), ), - // Positioned( - // left: _focusNode.hasFocus ? 16 : 73, - // top: _controller.text.isEmpty && !_focusNode.hasFocus ? 14 : 0, - // child: Text( - // widget.placeholder, - // style: context.theme.appTextThemes.body.copyWith( - // color: _focusNode.hasFocus - // ? context.theme.appColors.primaryAccent - // : context.theme.appColors - // .tertararyText, // Use the color you desire - // ), - // ), - // ), ], ); } diff --git a/lib/app/components/title_description_header/title_description_header.dart b/lib/app/components/title_description_header/title_description_header.dart index b4f3c74ee..2fb6a565b 100644 --- a/lib/app/components/title_description_header/title_description_header.dart +++ b/lib/app/components/title_description_header/title_description_header.dart @@ -1,15 +1,16 @@ import 'package:flutter/material.dart'; import 'package:ice/app/extensions/build_context.dart'; +import 'package:ice/app/extensions/num.dart'; import 'package:ice/app/extensions/theme_data.dart'; class TitleDescription extends StatelessWidget { - const TitleDescription({ - this.topPadding = 0, - this.bottomPadding = 16.0, - String? title, - String? description, - }) : title = title ?? '', - description = description ?? ''; + TitleDescription({ + this.title = '', + this.description = '', + double? topPadding, + double? bottomPadding, + }) : topPadding = topPadding ?? 0, + bottomPadding = bottomPadding ?? 16.s; final double topPadding; final double bottomPadding; @@ -22,7 +23,7 @@ class TitleDescription extends StatelessWidget { child: Column( children: [ Padding( - padding: EdgeInsets.only(top: topPadding, bottom: 8), + padding: EdgeInsets.only(top: topPadding, bottom: 8.s), child: Visibility( visible: title.isNotEmpty, child: Text( @@ -37,7 +38,7 @@ class TitleDescription extends StatelessWidget { Visibility( visible: description.isNotEmpty, child: Padding( - padding: const EdgeInsets.symmetric(horizontal: 52), + padding: EdgeInsets.symmetric(horizontal: 52.s), child: Text( description, textAlign: TextAlign.center, diff --git a/lib/app/components/wallet_header/wallet_header.dart b/lib/app/components/wallet_header/wallet_header.dart index b2181906b..fb4c8f68b 100644 --- a/lib/app/components/wallet_header/wallet_header.dart +++ b/lib/app/components/wallet_header/wallet_header.dart @@ -3,6 +3,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:ice/app/components/button/button.dart'; import 'package:ice/app/components/screen_side_offset/screen_side_offset.dart'; import 'package:ice/app/extensions/build_context.dart'; +import 'package:ice/app/extensions/num.dart'; import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/generated/assets.gen.dart'; @@ -13,8 +14,8 @@ class WalletHeader extends HookConsumerWidget { Widget build(BuildContext context, WidgetRef ref) { return ScreenSideOffset.small( child: Padding( - padding: const EdgeInsets.only( - top: 56, + padding: EdgeInsets.only( + top: 56.s, ), child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, @@ -36,11 +37,16 @@ class WalletHeader extends HookConsumerWidget { }, ), padding: MaterialStateProperty.all( - const EdgeInsets.only(left: 6, top: 6, bottom: 6, right: 12), + EdgeInsets.only( + left: 6.s, + top: 6.s, + bottom: 6.s, + right: 12.s, + ), ), shape: MaterialStateProperty.all( RoundedRectangleBorder( - borderRadius: BorderRadius.circular(12), + borderRadius: BorderRadius.circular(12.s), side: BorderSide( color: context.theme.appColors.onTerararyFill, ), @@ -57,17 +63,17 @@ class WalletHeader extends HookConsumerWidget { children: [ Image.asset( Assets.images.walletWalletblue.path, - width: 28, - height: 28, + width: 28.s, + height: 28.s, fit: BoxFit.cover, ), - const SizedBox(width: 8), + SizedBox(width: 8.s), Text(context.i18n.wallet_header_ice_wallet), - const SizedBox(width: 8), + SizedBox(width: 8.s), Image.asset( Assets.images.selectArrows.path, - width: 12, - height: 12, + width: 12.s, + height: 12.s, ), ], ), @@ -78,34 +84,34 @@ class WalletHeader extends HookConsumerWidget { onPressed: () {}, icon: Image.asset( Assets.images.fieldSearch.path, - width: 24, - height: 24, + width: 24.s, + height: 24.s, ), type: ButtonType.outlined, style: ButtonStyle( fixedSize: MaterialStateProperty.all( - const Size(40, 40), + Size(40.s, 40.s), ), minimumSize: MaterialStateProperty.all( - const Size(40, 40), + Size(40.s, 40.s), ), ), ), - const SizedBox(width: 12), + SizedBox(width: 12.s), Button.icon( onPressed: () {}, icon: Image.asset( Assets.images.filter.path, - width: 24, - height: 24, + width: 24.s, + height: 24.s, ), type: ButtonType.outlined, style: ButtonStyle( fixedSize: MaterialStateProperty.all( - const Size(40, 40), + Size(40.s, 40.s), ), minimumSize: MaterialStateProperty.all( - const Size(40, 40), + Size(40.s, 40.s), ), ), ), diff --git a/lib/app/extensions/num.dart b/lib/app/extensions/num.dart index ee4d44fa5..c6624822c 100644 --- a/lib/app/extensions/num.dart +++ b/lib/app/extensions/num.dart @@ -31,7 +31,7 @@ extension DoubleNullableExtension on double? { } } -extension DoubleExtension on double { +extension SizeExtension on num { double get s { return w; } diff --git a/lib/app/features/auth/views/pages/auth_page/auth_page.dart b/lib/app/features/auth/views/pages/auth_page/auth_page.dart index 877283ed1..3db8ec9a8 100644 --- a/lib/app/features/auth/views/pages/auth_page/auth_page.dart +++ b/lib/app/features/auth/views/pages/auth_page/auth_page.dart @@ -9,6 +9,7 @@ import 'package:ice/app/components/secured_by/secured_by.dart'; import 'package:ice/app/components/socials/socials.dart'; import 'package:ice/app/components/terms_privacy/terms_privacy.dart'; import 'package:ice/app/extensions/build_context.dart'; +import 'package:ice/app/extensions/num.dart'; import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/app/features/auth/data/models/auth_state.dart'; import 'package:ice/app/features/auth/providers/auth_provider.dart'; @@ -85,22 +86,22 @@ class AuthPage extends HookConsumerWidget { validator: (String? value) => numberController.onVerify(), showLeadingSeparator: true, ), - const SizedBox( - height: 16, + SizedBox( + height: 16.s, ), Center( child: Button( trailingIcon: authState is AuthenticationLoading - ? const SizedBox( - height: 10, - width: 10, - child: CircularProgressIndicator( + ? SizedBox( + height: 10.s, + width: 10.s, + child: const CircularProgressIndicator( color: Colors.white, ), ) : ImageIcon( AssetImage(Assets.images.buttonNext.path), - size: 16, + size: 16.s, ), onPressed: () => { emailFormKey.currentState?.reset(), @@ -113,7 +114,7 @@ class AuthPage extends HookConsumerWidget { ), ), Padding( - padding: const EdgeInsets.only(top: 14, bottom: 14), + padding: EdgeInsets.only(top: 14.s, bottom: 14.s), child: Text( context.i18n.auth_signIn_or, style: context.theme.appTextThemes.caption @@ -125,7 +126,7 @@ class AuthPage extends HookConsumerWidget { type: ButtonType.outlined, leadingIcon: ImageIcon( AssetImage(Assets.images.phone.path), - size: 24, + size: 24.s, color: context.theme.appColors.secondaryText, ), onPressed: () { @@ -140,7 +141,7 @@ class AuthPage extends HookConsumerWidget { ), ), Padding( - padding: const EdgeInsets.only(top: 16, bottom: 22), + padding: EdgeInsets.only(top: 16.s, bottom: 22.s), child: Socials( onSocialButtonPressed: (SocialButtonType type) { switch (type) { @@ -165,8 +166,8 @@ class AuthPage extends HookConsumerWidget { ), ), const SecuredBy(), - const SizedBox( - height: 20, + SizedBox( + height: 20.s, ), const TermsPrivacy(), ], diff --git a/lib/app/features/auth/views/pages/auth_page/components/country_code_input.dart b/lib/app/features/auth/views/pages/auth_page/components/country_code_input.dart index 0cf4fd561..e264266c5 100644 --- a/lib/app/features/auth/views/pages/auth_page/components/country_code_input.dart +++ b/lib/app/features/auth/views/pages/auth_page/components/country_code_input.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; import 'package:ice/app/extensions/build_context.dart'; +import 'package:ice/app/extensions/num.dart'; import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/app/features/auth/views/pages/select_country/countries.dart'; import 'package:ice/generated/assets.gen.dart'; @@ -21,12 +22,12 @@ class CountryCodeInput extends StatelessWidget { country.flag, style: const TextStyle(fontSize: 30), ), - const SizedBox(width: 8), + SizedBox(width: 8.s), Image.asset( Assets.images.loginDropdown.path, color: context.theme.appColors.secondaryText, - width: 15, - height: 15, + width: 15.s, + height: 15.s, ), ], ), diff --git a/lib/app/features/auth/views/pages/check_email/check_email.dart b/lib/app/features/auth/views/pages/check_email/check_email.dart index b848020bb..0faccab15 100644 --- a/lib/app/features/auth/views/pages/check_email/check_email.dart +++ b/lib/app/features/auth/views/pages/check_email/check_email.dart @@ -5,6 +5,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:ice/app/components/screen_side_offset/screen_side_offset.dart'; import 'package:ice/app/components/terms_privacy/terms_privacy.dart'; import 'package:ice/app/extensions/build_context.dart'; +import 'package:ice/app/extensions/num.dart'; import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/generated/assets.gen.dart'; import 'package:pin_code_fields/pin_code_fields.dart'; @@ -27,14 +28,14 @@ class CheckEmail extends HookConsumerWidget { children: [ Column( children: [ - const SizedBox( - height: 65, + SizedBox( + height: 65.s, ), Image.asset( Assets.images.iceRound.path, ), - const SizedBox( - height: 12, + SizedBox( + height: 12.s, ), Text( context.i18n.check_email_title, @@ -58,7 +59,7 @@ class CheckEmail extends HookConsumerWidget { ), Padding( padding: - const EdgeInsets.symmetric(vertical: 36, horizontal: 20), + EdgeInsets.symmetric(vertical: 36.s, horizontal: 20.s), child: Text( context.i18n.check_email_description, textAlign: TextAlign.center, @@ -68,21 +69,21 @@ class CheckEmail extends HookConsumerWidget { ), ), SizedBox( - width: 248, + width: 248.s, child: PinCodeTextField( appContext: context, length: 4, animationType: AnimationType.fade, enabled: false, cursorColor: Colors.black, - cursorWidth: 3, - cursorHeight: 25, + cursorWidth: 3.s, + cursorHeight: 25.s, textStyle: context.theme.appTextThemes.inputFieldText, pinTheme: PinTheme( shape: PinCodeFieldShape.box, - borderRadius: BorderRadius.circular(16), - fieldHeight: 56, - fieldWidth: 50, + borderRadius: BorderRadius.circular(16.s), + fieldHeight: 56.s, + fieldWidth: 50.s, borderWidth: 1, inactiveColor: context.theme.appColors.strokeElements, disabledColor: context.theme.appColors.strokeElements, @@ -114,9 +115,9 @@ class CheckEmail extends HookConsumerWidget { Image.asset( Assets.images.iceRound.path, ), - const Padding( - padding: EdgeInsets.only(bottom: 48), - child: TermsPrivacy(), + Padding( + padding: EdgeInsets.only(bottom: 48.s), + child: const TermsPrivacy(), ), ], ), diff --git a/lib/app/features/auth/views/pages/discover_creators/discover_creators.dart b/lib/app/features/auth/views/pages/discover_creators/discover_creators.dart index 707633855..7fa437a9b 100644 --- a/lib/app/features/auth/views/pages/discover_creators/discover_creators.dart +++ b/lib/app/features/auth/views/pages/discover_creators/discover_creators.dart @@ -7,6 +7,7 @@ import 'package:ice/app/components/screen_side_offset/screen_side_offset.dart'; import 'package:ice/app/components/search/search.dart'; import 'package:ice/app/components/title_description_header/title_description_header.dart'; import 'package:ice/app/extensions/build_context.dart'; +import 'package:ice/app/extensions/num.dart'; import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/app/features/auth/views/pages/discover_creators/mocked_creators.dart'; import 'package:ice/generated/assets.gen.dart'; @@ -61,7 +62,7 @@ class DiscoverCreators extends HookConsumerWidget { const NavigationHeader(title: ''), ScreenSideOffset.small( child: Padding( - padding: const EdgeInsets.only( + padding: EdgeInsets.only( top: navigationHeaderHeight, ), child: Column( @@ -71,7 +72,7 @@ class DiscoverCreators extends HookConsumerWidget { description: context.i18n.discover_creators_description, ), Padding( - padding: const EdgeInsets.only(bottom: 12), + padding: EdgeInsets.only(bottom: 12.s), child: Search( onTextChanged: (String value) => searchText.value = value, @@ -89,38 +90,38 @@ class DiscoverCreators extends HookConsumerWidget { followedCreators.contains(creator); return Container( - height: 66, + height: 66.s, decoration: BoxDecoration( color: context.theme.appColors.tertararyBackground, - borderRadius: BorderRadius.circular(12.0), + borderRadius: BorderRadius.circular(12.s), ), - margin: const EdgeInsets.only( - bottom: 12, + margin: EdgeInsets.only( + bottom: 12.s, ), - padding: const EdgeInsets.symmetric( - horizontal: 16, + padding: EdgeInsets.symmetric( + horizontal: 16.s, ), child: Row( children: [ if (creator.imageUrl != null && creator.imageUrl!.isNotEmpty) Container( - width: 30, - height: 30, + width: 30.s, + height: 30.s, decoration: BoxDecoration( - borderRadius: BorderRadius.circular(10.0), + borderRadius: BorderRadius.circular(10.s), ), clipBehavior: Clip.hardEdge, child: Image.network( creator.imageUrl!, - width: 30, - height: 30, + width: 30.s, + height: 30.s, fit: BoxFit.cover, ), ), - const SizedBox( - width: 16, + SizedBox( + width: 16.s, ), Expanded( child: Column( @@ -141,20 +142,20 @@ class DiscoverCreators extends HookConsumerWidget { ), if (creator.isVerified ?? false) Padding( - padding: const EdgeInsets.only( - left: 4, - top: 2, + padding: EdgeInsets.only( + left: 4.s, + top: 2.s, ), child: Image.asset( Assets .images.verifiedBadge.path, - width: 16, - height: 16, + width: 16.s, + height: 16.s, ), ), ], ), - const SizedBox(height: 2), + SizedBox(height: 2.s), Text( creator.nickname, style: context @@ -194,9 +195,9 @@ class DiscoverCreators extends HookConsumerWidget { ), mainAxisSize: MainAxisSize.max, style: OutlinedButton.styleFrom( - minimumSize: const Size(77, 28), - padding: const EdgeInsets.symmetric( - horizontal: 5, + minimumSize: Size(77.s, 28.s), + padding: EdgeInsets.symmetric( + horizontal: 5.s, ), ), ), diff --git a/lib/app/features/auth/views/pages/enter_code/enter_code.dart b/lib/app/features/auth/views/pages/enter_code/enter_code.dart index 443b4a87e..e4101b117 100644 --- a/lib/app/features/auth/views/pages/enter_code/enter_code.dart +++ b/lib/app/features/auth/views/pages/enter_code/enter_code.dart @@ -6,6 +6,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:ice/app/components/screen_side_offset/screen_side_offset.dart'; import 'package:ice/app/components/terms_privacy/terms_privacy.dart'; import 'package:ice/app/extensions/build_context.dart'; +import 'package:ice/app/extensions/num.dart'; import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/generated/assets.gen.dart'; import 'package:pin_code_fields/pin_code_fields.dart'; @@ -32,14 +33,14 @@ class EnterCode extends HookConsumerWidget { children: [ Column( children: [ - const SizedBox( - height: 65, + SizedBox( + height: 65.s, ), Image.asset( Assets.images.enterCode.path, ), - const SizedBox( - height: 9, + SizedBox( + height: 9.s, ), Text( context.i18n.enter_code_title, @@ -56,22 +57,22 @@ class EnterCode extends HookConsumerWidget { style: context.theme.appTextThemes.subtitle, ), Padding( - padding: const EdgeInsets.only(top: 30, bottom: 19), + padding: EdgeInsets.only(top: 30.s, bottom: 19.s), child: SizedBox( - width: 248, + width: 248.s, child: PinCodeTextField( appContext: context, length: 4, animationType: AnimationType.fade, cursorColor: Colors.black, - cursorWidth: 3, - cursorHeight: 25, + cursorWidth: 3.s, + cursorHeight: 25.s, textStyle: context.theme.appTextThemes.inputFieldText, pinTheme: PinTheme( shape: PinCodeFieldShape.box, - borderRadius: BorderRadius.circular(16), - fieldHeight: 56, - fieldWidth: 50, + borderRadius: BorderRadius.circular(16.s), + fieldHeight: 56.s, + fieldWidth: 50.s, borderWidth: 1, inactiveColor: invalidCode.value ? context.theme.appColors.attentionRed @@ -142,9 +143,9 @@ class EnterCode extends HookConsumerWidget { Image.asset( Assets.images.iceRound.path, ), - const Padding( - padding: EdgeInsets.only(bottom: 48), - child: TermsPrivacy(), + Padding( + padding: EdgeInsets.only(bottom: 48.s), + child: const TermsPrivacy(), ), ], ), diff --git a/lib/app/features/auth/views/pages/fill_profile/fill_profile.dart b/lib/app/features/auth/views/pages/fill_profile/fill_profile.dart index cab4e5f5e..084b8f6f9 100644 --- a/lib/app/features/auth/views/pages/fill_profile/fill_profile.dart +++ b/lib/app/features/auth/views/pages/fill_profile/fill_profile.dart @@ -7,6 +7,7 @@ import 'package:ice/app/components/inputs/text_fields.dart'; import 'package:ice/app/components/screen_side_offset/screen_side_offset.dart'; import 'package:ice/app/components/text_field_wrapper/text_field_wrapper.dart'; import 'package:ice/app/extensions/build_context.dart'; +import 'package:ice/app/extensions/num.dart'; import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/app/features/auth/views/pages/fill_profile/controllers/inviter_controller.dart'; import 'package:ice/app/features/auth/views/pages/fill_profile/controllers/name_controller.dart'; @@ -62,17 +63,17 @@ class FillProfile extends HookConsumerWidget { final Widget profileImage = ref.watch(croppedFileProvider) != null ? ClipRRect( - borderRadius: BorderRadius.circular(50), + borderRadius: BorderRadius.circular(50.s), child: Image.file( File(ref.watch(croppedFileProvider)!.path), - width: 100, - height: 100, + width: 100.s, + height: 100.s, fit: BoxFit.cover, ), ) : Container( - width: 100, - height: 100, + width: 100.s, + height: 100.s, decoration: BoxDecoration( image: DecorationImage( image: AssetImage(Assets.images.profilePhotoPlaceholder.path), @@ -86,14 +87,14 @@ class FillProfile extends HookConsumerWidget { child: ScreenSideOffset.large( child: Column( children: [ - const SizedBox( - height: 65, + SizedBox( + height: 65.s, ), Image.asset( Assets.images.iceRound.path, ), - const SizedBox( - height: 19, + SizedBox( + height: 19.s, ), Text( context.i18n.fill_profile_title, @@ -105,8 +106,8 @@ class FillProfile extends HookConsumerWidget { color: context.theme.appColors.tertararyText, ), ), - const SizedBox( - height: 20, + SizedBox( + height: 20.s, ), Stack( children: [ @@ -117,21 +118,21 @@ class FillProfile extends HookConsumerWidget { child: GestureDetector( onTap: addPhoto, child: Container( - width: 36, - height: 36, + width: 36.s, + height: 36.s, decoration: const BoxDecoration(), child: Image.asset( Assets.images.profileCamera.path, - width: 36, - height: 36, + width: 36.s, + height: 36.s, ), ), ), ), ], ), - const SizedBox( - height: 28, + SizedBox( + height: 28.s, ), InputField( // autofocus: true, @@ -163,14 +164,14 @@ class FillProfile extends HookConsumerWidget { // key: inviterFieldKey, // textInputAction: TextInputAction.done ), - const SizedBox( - height: 20, + SizedBox( + height: 20.s, ), Center( child: Button( leadingIcon: ImageIcon( AssetImage(Assets.images.profileSave.path), - size: 24, + size: 24.s, ), onPressed: onSave, label: Text(context.i18n.button_save), diff --git a/lib/app/features/auth/views/pages/intro_page/intro_page.dart b/lib/app/features/auth/views/pages/intro_page/intro_page.dart index e922b0202..df740ba7d 100644 --- a/lib/app/features/auth/views/pages/intro_page/intro_page.dart +++ b/lib/app/features/auth/views/pages/intro_page/intro_page.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:ice/app/components/modal_wrapper/modal_wrapper.dart'; import 'package:ice/app/extensions/build_context.dart'; +import 'package:ice/app/extensions/num.dart'; import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/app/features/auth/views/pages/auth_page/auth_page.dart'; import 'package:ice/generated/assets.gen.dart'; @@ -40,10 +41,10 @@ class IntroPage extends HookConsumerWidget { repeat: false, ), Padding( - padding: const EdgeInsets.only( - left: 40, - right: 85, - bottom: 10, + padding: EdgeInsets.only( + left: 40.s, + right: 85.s, + bottom: 10.s, ), child: Text( context.i18n.intro_title, @@ -55,7 +56,7 @@ class IntroPage extends HookConsumerWidget { ), ), Padding( - padding: const EdgeInsets.only(left: 40.0, right: 40.0), + padding: EdgeInsets.only(left: 40.s, right: 40.s), child: Align( alignment: Alignment.centerLeft, child: Text( diff --git a/lib/app/features/auth/views/pages/nostr_auth/nostr_auth.dart b/lib/app/features/auth/views/pages/nostr_auth/nostr_auth.dart index 63d34ceaf..ec01c1db6 100644 --- a/lib/app/features/auth/views/pages/nostr_auth/nostr_auth.dart +++ b/lib/app/features/auth/views/pages/nostr_auth/nostr_auth.dart @@ -5,6 +5,7 @@ import 'package:ice/app/components/button/button.dart'; import 'package:ice/app/components/modal_wrapper/modal_wrapper.dart'; import 'package:ice/app/components/screen_side_offset/screen_side_offset.dart'; import 'package:ice/app/extensions/build_context.dart'; +import 'package:ice/app/extensions/num.dart'; import 'package:ice/app/features/auth/views/pages/nostr_login/nostr_login.dart'; import 'package:ice/generated/assets.gen.dart'; @@ -38,8 +39,8 @@ class NostrAuth extends HookConsumerWidget { ), Image.asset( Assets.images.ostrichlogo.path, - width: 256, - height: 160, + width: 256.s, + height: 160.s, ), Column( children: [ @@ -47,7 +48,7 @@ class NostrAuth extends HookConsumerWidget { child: Button( leadingIcon: ImageIcon( AssetImage(Assets.images.loginCreateacc.path), - size: 24, + size: 24.s, ), onPressed: () { // showModalScreen( @@ -60,14 +61,14 @@ class NostrAuth extends HookConsumerWidget { mainAxisSize: MainAxisSize.max, ), ), - const SizedBox( - height: 26, + SizedBox( + height: 26.s, ), Center( child: Button( leadingIcon: ImageIcon( AssetImage(Assets.images.profileSave.path), - size: 24, + size: 24.s, ), onPressed: () { showModalScreen( @@ -79,8 +80,8 @@ class NostrAuth extends HookConsumerWidget { mainAxisSize: MainAxisSize.max, ), ), - const SizedBox( - height: 91, + SizedBox( + height: 91.s, ), ], ), diff --git a/lib/app/features/auth/views/pages/nostr_login/nostr_login.dart b/lib/app/features/auth/views/pages/nostr_login/nostr_login.dart index 3c9568fde..36de6ff38 100644 --- a/lib/app/features/auth/views/pages/nostr_login/nostr_login.dart +++ b/lib/app/features/auth/views/pages/nostr_login/nostr_login.dart @@ -5,6 +5,7 @@ import 'package:ice/app/components/button/button.dart'; import 'package:ice/app/components/inputs/text_fields.dart'; import 'package:ice/app/components/screen_side_offset/screen_side_offset.dart'; import 'package:ice/app/extensions/build_context.dart'; +import 'package:ice/app/extensions/num.dart'; import 'package:ice/app/features/auth/views/pages/nostr_login/controllers/name_controller.dart'; import 'package:ice/generated/assets.gen.dart'; @@ -23,16 +24,16 @@ class NostrLogin extends HookConsumerWidget { title: context.i18n.nostr_login_title, description: context.i18n.nostr_login_description, ), - const SizedBox( - height: 15, + SizedBox( + height: 15.s, ), Image.asset( Assets.images.ostrichlogo.path, - width: 256, - height: 160, + width: 256.s, + height: 160.s, ), - const SizedBox( - height: 80, + SizedBox( + height: 80.s, ), Column( children: [ @@ -46,14 +47,14 @@ class NostrLogin extends HookConsumerWidget { privateKeyController.onVerify(), showLeadingSeparator: true, ), - const SizedBox( - height: 26, + SizedBox( + height: 26.s, ), Center( child: Button( leadingIcon: ImageIcon( AssetImage(Assets.images.profilePaste.path), - size: 24, + size: 24.s, ), onPressed: () {}, type: ButtonType.disabled, diff --git a/lib/app/features/auth/views/pages/select_country/select_country.dart b/lib/app/features/auth/views/pages/select_country/select_country.dart index 2afe6a2fb..9a5dfd669 100644 --- a/lib/app/features/auth/views/pages/select_country/select_country.dart +++ b/lib/app/features/auth/views/pages/select_country/select_country.dart @@ -4,6 +4,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:ice/app/components/navigation_header/navigation_header.dart'; import 'package:ice/app/components/search/search.dart'; import 'package:ice/app/extensions/build_context.dart'; +import 'package:ice/app/extensions/num.dart'; import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/app/features/auth/views/pages/select_country/countries.dart'; @@ -39,7 +40,7 @@ class SelectCountries extends HookConsumerWidget { title: context.i18n.select_countries_nav_title, ), Padding( - padding: const EdgeInsets.only(top: navigationHeaderHeight), + padding: EdgeInsets.only(top: navigationHeaderHeight), child: Column( children: [ Search( @@ -56,15 +57,15 @@ class SelectCountries extends HookConsumerWidget { Navigator.pop(context); }, child: Container( - height: 40, - padding: const EdgeInsets.symmetric(horizontal: 16), + height: 40.s, + padding: EdgeInsets.symmetric(horizontal: 16.s), child: Row( children: [ Text( country.flag, style: context.theme.appTextThemes.subtitle2, ), - const SizedBox(width: 16), + SizedBox(width: 16.s), Expanded( child: Text( country.name, diff --git a/lib/app/features/auth/views/pages/select_languages/select_languages.dart b/lib/app/features/auth/views/pages/select_languages/select_languages.dart index 982243d4b..1f38a1c1e 100644 --- a/lib/app/features/auth/views/pages/select_languages/select_languages.dart +++ b/lib/app/features/auth/views/pages/select_languages/select_languages.dart @@ -6,6 +6,7 @@ import 'package:ice/app/components/screen_side_offset/screen_side_offset.dart'; import 'package:ice/app/components/search/search.dart'; import 'package:ice/app/components/title_description_header/title_description_header.dart'; import 'package:ice/app/extensions/build_context.dart'; +import 'package:ice/app/extensions/num.dart'; import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/app/features/auth/views/pages/select_languages/languages.dart'; import 'package:ice/generated/assets.gen.dart'; @@ -38,7 +39,7 @@ class SelectLanguages extends HookConsumerWidget { const NavigationHeader(title: ''), ScreenSideOffset.small( child: Padding( - padding: const EdgeInsets.only( + padding: EdgeInsets.only( top: navigationHeaderHeight, ), child: Column( @@ -48,7 +49,7 @@ class SelectLanguages extends HookConsumerWidget { description: context.i18n.select_languages_description, ), Padding( - padding: const EdgeInsets.only(bottom: 12), + padding: EdgeInsets.only(bottom: 12.s), child: Search( onTextChanged: (String value) => searchText.value = value, @@ -78,17 +79,17 @@ class SelectLanguages extends HookConsumerWidget { newSelectedLanguages; }, child: Container( - height: 44, + height: 44.s, decoration: BoxDecoration( color: context.theme.appColors.tertararyBackground, - borderRadius: BorderRadius.circular(12.0), + borderRadius: BorderRadius.circular(12.s), ), - margin: const EdgeInsets.only( - bottom: 12, + margin: EdgeInsets.only( + bottom: 12.s, ), - padding: const EdgeInsets.symmetric( - horizontal: 16, + padding: EdgeInsets.symmetric( + horizontal: 16.s, ), child: Row( children: [ @@ -101,8 +102,8 @@ class SelectLanguages extends HookConsumerWidget { fontSize: 24, ), ), - const SizedBox( - width: 16, + SizedBox( + width: 16.s, ), Expanded( child: Text( @@ -116,7 +117,7 @@ class SelectLanguages extends HookConsumerWidget { ), ), SizedBox( - width: 30, + width: 30.s, child: isSelected ? Image.asset( Assets.images.checkboxon.path, diff --git a/lib/app/features/dapps/views/pages/components/apps_collection.dart b/lib/app/features/dapps/views/pages/components/apps_collection.dart index 8a9c96973..ec4149e3b 100644 --- a/lib/app/features/dapps/views/pages/components/apps_collection.dart +++ b/lib/app/features/dapps/views/pages/components/apps_collection.dart @@ -2,12 +2,13 @@ import 'package:flutter/material.dart'; import 'package:ice/app/components/favourite_icon/favorite_icon.dart'; import 'package:ice/app/components/screen_side_offset/screen_side_offset.dart'; import 'package:ice/app/extensions/build_context.dart'; +import 'package:ice/app/extensions/num.dart'; import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/app/features/dapps/views/pages/mocks/mocked_apps.dart'; import 'package:ice/app/utils/string.dart'; const double columnWidthPercentage = 0.68; -const double sectionHeight = 200.0; +double sectionHeight = 200.s; const int itemsPerColumn = 3; class AppsCollection extends StatelessWidget { @@ -64,8 +65,8 @@ class DAppGridItem extends StatelessWidget { Widget build(BuildContext context) { return ScreenSideOffset.small( child: Container( - padding: const EdgeInsets.symmetric( - vertical: 6, + padding: EdgeInsets.symmetric( + vertical: 6.s, ), width: double.infinity, child: Row( @@ -74,19 +75,19 @@ class DAppGridItem extends StatelessWidget { Row( children: [ Container( - width: 48, - height: 48, + width: 48.s, + height: 48.s, decoration: BoxDecoration( color: Colors.white, borderRadius: BorderRadius.circular(8), ), child: Image.asset( item.iconImage, - width: 48, + width: 48.s, fit: BoxFit.contain, ), ), - const SizedBox(width: 8), + SizedBox(width: 8.s), Column( crossAxisAlignment: CrossAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.center, diff --git a/lib/app/features/dapps/views/pages/components/categories_collection.dart b/lib/app/features/dapps/views/pages/components/categories_collection.dart index 8da726d29..e04ac1877 100644 --- a/lib/app/features/dapps/views/pages/components/categories_collection.dart +++ b/lib/app/features/dapps/views/pages/components/categories_collection.dart @@ -1,9 +1,10 @@ import 'package:flutter/material.dart'; import 'package:ice/app/extensions/build_context.dart'; +import 'package:ice/app/extensions/num.dart'; import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/generated/assets.gen.dart'; -const double textContainerHeight = 24.0; +double textContainerHeight = 24.s; class CategoryItem { CategoryItem({ @@ -52,8 +53,8 @@ class CategoriesCollection extends StatelessWidget { scrollDirection: Axis.horizontal, itemCount: featured.length, itemBuilder: (BuildContext context, int index) { - final double leftOffset = index == 0 ? 16.0 : 8.0; - final double rightOffset = index == featured.length - 1 ? 16.0 : 8.0; + final double leftOffset = index == 0 ? 16.s : 8.s; + final double rightOffset = index == featured.length - 1 ? 16.s : 8.s; return Column( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ @@ -62,7 +63,7 @@ class CategoriesCollection extends StatelessWidget { height: itemWidth, margin: EdgeInsets.only(right: rightOffset, left: leftOffset), decoration: BoxDecoration( - borderRadius: BorderRadius.circular(9.6), + borderRadius: BorderRadius.circular(9.6.s), color: context.theme.appColors.tertararyBackground, border: Border.all( color: context.theme.appColors.onTerararyFill, @@ -73,7 +74,7 @@ class CategoriesCollection extends StatelessWidget { children: [ Image.asset( featured[index].iconImage, - width: 50, + width: 50.s, ), ], ), diff --git a/lib/app/features/dapps/views/pages/components/favourites.dart b/lib/app/features/dapps/views/pages/components/favourites.dart index c3b8198fb..c526dc83d 100644 --- a/lib/app/features/dapps/views/pages/components/favourites.dart +++ b/lib/app/features/dapps/views/pages/components/favourites.dart @@ -2,10 +2,11 @@ import 'package:flutter/material.dart'; import 'package:ice/app/components/favourite_icon/favorite_icon.dart'; import 'package:ice/app/components/screen_side_offset/screen_side_offset.dart'; import 'package:ice/app/extensions/build_context.dart'; +import 'package:ice/app/extensions/num.dart'; import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/generated/assets.gen.dart'; -const double containerHeight = 60.0; +double containerHeight = 60.s; class Favourites extends StatelessWidget { const Favourites({ @@ -19,8 +20,8 @@ class Favourites extends StatelessWidget { Widget build(BuildContext context) { return ScreenSideOffset.small( child: Padding( - padding: const EdgeInsets.symmetric( - vertical: 24, + padding: EdgeInsets.symmetric( + vertical: 24.s, ), child: GestureDetector( onTap: onPress, @@ -31,7 +32,7 @@ class Favourites extends StatelessWidget { horizontal: ScreenSideOffset.defaultSmallMargin, ), decoration: BoxDecoration( - borderRadius: BorderRadius.circular(16), + borderRadius: BorderRadius.circular(16.s), color: context.theme.appColors.tertararyBackground, border: Border.all( color: context.theme.appColors.onTerararyFill, @@ -43,9 +44,9 @@ class Favourites extends StatelessWidget { Row( children: [ const FavouriteIcon(), - const SizedBox(width: 8), + SizedBox(width: 8.s), SizedBox( - height: 36, + height: 36.s, child: Column( crossAxisAlignment: CrossAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.center, @@ -70,7 +71,7 @@ class Favourites extends StatelessWidget { ), Image.asset( Assets.images.forwardArrow.path, - width: 12, + width: 12.s, ), ], ), diff --git a/lib/app/features/dapps/views/pages/components/featured_collection.dart b/lib/app/features/dapps/views/pages/components/featured_collection.dart index f82f51c46..3f10db3c1 100644 --- a/lib/app/features/dapps/views/pages/components/featured_collection.dart +++ b/lib/app/features/dapps/views/pages/components/featured_collection.dart @@ -1,6 +1,7 @@ import 'package:flutter/material.dart'; import 'package:ice/app/components/shadow_text/shadow_text.dart'; import 'package:ice/app/extensions/build_context.dart'; +import 'package:ice/app/extensions/num.dart'; import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/app/features/dapps/views/pages/mocks/mocked_apps.dart'; @@ -21,14 +22,14 @@ class FeaturedCollection extends StatelessWidget { scrollDirection: Axis.horizontal, itemCount: items.length, itemBuilder: (BuildContext context, int index) { - final double leftOffset = index == 0 ? 16.0 : 8.0; - final double rightOffset = index == items.length - 1 ? 16.0 : 8.0; + final double leftOffset = index == 0 ? 16.s : 8.s; + final double rightOffset = index == items.length - 1 ? 16.s : 8.s; final String assetBg = items[index].backgroundImage ?? ''; return Container( width: itemWidth, margin: EdgeInsets.only(right: rightOffset, left: leftOffset), decoration: BoxDecoration( - borderRadius: BorderRadius.circular(12), + borderRadius: BorderRadius.circular(12.s), image: DecorationImage( image: AssetImage( assetBg, @@ -39,8 +40,8 @@ class FeaturedCollection extends StatelessWidget { child: Stack( children: [ Positioned( - bottom: 14, - left: 14, + bottom: 14.s, + left: 14.s, child: Row( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -48,16 +49,16 @@ class FeaturedCollection extends StatelessWidget { padding: const EdgeInsets.all(4), decoration: BoxDecoration( color: Colors.white, - borderRadius: BorderRadius.circular(8), + borderRadius: BorderRadius.circular(8.s), ), child: Image.asset( items[index].iconImage, - width: 30, + width: 30.s, ), ), - const SizedBox(width: 8), + SizedBox(width: 8.s), SizedBox( - height: 36, + height: 36.s, child: Column( crossAxisAlignment: CrossAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.center, diff --git a/lib/app/features/dapps/views/pages/dapps_list/dapps_list.dart b/lib/app/features/dapps/views/pages/dapps_list/dapps_list.dart index a72163f07..f8da3b15c 100644 --- a/lib/app/features/dapps/views/pages/dapps_list/dapps_list.dart +++ b/lib/app/features/dapps/views/pages/dapps_list/dapps_list.dart @@ -36,7 +36,7 @@ class DAppsList extends HookConsumerWidget { title: context.i18n.dapps_list_defi, ), Padding( - padding: const EdgeInsets.only(top: navigationHeaderHeight), + padding: EdgeInsets.only(top: navigationHeaderHeight), child: Column( mainAxisSize: MainAxisSize.min, children: [ diff --git a/lib/app/features/feed/components/post_image/post_image.dart b/lib/app/features/feed/components/post_image/post_image.dart index 081ee3f6d..f156beeb6 100644 --- a/lib/app/features/feed/components/post_image/post_image.dart +++ b/lib/app/features/feed/components/post_image/post_image.dart @@ -1,13 +1,13 @@ import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter/material.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:ice/app/components/screen_side_offset/screen_side_offset.dart'; import 'package:ice/app/extensions/build_context.dart'; +import 'package:ice/app/extensions/num.dart'; import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/app/features/feed/components/read_time_tile/read_time_tile.dart'; import 'package:ice/app/utils/image.dart'; -double borderRadius = 12.0.w; +double borderRadius = 12.s; class PostImage extends StatelessWidget { const PostImage({ @@ -59,8 +59,7 @@ class PostImage extends StatelessWidget { ), if (minutesToRead != null) ...[ Container( - padding: - EdgeInsets.symmetric(horizontal: 8.0.w, vertical: 4.0.w), + padding: EdgeInsets.symmetric(horizontal: 8.s, vertical: 4.s), decoration: BoxDecoration( color: context.theme.appColors.tertararyBackground, border: Border.all( diff --git a/lib/app/features/feed/components/read_time_tile/read_time_tile.dart b/lib/app/features/feed/components/read_time_tile/read_time_tile.dart index 5d4682149..399f67342 100644 --- a/lib/app/features/feed/components/read_time_tile/read_time_tile.dart +++ b/lib/app/features/feed/components/read_time_tile/read_time_tile.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:ice/app/extensions/build_context.dart'; +import 'package:ice/app/extensions/num.dart'; import 'package:ice/app/extensions/theme_data.dart'; -double iconSize = 16.0.w; +double iconSize = 16.s; class ReadTimeTile extends StatelessWidget { const ReadTimeTile({super.key, required this.minutesToRead}); @@ -20,7 +20,7 @@ class ReadTimeTile extends StatelessWidget { size: iconSize, color: context.theme.appColors.sharkText, ), - SizedBox(width: 3.0.w), + SizedBox(width: 3.s), Text( context.i18n.read_time_in_mins(minutesToRead), style: context.theme.appTextThemes.caption diff --git a/lib/app/features/feed/views/pages/feed_page.dart b/lib/app/features/feed/views/pages/feed_page.dart index a85c91de9..856649023 100644 --- a/lib/app/features/feed/views/pages/feed_page.dart +++ b/lib/app/features/feed/views/pages/feed_page.dart @@ -4,6 +4,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:ice/app/components/button/button.dart'; import 'package:ice/app/components/drop_down_menu/drop_down_menu.dart'; import 'package:ice/app/extensions/build_context.dart'; +import 'package:ice/app/extensions/num.dart'; import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/generated/assets.gen.dart'; @@ -41,8 +42,8 @@ class FeedPage extends HookConsumerWidget { ), leadingIcon: Image.asset( Assets.images.foo.path, - width: 30, - height: 30, + width: 30.s, + height: 30.s, fit: BoxFit.cover, ), label: Text( diff --git a/lib/app/features/wallet/views/pages/inner_wallet_page.dart b/lib/app/features/wallet/views/pages/inner_wallet_page.dart index 4110463ae..b42afeb06 100644 --- a/lib/app/features/wallet/views/pages/inner_wallet_page.dart +++ b/lib/app/features/wallet/views/pages/inner_wallet_page.dart @@ -1,6 +1,7 @@ import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:ice/app/extensions/build_context.dart'; +import 'package:ice/app/extensions/num.dart'; import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/app/features/auth/data/models/auth_state.dart'; import 'package:ice/app/features/auth/providers/auth_provider.dart'; @@ -23,10 +24,10 @@ class InnerWalletPage extends HookConsumerWidget { ElevatedButton.icon( label: const Text('Sign Out'), icon: authState is AuthenticationLoading - ? const SizedBox( - height: 10, - width: 10, - child: CircularProgressIndicator(color: Colors.white), + ? SizedBox( + height: 10.s, + width: 10.s, + child: const CircularProgressIndicator(color: Colors.white), ) : const Icon(Icons.logout), onPressed: ref.read(authProvider.notifier).signOut, diff --git a/lib/app/features/wallet/views/pages/wallet_page.dart b/lib/app/features/wallet/views/pages/wallet_page.dart index 49ccaf47c..251ac5de0 100644 --- a/lib/app/features/wallet/views/pages/wallet_page.dart +++ b/lib/app/features/wallet/views/pages/wallet_page.dart @@ -3,6 +3,7 @@ import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:ice/app/components/button/button.dart'; import 'package:ice/app/extensions/build_context.dart'; +import 'package:ice/app/extensions/num.dart'; import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/app/features/auth/data/models/auth_state.dart'; import 'package:ice/app/features/auth/providers/auth_provider.dart'; @@ -34,8 +35,8 @@ class WalletPage extends HookConsumerWidget { ), leadingIcon: Image.asset( Assets.images.foo.path, - width: 30, - height: 30, + width: 30.s, + height: 30.s, fit: BoxFit.cover, ), label: Text( @@ -46,10 +47,12 @@ class WalletPage extends HookConsumerWidget { ElevatedButton.icon( label: const Text('Sign Out'), icon: authState is AuthenticationLoading - ? const SizedBox( - height: 10, - width: 10, - child: CircularProgressIndicator(color: Colors.white), + ? SizedBox( + height: 10.s, + width: 10.s, + child: const CircularProgressIndicator( + color: Colors.white, + ), ) : const Icon(Icons.logout), onPressed: ref.read(authProvider.notifier).signOut, From 9b8abed0096343760c59a4555ac3a66e92d6a227 Mon Sep 17 00:00:00 2001 From: ice-orion <102020833+ice-orion@users.noreply.github.com> Date: Mon, 12 Feb 2024 20:00:31 +0400 Subject: [PATCH 10/13] fix: pub using correct dart version --- pubspec.lock | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 58d4a8c4d..f88e281cb 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -229,10 +229,10 @@ packages: dependency: transitive description: name: cross_file - sha256: "2f9d2cbccb76127ba28528cb3ae2c2326a122446a83de5a056aaa3880d3882c5" + sha256: fedaadfa3a6996f75211d835aaeb8fede285dae94262485698afd832371b9a5e url: "https://pub.flutter-io.cn" source: hosted - version: "0.3.3+7" + version: "0.3.3+8" crypto: dependency: transitive description: @@ -349,10 +349,10 @@ packages: dependency: transitive description: name: file_selector_platform_interface - sha256: "0aa47a725c346825a2bd396343ce63ac00bda6eff2fbc43eabe99737dede8262" + sha256: a3994c26f10378a039faa11de174d7b78eb8f79e4dd0af2a451410c1a5c3f66b url: "https://pub.flutter-io.cn" source: hosted - version: "2.6.1" + version: "2.6.2" file_selector_windows: dependency: transitive description: @@ -585,18 +585,18 @@ packages: dependency: transitive description: name: hotreloader - sha256: "94ee21a60ea2836500799f3af035dc3212b1562027f1e0031c14e087f0231449" + sha256: ed56fdc1f3a8ac924e717257621d09e9ec20e308ab6352a73a50a1d7a4d9158e url: "https://pub.flutter-io.cn" source: hosted - version: "4.1.0" + version: "4.2.0" http: dependency: transitive description: name: http - sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525" + sha256: a2bbf9d017fcced29139daa8ed2bba4ece450ab222871df93ca9eec6f80c34ba url: "https://pub.flutter-io.cn" source: hosted - version: "1.1.0" + version: "1.2.0" http_multi_server: dependency: transitive description: @@ -753,10 +753,10 @@ packages: dependency: "direct dev" description: name: lint - sha256: "77b3777e8e9adca8e942da1e835882ae3248dfa00488a2ebbdbc1f1a4aa3f4a7" + sha256: d758a5211fce7fd3f5e316f804daefecdc34c7e53559716125e6da7388ae8565 url: "https://pub.flutter-io.cn" source: hosted - version: "2.2.0" + version: "2.3.0" lints: dependency: transitive description: @@ -809,10 +809,10 @@ packages: dependency: transitive description: name: mime - sha256: e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e + sha256: "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2" url: "https://pub.flutter-io.cn" source: hosted - version: "1.0.4" + version: "1.0.5" nested: dependency: transitive description: @@ -897,10 +897,10 @@ packages: dependency: transitive description: name: petitparser - sha256: cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750 + sha256: c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27 url: "https://pub.flutter-io.cn" source: hosted - version: "5.4.0" + version: "6.0.2" pin_code_fields: dependency: "direct main" description: @@ -1174,10 +1174,10 @@ packages: dependency: transitive description: name: uuid - sha256: "22c94e5ad1e75f9934b766b53c742572ee2677c56bc871d850a57dad0f82127f" + sha256: cd210a09f7c18cbe5a02511718e0334de6559871052c90a90c0cca46a4aa81c8 url: "https://pub.flutter-io.cn" source: hosted - version: "4.2.2" + version: "4.3.3" vector_math: dependency: transitive description: @@ -1190,10 +1190,10 @@ packages: dependency: transitive description: name: vm_service - sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957 + sha256: a2662fb1f114f4296cf3f5a50786a2d888268d7776cf681aa17d660ffa23b246 url: "https://pub.flutter-io.cn" source: hosted - version: "13.0.0" + version: "14.0.0" watcher: dependency: transitive description: @@ -1246,10 +1246,10 @@ packages: dependency: transitive description: name: win32 - sha256: b0f37db61ba2f2e9b7a78a1caece0052564d1bc70668156cf3a29d676fe4e574 + sha256: "464f5674532865248444b4c3daca12bd9bf2d7c47f759ce2617986e7229494a8" url: "https://pub.flutter-io.cn" source: hosted - version: "5.1.1" + version: "5.2.0" xdg_directories: dependency: transitive description: @@ -1262,10 +1262,10 @@ packages: dependency: transitive description: name: xml - sha256: "5bc72e1e45e941d825fd7468b9b4cc3b9327942649aeb6fc5cdbf135f0a86e84" + sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226 url: "https://pub.flutter-io.cn" source: hosted - version: "6.3.0" + version: "6.5.0" yaml: dependency: transitive description: @@ -1275,5 +1275,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.2.0-194.0.dev <4.0.0" + dart: ">=3.2.0 <4.0.0" flutter: ">=3.13.0" From d41c2d316136c1effb76088daf9ab293f19b0313 Mon Sep 17 00:00:00 2001 From: ice-orion <102020833+ice-orion@users.noreply.github.com> Date: Mon, 12 Feb 2024 20:08:46 +0400 Subject: [PATCH 11/13] refactor: w ext num to double --- .../components/auth_header/auth_header.dart | 6 +-- lib/app/components/button/button.dart | 11 ++--- .../button/variants/button_icon.dart | 2 +- .../favourite_icon/favorite_icon.dart | 6 +-- lib/app/components/inputs/email_input.dart | 18 ++++---- lib/app/components/inputs/text_fields.dart | 24 +++++------ lib/app/components/list_item/list_item.dart | 11 ++--- .../modal_wrapper/modal_wrapper.dart | 12 +++--- .../nav_header_offset/nav_header_offset.dart | 2 +- .../navigation_header/navigation_header.dart | 6 +-- .../screen_side_offset.dart | 4 +- lib/app/components/search/search.dart | 12 +++--- .../section_header/section_header.dart | 10 ++--- lib/app/components/secured_by/secured_by.dart | 4 +- lib/app/components/socials/socials.dart | 2 +- .../terms_privacy/terms_privacy.dart | 2 +- .../text_field_wrapper.dart | 28 ++++++------- .../title_description_header.dart | 6 +-- .../wallet_header/wallet_header.dart | 42 +++++++++---------- lib/app/extensions/num.dart | 2 +- .../auth/views/pages/auth_page/auth_page.dart | 16 +++---- .../components/country_code_input.dart | 6 +-- .../views/pages/check_email/check_email.dart | 24 ++++++----- .../discover_creators/discover_creators.dart | 37 ++++++++-------- .../discover_creators/mocked_creators.dart | 4 +- .../views/pages/enter_code/enter_code.dart | 22 +++++----- .../pages/fill_profile/fill_profile.dart | 30 ++++++------- .../views/pages/intro_page/intro_page.dart | 8 ++-- .../views/pages/nostr_auth/nostr_auth.dart | 12 +++--- .../views/pages/nostr_login/nostr_login.dart | 12 +++--- .../pages/select_country/select_country.dart | 6 +-- .../select_languages/select_languages.dart | 14 +++---- .../pages/components/apps_collection.dart | 12 +++--- .../components/categories_collection.dart | 9 ++-- .../views/pages/components/favourites.dart | 12 +++--- .../pages/components/featured_collection.dart | 18 ++++---- .../dapps/views/pages/mocks/mocked_apps.dart | 2 +- .../components/post_image/post_image.dart | 5 ++- .../read_time_tile/read_time_tile.dart | 4 +- .../features/feed/views/pages/feed_page.dart | 4 +- .../wallet/views/pages/inner_wallet_page.dart | 4 +- .../wallet/views/pages/wallet_page.dart | 8 ++-- 42 files changed, 243 insertions(+), 236 deletions(-) diff --git a/lib/app/components/auth_header/auth_header.dart b/lib/app/components/auth_header/auth_header.dart index ce2d014c7..6927acda3 100644 --- a/lib/app/components/auth_header/auth_header.dart +++ b/lib/app/components/auth_header/auth_header.dart @@ -11,8 +11,8 @@ class AuthHeaderWidget extends StatelessWidget { double? bottomPadding, String? description, String? imagePath, - }) : topPadding = topPadding ?? 65.s, - bottomPadding = bottomPadding ?? 30.s, + }) : topPadding = topPadding ?? 65.0.s, + bottomPadding = bottomPadding ?? 30.0.s, description = description ?? '', // Ensure description is not null imagePath = imagePath ?? Assets.images.iceRound.path; @@ -33,7 +33,7 @@ class AuthHeaderWidget extends StatelessWidget { ), ), Padding( - padding: EdgeInsets.only(top: 19.s, bottom: 3.s), + padding: EdgeInsets.only(top: 19.0.s, bottom: 3.0.s), child: Text( title, style: context.theme.appTextThemes.headline1, diff --git a/lib/app/components/button/button.dart b/lib/app/components/button/button.dart index 0366b5114..916b7e5ea 100644 --- a/lib/app/components/button/button.dart +++ b/lib/app/components/button/button.dart @@ -56,10 +56,10 @@ class Button extends StatelessWidget { fixedSize: fixedSize, tapTargetSize: MaterialTapTargetSize.shrinkWrap, shape: RoundedRectangleBorder( - borderRadius: BorderRadius.all(Radius.circular(12.s)), + borderRadius: BorderRadius.all(Radius.circular(12.0.s)), ), - minimumSize: Size(56.s, 56.s), - padding: EdgeInsets.symmetric(horizontal: 16.s), + minimumSize: Size(56.0.s, 56.0.s), + padding: EdgeInsets.symmetric(horizontal: 16.0.s), backgroundColor: _getBackgroundColor(context, type), side: BorderSide( color: _getBorderColor(context, type), @@ -79,8 +79,9 @@ class Button extends StatelessWidget { if (label != null) Padding( padding: EdgeInsets.only( - left: leadingIcon == null ? 0 : 8.s, // 8 move to constants - right: trailingIcon == null ? 0 : 8.s, + left: + leadingIcon == null ? 0 : 8.0.s, // 8 move to constants + right: trailingIcon == null ? 0 : 8.0.s, ), child: label, ), diff --git a/lib/app/components/button/variants/button_icon.dart b/lib/app/components/button/variants/button_icon.dart index 26dc568c3..5370d2e51 100644 --- a/lib/app/components/button/variants/button_icon.dart +++ b/lib/app/components/button/variants/button_icon.dart @@ -12,7 +12,7 @@ class _ButtonWithIcon extends Button { leadingIcon: icon, style: style.merge( OutlinedButton.styleFrom( - fixedSize: Size.square(size ?? 56.s), + fixedSize: Size.square(size ?? 56.0.s), padding: EdgeInsets.zero, ), ), diff --git a/lib/app/components/favourite_icon/favorite_icon.dart b/lib/app/components/favourite_icon/favorite_icon.dart index aa90382c3..686bd2711 100644 --- a/lib/app/components/favourite_icon/favorite_icon.dart +++ b/lib/app/components/favourite_icon/favorite_icon.dart @@ -4,7 +4,7 @@ import 'package:ice/app/extensions/num.dart'; import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/generated/assets.gen.dart'; -final double iconSideDimension = 36.s; +final double iconSideDimension = 36.0.s; class FavouriteIcon extends StatelessWidget { const FavouriteIcon({ @@ -28,7 +28,7 @@ class FavouriteIcon extends StatelessWidget { width: iconSideDimension, height: iconSideDimension, decoration: BoxDecoration( - borderRadius: BorderRadius.circular(12.s), + borderRadius: BorderRadius.circular(12.0.s), color: iconBackgroundColor, border: Border.all( color: context.theme.appColors.onTerararyFill, @@ -39,7 +39,7 @@ class FavouriteIcon extends StatelessWidget { children: [ Image.asset( iconPath, - width: 24.s, + width: 24.0.s, ), ], ), diff --git a/lib/app/components/inputs/email_input.dart b/lib/app/components/inputs/email_input.dart index 484a8e764..b6fffc8af 100644 --- a/lib/app/components/inputs/email_input.dart +++ b/lib/app/components/inputs/email_input.dart @@ -44,19 +44,19 @@ class EmailInput extends HookWidget { child: Row( mainAxisSize: MainAxisSize.min, children: [ - SizedBox(width: 20.s), + SizedBox(width: 20.0.s), Image.asset( Assets.images.fieldEmail.path, color: context.theme.appColors.primaryText, ), - SizedBox(width: 6.s), + SizedBox(width: 6.0.s), VerticalDivider( color: context.theme.appColors.strokeElements, thickness: 1, - indent: 14.s, - endIndent: 14.s, + indent: 14.0.s, + endIndent: 14.0.s, ), - SizedBox(width: 8.s), + SizedBox(width: 8.0.s), ], ), ), @@ -67,22 +67,22 @@ class EmailInput extends HookWidget { // or extend the InputBorder class to create your own // the default is UnderlineInputBorder border: OutlineInputBorder( - borderRadius: BorderRadius.circular(16.s), + borderRadius: BorderRadius.circular(16.0.s), ), // you can also define different border styles for different states // e.g. when the field is enabled / focused / has error enabledBorder: OutlineInputBorder( - borderRadius: BorderRadius.circular(16.s), + borderRadius: BorderRadius.circular(16.0.s), borderSide: BorderSide(color: context.theme.appColors.strokeElements), ), focusedBorder: OutlineInputBorder( - borderRadius: BorderRadius.circular(16.s), + borderRadius: BorderRadius.circular(16.0.s), borderSide: BorderSide(color: context.theme.appColors.primaryAccent), ), errorBorder: OutlineInputBorder( - borderRadius: BorderRadius.circular(16.s), + borderRadius: BorderRadius.circular(16.0.s), borderSide: const BorderSide(color: Colors.red), ), ), diff --git a/lib/app/components/inputs/text_fields.dart b/lib/app/components/inputs/text_fields.dart index cb989ccae..21f9b9481 100644 --- a/lib/app/components/inputs/text_fields.dart +++ b/lib/app/components/inputs/text_fields.dart @@ -10,10 +10,10 @@ import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/generated/assets.gen.dart'; const Color _kBackgroundColor = Color(0xFFFFFFFF); -double defaultTextFieldMargin = 44.s; -double textInputLeadingPadding = 16.s; -double textInputTrailingPadding = 12.s; -double defaultTextInputHeight = 58.s; +double defaultTextFieldMargin = 44.0.s; +double textInputLeadingPadding = 16.0.s; +double textInputTrailingPadding = 12.0.s; +double defaultTextInputHeight = 58.0.s; class InputField extends StatefulWidget { InputField({ @@ -201,8 +201,8 @@ class InputFormField extends FormField { leadingIcon, if (showLeadingSeparator != null && showLeadingSeparator) Container( - width: 1.s, - height: 26.s, + width: 1.0.s, + height: 26.0.s, color: context.theme.appColors.strokeElements, margin: EdgeInsets.only( left: textInputLeadingPadding, @@ -215,7 +215,7 @@ class InputFormField extends FormField { child: Padding( padding: EdgeInsets.only(top: 19.5.s), child: SizedBox( - height: 34.s, + height: 34.0.s, child: TextFormField( scrollPadding: EdgeInsets.only( bottom: controller.scrollPadding.zeroOrValue + @@ -271,8 +271,8 @@ class InputFormField extends FormField { children: [ if (showTrailingSeparator != null && showTrailingSeparator) Container( - width: 1.s, - height: 26.s, + width: 1.0.s, + height: 26.0.s, color: context.theme.appColors.strokeElements, margin: EdgeInsets.only( right: textInputTrailingPadding, @@ -296,7 +296,7 @@ class InputFormField extends FormField { children: [ field, Padding( - padding: EdgeInsets.only(left: defaultTextFieldMargin, top: 4.s), + padding: EdgeInsets.only(left: defaultTextFieldMargin, top: 4.0.s), child: Text( error, overflow: TextOverflow.ellipsis, @@ -358,7 +358,7 @@ class TextFieldToEdit extends StatelessWidget { return GestureDetector( onTap: onEdit, child: RoundedContainer( - height: 56.s, + height: 56.0.s, color: _kBackgroundColor, child: Padding( padding: EdgeInsets.all(defaultTextFieldMargin), @@ -373,7 +373,7 @@ class TextFieldToEdit extends StatelessWidget { ), ), ), - SizedBox(width: 10.s), + SizedBox(width: 10.0.s), Image.asset( Assets.images.iceRound.path, ), diff --git a/lib/app/components/list_item/list_item.dart b/lib/app/components/list_item/list_item.dart index c44cdd188..0483b92e0 100644 --- a/lib/app/components/list_item/list_item.dart +++ b/lib/app/components/list_item/list_item.dart @@ -19,11 +19,12 @@ class ListItem extends StatelessWidget { EdgeInsets? leadingPadding, EdgeInsets? trailingPadding, BoxConstraints? constraints, - }) : borderRadius = borderRadius ?? BorderRadius.all(Radius.circular(16.s)), - contentPadding = contentPadding ?? EdgeInsets.all(12.s), - leadingPadding = leadingPadding ?? EdgeInsets.only(right: 10.s), - trailingPadding = trailingPadding ?? EdgeInsets.only(left: 10.s), - constraints = constraints ?? BoxConstraints(minHeight: 60.s); + }) : borderRadius = + borderRadius ?? BorderRadius.all(Radius.circular(16.0.s)), + contentPadding = contentPadding ?? EdgeInsets.all(12.0.s), + leadingPadding = leadingPadding ?? EdgeInsets.only(right: 10.0.s), + trailingPadding = trailingPadding ?? EdgeInsets.only(left: 10.0.s), + constraints = constraints ?? BoxConstraints(minHeight: 60.0.s); factory ListItem.checkbox({ Key? key, diff --git a/lib/app/components/modal_wrapper/modal_wrapper.dart b/lib/app/components/modal_wrapper/modal_wrapper.dart index 1c956a4d2..7a24db5ee 100644 --- a/lib/app/components/modal_wrapper/modal_wrapper.dart +++ b/lib/app/components/modal_wrapper/modal_wrapper.dart @@ -12,21 +12,21 @@ class ModalWrapper extends StatelessWidget { alignment: Alignment.bottomCenter, child: KeyboardHider( child: Container( - height: MediaQuery.of(context).size.height - 74.s, + height: MediaQuery.of(context).size.height - 74.0.s, decoration: BoxDecoration( color: Colors.black, - borderRadius: BorderRadius.vertical(top: Radius.circular(30.s)), + borderRadius: BorderRadius.vertical(top: Radius.circular(30.0.s)), boxShadow: [ BoxShadow( color: Colors.grey.withOpacity(0.5), - spreadRadius: 5.s, - blurRadius: 7.s, - offset: Offset(0, 3.s), + spreadRadius: 5.0.s, + blurRadius: 7.0.s, + offset: Offset(0, 3.0.s), ), ], ), child: ClipRRect( - borderRadius: BorderRadius.vertical(top: Radius.circular(30.s)), + borderRadius: BorderRadius.vertical(top: Radius.circular(30.0.s)), child: child, ), ), diff --git a/lib/app/components/nav_header_offset/nav_header_offset.dart b/lib/app/components/nav_header_offset/nav_header_offset.dart index 419416d6f..7d4640075 100644 --- a/lib/app/components/nav_header_offset/nav_header_offset.dart +++ b/lib/app/components/nav_header_offset/nav_header_offset.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:ice/app/extensions/num.dart'; -double defaultNavHeaderTopPadding = 50.s; +double defaultNavHeaderTopPadding = 50.0.s; EdgeInsets defaultInsets = EdgeInsets.only(top: defaultNavHeaderTopPadding); class NavHeaderOffset extends StatelessWidget { diff --git a/lib/app/components/navigation_header/navigation_header.dart b/lib/app/components/navigation_header/navigation_header.dart index e4102f648..441c4a5eb 100644 --- a/lib/app/components/navigation_header/navigation_header.dart +++ b/lib/app/components/navigation_header/navigation_header.dart @@ -4,9 +4,9 @@ import 'package:ice/app/extensions/num.dart'; import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/generated/assets.gen.dart'; -double navigationHeaderHeight = 50.s; -double backButtonSide = 24.s; -double backButtonPadding = 10.s; +double navigationHeaderHeight = 50.0.s; +double backButtonSide = 24.0.s; +double backButtonPadding = 10.0.s; class NavigationHeader extends StatelessWidget { const NavigationHeader({ diff --git a/lib/app/components/screen_side_offset/screen_side_offset.dart b/lib/app/components/screen_side_offset/screen_side_offset.dart index d49f45e46..abdde7836 100644 --- a/lib/app/components/screen_side_offset/screen_side_offset.dart +++ b/lib/app/components/screen_side_offset/screen_side_offset.dart @@ -36,9 +36,9 @@ class ScreenSideOffset extends StatelessWidget { ); } - static double get defaultSmallMargin => 16.s; + static double get defaultSmallMargin => 16.0.s; - static double get defaultLargeMargin => 44.s; + static double get defaultLargeMargin => 44.0.s; final Widget child; final EdgeInsets insets; diff --git a/lib/app/components/search/search.dart b/lib/app/components/search/search.dart index 2cc73738f..00b5cecaf 100644 --- a/lib/app/components/search/search.dart +++ b/lib/app/components/search/search.dart @@ -47,17 +47,17 @@ class _SearchState extends State { @override Widget build(BuildContext context) { return Container( - padding: EdgeInsets.symmetric(horizontal: 10.s, vertical: 5.s), + padding: EdgeInsets.symmetric(horizontal: 10.0.s, vertical: 5.0.s), child: Row( children: [ Expanded( child: SizedBox( - height: 42.s, + height: 42.0.s, child: CupertinoTextField( focusNode: _focusNode, decoration: BoxDecoration( color: context.theme.appColors.primaryBackground, - borderRadius: BorderRadius.circular(16.s), + borderRadius: BorderRadius.circular(16.0.s), ), controller: _controller, placeholder: context.i18n.search_placeholder, @@ -65,11 +65,11 @@ class _SearchState extends State { color: context.theme.appColors.tertararyText, ), prefix: Padding( - padding: EdgeInsets.only(left: 12.s), + padding: EdgeInsets.only(left: 12.0.s), child: ImageIcon( AssetImage(Assets.images.search.path), color: context.theme.appColors.tertararyText, - size: 14.s, + size: 14.0.s, ), ), clearButtonMode: OverlayVisibilityMode.editing, @@ -79,7 +79,7 @@ class _SearchState extends State { ? GestureDetector( onTap: _onClearTapped, child: Padding( - padding: EdgeInsets.only(right: 12.s), + padding: EdgeInsets.only(right: 12.0.s), child: const Icon( CupertinoIcons.clear_circled, color: Colors.grey, diff --git a/lib/app/components/section_header/section_header.dart b/lib/app/components/section_header/section_header.dart index 08115a285..b7676d4e5 100644 --- a/lib/app/components/section_header/section_header.dart +++ b/lib/app/components/section_header/section_header.dart @@ -11,8 +11,8 @@ class SectionHeader extends StatelessWidget { this.onPress, double? topPadding, double? bottomPadding, - }) : topPadding = topPadding ?? 24.s, - bottomPadding = bottomPadding ?? 16.s; + }) : topPadding = topPadding ?? 24.0.s, + bottomPadding = bottomPadding ?? 16.0.s; final double topPadding; final double bottomPadding; @@ -28,7 +28,7 @@ class SectionHeader extends StatelessWidget { bottom: bottomPadding, ), child: SizedBox( - height: 24.s, + height: 24.0.s, child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ @@ -45,8 +45,8 @@ class SectionHeader extends StatelessWidget { InkWell( onTap: onPress, child: Ink( - width: 24.s, // Set the width of the button - height: 24.s, // Set the height of the button + width: 24.0.s, // Set the width of the button + height: 24.0.s, // Set the height of the button child: Center( child: Image.asset( Assets.images.nextArrow.path, diff --git a/lib/app/components/secured_by/secured_by.dart b/lib/app/components/secured_by/secured_by.dart index e185cf973..db95d6cf3 100644 --- a/lib/app/components/secured_by/secured_by.dart +++ b/lib/app/components/secured_by/secured_by.dart @@ -16,9 +16,9 @@ class SecuredBy extends StatelessWidget { context.i18n.secured_by, style: context.theme.appTextThemes.caption, ), - SizedBox(width: 5.s), + SizedBox(width: 5.0.s), Image.asset(Assets.images.iceIcon.path), - SizedBox(width: 3.s), + SizedBox(width: 3.0.s), Text( context.i18n.secured_by_ice, style: context.theme.appTextThemes.headline1 diff --git a/lib/app/components/socials/socials.dart b/lib/app/components/socials/socials.dart index 29bcbb167..7076c0819 100644 --- a/lib/app/components/socials/socials.dart +++ b/lib/app/components/socials/socials.dart @@ -7,7 +7,7 @@ import 'package:ice/generated/assets.gen.dart'; enum SocialButtonType { apple, nostr, x, expand, fb, github, discord, linkedin } -double defaultSocialIconButtonSide = 44.s; +double defaultSocialIconButtonSide = 44.0.s; Map socialIcons = { SocialButtonType.apple: Assets.images.apple.path, diff --git a/lib/app/components/terms_privacy/terms_privacy.dart b/lib/app/components/terms_privacy/terms_privacy.dart index a2aba66ff..134bcc449 100644 --- a/lib/app/components/terms_privacy/terms_privacy.dart +++ b/lib/app/components/terms_privacy/terms_privacy.dart @@ -26,7 +26,7 @@ class TermsPrivacy extends StatelessWidget { } return SizedBox( - width: 220.s, + width: 220.0.s, child: Text.rich( replaceString( context.i18n.auth_privacy, diff --git a/lib/app/components/text_field_wrapper/text_field_wrapper.dart b/lib/app/components/text_field_wrapper/text_field_wrapper.dart index e8c3aa5fa..cab9407c2 100644 --- a/lib/app/components/text_field_wrapper/text_field_wrapper.dart +++ b/lib/app/components/text_field_wrapper/text_field_wrapper.dart @@ -97,17 +97,17 @@ class TextFieldWrapperState extends State { return Row( mainAxisSize: MainAxisSize.min, children: [ - SizedBox(width: 16.s), + SizedBox(width: 16.0.s), ImageIcon( widget.defaultIcon, - size: 24.s, + size: 24.0.s, color: context.theme.appColors.secondaryText, ), Container( width: 1, - height: 26.s, + height: 26.0.s, color: context.theme.appColors.strokeElements, - margin: EdgeInsets.symmetric(horizontal: 16.s), + margin: EdgeInsets.symmetric(horizontal: 16.0.s), ), ], ); @@ -129,19 +129,19 @@ class TextFieldWrapperState extends State { borderSide: BorderSide( color: _getBorderColor(context), ), - borderRadius: BorderRadius.circular(16.s), + borderRadius: BorderRadius.circular(16.0.s), ), focusedBorder: OutlineInputBorder( borderSide: BorderSide( color: context.theme.appColors.primaryAccent, ), - borderRadius: BorderRadius.circular(16.s), + borderRadius: BorderRadius.circular(16.0.s), ), errorBorder: OutlineInputBorder( borderSide: BorderSide( color: context.theme.appColors.attentionRed, ), - borderRadius: BorderRadius.circular(16.s), + borderRadius: BorderRadius.circular(16.0.s), ), label: Text( placeholder(), @@ -152,20 +152,20 @@ class TextFieldWrapperState extends State { ), prefixIcon: _buildPrefixIcon(), suffixIconConstraints: BoxConstraints( - maxHeight: 15.s, // Adjust the maxHeight as needed - maxWidth: 15.s, // Adjust the maxWidth as needed + maxHeight: 15.0.s, // Adjust the maxHeight as needed + maxWidth: 15.0.s, // Adjust the maxWidth as needed ), - contentPadding: EdgeInsets.only(left: 16.s), + contentPadding: EdgeInsets.only(left: 16.0.s), ), ), if (_state == TextFieldState.successState) Positioned( - right: 16.s, - top: 12.s, + right: 16.0.s, + top: 12.0.s, child: Image.asset( Assets.images.blockCheckboxOn.path, - width: 24.s, - height: 24.s, + width: 24.0.s, + height: 24.0.s, ), ), ], diff --git a/lib/app/components/title_description_header/title_description_header.dart b/lib/app/components/title_description_header/title_description_header.dart index 2fb6a565b..b545e4511 100644 --- a/lib/app/components/title_description_header/title_description_header.dart +++ b/lib/app/components/title_description_header/title_description_header.dart @@ -10,7 +10,7 @@ class TitleDescription extends StatelessWidget { double? topPadding, double? bottomPadding, }) : topPadding = topPadding ?? 0, - bottomPadding = bottomPadding ?? 16.s; + bottomPadding = bottomPadding ?? 16.0.s; final double topPadding; final double bottomPadding; @@ -23,7 +23,7 @@ class TitleDescription extends StatelessWidget { child: Column( children: [ Padding( - padding: EdgeInsets.only(top: topPadding, bottom: 8.s), + padding: EdgeInsets.only(top: topPadding, bottom: 8.0.s), child: Visibility( visible: title.isNotEmpty, child: Text( @@ -38,7 +38,7 @@ class TitleDescription extends StatelessWidget { Visibility( visible: description.isNotEmpty, child: Padding( - padding: EdgeInsets.symmetric(horizontal: 52.s), + padding: EdgeInsets.symmetric(horizontal: 52.0.s), child: Text( description, textAlign: TextAlign.center, diff --git a/lib/app/components/wallet_header/wallet_header.dart b/lib/app/components/wallet_header/wallet_header.dart index fb4c8f68b..fdabcc01f 100644 --- a/lib/app/components/wallet_header/wallet_header.dart +++ b/lib/app/components/wallet_header/wallet_header.dart @@ -15,7 +15,7 @@ class WalletHeader extends HookConsumerWidget { return ScreenSideOffset.small( child: Padding( padding: EdgeInsets.only( - top: 56.s, + top: 56.0.s, ), child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, @@ -38,15 +38,15 @@ class WalletHeader extends HookConsumerWidget { ), padding: MaterialStateProperty.all( EdgeInsets.only( - left: 6.s, - top: 6.s, - bottom: 6.s, - right: 12.s, + left: 6.0.s, + top: 6.0.s, + bottom: 6.0.s, + right: 12.0.s, ), ), shape: MaterialStateProperty.all( RoundedRectangleBorder( - borderRadius: BorderRadius.circular(12.s), + borderRadius: BorderRadius.circular(12.0.s), side: BorderSide( color: context.theme.appColors.onTerararyFill, ), @@ -63,17 +63,17 @@ class WalletHeader extends HookConsumerWidget { children: [ Image.asset( Assets.images.walletWalletblue.path, - width: 28.s, - height: 28.s, + width: 28.0.s, + height: 28.0.s, fit: BoxFit.cover, ), - SizedBox(width: 8.s), + SizedBox(width: 8.0.s), Text(context.i18n.wallet_header_ice_wallet), - SizedBox(width: 8.s), + SizedBox(width: 8.0.s), Image.asset( Assets.images.selectArrows.path, - width: 12.s, - height: 12.s, + width: 12.0.s, + height: 12.0.s, ), ], ), @@ -84,34 +84,34 @@ class WalletHeader extends HookConsumerWidget { onPressed: () {}, icon: Image.asset( Assets.images.fieldSearch.path, - width: 24.s, - height: 24.s, + width: 24.0.s, + height: 24.0.s, ), type: ButtonType.outlined, style: ButtonStyle( fixedSize: MaterialStateProperty.all( - Size(40.s, 40.s), + Size(40.0.s, 40.0.s), ), minimumSize: MaterialStateProperty.all( - Size(40.s, 40.s), + Size(40.0.s, 40.0.s), ), ), ), - SizedBox(width: 12.s), + SizedBox(width: 12.0.s), Button.icon( onPressed: () {}, icon: Image.asset( Assets.images.filter.path, - width: 24.s, - height: 24.s, + width: 24.0.s, + height: 24.0.s, ), type: ButtonType.outlined, style: ButtonStyle( fixedSize: MaterialStateProperty.all( - Size(40.s, 40.s), + Size(40.0.s, 40.0.s), ), minimumSize: MaterialStateProperty.all( - Size(40.s, 40.s), + Size(40.0.s, 40.0.s), ), ), ), diff --git a/lib/app/extensions/num.dart b/lib/app/extensions/num.dart index c6624822c..e1a796b0a 100644 --- a/lib/app/extensions/num.dart +++ b/lib/app/extensions/num.dart @@ -31,7 +31,7 @@ extension DoubleNullableExtension on double? { } } -extension SizeExtension on num { +extension SizeExtension on double { double get s { return w; } diff --git a/lib/app/features/auth/views/pages/auth_page/auth_page.dart b/lib/app/features/auth/views/pages/auth_page/auth_page.dart index 3db8ec9a8..0921f9a72 100644 --- a/lib/app/features/auth/views/pages/auth_page/auth_page.dart +++ b/lib/app/features/auth/views/pages/auth_page/auth_page.dart @@ -87,21 +87,21 @@ class AuthPage extends HookConsumerWidget { showLeadingSeparator: true, ), SizedBox( - height: 16.s, + height: 16.0.s, ), Center( child: Button( trailingIcon: authState is AuthenticationLoading ? SizedBox( - height: 10.s, - width: 10.s, + height: 10.0.s, + width: 10.0.s, child: const CircularProgressIndicator( color: Colors.white, ), ) : ImageIcon( AssetImage(Assets.images.buttonNext.path), - size: 16.s, + size: 16.0.s, ), onPressed: () => { emailFormKey.currentState?.reset(), @@ -114,7 +114,7 @@ class AuthPage extends HookConsumerWidget { ), ), Padding( - padding: EdgeInsets.only(top: 14.s, bottom: 14.s), + padding: EdgeInsets.only(top: 14.0.s, bottom: 14.0.s), child: Text( context.i18n.auth_signIn_or, style: context.theme.appTextThemes.caption @@ -126,7 +126,7 @@ class AuthPage extends HookConsumerWidget { type: ButtonType.outlined, leadingIcon: ImageIcon( AssetImage(Assets.images.phone.path), - size: 24.s, + size: 24.0.s, color: context.theme.appColors.secondaryText, ), onPressed: () { @@ -141,7 +141,7 @@ class AuthPage extends HookConsumerWidget { ), ), Padding( - padding: EdgeInsets.only(top: 16.s, bottom: 22.s), + padding: EdgeInsets.only(top: 16.0.s, bottom: 22.0.s), child: Socials( onSocialButtonPressed: (SocialButtonType type) { switch (type) { @@ -167,7 +167,7 @@ class AuthPage extends HookConsumerWidget { ), const SecuredBy(), SizedBox( - height: 20.s, + height: 20.0.s, ), const TermsPrivacy(), ], diff --git a/lib/app/features/auth/views/pages/auth_page/components/country_code_input.dart b/lib/app/features/auth/views/pages/auth_page/components/country_code_input.dart index e264266c5..ca3006c2f 100644 --- a/lib/app/features/auth/views/pages/auth_page/components/country_code_input.dart +++ b/lib/app/features/auth/views/pages/auth_page/components/country_code_input.dart @@ -22,12 +22,12 @@ class CountryCodeInput extends StatelessWidget { country.flag, style: const TextStyle(fontSize: 30), ), - SizedBox(width: 8.s), + SizedBox(width: 8.0.s), Image.asset( Assets.images.loginDropdown.path, color: context.theme.appColors.secondaryText, - width: 15.s, - height: 15.s, + width: 15.0.s, + height: 15.0.s, ), ], ), diff --git a/lib/app/features/auth/views/pages/check_email/check_email.dart b/lib/app/features/auth/views/pages/check_email/check_email.dart index 0faccab15..0ba488534 100644 --- a/lib/app/features/auth/views/pages/check_email/check_email.dart +++ b/lib/app/features/auth/views/pages/check_email/check_email.dart @@ -29,13 +29,13 @@ class CheckEmail extends HookConsumerWidget { Column( children: [ SizedBox( - height: 65.s, + height: 65.0.s, ), Image.asset( Assets.images.iceRound.path, ), SizedBox( - height: 12.s, + height: 12.0.s, ), Text( context.i18n.check_email_title, @@ -58,8 +58,10 @@ class CheckEmail extends HookConsumerWidget { ], ), Padding( - padding: - EdgeInsets.symmetric(vertical: 36.s, horizontal: 20.s), + padding: EdgeInsets.symmetric( + vertical: 36.0.s, + horizontal: 20.0.s, + ), child: Text( context.i18n.check_email_description, textAlign: TextAlign.center, @@ -69,21 +71,21 @@ class CheckEmail extends HookConsumerWidget { ), ), SizedBox( - width: 248.s, + width: 248.0.s, child: PinCodeTextField( appContext: context, length: 4, animationType: AnimationType.fade, enabled: false, cursorColor: Colors.black, - cursorWidth: 3.s, - cursorHeight: 25.s, + cursorWidth: 3.0.s, + cursorHeight: 25.0.s, textStyle: context.theme.appTextThemes.inputFieldText, pinTheme: PinTheme( shape: PinCodeFieldShape.box, - borderRadius: BorderRadius.circular(16.s), - fieldHeight: 56.s, - fieldWidth: 50.s, + borderRadius: BorderRadius.circular(16.0.s), + fieldHeight: 56.0.s, + fieldWidth: 50.0.s, borderWidth: 1, inactiveColor: context.theme.appColors.strokeElements, disabledColor: context.theme.appColors.strokeElements, @@ -116,7 +118,7 @@ class CheckEmail extends HookConsumerWidget { Assets.images.iceRound.path, ), Padding( - padding: EdgeInsets.only(bottom: 48.s), + padding: EdgeInsets.only(bottom: 48.0.s), child: const TermsPrivacy(), ), ], diff --git a/lib/app/features/auth/views/pages/discover_creators/discover_creators.dart b/lib/app/features/auth/views/pages/discover_creators/discover_creators.dart index 7fa437a9b..a760198fd 100644 --- a/lib/app/features/auth/views/pages/discover_creators/discover_creators.dart +++ b/lib/app/features/auth/views/pages/discover_creators/discover_creators.dart @@ -72,7 +72,7 @@ class DiscoverCreators extends HookConsumerWidget { description: context.i18n.discover_creators_description, ), Padding( - padding: EdgeInsets.only(bottom: 12.s), + padding: EdgeInsets.only(bottom: 12.0.s), child: Search( onTextChanged: (String value) => searchText.value = value, @@ -90,38 +90,39 @@ class DiscoverCreators extends HookConsumerWidget { followedCreators.contains(creator); return Container( - height: 66.s, + height: 66.0.s, decoration: BoxDecoration( color: context.theme.appColors.tertararyBackground, - borderRadius: BorderRadius.circular(12.s), + borderRadius: BorderRadius.circular(12.0.s), ), margin: EdgeInsets.only( - bottom: 12.s, + bottom: 12.0.s, ), padding: EdgeInsets.symmetric( - horizontal: 16.s, + horizontal: 16.0.s, ), child: Row( children: [ if (creator.imageUrl != null && creator.imageUrl!.isNotEmpty) Container( - width: 30.s, - height: 30.s, + width: 30.0.s, + height: 30.0.s, decoration: BoxDecoration( - borderRadius: BorderRadius.circular(10.s), + borderRadius: + BorderRadius.circular(10.0.s), ), clipBehavior: Clip.hardEdge, child: Image.network( creator.imageUrl!, - width: 30.s, - height: 30.s, + width: 30.0.s, + height: 30.0.s, fit: BoxFit.cover, ), ), SizedBox( - width: 16.s, + width: 16.0.s, ), Expanded( child: Column( @@ -143,19 +144,19 @@ class DiscoverCreators extends HookConsumerWidget { if (creator.isVerified ?? false) Padding( padding: EdgeInsets.only( - left: 4.s, - top: 2.s, + left: 4.0.s, + top: 2.0.s, ), child: Image.asset( Assets .images.verifiedBadge.path, - width: 16.s, - height: 16.s, + width: 16.0.s, + height: 16.0.s, ), ), ], ), - SizedBox(height: 2.s), + SizedBox(height: 2.0.s), Text( creator.nickname, style: context @@ -195,9 +196,9 @@ class DiscoverCreators extends HookConsumerWidget { ), mainAxisSize: MainAxisSize.max, style: OutlinedButton.styleFrom( - minimumSize: Size(77.s, 28.s), + minimumSize: Size(77.0.s, 28.0.s), padding: EdgeInsets.symmetric( - horizontal: 5.s, + horizontal: 5.0.s, ), ), ), diff --git a/lib/app/features/auth/views/pages/discover_creators/mocked_creators.dart b/lib/app/features/auth/views/pages/discover_creators/mocked_creators.dart index 8a73f040c..d24d66079 100644 --- a/lib/app/features/auth/views/pages/discover_creators/mocked_creators.dart +++ b/lib/app/features/auth/views/pages/discover_creators/mocked_creators.dart @@ -45,13 +45,13 @@ const List creators = [ name: 'Sophie Anderson', nickname: '@sophieanderson', imageUrl: - 'https://www.creativefabrica.com/wp-content/uploads/2022/10/19/Sophie-Andersons-Beautiful-Dark-Skin-African-Queen-Wearing-Traditional-Crown-42396595-1.png', + 'https://www.creativefabrica.com/wp-content/uploads/2022/10/19.0.sophie-Andersons-Beautiful-Dark-Skin-African-Queen-Wearing-Traditional-Crown-42396595-1.png', ), User( name: 'Dan Scott', nickname: '@danscott', imageUrl: - 'https://i0.wp.com/fashionablymale.net/wp-content/uploads/2014/08/david-koch-by-alinejaqueline-tappia2.jpg?fit=640%2C960&ssl=1&resize=350%2C200', + 'https://i0.wp.com/fashionablymale.net/wp-content/uploads/2014/08/david-koch-by-alinejaqueline-tappia2.jpg?fit=640%2C960.0.ssl=1&resize=350%2C200', isVerified: true, ), User( diff --git a/lib/app/features/auth/views/pages/enter_code/enter_code.dart b/lib/app/features/auth/views/pages/enter_code/enter_code.dart index e4101b117..731563643 100644 --- a/lib/app/features/auth/views/pages/enter_code/enter_code.dart +++ b/lib/app/features/auth/views/pages/enter_code/enter_code.dart @@ -34,13 +34,13 @@ class EnterCode extends HookConsumerWidget { Column( children: [ SizedBox( - height: 65.s, + height: 65.0.s, ), Image.asset( Assets.images.enterCode.path, ), SizedBox( - height: 9.s, + height: 9.0.s, ), Text( context.i18n.enter_code_title, @@ -57,22 +57,22 @@ class EnterCode extends HookConsumerWidget { style: context.theme.appTextThemes.subtitle, ), Padding( - padding: EdgeInsets.only(top: 30.s, bottom: 19.s), + padding: EdgeInsets.only(top: 30.0.s, bottom: 19.0.s), child: SizedBox( - width: 248.s, + width: 248.0.s, child: PinCodeTextField( appContext: context, length: 4, animationType: AnimationType.fade, cursorColor: Colors.black, - cursorWidth: 3.s, - cursorHeight: 25.s, + cursorWidth: 3.0.s, + cursorHeight: 25.0.s, textStyle: context.theme.appTextThemes.inputFieldText, pinTheme: PinTheme( shape: PinCodeFieldShape.box, - borderRadius: BorderRadius.circular(16.s), - fieldHeight: 56.s, - fieldWidth: 50.s, + borderRadius: BorderRadius.circular(16.0.s), + fieldHeight: 56.0.s, + fieldWidth: 50.0.s, borderWidth: 1, inactiveColor: invalidCode.value ? context.theme.appColors.attentionRed @@ -134,7 +134,7 @@ class EnterCode extends HookConsumerWidget { style: context.theme.appTextThemes.subtitle2, ), Text( - ' 30s', // TODO: Add countdown timer + ' 3.0.s', // TODO: Add countdown timer style: context.theme.appTextThemes.subtitle2 .copyWith(color: context.theme.appColors.primaryAccent), ), @@ -144,7 +144,7 @@ class EnterCode extends HookConsumerWidget { Assets.images.iceRound.path, ), Padding( - padding: EdgeInsets.only(bottom: 48.s), + padding: EdgeInsets.only(bottom: 48.0.s), child: const TermsPrivacy(), ), ], diff --git a/lib/app/features/auth/views/pages/fill_profile/fill_profile.dart b/lib/app/features/auth/views/pages/fill_profile/fill_profile.dart index 084b8f6f9..c80583a83 100644 --- a/lib/app/features/auth/views/pages/fill_profile/fill_profile.dart +++ b/lib/app/features/auth/views/pages/fill_profile/fill_profile.dart @@ -63,17 +63,17 @@ class FillProfile extends HookConsumerWidget { final Widget profileImage = ref.watch(croppedFileProvider) != null ? ClipRRect( - borderRadius: BorderRadius.circular(50.s), + borderRadius: BorderRadius.circular(50.0.s), child: Image.file( File(ref.watch(croppedFileProvider)!.path), - width: 100.s, - height: 100.s, + width: 100.0.s, + height: 100.0.s, fit: BoxFit.cover, ), ) : Container( - width: 100.s, - height: 100.s, + width: 100.0.s, + height: 100.0.s, decoration: BoxDecoration( image: DecorationImage( image: AssetImage(Assets.images.profilePhotoPlaceholder.path), @@ -88,13 +88,13 @@ class FillProfile extends HookConsumerWidget { child: Column( children: [ SizedBox( - height: 65.s, + height: 65.0.s, ), Image.asset( Assets.images.iceRound.path, ), SizedBox( - height: 19.s, + height: 19.0.s, ), Text( context.i18n.fill_profile_title, @@ -107,7 +107,7 @@ class FillProfile extends HookConsumerWidget { ), ), SizedBox( - height: 20.s, + height: 20.0.s, ), Stack( children: [ @@ -118,13 +118,13 @@ class FillProfile extends HookConsumerWidget { child: GestureDetector( onTap: addPhoto, child: Container( - width: 36.s, - height: 36.s, + width: 36.0.s, + height: 36.0.s, decoration: const BoxDecoration(), child: Image.asset( Assets.images.profileCamera.path, - width: 36.s, - height: 36.s, + width: 36.0.s, + height: 36.0.s, ), ), ), @@ -132,7 +132,7 @@ class FillProfile extends HookConsumerWidget { ], ), SizedBox( - height: 28.s, + height: 28.0.s, ), InputField( // autofocus: true, @@ -165,13 +165,13 @@ class FillProfile extends HookConsumerWidget { // textInputAction: TextInputAction.done ), SizedBox( - height: 20.s, + height: 20.0.s, ), Center( child: Button( leadingIcon: ImageIcon( AssetImage(Assets.images.profileSave.path), - size: 24.s, + size: 24.0.s, ), onPressed: onSave, label: Text(context.i18n.button_save), diff --git a/lib/app/features/auth/views/pages/intro_page/intro_page.dart b/lib/app/features/auth/views/pages/intro_page/intro_page.dart index df740ba7d..746d2b59b 100644 --- a/lib/app/features/auth/views/pages/intro_page/intro_page.dart +++ b/lib/app/features/auth/views/pages/intro_page/intro_page.dart @@ -42,9 +42,9 @@ class IntroPage extends HookConsumerWidget { ), Padding( padding: EdgeInsets.only( - left: 40.s, - right: 85.s, - bottom: 10.s, + left: 40.0.s, + right: 85.0.s, + bottom: 10.0.s, ), child: Text( context.i18n.intro_title, @@ -56,7 +56,7 @@ class IntroPage extends HookConsumerWidget { ), ), Padding( - padding: EdgeInsets.only(left: 40.s, right: 40.s), + padding: EdgeInsets.only(left: 40.0.s, right: 40.0.s), child: Align( alignment: Alignment.centerLeft, child: Text( diff --git a/lib/app/features/auth/views/pages/nostr_auth/nostr_auth.dart b/lib/app/features/auth/views/pages/nostr_auth/nostr_auth.dart index ec01c1db6..d408060b4 100644 --- a/lib/app/features/auth/views/pages/nostr_auth/nostr_auth.dart +++ b/lib/app/features/auth/views/pages/nostr_auth/nostr_auth.dart @@ -39,8 +39,8 @@ class NostrAuth extends HookConsumerWidget { ), Image.asset( Assets.images.ostrichlogo.path, - width: 256.s, - height: 160.s, + width: 256.0.s, + height: 160.0.s, ), Column( children: [ @@ -48,7 +48,7 @@ class NostrAuth extends HookConsumerWidget { child: Button( leadingIcon: ImageIcon( AssetImage(Assets.images.loginCreateacc.path), - size: 24.s, + size: 24.0.s, ), onPressed: () { // showModalScreen( @@ -62,13 +62,13 @@ class NostrAuth extends HookConsumerWidget { ), ), SizedBox( - height: 26.s, + height: 26.0.s, ), Center( child: Button( leadingIcon: ImageIcon( AssetImage(Assets.images.profileSave.path), - size: 24.s, + size: 24.0.s, ), onPressed: () { showModalScreen( @@ -81,7 +81,7 @@ class NostrAuth extends HookConsumerWidget { ), ), SizedBox( - height: 91.s, + height: 91.0.s, ), ], ), diff --git a/lib/app/features/auth/views/pages/nostr_login/nostr_login.dart b/lib/app/features/auth/views/pages/nostr_login/nostr_login.dart index 36de6ff38..093f23710 100644 --- a/lib/app/features/auth/views/pages/nostr_login/nostr_login.dart +++ b/lib/app/features/auth/views/pages/nostr_login/nostr_login.dart @@ -25,15 +25,15 @@ class NostrLogin extends HookConsumerWidget { description: context.i18n.nostr_login_description, ), SizedBox( - height: 15.s, + height: 15.0.s, ), Image.asset( Assets.images.ostrichlogo.path, - width: 256.s, - height: 160.s, + width: 256.0.s, + height: 160.0.s, ), SizedBox( - height: 80.s, + height: 80.0.s, ), Column( children: [ @@ -48,13 +48,13 @@ class NostrLogin extends HookConsumerWidget { showLeadingSeparator: true, ), SizedBox( - height: 26.s, + height: 26.0.s, ), Center( child: Button( leadingIcon: ImageIcon( AssetImage(Assets.images.profilePaste.path), - size: 24.s, + size: 24.0.s, ), onPressed: () {}, type: ButtonType.disabled, diff --git a/lib/app/features/auth/views/pages/select_country/select_country.dart b/lib/app/features/auth/views/pages/select_country/select_country.dart index 9a5dfd669..cfdcca073 100644 --- a/lib/app/features/auth/views/pages/select_country/select_country.dart +++ b/lib/app/features/auth/views/pages/select_country/select_country.dart @@ -57,15 +57,15 @@ class SelectCountries extends HookConsumerWidget { Navigator.pop(context); }, child: Container( - height: 40.s, - padding: EdgeInsets.symmetric(horizontal: 16.s), + height: 40.0.s, + padding: EdgeInsets.symmetric(horizontal: 16.0.s), child: Row( children: [ Text( country.flag, style: context.theme.appTextThemes.subtitle2, ), - SizedBox(width: 16.s), + SizedBox(width: 16.0.s), Expanded( child: Text( country.name, diff --git a/lib/app/features/auth/views/pages/select_languages/select_languages.dart b/lib/app/features/auth/views/pages/select_languages/select_languages.dart index 1f38a1c1e..e680fa610 100644 --- a/lib/app/features/auth/views/pages/select_languages/select_languages.dart +++ b/lib/app/features/auth/views/pages/select_languages/select_languages.dart @@ -49,7 +49,7 @@ class SelectLanguages extends HookConsumerWidget { description: context.i18n.select_languages_description, ), Padding( - padding: EdgeInsets.only(bottom: 12.s), + padding: EdgeInsets.only(bottom: 12.0.s), child: Search( onTextChanged: (String value) => searchText.value = value, @@ -79,17 +79,17 @@ class SelectLanguages extends HookConsumerWidget { newSelectedLanguages; }, child: Container( - height: 44.s, + height: 44.0.s, decoration: BoxDecoration( color: context.theme.appColors.tertararyBackground, - borderRadius: BorderRadius.circular(12.s), + borderRadius: BorderRadius.circular(12.0.s), ), margin: EdgeInsets.only( - bottom: 12.s, + bottom: 12.0.s, ), padding: EdgeInsets.symmetric( - horizontal: 16.s, + horizontal: 16.0.s, ), child: Row( children: [ @@ -103,7 +103,7 @@ class SelectLanguages extends HookConsumerWidget { ), ), SizedBox( - width: 16.s, + width: 16.0.s, ), Expanded( child: Text( @@ -117,7 +117,7 @@ class SelectLanguages extends HookConsumerWidget { ), ), SizedBox( - width: 30.s, + width: 30.0.s, child: isSelected ? Image.asset( Assets.images.checkboxon.path, diff --git a/lib/app/features/dapps/views/pages/components/apps_collection.dart b/lib/app/features/dapps/views/pages/components/apps_collection.dart index ec4149e3b..58bc5b5b2 100644 --- a/lib/app/features/dapps/views/pages/components/apps_collection.dart +++ b/lib/app/features/dapps/views/pages/components/apps_collection.dart @@ -8,7 +8,7 @@ import 'package:ice/app/features/dapps/views/pages/mocks/mocked_apps.dart'; import 'package:ice/app/utils/string.dart'; const double columnWidthPercentage = 0.68; -double sectionHeight = 200.s; +double sectionHeight = 200.0.s; const int itemsPerColumn = 3; class AppsCollection extends StatelessWidget { @@ -66,7 +66,7 @@ class DAppGridItem extends StatelessWidget { return ScreenSideOffset.small( child: Container( padding: EdgeInsets.symmetric( - vertical: 6.s, + vertical: 6.0.s, ), width: double.infinity, child: Row( @@ -75,19 +75,19 @@ class DAppGridItem extends StatelessWidget { Row( children: [ Container( - width: 48.s, - height: 48.s, + width: 48.0.s, + height: 48.0.s, decoration: BoxDecoration( color: Colors.white, borderRadius: BorderRadius.circular(8), ), child: Image.asset( item.iconImage, - width: 48.s, + width: 48.0.s, fit: BoxFit.contain, ), ), - SizedBox(width: 8.s), + SizedBox(width: 8.0.s), Column( crossAxisAlignment: CrossAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.center, diff --git a/lib/app/features/dapps/views/pages/components/categories_collection.dart b/lib/app/features/dapps/views/pages/components/categories_collection.dart index e04ac1877..61ff89cd0 100644 --- a/lib/app/features/dapps/views/pages/components/categories_collection.dart +++ b/lib/app/features/dapps/views/pages/components/categories_collection.dart @@ -4,7 +4,7 @@ import 'package:ice/app/extensions/num.dart'; import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/generated/assets.gen.dart'; -double textContainerHeight = 24.s; +double textContainerHeight = 24.0.s; class CategoryItem { CategoryItem({ @@ -53,8 +53,9 @@ class CategoriesCollection extends StatelessWidget { scrollDirection: Axis.horizontal, itemCount: featured.length, itemBuilder: (BuildContext context, int index) { - final double leftOffset = index == 0 ? 16.s : 8.s; - final double rightOffset = index == featured.length - 1 ? 16.s : 8.s; + final double leftOffset = index == 0 ? 16.0.s : 8.0.s; + final double rightOffset = + index == featured.length - 1 ? 16.0.s : 8.0.s; return Column( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ @@ -74,7 +75,7 @@ class CategoriesCollection extends StatelessWidget { children: [ Image.asset( featured[index].iconImage, - width: 50.s, + width: 50.0.s, ), ], ), diff --git a/lib/app/features/dapps/views/pages/components/favourites.dart b/lib/app/features/dapps/views/pages/components/favourites.dart index c526dc83d..7e70d7f1b 100644 --- a/lib/app/features/dapps/views/pages/components/favourites.dart +++ b/lib/app/features/dapps/views/pages/components/favourites.dart @@ -6,7 +6,7 @@ import 'package:ice/app/extensions/num.dart'; import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/generated/assets.gen.dart'; -double containerHeight = 60.s; +double containerHeight = 60.0.s; class Favourites extends StatelessWidget { const Favourites({ @@ -21,7 +21,7 @@ class Favourites extends StatelessWidget { return ScreenSideOffset.small( child: Padding( padding: EdgeInsets.symmetric( - vertical: 24.s, + vertical: 24.0.s, ), child: GestureDetector( onTap: onPress, @@ -32,7 +32,7 @@ class Favourites extends StatelessWidget { horizontal: ScreenSideOffset.defaultSmallMargin, ), decoration: BoxDecoration( - borderRadius: BorderRadius.circular(16.s), + borderRadius: BorderRadius.circular(16.0.s), color: context.theme.appColors.tertararyBackground, border: Border.all( color: context.theme.appColors.onTerararyFill, @@ -44,9 +44,9 @@ class Favourites extends StatelessWidget { Row( children: [ const FavouriteIcon(), - SizedBox(width: 8.s), + SizedBox(width: 8.0.s), SizedBox( - height: 36.s, + height: 36.0.s, child: Column( crossAxisAlignment: CrossAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.center, @@ -71,7 +71,7 @@ class Favourites extends StatelessWidget { ), Image.asset( Assets.images.forwardArrow.path, - width: 12.s, + width: 12.0.s, ), ], ), diff --git a/lib/app/features/dapps/views/pages/components/featured_collection.dart b/lib/app/features/dapps/views/pages/components/featured_collection.dart index 3f10db3c1..d8c1fced3 100644 --- a/lib/app/features/dapps/views/pages/components/featured_collection.dart +++ b/lib/app/features/dapps/views/pages/components/featured_collection.dart @@ -22,14 +22,14 @@ class FeaturedCollection extends StatelessWidget { scrollDirection: Axis.horizontal, itemCount: items.length, itemBuilder: (BuildContext context, int index) { - final double leftOffset = index == 0 ? 16.s : 8.s; - final double rightOffset = index == items.length - 1 ? 16.s : 8.s; + final double leftOffset = index == 0 ? 16.0.s : 8.0.s; + final double rightOffset = index == items.length - 1 ? 16.0.s : 8.0.s; final String assetBg = items[index].backgroundImage ?? ''; return Container( width: itemWidth, margin: EdgeInsets.only(right: rightOffset, left: leftOffset), decoration: BoxDecoration( - borderRadius: BorderRadius.circular(12.s), + borderRadius: BorderRadius.circular(12.0.s), image: DecorationImage( image: AssetImage( assetBg, @@ -40,8 +40,8 @@ class FeaturedCollection extends StatelessWidget { child: Stack( children: [ Positioned( - bottom: 14.s, - left: 14.s, + bottom: 14.0.s, + left: 14.0.s, child: Row( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -49,16 +49,16 @@ class FeaturedCollection extends StatelessWidget { padding: const EdgeInsets.all(4), decoration: BoxDecoration( color: Colors.white, - borderRadius: BorderRadius.circular(8.s), + borderRadius: BorderRadius.circular(8.0.s), ), child: Image.asset( items[index].iconImage, - width: 30.s, + width: 30.0.s, ), ), - SizedBox(width: 8.s), + SizedBox(width: 8.0.s), SizedBox( - height: 36.s, + height: 36.0.s, child: Column( crossAxisAlignment: CrossAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.center, diff --git a/lib/app/features/dapps/views/pages/mocks/mocked_apps.dart b/lib/app/features/dapps/views/pages/mocks/mocked_apps.dart index d8dc34ecc..87488f52d 100644 --- a/lib/app/features/dapps/views/pages/mocks/mocked_apps.dart +++ b/lib/app/features/dapps/views/pages/mocks/mocked_apps.dart @@ -61,7 +61,7 @@ List featured = [ DAppItem( iconImage: Assets.images.walletLido.path, title: 'Lido', - description: 'Decentralized ETH 2.0 staking', + description: 'Decentralized ETH 2.0.0.staking', value: 497.08, isFavourite: true, ), diff --git a/lib/app/features/feed/components/post_image/post_image.dart b/lib/app/features/feed/components/post_image/post_image.dart index f156beeb6..034f62ce2 100644 --- a/lib/app/features/feed/components/post_image/post_image.dart +++ b/lib/app/features/feed/components/post_image/post_image.dart @@ -7,7 +7,7 @@ import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/app/features/feed/components/read_time_tile/read_time_tile.dart'; import 'package:ice/app/utils/image.dart'; -double borderRadius = 12.s; +double borderRadius = 12.0.s; class PostImage extends StatelessWidget { const PostImage({ @@ -59,7 +59,8 @@ class PostImage extends StatelessWidget { ), if (minutesToRead != null) ...[ Container( - padding: EdgeInsets.symmetric(horizontal: 8.s, vertical: 4.s), + padding: + EdgeInsets.symmetric(horizontal: 8.0.s, vertical: 4.0.s), decoration: BoxDecoration( color: context.theme.appColors.tertararyBackground, border: Border.all( diff --git a/lib/app/features/feed/components/read_time_tile/read_time_tile.dart b/lib/app/features/feed/components/read_time_tile/read_time_tile.dart index 399f67342..8fefdfea2 100644 --- a/lib/app/features/feed/components/read_time_tile/read_time_tile.dart +++ b/lib/app/features/feed/components/read_time_tile/read_time_tile.dart @@ -3,7 +3,7 @@ import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/extensions/num.dart'; import 'package:ice/app/extensions/theme_data.dart'; -double iconSize = 16.s; +double iconSize = 16.0.s; class ReadTimeTile extends StatelessWidget { const ReadTimeTile({super.key, required this.minutesToRead}); @@ -20,7 +20,7 @@ class ReadTimeTile extends StatelessWidget { size: iconSize, color: context.theme.appColors.sharkText, ), - SizedBox(width: 3.s), + SizedBox(width: 3.0.s), Text( context.i18n.read_time_in_mins(minutesToRead), style: context.theme.appTextThemes.caption diff --git a/lib/app/features/feed/views/pages/feed_page.dart b/lib/app/features/feed/views/pages/feed_page.dart index 856649023..cbf62f313 100644 --- a/lib/app/features/feed/views/pages/feed_page.dart +++ b/lib/app/features/feed/views/pages/feed_page.dart @@ -42,8 +42,8 @@ class FeedPage extends HookConsumerWidget { ), leadingIcon: Image.asset( Assets.images.foo.path, - width: 30.s, - height: 30.s, + width: 30.0.s, + height: 30.0.s, fit: BoxFit.cover, ), label: Text( diff --git a/lib/app/features/wallet/views/pages/inner_wallet_page.dart b/lib/app/features/wallet/views/pages/inner_wallet_page.dart index b42afeb06..5120e496e 100644 --- a/lib/app/features/wallet/views/pages/inner_wallet_page.dart +++ b/lib/app/features/wallet/views/pages/inner_wallet_page.dart @@ -25,8 +25,8 @@ class InnerWalletPage extends HookConsumerWidget { label: const Text('Sign Out'), icon: authState is AuthenticationLoading ? SizedBox( - height: 10.s, - width: 10.s, + height: 10.0.s, + width: 10.0.s, child: const CircularProgressIndicator(color: Colors.white), ) : const Icon(Icons.logout), diff --git a/lib/app/features/wallet/views/pages/wallet_page.dart b/lib/app/features/wallet/views/pages/wallet_page.dart index 251ac5de0..f03b40317 100644 --- a/lib/app/features/wallet/views/pages/wallet_page.dart +++ b/lib/app/features/wallet/views/pages/wallet_page.dart @@ -35,8 +35,8 @@ class WalletPage extends HookConsumerWidget { ), leadingIcon: Image.asset( Assets.images.foo.path, - width: 30.s, - height: 30.s, + width: 30.0.s, + height: 30.0.s, fit: BoxFit.cover, ), label: Text( @@ -48,8 +48,8 @@ class WalletPage extends HookConsumerWidget { label: const Text('Sign Out'), icon: authState is AuthenticationLoading ? SizedBox( - height: 10.s, - width: 10.s, + height: 10.0.s, + width: 10.0.s, child: const CircularProgressIndicator( color: Colors.white, ), From cbc5ad1dfce2203b2f75c4fe358a4281eeb65998 Mon Sep 17 00:00:00 2001 From: ice-orion <102020833+ice-orion@users.noreply.github.com> Date: Mon, 12 Feb 2024 20:37:14 +0400 Subject: [PATCH 12/13] refactor: move feature related components to features --- .../views}/components/auth_header/auth_header.dart | 0 .../auth/views}/components/secured_by/secured_by.dart | 0 .../auth/views}/components/socials/socials.dart | 0 .../views}/components/terms_privacy/terms_privacy.dart | 0 .../text_field_wrapper/text_field_wrapper.dart | 0 .../title_description_header.dart | 0 .../features/auth/views/pages/auth_page/auth_page.dart | 8 ++++---- .../auth/views/pages/check_email/check_email.dart | 2 +- .../pages/discover_creators/discover_creators.dart | 2 +- .../auth/views/pages/enter_code/enter_code.dart | 2 +- .../auth/views/pages/fill_profile/fill_profile.dart | 2 +- .../auth/views/pages/nostr_auth/nostr_auth.dart | 2 +- .../auth/views/pages/nostr_login/nostr_login.dart | 2 +- .../views/pages/select_languages/select_languages.dart | 2 +- .../dapps/views/{pages => }/components/apps.dart | 4 ++-- .../views/{pages => }/components/apps_collection.dart | 2 +- .../dapps/views/{pages => }/components/categories.dart | 4 ++-- .../{pages => }/components/categories_collection.dart | 0 .../components/favourite_icon/favorite_icon.dart | 0 .../dapps/views/{pages => }/components/favourites.dart | 2 +- .../dapps/views/{pages => }/components/featured.dart | 4 ++-- .../{pages => }/components/featured_collection.dart | 0 .../nav_header_offset/nav_header_offset.dart | 0 .../components/section_header/section_header.dart | 0 .../views}/components/wallet_header/wallet_header.dart | 0 lib/app/features/dapps/views/pages/dapps.dart | 10 +++++----- .../dapps/views/pages/dapps_list/dapps_list.dart | 4 ++-- 27 files changed, 26 insertions(+), 26 deletions(-) rename lib/app/{ => features/auth/views}/components/auth_header/auth_header.dart (100%) rename lib/app/{ => features/auth/views}/components/secured_by/secured_by.dart (100%) rename lib/app/{ => features/auth/views}/components/socials/socials.dart (100%) rename lib/app/{ => features/auth/views}/components/terms_privacy/terms_privacy.dart (100%) rename lib/app/{ => features/auth/views}/components/text_field_wrapper/text_field_wrapper.dart (100%) rename lib/app/{ => features/auth/views}/components/title_description_header/title_description_header.dart (100%) rename lib/app/features/dapps/views/{pages => }/components/apps.dart (79%) rename lib/app/features/dapps/views/{pages => }/components/apps_collection.dart (97%) rename lib/app/features/dapps/views/{pages => }/components/categories.dart (69%) rename lib/app/features/dapps/views/{pages => }/components/categories_collection.dart (100%) rename lib/app/{ => features/dapps/views}/components/favourite_icon/favorite_icon.dart (100%) rename lib/app/features/dapps/views/{pages => }/components/favourites.dart (96%) rename lib/app/features/dapps/views/{pages => }/components/featured.dart (73%) rename lib/app/features/dapps/views/{pages => }/components/featured_collection.dart (100%) rename lib/app/{ => features/dapps/views}/components/nav_header_offset/nav_header_offset.dart (100%) rename lib/app/{ => features/dapps/views}/components/section_header/section_header.dart (100%) rename lib/app/{ => features/dapps/views}/components/wallet_header/wallet_header.dart (100%) diff --git a/lib/app/components/auth_header/auth_header.dart b/lib/app/features/auth/views/components/auth_header/auth_header.dart similarity index 100% rename from lib/app/components/auth_header/auth_header.dart rename to lib/app/features/auth/views/components/auth_header/auth_header.dart diff --git a/lib/app/components/secured_by/secured_by.dart b/lib/app/features/auth/views/components/secured_by/secured_by.dart similarity index 100% rename from lib/app/components/secured_by/secured_by.dart rename to lib/app/features/auth/views/components/secured_by/secured_by.dart diff --git a/lib/app/components/socials/socials.dart b/lib/app/features/auth/views/components/socials/socials.dart similarity index 100% rename from lib/app/components/socials/socials.dart rename to lib/app/features/auth/views/components/socials/socials.dart diff --git a/lib/app/components/terms_privacy/terms_privacy.dart b/lib/app/features/auth/views/components/terms_privacy/terms_privacy.dart similarity index 100% rename from lib/app/components/terms_privacy/terms_privacy.dart rename to lib/app/features/auth/views/components/terms_privacy/terms_privacy.dart diff --git a/lib/app/components/text_field_wrapper/text_field_wrapper.dart b/lib/app/features/auth/views/components/text_field_wrapper/text_field_wrapper.dart similarity index 100% rename from lib/app/components/text_field_wrapper/text_field_wrapper.dart rename to lib/app/features/auth/views/components/text_field_wrapper/text_field_wrapper.dart diff --git a/lib/app/components/title_description_header/title_description_header.dart b/lib/app/features/auth/views/components/title_description_header/title_description_header.dart similarity index 100% rename from lib/app/components/title_description_header/title_description_header.dart rename to lib/app/features/auth/views/components/title_description_header/title_description_header.dart diff --git a/lib/app/features/auth/views/pages/auth_page/auth_page.dart b/lib/app/features/auth/views/pages/auth_page/auth_page.dart index 0921f9a72..c3cb122dd 100644 --- a/lib/app/features/auth/views/pages/auth_page/auth_page.dart +++ b/lib/app/features/auth/views/pages/auth_page/auth_page.dart @@ -1,19 +1,19 @@ import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:ice/app/components/auth_header/auth_header.dart'; import 'package:ice/app/components/button/button.dart'; import 'package:ice/app/components/inputs/text_fields.dart'; import 'package:ice/app/components/modal_wrapper/modal_wrapper.dart'; import 'package:ice/app/components/screen_side_offset/screen_side_offset.dart'; -import 'package:ice/app/components/secured_by/secured_by.dart'; -import 'package:ice/app/components/socials/socials.dart'; -import 'package:ice/app/components/terms_privacy/terms_privacy.dart'; import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/extensions/num.dart'; import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/app/features/auth/data/models/auth_state.dart'; import 'package:ice/app/features/auth/providers/auth_provider.dart'; import 'package:ice/app/features/auth/providers/ui_auth_provider.dart'; +import 'package:ice/app/features/auth/views/components/auth_header/auth_header.dart'; +import 'package:ice/app/features/auth/views/components/secured_by/secured_by.dart'; +import 'package:ice/app/features/auth/views/components/socials/socials.dart'; +import 'package:ice/app/features/auth/views/components/terms_privacy/terms_privacy.dart'; import 'package:ice/app/features/auth/views/pages/auth_page/components/country_code_input.dart'; import 'package:ice/app/features/auth/views/pages/auth_page/controllers/email_controller.dart'; import 'package:ice/app/features/auth/views/pages/auth_page/controllers/phone_number_controller.dart'; diff --git a/lib/app/features/auth/views/pages/check_email/check_email.dart b/lib/app/features/auth/views/pages/check_email/check_email.dart index 0ba488534..03a3d9190 100644 --- a/lib/app/features/auth/views/pages/check_email/check_email.dart +++ b/lib/app/features/auth/views/pages/check_email/check_email.dart @@ -3,10 +3,10 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:ice/app/components/screen_side_offset/screen_side_offset.dart'; -import 'package:ice/app/components/terms_privacy/terms_privacy.dart'; import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/extensions/num.dart'; import 'package:ice/app/extensions/theme_data.dart'; +import 'package:ice/app/features/auth/views/components/terms_privacy/terms_privacy.dart'; import 'package:ice/generated/assets.gen.dart'; import 'package:pin_code_fields/pin_code_fields.dart'; diff --git a/lib/app/features/auth/views/pages/discover_creators/discover_creators.dart b/lib/app/features/auth/views/pages/discover_creators/discover_creators.dart index a760198fd..8b2cc85ea 100644 --- a/lib/app/features/auth/views/pages/discover_creators/discover_creators.dart +++ b/lib/app/features/auth/views/pages/discover_creators/discover_creators.dart @@ -5,10 +5,10 @@ import 'package:ice/app/components/button/button.dart'; import 'package:ice/app/components/navigation_header/navigation_header.dart'; import 'package:ice/app/components/screen_side_offset/screen_side_offset.dart'; import 'package:ice/app/components/search/search.dart'; -import 'package:ice/app/components/title_description_header/title_description_header.dart'; import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/extensions/num.dart'; import 'package:ice/app/extensions/theme_data.dart'; +import 'package:ice/app/features/auth/views/components/title_description_header/title_description_header.dart'; import 'package:ice/app/features/auth/views/pages/discover_creators/mocked_creators.dart'; import 'package:ice/generated/assets.gen.dart'; diff --git a/lib/app/features/auth/views/pages/enter_code/enter_code.dart b/lib/app/features/auth/views/pages/enter_code/enter_code.dart index 731563643..d886603ac 100644 --- a/lib/app/features/auth/views/pages/enter_code/enter_code.dart +++ b/lib/app/features/auth/views/pages/enter_code/enter_code.dart @@ -4,10 +4,10 @@ import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:ice/app/components/screen_side_offset/screen_side_offset.dart'; -import 'package:ice/app/components/terms_privacy/terms_privacy.dart'; import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/extensions/num.dart'; import 'package:ice/app/extensions/theme_data.dart'; +import 'package:ice/app/features/auth/views/components/terms_privacy/terms_privacy.dart'; import 'package:ice/generated/assets.gen.dart'; import 'package:pin_code_fields/pin_code_fields.dart'; diff --git a/lib/app/features/auth/views/pages/fill_profile/fill_profile.dart b/lib/app/features/auth/views/pages/fill_profile/fill_profile.dart index c80583a83..ff09ff880 100644 --- a/lib/app/features/auth/views/pages/fill_profile/fill_profile.dart +++ b/lib/app/features/auth/views/pages/fill_profile/fill_profile.dart @@ -5,10 +5,10 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:ice/app/components/button/button.dart'; import 'package:ice/app/components/inputs/text_fields.dart'; import 'package:ice/app/components/screen_side_offset/screen_side_offset.dart'; -import 'package:ice/app/components/text_field_wrapper/text_field_wrapper.dart'; import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/extensions/num.dart'; import 'package:ice/app/extensions/theme_data.dart'; +import 'package:ice/app/features/auth/views/components/text_field_wrapper/text_field_wrapper.dart'; import 'package:ice/app/features/auth/views/pages/fill_profile/controllers/inviter_controller.dart'; import 'package:ice/app/features/auth/views/pages/fill_profile/controllers/name_controller.dart'; import 'package:ice/app/features/auth/views/pages/fill_profile/controllers/nickname_controller.dart'; diff --git a/lib/app/features/auth/views/pages/nostr_auth/nostr_auth.dart b/lib/app/features/auth/views/pages/nostr_auth/nostr_auth.dart index d408060b4..6ce7ab7d7 100644 --- a/lib/app/features/auth/views/pages/nostr_auth/nostr_auth.dart +++ b/lib/app/features/auth/views/pages/nostr_auth/nostr_auth.dart @@ -1,11 +1,11 @@ import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:ice/app/components/auth_header/auth_header.dart'; import 'package:ice/app/components/button/button.dart'; import 'package:ice/app/components/modal_wrapper/modal_wrapper.dart'; import 'package:ice/app/components/screen_side_offset/screen_side_offset.dart'; import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/extensions/num.dart'; +import 'package:ice/app/features/auth/views/components/auth_header/auth_header.dart'; import 'package:ice/app/features/auth/views/pages/nostr_login/nostr_login.dart'; import 'package:ice/generated/assets.gen.dart'; diff --git a/lib/app/features/auth/views/pages/nostr_login/nostr_login.dart b/lib/app/features/auth/views/pages/nostr_login/nostr_login.dart index 093f23710..61fa033f7 100644 --- a/lib/app/features/auth/views/pages/nostr_login/nostr_login.dart +++ b/lib/app/features/auth/views/pages/nostr_login/nostr_login.dart @@ -1,11 +1,11 @@ import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:ice/app/components/auth_header/auth_header.dart'; import 'package:ice/app/components/button/button.dart'; import 'package:ice/app/components/inputs/text_fields.dart'; import 'package:ice/app/components/screen_side_offset/screen_side_offset.dart'; import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/extensions/num.dart'; +import 'package:ice/app/features/auth/views/components/auth_header/auth_header.dart'; import 'package:ice/app/features/auth/views/pages/nostr_login/controllers/name_controller.dart'; import 'package:ice/generated/assets.gen.dart'; diff --git a/lib/app/features/auth/views/pages/select_languages/select_languages.dart b/lib/app/features/auth/views/pages/select_languages/select_languages.dart index e680fa610..40a077e69 100644 --- a/lib/app/features/auth/views/pages/select_languages/select_languages.dart +++ b/lib/app/features/auth/views/pages/select_languages/select_languages.dart @@ -4,10 +4,10 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:ice/app/components/navigation_header/navigation_header.dart'; import 'package:ice/app/components/screen_side_offset/screen_side_offset.dart'; import 'package:ice/app/components/search/search.dart'; -import 'package:ice/app/components/title_description_header/title_description_header.dart'; import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/extensions/num.dart'; import 'package:ice/app/extensions/theme_data.dart'; +import 'package:ice/app/features/auth/views/components/title_description_header/title_description_header.dart'; import 'package:ice/app/features/auth/views/pages/select_languages/languages.dart'; import 'package:ice/generated/assets.gen.dart'; diff --git a/lib/app/features/dapps/views/pages/components/apps.dart b/lib/app/features/dapps/views/components/apps.dart similarity index 79% rename from lib/app/features/dapps/views/pages/components/apps.dart rename to lib/app/features/dapps/views/components/apps.dart index 240af078a..fb544dfae 100644 --- a/lib/app/features/dapps/views/pages/components/apps.dart +++ b/lib/app/features/dapps/views/components/apps.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:ice/app/components/section_header/section_header.dart'; -import 'package:ice/app/features/dapps/views/pages/components/apps_collection.dart'; +import 'package:ice/app/features/dapps/views/components/apps_collection.dart'; +import 'package:ice/app/features/dapps/views/components/section_header/section_header.dart'; import 'package:ice/app/features/dapps/views/pages/mocks/mocked_apps.dart'; class AppsRouteData { diff --git a/lib/app/features/dapps/views/pages/components/apps_collection.dart b/lib/app/features/dapps/views/components/apps_collection.dart similarity index 97% rename from lib/app/features/dapps/views/pages/components/apps_collection.dart rename to lib/app/features/dapps/views/components/apps_collection.dart index 58bc5b5b2..a0418c0c9 100644 --- a/lib/app/features/dapps/views/pages/components/apps_collection.dart +++ b/lib/app/features/dapps/views/components/apps_collection.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; -import 'package:ice/app/components/favourite_icon/favorite_icon.dart'; import 'package:ice/app/components/screen_side_offset/screen_side_offset.dart'; import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/extensions/num.dart'; import 'package:ice/app/extensions/theme_data.dart'; +import 'package:ice/app/features/dapps/views/components/favourite_icon/favorite_icon.dart'; import 'package:ice/app/features/dapps/views/pages/mocks/mocked_apps.dart'; import 'package:ice/app/utils/string.dart'; diff --git a/lib/app/features/dapps/views/pages/components/categories.dart b/lib/app/features/dapps/views/components/categories.dart similarity index 69% rename from lib/app/features/dapps/views/pages/components/categories.dart rename to lib/app/features/dapps/views/components/categories.dart index 81c22a896..0bfd6a6b5 100644 --- a/lib/app/features/dapps/views/pages/components/categories.dart +++ b/lib/app/features/dapps/views/components/categories.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -import 'package:ice/app/components/section_header/section_header.dart'; import 'package:ice/app/extensions/build_context.dart'; -import 'package:ice/app/features/dapps/views/pages/components/categories_collection.dart'; +import 'package:ice/app/features/dapps/views/components/categories_collection.dart'; +import 'package:ice/app/features/dapps/views/components/section_header/section_header.dart'; class Categories extends StatelessWidget { const Categories({super.key}); diff --git a/lib/app/features/dapps/views/pages/components/categories_collection.dart b/lib/app/features/dapps/views/components/categories_collection.dart similarity index 100% rename from lib/app/features/dapps/views/pages/components/categories_collection.dart rename to lib/app/features/dapps/views/components/categories_collection.dart diff --git a/lib/app/components/favourite_icon/favorite_icon.dart b/lib/app/features/dapps/views/components/favourite_icon/favorite_icon.dart similarity index 100% rename from lib/app/components/favourite_icon/favorite_icon.dart rename to lib/app/features/dapps/views/components/favourite_icon/favorite_icon.dart diff --git a/lib/app/features/dapps/views/pages/components/favourites.dart b/lib/app/features/dapps/views/components/favourites.dart similarity index 96% rename from lib/app/features/dapps/views/pages/components/favourites.dart rename to lib/app/features/dapps/views/components/favourites.dart index 7e70d7f1b..3628f58cf 100644 --- a/lib/app/features/dapps/views/pages/components/favourites.dart +++ b/lib/app/features/dapps/views/components/favourites.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; -import 'package:ice/app/components/favourite_icon/favorite_icon.dart'; import 'package:ice/app/components/screen_side_offset/screen_side_offset.dart'; import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/extensions/num.dart'; import 'package:ice/app/extensions/theme_data.dart'; +import 'package:ice/app/features/dapps/views/components/favourite_icon/favorite_icon.dart'; import 'package:ice/generated/assets.gen.dart'; double containerHeight = 60.0.s; diff --git a/lib/app/features/dapps/views/pages/components/featured.dart b/lib/app/features/dapps/views/components/featured.dart similarity index 73% rename from lib/app/features/dapps/views/pages/components/featured.dart rename to lib/app/features/dapps/views/components/featured.dart index 921af3647..ec4b93ecb 100644 --- a/lib/app/features/dapps/views/pages/components/featured.dart +++ b/lib/app/features/dapps/views/components/featured.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -import 'package:ice/app/components/section_header/section_header.dart'; import 'package:ice/app/extensions/build_context.dart'; -import 'package:ice/app/features/dapps/views/pages/components/featured_collection.dart'; +import 'package:ice/app/features/dapps/views/components/featured_collection.dart'; +import 'package:ice/app/features/dapps/views/components/section_header/section_header.dart'; import 'package:ice/app/features/dapps/views/pages/mocks/mocked_featured.dart'; class Featured extends StatelessWidget { diff --git a/lib/app/features/dapps/views/pages/components/featured_collection.dart b/lib/app/features/dapps/views/components/featured_collection.dart similarity index 100% rename from lib/app/features/dapps/views/pages/components/featured_collection.dart rename to lib/app/features/dapps/views/components/featured_collection.dart diff --git a/lib/app/components/nav_header_offset/nav_header_offset.dart b/lib/app/features/dapps/views/components/nav_header_offset/nav_header_offset.dart similarity index 100% rename from lib/app/components/nav_header_offset/nav_header_offset.dart rename to lib/app/features/dapps/views/components/nav_header_offset/nav_header_offset.dart diff --git a/lib/app/components/section_header/section_header.dart b/lib/app/features/dapps/views/components/section_header/section_header.dart similarity index 100% rename from lib/app/components/section_header/section_header.dart rename to lib/app/features/dapps/views/components/section_header/section_header.dart diff --git a/lib/app/components/wallet_header/wallet_header.dart b/lib/app/features/dapps/views/components/wallet_header/wallet_header.dart similarity index 100% rename from lib/app/components/wallet_header/wallet_header.dart rename to lib/app/features/dapps/views/components/wallet_header/wallet_header.dart diff --git a/lib/app/features/dapps/views/pages/dapps.dart b/lib/app/features/dapps/views/pages/dapps.dart index 431bc765c..27e646b5f 100644 --- a/lib/app/features/dapps/views/pages/dapps.dart +++ b/lib/app/features/dapps/views/pages/dapps.dart @@ -1,13 +1,13 @@ import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:ice/app/components/wallet_header/wallet_header.dart'; import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/extensions/theme_data.dart'; -import 'package:ice/app/features/dapps/views/pages/components/apps.dart'; -import 'package:ice/app/features/dapps/views/pages/components/categories.dart'; -import 'package:ice/app/features/dapps/views/pages/components/favourites.dart'; -import 'package:ice/app/features/dapps/views/pages/components/featured.dart'; +import 'package:ice/app/features/dapps/views/components/apps.dart'; +import 'package:ice/app/features/dapps/views/components/categories.dart'; +import 'package:ice/app/features/dapps/views/components/favourites.dart'; +import 'package:ice/app/features/dapps/views/components/featured.dart'; +import 'package:ice/app/features/dapps/views/components/wallet_header/wallet_header.dart'; import 'package:ice/app/features/dapps/views/pages/mocks/mocked_apps.dart'; class DAppsPage extends HookConsumerWidget { diff --git a/lib/app/features/dapps/views/pages/dapps_list/dapps_list.dart b/lib/app/features/dapps/views/pages/dapps_list/dapps_list.dart index f8da3b15c..3da04daf5 100644 --- a/lib/app/features/dapps/views/pages/dapps_list/dapps_list.dart +++ b/lib/app/features/dapps/views/pages/dapps_list/dapps_list.dart @@ -1,12 +1,12 @@ import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:ice/app/components/nav_header_offset/nav_header_offset.dart'; import 'package:ice/app/components/navigation_header/navigation_header.dart'; import 'package:ice/app/components/search/search.dart'; import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/extensions/theme_data.dart'; -import 'package:ice/app/features/dapps/views/pages/components/apps_collection.dart'; +import 'package:ice/app/features/dapps/views/components/apps_collection.dart'; +import 'package:ice/app/features/dapps/views/components/nav_header_offset/nav_header_offset.dart'; import 'package:ice/app/features/dapps/views/pages/mocks/mocked_apps.dart'; class DAppsList extends HookConsumerWidget { From 35296410279a06afe58ae242b8fe19b93b8e2b1f Mon Sep 17 00:00:00 2001 From: ice-orion <102020833+ice-orion@users.noreply.github.com> Date: Mon, 12 Feb 2024 20:39:57 +0400 Subject: [PATCH 13/13] chore: set pickerImageQuality to const --- lib/app/utils/image.dart | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/app/utils/image.dart b/lib/app/utils/image.dart index df152faa5..3a83ed6cd 100644 --- a/lib/app/utils/image.dart +++ b/lib/app/utils/image.dart @@ -6,10 +6,12 @@ String getAdaptiveImageUrl(String imageUrl, double imageWidth) { return '$imageUrl?width=${imageWidth.toInt()}'; } +const int pickerImageQuality = 50; + Future pickImageFromGallery() async { final XFile? pickedFile = await ImagePicker().pickImage( source: ImageSource.gallery, - imageQuality: 50, + imageQuality: pickerImageQuality, ); return _cropImage(pickedFile?.path); } @@ -17,7 +19,7 @@ Future pickImageFromGallery() async { Future takePhoto() async { final XFile? capturedFile = await ImagePicker().pickImage( source: ImageSource.camera, - imageQuality: 50, + imageQuality: pickerImageQuality, ); return _cropImage(capturedFile?.path); }