Skip to content

feat: 마음 기록 상세 화면에 뒤로가기 버튼 추가 #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
surfwithus merged 3 commits into from
Jul 22, 2025
Merged

feat: 마음 기록 상세 화면에 뒤로가기 버튼 추가 #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d444f66
feat: 날짜 누르면 마음 기록 앨범 상세 페이지로 이동
surfwithus Jul 22, 2025
35fe116
feat: 마음 기록 상세 화면에 뒤로가기 버튼 추가
surfwithus Jul 22, 2025
94b9461
Merge branch 'main' into feat/photo
surfwithus Jul 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 8 additions & 30 deletions frontend/ongi/lib/screens/health/health_home_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,49 +70,29 @@ class _HealthHomeScreenState extends State<HealthHomeScreen> {
child: Container(
width: 44,
height: 44,
child: Icon(
Icons.arrow_back_ios,
color: Colors.white,
size: 30,
),
child: Icon(Icons.arrow_back_ios, color: Colors.white, size: 30),
),
),
);
}

Widget _buildPainInputView() {
return Stack(
children: [
const HealthStatusInputScreen(),
_buildBackButton(),
],
children: [const HealthStatusInputScreen(), _buildBackButton()],
);
}

Widget _buildPillHistoryView() {
return Stack(
children: [
const PillHistoryScreen(),
_buildBackButton(),
],
);
return Stack(children: [const PillHistoryScreen(), _buildBackButton()]);
}

Widget _buildExerciseView() {
return Stack(
children: [
const ExerciseRecordScreen(),
_buildBackButton(),
],
);
return Stack(children: [const ExerciseRecordScreen(), _buildBackButton()]);
}

Widget _buildStepTrackerView() {
return Stack(
children: [
const FamilyStepTrackerScreen(),
_buildBackButton(),
],
children: [const FamilyStepTrackerScreen(), _buildBackButton()],
);
}

Expand All @@ -122,7 +102,7 @@ class _HealthHomeScreenState extends State<HealthHomeScreen> {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const SizedBox(height: 150),
const SizedBox(height: 130),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 40),
child: Column(
Expand Down Expand Up @@ -208,7 +188,7 @@ class _HealthHomeScreenState extends State<HealthHomeScreen> {
),
),
Positioned(
left: 165,
left: 160,
top: 40,
child: Image.asset(
'assets/images/sitting_mom_icon.png',
Expand Down Expand Up @@ -444,9 +424,7 @@ class _HealthHomeScreenState extends State<HealthHomeScreen> {
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: Colors.transparent,
body: AppLightBackground(
child: _buildCurrentView(),
),
body: AppLightBackground(child: _buildCurrentView()),
);
}
}
6 changes: 3 additions & 3 deletions frontend/ongi/lib/screens/photo/photo_calendar_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ class _PhotoCalendarScreenState extends State<PhotoCalendarScreen> {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const SizedBox(height: 150),
const SizedBox(height: 130),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 40),
child: Column(
Expand Down Expand Up @@ -209,7 +209,7 @@ class _PhotoCalendarScreenState extends State<PhotoCalendarScreen> {
} else {
_selectedDate = selectedDay;
_focusedDay = selectedDay;
_currentView = 'photoDate'; // 날짜 선택 시 photo_date_screen으로 이동
_currentView = 'photoDate';
}
});
},
Expand Down Expand Up @@ -263,7 +263,7 @@ class _PhotoCalendarScreenState extends State<PhotoCalendarScreen> {
height: 44,
child: Icon(
Icons.arrow_back_ios,
color: Colors.white,
color: AppColors.ongiOrange,
size: 30,
),
),
Expand Down
93 changes: 60 additions & 33 deletions frontend/ongi/lib/screens/photo/photo_date_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class _PhotoDateScreenState extends State<PhotoDateScreen> {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const SizedBox(height: 125),
const SizedBox(height: 130),
Expanded(
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 40),
Expand All @@ -75,16 +75,20 @@ class _PhotoDateScreenState extends State<PhotoDateScreen> {
color: AppColors.ongiOrange,
),
),
const SizedBox(height: 32),
const SizedBox(height: 45),
// 사진 카드 PageView
Center(
child: SizedBox(
width: cardWidth,
height: cardHeight,
child: PageView.builder(
itemCount: _photos.length,
controller: PageController(viewportFraction: 0.78, initialPage: _currentPage),
onPageChanged: (idx) => setState(() => _currentPage = idx),
controller: PageController(
viewportFraction: 0.78,
initialPage: _currentPage,
),
onPageChanged: (idx) =>
setState(() => _currentPage = idx),
itemBuilder: (context, idx) {
final photo = _photos[idx];
final isActive = idx == _currentPage;
Expand All @@ -109,7 +113,10 @@ class _PhotoDateScreenState extends State<PhotoDateScreen> {
fit: BoxFit.cover,
)
: ImageFiltered(
imageFilter: ImageFilter.blur(sigmaX: 8, sigmaY: 8),
imageFilter: ImageFilter.blur(
sigmaX: 8,
sigmaY: 8,
),
child: Opacity(
opacity: 0.7,
child: Image.asset(
Expand All @@ -129,7 +136,10 @@ class _PhotoDateScreenState extends State<PhotoDateScreen> {
width: 88,
height: 100,
decoration: BoxDecoration(
border: Border.all(color: AppColors.ongiOrange, width: 3),
border: Border.all(
color: AppColors.ongiOrange,
width: 3,
),
borderRadius: BorderRadius.circular(15),
),
child: ClipRRect(
Expand All @@ -147,7 +157,12 @@ class _PhotoDateScreenState extends State<PhotoDateScreen> {
right: 0,
bottom: 0,
child: Container(
padding: const EdgeInsets.fromLTRB(20, 16, 20, 24),
padding: const EdgeInsets.fromLTRB(
20,
16,
20,
24,
),
decoration: BoxDecoration(
borderRadius: const BorderRadius.only(
bottomLeft: Radius.circular(32),
Expand All @@ -163,15 +178,18 @@ class _PhotoDateScreenState extends State<PhotoDateScreen> {
),
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
crossAxisAlignment:
CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
Row(
children: [
// 원형 프로필
CircleAvatar(
radius: 16,
backgroundImage: AssetImage(photo['profile']!),
backgroundImage: AssetImage(
photo['profile']!,
),
),
const SizedBox(width: 8),
Expanded(
Expand All @@ -198,30 +216,41 @@ class _PhotoDateScreenState extends State<PhotoDateScreen> {
// 위치 버튼 스타일
Align(
alignment: Alignment.center,
child: Container(
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 2),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(20),
),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
Icon(Icons.place, color: AppColors.ongiOrange, size: 16),
const SizedBox(width: 4),
Text(
photo['location']!,
style: TextStyle(
child: Container(
padding:
const EdgeInsets.symmetric(
horizontal: 8,
vertical: 2,
),
decoration: BoxDecoration(
color: Colors.white,
borderRadius:
BorderRadius.circular(20),
),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
Icon(
Icons.place,
color: AppColors.ongiOrange,
fontSize: 11,
fontWeight: FontWeight.w500,
fontFamily: 'Pretendard',
size: 16,
),
),
],
const SizedBox(width: 4),
Text(
photo['location']!,
style: TextStyle(
color:
AppColors.ongiOrange,
fontSize: 11,
fontWeight:
FontWeight.w500,
fontFamily: 'Pretendard',
),
),
],
),
),
),
),
],
),
),
Expand Down Expand Up @@ -252,7 +281,7 @@ class _PhotoDateScreenState extends State<PhotoDateScreen> {
for (int i = 0; i < _photos.length; i++) ...[
_buildIndicator(i == _currentPage),
if (i != _photos.length - 1) const SizedBox(width: 6),
]
],
],
),
],
Expand All @@ -270,9 +299,7 @@ class _PhotoDateScreenState extends State<PhotoDateScreen> {
onPressed: () {},
style: OutlinedButton.styleFrom(
side: BorderSide(color: color, width: 1.5),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(20),
),
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20)),
backgroundColor: AppColors.ongiOrange,
padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 15),
minimumSize: Size.zero,
Expand Down
Loading