Merge pull request 'feature/battle_league' (#7) from feature/battle_league into develop

Reviewed-on: #7

lib/common_ui/resources/my_colors.dart

@@ -9,4 +9,5 @@ class MyColors {
   static const Color black = Colors.black;
   static const Color transparent = Colors.transparent;
   static const Color backgroundColor = Color(0xFF160C30);
+  static const Color battleLeagueBackgroundColor = Color(0XFF390C82);
 }

lib/common_ui/theme/my_theme.dart

@@ -6,6 +6,7 @@ enum ColorsName {
   primaryColor,
   noColor,
   backgroundColor,
+  battleLeagueBackgroundColor,
 }
 
 class MyTheme {
@@ -21,12 +22,14 @@ class MyTheme {
     ColorsName.primaryColor: MyColors.white,
     ColorsName.noColor: MyColors.transparent,
     ColorsName.backgroundColor: MyColors.backgroundColor,
+    ColorsName.battleLeagueBackgroundColor: MyColors.battleLeagueBackgroundColor,
   };
 
   static Map<ColorsName, Color> get darkColors => {
     ColorsName.primaryColor: MyColors.white,
     ColorsName.noColor: MyColors.transparent,
     ColorsName.backgroundColor: MyColors.backgroundColor,
+    ColorsName.battleLeagueBackgroundColor: MyColors.battleLeagueBackgroundColor,
   };
 }
 
@@ -37,4 +40,5 @@ extension ThemeExtension on BuildContext {
   Color get primaryColor => customColors[ColorsName.primaryColor]!;
   Color get noColor => customColors[ColorsName.noColor]!;
   Color get backgroundColor => customColors[ColorsName.backgroundColor]!;
+  Color get battleLeagueBackgroundColor => customColors[ColorsName.battleLeagueBackgroundColor]!;
 }

lib/core/widgets/app_bar/my_app_bar.dart

@@ -36,6 +36,7 @@ class MyAppBar extends StatelessWidget implements PreferredSizeWidget {
       backgroundColor: backgroundColor,
       centerTitle: true,
       titleSpacing: MySpaces.s30,
+      scrolledUnderElevation: 0,
       title: AppBarType.title(
         title: title,
         diamondNumber: diamondNumber,

lib/features/battle_league/presentation/ui/battle_league_page.dart

@@ -18,7 +18,7 @@ class BattleLeaguePage extends GetView<BattleLeagueController> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      backgroundColor: const Color(0XFF390C82),
+      backgroundColor: context.battleLeagueBackgroundColor,
       appBar: MyAppBar(
         type: AppBarType.battleLeague,
         backgroundColor: context.noColor,
@@ -30,44 +30,56 @@ class BattleLeaguePage extends GetView<BattleLeagueController> {
         child: Column(
           children: [
             MySpaces.s30.gapHeight,
-            Padding(
-              padding: const EdgeInsets.symmetric(horizontal: MySpaces.s30),
-              child: BattleLeagueTabBar(
-                controller: controller.tabController,
-                tabs: [
-                  context.translate.time_ranking,
-                  context.translate.regional_ranking,
-                ],
-              ),
-            ),
+            _tabBars(context),
             MySpaces.s12.gapHeight,
-            Expanded(
-              child: TabBarView(
-                controller: controller.tabController,
-                children: const [
-                  Padding(
-                    padding: EdgeInsets.symmetric(horizontal: MySpaces.s30),
-                    child: TimeRanking(),
-                  ),
-                  Padding(
-                    padding: EdgeInsets.symmetric(horizontal: MySpaces.s30),
-                    child: RegionalRanking(),
-                  ),
-                ],
-              ),
-            ),
+            _tabViews(),
             56.0.gapHeight,
-            Padding(
-              padding: const EdgeInsets.symmetric(horizontal: MySpaces.s30),
-              child: BattleLeagueStartButton(
-                title: context.translate.play_now,
-                onTap: () {},
-              ),
-            ),
+            _startButton(context),
             MySpaces.s16.gapHeight,
           ],
         ),
       ),
     );
   }
+
+  Padding _tabBars(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(horizontal: MySpaces.s30),
+      child: BattleLeagueTabBar(
+        controller: controller.tabController,
+        tabs: [
+          context.translate.time_ranking,
+          context.translate.regional_ranking,
+        ],
+      ),
+    );
+  }
+
+  Expanded _tabViews() {
+    return Expanded(
+      child: TabBarView(
+        controller: controller.tabController,
+        children: const [
+          Padding(
+            padding: EdgeInsets.symmetric(horizontal: MySpaces.s30),
+            child: TimeRanking(),
+          ),
+          Padding(
+            padding: EdgeInsets.symmetric(horizontal: MySpaces.s30),
+            child: RegionalRanking(),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Padding _startButton(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(horizontal: MySpaces.s30),
+      child: BattleLeagueStartButton(
+        title: context.translate.play_now,
+        onTap: () {},
+      ),
+    );
+  }
 }

lib/features/home/presentation/controller/home_controller.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/cupertino.dart';
 import 'package:get/get.dart';
 import 'package:shia_game_flutter/core/params/home_params.dart';
+import 'package:shia_game_flutter/core/routers/my_routes.dart';
 import 'package:shia_game_flutter/core/status/base_status.dart';
 import 'package:shia_game_flutter/features/home/domain/entity/home_entity.dart';
 import 'package:shia_game_flutter/features/home/domain/usecases/get_home_usecase.dart';
@@ -35,6 +36,9 @@ class HomeController extends GetxController with StateMixin {
   final Rx<BaseStatus> getHomeStatus = Rx(const BaseInit());
 
   /// ------ Functions ------
+  void goToBattleLeaguePage() {
+    Get.toNamed(Routes.battleLeaguePage);
+  }
 
   /// ------ Api Calls ------
   Future<void> getHome() async {

lib/features/home/presentation/pages/home_page.dart

@@ -25,7 +25,9 @@ class HomePage extends GetView<HomeController> {
           const MyImage(asset: MyAssets.shiaMindGroup),
           MySpaces.s40.gapHeight,
           const HomeMembership(),
-          const HomeBattleLeague(),
+          HomeBattleLeague(
+            onTap: controller.goToBattleLeaguePage,
+          ),
           MySpaces.s20.gapHeight,
           _customWidgets(context),
           MySpaces.s20.gapHeight,

lib/features/home/presentation/pages/widgets/home_battle_league.dart

@@ -10,7 +10,9 @@ import 'package:shia_game_flutter/core/widgets/image/my_image.dart';
 import 'package:shia_game_flutter/core/widgets/text/gradient_text.dart';
 
 class HomeBattleLeague extends StatelessWidget {
-  const HomeBattleLeague({super.key});
+  const HomeBattleLeague({super.key, this.onTap});
+
+  final VoidCallback? onTap;
 
   @override
   Widget build(BuildContext context) {
@@ -18,6 +20,7 @@ class HomeBattleLeague extends StatelessWidget {
       alignment: AlignmentDirectional.bottomEnd,
       children: [
         MyContainer(
+          onTap: onTap,
           width: context.widthScreen,
           height: 120,
           padding: const EdgeInsets.symmetric(

lib/features/master/presentation/ui/master_page.dart

@@ -1,6 +1,8 @@
 import 'package:flutter/material.dart';
+import 'package:shia_game_flutter/common_ui/theme/my_theme.dart';
 import 'package:shia_game_flutter/core/routers/my_routes.dart';
-import 'package:shia_game_flutter/core/widgets/app_bar/styles/master_app_bar.dart';
+import 'package:shia_game_flutter/core/widgets/app_bar/enums/app_bar_type.dart';
+import 'package:shia_game_flutter/core/widgets/app_bar/my_app_bar.dart';
 import 'package:shia_game_flutter/core/widgets/bottom_nav_bar/bottom_nav_bar.dart';
 import 'package:shia_game_flutter/features/master/presentation/controller/master_controller.dart';
 import 'package:get/get.dart';
@@ -12,7 +14,10 @@ class MasterPage extends GetView<MasterController> {
   Widget build(BuildContext context) {
     return Scaffold(
       resizeToAvoidBottomInset: false,
-      appBar: const MasterAppBar(),
+      appBar: MyAppBar(
+        type: AppBarType.master,
+        backgroundColor: context.backgroundColor,
+      ),
       bottomNavigationBar: const BottomNavBar(),
       body: GetRouterOutlet(
         initialRoute: Routes.homePage,

lib/init_bindings.dart

@@ -74,7 +74,7 @@ void initBindings() {
   Get.lazyPut<GetProfileUseCase>(() => GetProfileUseCase(Get.find()), fenix: true);
 
   /// ----- BattleLeague Feature -----
-  Get.lazyPut<IBattleLeagueDatasource>(() => BattleLeagueDatasourceImpl(Get.find()));
-  Get.lazyPut<IBattleLeagueRepository>(() => BattleLeagueRepositoryImpl(Get.find()));
-  Get.lazyPut<GetBattleLeagueUseCase>(() => GetBattleLeagueUseCase(Get.find()));
+  Get.lazyPut<IBattleLeagueDatasource>(() => BattleLeagueDatasourceImpl(Get.find()), fenix: true);
+  Get.lazyPut<IBattleLeagueRepository>(() => BattleLeagueRepositoryImpl(Get.find()), fenix: true);
+  Get.lazyPut<GetBattleLeagueUseCase>(() => GetBattleLeagueUseCase(Get.find()), fenix: true);
 }

lib/main.dart

@@ -31,7 +31,7 @@ class MainApp extends StatelessWidget {
       fallbackLocale: const Locale('en', 'US'),
       supportedLocales: const [Locale('en', 'US')],
       getPages: appPages,
-      initialRoute: Routes.battleLeaguePage,
+      initialRoute: Routes.masterPage,
       localizationsDelegates: const [
         AppLocalizations.delegate,
         GlobalMaterialLocalizations.delegate,