Commit cc202df4 authored by DatHV's avatar DatHV
Browse files

update change id, popup common manager

parent 417358c5
import 'package:flutter/cupertino.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:mypoint_flutter_app/screen/news/news_list_screen.dart'; import 'package:mypoint_flutter_app/screen/news/news_list_screen.dart';
import '../screen/achievement/achievement_list_screen.dart'; import '../screen/achievement/achievement_list_screen.dart';
...@@ -6,6 +5,7 @@ import '../screen/affiliate/affiliate_tab_screen.dart'; ...@@ -6,6 +5,7 @@ import '../screen/affiliate/affiliate_tab_screen.dart';
import '../screen/affiliate_brand_detail/affiliate_brand_detail_screen.dart'; import '../screen/affiliate_brand_detail/affiliate_brand_detail_screen.dart';
import '../screen/affiliate_brand_detail/affiliate_brand_list_screen.dart'; import '../screen/affiliate_brand_detail/affiliate_brand_list_screen.dart';
import '../screen/affiliate_brand_detail/affiliate_category_grid_screen.dart'; import '../screen/affiliate_brand_detail/affiliate_category_grid_screen.dart';
import '../screen/bank_account_manager/bank_account_manager_screen.dart';
import '../screen/campaign7day/campaign_7day_screen.dart'; import '../screen/campaign7day/campaign_7day_screen.dart';
import '../screen/contacts/contacts_list_screen.dart'; import '../screen/contacts/contacts_list_screen.dart';
import '../screen/daily_checkin/daily_checkin_screen.dart'; import '../screen/daily_checkin/daily_checkin_screen.dart';
...@@ -40,6 +40,7 @@ import '../screen/transaction/history/transaction_history_detail_screen.dart'; ...@@ -40,6 +40,7 @@ import '../screen/transaction/history/transaction_history_detail_screen.dart';
import '../screen/transaction/transaction_detail_screen.dart'; import '../screen/transaction/transaction_detail_screen.dart';
import '../screen/transaction/transactions_history_screen.dart'; import '../screen/transaction/transactions_history_screen.dart';
import '../screen/voucher/detail/voucher_detail_screen.dart'; import '../screen/voucher/detail/voucher_detail_screen.dart';
import '../screen/voucher/my_voucher/my_mobile_card_list_widget.dart';
import '../screen/voucher/my_voucher/my_product_list_widget.dart'; import '../screen/voucher/my_voucher/my_product_list_widget.dart';
import '../screen/voucher/voucher_list/voucher_list_screen.dart'; import '../screen/voucher/voucher_list/voucher_list_screen.dart';
import '../screen/vplay_game_center/vplay_game_center_screen.dart'; import '../screen/vplay_game_center/vplay_game_center_screen.dart';
...@@ -91,6 +92,8 @@ const campaignSevenDayScreen = '/campaignSevenDayScreen'; ...@@ -91,6 +92,8 @@ const campaignSevenDayScreen = '/campaignSevenDayScreen';
const surveyQuestionScreen = '/surveyQuestionScreen'; const surveyQuestionScreen = '/surveyQuestionScreen';
const deviceManagerScreen = '/deviceManagerScreen'; const deviceManagerScreen = '/deviceManagerScreen';
const interestCategoriesScreen = '/interestCategoriesScreen'; const interestCategoriesScreen = '/interestCategoriesScreen';
const myMobileCardListScreen = '/myMobileCardListScreen';
const bankAccountManagerScreen = '/bankAccountManagerScreen';
class RouterPage { class RouterPage {
static List<GetPage> pages() { static List<GetPage> pages() {
...@@ -151,7 +154,9 @@ class RouterPage { ...@@ -151,7 +154,9 @@ class RouterPage {
GetPage(name: campaignSevenDayScreen, page: () => Campaign7DayScreen()), GetPage(name: campaignSevenDayScreen, page: () => Campaign7DayScreen()),
GetPage(name: surveyQuestionScreen, page: () => SurveyQuestionScreen()), GetPage(name: surveyQuestionScreen, page: () => SurveyQuestionScreen()),
GetPage(name: deviceManagerScreen, page: () => DeviceManagerScreen()), GetPage(name: deviceManagerScreen, page: () => DeviceManagerScreen()),
GetPage(name: myMobileCardListScreen, page: () => MyMobileCardListScreen()),
GetPage(name: interestCategoriesScreen, page: () => InterestCategoriesScreen()), GetPage(name: interestCategoriesScreen, page: () => InterestCategoriesScreen()),
GetPage(name: bankAccountManagerScreen, page: () => BankAccountManagerScreen()),
]; ];
} }
} }
\ No newline at end of file
...@@ -5,14 +5,14 @@ import 'image_loader.dart'; ...@@ -5,14 +5,14 @@ import 'image_loader.dart';
class CustomNavigationBar extends StatelessWidget implements PreferredSizeWidget { class CustomNavigationBar extends StatelessWidget implements PreferredSizeWidget {
final String title; final String title;
final String? backgroundImage; final String? backgroundImage;
final bool showBackButton; final List<Widget> leftButtons;
final List<Widget> rightButtons; final List<Widget> rightButtons;
const CustomNavigationBar({ const CustomNavigationBar({
super.key, super.key,
required this.title, required this.title,
this.backgroundImage = "assets/images/bg_header_navi.png", this.backgroundImage = "assets/images/bg_header_navi.png",
this.showBackButton = true, this.leftButtons = const [CustomBackButton()],
this.rightButtons = const [], this.rightButtons = const [],
}); });
...@@ -58,7 +58,9 @@ class CustomNavigationBar extends StatelessWidget implements PreferredSizeWidget ...@@ -58,7 +58,9 @@ class CustomNavigationBar extends StatelessWidget implements PreferredSizeWidget
textAlign: TextAlign.center, textAlign: TextAlign.center,
), ),
// Back button bên trái // Back button bên trái
if (showBackButton) Positioned(left: 12, child: CustomBackButton()), // if (showBackButton) Positioned(left: 12, child: CustomBackButton()),
if (leftButtons.isNotEmpty)
Positioned(left: 12, child: Row(mainAxisSize: MainAxisSize.min, children: leftButtons)),
// Buttons bên phải // Buttons bên phải
if (rightButtons != null) if (rightButtons != null)
Positioned(right: 12, child: Row(mainAxisSize: MainAxisSize.min, children: rightButtons!)), Positioned(right: 12, child: Row(mainAxisSize: MainAxisSize.min, children: rightButtons!)),
......
...@@ -57,7 +57,7 @@ dependencies: ...@@ -57,7 +57,7 @@ dependencies:
infinite_carousel: ^1.0.3 infinite_carousel: ^1.0.3
package_info_plus: ^4.1.0 package_info_plus: ^4.1.0
dotted_border: ^2.0.0 dotted_border: ^2.0.0
contacts_service: ^0.6.3 # contacts_service: ^0.6.3
flutter_contacts: ^1.1.6 flutter_contacts: ^1.1.6
permission_handler: ^11.0.0 permission_handler: ^11.0.0
share_plus: ^7.2.1 share_plus: ^7.2.1
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment