diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 893eae5..8161367 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -64,7 +64,6 @@ dependencies {
implementation(libs.material)
implementation(libs.androidx.activity)
implementation(libs.androidx.constraintlayout)
- implementation(libs.play.services.maps)
testImplementation(libs.junit)
androidTestImplementation(libs.androidx.junit)
androidTestImplementation(libs.androidx.espresso.core)
diff --git a/app/src/main/java/com/project/jangburich/api/response/home/GetHomeDataResponse.kt b/app/src/main/java/com/project/jangburich/api/response/home/GetHomeDataResponse.kt
index a1c4388..6f11cb8 100644
--- a/app/src/main/java/com/project/jangburich/api/response/home/GetHomeDataResponse.kt
+++ b/app/src/main/java/com/project/jangburich/api/response/home/GetHomeDataResponse.kt
@@ -13,6 +13,7 @@ data class GetHomeDataResponse(
data class Team(
val teamId: Int,
val storeId: Int,
+ val dDay: Int,
val storeImgUrl: String,
val isLikedAtStore: Boolean,
val teamName: String,
diff --git a/app/src/main/java/com/project/jangburich/ui/home/adapter/TeamAdapter.kt b/app/src/main/java/com/project/jangburich/ui/home/adapter/TeamAdapter.kt
index 85b2216..b171989 100644
--- a/app/src/main/java/com/project/jangburich/ui/home/adapter/TeamAdapter.kt
+++ b/app/src/main/java/com/project/jangburich/ui/home/adapter/TeamAdapter.kt
@@ -66,6 +66,7 @@ class TeamAdapter(
holder.storeName.text = teamList[position].storeName
holder.myPoint.text = "${teamList[position].currentAmount.toString()}원"
holder.totalPoint.text = "/ ${teamList[position].totalAmount.toString()}원"
+ holder.dDay.text = "D-${teamList[position].dDay}"
Glide.with(activity).load(teamList[position].storeImgUrl).into(holder.storeImage)
@@ -77,7 +78,8 @@ class TeamAdapter(
RecyclerView.ViewHolder(binding.root) {
val groupName = binding.textViewGroupName
val storeName = binding.textViewStoreName
- val storeImage = binding.profileImage
+ val storeImage = binding.imageViewStore
+ val dDay = binding.textViewDday
val myPoint= binding.textViewMyPoint
val layoutPoint = binding.progressIndicatorSelected
val totalPoint= binding.textViewTotalPoint
diff --git a/app/src/main/java/com/project/jangburich/ui/home/viewModel/HomeViewModel.kt b/app/src/main/java/com/project/jangburich/ui/home/viewModel/HomeViewModel.kt
index c8b14e1..fc217a2 100644
--- a/app/src/main/java/com/project/jangburich/ui/home/viewModel/HomeViewModel.kt
+++ b/app/src/main/java/com/project/jangburich/ui/home/viewModel/HomeViewModel.kt
@@ -57,6 +57,7 @@ class HomeViewModel : ViewModel() {
for (i in 0 until result?.data?.teams?.size!!) {
var teamId = result.data.teams[i].teamId
var storeId = result.data.teams[i].storeId
+ var dDay = result.data.teams[i].dDay
var storeImage = result.data.teams[i].storeImgUrl
var isLike = result.data.teams[i].isLikedAtStore
var teamName = result.data.teams[i].teamName
@@ -68,6 +69,7 @@ class HomeViewModel : ViewModel() {
var t1 = Team(
teamId,
storeId,
+ dDay,
storeImage,
isLike,
teamName,
diff --git a/app/src/main/res/drawable/background_home_jangbu.xml b/app/src/main/res/drawable/background_gray100_round10.xml
similarity index 100%
rename from app/src/main/res/drawable/background_home_jangbu.xml
rename to app/src/main/res/drawable/background_gray100_round10.xml
diff --git a/app/src/main/res/drawable/background_group.xml b/app/src/main/res/drawable/background_group.xml
deleted file mode 100644
index 6307aff..0000000
--- a/app/src/main/res/drawable/background_group.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/drawable/background_home_menu.xml b/app/src/main/res/drawable/background_home_menu.xml
deleted file mode 100644
index b6d1099..0000000
--- a/app/src/main/res/drawable/background_home_menu.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_cart.xml b/app/src/main/res/layout/fragment_cart.xml
index 692cb1f..2528e3f 100644
--- a/app/src/main/res/layout/fragment_cart.xml
+++ b/app/src/main/res/layout/fragment_cart.xml
@@ -9,7 +9,7 @@
@@ -157,7 +157,7 @@
android:layout_marginStart="14dp"
android:layout_marginTop="13dp"
android:layout_marginEnd="20dp"
- android:background="@drawable/background_home_menu"
+ android:background="@drawable/background_gray100_round10"
app:layout_constraintBottom_toBottomOf="@+id/button_point"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/button_map"
diff --git a/app/src/main/res/layout/fragment_order.xml b/app/src/main/res/layout/fragment_order.xml
index 5049ae1..2554623 100644
--- a/app/src/main/res/layout/fragment_order.xml
+++ b/app/src/main/res/layout/fragment_order.xml
@@ -9,7 +9,7 @@
+ android:background="@drawable/background_gray100_round10">
+ app:layout_constraintStart_toEndOf="@+id/imageView_store"
+ app:layout_constraintTop_toTopOf="@+id/imageView_store" />
-
+
+
+ android:layout_marginStart="5dp"
+ android:text="|"
+ android:textColor="@color/gray_70"
+ app:layout_constraintStart_toEndOf="@+id/textView_dday"
+ app:layout_constraintTop_toTopOf="@+id/textView_dday"
+ app:layout_constraintBottom_toBottomOf="@+id/textView_dday"/>
+ app:layout_constraintStart_toEndOf="@+id/divider"
+ app:layout_constraintTop_toTopOf="@+id/divider"
+ app:layout_constraintBottom_toBottomOf="@+id/divider" />
+ app:layout_constraintTop_toBottomOf="@+id/imageView_store" />
+
+