aboutsummaryrefslogtreecommitdiff
path: root/Client/BrzoDoLokacije/app/src/main/res/layout
diff options
context:
space:
mode:
authorOgnjen Cirkovic <ciraboxkg@gmail.com>2022-11-15 17:32:45 +0000
committerOgnjen Cirkovic <ciraboxkg@gmail.com>2022-11-15 17:32:45 +0000
commit19b7461db83097911940f37ecd2484c2149cb054 (patch)
treed3070c8c5821e04bbc3139f431eaf89509ff7955 /Client/BrzoDoLokacije/app/src/main/res/layout
parente5ff284cfc4b1944d13034ff183efef49f631e4b (diff)
parentc8eb6ba248aff872a4f4d2aa7ccde50aacad73a6 (diff)
Merge branch 'develop' into 'master'
Merge develop > master See merge request BrzoDoLokacije2022/odyssey/brzodolokacije!6
Diffstat (limited to 'Client/BrzoDoLokacije/app/src/main/res/layout')
-rw-r--r--Client/BrzoDoLokacije/app/src/main/res/layout/activity_add_post.xml50
-rw-r--r--Client/BrzoDoLokacije/app/src/main/res/layout/activity_capture_post.xml63
-rw-r--r--Client/BrzoDoLokacije/app/src/main/res/layout/activity_single_post.xml327
-rw-r--r--Client/BrzoDoLokacije/app/src/main/res/layout/fragment_browse.xml74
-rw-r--r--Client/BrzoDoLokacije/app/src/main/res/layout/fragment_home_page.xml116
-rw-r--r--Client/BrzoDoLokacije/app/src/main/res/layout/fragment_home_page_main_scroll.xml190
-rw-r--r--Client/BrzoDoLokacije/app/src/main/res/layout/fragment_profile.xml85
-rw-r--r--Client/BrzoDoLokacije/app/src/main/res/layout/fragment_show_posts.xml87
-rw-r--r--Client/BrzoDoLokacije/app/src/main/res/layout/fragment_show_posts_by_location.xml17
-rw-r--r--Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_posts.xml40
-rw-r--r--Client/BrzoDoLokacije/app/src/main/res/layout/post_item_home_page.xml47
-rw-r--r--Client/BrzoDoLokacije/app/src/main/res/layout/post_preview.xml1
-rw-r--r--Client/BrzoDoLokacije/app/src/main/res/layout/single_comment.xml22
13 files changed, 953 insertions, 166 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/activity_single_post.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_single_post.xml
index 00d3460..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
@@ -1,127 +1,296 @@
<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+
+
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:padding="@dimen/component_padding"
xmlns:app="http://schemas.android.com/apk/res-auto"
tools:context=".Activities.ActivitySinglePost">
-
- <androidx.recyclerview.widget.RecyclerView
+ <ScrollView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:fillViewport="true">
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+ <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rvMain"
android:layout_width="match_parent"
- android:layout_height="443dp"
+ android:paddingBottom="@dimen/component_padding"
+ android:layout_height="400dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
-
</androidx.recyclerview.widget.RecyclerView>
- <LinearLayout
+
+
+<androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="bottom"
+ app:layout_constraintTop_toBottomOf="@id/rvMain"
+ tools:layout_editor_absoluteX="0dp">
+
+ <TextView
+ android:id="@+id/tvLocationParent"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="top|start"
+ android:padding="@dimen/text_padding"
+ android:text="Drzava, grad"
+ app:layout_constraintTop_toBottomOf="@+id/tvLocationType"
+ tools:layout_editor_absoluteX="0dp" />
+
+ <TextView
+ android:id="@+id/tvTitle"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="top|start"
+ android:padding="@dimen/text_padding"
+ android:text="Naslov"
+ android:textSize="@dimen/header1_size"
+ android:textStyle="bold" />
+
+ <TextView
+ android:id="@+id/tvLocationType"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="top|start"
+ android:padding="@dimen/text_padding"
+ android:text="Tip lokacije"
+ app:layout_constraintTop_toBottomOf="@+id/tvTitle"
+ tools:layout_editor_absoluteX="0dp" />
+
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:id="@+id/constraintLayout"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical">
+ android:layout_height="wrap_content"
+ android:layout_marginTop="20dp"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/tvLocationParent">
- <TextView
- android:id="@+id/tvTitle"
+ <LinearLayout
+ android:id="@+id/linearLayout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="Naslov" />
+ android:orientation="horizontal"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent">
+
+ <ImageView
+ 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/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/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/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/star5"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:src="@android:drawable/btn_star_big_on" />
+ </LinearLayout>
<TextView
- android:id="@+id/tvLocationType"
+ android:id="@+id/tvRating"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginTop="11dp"
- android:text="tip lokacije" />
+ android:padding="@dimen/text_padding"
+ android:text="4.2"
+ android:textStyle="bold"
+ app:layout_constraintEnd_toStartOf="@+id/tvNumberOfRatings"
+ tools:layout_editor_absoluteY="4dp" />
<TextView
- android:id="@+id/tvLocationParent"
+ android:id="@+id/tvNumberOfRatings"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="Drzava, grad" />
+ android:padding="@dimen/text_padding"
+ android:text="(10,500)"
+ app:layout_constraintEnd_toEndOf="parent"
+ tools:layout_editor_absoluteY="4dp" />
<androidx.constraintlayout.widget.ConstraintLayout
+ android:id="@+id/constraintLayout3"
android:layout_width="match_parent"
- android:layout_height="wrap_content">
+ android:layout_height="wrap_content"
+ android:background="@drawable/rounded_picture_background"
+ android:elevation="5dp"
+ android:padding="@dimen/component_padding"
+ app:layout_constraintTop_toBottomOf="@+id/linearLayout"
+ tools:layout_editor_absoluteX="0dp">
- <LinearLayout
- android:layout_width="213dp"
- android:layout_height="27dp"
- android:orientation="horizontal">
+ <TextView
+ android:id="@+id/tvDescriptionLabel"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="top|start"
+ android:padding="@dimen/text_padding"
+ android:text="Opis"
+ android:textStyle="bold" />
- <ImageView
- 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" />
+ <TextView
+ android:id="@+id/tvDescription"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="TextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextView"
+ app:layout_constraintTop_toBottomOf="@+id/tvDescriptionLabel" />
+ </androidx.constraintlayout.widget.ConstraintLayout>
- <ImageView
- 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" />
+ <LinearLayout
+ android:id="@+id/linearLayout2"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:orientation="horizontal"
+ android:paddingVertical="@dimen/component_padding"
+ app:layout_constraintTop_toBottomOf="@id/constraintLayout3">
- <ImageView
- 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" />
+ <ImageButton
+ android:id="@+id/rateStar1"
+ android:layout_width="30dp"
+ android:layout_height="40dp"
+ android:layout_gravity="center_vertical"
+ android:scaleType="centerCrop"
+ android:layout_weight="1"
+ android:backgroundTint="@color/white"
+ android:src="@drawable/empty_star" />
- <ImageView
- 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" />
+ <ImageButton
+ android:id="@+id/rateStar2"
+ android:layout_width="30dp"
+ android:layout_height="40dp"
+ android:layout_gravity="center_vertical"
+ android:scaleType="centerCrop"
+ android:layout_weight="1"
+ android:backgroundTint="@color/white"
+ android:src="@drawable/empty_star" />
+
+ <ImageButton
+ android:id="@+id/rateStar3"
+ android:layout_width="30dp"
+ android:layout_height="40dp"
+ android:layout_gravity="center_vertical"
+ android:scaleType="centerCrop"
+ android:layout_weight="1"
+ android:backgroundTint="@color/white"
+ android:src="@drawable/empty_star" />
+
+ <ImageButton
+ android:id="@+id/rateStar4"
+ android:layout_width="30dp"
+ android:layout_height="40dp"
+ android:layout_gravity="center_vertical"
+ android:scaleType="centerCrop"
+ android:layout_weight="1"
+ android:backgroundTint="@color/white"
+ android:src="@drawable/empty_star" />
- <ImageView
- android:id="@+id/star5"
- android:layout_width="wrap_content"
+ <ImageButton
+ android:id="@+id/rateStar5"
+ android:layout_width="30dp"
+ android:layout_height="40dp"
+ android:layout_gravity="center_vertical"
+ android:scaleType="centerCrop"
+ android:layout_weight="1"
+ android:backgroundTint="@color/white"
+ android:src="@drawable/empty_star" />
+
+ <Button
+ android:id="@+id/submitRating"
+ android:layout_width="30dp"
+ android:layout_height="40dp"
+ android:layout_weight="1"
+ android:backgroundTint="@color/white"
+ android:text="ok"
+ android:layout_gravity="center_vertical"
+ android:textColor="@color/black"
+ />
+ </LinearLayout>
+
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ app:layout_constraintTop_toBottomOf="@id/linearLayout2">
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:id="@+id/postCommentLayout"
+ android:orientation="horizontal"
+ app:layout_constraintStart_toStartOf="parent" >
+ <EditText
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:src="@android:drawable/btn_star_big_on" />
+ android:hint="Unesite komentar ovde"
+ android:id="@+id/NewComment"
+ />
+
+ <ImageButton
+ android:id="@+id/btnPostComment"
+ android:layout_width="50dp"
+ android:scaleType="fitCenter"
+ android:layout_height="50dp"
+ android:src="@drawable/post_comment"
+ android:backgroundTint="@color/white"/>
</LinearLayout>
- <TextView
- android:id="@+id/tvRating"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
- android:text="4.2"
- app:layout_constraintEnd_toStartOf="@+id/textView10"
- tools:layout_editor_absoluteY="0dp" />
<TextView
- android:id="@+id/tvNumberOfRatings"
+ android:id="@+id/tvCommentLabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="(10,500)"
- app:layout_constraintEnd_toEndOf="parent"
- tools:layout_editor_absoluteY="0dp" />
- </androidx.constraintlayout.widget.ConstraintLayout>
-
- <androidx.constraintlayout.widget.ConstraintLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_margin="10dp"
- android:padding="10dp"
- android:background="@drawable/rounded_picture_background"
- android:elevation="5dp">
+ app:layout_constraintTop_toBottomOf="@id/postCommentLayout"
+ android:padding="@dimen/text_padding"
+ android:text="Komentari"
+ android:textStyle="bold" />
<TextView
- android:id="@+id/tvDescription"
+ android:id="@+id/tvCommentCount"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="TextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextView"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.048"
- app:layout_constraintStart_toStartOf="parent"
- tools:layout_editor_absoluteY="4dp" />
- </androidx.constraintlayout.widget.ConstraintLayout>
- </LinearLayout>
+ android:padding="@dimen/text_padding"
+ app:layout_constraintTop_toBottomOf="@id/postCommentLayout"
+ android:text="3"
+ app:layout_constraintStart_toEndOf="@id/tvCommentLabel" />
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/rvComments"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ app:layout_constraintTop_toBottomOf="@id/tvCommentLabel"
+ android:nestedScrollingEnabled="false">
-</LinearLayout> \ No newline at end of file
+ </androidx.recyclerview.widget.RecyclerView>
+ </androidx.constraintlayout.widget.ConstraintLayout>
+ </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
+</ScrollView>
+</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 3287683..9e6dd9d 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_browse.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_browse.xml
@@ -1,14 +1,74 @@
<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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=".Fragments.FragmentBrowse">
- <!-- TODO: Update blank fragment layout -->
- <TextView
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:text="Browse" />
-</FrameLayout> \ No newline at end of file
+
+ <org.osmdroid.views.MapView
+ android:id="@+id/FragmentBrowseMapView"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ />
+
+
+
+ <com.google.android.material.floatingactionbutton.FloatingActionButton
+ 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:rippleColor="#FFFFFF"
+ 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_home_page.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_home_page.xml
new file mode 100644
index 0000000..5d9e62c
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_home_page.xml
@@ -0,0 +1,116 @@
+<?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=".Fragments.FragmentHomePage">
+
+
+ <TextView
+ android:id="@+id/tvFragmentHomePageHelloName"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="16dp"
+
+ android:layout_marginTop="56dp"
+ android:layout_marginEnd="107dp"
+ android:text="Zdravo, Mia"
+ app:layout_constraintEnd_toStartOf="@+id/cvFragmentHomePageProfile"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <androidx.cardview.widget.CardView
+ android:id="@+id/cvFragmentHomePageProfile"
+ android:layout_width="70dp"
+ android:layout_height="70dp"
+ android:layout_gravity="center"
+ android:layout_marginTop="24dp"
+ android:layout_marginEnd="24dp"
+ app:cardCornerRadius="250dp"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toEndOf="@+id/tvFragmentHomePageHelloName"
+ app:layout_constraintTop_toTopOf="parent">
+
+ <ImageView
+ android:id="@+id/ivFragmentHomePageProfile"
+ android:layout_width="70dp"
+ android:layout_height="70dp"
+ android:scaleType="centerCrop"
+ android:src="@drawable/ic_baseline_person_24"
+ tools:ignore="ContentDescription" />
+ </androidx.cardview.widget.CardView>
+
+
+ <TextView
+ android:id="@+id/tvFragmentHomePageSearch"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="16dp"
+ android:layout_marginTop="8dp"
+ android:text="Pretraži lokacije"
+ android:textSize="20sp"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="0.0"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/cvFragmentHomePageProfile" />
+
+ <androidx.cardview.widget.CardView
+ android:id="@+id/cvFragmentHomePageSearch"
+ android:layout_width="0dp"
+ 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>
+
+ <!--***************************SCROLL****************************************-->
+ <ImageView
+ android:id="@+id/btnFragmentHomePageBack"
+ android:layout_width="63dp"
+ android:layout_height="40dp"
+ android:clickable="true"
+ android:src="@drawable/ic_baseline_arrow_back_24"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/cvFragmentHomePageSearch" />
+
+ <FrameLayout
+ android:id="@+id/flFragmentHomePageMainContent"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_marginStart="16dp"
+ android:layout_marginEnd="16dp"
+ android:layout_marginBottom="8dp"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/btnFragmentHomePageBack">
+
+ </FrameLayout>
+</androidx.constraintlayout.widget.ConstraintLayout> \ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_home_page_main_scroll.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_home_page_main_scroll.xml
new file mode 100644
index 0000000..90d1037
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_home_page_main_scroll.xml
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView 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.FragmentHomePageMainScroll">
+
+<LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+
+
+ <androidx.cardview.widget.CardView
+ android:id="@+id/cvFragmentHomePageText1"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+
+ <TextView
+ android:id="@+id/tvFragmentHomePagePopular"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_gravity="left"
+ android:text="Popularno"
+ android:textStyle="bold" />
+
+ <TextView
+ android:id="@+id/tvFragmentHomePagePopularShowAll"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="right"
+ android:clickable="true"
+ android:text="Prikaži sve"
+
+ tools:ignore="TouchTargetSizeCheck" />
+
+ </androidx.cardview.widget.CardView>
+
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/rvFragmentHomePagePopular"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="16dp" />
+
+ <HorizontalScrollView
+ android:id="@+id/hsvFragmentHomePageLocationButtonScroll"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+
+ >
+
+ <LinearLayout
+ android:id="@+id/llFragmentHomePageLocationButtonLayout"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent">
+
+ <ImageButton
+ android:id="@+id/btnFragmentHomePagelocation_city"
+ android:layout_width="60dp"
+ android:layout_height="60dp"
+ android:layout_marginRight="10dp"
+ android:background="@drawable/location_city"
+ tools:ignore="SpeakableTextPresentCheck" />
+
+ <ImageButton
+ android:id="@+id/btnFragmentHomePagelocation_beach"
+ android:layout_width="60dp"
+ android:layout_height="60dp"
+ android:layout_marginRight="10dp"
+ android:background="@drawable/location_beach"
+ tools:ignore="SpeakableTextPresentCheck" />
+
+ <ImageButton
+ android:id="@+id/btnFragmentHomePagelocation_mountain"
+ android:layout_width="60dp"
+ android:layout_height="60dp"
+ android:layout_marginRight="10dp"
+ android:background="@drawable/location_mountain"
+ tools:ignore="SpeakableTextPresentCheck" />
+
+ <ImageButton
+ android:id="@+id/btnFragmentHomePagelocation_lake"
+ android:layout_width="60dp"
+ android:layout_height="match_parent"
+ android:layout_marginRight="10dp"
+ android:background="@drawable/location_lake"
+ tools:ignore="SpeakableTextPresentCheck" />
+
+ <ImageButton
+ android:id="@+id/btnFragmentHomePagelocation_spa"
+ android:layout_width="60dp"
+ android:layout_height="60dp"
+ android:layout_marginRight="10dp"
+ android:background="@drawable/location_spa"
+ tools:ignore="SpeakableTextPresentCheck" />
+
+ <ImageButton
+ android:id="@+id/btnFragmentHomePagelocation_waterfall"
+ android:layout_width="60dp"
+ android:layout_height="60dp"
+ android:layout_marginRight="10dp"
+ android:background="@drawable/location_waterfall"
+ tools:ignore="SpeakableTextPresentCheck" />
+
+ <ImageButton
+ android:id="@+id/btnFragmentHomePagelocation_amusement_park"
+ android:layout_width="60dp"
+ android:layout_height="60dp"
+ android:layout_marginRight="10dp"
+ android:background="@drawable/location_amusement_park"
+ tools:ignore="SpeakableTextPresentCheck" />
+
+ <ImageButton
+ android:id="@+id/btnFragmentHomePagelocation_attraction"
+ android:layout_width="60dp"
+ android:layout_height="60dp"
+ android:layout_marginRight="10dp"
+ android:background="@drawable/location_attraction"
+ tools:ignore="SpeakableTextPresentCheck" />
+
+ <ImageButton
+ android:id="@+id/btnFragmentHomePagelocation_landmark"
+ android:layout_width="60dp"
+ android:layout_height="60dp"
+ android:layout_marginRight="10dp"
+ android:background="@drawable/location_landmark"
+ tools:ignore="SpeakableTextPresentCheck" />
+
+ </LinearLayout>
+ </HorizontalScrollView>
+
+ <androidx.cardview.widget.CardView
+ android:id="@+id/cvFragmentHomePageText2"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="16dp">
+
+ <TextView
+ android:id="@+id/tvFragmentHomePageNewest"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="left"
+ android:text="Najnovije"
+ android:textStyle="bold" />
+
+ <TextView
+ android:id="@+id/tvFragmentHomePageNewestShowAll"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="right"
+ android:clickable="true"
+ android:text="Prikaži sve" />
+ </androidx.cardview.widget.CardView>
+
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/rvFragmentHomePageNewest"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
+
+ <androidx.cardview.widget.CardView
+ android:id="@+id/cvFragmentHomePageText3"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="16dp">
+
+ <TextView
+ android:id="@+id/tvFragmentHomePageBestRated"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="left"
+ android:text="Najposećenije"
+ android:textStyle="bold" />
+
+ <TextView
+ android:id="@+id/tvFragmentHomePageBestRatedShowAll"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="right"
+ android:clickable="true"
+ android:text="Prikaži sve" />
+ </androidx.cardview.widget.CardView>
+
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/rvFragmentHomePageBestRated"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
+
+</LinearLayout>
+
+</ScrollView> \ 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..c75e1e4 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_profile.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_profile.xml
@@ -6,7 +6,6 @@
android:layout_height="match_parent"
tools:context=".Fragments.FragmentProfile">
-
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
@@ -46,7 +45,7 @@
android:layout_marginEnd="20dp"
android:adjustViewBounds="true"
android:background="#E8FFFFFF"
- android:elevation="20dp"
+ android:elevation="1dp"
android:scaleType="fitEnd"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.494"
@@ -55,25 +54,48 @@
app:shapeAppearanceOverlay="@style/imageViewRoundedEdge" />
- <com.google.android.material.imageview.ShapeableImageView
- android:id="@+id/tvFragmentProfileProfilePicture"
- android:layout_width="150dp"
- android:layout_height="150dp"
+ <androidx.cardview.widget.CardView
+ android:id="@+id/cvFragmentHomePageProfile"
+ android:layout_width="140dp"
+ android:layout_height="140dp"
android:layout_gravity="center"
- android:layout_margin="5dp"
- android:layout_marginTop="4dp"
- android:layout_marginEnd="108dp"
- android:adjustViewBounds="true"
- android:elevation="21dp"
- android:scaleType="fitCenter"
- android:src="@drawable/ic_launcher_background"
+ android:layout_marginTop="24dp"
+ android:elevation="10dp"
+ app:cardCornerRadius="250dp"
app:layout_constraintBottom_toTopOf="@+id/tableLayout"
- app:layout_constraintEnd_toEndOf="@+id/imageView3"
- app:layout_constraintHorizontal_bias="0.483"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="0.498"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="@+id/imageView3"
- app:layout_constraintVertical_bias="1.0"
- app:shapeAppearanceOverlay="@style/imageViewCircle" />
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintVertical_bias="0.887">
+
+ <ImageView
+
+ android:id="@+id/tvFragmentProfileProfilePicture"
+ android:layout_width="140dp"
+ android:layout_height="140dp"
+ android:elevation="10dp"
+ android:scaleType="centerCrop"
+ android:src="@drawable/ic_baseline_person_24"
+ tools:ignore="ContentDescription" />
+ </androidx.cardview.widget.CardView>
+
+ <com.google.android.material.button.MaterialButton
+ android:id="@+id/btnFragmentProfileProfilePicturePlus"
+ android:layout_width="54dp"
+ android:layout_height="54dp"
+ android:layout_marginEnd="32dp"
+ android:layout_marginBottom="4dp"
+ app:backgroundTint="#FFFFFF"
+ app:cornerRadius="100dp"
+ app:icon="@drawable/ic_baseline_add_a_photo_24"
+ app:iconGravity="start"
+ app:iconTint="#3C5C6E"
+ app:layout_constraintBottom_toTopOf="@+id/tableLayout"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="0.72"
+ app:layout_constraintStart_toStartOf="parent"
+ tools:ignore="SpeakableTextPresentCheck" />
<TableLayout
android:id="@+id/tableLayout"
@@ -99,6 +121,7 @@
android:layout_height="match_parent"
android:text="Petar Petrović" />
</TableRow>
+
<TableRow
android:layout_width="fill_parent"
android:layout_height="wrap_content"
@@ -112,6 +135,7 @@
android:gravity="center"
android:text="#PetarP" />
</TableRow>
+
<Space android:layout_height="20dp"></Space>
<TableRow
@@ -159,6 +183,7 @@
</TableRow>
</TableLayout>
+
<View
android:id="@+id/divider"
android:layout_width="409dp"
@@ -198,17 +223,6 @@
app:layout_constraintStart_toEndOf="@+id/btnFragmentProfileShowMyRecensions"
app:layout_constraintTop_toBottomOf="@+id/tvFragmentProfileInfoContainer" />
- <FrameLayout
- android:id="@+id/flFragmentProfileFragmentContainer"
- android:layout_width="409dp"
- android:layout_height="319dp"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="@+id/divider">
-
- </FrameLayout>
-
<Button
android:id="@+id/btnFragmentProfileShowMyRecensions"
android:layout_width="wrap_content"
@@ -217,10 +231,21 @@
android:layout_marginTop="4dp"
android:backgroundTint="#FFFFFF"
android:stateListAnimator="@null"
- android:textColor="@color/cardview_dark_background"
android:text="Recenzije"
+ android:textColor="@color/cardview_dark_background"
app:layout_constraintStart_toEndOf="@+id/btnFragmentProfileShowMyPosts"
app:layout_constraintTop_toBottomOf="@+id/tvFragmentProfileInfoContainer" />
+ <FrameLayout
+ android:id="@+id/flFragmentProfileFragmentContainer"
+ android:layout_width="409dp"
+ android:layout_height="319dp"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="@+id/divider">
+ </FrameLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
+
+
</FrameLayout> \ No newline at end of file
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 02512d4..5dfbc98 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"
@@ -22,52 +48,63 @@
<ImageButton
- android:id="@+id/button3"
+ android:id="@+id/btnSortType"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_alignParentRight="true"
- android:src="@drawable/filter"
+ android:background="@color/white"
+ android:padding="@dimen/component_padding"
android:scaleType="centerCrop"
- android:background="@color/white"/>
+ android:src="@drawable/filter"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
<ImageButton
- android:id="@+id/imageButton1"
+ android:id="@+id/btnSortDirection"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_marginStart="8dp"
android:layout_weight="1"
+ android:background="@color/white"
+ android:padding="@dimen/component_padding"
android:scaleType="centerCrop"
android:src="@drawable/sort"
- app:layout_constraintStart_toEndOf="@+id/button3"
- tools:layout_editor_absoluteY="0dp"
- android:background="@color/white"/>
+ app:layout_constraintStart_toEndOf="@+id/btnSortType"
+ app:layout_constraintTop_toTopOf="parent" />
<ImageButton
- android:id="@+id/imageButton2"
+ android:id="@+id/btnLinearLayout"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_marginEnd="16dp"
android:layout_weight="1"
android:background="@color/white"
+ android:padding="@dimen/component_padding"
android:scaleType="centerCrop"
- android:src="@drawable/list"
- app:layout_constraintEnd_toStartOf="@+id/imageButton3"
+ android:src="@drawable/list_empty"
+ app:layout_constraintEnd_toStartOf="@+id/btnGridLayout"
app:layout_constraintHorizontal_bias="1.0"
- app:layout_constraintStart_toEndOf="@+id/imageButton1"
- tools:layout_editor_absoluteY="0dp" />
+ app:layout_constraintStart_toEndOf="@+id/btnSortDirection"
+ app:layout_constraintTop_toTopOf="parent" />
<ImageButton
- android:id="@+id/imageButton3"
+ android:id="@+id/btnGridLayout"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_marginStart="248dp"
android:layout_weight="1"
android:background="@color/white"
+ android:clickable="true"
+ android:padding="@dimen/component_padding"
android:scaleType="centerCrop"
- android:src="@drawable/grid"
- app:layout_constraintStart_toEndOf="@+id/imageButton1"
- tools:layout_editor_absoluteY="0dp" />
+ android:src="@drawable/grid_full"
+ app:layout_constraintStart_toEndOf="@+id/btnSortDirection"
+ app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
+<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+ android:layout_height="match_parent"
+ android:layout_width="match_parent"
+ android:id="@+id/swipeContainer">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rvMain"
@@ -77,5 +114,7 @@
app:layout_constraintTop_toTopOf="parent" >
</androidx.recyclerview.widget.RecyclerView>
+</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+
</LinearLayout> \ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_show_posts_by_location.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_show_posts_by_location.xml
new file mode 100644
index 0000000..1e6305f
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_show_posts_by_location.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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"
+ android:orientation="vertical"
+ tools:context=".Fragments.FragmentShowPostsByLocation">
+
+ <!-- TODO: Update blank fragment layout -->
+
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/rvFragmentShowPostsByLocationPosts"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
+
+</LinearLayout> \ 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..effb6e5 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,44 @@
<?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"
+
+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 -->
- <TextView
+ <androidx.cardview.widget.CardView
+ android:layout_marginTop="35dp"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+
+ <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>
+
+
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/rvFragmentUserPostsPosts"
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
+ </LinearLayout>
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
new file mode 100644
index 0000000..441f97b
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/post_item_home_page.xml
@@ -0,0 +1,47 @@
+<?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="150dp"
+ android:layout_height="180dp">
+
+ <com.google.android.material.imageview.ShapeableImageView
+ android:id="@+id/ivPIHPBackground"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginTop="8dp"
+ android:layout_marginEnd="16dp"
+ android:layout_marginBottom="8dp"
+ android:scaleType="fitXY"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:shapeAppearanceOverlay="@style/Circular"
+ app:srcCompat="@drawable/b1" />
+
+ <com.google.android.material.imageview.ShapeableImageView
+ android:id="@+id/ivPIHPMenu"
+ android:layout_width="0dp"
+ android:layout_height="22dp"
+ app:layout_constraintBottom_toBottomOf="@+id/ivPIHPBackground"
+
+ app:layout_constraintEnd_toEndOf="@+id/ivPIHPBackground"
+ app:layout_constraintHorizontal_bias="0.0"
+ app:layout_constraintStart_toStartOf="@+id/ivPIHPBackground"
+ app:shapeAppearanceOverlay="@style/roundedBottom"
+ app:srcCompat="@color/dark_blue_transparent" />
+
+ <TextView
+ android:id="@+id/tvPIHPLocationName"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="8dp"
+ android:text="TextView"
+ android:textColor="@color/white"
+ android:textSize="10dp"
+ app:layout_constraintStart_toStartOf="@+id/ivPIHPMenu"
+ app:layout_constraintTop_toTopOf="@+id/ivPIHPMenu" />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout> \ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/post_preview.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/post_preview.xml
index dafd3b9..dad1d41 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/post_preview.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/post_preview.xml
@@ -14,6 +14,7 @@
android:id="@+id/locationImage"
android:layout_width="match_parent"
android:layout_height="250dp"
+ android:layout_marginTop="16dp"
android:outlineProvider="background"
android:scaleType="centerCrop"
app:layout_constraintBottom_toBottomOf="parent"
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/single_comment.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/single_comment.xml
new file mode 100644
index 0000000..f219ea2
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/single_comment.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:padding="@dimen/component_padding"
+ xmlns:app="http://schemas.android.com/apk/res-auto">
+ <TextView
+ android:id="@+id/tvCommentAuthor"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="autor"
+ android:textStyle="bold"
+ android:padding="@dimen/text_padding"/>
+ <TextView
+ android:id="@+id/tvCommentText"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="autor"
+ android:padding="@dimen/text_padding"
+ app:layout_constraintTop_toBottomOf="@id/tvCommentAuthor"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout> \ No newline at end of file