update authen 401, device manager, interestied category

lib/screen/topup/topup_screen.dart

@@ -6,7 +6,7 @@ import 'package:mypoint_flutter_app/screen/topup/topup_viewmodel.dart';
 import 'package:mypoint_flutter_app/widgets/custom_navigation_bar.dart';
 import 'package:mypoint_flutter_app/widgets/image_loader.dart';
 import '../../preference/data_preference.dart';
-import '../../resouce/base_color.dart';
+import '../../resources/base_color.dart';
 import '../../shared/router_gage.dart';
 import 'brand_select_sheet_widget.dart';
 

lib/screen/traffic_service/traffic_service_certificate_screen.dart

@@ -7,7 +7,7 @@ import 'package:path_provider/path_provider.dart';
 import 'package:http/http.dart' as http;
 import '../../base/base_screen.dart';
 import '../../base/basic_state.dart';
-import '../../resouce/base_color.dart';
+import '../../resources/base_color.dart';
 import '../../widgets/custom_navigation_bar.dart';
 import 'dart:typed_data' as typed_data;
 

lib/screen/traffic_service/traffic_service_detail_screen.dart

@@ -5,7 +5,7 @@ import 'package:mypoint_flutter_app/screen/traffic_service/traffic_service_model
 import 'package:mypoint_flutter_app/screen/traffic_service/traffic_service_viewmodel.dart';
 import 'package:mypoint_flutter_app/widgets/custom_empty_widget.dart';
 import 'package:url_launcher/url_launcher.dart';
-import '../../resouce/base_color.dart';
+import '../../resources/base_color.dart';
 import '../../widgets/custom_navigation_bar.dart';
 
 class TrafficServiceDetailScreen extends StatefulWidget {

lib/screen/traffic_service/traffic_service_screen.dart

@@ -2,13 +2,12 @@ import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:mypoint_flutter_app/extensions/datetime_extensions.dart';
 import 'package:mypoint_flutter_app/extensions/string_extension.dart';
-import 'package:mypoint_flutter_app/resouce/base_color.dart';
 import 'package:mypoint_flutter_app/screen/traffic_service/traffic_service_detail_screen.dart';
 import 'package:mypoint_flutter_app/screen/traffic_service/traffic_service_viewmodel.dart';
 import 'package:mypoint_flutter_app/widgets/custom_empty_widget.dart';
 import 'package:mypoint_flutter_app/widgets/image_loader.dart';
-
 import '../../extensions/date_format.dart';
+import '../../resources/base_color.dart';
 import '../../shared/router_gage.dart';
 import '../../widgets/custom_navigation_bar.dart';
 

lib/screen/transaction/history/transaction_history_detail_screen.dart

@@ -6,7 +6,7 @@ import 'package:mypoint_flutter_app/shared/router_gage.dart';
 import 'package:mypoint_flutter_app/widgets/dashed_line.dart';
 import '../../../base/base_screen.dart';
 import '../../../base/basic_state.dart';
-import '../../../resouce/base_color.dart';
+import '../../../resources/base_color.dart';
 import '../../../widgets/back_button.dart';
 import '../../../widgets/image_loader.dart';
 import 'transaction_history_detail_viewmodel.dart';

lib/screen/transaction/transaction_detail_screen.dart

@@ -2,9 +2,9 @@ import 'dart:core';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:intl/intl.dart';
-import 'package:mypoint_flutter_app/resouce/base_color.dart';
 import '../../base/base_screen.dart';
 import '../../base/basic_state.dart';
+import '../../resources/base_color.dart';
 import '../../widgets/custom_app_bar.dart';
 import '../../widgets/image_loader.dart';
 import '../voucher/models/product_model.dart';

lib/screen/transaction/transactions_history_screen.dart

@@ -5,7 +5,7 @@ import 'package:mypoint_flutter_app/extensions/datetime_extensions.dart';
 import 'package:mypoint_flutter_app/screen/transaction/transactions_history_viewmodel.dart';
 import 'package:mypoint_flutter_app/widgets/custom_empty_widget.dart';
 import 'package:mypoint_flutter_app/widgets/image_loader.dart';
-import '../../resouce/base_color.dart';
+import '../../resources/base_color.dart';
 import '../../shared/router_gage.dart';
 import '../../widgets/custom_navigation_bar.dart';
 import 'history/transaction_history_model.dart';

lib/screen/voucher/detail/voucher_detail_screen.dart

@@ -9,7 +9,7 @@ import 'package:url_launcher/url_launcher.dart';
 import '../../../base/base_screen.dart';
 import '../../../base/basic_state.dart';
 import '../../../preference/point/point_manager.dart';
-import '../../../resouce/base_color.dart';
+import '../../../resources/base_color.dart';
 import '../../../shared/router_gage.dart';
 import '../../../widgets/alert/data_alert_model.dart';
 import '../../../widgets/back_button.dart';

lib/screen/voucher/sub_widget/voucher_action_menu.dart

@@ -4,7 +4,7 @@ import 'package:get/get_core/src/get_main.dart';
 
 import '../../../directional/directional_action_type.dart';
 import '../../../directional/directional_screen.dart';
-import '../../../resouce/base_color.dart';
+import '../../../resources/base_color.dart';
 import '../../../shared/router_gage.dart';
 
 class VoucherActionMenu extends StatelessWidget {

lib/screen/voucher/sub_widget/voucher_item_list.dart

@@ -3,7 +3,7 @@ import 'package:get/get.dart';
 import 'package:get/get_core/src/get_main.dart';
 import 'package:mypoint_flutter_app/extensions/num_extension.dart';
 import 'package:mypoint_flutter_app/shared/router_gage.dart';
-import '../../../resouce/base_color.dart';
+import '../../../resources/base_color.dart';
 import '../../../widgets/custom_price_tag.dart';
 import '../../../widgets/image_loader.dart';
 import '../models/product_model.dart';

lib/screen/voucher/voucher_code_card_screen.dart

 import 'package:barcode_widget/barcode_widget.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:mypoint_flutter_app/resouce/base_color.dart';
 import 'package:mypoint_flutter_app/widgets/back_button.dart';
 import 'package:mypoint_flutter_app/widgets/dashed_line.dart';
 import 'package:qr_flutter/qr_flutter.dart';
+import '../../resources/base_color.dart';
 import '../../widgets/custom_point_text_tag.dart';
 import '../../widgets/image_loader.dart';
 import 'models/product_model.dart';

lib/screen/webview/payment_web_view_screen.dart

+import 'package:flutter/foundation.dart';
+import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:mypoint_flutter_app/widgets/custom_app_bar.dart';
@@ -6,7 +8,7 @@ import 'package:url_launcher/url_launcher.dart';
 
 import '../../base/base_screen.dart';
 import '../../base/basic_state.dart';
-import '../../resouce/base_color.dart';
+import '../../resources/base_color.dart';
 import '../../shared/router_gage.dart';
 import '../../widgets/alert/data_alert_model.dart';
 import '../../widgets/back_button.dart';
@@ -134,7 +136,12 @@ class _PaymentWebViewScreenState extends BaseState<PaymentWebViewScreen> with Ba
       ),
       body: Stack(
         children: [
-          WebViewWidget(controller: _controller),
+          WebViewWidget(
+            controller: _controller,
+            gestureRecognizers: const <Factory<OneSequenceGestureRecognizer>>{
+              Factory<VerticalDragGestureRecognizer>(VerticalDragGestureRecognizer.new),
+            },
+          ),
           if (_isLoading) const Center(child: CircularProgressIndicator()),
         ],
       ),

lib/shared/router_gage.dart

@@ -10,11 +10,13 @@ import '../screen/campaign7day/campaign_7day_screen.dart';
 import '../screen/contacts/contacts_list_screen.dart';
 import '../screen/daily_checkin/daily_checkin_screen.dart';
 import '../screen/data_network_service/data_network_service_screen.dart';
+import '../screen/device_manager/device_manager_screen.dart';
 import '../screen/electric_payment/electric_payment_history_screen.dart';
 import '../screen/electric_payment/electric_payment_screen.dart';
 import '../screen/game/game_cards/game_card_screen.dart';
 import '../screen/game/game_tab_screen.dart';
 import '../screen/history_point_cashback/history_point_cashback_screen.dart';
+import '../screen/interested_categories/interestied_categories_screen.dart';
 import '../screen/invite_friend_campaign/invite_friend_campaign_screen.dart';
 import '../screen/location_address/location_address_screen.dart';
 import '../screen/login/login_screen.dart';
@@ -87,6 +89,8 @@ const trafficServiceScreen = '/trafficServiceScreen';
 const trafficServiceDetailScreen = '/trafficServiceDetailScreen';
 const campaignSevenDayScreen = '/campaignSevenDayScreen';
 const surveyQuestionScreen = '/surveyQuestionScreen';
+const deviceManagerScreen = '/deviceManagerScreen';
+const interestCategoriesScreen = '/interestCategoriesScreen';
 
 class RouterPage {
   static List<GetPage> pages() {
@@ -146,6 +150,8 @@ class RouterPage {
       GetPage(name: trafficServiceDetailScreen, page: () => TrafficServiceDetailScreen()),
       GetPage(name: campaignSevenDayScreen, page: () => Campaign7DayScreen()),
       GetPage(name: surveyQuestionScreen, page: () => SurveyQuestionScreen()),
+      GetPage(name: deviceManagerScreen, page: () => DeviceManagerScreen()),
+      GetPage(name: interestCategoriesScreen, page: () => InterestCategoriesScreen()),
     ];
   }
 }
\ No newline at end of file

lib/widgets/alert/custom_alert_dialog.dart

 import 'package:flutter/material.dart';
 import 'package:flutter_widget_from_html/flutter_widget_from_html.dart';
 import 'package:get/get.dart';
-import '../../resouce/base_color.dart';
+import '../../resources/base_color.dart';
 import '../image_loader.dart';
 import 'data_alert_model.dart';
 

lib/widgets/alert/popup_data_model.dart

-import '../../resouce/base_color.dart';
 import 'button_config_model.dart';
 import 'package:json_annotation/json_annotation.dart';
-
 import 'data_alert_model.dart';
 
 part 'popup_data_model.g.dart';

lib/widgets/back_button.dart

@@ -2,9 +2,10 @@ import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:get/get_core/src/get_main.dart';
 import 'package:mypoint_flutter_app/preference/data_preference.dart';
-import 'package:mypoint_flutter_app/resouce/base_color.dart';
 import 'package:mypoint_flutter_app/shared/router_gage.dart';
 
+import '../resources/base_color.dart';
+
 class CustomBackButton extends StatelessWidget {
   final VoidCallback? onPressed;
   final Color? iconColor;

lib/widgets/custom_navigation_bar.dart

@@ -54,7 +54,7 @@ class CustomNavigationBar extends StatelessWidget implements PreferredSizeWidget
                 Text(
                   title,
                   maxLines: 1,
-                  style: const TextStyle(fontSize: 17, fontWeight: FontWeight.w800, color: Colors.white),
+                  style: const TextStyle(fontSize: 18, fontWeight: FontWeight.w800, color: Colors.white),
                   textAlign: TextAlign.center,
                 ),
                 // Back button bên trái

lib/widgets/custom_price_tag.dart

 import 'package:flutter/material.dart';
-
 import '../extensions/num_extension.dart';
-import '../resouce/base_color.dart';
+import '../resources/base_color.dart';
 
 class PriceTagWidget extends StatelessWidget {
   final int point;

lib/widgets/support_button.dart

 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import '../resouce/base_color.dart';
+import '../resources/base_color.dart';
 import '../screen/support/support_screen.dart';
 
 class SupportButton extends StatelessWidget {