aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOgnjen Cirkovic <ciraboxkg@gmail.com>2022-12-11 21:21:03 +0100
committerOgnjen Cirkovic <ciraboxkg@gmail.com>2022-12-11 21:21:03 +0100
commit4ff89a8b3d8d939e58c6702e9fa388f1b6cd96c5 (patch)
treeba9756d9fc87b829dc11c19ae6083272a411ee16
parent0875e09ff1980a0533c4cb2f88121564405a4f61 (diff)
Dodata ikonica koja prikazuje ako objava sadrzi vise od jedne slike.
-rw-r--r--Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/MyPostsAdapter.kt3
-rw-r--r--Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ShowPostsAdapter.kt3
-rw-r--r--Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ShowPostsHomePageAdapter.kt4
-rw-r--r--Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_multiple_images_24.xml5
-rw-r--r--Client/BrzoDoLokacije/app/src/main/res/layout/post_item_home_page.xml12
-rw-r--r--Client/BrzoDoLokacije/app/src/main/res/layout/post_preview.xml13
6 files changed, 40 insertions, 0 deletions
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/MyPostsAdapter.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/MyPostsAdapter.kt
index de7d619..2161f96 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/MyPostsAdapter.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/MyPostsAdapter.kt
@@ -4,6 +4,7 @@ import android.app.Activity
import android.content.Intent
import android.os.Bundle
import android.view.LayoutInflater
+import android.view.View
import android.view.ViewGroup
import androidx.recyclerview.widget.RecyclerView
import com.bumptech.glide.Glide
@@ -40,6 +41,8 @@ class MyPostsAdapter (val activity:Activity,val items : MutableList<PostPreview>
tvTitle.text = item.location.name
tvLocationParent.text = item.location.country
tvPostPreviewRating.text=item.ratings.toString()
+ if(item.images.size>1)
+ ivMultipleImagesIcon.visibility= View.VISIBLE
// tvLocationType.text = "TODO"
if(item.images.isNotEmpty()) {
Glide.with(activity)
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ShowPostsAdapter.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ShowPostsAdapter.kt
index 0d4f0f0..d287097 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ShowPostsAdapter.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ShowPostsAdapter.kt
@@ -4,6 +4,7 @@ import android.app.Activity
import android.content.Intent
import android.os.Bundle
import android.view.LayoutInflater
+import android.view.View
import android.view.ViewGroup
import android.widget.Toast
import androidx.paging.PagingDataAdapter
@@ -72,6 +73,8 @@ class ShowPostsAdapter (val activity:Activity,val items : MutableList<PostPrevie
else
tvLocationParent.text = item.location.country
tvPostPreviewRating.text=item.ratings.toString()
+ if(item.images.size>1)
+ ivMultipleImagesIcon.visibility= View.VISIBLE
//tvLocationType.text = "TODO"
if(item.images.isNotEmpty()) {
Glide.with(activity)
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ShowPostsHomePageAdapter.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ShowPostsHomePageAdapter.kt
index bc5e1f6..5569fd4 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ShowPostsHomePageAdapter.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ShowPostsHomePageAdapter.kt
@@ -7,6 +7,7 @@ import android.util.Log
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
+import android.widget.ImageView
import android.widget.TextView
import androidx.core.net.toUri
import androidx.recyclerview.widget.RecyclerView
@@ -49,6 +50,7 @@ inner class PostViewHolder(view: View):RecyclerView.ViewHolder(view){
private val locationName:TextView=view.findViewById(R.id.tvPIHPLocationName)
private val locationDetail:TextView=view.findViewById(R.id.tvPIHPLocationDetail)
private val rating:TextView=view.findViewById(R.id.tvPIHPRecension)
+ private val multipleImageIcon:ImageView=view.findViewById(R.id.ivMultipleImagesIcon)
fun bindView(postPreview:PostPreview){
//background.setImageURI(postPreview.images[0]._id.to)
@@ -59,6 +61,8 @@ inner class PostViewHolder(view: View):RecyclerView.ViewHolder(view){
}
locationName.text=postPreview.location.name
rating.text=postPreview.ratings.toString()
+ if(postPreview.images.size>1)
+ multipleImageIcon.visibility=View.VISIBLE
if(postPreview.location.city!=null)
locationDetail.text=postPreview.location.city
else
diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_multiple_images_24.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_multiple_images_24.xml
new file mode 100644
index 0000000..2f21fd1
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_multiple_images_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#747474"
+ android:viewportHeight="24" android:viewportWidth="24"
+ android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+ <path android:fillColor="@android:color/white" android:pathData="M14,2L4,2c-1.11,0 -2,0.9 -2,2v10h2L4,4h10L14,2zM18,6L8,6c-1.11,0 -2,0.9 -2,2v10h2L8,8h10L18,6zM20,10h-8c-1.11,0 -2,0.9 -2,2v8c0,1.1 0.89,2 2,2h8c1.1,0 2,-0.9 2,-2v-8c0,-1.1 -0.9,-2 -2,-2z"/>
+</vector>
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/post_item_home_page.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/post_item_home_page.xml
index 2d32b2d..a730c82 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/post_item_home_page.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/post_item_home_page.xml
@@ -21,6 +21,18 @@
app:layout_constraintTop_toTopOf="parent"
app:shapeAppearanceOverlay="@style/Circular" />
+ <ImageView
+ android:id="@+id/ivMultipleImagesIcon"
+ android:layout_width="18dp"
+ android:layout_height="17dp"
+ android:elevation="10dp"
+ android:visibility="invisible"
+ android:layout_marginRight="5dp"
+ android:layout_marginTop="5dp"
+ android:src="@drawable/ic_baseline_multiple_images_24"
+ app:layout_constraintEnd_toEndOf="@+id/ivPIHPBackground"
+ app:layout_constraintTop_toTopOf="@+id/imageView9" />
+
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/ivPIHPBackground"
android:layout_width="172dp"
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/post_preview.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/post_preview.xml
index 73e546f..0042c6f 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/post_preview.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/post_preview.xml
@@ -31,6 +31,19 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
+
+ <ImageView
+ android:id="@+id/ivMultipleImagesIcon"
+ android:layout_width="18dp"
+ android:layout_height="17dp"
+ android:layout_marginRight="5dp"
+ android:layout_marginTop="5dp"
+ android:elevation="10dp"
+ android:src="@drawable/ic_baseline_multiple_images_24"
+ android:visibility="invisible"
+ app:layout_constraintEnd_toEndOf="@+id/locationImage"
+ app:layout_constraintTop_toTopOf="@+id/locationImage" />
+
<View
android:id="@+id/vBanner"
android:layout_width="match_parent"