From 1505eae021ca01a2b02fb85a9383e37dc90e008b Mon Sep 17 00:00:00 2001 From: wonyong Date: Thu, 8 Jan 2026 00:58:22 +0900 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=ED=99=88=EC=9D=84=20=EC=A0=9C?= =?UTF-8?q?=EC=99=B8=ED=95=9C=20=EB=8B=A4=EB=A5=B8=20=ED=83=AD=EC=97=90?= =?UTF-8?q?=EC=84=9C=20=EB=92=A4=EB=A1=9C=EA=B0=80=EA=B8=B0=20=EC=8B=9C=20?= =?UTF-8?q?=ED=99=88=20=ED=83=AD=EC=9C=BC=EB=A1=9C=20=EC=9D=B4=EB=8F=99=20?= =?UTF-8?q?=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/presentation/main/main_app_shell.dart | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/lib/presentation/main/main_app_shell.dart b/lib/presentation/main/main_app_shell.dart index 978cd451..d9b99dd7 100644 --- a/lib/presentation/main/main_app_shell.dart +++ b/lib/presentation/main/main_app_shell.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; +import 'package:grimity/presentation/common/widget/grimity_pop_scope.dart'; import 'package:grimity/presentation/drawer/main_app_drawer.dart'; import 'package:grimity/presentation/main/provider/main_bottom_navigation_item.dart'; import 'package:grimity/presentation/main/widget/main_bottom_navigation_bar.dart'; @@ -17,15 +18,20 @@ class MainAppShell extends StatefulWidget { class _MainAppShellState extends State { @override Widget build(BuildContext context) { + final canPop = widget.navigationShell.currentIndex == 0; final showFab = GoRouter.of(context).state.name == MainNavigationItem.values[widget.navigationShell.currentIndex].name; - return Scaffold( - endDrawer: MainAppDrawer(), - body: widget.navigationShell, - bottomNavigationBar: MainBottomNavigationBar(navigationShell: widget.navigationShell), - floatingActionButton: - showFab ? MainFloatingActionButton(currentIndex: widget.navigationShell.currentIndex) : null, + return GrimityPopScope( + canPop: canPop, + callback: () => widget.navigationShell.goBranch(0), + child: Scaffold( + endDrawer: MainAppDrawer(), + body: widget.navigationShell, + bottomNavigationBar: MainBottomNavigationBar(navigationShell: widget.navigationShell), + floatingActionButton: + showFab ? MainFloatingActionButton(currentIndex: widget.navigationShell.currentIndex) : null, + ), ); } } From b4ae2439d8f6334547019c6e7a3923679f5a1624 Mon Sep 17 00:00:00 2001 From: wonyong Date: Thu, 8 Jan 2026 01:05:12 +0900 Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20=EB=A6=AC=EB=B7=B0=20=EC=82=AC?= =?UTF-8?q?=ED=95=AD=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - `MainNavigationItem.home.index`를 사용하여 가독성 개선 --- lib/presentation/main/main_app_shell.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/presentation/main/main_app_shell.dart b/lib/presentation/main/main_app_shell.dart index d9b99dd7..448d5ffa 100644 --- a/lib/presentation/main/main_app_shell.dart +++ b/lib/presentation/main/main_app_shell.dart @@ -18,13 +18,13 @@ class MainAppShell extends StatefulWidget { class _MainAppShellState extends State { @override Widget build(BuildContext context) { - final canPop = widget.navigationShell.currentIndex == 0; + final canPop = widget.navigationShell.currentIndex == MainNavigationItem.home.index; final showFab = GoRouter.of(context).state.name == MainNavigationItem.values[widget.navigationShell.currentIndex].name; return GrimityPopScope( canPop: canPop, - callback: () => widget.navigationShell.goBranch(0), + callback: () => widget.navigationShell.goBranch(MainNavigationItem.home.index), child: Scaffold( endDrawer: MainAppDrawer(), body: widget.navigationShell,