Skip to content

Commit

Permalink
v6.6.1 updates
Browse files Browse the repository at this point in the history
  • Loading branch information
agordn52 committed May 28, 2023
1 parent 05a7aed commit 688ce6b
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 10 deletions.
11 changes: 6 additions & 5 deletions LabelStoreMax/lib/resources/widgets/compo_theme_widget.dart
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import 'package:flutter_app/resources/pages/wishlist_page_widget.dart';
import 'package:flutter_app/resources/pages/home_search_page.dart';
import 'package:flutter_app/resources/widgets/app_loader_widget.dart';
import 'package:flutter_app/resources/widgets/compo_home_widget.dart';
import 'package:nylo_framework/nylo_framework.dart';
import 'package:woosignal/models/response/woosignal_app.dart';

class CompoThemeWidget extends StatefulWidget {
Expand Down Expand Up @@ -87,7 +88,7 @@ class CompoThemeWidgetState extends State<CompoThemeWidget> {
id: 1,
bottomNavigationBarItem: BottomNavigationBarItem(
icon: Icon(Icons.home),
label: 'Home',
label: 'Home'.tr(),
),
tabWidget: CompoHomeWidget(wooSignalApp: widget.wooSignalApp)),
);
Expand All @@ -97,7 +98,7 @@ class CompoThemeWidgetState extends State<CompoThemeWidget> {
id: 2,
bottomNavigationBarItem: BottomNavigationBarItem(
icon: Icon(Icons.search),
label: 'Search',
label: 'Search'.tr(),
),
tabWidget: HomeSearchPage()),
);
Expand All @@ -107,7 +108,7 @@ class CompoThemeWidgetState extends State<CompoThemeWidget> {
id: 3,
bottomNavigationBarItem: BottomNavigationBarItem(
icon: Icon(Icons.favorite_border),
label: 'Wishlist',
label: 'Wishlist'.tr(),
),
tabWidget: WishListPageWidget(),
));
Expand All @@ -116,15 +117,15 @@ class CompoThemeWidgetState extends State<CompoThemeWidget> {
items.add(BottomNavItem(
id: 4,
bottomNavigationBarItem: BottomNavigationBarItem(
icon: Icon(Icons.shopping_cart), label: 'Cart'),
icon: Icon(Icons.shopping_cart), label: 'Cart'.tr()),
tabWidget: CartPage(),
));

if (AppHelper.instance.appConfig!.wpLoginEnabled == 1) {
items.add(BottomNavItem(
id: 5,
bottomNavigationBarItem:
BottomNavigationBarItem(icon: Icon(Icons.person), label: 'Account'),
BottomNavigationBarItem(icon: Icon(Icons.person), label: 'Account'.tr()),
tabWidget: (await authCheck())
? AccountDetailPage(showLeadingBackButton: false)
: AccountLandingPage(
Expand Down
15 changes: 10 additions & 5 deletions LabelStoreMax/lib/resources/widgets/notic_theme_widget.dart
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import 'package:flutter_app/resources/pages/wishlist_page_widget.dart';
import 'package:flutter_app/resources/pages/home_search_page.dart';
import 'package:flutter_app/resources/widgets/app_loader_widget.dart';
import 'package:flutter_app/resources/widgets/notic_home_widget.dart';
import 'package:nylo_framework/nylo_framework.dart';
import 'package:woosignal/models/response/woosignal_app.dart';

class NoticThemeWidget extends StatefulWidget {
Expand Down Expand Up @@ -86,7 +87,7 @@ class _NoticThemeWidgetState extends State<NoticThemeWidget> {
id: 1,
bottomNavigationBarItem: BottomNavigationBarItem(
icon: Icon(Icons.home),
label: 'Home',
label: 'Home'.tr(),
),
tabWidget: NoticHomeWidget(wooSignalApp: widget.wooSignalApp)),
);
Expand All @@ -96,7 +97,7 @@ class _NoticThemeWidgetState extends State<NoticThemeWidget> {
id: 2,
bottomNavigationBarItem: BottomNavigationBarItem(
icon: Icon(Icons.search),
label: 'Search',
label: 'Search'.tr(),
),
tabWidget: HomeSearchPage()),
);
Expand All @@ -106,7 +107,7 @@ class _NoticThemeWidgetState extends State<NoticThemeWidget> {
id: 3,
bottomNavigationBarItem: BottomNavigationBarItem(
icon: Icon(Icons.favorite_border),
label: 'Wishlist',
label: 'Wishlist'.tr(),
),
tabWidget: WishListPageWidget(),
));
Expand All @@ -115,15 +116,19 @@ class _NoticThemeWidgetState extends State<NoticThemeWidget> {
items.add(BottomNavItem(
id: 4,
bottomNavigationBarItem: BottomNavigationBarItem(
icon: Icon(Icons.shopping_cart), label: 'Cart'),
icon: Icon(Icons.shopping_cart),
label: 'Cart'.tr(),
),
tabWidget: CartPage(),
));

if (AppHelper.instance.appConfig!.wpLoginEnabled == 1) {
items.add(BottomNavItem(
id: 5,
bottomNavigationBarItem:
BottomNavigationBarItem(icon: Icon(Icons.person), label: 'Account'),
BottomNavigationBarItem(icon: Icon(Icons.person),
label: 'Account'.tr(),
),
tabWidget: (await authCheck())
? AccountDetailPage(showLeadingBackButton: false)
: AccountLandingPage(
Expand Down

0 comments on commit 688ce6b

Please sign in to comment.