Skip to content

Commit fd1b704

Browse files
ZZANZUZZANZU
authored
feat: 메뉴 날짜, 제공자 UI 구현 (#31)
* feat: 메뉴 날짜, 제공자 ui 구현 * feat: 데이터 표시 로직 구현
1 parent b1d8cf2 commit fd1b704

File tree

9 files changed

+76
-4
lines changed

9 files changed

+76
-4
lines changed

‎app/src/main/java/com/woozoo/menumonya/RestaurantAdapter.kt‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import com.woozoo.menumonya.Constants.Companion.GLIDE_IMAGE_SIZE_WIDTH
1414
import com.woozoo.menumonya.databinding.ItemRestaurantBinding
1515
import com.woozoo.menumonya.model.Restaurant
1616
import com.woozoo.menumonya.repository.RemoteConfigRepository
17+
import com.woozoo.menumonya.util.DateUtils.Companion.getTodayMenuDateText
1718

1819
class RestaurantAdapter(private val restaurantInfoArray: ArrayList<Restaurant>, private val context: Context) :
1920

@@ -39,6 +40,14 @@ class RestaurantAdapter(private val restaurantInfoArray: ArrayList<Restaurant>,
3940
menuDialog.show()
4041
}
4142

43+
binding.menuDateTv.text = getTodayMenuDateText()
44+
if (data.todayMenu.provider != "") {
45+
binding.menuProviderTv.text = String.format(
46+
context.resources.getString(R.string.restaurant_info_menu_provider),
47+
data.todayMenu.provider
48+
)
49+
}
50+
4251
binding.restaurantMenuMainTv.text = data.todayMenu.main.replace(",", ", ")
4352
binding.restaurantMenuSideTv.text = data.todayMenu.side.replace(",", ", ")
4453
binding.restaurantMenuDessertTv.text = data.todayMenu.dessert.replace(",", ", ")

‎app/src/main/java/com/woozoo/menumonya/model/Food.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@ data class Food(
44
val main: String = "",
55
val side: String = "",
66
val dessert: String = "",
7-
val imageUrl: String = ""
7+
val imageUrl: String = "",
8+
val provider: String = "" // 메뉴 제공자
89
)

‎app/src/main/java/com/woozoo/menumonya/repository/FireStoreRepository.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package com.woozoo.menumonya.repository
33
import com.google.firebase.firestore.ktx.firestore
44
import com.google.firebase.firestore.ktx.toObject
55
import com.google.firebase.ktx.Firebase
6+
import com.woozoo.menumonya.model.Food
67
import com.woozoo.menumonya.model.Menu
78
import com.woozoo.menumonya.model.Restaurant
89
import com.woozoo.menumonya.repository.RemoteConfigRepository.getMenuCollectionNameConfig
@@ -36,7 +37,7 @@ object FireStoreRepository {
3637
// 메뉴 정보 조회
3738
val menu = getMenu(document.id)
3839

39-
val todayMenu = menu.date.get(getTodayDate())
40+
val todayMenu: Food? = menu.date.get(getTodayDate())
4041
if (todayMenu != null) restaurant.todayMenu = todayMenu
4142

4243
restaurantInfo.add(restaurant)

‎app/src/main/java/com/woozoo/menumonya/util/DateUtils.kt‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,16 @@ class DateUtils {
1111

1212
return todayDate
1313
}
14+
15+
/**
16+
* 해당 메뉴의 날짜를 표시함
17+
* 형식 : 05월 08일 (월요일)
18+
*/
19+
fun getTodayMenuDateText(): String {
20+
val dateFormat = SimpleDateFormat("MM월 dd일 (E요일)", Locale.KOREAN)
21+
val todayDate = dateFormat.format(Date())
22+
23+
return todayDate
24+
}
1425
}
1526
}

‎app/src/main/res/layout/item_restaurant.xml‎

Lines changed: 46 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
app:layout_constraintBottom_toTopOf="@+id/restaurant_info_layout"
2828
android:layout_marginBottom="10dp"
2929
android:visibility="gone"
30-
tool:visibility="visible"
30+
tool:visibility="gone"
3131
>
3232

3333
<View
@@ -87,9 +87,53 @@
8787
app:layout_constraintBottom_toTopOf="@+id/restaurant_info_layout"
8888
android:layout_marginBottom="10dp"
8989
android:visibility="gone"
90-
tool:visibility="gone"
90+
tool:visibility="visible"
9191
>
9292

93+
<!--날짜, 제공해주신 분-->
94+
<androidx.constraintlayout.widget.ConstraintLayout
95+
android:layout_width="match_parent"
96+
android:layout_height="wrap_content"
97+
android:orientation="horizontal"
98+
>
99+
100+
<TextView
101+
android:id="@+id/menu_date_tv"
102+
android:layout_width="wrap_content"
103+
android:layout_height="wrap_content"
104+
android:layout_gravity="start"
105+
app:layout_constraintBottom_toBottomOf="parent"
106+
app:layout_constraintStart_toStartOf="parent"
107+
app:layout_constraintTop_toTopOf="parent"
108+
tool:text="05월 08일 (월요일)"
109+
android:textSize="@dimen/menu_date_text_size"
110+
android:fontFamily="@font/pretendard_semibold"
111+
android:textColor="@color/colorAccent"
112+
/>
113+
114+
<TextView
115+
android:id="@+id/menu_provider_tv"
116+
android:layout_width="wrap_content"
117+
android:layout_height="wrap_content"
118+
android:layout_gravity="end"
119+
app:layout_constraintEnd_toEndOf="parent"
120+
app:layout_constraintTop_toTopOf="parent"
121+
app:layout_constraintBottom_toBottomOf="parent"
122+
tool:text="제공해주신 분 : 된장찌개 님"
123+
android:textSize="@dimen/menu_provider_text_size"
124+
android:fontFamily="@font/pretendard_semibold"
125+
android:textColor="@color/gray500"
126+
/>
127+
128+
</androidx.constraintlayout.widget.ConstraintLayout>
129+
130+
<View
131+
android:layout_width="match_parent"
132+
android:layout_height="1dp"
133+
android:layout_marginTop="6dp"
134+
android:layout_marginBottom="6dp"
135+
android:background="@color/borderGray" />
136+
93137
<!--메인 메뉴-->
94138
<LinearLayout
95139
android:layout_width="match_parent"

‎app/src/main/res/values-hdpi/dimens.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@
4040
<dimen name="restaurant_info_padding_size">10dp</dimen>
4141

4242
<!--메뉴 정보 다이얼로그 관련-->
43+
<dimen name="menu_date_text_size">10dp</dimen>
44+
<dimen name="menu_provider_text_size">10dp</dimen>
4345
<dimen name="menu_title_text_size">16dp</dimen>
4446
<dimen name="menu_content_text_size">14dp</dimen>
4547

‎app/src/main/res/values/colors.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,5 @@
1717
<color name="gray800">#424242</color>
1818
<color name="gray900">#212121</color>
1919
<color name="blackTransparent">#40000000</color>
20+
<color name="colorAccent">#FA560F</color>
2021
</resources>

‎app/src/main/res/values/dimens.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@
4040
<dimen name="restaurant_info_padding_size">8dp</dimen>
4141

4242
<!--메뉴 정보 다이얼로그 관련-->
43+
<dimen name="menu_date_text_size">10dp</dimen>
44+
<dimen name="menu_provider_text_size">10dp</dimen>
4345
<dimen name="menu_title_text_size">16dp</dimen>
4446
<dimen name="menu_content_text_size">14dp</dimen>
4547

‎app/src/main/res/values/strings.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<string name="app_name">메뉴머냐</string>
33
<string name="app_name_debug">[개발] 메뉴머냐</string>
44

5+
<string name="restaurant_info_menu_provider">제공해주신 분 : %s님</string>
56
<string name="restaurant_info_menu_more"><u>자세히 보기</u></string>
67
<string name="restaurant_info_price">가격</string>
78
<string name="restaurant_info_time">점심 운영시간</string>

0 commit comments

Comments
 (0)