Omogućeno dodavanje objava sa fragmenta za prikaz svih objava ulogovanog korisnika. Izmenjen izgled fragmenata za dodavanje objava.

3 files changed, 117 insertions, 26 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 5af0c1f..a7a6e06 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
@@ -10,6 +10,7 @@
         android:id="@+id/isActivityAddPostSwitcher"
         android:layout_width="0dp"
         android:layout_height="0dp"
+        android:elevation="10dp"
         app:layout_constraintBottom_toTopOf="@+id/btnActivityAddPostUploadFromGallery"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -45,60 +46,95 @@
         tools:ignore="SpeakableTextPresentCheck" />
 
     <Button
+        android:clickable="false"
         android:id="@+id/btnActivityAddPostUploadFromGallery"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="177dp"
+        android:layout_height="19dp"
         android:text="Otvori galeriju"
+        android:visibility="invisible"
+        app:cornerRadius="20dp"
         app:layout_constraintBottom_toTopOf="@+id/tvActivityAddPostLocationtext"
         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_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent" />
 
     <EditText
         android:id="@+id/etActivityAddPostLocation"
         android:layout_width="match_parent"
         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_constraintEnd_toEndOf="parent" />
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
 
     <TextView
         android:id="@+id/tvActivityAddPostDescriptiontext"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
         android:text="Opis"
         app:layout_constraintBottom_toTopOf="@+id/etActivityAddPostDescription"
-        app:layout_constraintEnd_toEndOf="parent" />
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
 
     <EditText
         android:id="@+id/etActivityAddPostDescription"
         android:layout_width="match_parent"
         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/btnActivityAddPostPost"
-        app:layout_constraintEnd_toEndOf="parent" />
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
 
     <Button
         android:id="@+id/btnActivityAddPostPost"
-        android:layout_width="200dp"
+        android:layout_width="250dp"
         android:layout_height="40dp"
+        android:layout_marginBottom="12dp"
         android:background="@drawable/rounded_cyan_button"
         android:backgroundTint="#1C789A"
         android:text="Objavi"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.496"
         app:layout_constraintStart_toStartOf="parent" />
 
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/btnActivityAddPostUploadFromGalleryVisible"
+        android:layout_width="50dp"
+        android:layout_height="wrap_content"
+        android:stateListAnimator="@null"
+        app:backgroundTint="#00FFFFFF"
+        app:icon="@drawable/ic_baseline_add_photo_alternate_24"
+        app:iconGravity="textEnd"
+        app:iconSize="40dp"
+        app:iconTint="#1C7696"
+        app:layout_constraintBottom_toBottomOf="@+id/isActivityAddPostSwitcher"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/isActivityAddPostSwitcher" />
+
 
 </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 91517a7..23d34ee 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
@@ -8,33 +8,39 @@
 
         <ImageView
             android:id="@+id/ivActivityCapturePostImage"
-            android:layout_width="408dp"
-            android:layout_height="319dp"
+            android:layout_width="413dp"
+            android:layout_height="0dp"
             android:layout_marginTop="4dp"
+            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"
+            tools:ignore="ImageContrastCheck"
             tools:srcCompat="@tools:sample/avatars" />
 
         <Button
             android:id="@+id/btnActivityCapturePostCapture"
-            android:layout_width="60dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="68dp"
+            android:layout_width="68dp"
+            android:layout_height="15dp"
+            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_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.498"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/ivActivityCapturePostImage" />
+            tools:ignore="SpeakableTextPresentCheck" />
 
         <TextView
             android:id="@+id/tvActivityCapturePostLocationtext"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="464dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="516dp"
+            android:layout_marginEnd="16dp"
             android:text="Lokacija"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.0"
@@ -45,20 +51,26 @@
             android:id="@+id/etActivityCapturePostLocation"
             android:layout_width="match_parent"
             android:layout_height="50dp"
+            android:layout_marginStart="16dp"
             android:layout_marginTop="4dp"
+            android:layout_marginEnd="16dp"
             android:ems="10"
             android:hint="Reykjavik, Iceland"
             android:inputType="textEmailAddress"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.0"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/tvActivityCapturePostLocationtext" />
+            app:layout_constraintTop_toBottomOf="@+id/tvActivityCapturePostLocationtext"
+            tools:ignore="DuplicateSpeakableTextCheck,TextContrastCheck"
+            android:importantForAutofill="no" />
 
         <TextView
             android:id="@+id/tvActivityCapturePostDescriptiontext"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
             android:layout_marginTop="8dp"
+            android:layout_marginEnd="16dp"
             android:text="Opis"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="1.0"
@@ -69,26 +81,49 @@
             android:id="@+id/etActivityCapturePostDescription"
             android:layout_width="match_parent"
             android:layout_height="50dp"
+            android:layout_marginStart="16dp"
             android:layout_marginTop="4dp"
+            android:layout_marginEnd="16dp"
             android:ems="10"
             android:hint="Reykjavik, Iceland"
             android:inputType="textEmailAddress"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/tvActivityCapturePostDescriptiontext" />
+            app:layout_constraintTop_toBottomOf="@+id/tvActivityCapturePostDescriptiontext"
+            tools:ignore="TextContrastCheck"
+            android:importantForAutofill="no" />
 
 
         <Button
             android:id="@+id/btnActivityCapturePostPost"
-            android:layout_width="200dp"
-            android:layout_height="40dp"
+            android:layout_width="244dp"
+            android:layout_height="35dp"
+            android:layout_marginStart="32dp"
+            android:layout_marginEnd="32dp"
+            android:layout_marginBottom="16dp"
             android:background="@drawable/rounded_cyan_button"
             android:backgroundTint="#1C789A"
             android:text="Objavi"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintDimensionRatio="w,1:1"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.431"
-            app:layout_constraintStart_toStartOf="parent" />
+            app:layout_constraintHorizontal_bias="0.495"
+            app:layout_constraintStart_toStartOf="parent"
+            tools:ignore="TouchTargetSizeCheck" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/btnActivityCapturePostCaptureVisible"
+            android:layout_width="50dp"
+            android:layout_height="wrap_content"
+            android:stateListAnimator="@null"
+            app:backgroundTint="#00FFFFFF"
+            app:icon="@drawable/ic_baseline_add_a_photo_24"
+            app:iconGravity="textEnd"
+            app:iconSize="40dp"
+            app:iconTint="#1C7696"
+            app:layout_constraintBottom_toTopOf="@+id/btnActivityCapturePostCapture"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
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 185719b..beada31 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,14 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout 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.FragmentUserPosts">
 
     <!-- TODO: Update blank fragment layout -->
-    <TextView
+    <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:text="@string/hello_blank_fragment" />
+        android:layout_height="wrap_content">
 
-</FrameLayout>
\ No newline at end of file
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end"
+            android:layout_marginEnd="110dp"
+            android:src="@drawable/ic_baseline_post_add_24"
+           />
+
+        <TextView
+            android:id="@+id/tvFragmentUserPostsAddPost"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end"
+            android:layout_marginEnd="20dp"
+            android:clickable="true"
+            android:text="@string/dodaj_objavu"
+            android:textSize="15sp"
+            android:focusable="true" />
+    </androidx.cardview.widget.CardView>
+
+
+</LinearLayout>
\ No newline at end of file