diff --git a/app/src/main/java/uca/baptistearthur/geocaching/data/Stub.kt b/app/src/main/java/uca/baptistearthur/geocaching/data/Stub.kt index 09a8bc2..0ddbabe 100644 --- a/app/src/main/java/uca/baptistearthur/geocaching/data/Stub.kt +++ b/app/src/main/java/uca/baptistearthur/geocaching/data/Stub.kt @@ -1,6 +1,34 @@ package uca.baptistearthur.geocaching.data -class Stub { +import uca.baptistearthur.geocaching.model.Place +import uca.baptistearthur.geocaching.model.RoadTrip +import java.util.Date +class Stub { + fun load(): MutableList { + val list = listOf( + RoadTrip( + "France", + Date(), + listOf(Place(49.3, 49.3)).toMutableList() + ), + RoadTrip( + "Italie", + Date(), + listOf(Place(48.866667, 2.333333), Place(48.866667, 2.333333)).toMutableList() + ), + RoadTrip( + "Danemark", + Date(), + listOf(Place(48.866667, 2.333333), Place(48.866667, 2.333333)).toMutableList() + ), + RoadTrip( + "Islande", + Date(), + listOf(Place(48.866667, 2.333333), Place(48.866667, 2.333333), Place(48.866667, 2.333333)).toMutableList() + ), + ) + return list.toMutableList() + } } \ No newline at end of file diff --git a/app/src/main/java/uca/baptistearthur/geocaching/model/RoadTrip.kt b/app/src/main/java/uca/baptistearthur/geocaching/model/RoadTrip.kt index c91fa76..4352b37 100644 --- a/app/src/main/java/uca/baptistearthur/geocaching/model/RoadTrip.kt +++ b/app/src/main/java/uca/baptistearthur/geocaching/model/RoadTrip.kt @@ -5,7 +5,7 @@ import java.util.Date class RoadTrip( val name: String, val date: Date, - val places: ArrayList + val places: MutableList ){ fun addPlaceToRoadTripList(place: Place) = places.add(place) diff --git a/app/src/main/java/uca/baptistearthur/geocaching/model/Stub.kt b/app/src/main/java/uca/baptistearthur/geocaching/model/Stub.kt deleted file mode 100644 index 265098c..0000000 --- a/app/src/main/java/uca/baptistearthur/geocaching/model/Stub.kt +++ /dev/null @@ -1,24 +0,0 @@ -package uca.baptistearthur.geocaching.model - -import java.util.Date - -class Stub { - -// private val list = listOf( -// RoadTrip( -// "France", -// Date(), -// listOf(Place(48.866667, 2.333333), Place(48.866667, 2.333333)) as ArrayList -// ), -// RoadTrip( -// "Italie", -// Date(), -// listOf(Place(48.866667, 2.333333), Place(48.866667, 2.333333)) as ArrayList -// ), -// ) - -// fun load(): List { -// return list -// } - -} \ No newline at end of file diff --git a/app/src/main/java/uca/baptistearthur/geocaching/recyclerview/RoadTripAdapter.kt b/app/src/main/java/uca/baptistearthur/geocaching/recyclerview/RoadTripAdapter.kt index 91dfb62..17796f6 100644 --- a/app/src/main/java/uca/baptistearthur/geocaching/recyclerview/RoadTripAdapter.kt +++ b/app/src/main/java/uca/baptistearthur/geocaching/recyclerview/RoadTripAdapter.kt @@ -1,26 +1,22 @@ package uca.baptistearthur.geocaching.recyclerview +import android.annotation.SuppressLint import android.view.LayoutInflater -import android.view.View import android.view.ViewGroup -import android.widget.Button import androidx.recyclerview.widget.RecyclerView -import androidx.recyclerview.widget.RecyclerView.Adapter import uca.baptistearthur.geocaching.R import uca.baptistearthur.geocaching.model.RoadTrip -class RoadTripAdapter (val voyages: List) : Adapter(){ - - override fun onBindViewHolder(holder: RoadTripViewHolder, position: Int) { - holder.itemView.findViewById