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

4 files changed, 86 insertions, 36 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 da38262..5727fb1 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,34 +6,71 @@
     android:layout_height="match_parent"
     tools:context=".Activities.ActivityAddPost">
 
-    <ImageView
-        android:id="@+id/image"
-        android:layout_width="200dp"
-        android:layout_height="200dp"
-        android:layout_weight="1"
-        app:layout_constraintBottom_toTopOf="@+id/btnActivityAddPostUploadImages"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
     <Button
         android:id="@+id/btnActivityAddPostUploadImages"
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
+        android:layout_width="417dp"
+        android:layout_height="61dp"
         android:layout_gravity="center"
         android:layout_weight="0"
         android:text="Importuj"
         app:layout_constraintBottom_toTopOf="@+id/btnActivityAddPosTakeImage"
-        tools:layout_editor_absoluteX="-16dp" />
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
 
     <Button
         android:id="@+id/btnActivityAddPosTakeImage"
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
+        android:layout_width="417dp"
+        android:layout_height="57dp"
         android:layout_gravity="center"
+        android:layout_marginBottom="4dp"
         android:layout_weight="0"
+
         android:text="Slikaj"
         app:layout_constraintBottom_toBottomOf="parent"
-        tools:layout_editor_absoluteX="-16dp" />
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <Button
+        android:id="@+id/nextImage"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:background="@drawable/rounded_transparent_button"
+        android:gravity="right"
+        android:textColor="@color/material_dynamic_primary30"
+        android:padding="30dp"
+        app:icon="@drawable/ic_baseline_arrow_forward"
+        app:iconTint="#072242"
+        app:layout_constraintBottom_toTopOf="@+id/btnActivityAddPostUploadImages"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:ignore="SpeakableTextPresentCheck" />
+
+    <Button
+        android:id="@+id/previousImage"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:padding="30dp"
+
+        android:gravity="left"
+        android:background="@drawable/rounded_transparent_button"
+        android:textColor="@color/material_dynamic_primary30"
+        app:icon="@drawable/ic_baseline_arrow_back"
+        app:iconTint="#0E283C"
+        app:layout_constraintBottom_toTopOf="@+id/btnActivityAddPostUploadImages"
+        app:layout_constraintEnd_toStartOf="@+id/nextImage"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:ignore="SpeakableTextPresentCheck" />
+
+    <ImageSwitcher
+        android:id="@+id/switcher"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toTopOf="@+id/btnActivityAddPostUploadImages"
+        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/activity_capture_post.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_capture_post.xml
new file mode 100644
index 0000000..c96961e
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_capture_post.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    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"
+    tools:context=".Activities.ActivityCapturePost">
+
+</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 5688acd..d323d0c 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
@@ -23,20 +23,20 @@
         android:orientation="vertical">
 
         <TextView
-            android:id="@+id/textView6"
+            android:id="@+id/tvTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Naslov" />
 
         <TextView
-            android:id="@+id/textView7"
+            android:id="@+id/tvLocationType"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="11dp"
             android:text="tip lokacije" />
 
         <TextView
-            android:id="@+id/textView8"
+            android:id="@+id/tvLocationParent"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Drzava, grad" />
@@ -51,35 +51,35 @@
                 android:orientation="horizontal">
 
                 <ImageView
-                    android:id="@+id/imageView8"
+                    android:id="@+id/star1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:src="@android:drawable/btn_star_big_on" />
 
                 <ImageView
-                    android:id="@+id/imageView9"
+                    android:id="@+id/star2"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:src="@android:drawable/btn_star_big_on" />
 
                 <ImageView
-                    android:id="@+id/imageView10"
+                    android:id="@+id/star3"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:src="@android:drawable/btn_star_big_on" />
 
                 <ImageView
-                    android:id="@+id/imageView11"
+                    android:id="@+id/star4"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:src="@android:drawable/btn_star_big_on" />
 
                 <ImageView
-                    android:id="@+id/imageView12"
+                    android:id="@+id/star5"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
@@ -87,7 +87,7 @@
             </LinearLayout>
 
             <TextView
-                android:id="@+id/textView9"
+                android:id="@+id/tvRating"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
@@ -96,7 +96,7 @@
                 tools:layout_editor_absoluteY="0dp" />
 
             <TextView
-                android:id="@+id/textView10"
+                android:id="@+id/tvNumberOfRatings"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="(10,500)"
@@ -113,7 +113,7 @@
             android:elevation="5dp">
 
             <TextView
-                android:id="@+id/textView11"
+                android:id="@+id/tvDescription"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="TextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextView"
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_add_new.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_add_new.xml
index 5cfda04..579afdb 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_add_new.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_add_new.xml
@@ -10,6 +10,7 @@
     <TextView
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
+
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
@@ -22,11 +23,11 @@
             android:stateListAnimator="@null"
             android:text="Nova lokacija"
             android:textColor="@color/cardview_dark_background"
-            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintBottom_toTopOf="@+id/flFragmentAddNewFragmentContainer"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/btnFragmentAddNewNewPost"
             app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintVertical_bias="0.00999999" />
+            app:layout_constraintVertical_bias="0.997" />
 
         <Button
             android:id="@+id/btnFragmentAddNewNewPost"
@@ -37,33 +38,36 @@
 
             android:text="Nova objava"
             android:textColor="@color/cardview_dark_background"
-            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintBottom_toTopOf="@+id/flFragmentAddNewFragmentContainer"
             app:layout_constraintEnd_toStartOf="@+id/btnFragmentAddNewNewLocation"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintVertical_bias="0.00999999" />
+            app:layout_constraintVertical_bias="0.997" />
 
         <View
             android:id="@+id/divider3"
             android:layout_width="409dp"
             android:layout_height="1dp"
             android:background="?android:attr/listDivider"
+            app:layout_constraintBottom_toTopOf="@+id/flFragmentAddNewFragmentContainer"
             app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="1.0"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/btnFragmentAddNewNewPost" />
+            app:layout_constraintTop_toBottomOf="@+id/btnFragmentAddNewNewPost"
+            app:layout_constraintVertical_bias="1.0" />
 
         <FrameLayout
             android:id="@+id/flFragmentAddNewFragmentContainer"
-            android:layout_width="409dp"
-            android:layout_height="673dp"
+            android:layout_width="411dp"
+            android:layout_height="309dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.0"
             app:layout_constraintStart_toStartOf="parent">
 
         </FrameLayout>
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
 
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
 
 </FrameLayout>
\ No newline at end of file