Merge pull request #8 from team-balt/feat/#1

Feat/#1
team-balt · Nov 26, 2024 · 6e5ad8d · 6e5ad8d
2 parents a1d0326 + 59d7403
commit 6e5ad8d
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 16 deletions.
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -32,4 +32,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 819463e6a0290f5a72f145ba7cde16e8b6ef0796
 
-COCOAPODS: 1.16.2
+COCOAPODS: 1.15.2
diff --git a/lib/component/bottom_navigation_bar.dart b/lib/component/bottom_navigation_bar.dart
@@ -23,9 +23,9 @@ class EasierDodamBottomNavigationBar extends StatelessWidget {
           borderRadius: BorderRadius.circular(12),
           boxShadow: [
             BoxShadow(
-              color: Colors.grey.shade300,
+              color: Colors.grey.shade200,
               blurRadius: 10,
-              offset: const Offset(0, -5),
+              offset: const Offset(0, -15),
             ),
           ],
         ),

diff --git a/lib/feature/night_study/item/night_study_item.dart b/lib/feature/night_study/item/night_study_item.dart
@@ -41,8 +41,7 @@ extension PlaceTypeExtension on PlaceType {
   @override
   Widget build(BuildContext context) {
 
-    final hour = dateDifferenceInDays(DateTime.now(), endAt) ~/ 60;
-    final minute = dateDifferenceInDays(DateTime.now(), endAt) % 60;
+    final day = dateDifferenceInDays(DateTime.now(), endAt);
 
     return Container(
       decoration: BoxDecoration(
@@ -117,7 +116,7 @@ extension PlaceTypeExtension on PlaceType {
               crossAxisAlignment: CrossAxisAlignment.end,
               children: [
                 Text(
-                  hour > 0 ? "$hour시간" : "$minute분",
+                  "$day일 남음",
                   style: EasierDodamStyles.label2,
                 ),
                 SizedBox(
@@ -160,7 +159,7 @@ extension PlaceTypeExtension on PlaceType {
                   crossAxisAlignment: CrossAxisAlignment.center,
                   children: [
                     Text(
-                      "복귀",
+                      "종료",
                       style: EasierDodamStyles.label2.copyWith(
                         fontSize: 12.0,
                       ),

diff --git a/lib/feature/night_study/item/night_study_preset_item.dart b/lib/feature/night_study/item/night_study_preset_item.dart
@@ -10,8 +10,8 @@ class NightStudyPresetItem extends StatelessWidget {
   final String content;
   final bool doNeedPhone;
   final String phoneReason;
-  final String startDate;
-  final String endDate;
+  final DateTime startDate;
+  final DateTime endDate;
   final Function() onTrashClick;
   final Function() onClickCreate;
 
@@ -53,7 +53,7 @@ class NightStudyPresetItem extends StatelessWidget {
                       height: 4,
                     ),
                     Text(
-                      "사유 : $context",
+                      "사유 : $content",
                       style: EasierDodamStyles.body2
                           .copyWith(color: EasierDodamColors.gray600),
                     ),
@@ -68,7 +68,7 @@ class NightStudyPresetItem extends StatelessWidget {
                           EasierDodamStyles.body2.copyWith(fontSize: 12.0),
                         ),
                         Text(
-                          " $startDate",
+                          " ${startDate.year}년 ${startDate.month}월 ${startDate.day}일 ",
                           style:
                           EasierDodamStyles.body2.copyWith(fontSize: 14.0),
                         ),
@@ -79,7 +79,7 @@ class NightStudyPresetItem extends StatelessWidget {
                           EasierDodamStyles.body2.copyWith(fontSize: 12.0),
                         ),
                         Text(
-                          " $endDate",
+                          " ${endDate.year}년 ${endDate.month}월 ${endDate.day}일 ",
                           style:
                           EasierDodamStyles.body2.copyWith(fontSize: 14.0),
                         ),

diff --git a/lib/feature/night_study/night_study.dart b/lib/feature/night_study/night_study.dart
@@ -110,8 +110,10 @@ class _NightStudyScreenState extends State<NightStudyScreen> {
                       ),
                       ..._nightStudyItemsView(
                         viewModel.nightStudyResponses,
-                        viewModel.isLoading,
-                        (item) => {viewModel.deleteMyOut(item.id)},
+                        viewModel.isLoading, 
+                            (item) => {
+                          viewModel.deleteMyOut(item.id)
+                            },
                       ),
                     ],
                   ),
@@ -161,8 +163,8 @@ class _NightStudyScreenState extends State<NightStudyScreen> {
                       content: data.content,
                       doNeedPhone: data.doNeedPhone,
                       phoneReason: data.reasonForPhone,
-                      startDate: "${data.startAt} ${data.startAt.minute}",
-                      endDate: "${data.endAt.hour} ${data.endAt.minute}",
+                      startDate: data.startAt,
+                      endDate: data.endAt,
                       onTrashClick: () {
                         viewModel.removeEntity(data.id ?? 0);
                       },
Original file line number	Diff line number	Diff line change
Expand Up		@@ -32,4 +32,4 @@ SPEC CHECKSUMS:

		PODFILE CHECKSUM: 819463e6a0290f5a72f145ba7cde16e8b6ef0796

		COCOAPODS: 1.16.2
		COCOAPODS: 1.15.2