Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file modified frontend/ongi/assets/images/body_front.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,6 @@ class ExerciseRecordDetailScreen extends StatelessWidget {
left: 0,
right: 0,
child: Center(
child: Text(
'${date.year}-${date.month}-${date.day} : $hours시간 $minutes분',
style: const TextStyle(fontSize: 24),
),
),
),
// Back button
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class _ExerciseRecordScreenState extends State<ExerciseRecordScreen> {
// Get exercise time for a specific date (placeholder: returns 0)
Map<String, int> getExerciseTime(DateTime date) {
// TODO: Replace with real backend call
return {'hours': 1, 'minutes': 50};
return {'hours': 1, 'minutes': 30};
}

// Convert page index to date for exercise PageView
Expand Down
44 changes: 36 additions & 8 deletions frontend/ongi/lib/screens/health/health_status_input_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ class HealthStatusInputScreen extends StatefulWidget {

class _HealthStatusInputScreenState extends State<HealthStatusInputScreen> {
Map<int, int> selectedDosages = {};
bool isFront = true;

@override
Widget build(BuildContext context) {
Expand Down Expand Up @@ -65,12 +66,12 @@ class _HealthStatusInputScreenState extends State<HealthStatusInputScreen> {
Container(
margin: EdgeInsets.symmetric(
horizontal: 0,
vertical: 0,
vertical: 6,
),
child: Image.asset(
'assets/images/health_status_check_hands.png',
width: 99,
height: 99,
'assets/images/sitting_mom_icon.png',
width: 110,
height: 110,
),
),
],
Expand All @@ -94,14 +95,41 @@ class _HealthStatusInputScreenState extends State<HealthStatusInputScreen> {
Expanded(
child: Container(
width: double.infinity,
margin: const EdgeInsets.only(left: 60, right: 60, bottom: 20),
margin: const EdgeInsets.only(left: 80, right: 80, bottom: 20),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(20),
),
child: Padding(
padding: const EdgeInsets.all(16),
child: Text("여기부터 본문을 생성 ㅇ.ㅇ"),
child: Stack(
children: [
Center(
child: Image.asset(
isFront
? 'assets/images/body_front.png'
: 'assets/images/body_back.png',
height: 400, // 필요시 반응형으로 조정
fit: BoxFit.contain,
),
),
Positioned(
right: 16,
bottom: 16,
child: GestureDetector(
onTap: () {
setState(() {
isFront = !isFront;
});
},
child: Image.asset(
isFront
? 'assets/images/body_front_btn.png'
: 'assets/images/body_back_btn.png',
width: 60,
height: 60,
),
),
),
],
),
),
),
Expand Down
4 changes: 2 additions & 2 deletions frontend/ongi/lib/screens/health/pill_history_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,9 @@ class _PillHistoryScreenState extends State<PillHistoryScreen> {
bottom: 0,
child: ListView.builder(
padding: EdgeInsets.all(10),
itemCount: 10,
itemCount: 3,
itemBuilder: (context, index) {
if (index == 9) {
if (index == 2) {
return GestureDetector(
onTap: () {
Navigator.push(
Expand Down
4 changes: 4 additions & 0 deletions frontend/ongi/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,10 @@ flutter:
- assets/images/step_tracker_light_background.svg
- assets/images/step_tracker_rectangle.svg
- assets/images/sample_family_photo.png
- assets/images/body_front.png
- assets/images/body_front_btn.png
- assets/images/body_back.png
- assets/images/body_back_btn.png

fonts:
- family: Pretendard
Expand Down
Loading