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

9 files changed, 45 insertions, 17 deletions

diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_add_post.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_add_post.xml
index 0d3eba5..dabb494 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_add_post.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_add_post.xml
@@ -6,20 +6,25 @@
     android:layout_height="match_parent"
     tools:context=".Activities.ActivityAddPost">
 
-    <ImageSwitcher
+    <ImageView
         android:id="@+id/isActivityAddPostSwitcher"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:elevation="10dp"
-        app:layout_constraintBottom_toTopOf="@+id/btnActivityAddPostUploadFromGallery"
+        android:scaleType="fitCenter"
+        app:layout_constraintBottom_toTopOf="@+id/btnActivityAddPostAddLocation"
         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:layout_constraintVertical_bias="1.0"
+        tools:ignore="ImageContrastCheck"
+        tools:srcCompat="@tools:sample/avatars"/>
 
     <Button
         android:id="@+id/nextImage"
         android:layout_width="78dp"
         android:layout_height="0dp"
+        android:elevation="15dp"
         android:background="@drawable/rounded_transparent_button"
         android:gravity="right"
         android:padding="30dp"
@@ -34,7 +39,7 @@
         android:id="@+id/previousImage"
         android:layout_width="70dp"
         android:layout_height="0dp"
-
+        android:elevation="15dp"
         android:background="@drawable/rounded_transparent_button"
         android:gravity="left"
         android:padding="30dp"
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_change_password.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_change_password.xml
index dc8243e..1ef0be6 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_change_password.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_change_password.xml
@@ -85,7 +85,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
 
-        android:layout_marginTop="40dp"
+        android:layout_marginTop="20dp"
         android:text="Nova lozinka"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/btnActivityChangePasswordForgottenPass" />
@@ -127,6 +127,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:clickable="true"
+        android:visibility="invisible"
         android:text="Zaboravljena lozinka?"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
@@ -173,6 +174,6 @@
         android:layout_height="wrap_content"
         android:text="ErrorMessage"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/btnActivityChangePasswordForgottenPass" />
+        app:layout_constraintTop_toTopOf="@+id/btnActivityChangePasswordForgottenPass" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_single_post.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_single_post.xml
index d2229e8..e435876 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_single_post.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_single_post.xml
@@ -46,12 +46,16 @@
             <TextView
                 android:id="@+id/tvTitle"
                 style="@style/title"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="24dp"
+                android:ellipsize="end"
                 android:gravity="top|start"
+                android:maxLines="1"
                 android:padding="@dimen/text_padding"
+                android:paddingRight="20dp"
                 android:text="Naslov"
+                app:layout_constraintEnd_toStartOf="@+id/ivFavourite"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_my_profile_info.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_my_profile_info.xml
index 34da5ff..eee59aa 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_my_profile_info.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_my_profile_info.xml
@@ -6,7 +6,9 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     tools:context=".Fragments.FragmentMyProfileInfo">
-
+<ScrollView
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="0dp"
@@ -46,6 +48,7 @@
             android:drawableLeft="@drawable/ic_outline_share_24"
             android:text="Pozovite prijatelje" />
     </LinearLayout>
+</ScrollView>
 
     <Button
         android:id="@+id/buttonLogOut"
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_my_recensions.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_my_recensions.xml
index 72706e0..76690e9 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_my_recensions.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_my_recensions.xml
@@ -23,6 +23,8 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/materialDivider"
-        android:layout_marginHorizontal="16dp"/>
+        android:layout_marginHorizontal="16dp"
+        android:paddingBottom="50dp"/>
+
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
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 9622c34..6584d5c 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
@@ -53,15 +53,18 @@
 
     <TextView
         android:id="@+id/tvPIHPLocationName"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="12dp"
         android:layout_marginBottom="2dp"
+        android:maxLines="1"
+        android:ellipsize="end"
         android:elevation="3dp"
         android:text="TextView"
         android:textSize="13sp"
         android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@+id/tvPIHPLocationDetail"
+        app:layout_constraintEnd_toStartOf="@+id/imageView10"
         app:layout_constraintStart_toStartOf="parent" />
 
     <TextView
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/post_item_user_post.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/post_item_user_post.xml
index c72ace6..1b78ba9 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/post_item_user_post.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/post_item_user_post.xml
@@ -52,14 +52,17 @@
 
     <TextView
         android:id="@+id/piupLocation"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="12dp"
         android:layout_marginTop="2dp"
+        android:maxLines="1"
+        android:ellipsize="end"
         android:elevation="3dp"
         android:text="TextView"
         android:textSize="13sp"
         android:textStyle="bold"
+        app:layout_constraintEnd_toStartOf="@+id/imageView10"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/piupbackground" />
 
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 0ce4776..54b11b0 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/post_preview.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/post_preview.xml
@@ -67,16 +67,20 @@
 
     <TextView
         android:id="@+id/tvTitle"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="24dp"
         android:layout_marginTop="4dp"
         android:elevation="10dp"
+        android:ellipsize="end"
         android:gravity="top|left"
+        android:paddingLeft="5dp"
+        android:maxLines="1"
+        android:paddingRight="20dp"
         android:text="Naslov"
         android:textSize="18sp"
         android:textStyle="bold"
-        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/tvPostPreviewRating"
+        app:layout_constraintStart_toStartOf="@+id/locationImage"
         app:layout_constraintTop_toBottomOf="@+id/locationImage" />
 
     <TextView
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/single_post_history.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/single_post_history.xml
index 72ead29..16c5814 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/single_post_history.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/single_post_history.xml
@@ -30,16 +30,19 @@
 
     <TextView
         android:id="@+id/tvTitleSinglePostHistory"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="32dp"
         android:elevation="5dp"
+        android:ellipsize="end"
         android:gravity="top|left"
+        android:maxLines="1"
+        android:paddingRight="20dp"
         android:text="Naslov"
         android:textSize="20sp"
         android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintEnd_toEndOf="@+id/vBannerSinglePostHistory"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@+id/vBannerSinglePostHistory"