Feat : Add a WeekWeatherAdapter tukcomCD2024#102

File : subdivide the sub-files of the folder and organize them into folders
ksh-g001 · Jul 12, 2024 · 3724165 · 3724165
1 parent 6a89bbe
commit 3724165
Show file tree

Hide file tree

Showing 90 changed files with 436 additions and 254 deletions.
diff --git a/...recyclerview/OneWayAirplaneListAdapter.kt → ...ing/airplane/OneWayAirplaneListAdapter.kt b/...recyclerview/OneWayAirplaneListAdapter.kt → ...ing/airplane/OneWayAirplaneListAdapter.kt
@@ -1,12 +1,12 @@
-package com.project.how.adapter.recyclerview
+package com.project.how.adapter.recyclerview.booking.airplane
 
 import android.content.Context
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.project.how.R
-import com.project.how.data_class.dto.GetOneWayFlightOffersResponseElement
+import com.project.how.data_class.dto.booking.airplane.GetOneWayFlightOffersResponseElement
 import com.project.how.databinding.OneWayAirplaneListItemBinding
 import java.text.NumberFormat
 import java.time.LocalDateTime

diff --git a/...ter/recyclerview/RecentAirplaneAdapter.kt → ...booking/airplane/RecentAirplaneAdapter.kt b/...ter/recyclerview/RecentAirplaneAdapter.kt → ...booking/airplane/RecentAirplaneAdapter.kt
@@ -1,4 +1,4 @@
-package com.project.how.adapter.recyclerview
+package com.project.how.adapter.recyclerview.booking.airplane
 
 import android.view.LayoutInflater
 import android.view.ViewGroup

diff --git a/...yclerview/RoundTripAirplaneListAdapter.kt → .../airplane/RoundTripAirplaneListAdapter.kt b/...yclerview/RoundTripAirplaneListAdapter.kt → .../airplane/RoundTripAirplaneListAdapter.kt
@@ -1,12 +1,12 @@
-package com.project.how.adapter.recyclerview
+package com.project.how.adapter.recyclerview.booking.airplane
 
 import android.content.Context
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.project.how.R
-import com.project.how.data_class.dto.GetFlightOffersResponseElement
+import com.project.how.data_class.dto.booking.airplane.GetFlightOffersResponseElement
 import com.project.how.databinding.RoundTripAirplaneListItemBinding
 import java.text.NumberFormat
 import java.time.LocalDateTime

diff --git a/...dapter/recyclerview/RecentHotelAdapter.kt → ...rview/booking/hotel/RecentHotelAdapter.kt b/...dapter/recyclerview/RecentHotelAdapter.kt → ...rview/booking/hotel/RecentHotelAdapter.kt
@@ -1,11 +1,10 @@
-package com.project.how.adapter.recyclerview
+package com.project.how.adapter.recyclerview.booking.hotel
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
 import com.project.how.BuildConfig
-import com.project.how.R
 import com.project.how.data_class.recyclerview.RecentHotel
 import com.project.how.databinding.RecentHotelItemBinding
 

diff --git a/...ter/recyclerview/AiDaysScheduleAdapter.kt → ...lerview/schedule/AiDaysScheduleAdapter.kt b/...ter/recyclerview/AiDaysScheduleAdapter.kt → ...lerview/schedule/AiDaysScheduleAdapter.kt
@@ -1,5 +1,6 @@
-package com.project.how.adapter.recyclerview
+package com.project.how.adapter.recyclerview.schedule
 
+import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -8,13 +9,14 @@ import com.project.how.R
 import com.project.how.data_class.recyclerview.AiDaysSchedule
 import com.project.how.databinding.AiDaysScheduleItemBinding
 
-class AiDaysScheduleAdapter(data: List<AiDaysSchedule>)
+class AiDaysScheduleAdapter(private val context: Context, data: List<AiDaysSchedule>)
     : RecyclerView.Adapter<AiDaysScheduleAdapter.ViewHolder>(){
         private var dailySchedule = data
 
         inner class ViewHolder(val binding: AiDaysScheduleItemBinding) : RecyclerView.ViewHolder(binding.root){
             fun bind(data : AiDaysSchedule, position: Int){
                 binding.scheduleTitle.text = data.places
+                binding.budget.text = context.getString(R.string.budget, data.budget.toString())
                 when (position) {
                     0 -> binding.topDottedLine.visibility = View.GONE
                     dailySchedule.lastIndex -> binding.bottomDottedLine.visibility = View.GONE

diff --git a/...adapter/recyclerview/AiScheduleAdapter.kt → ...ecyclerview/schedule/AiScheduleAdapter.kt b/...adapter/recyclerview/AiScheduleAdapter.kt → ...ecyclerview/schedule/AiScheduleAdapter.kt
@@ -1,4 +1,4 @@
-package com.project.how.adapter.recyclerview
+package com.project.how.adapter.recyclerview.schedule
 
 import android.content.Context
 import android.util.Log
@@ -35,6 +35,7 @@ class AiScheduleAdapter(private val context: Context, data : List<AiSchedule>, p
         inner class ViewHolder(val binding : AiScheduleItemBinding) : RecyclerView.ViewHolder(binding.root){
             fun bind(data : AiSchedule, position: Int){
                 binding.title.text = data.title
+                binding.budget.text = context.getString(R.string.total_budget, data.budget.toString())
                 binding.places.text = getPlacesText(data.places)
                 Glide.with(binding.root)
                     .load(data.image)
@@ -47,7 +48,7 @@ class AiScheduleAdapter(private val context: Context, data : List<AiSchedule>, p
 
                 binding.daysTitle.text = context.getString(R.string.days_title, (1).toString(), getDaysTitle(data, 0))
 
-                val adapter = AiDaysScheduleAdapter(data.dailySchedule[selectedDay])
+                val adapter = AiDaysScheduleAdapter(context, data.dailySchedule[selectedDay])
                 binding.daySchedules.adapter = adapter
 
                 binding.drawer.setOnClickListener {

diff --git a/...apter/recyclerview/CalendarListAdapter.kt → ...yclerview/schedule/CalendarListAdapter.kt b/...apter/recyclerview/CalendarListAdapter.kt → ...yclerview/schedule/CalendarListAdapter.kt
@@ -1,4 +1,4 @@
-package com.project.how.adapter.recyclerview
+package com.project.how.adapter.recyclerview.schedule
 
 import android.content.Context
 import android.util.Log
@@ -7,11 +7,10 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
-import com.google.android.gms.maps.model.LatLng
 import com.project.how.BuildConfig
 import com.project.how.R
-import com.project.how.data_class.dto.GetScheduleListResponse
-import com.project.how.data_class.dto.GetScheduleListResponseElement
+import com.project.how.data_class.dto.schedule.GetScheduleListResponse
+import com.project.how.data_class.dto.schedule.GetScheduleListResponseElement
 import com.project.how.databinding.CalendarListItemBinding
 import java.text.NumberFormat
 import java.util.Locale

diff --git a/...apter/recyclerview/DaysScheduleAdapter.kt → ...yclerview/schedule/DaysScheduleAdapter.kt b/...apter/recyclerview/DaysScheduleAdapter.kt → ...yclerview/schedule/DaysScheduleAdapter.kt
@@ -1,4 +1,4 @@
-package com.project.how.adapter.recyclerview
+package com.project.how.adapter.recyclerview.schedule
 
 import android.content.Context
 import android.view.LayoutInflater

diff --git a/...r/recyclerview/DaysScheduleEditAdapter.kt → ...rview/schedule/DaysScheduleEditAdapter.kt b/...r/recyclerview/DaysScheduleEditAdapter.kt → ...rview/schedule/DaysScheduleEditAdapter.kt
@@ -1,4 +1,4 @@
-package com.project.how.adapter.recyclerview
+package com.project.how.adapter.recyclerview.schedule
 
 import android.content.Context
 import android.util.Log

diff --git a/...cyclerview/RecentAddedCalendarsAdapter.kt → ...w/schedule/RecentAddedCalendarsAdapter.kt b/...cyclerview/RecentAddedCalendarsAdapter.kt → ...w/schedule/RecentAddedCalendarsAdapter.kt
@@ -1,12 +1,12 @@
-package com.project.how.adapter.recyclerview
+package com.project.how.adapter.recyclerview.schedule
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
 import com.project.how.BuildConfig
-import com.project.how.data_class.dto.GetLatestSchedulesResponse
-import com.project.how.data_class.dto.GetLatestSchedulesResponseElement
+import com.project.how.data_class.dto.schedule.GetLatestSchedulesResponse
+import com.project.how.data_class.dto.schedule.GetLatestSchedulesResponseElement
 import com.project.how.databinding.RecentAddedCalendarsItemBinding
 
 class RecentAddedCalendarsAdapter(data : GetLatestSchedulesResponse, private val onItemClickListener: OnItemClickListener) : RecyclerView.Adapter<RecentAddedCalendarsAdapter.ViewHolder>() {

diff --git a/...Trip/app/src/main/java/com/project/how/adapter/recyclerview/weather/WeekWeatherAdapter.kt b/...Trip/app/src/main/java/com/project/how/adapter/recyclerview/weather/WeekWeatherAdapter.kt
@@ -0,0 +1,41 @@
+package com.project.how.adapter.recyclerview.weather
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import com.bumptech.glide.Glide
+import com.project.how.R
+import com.project.how.data_class.dto.weather.GetWeeklyWeathersResponseElement
+import com.project.how.databinding.WeekWeatherItemBinding
+
+class WeekWeatherAdapter(private val data : List<GetWeeklyWeathersResponseElement>)
+    : RecyclerView.Adapter<WeekWeatherAdapter.ViewHolder>() {
+
+        inner class ViewHolder(val binding: WeekWeatherItemBinding) : RecyclerView.ViewHolder(binding.root){
+            fun bind(data: GetWeeklyWeathersResponseElement){
+                binding.week.text = data.date
+                binding.temp.text = data.temp
+                Glide.with(binding.root)
+                    .load(data.iconUrl)
+                    .error(R.drawable.icon_question)
+                    .into(binding.image)
+            }
+        }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder = ViewHolder(
+        WeekWeatherItemBinding.inflate(
+            LayoutInflater.from(parent.context),
+            parent,
+            false
+        )
+    )
+
+    override fun getItemViewType(position: Int): Int = position
+    override fun getItemCount(): Int = data.size
+
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+        val data = data[position]
+        holder.bind(data)
+    }
+
+}
diff --git a/...class/dto/GenerateSkyscannerUrlRequest.kt → .../airplane/GenerateSkyscannerUrlRequest.kt b/...class/dto/GenerateSkyscannerUrlRequest.kt → .../airplane/GenerateSkyscannerUrlRequest.kt
@@ -1,4 +1,4 @@
-package com.project.how.data_class.dto
+package com.project.how.data_class.dto.booking.airplane
 
 import com.google.gson.annotations.SerializedName
 

diff --git a/...lass/dto/GenerateSkyscannerUrlResponse.kt → ...airplane/GenerateSkyscannerUrlResponse.kt b/...lass/dto/GenerateSkyscannerUrlResponse.kt → ...airplane/GenerateSkyscannerUrlResponse.kt
@@ -1,4 +1,4 @@
-package com.project.how.data_class.dto
+package com.project.how.data_class.dto.booking.airplane
 
 import com.google.gson.annotations.SerializedName
 

diff --git a/.../data_class/dto/GetFlightOffersRequest.kt → ...ooking/airplane/GetFlightOffersRequest.kt b/.../data_class/dto/GetFlightOffersRequest.kt → ...ooking/airplane/GetFlightOffersRequest.kt
@@ -1,4 +1,4 @@
-package com.project.how.data_class.dto
+package com.project.how.data_class.dto.booking.airplane
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable

diff --git a/...data_class/dto/GetFlightOffersResponse.kt → ...oking/airplane/GetFlightOffersResponse.kt b/...data_class/dto/GetFlightOffersResponse.kt → ...oking/airplane/GetFlightOffersResponse.kt
@@ -1,4 +1,4 @@
-package com.project.how.data_class.dto
+package com.project.how.data_class.dto.booking.airplane
 
 import java.io.Serializable
 

diff --git a/...w/data_class/dto/GetLikeFlightResponse.kt → ...booking/airplane/GetLikeFlightResponse.kt b/...w/data_class/dto/GetLikeFlightResponse.kt → ...booking/airplane/GetLikeFlightResponse.kt
@@ -1,4 +1,4 @@
-package com.project.how.data_class.dto
+package com.project.how.data_class.dto.booking.airplane
 
 typealias GetLikeFlightResponse = List<GetLikeFlightResponseElement>
 

diff --git a/.../project/how/data_class/dto/LikeFlight.kt → ..._class/dto/booking/airplane/LikeFlight.kt b/.../project/how/data_class/dto/LikeFlight.kt → ..._class/dto/booking/airplane/LikeFlight.kt
@@ -1,4 +1,4 @@
-package com.project.how.data_class.dto
+package com.project.how.data_class.dto.booking.airplane
 
 typealias LikeFlight = List<LikeFlightElement>
 

diff --git a/...ct/how/data_class/dto/LikeOneWayFlight.kt → .../dto/booking/airplane/LikeOneWayFlight.kt b/...ct/how/data_class/dto/LikeOneWayFlight.kt → .../dto/booking/airplane/LikeOneWayFlight.kt
@@ -1,4 +1,4 @@
-package com.project.how.data_class.dto
+package com.project.how.data_class.dto.booking.airplane
 
 typealias LikeOneWayFlight = List<LikeOneWayFlightElement>
 

diff --git a/...ta_class/dto/GetCountryLocationRequest.kt → .../dto/country/GetCountryLocationRequest.kt b/...ta_class/dto/GetCountryLocationRequest.kt → .../dto/country/GetCountryLocationRequest.kt
@@ -1,4 +1,4 @@
-package com.project.how.data_class.dto
+package com.project.how.data_class.dto.country
 
 import com.google.gson.annotations.SerializedName
 

diff --git a/...a_class/dto/GetCountryLocationResponse.kt → ...dto/country/GetCountryLocationResponse.kt b/...a_class/dto/GetCountryLocationResponse.kt → ...dto/country/GetCountryLocationResponse.kt
@@ -1,4 +1,4 @@
-package com.project.how.data_class.dto
+package com.project.how.data_class.dto.country
 
 import com.google.gson.annotations.SerializedName
 

diff --git a/...how/data_class/dto/AuthRecreateRequest.kt → ...a_class/dto/member/AuthRecreateRequest.kt b/...how/data_class/dto/AuthRecreateRequest.kt → ...a_class/dto/member/AuthRecreateRequest.kt
@@ -1,4 +1,4 @@
-package com.project.how.data_class.dto
+package com.project.how.data_class.dto.member
 
 import com.google.gson.annotations.SerializedName
 

diff --git a/...ect/how/data_class/dto/GetInfoResponse.kt → .../data_class/dto/member/GetInfoResponse.kt b/...ect/how/data_class/dto/GetInfoResponse.kt → .../data_class/dto/member/GetInfoResponse.kt
@@ -1,4 +1,4 @@
-package com.project.how.data_class.dto
+package com.project.how.data_class.dto.member
 
 import com.google.gson.annotations.SerializedName
 

diff --git a/...roject/how/data_class/dto/LoginRequest.kt → ...how/data_class/dto/member/LoginRequest.kt b/...roject/how/data_class/dto/LoginRequest.kt → ...how/data_class/dto/member/LoginRequest.kt
@@ -1,4 +1,4 @@
-package com.project.how.data_class.dto
+package com.project.how.data_class.dto.member
 import com.google.gson.annotations.SerializedName
 
 data class LoginRequest (

diff --git a/...oject/how/data_class/dto/SignUpRequest.kt → ...ow/data_class/dto/member/SignUpRequest.kt b/...oject/how/data_class/dto/SignUpRequest.kt → ...ow/data_class/dto/member/SignUpRequest.kt
@@ -1,4 +1,4 @@
-package com.project.how.data_class.dto
+package com.project.how.data_class.dto.member
 
 import com.google.gson.annotations.SerializedName
 

diff --git a/...ta_class/dto/CreateScheduleListRequest.kt → ...dto/schedule/CreateScheduleListRequest.kt b/...ta_class/dto/CreateScheduleListRequest.kt → ...dto/schedule/CreateScheduleListRequest.kt
@@ -1,4 +1,4 @@
-package com.project.how.data_class.dto
+package com.project.how.data_class.dto.schedule
 
 import com.google.gson.annotations.SerializedName
 

diff --git a/...w/data_class/dto/CreateScheduleRequest.kt → ...ass/dto/schedule/CreateScheduleRequest.kt b/...w/data_class/dto/CreateScheduleRequest.kt → ...ass/dto/schedule/CreateScheduleRequest.kt
@@ -1,4 +1,4 @@
-package com.project.how.data_class.dto
+package com.project.how.data_class.dto.schedule
 
 import com.google.gson.annotations.SerializedName
 

diff --git a/.../data_class/dto/CreateScheduleResponse.kt → ...ss/dto/schedule/CreateScheduleResponse.kt b/.../data_class/dto/CreateScheduleResponse.kt → ...ss/dto/schedule/CreateScheduleResponse.kt
@@ -1,4 +1,4 @@
-package com.project.how.data_class.dto
+package com.project.how.data_class.dto.schedule
 
 import com.google.gson.annotations.SerializedName
 

diff --git a/..._class/dto/GetFastestSchedulesResponse.kt → ...o/schedule/GetFastestSchedulesResponse.kt b/..._class/dto/GetFastestSchedulesResponse.kt → ...o/schedule/GetFastestSchedulesResponse.kt
@@ -1,4 +1,4 @@
-package com.project.how.data_class.dto
+package com.project.how.data_class.dto.schedule
 
 data class GetFastestSchedulesResponse(
     val id: Long,

diff --git a/...ta_class/dto/GetLatestScheduleResponse.kt → ...dto/schedule/GetLatestScheduleResponse.kt b/...ta_class/dto/GetLatestScheduleResponse.kt → ...dto/schedule/GetLatestScheduleResponse.kt
@@ -1,4 +1,4 @@
-package com.project.how.data_class.dto
+package com.project.how.data_class.dto.schedule
 
 typealias GetLatestSchedulesResponse = List<GetLatestSchedulesResponseElement>
 

diff --git a/...data_class/dto/GetScheduleListResponse.kt → ...s/dto/schedule/GetScheduleListResponse.kt b/...data_class/dto/GetScheduleListResponse.kt → ...s/dto/schedule/GetScheduleListResponse.kt
@@ -1,4 +1,4 @@
-package com.project.how.data_class.dto
+package com.project.how.data_class.dto.schedule
 
 import com.google.gson.annotations.SerializedName
 

diff --git a/...ject/how/data_class/dto/ScheduleDetail.kt → ...data_class/dto/schedule/ScheduleDetail.kt b/...ject/how/data_class/dto/ScheduleDetail.kt → ...data_class/dto/schedule/ScheduleDetail.kt
@@ -1,4 +1,4 @@
-package com.project.how.data_class.dto
+package com.project.how.data_class.dto.schedule
 
 import com.google.gson.annotations.SerializedName
 

diff --git a/...wAboutTrip/app/src/main/java/com/project/how/data_class/dto/weather/GetWeathersRequest.kt b/...wAboutTrip/app/src/main/java/com/project/how/data_class/dto/weather/GetWeathersRequest.kt
@@ -0,0 +1,8 @@
+package com.project.how.data_class.dto.weather
+
+import com.google.gson.annotations.SerializedName
+
+data class GetWeathersRequest(
+    @SerializedName("country")
+    val country : String
+)
diff --git a/...rip/app/src/main/java/com/project/how/data_class/dto/weather/GetWeeklyWeathersResponse.kt b/...rip/app/src/main/java/com/project/how/data_class/dto/weather/GetWeeklyWeathersResponse.kt
@@ -0,0 +1,14 @@
+package com.project.how.data_class.dto.weather
+
+import com.google.gson.annotations.SerializedName
+
+typealias GetWeeklyWeathersResponse = ArrayList<GetWeeklyWeathersResponseElement>
+
+data class GetWeeklyWeathersResponseElement (
+    @SerializedName("date")
+    val date: String,
+    @SerializedName("temp")
+    val temp: String,
+    @SerializedName("iconUrl")
+    val iconUrl: String
+)
diff --git a/android/HowAboutTrip/app/src/main/java/com/project/how/data_class/recyclerview/AiSchedule.kt b/android/HowAboutTrip/app/src/main/java/com/project/how/data_class/recyclerview/AiSchedule.kt
@@ -9,6 +9,7 @@ data class AiScheduleList(
 data class AiSchedule(
     val title: String,
     val country: String,
+    val budget : Long = 0,
     val places: List<String>,
     val image: String,
     val startDate: String,
@@ -19,6 +20,7 @@ data class AiSchedule(
 data class AiDaysSchedule(
     val type : Int,
     val todo: String,
+    val budget : Long,
     val places: String,
     val lat : Double,
     val lng : Double

diff --git a/android/HowAboutTrip/app/src/main/java/com/project/how/model/BookingRepository.kt b/android/HowAboutTrip/app/src/main/java/com/project/how/model/BookingRepository.kt
@@ -3,12 +3,11 @@ package com.project.how.model
 import android.util.Log
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
-import com.project.how.data_class.dto.GetFlightOffersResponse
-import com.project.how.data_class.dto.GetLikeFlightResponse
-import com.project.how.data_class.dto.GetOneWayFlightOffersResponse
+import com.project.how.data_class.dto.booking.airplane.GetFlightOffersResponse
+import com.project.how.data_class.dto.booking.airplane.GetLikeFlightResponse
+import com.project.how.data_class.dto.booking.airplane.GetOneWayFlightOffersResponse
 import com.project.how.data_class.roomdb.RecentAirplane
 import com.project.how.roomdb.dao.RecentAirplaneDao
-import java.util.LinkedList
 import javax.inject.Inject
 import javax.inject.Singleton
 

diff --git a/android/HowAboutTrip/app/src/main/java/com/project/how/model/ScheduleRepository.kt b/android/HowAboutTrip/app/src/main/java/com/project/how/model/ScheduleRepository.kt
@@ -5,15 +5,15 @@ import android.util.Log
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import com.project.how.R
-import com.project.how.adapter.recyclerview.AiDaysScheduleAdapter
-import com.project.how.data_class.dto.GetFastestSchedulesResponse
-import com.project.how.data_class.dto.GetLatestSchedulesResponse
+import com.project.how.adapter.recyclerview.schedule.AiDaysScheduleAdapter
+import com.project.how.data_class.dto.schedule.GetFastestSchedulesResponse
+import com.project.how.data_class.dto.schedule.GetLatestSchedulesResponse
 import com.project.how.data_class.recyclerview.AiDaysSchedule
 import com.project.how.data_class.recyclerview.AiSchedule
 import com.project.how.data_class.recyclerview.DaysSchedule
 import com.project.how.data_class.recyclerview.Schedule
-import com.project.how.data_class.dto.GetScheduleListResponse
-import com.project.how.data_class.dto.ScheduleDetail
+import com.project.how.data_class.dto.schedule.GetScheduleListResponse
+import com.project.how.data_class.dto.schedule.ScheduleDetail
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
 import java.time.LocalDate