Skip to content
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.

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

πŸ”€ :: 문ꡬ μˆ˜μ • #213 #214

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open
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
2 changes: 1 addition & 1 deletion lib/presentation/app_update_page/ui/app_update_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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),
),
),
Expand Down
6 changes: 3 additions & 3 deletions lib/presentation/apply_page/ui/view/apply_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand All @@ -84,7 +84,7 @@ 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:
const ScrollBehavior().copyWith(overscroll: false),
Expand Down
4 changes: 2 additions & 2 deletions lib/presentation/utils/bottom_navi.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
16 changes: 8 additions & 8 deletions lib/presentation/utils/osj_bottom_sheet.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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μ™„λ£Œ μ•Œλ¦Όμ„ ν•΄μ œν• κΉŒμš”?";
}
}
}
Expand Down