Update directory structure (#509)

AnalogIO · Sep 21, 2023 · facb451 · facb451
1 parent 1fd284e
commit facb451
Show file tree

Hide file tree

Showing 218 changed files with 379 additions and 409 deletions.
diff --git a/lib/app.dart b/lib/app.dart
@@ -1,11 +1,11 @@
-import 'package:coffeecard/base/strings.dart';
-import 'package:coffeecard/base/style/theme.dart';
-import 'package:coffeecard/cubits/authentication/authentication_cubit.dart';
+import 'package:coffeecard/core/strings.dart';
+import 'package:coffeecard/core/styles/theme.dart';
+import 'package:coffeecard/core/widgets/pages/splash/splash_error_page.dart';
+import 'package:coffeecard/core/widgets/pages/splash/splash_loading_page.dart';
+import 'package:coffeecard/core/widgets/routers/splash_router.dart';
+import 'package:coffeecard/features/authentication/presentation/cubits/authentication_cubit.dart';
 import 'package:coffeecard/features/environment/presentation/cubit/environment_cubit.dart';
 import 'package:coffeecard/service_locator.dart';
-import 'package:coffeecard/widgets/pages/splash/splash_error_page.dart';
-import 'package:coffeecard/widgets/pages/splash/splash_loading_page.dart';
-import 'package:coffeecard/widgets/routers/splash_router.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';

diff --git a/lib/base/strings_environment.dart b/lib/base/strings_environment.dart
diff --git a/lib/utils/api_uri_constants.dart → lib/core/api_uri_constants.dart b/lib/utils/api_uri_constants.dart → lib/core/api_uri_constants.dart
diff --git a/lib/utils/debouncing.dart → lib/core/debouncing.dart b/lib/utils/debouncing.dart → lib/core/debouncing.dart
diff --git a/lib/utils/encode_passcode.dart → lib/core/encode_passcode.dart b/lib/utils/encode_passcode.dart → lib/core/encode_passcode.dart
diff --git a/lib/core/errors/failures.dart b/lib/core/errors/failures.dart
@@ -1,7 +1,7 @@
 import 'dart:convert';
 
 import 'package:chopper/chopper.dart';
-import 'package:coffeecard/base/strings.dart';
+import 'package:coffeecard/core/strings.dart';
 import 'package:equatable/equatable.dart';
 
 abstract class Failure extends Equatable {

diff --git a/lib/core/external/external_url_launcher.dart b/lib/core/external/external_url_launcher.dart
@@ -1,4 +1,4 @@
-import 'package:coffeecard/base/strings.dart';
+import 'package:coffeecard/core/strings.dart';
 import 'package:flutter/material.dart';
 import 'package:url_launcher/url_launcher.dart' as url_launch;
 

diff --git a/...ils/firebase_analytics_event_logging.dart → ...ore/firebase_analytics_event_logging.dart b/...ils/firebase_analytics_event_logging.dart → ...ore/firebase_analytics_event_logging.dart
diff --git a/lib/utils/ignore_value.dart → lib/core/ignore_value.dart b/lib/utils/ignore_value.dart → lib/core/ignore_value.dart
diff --git a/lib/core/network/network_request_executor.dart b/lib/core/network/network_request_executor.dart
@@ -1,6 +1,6 @@
 import 'package:chopper/chopper.dart' show Response;
 import 'package:coffeecard/core/errors/failures.dart';
-import 'package:coffeecard/utils/firebase_analytics_event_logging.dart';
+import 'package:coffeecard/core/firebase_analytics_event_logging.dart';
 import 'package:fpdart/fpdart.dart';
 import 'package:logger/logger.dart';
 

diff --git a/lib/data/storage/secure_storage.dart → lib/core/storage/secure_storage.dart b/lib/data/storage/secure_storage.dart → lib/core/storage/secure_storage.dart
@@ -1,4 +1,4 @@
-import 'package:coffeecard/models/account/authenticated_user.dart';
+import 'package:coffeecard/features/authentication/domain/entities/authenticated_user.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:logger/logger.dart';
 

diff --git a/lib/base/strings.dart → lib/core/strings.dart b/lib/base/strings.dart → lib/core/strings.dart
@@ -35,6 +35,15 @@ abstract final class Strings {
   static String loginVerificationEmailBody(String email) =>
       'We have sent an email to $email, please check your spam folder';
 
+  // Environment
+  static const environmentTitle = 'Connected to test environment';
+  static const environmentDescription = [
+    'The functionality of this app is for testing purposes only.',
+    'User account information is not shared with the production environment. This means you will need a separate account for this environment.',
+    'Tickets you buy or swipe are *NOT VALID* for use at Cafe Analog.',
+  ];
+  static const environmentUnderstood = 'Understood';
+
   // Tickets
   static const ticketsMyTickets = 'My tickets';
   static const shopText = 'Shop';

diff --git a/lib/base/style/app_colors.dart → lib/core/styles/app_colors.dart b/lib/base/style/app_colors.dart → lib/core/styles/app_colors.dart
diff --git a/lib/base/style/app_text_styles.dart → lib/core/styles/app_text_styles.dart b/lib/base/style/app_text_styles.dart → lib/core/styles/app_text_styles.dart
@@ -1,5 +1,5 @@
-import 'package:coffeecard/base/style/app_colors.dart';
-import 'package:coffeecard/base/style/text_style_builder.dart';
+import 'package:coffeecard/core/styles/app_colors.dart';
+import 'package:coffeecard/core/styles/text_style_builder.dart';
 import 'package:flutter/material.dart';
 
 abstract final class AppTextStyle {

diff --git a/lib/base/style/text_style_builder.dart → lib/core/styles/text_style_builder.dart b/lib/base/style/text_style_builder.dart → lib/core/styles/text_style_builder.dart
diff --git a/lib/base/style/theme.dart → lib/core/styles/theme.dart b/lib/base/style/theme.dart → lib/core/styles/theme.dart
@@ -1,4 +1,4 @@
-import 'package:coffeecard/base/style/app_colors.dart';
+import 'package:coffeecard/core/styles/app_colors.dart';
 import 'package:flutter/material.dart';
 
 final ThemeData analogTheme = ThemeData(

diff --git a/lib/utils/email_is_valid.dart → lib/core/validator/email_is_valid.dart b/lib/utils/email_is_valid.dart → lib/core/validator/email_is_valid.dart
diff --git a/lib/utils/input_validator.dart → lib/core/validator/input_validator.dart b/lib/utils/input_validator.dart → lib/core/validator/input_validator.dart
@@ -1,6 +1,6 @@
 import 'dart:async';
 
-import 'package:coffeecard/utils/email_is_valid.dart';
+import 'package:coffeecard/core/validator/email_is_valid.dart';
 import 'package:fpdart/fpdart.dart';
 
 part 'input_validator_helpers.dart';

diff --git a/lib/utils/input_validator_helpers.dart → ...re/validator/input_validator_helpers.dart b/lib/utils/input_validator_helpers.dart → ...re/validator/input_validator_helpers.dart
diff --git a/...ts/tickets/bottom_modal_sheet_helper.dart → ...components/bottom_modal_sheet_helper.dart b/...ts/tickets/bottom_modal_sheet_helper.dart → ...components/bottom_modal_sheet_helper.dart
diff --git a/lib/widgets/components/card.dart → lib/core/widgets/components/card.dart b/lib/widgets/components/card.dart → lib/core/widgets/components/card.dart
@@ -1,4 +1,4 @@
-import 'package:coffeecard/widgets/components/helpers/tappable.dart';
+import 'package:coffeecard/core/widgets/components/helpers/tappable.dart';
 import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
 

diff --git a/...dgets/components/tickets/coffee_card.dart → lib/core/widgets/components/coffee_card.dart b/...dgets/components/tickets/coffee_card.dart → lib/core/widgets/components/coffee_card.dart
@@ -1,7 +1,7 @@
-import 'package:coffeecard/base/style/app_colors.dart';
-import 'package:coffeecard/base/style/app_text_styles.dart';
+import 'package:coffeecard/core/styles/app_colors.dart';
+import 'package:coffeecard/core/styles/app_text_styles.dart';
+import 'package:coffeecard/core/widgets/components/card.dart';
 import 'package:coffeecard/features/ticket/presentation/widgets/swipe_ticket_confirm.dart';
-import 'package:coffeecard/widgets/components/card.dart';
 import 'package:flutter/material.dart';
 
 class CoffeeCard extends StatelessWidget {

diff --git a/...ents/tickets/coffee_card_placeholder.dart → ...s/components/coffee_card_placeholder.dart b/...ents/tickets/coffee_card_placeholder.dart → ...s/components/coffee_card_placeholder.dart
@@ -1,6 +1,6 @@
-import 'package:coffeecard/base/strings.dart';
-import 'package:coffeecard/base/style/app_colors.dart';
-import 'package:coffeecard/base/style/app_text_styles.dart';
+import 'package:coffeecard/core/strings.dart';
+import 'package:coffeecard/core/styles/app_colors.dart';
+import 'package:coffeecard/core/styles/app_text_styles.dart';
 import 'package:dotted_border/dotted_border.dart';
 import 'package:flutter/material.dart';
 

diff --git a/lib/widgets/components/dialog.dart → lib/core/widgets/components/dialog.dart b/lib/widgets/components/dialog.dart → lib/core/widgets/components/dialog.dart
@@ -1,5 +1,5 @@
-import 'package:coffeecard/base/style/app_colors.dart';
-import 'package:coffeecard/base/style/app_text_styles.dart';
+import 'package:coffeecard/core/styles/app_colors.dart';
+import 'package:coffeecard/core/styles/app_text_styles.dart';
 import 'package:flutter/material.dart';
 
 Future<void> appDialog({

diff --git a/lib/widgets/components/dropdown.dart → lib/core/widgets/components/dropdown.dart b/lib/widgets/components/dropdown.dart → lib/core/widgets/components/dropdown.dart
@@ -1,5 +1,5 @@
-import 'package:coffeecard/base/style/app_colors.dart';
-import 'package:coffeecard/base/style/app_text_styles.dart';
+import 'package:coffeecard/core/styles/app_colors.dart';
+import 'package:coffeecard/core/styles/app_text_styles.dart';
 import 'package:flutter/material.dart';
 
 class Dropdown<FilterCategory> extends StatelessWidget {

diff --git a/lib/widgets/components/error_section.dart → ...ore/widgets/components/error_section.dart b/lib/widgets/components/error_section.dart → ...ore/widgets/components/error_section.dart
@@ -1,5 +1,5 @@
-import 'package:coffeecard/base/strings.dart';
-import 'package:coffeecard/widgets/components/tickets/rounded_button.dart';
+import 'package:coffeecard/core/strings.dart';
+import 'package:coffeecard/core/widgets/components/rounded_button.dart';
 import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
 

diff --git a/lib/widgets/components/helpers/grid.dart → ...core/widgets/components/helpers/grid.dart b/lib/widgets/components/helpers/grid.dart → ...core/widgets/components/helpers/grid.dart
@@ -1,4 +1,4 @@
-import 'package:coffeecard/utils/responsive.dart';
+import 'package:coffeecard/core/widgets/components/helpers/responsive.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_layout_grid/flutter_layout_grid.dart';

diff --git a/...omponents/helpers/lazy_indexed_stack.dart → ...omponents/helpers/lazy_indexed_stack.dart b/...omponents/helpers/lazy_indexed_stack.dart → ...omponents/helpers/lazy_indexed_stack.dart
diff --git a/lib/utils/responsive.dart → ...idgets/components/helpers/responsive.dart b/lib/utils/responsive.dart → ...idgets/components/helpers/responsive.dart
diff --git a/...s/components/helpers/shimmer_builder.dart → ...s/components/helpers/shimmer_builder.dart b/...s/components/helpers/shimmer_builder.dart → ...s/components/helpers/shimmer_builder.dart
@@ -1,4 +1,4 @@
-import 'package:coffeecard/base/style/app_colors.dart';
+import 'package:coffeecard/core/styles/app_colors.dart';
 import 'package:flutter/material.dart';
 import 'package:shimmer/shimmer.dart';
 

diff --git a/lib/widgets/components/helpers/tappable.dart → .../widgets/components/helpers/tappable.dart b/lib/widgets/components/helpers/tappable.dart → .../widgets/components/helpers/tappable.dart
@@ -1,4 +1,4 @@
-import 'package:coffeecard/base/style/app_colors.dart';
+import 'package:coffeecard/core/styles/app_colors.dart';
 import 'package:flutter/material.dart';
 
 class Tappable extends StatelessWidget {

diff --git a/...nents/helpers/unordered_list_builder.dart → ...nents/helpers/unordered_list_builder.dart b/...nents/helpers/unordered_list_builder.dart → ...nents/helpers/unordered_list_builder.dart
diff --git a/lib/widgets/components/loading.dart → lib/core/widgets/components/loading.dart b/lib/widgets/components/loading.dart → lib/core/widgets/components/loading.dart
diff --git a/lib/widgets/components/loading_overlay.dart → ...e/widgets/components/loading_overlay.dart b/lib/widgets/components/loading_overlay.dart → ...e/widgets/components/loading_overlay.dart
@@ -1,4 +1,4 @@
-import 'package:coffeecard/base/style/app_colors.dart';
+import 'package:coffeecard/core/styles/app_colors.dart';
 import 'package:flutter/material.dart';
 
 void showLoadingOverlay(BuildContext context) {

diff --git a/...ts/components/tickets/rounded_button.dart → ...re/widgets/components/rounded_button.dart b/...ts/components/tickets/rounded_button.dart → ...re/widgets/components/rounded_button.dart
@@ -1,5 +1,5 @@
-import 'package:coffeecard/base/style/app_colors.dart';
-import 'package:coffeecard/base/style/app_text_styles.dart';
+import 'package:coffeecard/core/styles/app_colors.dart';
+import 'package:coffeecard/core/styles/app_text_styles.dart';
 import 'package:flutter/material.dart';
 
 class RoundedButton extends StatelessWidget {

diff --git a/lib/widgets/components/scaffold.dart → lib/core/widgets/components/scaffold.dart b/lib/widgets/components/scaffold.dart → lib/core/widgets/components/scaffold.dart
@@ -1,5 +1,5 @@
-import 'package:coffeecard/base/style/app_colors.dart';
-import 'package:coffeecard/base/style/app_text_styles.dart';
+import 'package:coffeecard/core/styles/app_colors.dart';
+import 'package:coffeecard/core/styles/app_text_styles.dart';
 import 'package:coffeecard/features/environment/domain/entities/environment.dart';
 import 'package:coffeecard/features/environment/presentation/cubit/environment_cubit.dart';
 import 'package:coffeecard/features/environment/presentation/widgets/environment_banner.dart';

diff --git a/lib/widgets/components/section_title.dart → ...ore/widgets/components/section_title.dart b/lib/widgets/components/section_title.dart → ...ore/widgets/components/section_title.dart
@@ -1,4 +1,4 @@
-import 'package:coffeecard/base/style/app_text_styles.dart';
+import 'package:coffeecard/core/styles/app_text_styles.dart';
 import 'package:flutter/material.dart';
 
 class SectionTitle extends StatelessWidget {

diff --git a/...omponents/tickets/single_coffee_card.dart → ...idgets/components/single_coffee_card.dart b/...omponents/tickets/single_coffee_card.dart → ...idgets/components/single_coffee_card.dart
@@ -1,7 +1,7 @@
-import 'package:coffeecard/base/strings.dart';
-import 'package:coffeecard/base/style/app_colors.dart';
-import 'package:coffeecard/base/style/app_text_styles.dart';
-import 'package:coffeecard/widgets/components/helpers/tappable.dart';
+import 'package:coffeecard/core/strings.dart';
+import 'package:coffeecard/core/styles/app_colors.dart';
+import 'package:coffeecard/core/styles/app_text_styles.dart';
+import 'package:coffeecard/core/widgets/components/helpers/tappable.dart';
 import 'package:flutter/material.dart';
 
 class SingleCoffeeCard extends StatelessWidget {

diff --git a/...gets/components/tickets/slide_to_act.dart → ...core/widgets/components/slide_action.dart b/...gets/components/tickets/slide_to_act.dart → ...core/widgets/components/slide_action.dart
diff --git a/lib/utils/fast_slide_transition.dart → lib/core/widgets/fast_slide_transition.dart b/lib/utils/fast_slide_transition.dart → lib/core/widgets/fast_slide_transition.dart
diff --git a/lib/core/widgets/images/analog_logo.dart b/lib/core/widgets/images/analog_logo.dart
@@ -1,4 +1,4 @@
-import 'package:coffeecard/utils/responsive.dart';
+import 'package:coffeecard/core/widgets/components/helpers/responsive.dart';
 import 'package:flutter/material.dart';
 
 class AnalogLogo extends StatelessWidget {

diff --git a/lib/core/widgets/list_entry.dart b/lib/core/widgets/list_entry.dart
@@ -1,5 +1,5 @@
-import 'package:coffeecard/base/style/app_colors.dart';
-import 'package:coffeecard/widgets/components/helpers/tappable.dart';
+import 'package:coffeecard/core/styles/app_colors.dart';
+import 'package:coffeecard/core/widgets/components/helpers/tappable.dart';
 import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
 

diff --git a/lib/widgets/pages/home_page.dart → lib/core/widgets/pages/home_page.dart b/lib/widgets/pages/home_page.dart → lib/core/widgets/pages/home_page.dart
@@ -1,8 +1,10 @@
 import 'dart:math';
 
-import 'package:coffeecard/base/strings.dart';
-import 'package:coffeecard/base/style/app_colors.dart';
-import 'package:coffeecard/base/style/app_text_styles.dart';
+import 'package:coffeecard/core/strings.dart';
+import 'package:coffeecard/core/styles/app_colors.dart';
+import 'package:coffeecard/core/styles/app_text_styles.dart';
+import 'package:coffeecard/core/widgets/components/helpers/lazy_indexed_stack.dart';
+import 'package:coffeecard/core/widgets/routers/app_flow.dart';
 import 'package:coffeecard/features/leaderboard/presentation/cubit/leaderboard_cubit.dart';
 import 'package:coffeecard/features/leaderboard/presentation/pages/leaderboard_page.dart';
 import 'package:coffeecard/features/opening_hours/presentation/cubit/opening_hours_cubit.dart';
@@ -13,8 +15,6 @@ import 'package:coffeecard/features/ticket/presentation/cubit/tickets_cubit.dart
 import 'package:coffeecard/features/ticket/presentation/pages/tickets_page.dart';
 import 'package:coffeecard/features/user/presentation/cubit/user_cubit.dart';
 import 'package:coffeecard/service_locator.dart';
-import 'package:coffeecard/widgets/components/helpers/lazy_indexed_stack.dart';
-import 'package:coffeecard/widgets/routers/app_flow.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 

diff --git a/...dgets/pages/splash/splash_error_page.dart → ...dgets/pages/splash/splash_error_page.dart b/...dgets/pages/splash/splash_error_page.dart → ...dgets/pages/splash/splash_error_page.dart
@@ -1,8 +1,8 @@
-import 'package:coffeecard/base/strings.dart';
-import 'package:coffeecard/base/style/app_colors.dart';
-import 'package:coffeecard/base/style/app_text_styles.dart';
+import 'package:coffeecard/core/strings.dart';
+import 'package:coffeecard/core/styles/app_colors.dart';
+import 'package:coffeecard/core/styles/app_text_styles.dart';
+import 'package:coffeecard/core/widgets/components/loading_overlay.dart';
 import 'package:coffeecard/features/environment/presentation/cubit/environment_cubit.dart';
-import 'package:coffeecard/widgets/components/loading_overlay.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:gap/gap.dart';

diff --git a/...ets/pages/splash/splash_loading_page.dart → ...ets/pages/splash/splash_loading_page.dart b/...ets/pages/splash/splash_loading_page.dart → ...ets/pages/splash/splash_loading_page.dart
@@ -1,4 +1,4 @@
-import 'package:coffeecard/base/style/app_colors.dart';
+import 'package:coffeecard/core/styles/app_colors.dart';
 import 'package:coffeecard/core/widgets/images/analog_logo.dart';
 import 'package:flutter/material.dart';
 

diff --git a/lib/widgets/routers/app_flow.dart → lib/core/widgets/routers/app_flow.dart b/lib/widgets/routers/app_flow.dart → lib/core/widgets/routers/app_flow.dart
diff --git a/lib/widgets/routers/splash_router.dart → lib/core/widgets/routers/splash_router.dart b/lib/widgets/routers/splash_router.dart → lib/core/widgets/routers/splash_router.dart
@@ -1,8 +1,8 @@
-import 'package:coffeecard/base/style/app_colors.dart';
-import 'package:coffeecard/cubits/authentication/authentication_cubit.dart';
+import 'package:coffeecard/core/styles/app_colors.dart';
+import 'package:coffeecard/core/widgets/pages/home_page.dart';
+import 'package:coffeecard/features/authentication/presentation/cubits/authentication_cubit.dart';
 import 'package:coffeecard/features/environment/presentation/cubit/environment_cubit.dart';
 import 'package:coffeecard/features/login/presentation/pages/login_page_email.dart';
-import 'package:coffeecard/widgets/pages/home_page.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 

diff --git a/lib/data/api/README.md b/lib/data/api/README.md
diff --git a/...erceptors/authentication_interceptor.dart → ...ercepters/authentication_interceptor.dart b/...erceptors/authentication_interceptor.dart → ...ercepters/authentication_interceptor.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
 
 import 'package:chopper/chopper.dart';
-import 'package:coffeecard/data/storage/secure_storage.dart';
+import 'package:coffeecard/core/storage/secure_storage.dart';
 
 class AuthenticationInterceptor extends RequestInterceptor {
   final SecureStorage _storage;

diff --git a/lib/models/account/authenticated_user.dart → ...n/domain/entities/authenticated_user.dart b/lib/models/account/authenticated_user.dart → ...n/domain/entities/authenticated_user.dart
@@ -1,6 +1,5 @@
 import 'package:equatable/equatable.dart';
 
-/// A user's email and token.
 class AuthenticatedUser extends Equatable {
   final String email;
   final String token;
@@ -10,9 +9,6 @@ class AuthenticatedUser extends Equatable {
     required this.token,
   });
 
-  @override
-  String toString() => '$email | $token';
-
   @override
   List<Object?> get props => [email, token];
 }
diff --git a/.../authentication/authentication_cubit.dart → ...entation/cubits/authentication_cubit.dart b/.../authentication/authentication_cubit.dart → ...entation/cubits/authentication_cubit.dart
@@ -1,5 +1,5 @@
-import 'package:coffeecard/data/storage/secure_storage.dart';
-import 'package:coffeecard/models/account/authenticated_user.dart';
+import 'package:coffeecard/core/storage/secure_storage.dart';
+import 'package:coffeecard/features/authentication/domain/entities/authenticated_user.dart';
 import 'package:equatable/equatable.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 

diff --git a/.../authentication/authentication_state.dart → ...entation/cubits/authentication_state.dart b/.../authentication/authentication_state.dart → ...entation/cubits/authentication_state.dart
diff --git a/lib/features/contributor/presentation/pages/credits_page.dart b/lib/features/contributor/presentation/pages/credits_page.dart
@@ -1,16 +1,16 @@
-import 'package:coffeecard/base/strings.dart';
-import 'package:coffeecard/base/style/app_colors.dart';
-import 'package:coffeecard/base/style/app_text_styles.dart';
+import 'package:coffeecard/core/api_uri_constants.dart';
 import 'package:coffeecard/core/external/external_url_launcher.dart';
+import 'package:coffeecard/core/strings.dart';
+import 'package:coffeecard/core/styles/app_colors.dart';
+import 'package:coffeecard/core/styles/app_text_styles.dart';
+import 'package:coffeecard/core/widgets/components/scaffold.dart';
+import 'package:coffeecard/core/widgets/components/section_title.dart';
 import 'package:coffeecard/core/widgets/images/analogio_logo.dart';
 import 'package:coffeecard/features/contributor/presentation/cubit/contributor_cubit.dart';
 import 'package:coffeecard/features/contributor/presentation/widgets/contributor_card.dart';
 import 'package:coffeecard/features/settings/presentation/widgets/settings_group.dart';
 import 'package:coffeecard/features/settings/presentation/widgets/settings_list_entry.dart';
 import 'package:coffeecard/service_locator.dart';
-import 'package:coffeecard/utils/api_uri_constants.dart';
-import 'package:coffeecard/widgets/components/scaffold.dart';
-import 'package:coffeecard/widgets/components/section_title.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:gap/gap.dart';

diff --git a/lib/features/contributor/presentation/widgets/contributor_card.dart b/lib/features/contributor/presentation/widgets/contributor_card.dart
@@ -1,10 +1,10 @@
 import 'package:cached_network_image/cached_network_image.dart';
-import 'package:coffeecard/base/style/app_colors.dart';
-import 'package:coffeecard/base/style/app_text_styles.dart';
 import 'package:coffeecard/core/external/external_url_launcher.dart';
+import 'package:coffeecard/core/styles/app_colors.dart';
+import 'package:coffeecard/core/styles/app_text_styles.dart';
+import 'package:coffeecard/core/widgets/components/helpers/tappable.dart';
 import 'package:coffeecard/features/contributor/domain/entities/contributor.dart';
 import 'package:coffeecard/service_locator.dart';
-import 'package:coffeecard/widgets/components/helpers/tappable.dart';
 import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
 

diff --git a/lib/features/environment/presentation/widgets/environment_banner.dart b/lib/features/environment/presentation/widgets/environment_banner.dart
@@ -1,4 +1,4 @@
-import 'package:coffeecard/base/style/app_colors.dart';
+import 'package:coffeecard/core/styles/app_colors.dart';
 import 'package:coffeecard/features/environment/presentation/widgets/environment_button.dart';
 import 'package:flutter/material.dart';