Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions lib/i18n/app_localizations_en.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// ignore: unused_import
import 'package:intl/intl.dart' as intl;

import 'app_localizations.dart';

// ignore_for_file: type=lint
Expand Down
4 changes: 2 additions & 2 deletions lib/presentation/home/home_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import 'package:skelter/presentation/home/bloc/home_bloc.dart';
import 'package:skelter/presentation/home/bloc/home_event.dart';
import 'package:skelter/presentation/home/widgets/bottom_nav_bar.dart';
import 'package:skelter/presentation/home/widgets/home_screen_body.dart';
import 'package:skelter/presentation/my_orders/my_orders_screen.dart';
import 'package:skelter/presentation/profile/profile_screen.dart';
import 'package:skelter/presentation/search/search_screen.dart';
import 'package:skelter/services/in_app_review_service.dart';
import 'package:skelter/utils/app_environment.dart';

Expand Down Expand Up @@ -51,7 +51,7 @@ class HomeScreenWrapperState extends State<HomeScreenWrapper> {
Widget build(BuildContext context) {
final List<Widget> pages = [
HomeScreenBody(bottomNavKey: bottomNavKey),
const SearchScreen(),
const MyOrdersScreen(),
const InitialCheckoutScreen(),
const ProfileScreen(),
];
Expand Down
4 changes: 2 additions & 2 deletions lib/presentation/home/widgets/bottom_nav_bar.dart
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ class BottomNavBar extends StatelessWidget {
label: context.localization.home,
),
BottomNavigationBarItem(
icon: const Icon(TablerIcons.search),
label: context.localization.search,
icon: const Icon(TablerIcons.package),
label: context.localization.my_orders,
),
BottomNavigationBarItem(
icon: const Icon(TablerIcons.shopping_cart),
Expand Down
3 changes: 1 addition & 2 deletions lib/presentation/my_orders/my_orders_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,7 @@ class MyOrdersScreenBody extends StatelessWidget {
return isLoading
? const MyOrdersShimmer()
: ListView.separated(
itemCount: products.take(2).length,
shrinkWrap: true,
itemCount: products.length,
padding: const EdgeInsets.all(12),
itemBuilder: (context, index) {
return MyOrderItem(product: products[index]);
Expand Down
11 changes: 1 addition & 10 deletions lib/presentation/my_orders/widgets/my_order_app_bar.dart
Original file line number Diff line number Diff line change
@@ -1,24 +1,15 @@
import 'package:auto_route/auto_route.dart';
import 'package:flutter/material.dart';
import 'package:flutter_tabler_icons/flutter_tabler_icons.dart';
import 'package:skelter/common/theme/text_style/app_text_styles.dart';
import 'package:skelter/i18n/localization.dart';
import 'package:skelter/utils/theme/extension/theme_extension.dart';
import 'package:skelter/widgets/app_button/app_button.dart';
import 'package:skelter/widgets/app_button/enums/app_button_size_enum.dart';

class MyOrderAppBar extends StatelessWidget implements PreferredSizeWidget {
const MyOrderAppBar({super.key});

@override
Widget build(BuildContext context) {
return AppBar(
leading: AppButton.icon(
iconData: TablerIcons.arrow_left,
iconOrTextColorOverride: context.currentTheme.iconNeutralDefault,
size: AppButtonSize.extraLarge,
onPressed: () => context.router.maybePop(),
),
automaticallyImplyLeading: false,
title: Text(
context.localization.my_orders,
style: AppTextStyles.h6SemiBold.copyWith(
Expand Down
28 changes: 14 additions & 14 deletions lib/presentation/order_detail/order_detail_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -101,23 +101,23 @@ class OrderDetailBody extends StatelessWidget {
appBar: const OrderDetailsAppBar(),
body: productDetail == null
? Center(child: Text(context.localization.opps_something_went_wrong))
: const SingleChildScrollView(
padding: EdgeInsets.all(16),
: SingleChildScrollView(
padding: const EdgeInsets.all(16),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
OrderDetailProductCard(),
SizedBox(height: 24),
OrderDetailPaymentMethod(),
SizedBox(height: 24),
TrackingDetails(),
SizedBox(height: 24),
OrderDetailShippingAddress(),
SizedBox(height: 24),
OrderDetailSummary(),
SizedBox(height: 24),
OrderDetailActionButtons(),
SizedBox(height: 24),
const OrderDetailProductCard(),
const SizedBox(height: 24),
const OrderDetailPaymentMethod(),
const SizedBox(height: 24),
const TrackingDetails(),
const SizedBox(height: 24),
const OrderDetailShippingAddress(),
const SizedBox(height: 24),
const OrderDetailSummary(),
const SizedBox(height: 24),
const OrderDetailActionButtons(),
SizedBox(height: 16 + context.bottomPadding),
],
),
),
Expand Down
9 changes: 1 addition & 8 deletions lib/presentation/profile/widgets/activity_section.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import 'package:skelter/common/theme/text_style/app_text_styles.dart';
import 'package:skelter/i18n/localization.dart';
import 'package:skelter/presentation/profile/widgets/community.dart';
import 'package:skelter/presentation/profile/widgets/divider.dart';
import 'package:skelter/presentation/profile/widgets/history_button.dart';
import 'package:skelter/presentation/profile/widgets/notifications.dart';
import 'package:skelter/utils/theme/extension/theme_extension.dart';

Expand All @@ -30,13 +29,7 @@ class ActivitySection extends StatelessWidget {
borderRadius: BorderRadius.circular(12.0),
),
child: const Column(
children: [
Notifications(),
ProfileItemsDivider(),
History(),
ProfileItemsDivider(),
Community(),
],
children: [Notifications(), ProfileItemsDivider(), Community()],
),
),
],
Expand Down
35 changes: 0 additions & 35 deletions lib/presentation/profile/widgets/history_button.dart

This file was deleted.

7 changes: 3 additions & 4 deletions lib/presentation/profile/widgets/notifications.dart
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import 'package:auto_route/auto_route.dart';
import 'package:flutter/material.dart';
import 'package:flutter_tabler_icons/flutter_tabler_icons.dart';
import 'package:skelter/common/theme/text_style/app_text_styles.dart';
import 'package:skelter/i18n/localization.dart';
import 'package:skelter/utils/extensions/build_context_ext.dart';
import 'package:skelter/routes.gr.dart';
import 'package:skelter/utils/theme/extension/theme_extension.dart';

class Notifications extends StatelessWidget {
Expand Down Expand Up @@ -32,9 +33,7 @@ class Notifications extends StatelessWidget {
TablerIcons.chevron_right,
color: context.currentTheme.iconNeutralDefault,
),
onTap: () {
context.showSnackBar('Show Notification details');
},
onTap: () => context.pushRoute(const NotificationsRoute()),
);
}
}
11 changes: 0 additions & 11 deletions lib/presentation/search/search_screen.dart

This file was deleted.

38 changes: 0 additions & 38 deletions lib/presentation/search/widgets/empty_search_view.dart

This file was deleted.

Binary file modified test/presentation/home/goldens/linux/home_screen.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/presentation/home/goldens/macos/home_screen.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 17 additions & 0 deletions test/presentation/home/home_screen_test.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import 'package:alchemist/alchemist.dart';
import 'package:bloc_test/bloc_test.dart';
import 'package:dartz/dartz.dart';
import 'package:firebase_core/firebase_core.dart';
import 'package:firebase_core_platform_interface/test.dart';
import 'package:flutter/material.dart';
Expand All @@ -11,7 +12,10 @@ import 'package:skelter/presentation/home/bloc/home_bloc.dart';
import 'package:skelter/presentation/home/bloc/home_event.dart';
import 'package:skelter/presentation/home/bloc/home_state.dart';
import 'package:skelter/presentation/home/data/dummy_product_data.dart';
import 'package:skelter/presentation/home/domain/entities/product.dart';
import 'package:skelter/presentation/home/domain/usecases/get_products.dart';
import 'package:skelter/presentation/home/home_screen.dart';
import 'package:skelter/presentation/product_detail/domain/usecases/get_product_detail.dart';
import 'package:skelter/services/performance_monitoring_service.dart';
import 'package:skelter/widgets/styling/app_theme_data.dart';

Expand All @@ -21,6 +25,10 @@ import '../../test_helpers.dart';

class MockHomeBloc extends MockBloc<HomeEvent, HomeState> implements HomeBloc {}

class MockGetProducts extends Mock implements GetProducts {}

class MockGetProductDetail extends Mock implements GetProductDetail {}

void main() {
TestWidgetsFlutterBinding.ensureInitialized();
late MockFirebasePerformance mockFirebasePerformance;
Expand All @@ -31,6 +39,15 @@ void main() {
sl.registerLazySingleton<PerformanceMonitoringService>(
() => PerformanceMonitoringService(performance: mockFirebasePerformance),
);

final mockGetProducts = MockGetProducts();
final mockGetProductDetail = MockGetProductDetail();
when(
() => mockGetProducts(),
).thenAnswer((_) async => const Right(<Product>[]));
sl.registerLazySingleton<GetProducts>(() => mockGetProducts);
sl.registerLazySingleton<GetProductDetail>(() => mockGetProductDetail);

setupFirebaseCoreMocks();
await Firebase.initializeApp(
name: 'tenantIdTest',
Expand Down
Binary file modified test/presentation/my_orders/goldens/linux/my_orders_app_bar.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/presentation/my_orders/goldens/linux/my_orders_screen.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/presentation/my_orders/goldens/macos/my_orders_app_bar.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/presentation/my_orders/goldens/macos/my_orders_screen.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/presentation/profile/goldens/macos/profile_page.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading