Skip to content

Commit

Permalink
Merge branch 'main' into 34-add-splash-screen
Browse files Browse the repository at this point in the history
  • Loading branch information
@Amepistheo
Amepistheo authored Jul 28, 2023
2 parents c6d184a + 241c0f3 commit f28e35a
Show file tree
Hide file tree
Showing 12 changed files with 321 additions and 363 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ captures/

# IntelliJ
*.iml
.idea/
.idea/workspace.xml
.idea/tasks.xml
.idea/gradle.xml
Expand Down
2 changes: 1 addition & 1 deletion .idea/misc.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,10 @@ dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation files('libs/libDaumMapAndroid.jar')

implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0' // ViewModel KTX
implementation 'com.google.code.gson:gson:2.10' // Gson


//retrofit2 - 서버통신
implementation 'com.squareup.retrofit2:retrofit:2.9.0'
implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
Expand Down
119 changes: 53 additions & 66 deletions app/src/main/java/com/eatssu/android/adapter/DodamAdapter.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,69 +11,56 @@ import com.eatssu.android.databinding.ItemDodamBinding
import com.eatssu.android.ui.review.ReviewListActivity


//class DodamAdapter(private val dataList: GetTodayMealResponse) :
// RecyclerView.Adapter<DodamAdapter.ViewHolder>() {
//
// inner class ViewHolder(private val binding: ItemDodamBinding) :
// RecyclerView.ViewHolder(binding.root) {
//
//
// fun bind(position: Int) {
// if (position >= 0 && position < dataList.size) {
// val menuList = dataList[position]
// val nameList = StringBuilder()
//
// for (menuInfo in menuList.menuInfoList) {
// nameList.append(menuInfo.name)
// nameList.append("+")
// }
//
// if (nameList.isNotEmpty()) {
// nameList.deleteCharAt(nameList.length - 1) // Remove the last '+'
// }
//
// val result = nameList.toString()
// binding.tvMenu.text = result
//
// binding.tvPrice.text = 6000.toString()
//
// var totalGrade = 0.0
//
// for (menuInfo in menuList.menuInfoList) {
// val grade = menuInfo.grade ?: 0.0
// totalGrade += grade
// }
//
// val averageGrade = if (menuList.menuInfoList.isNotEmpty()) {
// totalGrade / menuList.menuInfoList.size
// } else {
// 0.0
// }
//
// binding.tvRate.text = String.format("%.1f", averageGrade)
// }
// }
// }
//
//
// override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
// val binding =
// ItemDodamBinding.inflate(LayoutInflater.from(parent.context), parent, false)
// return ViewHolder(binding)
// }
//
// override fun onBindViewHolder(holder: ViewHolder, position: Int) {
// holder.bind(position)
//
// //서버 연결
// holder.itemView.setOnClickListener {
// val intent = Intent(holder.itemView.context, ReviewListActivity::class.java)
//// intent.putExtra(
//// "menuId", dataList[position].menuId
//// )
// ContextCompat.startActivity(holder.itemView.context, intent, null)
// }
// }
//
// override fun getItemCount(): Int = dataList.size
//}

class DodamAdapter(private val dataList: GetTodayMealResponse) :
RecyclerView.Adapter<DodamAdapter.ViewHolder>() {

inner class ViewHolder(private val binding: ItemDodamBinding) :
RecyclerView.ViewHolder(binding.root) {


fun bind(position: Int) {
if (position >= 0 && position < dataList.size) {
val menuList = dataList[position]
val nameList = StringBuilder()

for (menuInfo in menuList.changeMenuInfoList) {
nameList.append(menuInfo.name)
nameList.append("+")
}

if (nameList.isNotEmpty()) {
nameList.deleteCharAt(nameList.length - 1) // Remove the last '+'
}

val result = nameList.toString()
binding.tvMenu.text = result

binding.tvPrice.text = dataList[position].price.toString()
binding.tvRate.text = dataList[position].mainGrade.toString()
}
}
}


override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
val binding =
ItemDodamBinding.inflate(LayoutInflater.from(parent.context), parent, false)
return ViewHolder(binding)
}

override fun onBindViewHolder(holder: ViewHolder, position: Int) {
holder.bind(position)

//서버 연결
holder.itemView.setOnClickListener {
val intent = Intent(holder.itemView.context, ReviewListActivity::class.java)
// intent.putExtra(
// "menuId", dataList[position].menuId
// )
ContextCompat.startActivity(holder.itemView.context, intent, null)
}
}

override fun getItemCount(): Int = dataList.size
}
70 changes: 35 additions & 35 deletions app/src/main/java/com/eatssu/android/adapter/FoodAdapter.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,38 +9,38 @@ import com.eatssu.android.data.model.response.GetFixedMenuResponse
import com.eatssu.android.databinding.ItemFoodBinding
import com.eatssu.android.ui.review.ReviewListActivity

//
//class FoodAdapter(private val dataList: GetFixedMenuResponse) :
// RecyclerView.Adapter<FoodAdapter.ViewHolder>() {
//
// inner class ViewHolder(private val binding: ItemFoodBinding) :
// RecyclerView.ViewHolder(binding.root) {
//
// fun bind(position: Int) {
// binding.tvMenu.text = dataList[position].name
// binding.tvPrice.text = dataList[position].price.toString()
// binding.tvRate.text = String.format("%.1f", dataList[position].grade)
// }
// }
//
// override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
// val binding =
// ItemFoodBinding.inflate(LayoutInflater.from(parent.context), parent, false)
// return ViewHolder(binding)
// }
//
// override fun onBindViewHolder(holder: ViewHolder, position: Int) {
// holder.bind(position)
//
// //서버 연결
// holder.itemView.setOnClickListener {
// val intent = Intent(holder.itemView.context, ReviewListActivity::class.java)
// intent.putExtra(
// "menuId", dataList[position].menuId
// )
// ContextCompat.startActivity(holder.itemView.context, intent, null)
// }
// }
//
// override fun getItemCount(): Int = dataList.size
//}

class FoodAdapter(private val dataList: List<GetFixedMenuResponse.FixMenuInfoList>) :
RecyclerView.Adapter<FoodAdapter.ViewHolder>() {

inner class ViewHolder(private val binding: ItemFoodBinding) :
RecyclerView.ViewHolder(binding.root) {

fun bind(position: Int) {
binding.tvMenu.text = dataList[position].name
binding.tvPrice.text = dataList[position].price.toString()
binding.tvRate.text = String.format("%.1f", dataList[position].mainGrade)
}
}

override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
val binding =
ItemFoodBinding.inflate(LayoutInflater.from(parent.context), parent, false)
return ViewHolder(binding)
}

override fun onBindViewHolder(holder: ViewHolder, position: Int) {
holder.bind(position)

//서버 연결
holder.itemView.setOnClickListener {
val intent = Intent(holder.itemView.context, ReviewListActivity::class.java)
intent.putExtra(
"menuId", dataList[position].menuId
)
ContextCompat.startActivity(holder.itemView.context, intent, null)
}
}

override fun getItemCount(): Int = dataList.size
}
34 changes: 26 additions & 8 deletions app/src/main/java/com/eatssu/android/adapter/GisikAdapter.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,42 @@ import android.view.LayoutInflater
import android.view.ViewGroup
import androidx.core.content.ContextCompat
import androidx.recyclerview.widget.RecyclerView
import com.eatssu.android.data.model.response.GetMenuInfoListResponse
import com.eatssu.android.data.model.response.GetTodayMealResponse
import com.eatssu.android.databinding.ItemGisikBinding
import com.eatssu.android.ui.review.ReviewListActivity


class GisikAdapter(private val dataList: List<GetMenuInfoListResponse.MenuInfo>) :
class GisikAdapter(private val dataList: GetTodayMealResponse) :
RecyclerView.Adapter<GisikAdapter.ViewHolder>() {

inner class ViewHolder(private val binding: ItemGisikBinding) :
RecyclerView.ViewHolder(binding.root) {


fun bind(position: Int) {
binding.tvMenu.text = dataList[position].name
binding.tvPrice.text = dataList[position].price.toString()
binding.tvRate.text = String.format("%.1f", dataList[position].grade)
if (position >= 0 && position < dataList.size) {
val menuList = dataList[position]
val nameList = StringBuilder()

for (menuInfo in menuList.changeMenuInfoList) {
nameList.append(menuInfo.name)
nameList.append("+")
}

if (nameList.isNotEmpty()) {
nameList.deleteCharAt(nameList.length - 1) // Remove the last '+'
}

val result = nameList.toString()
binding.tvMenu.text = result

binding.tvPrice.text = dataList[position].price.toString()
binding.tvRate.text = dataList[position].mainGrade.toString()
}
}
}


override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
val binding =
ItemGisikBinding.inflate(LayoutInflater.from(parent.context), parent, false)
Expand All @@ -35,9 +53,9 @@ class GisikAdapter(private val dataList: List<GetMenuInfoListResponse.MenuInfo>)
//서버 연결
holder.itemView.setOnClickListener {
val intent = Intent(holder.itemView.context, ReviewListActivity::class.java)
intent.putExtra(
"menuId", dataList[position].menuId
)
// intent.putExtra(
// "menuId", dataList[position].menuId
// )
ContextCompat.startActivity(holder.itemView.context, intent, null)
}
}
Expand Down
Loading

0 comments on commit f28e35a

Please sign in to comment.