Merge branch 'develop' of http://gitlab.pmf.kg.ac.rs/BrzoDoLokacije2022/odyssey/brzodolokacije into develop

4 files changed, 49 insertions, 35 deletions

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
index 2f21fd1..0dbac0c 100644
--- 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
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#747474"
+<vector android:height="24dp" android:tint="@color/white"
     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"/>
diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_star_rate_24.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_star_rate_24.xml
index cdafe07..e6a963c 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_star_rate_24.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_star_rate_24.xml
@@ -1,5 +1,5 @@
-<vector android:height="24dp" android:tint="#F1DB24"
+<vector android:height="20dp" android:tint="#F1DB24"
     android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="20dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="@android:color/white" android:pathData="M14.43,10l-2.43,-8l-2.43,8l-7.57,0l6.18,4.41l-2.35,7.59l6.17,-4.69l6.18,4.69l-2.35,-7.59l6.17,-4.41z"/>
 </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 a730c82..d403c97 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
@@ -8,7 +8,7 @@
     <com.google.android.material.imageview.ShapeableImageView
         android:id="@+id/imageView9"
         android:layout_width="170dp"
-        android:layout_height="240dp"
+        android:layout_height="215dp"
         android:layout_marginStart="8dp"
         android:layout_marginTop="4dp"
         android:layout_marginEnd="8dp"
@@ -35,8 +35,8 @@
 
     <com.google.android.material.imageview.ShapeableImageView
         android:id="@+id/ivPIHPBackground"
-        android:layout_width="172dp"
-        android:layout_height="185dp"
+        android:layout_width="170dp"
+        android:layout_height="175dp"
         android:layout_marginStart="1dp"
         android:layout_marginEnd="1dp"
         android:elevation="3dp"
@@ -53,11 +53,11 @@
         android:id="@+id/tvPIHPLocationName"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="4dp"
+        android:layout_marginStart="12dp"
+        android:layout_marginTop="2dp"
         android:elevation="3dp"
         android:text="TextView"
-        android:textSize="14sp"
+        android:textSize="13sp"
         android:textStyle="bold"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/ivPIHPBackground" />
@@ -66,9 +66,10 @@
         android:id="@+id/tvPIHPRecension"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
+        android:layout_marginTop="3dp"
 
-        android:layout_marginEnd="8dp"
+        android:layout_marginEnd="4dp"
+        android:drawableLeft="star"
         android:elevation="3dp"
         android:text="TextView"
         android:textSize="11dp"
@@ -81,7 +82,7 @@
 
         android:layout_width="15dp"
         android:layout_height="15dp"
-        android:layout_marginTop="8dp"
+        android:layout_marginTop="3dp"
         android:elevation="3dp"
         app:layout_constraintEnd_toStartOf="@+id/tvPIHPRecension"
         app:layout_constraintTop_toBottomOf="@+id/ivPIHPBackground"
@@ -90,9 +91,9 @@
     <ImageView
         android:id="@+id/imageView11"
 
-        android:layout_width="20dp"
-        android:layout_height="19dp"
-        android:layout_marginStart="12dp"
+        android:layout_width="18dp"
+        android:layout_height="18dp"
+        android:layout_marginStart="8dp"
         android:layout_marginTop="2dp"
         android:elevation="3dp"
         app:layout_constraintStart_toStartOf="parent"
@@ -104,8 +105,7 @@
 
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="4dp"
-        android:layout_marginTop="4dp"
+        android:layout_marginTop="2dp"
         android:elevation="3dp"
         android:text="TextView"
         android:textSize="11dp"
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 0042c6f..2d7d604 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/post_preview.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/post_preview.xml
@@ -17,37 +17,38 @@
         tools:layout_editor_absoluteY="295dp" />-->
 
     <com.google.android.material.imageview.ShapeableImageView
-        app:shapeAppearanceOverlay="@style/roundedTop"
         android:id="@+id/locationImage"
         android:layout_width="match_parent"
-        android:layout_height="250dp"
+        android:layout_height="239dp"
         android:layout_marginStart="16dp"
         android:layout_marginTop="16dp"
         android:layout_marginEnd="16dp"
         android:background="@drawable/b1"
+        android:elevation="10dp"
         android:scaleType="centerCrop"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:shapeAppearanceOverlay="@style/roundedTop" />
 
 
     <ImageView
         android:id="@+id/ivMultipleImagesIcon"
-        android:layout_width="18dp"
-        android:layout_height="17dp"
+        android:layout_width="25dp"
+        android:layout_height="25dp"
+        android:layout_marginTop="7dp"
         android:layout_marginRight="5dp"
-        android:layout_marginTop="5dp"
         android:elevation="10dp"
         android:src="@drawable/ic_baseline_multiple_images_24"
-        android:visibility="invisible"
+    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"
-        android:layout_height="70dp"
+        android:layout_height="55dp"
         android:layout_marginStart="16dp"
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="16dp"
@@ -59,7 +60,7 @@
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/locationImage"
-        app:layout_constraintVertical_bias="0.0">
+        app:layout_constraintVertical_bias="1.0">
 
 
     </View>
@@ -68,27 +69,28 @@
         android:id="@+id/tvTitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="28dp"
-        android:layout_marginTop="8dp"
+        android:layout_marginStart="24dp"
+        android:layout_marginTop="4dp"
         android:elevation="10dp"
         android:gravity="top|left"
         android:text="Naslov"
-        android:textSize="20sp"
+        android:textSize="18sp"
         android:textStyle="bold"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/locationImage" />
 
     <TextView
-        android:elevation="10dp"
         android:id="@+id/tvLocationParent"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:layout_marginStart="28dp"
-        android:layout_marginTop="4dp"
+        android:layout_marginStart="24dp"
+        android:layout_marginTop="1dp"
         android:drawableLeft="@drawable/ic_baseline_location_on_24"
 
+        android:elevation="10dp"
         android:text="grad, drzava"
         android:textAlignment="viewEnd"
+        android:textSize="16sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/tvTitle" />
 
@@ -96,13 +98,25 @@
         android:id="@+id/tvPostPreviewRating"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="40dp"
-        android:layout_marginEnd="32dp"
+        android:layout_marginTop="6dp"
+        android:layout_marginEnd="24dp"
         android:drawableLeft="@drawable/ic_baseline_star_rate_24"
         android:elevation="10dp"
         android:text="TextView"
-        android:textSize="17dp"
+        android:textSize="16dp"
         android:textStyle="bold"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/locationImage" />
+
+    <TextView
+        android:id="@+id/tvPostPreviewDate"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="2dp"
+        android:layout_marginEnd="24dp"
+        android:elevation="10dp"
+        android:text="TextView"
+        android:textSize="16sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tvPostPreviewRating" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file