Izmenjen izgled activity_add_post i activity_capture_post.

5 files changed, 90 insertions, 111 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 fbe2230..96ac3ff 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
@@ -46,66 +46,47 @@
         tools:ignore="SpeakableTextPresentCheck" />
 
     <Button
-        android:clickable="false"
         android:id="@+id/btnActivityAddPostUploadFromGallery"
         android:layout_width="177dp"
         android:layout_height="19dp"
+        android:clickable="false"
         android:text="Otvori galeriju"
         android:visibility="invisible"
         app:cornerRadius="20dp"
-        app:layout_constraintBottom_toTopOf="@+id/tvActivityAddPostLocationtext"
+        app:layout_constraintBottom_toTopOf="@+id/btnActivityAddPostAddLocation"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.497"
         app:layout_constraintStart_toStartOf="parent" />
 
-    <TextView
-        android:id="@+id/tvActivityAddPostLocationtext"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginBottom="16dp"
-        android:text="Lokacija"
-        app:layout_constraintBottom_toTopOf="@+id/etActivityAddPostLocation"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <EditText
-        android:id="@+id/etActivityAddPostLocation"
-        android:layout_width="200dp"
-        android:layout_height="50dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
-        android:ems="10"
-        android:hint="Reykjavik, Iceland"
-        android:inputType="textEmailAddress"
-        app:layout_constraintBottom_toTopOf="@+id/tvActivityAddPostDescriptiontext"
-        app:layout_constraintStart_toStartOf="parent" />
 
     <Button
         android:id="@+id/btnActivityAddPostAddLocation"
         android:layout_width="wrap_content"
         android:layout_height="50dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
-        android:background="@drawable/rounded_cyan_button"
-        android:backgroundTint="#1C789A"
+        android:stateListAnimator="@null"
+        android:backgroundTint="@color/white"
+        android:drawableLeft="@drawable/ic_baseline_location_on_24"
         android:text="Dodaj lokaciju"
+        android:textColor="#757471"
         app:layout_constraintBottom_toTopOf="@+id/tvActivityAddPostDescriptiontext"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/etActivityAddPostLocation" />
-
+        app:layout_constraintHorizontal_bias="0.074"
+        app:layout_constraintStart_toStartOf="parent" />
 
-    <TextView
+    <Button
         android:id="@+id/tvActivityAddPostDescriptiontext"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginEnd="16dp"
-        android:text="Opis"
+        android:backgroundTint="@color/white"
+        android:drawableLeft="@drawable/ic_baseline_description_24"
+        android:stateListAnimator="@null"
+        android:text="Dodaj opis"
+        android:textColor="#757471"
         app:layout_constraintBottom_toTopOf="@+id/etActivityAddPostDescription"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent" />
 
     <EditText
@@ -117,7 +98,8 @@
         android:ems="10"
         android:hint="Reykjavik, Iceland"
         android:inputType="textEmailAddress"
-        app:layout_constraintBottom_toTopOf="@+id/llTags"
+        android:visibility="gone"
+        app:layout_constraintBottom_toTopOf="@+id/btnActivityAddPostAddTag"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
@@ -164,29 +146,27 @@
         android:id="@+id/acTags"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="20dp"
-        android:layout_marginRight="20dp"
+        android:layout_marginStart="28dp"
         android:hint="Planina,Reka,Park..."
+        android:maxLength="12"
         android:minHeight="48dp"
-        android:maxLength= "12"
+        android:visibility="gone"
         app:layout_constraintBottom_toTopOf="@+id/btnActivityAddPostPost"
-        app:layout_constraintEnd_toStartOf="@+id/btnActivityAddPostAddTag"
         app:layout_constraintStart_toStartOf="parent" />
 
     <Button
         android:id="@+id/btnActivityAddPostAddTag"
         android:layout_width="wrap_content"
         android:layout_height="40dp"
-        android:layout_marginTop="5dp"
-        android:layout_marginEnd="20dp"
-        android:layout_marginStart="20dp"
-        android:layout_marginBottom="5dp"
-        android:background="@drawable/rounded_cyan_button"
-        android:backgroundTint="#1C789A"
+        android:layout_marginStart="16dp"
+        android:backgroundTint="@color/white"
+        android:drawableLeft="@drawable/ic_baseline_tag_24"
+        android:stateListAnimator="@null"
+
         android:text="Dodaj tag"
-        app:layout_constraintBottom_toTopOf="@+id/btnActivityAddPostPost"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/llTags" />
+        android:textColor="#757471"
+        app:layout_constraintBottom_toTopOf="@+id/acTags"
+        app:layout_constraintStart_toStartOf="parent" />
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_capture_post.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_capture_post.xml
index 2b64a27..e93fd54 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_capture_post.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_capture_post.xml
@@ -14,8 +14,10 @@
             android:scaleType="fitCenter"
             app:layout_constraintBottom_toTopOf="@+id/btnActivityCapturePostCapture"
             app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.0"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="1.0"
             tools:ignore="ImageContrastCheck"
             tools:srcCompat="@tools:sample/avatars" />
 
@@ -23,68 +25,46 @@
             android:id="@+id/btnActivityCapturePostCapture"
             android:layout_width="68dp"
             android:layout_height="15dp"
+            android:clickable="false"
             android:visibility="invisible"
             app:cornerRadius="30dp"
             app:icon="@android:drawable/ic_menu_camera"
             app:iconTint="#FFFFFF"
-            android:clickable="false"
-            app:layout_constraintBottom_toTopOf="@+id/tvActivityCapturePostLocationtext"
+            app:layout_constraintBottom_toTopOf="@+id/btnActivityCapturePostAddLocation"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.498"
             app:layout_constraintStart_toStartOf="parent"
             tools:ignore="SpeakableTextPresentCheck" />
 
-        <TextView
-            android:id="@+id/tvActivityCapturePostLocationtext"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
-            android:text="Lokacija"
-            app:layout_constraintBottom_toTopOf="@+id/etActivityCapturePostLocation"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.0"
-            app:layout_constraintStart_toStartOf="parent" />
 
-        <EditText
-            android:id="@+id/etActivityCapturePostLocation"
-            android:layout_width="200dp"
-            android:layout_height="50dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
-            android:ems="10"
-            android:hint="Reykjavik, Iceland"
-            android:importantForAutofill="no"
-            android:inputType="textEmailAddress"
-            app:layout_constraintBottom_toTopOf="@+id/tvActivityCapturePostDescriptiontext"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.0"
-            app:layout_constraintStart_toStartOf="parent"
-            tools:ignore="DuplicateSpeakableTextCheck,TextContrastCheck" />
         <Button
             android:id="@+id/btnActivityCapturePostAddLocation"
             android:layout_width="wrap_content"
             android:layout_height="50dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
-            android:background="@drawable/rounded_cyan_button"
-            android:backgroundTint="#1C789A"
+            android:backgroundTint="@color/white"
+            android:drawableLeft="@drawable/ic_baseline_location_on_24"
+            android:stateListAnimator="@null"
             android:text="Dodaj lokaciju"
+            android:textColor="#757471"
             app:layout_constraintBottom_toTopOf="@+id/tvActivityCapturePostDescriptiontext"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/etActivityCapturePostLocation" />
-
+            app:layout_constraintHorizontal_bias="0.092"
+            app:layout_constraintStart_toStartOf="parent" />
 
-        <TextView
+        <Button
             android:id="@+id/tvActivityCapturePostDescriptiontext"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
             android:layout_marginEnd="16dp"
-            android:text="Opis"
+            android:backgroundTint="@color/white"
+            android:drawableLeft="@drawable/ic_baseline_description_24"
+            android:stateListAnimator="@null"
+            android:text="Dodaj opis"
+            android:textColor="#757471"
             app:layout_constraintBottom_toTopOf="@+id/etActivityCapturePostDescription"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="1.0"
+            app:layout_constraintHorizontal_bias="0.017"
             app:layout_constraintStart_toStartOf="parent" />
 
         <EditText
@@ -95,6 +75,7 @@
             android:layout_marginEnd="16dp"
             android:ems="10"
             android:hint="Reykjavik, Iceland"
+            android:visibility="gone"
             android:importantForAutofill="no"
             android:inputType="textEmailAddress"
             app:layout_constraintBottom_toTopOf="@+id/llTagsCap"
@@ -142,36 +123,38 @@
             android:layout_marginLeft="20dp"
             android:layout_marginRight="20dp"
             android:orientation="horizontal"
-            app:layout_constraintBottom_toTopOf="@+id/acTagsCap"
+            app:layout_constraintBottom_toTopOf="@+id/btnActivityAddPostAddTagCap"
             app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.4"
             app:layout_constraintStart_toStartOf="parent"></LinearLayout>
 
         <EditText
             android:id="@+id/acTagsCap"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="20dp"
-            android:layout_marginRight="20dp"
+            android:layout_marginBottom="28dp"
             android:hint="Planina,Reka,Park..."
+            android:maxLength="12"
             android:minHeight="48dp"
-            android:maxLength= "12"
+            android:visibility="gone"
             app:layout_constraintBottom_toTopOf="@+id/btnActivityCapturePostPost"
-            app:layout_constraintEnd_toStartOf="@+id/btnActivityAddPostAddTagCap"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.08"
             app:layout_constraintStart_toStartOf="parent" />
 
         <Button
             android:id="@+id/btnActivityAddPostAddTagCap"
             android:layout_width="wrap_content"
             android:layout_height="40dp"
-            android:layout_marginTop="5dp"
-            android:layout_marginEnd="20dp"
-            android:layout_marginStart="20dp"
-            android:layout_marginBottom="5dp"
-            android:background="@drawable/rounded_cyan_button"
-            android:backgroundTint="#1C789A"
+            android:layout_marginBottom="20dp"
+            android:backgroundTint="@color/white"
+            android:drawableLeft="@drawable/ic_baseline_tag_24"
+            android:stateListAnimator="@null"
             android:text="Dodaj tag"
-            app:layout_constraintBottom_toTopOf="@+id/btnActivityCapturePostPost"
+            android:textColor="#757471"
+            app:layout_constraintBottom_toTopOf="@+id/acTagsCap"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/llTagsCap" />
+            app:layout_constraintHorizontal_bias="0.076"
+            app:layout_constraintStart_toStartOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_user_profile.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_user_profile.xml
index 8762183..16f4b1e 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_user_profile.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_user_profile.xml
@@ -74,10 +74,10 @@
             android:background="?android:attr/listDivider"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/btnFragmentUserProfileShowPosts" />
+            app:layout_constraintTop_toBottomOf="@+id/btnActivityUserProfileShowPosts" />
 
         <Button
-            android:id="@+id/btnFragmentUserProfileShowPosts"
+            android:id="@+id/btnActivityUserProfileShowPosts"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="20dp"
@@ -116,11 +116,11 @@
             android:stateListAnimator="@null"
             android:text="Recenzije"
             android:textColor="@color/cardview_dark_background"
-            app:layout_constraintStart_toEndOf="@+id/btnFragmentUserProfileShowPosts"
+            app:layout_constraintStart_toEndOf="@+id/btnActivityUserProfileShowPosts"
             app:layout_constraintTop_toBottomOf="@+id/tvFragmentProfileInfoContainer" />
 
         <FrameLayout
-            android:id="@+id/flFragmentProfileFragmentContainer"
+            android:id="@+id/flActivityProfileFragmentContainer"
             android:layout_width="409dp"
             android:layout_height="319dp"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -169,7 +169,7 @@
 
                     <ImageButton
 
-                        android:id="@+id/materialButton"
+                        android:id="@+id/ibActivityUserProfileFollow"
                         android:layout_width="115dp"
                         android:layout_height="40dp"
                         android:layout_marginStart="16dp"
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_show_user_posts.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_show_user_posts.xml
new file mode 100644
index 0000000..59450d3
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_show_user_posts.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".Fragments.FragmentShowUserPosts">
+
+    <!-- TODO: Update blank fragment layout -->
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</FrameLayout>
\ 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 9d26ddc..a2f20f3 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
@@ -25,10 +25,9 @@
     <com.google.android.material.imageview.ShapeableImageView
         android:id="@+id/ivPIHPBackground"
         android:layout_width="0dp"
-        android:layout_height="180dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="14dp"
-        android:layout_marginEnd="12dp"
+        android:layout_height="186dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="4dp"
         android:elevation="3dp"
         android:scaleType="fitXY"
         app:layout_constraintBottom_toBottomOf="@+id/imageView9"
@@ -36,7 +35,7 @@
         app:layout_constraintHorizontal_bias="1.0"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.04"
+        app:layout_constraintVertical_bias="0.045"
         app:shapeAppearanceOverlay="@style/Circular"
         app:srcCompat="@drawable/b1" />