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

# Conflicts:
#	Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentProfile.kt
#	Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentUserPosts.kt
#	Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_posts.xml

5 files changed, 132 insertions, 47 deletions

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 cbfc063..7c1f8bc 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
@@ -174,8 +174,9 @@
 
             <ImageButton
                 android:id="@+id/rateStar1"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
+                android:layout_width="30dp"
+                android:layout_height="40dp"
+                android:layout_gravity="center_vertical"
                 android:scaleType="centerCrop"
                 android:layout_weight="1"
                 android:backgroundTint="@color/white"
@@ -183,8 +184,9 @@
 
             <ImageButton
                 android:id="@+id/rateStar2"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
+                android:layout_width="30dp"
+                android:layout_height="40dp"
+                android:layout_gravity="center_vertical"
                 android:scaleType="centerCrop"
                 android:layout_weight="1"
                 android:backgroundTint="@color/white"
@@ -192,8 +194,9 @@
 
             <ImageButton
                 android:id="@+id/rateStar3"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
+                android:layout_width="30dp"
+                android:layout_height="40dp"
+                android:layout_gravity="center_vertical"
                 android:scaleType="centerCrop"
                 android:layout_weight="1"
                 android:backgroundTint="@color/white"
@@ -201,8 +204,9 @@
 
             <ImageButton
                 android:id="@+id/rateStar4"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
+                android:layout_width="30dp"
+                android:layout_height="40dp"
+                android:layout_gravity="center_vertical"
                 android:scaleType="centerCrop"
                 android:layout_weight="1"
                 android:backgroundTint="@color/white"
@@ -210,8 +214,9 @@
 
             <ImageButton
                 android:id="@+id/rateStar5"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
+                android:layout_width="30dp"
+                android:layout_height="40dp"
+                android:layout_gravity="center_vertical"
                 android:scaleType="centerCrop"
                 android:layout_weight="1"
                 android:backgroundTint="@color/white"
@@ -219,12 +224,14 @@
 
             <Button
                 android:id="@+id/submitRating"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="30dp"
+                android:layout_height="40dp"
                 android:layout_weight="1"
                 android:backgroundTint="@color/white"
-                android:text="oceni"
-                android:textColor="@color/black" />
+                android:text="ok"
+                android:layout_gravity="center_vertical"
+                android:textColor="@color/black"
+                />
         </LinearLayout>
 
         <androidx.constraintlayout.widget.ConstraintLayout
@@ -247,8 +254,11 @@
 
                 <ImageButton
                     android:id="@+id/btnPostComment"
-                    android:layout_width="wrap_content"
-                    android:layout_height="50dp" />
+                    android:layout_width="50dp"
+                    android:scaleType="fitCenter"
+                    android:layout_height="50dp"
+                    android:src="@drawable/post_comment"
+                    android:backgroundTint="@color/white"/>
             </LinearLayout>
 
 
@@ -274,11 +284,11 @@
                 android:id="@+id/rvComments"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:layout_constraintTop_toBottomOf="@id/tvCommentLabel">
+                app:layout_constraintTop_toBottomOf="@id/tvCommentLabel"
+                android:nestedScrollingEnabled="false">
 
             </androidx.recyclerview.widget.RecyclerView>
         </androidx.constraintlayout.widget.ConstraintLayout>
-
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_browse.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_browse.xml
index cdccaa6..9e6dd9d 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_browse.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_browse.xml
@@ -15,35 +15,60 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/FragmentBrowseSearchBar" />
-
-    <com.google.android.material.textfield.TextInputEditText
-        android:id="@+id/FragmentBrowseSearchBar"
-        android:layout_width="250dp"
-        android:layout_height="55dp"
-        android:layout_marginTop="40dp"
-        android:background="@drawable/rounded_white_button_login"
-        android:ems="10"
-        android:hint="  Pretraga"
-        android:inputType="textPersonName"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+         />
+
+
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/FragmentBrowseSearchButton"
+        android:id="@+id/FragmentBrowseMyLocation"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentStart="true"
         android:backgroundTint="#FFFFFF"
+        android:layout_marginBottom="80dp"
         android:clickable="true"
         android:focusable="true"
         android:tint="#FFFFFF"
+        app:layout_constraintBottom_toBottomOf="@+id/FragmentBrowseMapView"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/FragmentBrowseSearchBar"
-        app:layout_constraintTop_toTopOf="@+id/FragmentBrowseSearchBar"
         app:rippleColor="#FFFFFF"
-        app:srcCompat="@android:drawable/ic_search_category_default" />
+        app:srcCompat="@android:drawable/ic_menu_mylocation" />
+
+    <androidx.cardview.widget.CardView
+        android:id="@+id/FragmentBrowseCardViewSearch"
+        android:layout_width="0dp"
+        android:layout_marginTop="60dp"
+        android:layout_height="40dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:elevation="0dp"
+        app:cardCornerRadius="20dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/FragmentBrowseSearchBar"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@drawable/rounded_white_button_login"
+            android:hint="  Pretraga"
+            android:inputType="textPersonName"
+            android:paddingLeft="15dp" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/FragmentBrowseSearchButton"
+            android:layout_width="49dp"
+            android:layout_height="match_parent"
+            android:layout_gravity="right"
+            android:background="#00FFFFFF"
+            app:backgroundTint="#00FFFFFF"
+            app:cornerRadius="16dp"
+            app:icon="@drawable/ic_baseline_search_24"
+            app:iconTint="#333D70" />
+
+    </androidx.cardview.widget.CardView>
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_profile.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_profile.xml
index e7cccff..19e6212 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_profile.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_profile.xml
@@ -75,6 +75,7 @@
             app:layout_constraintVertical_bias="1.0"
             app:shapeAppearanceOverlay="@style/imageViewCircle" />
 
+
         <TableLayout
             android:id="@+id/tableLayout"
             android:layout_width="323dp"
@@ -159,6 +160,7 @@
             </TableRow>
         </TableLayout>
 
+
         <View
             android:id="@+id/divider"
             android:layout_width="409dp"
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_show_posts.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_show_posts.xml
index a12801e..64ad74c 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_show_posts.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_show_posts.xml
@@ -7,14 +7,40 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:context=".Fragments.FragmentShowPosts">
 
-    <EditText
-        android:id="@+id/editTextTextPersonName2"
-        android:layout_width="wrap_content"
-        android:layout_height="50dp"
-        android:layout_gravity="center_horizontal"
-        android:ems="10"
-        android:inputType="textPersonName"
-        android:text="Name" />
+    <androidx.cardview.widget.CardView
+        android:id="@+id/cvSearch"
+        android:layout_width="match_parent"
+        android:layout_height="40dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:elevation="0dp"
+        app:cardCornerRadius="20dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tvFragmentHomePageSearch">
+
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/etFragmentHomePageSearch"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@drawable/rounded_white_button_login"
+            android:hint="  Pretraga"
+            android:paddingLeft="15dp"
+            android:inputType="textPersonName" />
+
+        <com.google.android.material.button.MaterialButton
+            android:layout_width="49dp"
+            android:layout_height="match_parent"
+            android:layout_gravity="right"
+            android:background="#00FFFFFF"
+            app:backgroundTint="#00FFFFFF"
+            app:cornerRadius="16dp"
+            app:icon="@drawable/ic_baseline_search_24"
+            app:iconTint="#333D70" />
+
+    </androidx.cardview.widget.CardView>
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
@@ -27,6 +53,7 @@
             android:layout_height="50dp"
             android:layout_alignParentRight="true"
             android:src="@drawable/filter"
+            android:padding="@dimen/component_padding"
             android:scaleType="centerCrop"
             android:background="@color/white"/>
 
@@ -38,6 +65,7 @@
             android:layout_weight="1"
             android:scaleType="centerCrop"
             android:src="@drawable/sort"
+            android:padding="@dimen/component_padding"
             app:layout_constraintStart_toEndOf="@+id/btnSortType"
             tools:layout_editor_absoluteY="0dp"
             android:background="@color/white"/>
@@ -49,8 +77,9 @@
             android:layout_marginEnd="16dp"
             android:layout_weight="1"
             android:background="@color/white"
+            android:padding="@dimen/component_padding"
             android:scaleType="centerCrop"
-            android:src="@drawable/list"
+            android:src="@drawable/list_empty"
             app:layout_constraintEnd_toStartOf="@+id/btnGridLayout"
             app:layout_constraintHorizontal_bias="1.0"
             app:layout_constraintStart_toEndOf="@+id/btnSortDirection"
@@ -64,7 +93,8 @@
             android:layout_weight="1"
             android:background="@color/white"
             android:scaleType="centerCrop"
-            android:src="@drawable/grid"
+            android:src="@drawable/grid_full"
+            android:padding="@dimen/component_padding"
             android:clickable="true"
             app:layout_constraintStart_toEndOf="@+id/btnSortDirection"
             tools:layout_editor_absoluteY="0dp" />
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_posts.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_posts.xml
index beada31..390d5bf 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_posts.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_posts.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+
+android:orientation="vertical"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".Fragments.FragmentUserPosts">
 
+
     <!-- TODO: Update blank fragment layout -->
     <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
@@ -31,4 +34,19 @@
     </androidx.cardview.widget.CardView>
 
 
-</LinearLayout>
\ No newline at end of file
+
+
+
+    <androidx.legacy.widget.Space
+        android:id="@+id/space"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+  />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rvFragmentUserPostsPosts"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+ />
+
+    </LinearLayout>