From 7c07174832374c05a3e22f9e2ae05da73264c64b Mon Sep 17 00:00:00 2001
From: hoyahozz <85336456+hoyahozz@users.noreply.github.com>
Date: Mon, 1 Aug 2022 21:44:07 +0900
Subject: [PATCH 1/3] =?UTF-8?q?fix=20-=20=EC=98=A4=EB=8A=98=20=EB=82=A0?=
=?UTF-8?q?=EC=A7=9C=EB=A5=BC=20=ED=81=B4=EB=A6=AD=ED=95=98=EB=8D=94?=
=?UTF-8?q?=EB=9D=BC=EB=8F=84=20=EB=B0=94=ED=85=80=20=EC=8B=9C=ED=8A=B8?=
=?UTF-8?q?=EA=B0=80=20=EC=B6=9C=EB=A0=A5=EB=90=98=EB=8F=84=EB=A1=9D=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
---
.../com/yapp/growth/presentation/ui/main/home/HomeScreen.kt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/presentation/src/main/java/com/yapp/growth/presentation/ui/main/home/HomeScreen.kt b/presentation/src/main/java/com/yapp/growth/presentation/ui/main/home/HomeScreen.kt
index 0c146425..b689c008 100644
--- a/presentation/src/main/java/com/yapp/growth/presentation/ui/main/home/HomeScreen.kt
+++ b/presentation/src/main/java/com/yapp/growth/presentation/ui/main/home/HomeScreen.kt
@@ -477,7 +477,7 @@ fun HomeCalendar(
currentDate = currentDate,
selectMode = PlanzCalendarSelectMode.SINGLE,
onDateSelectedListener = { widget, date, selected ->
- if (date != CalendarDay.today() && monthlyPlanDates.containsKey(date))
+ if (monthlyPlanDates.containsKey(date))
onDateClick(date)
},
monthlyDates = monthlyPlanDates
From dc08c4f15f498954286b8c2b68f14a62130b7eb7 Mon Sep 17 00:00:00 2001
From: hoyahozz <85336456+hoyahozz@users.noreply.github.com>
Date: Mon, 1 Aug 2022 21:57:19 +0900
Subject: [PATCH 2/3] =?UTF-8?q?fix=20-=20=EC=95=BD=EC=86=8D=EC=9D=B4=20?=
=?UTF-8?q?=EC=97=86=EB=8A=94=20=EB=82=A0=EB=8F=84=20=ED=81=B4=EB=A6=AD=20?=
=?UTF-8?q?=EC=8B=9C=20=EB=B0=94=ED=85=80=EC=8B=9C=ED=8A=B8=EB=A5=BC=20?=
=?UTF-8?q?=EB=9D=84=EC=9A=B0=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../presentation/ui/main/PlanzScreen.kt | 22 ++++++++++++++-----
.../presentation/ui/main/home/HomeScreen.kt | 3 +--
2 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/presentation/src/main/java/com/yapp/growth/presentation/ui/main/PlanzScreen.kt b/presentation/src/main/java/com/yapp/growth/presentation/ui/main/PlanzScreen.kt
index 4e516b0d..d19e333c 100644
--- a/presentation/src/main/java/com/yapp/growth/presentation/ui/main/PlanzScreen.kt
+++ b/presentation/src/main/java/com/yapp/growth/presentation/ui/main/PlanzScreen.kt
@@ -502,11 +502,23 @@ fun PlanzBottomSheetContent(
.clickable { onExitClick() },
)
}
- Spacer(modifier = Modifier.height(24.dp))
- PlanzPlanList(
- dayPlans = selectDayPlans,
- onPlanItemClick = onPlanItemClick
- )
+ if(selectDayPlans.isNotEmpty()) {
+ Spacer(modifier = Modifier.height(24.dp))
+ PlanzPlanList(
+ dayPlans = selectDayPlans,
+ onPlanItemClick = onPlanItemClick
+ )
+ } else {
+ Spacer(modifier = Modifier.height(70.dp))
+ Text(
+ text = "오늘의 약속이 없습니다.",
+ style = PlanzTypography.body1,
+ color = Gray500,
+ modifier = Modifier.align(Alignment.CenterHorizontally)
+ )
+ Spacer(modifier = Modifier.height(70.dp))
+ }
+
}
}
diff --git a/presentation/src/main/java/com/yapp/growth/presentation/ui/main/home/HomeScreen.kt b/presentation/src/main/java/com/yapp/growth/presentation/ui/main/home/HomeScreen.kt
index b689c008..ca3c7ea0 100644
--- a/presentation/src/main/java/com/yapp/growth/presentation/ui/main/home/HomeScreen.kt
+++ b/presentation/src/main/java/com/yapp/growth/presentation/ui/main/home/HomeScreen.kt
@@ -477,8 +477,7 @@ fun HomeCalendar(
currentDate = currentDate,
selectMode = PlanzCalendarSelectMode.SINGLE,
onDateSelectedListener = { widget, date, selected ->
- if (monthlyPlanDates.containsKey(date))
- onDateClick(date)
+ onDateClick(date)
},
monthlyDates = monthlyPlanDates
)
From cbe197ca5d55191302c3cb57f0e393af7beedf88 Mon Sep 17 00:00:00 2001
From: hoyahozz <85336456+hoyahozz@users.noreply.github.com>
Date: Mon, 1 Aug 2022 21:57:45 +0900
Subject: [PATCH 3/3] =?UTF-8?q?fix=20-=20=EC=8A=A4=ED=8A=B8=EB=A7=81=20?=
=?UTF-8?q?=EB=A6=AC=EC=86=8C=EC=8A=A4=20=EC=B6=94=EA=B0=80=20=EB=B0=8F=20?=
=?UTF-8?q?=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/yapp/growth/presentation/ui/main/PlanzScreen.kt | 2 +-
presentation/src/main/res/values/strings.xml | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/presentation/src/main/java/com/yapp/growth/presentation/ui/main/PlanzScreen.kt b/presentation/src/main/java/com/yapp/growth/presentation/ui/main/PlanzScreen.kt
index d19e333c..2b113fad 100644
--- a/presentation/src/main/java/com/yapp/growth/presentation/ui/main/PlanzScreen.kt
+++ b/presentation/src/main/java/com/yapp/growth/presentation/ui/main/PlanzScreen.kt
@@ -511,7 +511,7 @@ fun PlanzBottomSheetContent(
} else {
Spacer(modifier = Modifier.height(70.dp))
Text(
- text = "오늘의 약속이 없습니다.",
+ text = stringResource(id = R.string.planz_has_not_plan),
style = PlanzTypography.body1,
color = Gray500,
modifier = Modifier.align(Alignment.CenterHorizontally)
diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml
index a0fbda92..fcaee735 100644
--- a/presentation/src/main/res/values/strings.xml
+++ b/presentation/src/main/res/values/strings.xml
@@ -9,6 +9,7 @@
문제가 발생했습니다.
다시 시도해주세요.
+ 오늘의 약속이 없습니다.
메인 홈
약속잡기