bastien.ollier
/
Mapping
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

affichage des Restaurant liker

Browse Source
master
Bastien OLLIER 2 years ago
parent 1f8e7f48e0
commit f8bccf3311
6 changed files with 52 additions and 43 deletions
Show Stats Download Patch File Download Diff File

9
app/src/main/java/fr/iut/mapping/LikesFrag.kt
Unescape View File

@ -1,7 +1,5 @@
package fr.iut.mapping
import android.app.Activity
import android.content.Entity
import android.content.Intent
import android.os.Bundle
import android.util.Log
import android.view.LayoutInflater
@ -12,8 +10,6 @@ import androidx.fragment.app.viewModels
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import fr.iut.mapping.Model.RestaurantData
import fr.iut.mapping.database.DAO.RestaurantDAO
import fr.iut.mapping.database.Entity.RestaurantEntity
class SecondFragment: Fragment(R.layout.fragment_likes_page) {
@ -35,10 +31,9 @@ class SecondFragment: Fragment(R.layout.fragment_likes_page) {
restaurantEntities.map { entity ->
RestaurantData(entity.lat, entity.lon, entity.name, entity.phone, entity.adress)
}.toMutableList()
Log.d("debug1", restaurantDataList.toString())
adapter.submitList(restaurantDataList)
Log.d("debug2", restaurantDataList.toString())
}
return rootView
}
}

2
app/src/main/java/fr/iut/mapping/MapFrag.kt
Unescape View File

@ -79,6 +79,8 @@ class FirstFragment: Fragment(R.layout.fragment_map_page) {
}
private fun findAndPutRestaurant(rootView: View){
locationListener.start()
if(locationListener.asPermission()){
Log.e("Debug","${locationListener.latitude},${locationListener.longitude}")
listRestaurant = emptyList()

35
app/src/main/java/fr/iut/mapping/RestaurantAdapter.kt
Unescape View File

@ -13,35 +13,34 @@ import fr.iut.mapping.Model.RestaurantData
class RestaurantAdapter : ListAdapter<RestaurantData, RestaurantAdapter.RestaurantViewHolder>(RESTAURANT_COMPARATOR) {
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RestaurantViewHolder {
Log.d("debug","onCreateViewHolder")
return RestaurantViewHolder.create(parent)
}
override fun onBindViewHolder(holder: RestaurantViewHolder, position: Int) {
Log.d("debug","onBindViewHolder")
val current = getItem(position)
holder.bind(current.name)
holder.bind(current.name,current.adress,current.phone,current.lat,current.lon)
}
override fun getItemCount(): Int {
Log.d("debug","getItemCount")
Log.d("debug",currentList.toString())
return currentList.size
}
class RestaurantViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
private val restaurantItemView: TextView = itemView.findViewById(R.id.nameRestaurant)
private val restaurantName: TextView = itemView.findViewById(R.id.nameRestaurant)
private val restaurantAddress: TextView = itemView.findViewById(R.id.addressRestaurant)
private val restauranttel: TextView = itemView.findViewById(R.id.telephoneRestaurant)
private val restaurantGps: TextView = itemView.findViewById(R.id.GPSRestaurant)
fun bind(text: String?) {
Log.d("debug","bind")
fun bind(name: String,address: String?,tel:String?,lat: Double, lon: Double ) {
restaurantItemView.text = text
restaurantName.text = name
restaurantAddress.text = address
restauranttel.text = tel
restaurantGps.text = "${lat},${lon}"
}
companion object {
fun create(parent: ViewGroup): RestaurantViewHolder {
Log.d("debug","create")
val view: View = LayoutInflater.from(parent.context).inflate(R.layout.recyclerviewitem, parent, false)
return RestaurantViewHolder(view)
}
@ -50,21 +49,15 @@ class RestaurantAdapter : ListAdapter<RestaurantData, RestaurantAdapter.Restaura
companion object {
private val RESTAURANT_COMPARATOR = object : DiffUtil.ItemCallback<RestaurantData>() {
override fun areItemsTheSame(oldItem: RestaurantData, newItem: RestaurantData): Boolean {
Log.d("debug","areItemsTheSame")
return oldItem === newItem
}
override fun areItemsTheSame(oldItem: RestaurantData, newItem: RestaurantData): Boolean = oldItem === newItem
override fun areContentsTheSame(oldItem: RestaurantData, newItem: RestaurantData): Boolean {
Log.d("debug","areContentsTheSame")
return oldItem.name == newItem.name &&
override fun areContentsTheSame(oldItem: RestaurantData, newItem: RestaurantData): Boolean =
oldItem.name == newItem.name &&
oldItem.lat == newItem.lat &&
oldItem.lon == newItem.lon &&
oldItem.adress == newItem.adress &&
oldItem.phone == newItem.phone
}
}
}
}

8
app/src/main/java/fr/iut/mapping/database/Database.kt
Unescape View File

@ -46,10 +46,10 @@ abstract class RestaurantDatabase : RoomDatabase() {
restaurantDao.deleteAll()
// Add sample words.
var resto = RestaurantEntity(0,0.0,0.0,"SUPER RESTO","0000","11 rue")
restaurantDao.insert(resto)
resto = RestaurantEntity(0,1.0,1.0,"SUPER RESTO2","00002","22 rue")
restaurantDao.insert(resto)
//var resto = RestaurantEntity(0,0.0,0.0,"SUPER RESTO","0000","11 rue")
//restaurantDao.insert(resto)
//resto = RestaurantEntity(0,1.0,1.0,"SUPER RESTO2","00002","22 rue")
//restaurantDao.insert(resto)
}
}

9
app/src/main/res/layout/fragment_likes_page.xml
Unescape View File

@ -5,15 +5,11 @@
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="test"/>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerview"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:listitem="@layout/recyclerviewitem"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
@ -21,4 +17,5 @@
app:layout_constraintTop_toTopOf="parent" />
</FrameLayout>

32
app/src/main/res/layout/recyclerviewitem.xml
Unescape View File

@ -4,9 +4,31 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/nameRestaurant"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/holo_orange_light" />
<TextView
android:id="@+id/nameRestaurant"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/addressRestaurant"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/telephoneRestaurant"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/GPSRestaurant"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="#000000" />
</LinearLayout>

Write Preview
Loading…
Cancel
Save