From e4e8807a464b722dd8d685b0768ab5f0091abcb6 Mon Sep 17 00:00:00 2001
From: TAMARA JERINIC <tamara.jerinic@gmail.com>
Date: Tue, 6 Dec 2022 22:00:51 +0100
Subject: Izmenjen položaj dugmića i polja za  pretragu na fragmentu za prikaz
 mape. Dodat divider za dugmiće na stranici single post.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/res/drawable/ic_baseline_close_24.xml |  2 +-
 .../main/res/drawable/ic_baseline_post_add_24.xml  |  2 +-
 .../app/src/main/res/layout/activity_maps.xml      | 18 ++++-----
 .../src/main/res/layout/activity_single_post.xml   | 43 +++++++++++++++++-----
 .../app/src/main/res/values/colors.xml             |  1 +
 5 files changed, 46 insertions(+), 20 deletions(-)

(limited to 'Client')

diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_close_24.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_close_24.xml
index 42a6279..3290245 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_close_24.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_close_24.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#666666"
+<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="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_post_add_24.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_post_add_24.xml
index 32f0448..aa413e9 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_post_add_24.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_post_add_24.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#274352"
+<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="M17,19.22H5V7h7V5H5C3.9,5 3,5.9 3,7v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2v-7h-2V19.22z"/>
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_maps.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_maps.xml
index 0051893..6cb0f4e 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_maps.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_maps.xml
@@ -6,6 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".Activities.MapsActivity">
+
     <org.osmdroid.views.MapView
         android:id="@+id/ActivityMapsMapView"
         android:layout_width="fill_parent"
@@ -13,8 +14,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        />
-
+        app:layout_constraintTop_toTopOf="parent" />
 
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -22,9 +22,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentStart="true"
+        android:layout_marginEnd="32dp"
+        android:layout_marginBottom="32dp"
         android:backgroundTint="#FFFFFF"
-        android:layout_marginRight="10dp"
-        android:layout_marginBottom="80dp"
         android:clickable="true"
         android:focusable="true"
         android:tint="#FFFFFF"
@@ -39,17 +39,17 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentStart="true"
-        android:layout_marginBottom="80dp"
-        android:layout_marginLeft="10dp"
+        android:layout_marginStart="32dp"
+        android:layout_marginBottom="32dp"
         android:backgroundTint="#FFFFFF"
         android:clickable="true"
         android:focusable="true"
         android:tint="#FFFFFF"
+        android:visibility="invisible"
         app:layout_constraintBottom_toBottomOf="@+id/ActivityMapsMapView"
         app:layout_constraintStart_toStartOf="parent"
         app:rippleColor="#FFFFFF"
-        app:srcCompat="@drawable/ic_baseline_check_24"
-        android:visibility="invisible"/>
+        app:srcCompat="@drawable/ic_baseline_check_24" />
 
     <androidx.cardview.widget.CardView
         android:id="@+id/ActivityMapsCardViewSearch"
@@ -69,7 +69,7 @@
             android:id="@+id/ActivityMapsSearchBar"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@drawable/rounded_white_button_login"
+            android:background="@drawable/rounded_picture_background"
             android:hint="  Pretraga"
             android:inputType="textPersonName"
             android:paddingLeft="15dp" />
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 cf5327a..9d59e0b 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
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-   xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-   xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
     tools:context=".Activities.ActivitySinglePost">
 
     <androidx.recyclerview.widget.RecyclerView
@@ -23,8 +23,9 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/linearLayout2"
-        android:layout_width="match_parent"
-        android:layout_height="308dp"
+        android:layout_width="410dp"
+        android:textSize="15dp"
+        android:layout_height="729dp"
         android:background="@drawable/view_top_corner_radius"
         android:elevation="30dp"
         android:paddingHorizontal="16dp"
@@ -33,7 +34,8 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toStartOf="parent">
+        app:layout_constraintStart_toStartOf="parent"
+        tools:backgroundTint="@color/white">
 
 
         <TextView
@@ -62,6 +64,7 @@
             android:layout_height="wrap_content"
             android:gravity="top|start"
             android:padding="@dimen/text_padding"
+            android:textSize="15dp"
             android:text="Drzava, grad"
             app:layout_constraintStart_toEndOf="@+id/imageView12"
             app:layout_constraintTop_toBottomOf="@+id/tvTitle" />
@@ -86,11 +89,14 @@
             android:gravity="top|start"
             android:padding="@dimen/text_padding"
             android:text="User"
+            android:textSize="17dp"
+            android:textStyle="bold"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/tvLocationType" />
 
         <TextView
             android:id="@+id/tvRating"
+            android:textSize="15dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="24dp"
@@ -107,6 +113,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="24dp"
             android:padding="@dimen/text_padding"
+            android:textSize="15dp"
             android:text="(10,500)"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -133,14 +140,22 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <org.osmdroid.views.MapView
+        <androidx.cardview.widget.CardView
             android:id="@+id/MapDialogueMapView"
             android:layout_width="match_parent"
             android:layout_height="150dp"
             android:layout_marginTop="8dp"
+            app:cardCornerRadius="10dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/tvUser" />
+            app:layout_constraintTop_toBottomOf="@+id/tvUser">
+
+            <org.osmdroid.views.MapView
+                android:id="@+id/MapDialogueMap"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+
+        </androidx.cardview.widget.CardView>
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/singlePostDetail"
@@ -188,8 +203,18 @@
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/btnActivitySinglePostComments"
+                app:layout_constraintTop_toBottomOf="@+id/divider5"
                 app:layout_constraintVertical_bias="1.0"></FrameLayout>
+
+            <View
+                android:id="@+id/divider5"
+                android:layout_width="376dp"
+                android:layout_height="1dp"
+                android:background="?android:attr/listDivider"
+                android:elevation="10dp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/btnActivitySinglePostDescription" />
         </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/Client/BrzoDoLokacije/app/src/main/res/values/colors.xml b/Client/BrzoDoLokacije/app/src/main/res/values/colors.xml
index fe34814..9cd2082 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/values/colors.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/values/colors.xml
@@ -10,4 +10,5 @@
     <color name="unfollow">#c4c4c4</color>
     <color name="dark_blue_transparent">#DE093A4C</color>
     <color name="button_main">#183e4b</color>
+    <color name="grey">#747474</color>
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3