From 48bc59f3ccb6ee333d1d84f021b2f15d4b4925dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EC=83=81=EA=B5=AC?= <76112135+MONOTYPEEE@users.noreply.github.com> Date: Fri, 29 Mar 2024 10:41:59 +0000 Subject: [PATCH 1/4] =?UTF-8?q?fix=20::=20=EB=B0=94=ED=85=80=EC=8B=9C?= =?UTF-8?q?=ED=8A=B8=20=EB=AC=B8=EA=B5=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/presentation/utils/osj_bottom_sheet.dart | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/presentation/utils/osj_bottom_sheet.dart b/lib/presentation/utils/osj_bottom_sheet.dart index f11d109e..60373ce3 100644 --- a/lib/presentation/utils/osj_bottom_sheet.dart +++ b/lib/presentation/utils/osj_bottom_sheet.dart @@ -36,31 +36,31 @@ class _OSJBottomSheetState extends State<OSJBottomSheet> { if (isWoman) { switch (state) { case CurrentState.working: - return "여자 세탁실 ${widget.index - 31}번 ${widget.machine.text}를\n알림 설정 하실건가요?"; + return "여자 세탁실 ${widget.index - 31}번 ${widget.machine.text}의\n완료 알림을 설정할까요?"; case CurrentState.available: - return "여자 세탁실 ${widget.index - 31}번 ${widget.machine.text}는\n현재 사용 가능한 상태에요."; + return "여자 세탁실 ${widget.index - 31}번 ${widget.machine.text}는\n사용할 수 있어요."; case CurrentState.disconnected: return "여자층 ${widget.index - 31}번 ${widget.machine.text}의 연결이 끊겨서\n상태를 확인할 수 없어요."; case CurrentState.breakdown: - return "여자 세탁실 ${widget.index - 31}번 ${widget.machine.text}는\n고장으로 인해 사용이 불가능해요."; + return "여자 세탁실 ${widget.index - 31}번 ${widget.machine.text}는\n고장으로 인해 사용할 수 없어요."; } } else { switch (state) { case CurrentState.working: - return "${widget.index}번 ${widget.machine.text}를\n알림 설정 하실건가요?"; + return "${widget.index}번 ${widget.machine.text}의\n완료 알림을 설정할까요?"; case CurrentState.available: - return "${widget.index}번 ${widget.machine.text}는\n현재 사용 가능한 상태에요."; + return "${widget.index}번 ${widget.machine.text}는\n사용할 수 있어요."; case CurrentState.disconnected: return "${widget.index}번 ${widget.machine.text}의 연결이 끊겨서\n상태를 확인할 수 없어요."; case CurrentState.breakdown: - return "${widget.index}번 ${widget.machine.text}는\n고장으로 인해 사용이 불가능해요."; + return "${widget.index}번 ${widget.machine.text}는\n고장으로 인해 사용할 수 없어요."; } } } else { if (isWoman) { - return "여자 세탁실 ${widget.index - 31}번 ${widget.machine.text}의\n알림 설정을 해제하실건가요?"; + return "여자 세탁실 ${widget.index - 31}번 ${widget.machine.text}의\n완료 알림을 해제할까요?"; } else { - return "${widget.index}번 ${widget.machine.text}의\n알림 설정을 해제하실건가요?"; + return "${widget.index}번 ${widget.machine.text}의\n완료 알림을 해제할까요?"; } } } From 4111f770e86d656757c9d6e0ea2fb050c1a41cfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EC=83=81=EA=B5=AC?= <76112135+MONOTYPEEE@users.noreply.github.com> Date: Fri, 29 Mar 2024 10:45:10 +0000 Subject: [PATCH 2/4] =?UTF-8?q?fix=20::=20=EC=97=85=EB=8D=B0=EC=9D=B4?= =?UTF-8?q?=ED=8A=B8=20=EB=B0=8F=20=ED=99=88=20=EB=AC=B8=EA=B5=AC=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/presentation/app_update_page/ui/app_update_page.dart | 2 +- lib/presentation/apply_page/ui/view/apply_page.dart | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/presentation/app_update_page/ui/app_update_page.dart b/lib/presentation/app_update_page/ui/app_update_page.dart index d1cd9fa3..bf98fd51 100644 --- a/lib/presentation/app_update_page/ui/app_update_page.dart +++ b/lib/presentation/app_update_page/ui/app_update_page.dart @@ -38,7 +38,7 @@ class AppUpdatePage extends StatelessWidget { SizedBox(height: 10.0.h), const Expanded( child: Text( - "Lotura의 새로운 버전이 출시되었어요!\n지금 바로 업데이트 하러 가기 ⬇️⬇️", + "Lotura의 새로운 버전이 출시되었어요!", style: TextStyle(fontWeight: FontWeight.w500), ), ), diff --git a/lib/presentation/apply_page/ui/view/apply_page.dart b/lib/presentation/apply_page/ui/view/apply_page.dart index 6ba0118b..1865412f 100644 --- a/lib/presentation/apply_page/ui/view/apply_page.dart +++ b/lib/presentation/apply_page/ui/view/apply_page.dart @@ -71,9 +71,9 @@ class ApplyPage extends StatelessWidget { Text("알림 설정한", style: bigStyle), Text("세탁기와 건조기", style: bigStyle), SizedBox(height: 24.0.h), - Text("알림을 설정하여 세탁기와 건조기를", style: smallStyle), + Text("알림을 설정하여 세탁기와 건조기의", style: smallStyle), SizedBox(height: 5.0.h), - Text("누구보다 빠르게 사용해보세요.", style: smallStyle), + Text("완료 알림을 수신해 보세요", style: smallStyle), ], ), SizedBox(height: 20.0.h), @@ -84,9 +84,9 @@ class ApplyPage extends StatelessWidget { Empty() => const Center(child: Text("비어있음")), Loading() => const Center(child: CircularProgressIndicator()), - Error() => const Center(child: Text("인터넷 연결을 확인해주세요")), + Error() => const Center(child: Text("인터넷 연결을 확인하세요")), Loaded() => ScrollConfiguration( - behavior: + behavior세 const ScrollBehavior().copyWith(overscroll: false), child: ListView.builder( itemCount: state.value.length.isEven From 7dcac229ef34a7ba392b5ebdd9cf752d6d252dae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EC=83=81=EA=B5=AC?= <76112135+MONOTYPEEE@users.noreply.github.com> Date: Fri, 29 Mar 2024 10:45:25 +0000 Subject: [PATCH 3/4] =?UTF-8?q?fix=20::=20NFC=20=EB=AC=B8=EA=B5=AC=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/presentation/utils/bottom_navi.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/presentation/utils/bottom_navi.dart b/lib/presentation/utils/bottom_navi.dart index 3c499a86..1298b8a8 100644 --- a/lib/presentation/utils/bottom_navi.dart +++ b/lib/presentation/utils/bottom_navi.dart @@ -59,11 +59,11 @@ class _BottomNaviState extends State<BottomNavi> builder: (context) => Center( child: AlertDialog( title: Text( - "NFC가 비활성화 되어있습니다.", + "NFC가 꺼져 있어요", style: TextStyle(fontSize: 20.0.sp), ), content: Text( - "Lotura 서비스 이용을 위해\n스마트폰의 NFC를 설정해주세요.", + "Lotura 서비스 이용을 위해\n스마트폰의 NFC를 켜 주세요.", style: TextStyle(fontSize: 18.0.sp), ), shape: RoundedRectangleBorder( From 0a74d7769f72035d850698df44aefabc5a15f874 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EC=83=81=EA=B5=AC?= <76112135+MONOTYPEEE@users.noreply.github.com> Date: Fri, 29 Mar 2024 10:55:10 +0000 Subject: [PATCH 4/4] =?UTF-8?q?fix=20::=20=EC=9E=98=EB=AA=BB=EB=90=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/presentation/apply_page/ui/view/apply_page.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/presentation/apply_page/ui/view/apply_page.dart b/lib/presentation/apply_page/ui/view/apply_page.dart index 1865412f..973bbaa8 100644 --- a/lib/presentation/apply_page/ui/view/apply_page.dart +++ b/lib/presentation/apply_page/ui/view/apply_page.dart @@ -86,7 +86,7 @@ class ApplyPage extends StatelessWidget { const Center(child: CircularProgressIndicator()), Error() => const Center(child: Text("인터넷 연결을 확인하세요")), Loaded() => ScrollConfiguration( - behavior세 + behavior: const ScrollBehavior().copyWith(overscroll: false), child: ListView.builder( itemCount: state.value.length.isEven