diff options
| author | Ognjen Cirkovic <ciraboxkg@gmail.com> | 2022-12-13 14:42:43 +0000 |
|---|---|---|
| committer | Ognjen Cirkovic <ciraboxkg@gmail.com> | 2022-12-13 14:42:43 +0000 |
| commit | e3b7055065d8ed49c4f5d5be277003bc18890166 (patch) | |
| tree | dbbfce17cbb176aee04c92d0685a77f4b645afc3 /Client/BrzoDoLokacije/app/src/main/res/layout | |
| parent | 5a205c35d936728f76451109751e1fb5a9a75bd1 (diff) | |
| parent | 61998e4a27b3ed6e42edefaac8b48cbf6b43c49d (diff) | |
Merge develop-> master
Closes #83
See merge request BrzoDoLokacije2022/odyssey/brzodolokacije!11
Diffstat (limited to 'Client/BrzoDoLokacije/app/src/main/res/layout')
43 files changed, 2627 insertions, 1319 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 405c221..dabb494 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,25 +6,30 @@ android:layout_height="match_parent" tools:context=".Activities.ActivityAddPost"> - <ImageSwitcher + <ImageView android:id="@+id/isActivityAddPostSwitcher" - android:layout_width="0dp" + android:layout_width="match_parent" android:layout_height="0dp" - android:elevation="10dp" - app:layout_constraintBottom_toTopOf="@+id/btnActivityAddPostUploadFromGallery" + android:scaleType="fitCenter" + app:layout_constraintBottom_toTopOf="@+id/btnActivityAddPostAddLocation" app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="1.0" + tools:ignore="ImageContrastCheck" + tools:srcCompat="@tools:sample/avatars"/> <Button android:id="@+id/nextImage" android:layout_width="78dp" android:layout_height="0dp" + android:elevation="15dp" android:background="@drawable/rounded_transparent_button" android:gravity="right" android:padding="30dp" app:icon="@drawable/ic_baseline_arrow_forward" - app:iconTint="#072242" + app:iconTint="@color/grey" app:layout_constraintBottom_toBottomOf="@+id/isActivityAddPostSwitcher" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" @@ -34,12 +39,12 @@ android:id="@+id/previousImage" android:layout_width="70dp" android:layout_height="0dp" - + android:elevation="15dp" android:background="@drawable/rounded_transparent_button" android:gravity="left" android:padding="30dp" app:icon="@drawable/ic_baseline_arrow_back" - app:iconTint="#0E283C" + app:iconTint="@color/grey" app:layout_constraintBottom_toBottomOf="@+id/isActivityAddPostSwitcher" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" @@ -53,7 +58,7 @@ android:text="Otvori galeriju" android:visibility="invisible" app:cornerRadius="20dp" - app:layout_constraintBottom_toTopOf="@+id/btnActivityAddPostAddLocation" + app:layout_constraintBottom_toTopOf="@+id/llTags" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.497" app:layout_constraintStart_toStartOf="parent" /> @@ -68,7 +73,7 @@ android:drawableLeft="@drawable/ic_baseline_location_on_24" android:text="Dodaj lokaciju" android:textColor="#757471" - app:layout_constraintBottom_toTopOf="@+id/tvActivityAddPostDescriptiontext" + app:layout_constraintBottom_toTopOf="@+id/btnActivityAddPostAddTag" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.074" app:layout_constraintStart_toStartOf="parent" /> @@ -102,24 +107,25 @@ <EditText android:id="@+id/etActivityAddPostDescription" android:layout_width="match_parent" - android:layout_height="50dp" + android:layout_height="wrap_content" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" android:ems="10" - android:hint="Reykjavik, Iceland" - android:inputType="textEmailAddress" + android:maxLines="100" + android:minHeight="50dp" android:visibility="gone" - app:layout_constraintBottom_toTopOf="@+id/llTags" + android:inputType="textCapSentences|textMultiLine" + app:layout_constraintBottom_toTopOf="@+id/btnActivityAddPostPost" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" /> <Button android:id="@+id/btnActivityAddPostPost" - android:layout_width="250dp" - android:layout_height="40dp" + android:layout_width="match_parent" + android:layout_marginHorizontal="16dp" + android:layout_height="45dp" android:layout_marginBottom="12dp" - android:background="@drawable/rounded_cyan_button" - android:backgroundTint="#1C789A" + style="@style/imageViewRoundedEdge" android:text="Objavi" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -148,7 +154,7 @@ android:layout_marginLeft="20dp" android:layout_marginRight="20dp" android:orientation="horizontal" - app:layout_constraintBottom_toTopOf="@+id/btnActivityAddPostAddTag" + app:layout_constraintBottom_toTopOf="@+id/btnActivityAddPostAddLocation" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent"></LinearLayout> @@ -157,12 +163,15 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="28dp" - android:hint="Planina,Reka,Park..." + android:hint="Planina, Reka, Park..." + android:inputType="text" android:maxLength="12" android:minHeight="48dp" + android:singleLine="true" android:visibility="gone" - app:layout_constraintBottom_toTopOf="@+id/btnActivityAddPostPost" - app:layout_constraintStart_toStartOf="parent" /> + app:layout_constraintBottom_toBottomOf="@+id/btnActivityAddPostAddTag" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toEndOf="@+id/btnActivityAddPostAddTag" /> <Button android:id="@+id/btnActivityAddPostAddTag" @@ -175,7 +184,7 @@ android:text="Dodaj tag" android:textColor="#757471" - app:layout_constraintBottom_toTopOf="@+id/acTags" + app:layout_constraintBottom_toTopOf="@+id/tvActivityAddPostDescriptiontext" app:layout_constraintStart_toStartOf="parent" /> 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 cb2c8dc..f46d6bd 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,9 +8,8 @@ <ImageView android:id="@+id/ivActivityCapturePostImage" - android:layout_width="413dp" + android:layout_width="match_parent" android:layout_height="0dp" - android:layout_marginTop="4dp" android:scaleType="fitCenter" app:layout_constraintBottom_toTopOf="@+id/btnActivityCapturePostCapture" app:layout_constraintEnd_toEndOf="parent" @@ -22,6 +21,49 @@ tools:srcCompat="@tools:sample/avatars" /> <Button + android:id="@+id/nextImage" + android:layout_width="78dp" + android:layout_height="0dp" + android:background="@drawable/rounded_transparent_button" + android:gravity="right" + android:padding="30dp" + app:icon="@drawable/ic_baseline_arrow_forward" + app:iconTint="@color/grey" + app:layout_constraintBottom_toTopOf="@+id/btnActivityCapturePostCapture" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" + tools:ignore="SpeakableTextPresentCheck" /> + + <Button + android:id="@+id/previousImage" + android:layout_width="70dp" + android:layout_height="0dp" + android:background="@drawable/rounded_transparent_button" + android:gravity="left" + android:padding="30dp" + app:icon="@drawable/ic_baseline_arrow_back" + app:iconTint="@color/grey" + app:layout_constraintBottom_toTopOf="@+id/btnActivityCapturePostCapture" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + tools:ignore="SpeakableTextPresentCheck" /> + <com.google.android.material.button.MaterialButton + android:id="@+id/btnActivityCapturePostCaptureVisible1" + android:layout_width="50dp" + android:layout_height="wrap_content" + android:stateListAnimator="@null" + android:layout_margin="5dp" + android:elevation="10dp" + app:backgroundTint="#00FFFFFF" + app:icon="@drawable/ic_baseline_add_a_photo_24" + app:iconGravity="textEnd" + app:iconSize="40dp" + app:iconTint="#1C7696" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" + android:visibility="invisible"/> + + <Button android:id="@+id/btnActivityCapturePostCapture" android:layout_width="68dp" android:layout_height="15dp" @@ -113,8 +155,8 @@ <com.google.android.material.button.MaterialButton android:id="@+id/btnActivityCapturePostCaptureVisible" - android:layout_width="50dp" - android:layout_height="wrap_content" + android:layout_width="40dp" + android:layout_height="40dp" android:stateListAnimator="@null" app:backgroundTint="#00FFFFFF" app:icon="@drawable/ic_baseline_add_a_photo_24" @@ -123,8 +165,10 @@ app:iconTint="#1C7696" app:layout_constraintBottom_toTopOf="@+id/btnActivityCapturePostCapture" app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.48" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0.503" /> <LinearLayout android:id="@+id/llTagsCap" diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_change_password.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_change_password.xml new file mode 100644 index 0000000..1ef0be6 --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_change_password.xml @@ -0,0 +1,179 @@ +<?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" + android:padding="16dp" + tools:context=".Activities.ActivityChangePassword"> + + <ImageView + android:id="@+id/btnBackToUser" + android:layout_width="35dp" + android:layout_height="35dp" + android:clickable="true" + android:src="@drawable/ic_baseline_arrow_back" + android:textAllCaps="false" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + tools:ignore="SpeakableTextPresentCheck,TouchTargetSizeCheck" /> + + <TextView + android:id="@+id/tvActivityChangePasswordBack" + style="@style/title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_column="1" + android:layout_gravity="center" + android:layout_marginStart="8dp" + + android:layout_marginTop="4dp" + android:text="Izmeni lozinku" + app:layout_constraintStart_toEndOf="@+id/btnBackToUser" + app:layout_constraintTop_toTopOf="parent" /> + + <androidx.cardview.widget.CardView + android:id="@+id/cvFragmentHomePageProfile" + android:layout_width="130dp" + android:layout_height="130dp" + android:layout_gravity="center" + android:layout_marginTop="24dp" + android:elevation="10dp" + app:cardCornerRadius="250dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/tvActivityChangePasswordBack"> + + <ImageView + + android:id="@+id/tvActivityChangeUserPasswordProfilePicture" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:elevation="10dp" + android:scaleType="centerCrop" + android:src="@mipmap/ic_launcher_round" + tools:ignore="ContentDescription" /> + + + </androidx.cardview.widget.CardView> + + <TextView + android:id="@+id/changeDataOldPassword" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="60dp" + android:text="Trenutna lozinka" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.003" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/cvFragmentHomePageProfile" /> + + <EditText + android:id="@+id/tvActivityChangePasswordCurrentPass" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:ems="10" + android:hint="Unesi trenutnu lozinku" + android:inputType="textPassword" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.0" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/changeDataOldPassword" /> + + <TextView + android:id="@+id/tvActivityChangePasswordNewPassText" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + + android:layout_marginTop="20dp" + android:text="Nova lozinka" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/btnActivityChangePasswordForgottenPass" /> + + <EditText + android:id="@+id/tvActivityChangePasswordNewPass" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:ems="10" + android:hint="Unesi novu lozinku" + android:inputType="textPassword" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.0" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/tvActivityChangePasswordNewPassText" /> + + <Button + android:id="@+id/ActivityChangePasswordChangePassword" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:text="Izmeni lozinku" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:shapeAppearanceOverlay="@style/Circular" /> + + <TextView + android:id="@+id/btnActivityChangePasswordNewError" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="ErrorMessage" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.0" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/tvActivityChangePasswordNewPass" /> + + <TextView + android:id="@+id/btnActivityChangePasswordForgottenPass" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:clickable="true" + android:visibility="invisible" + android:text="Zaboravljena lozinka?" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.0" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/tvActivityChangePasswordCurrentPass" /> + + + <TextView + android:id="@+id/changeDataNewPasswordConfirmInputt" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="40dp" + android:layout_marginEnd="270dp" + android:text="Potvrdi novu lozinku" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.0" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/tvActivityChangePasswordNewPass" /> + + <EditText + android:id="@+id/ActivityChangePasswordNewPasswordConfirm" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:ems="10" + android:hint="Unesi novu lozinku" + android:inputType="textPassword" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/changeDataNewPasswordConfirmInputt" /> + + <TextView + android:id="@+id/btnActivityChangePasswordConfirmError" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:hint="ErrorMessage" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.0" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/ActivityChangePasswordNewPasswordConfirm" /> + + <TextView + android:id="@+id/ActivityChangePasswordOldError" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="ErrorMessage" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="@+id/btnActivityChangePasswordForgottenPass" /> + +</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_change_user_data.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_change_user_data.xml index 2ade677..648e4ef 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_change_user_data.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_change_user_data.xml @@ -126,19 +126,6 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/changeDataUsername" /> - <Button - android:id="@+id/button" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginTop="140dp" - android:text="Izmeni lozinku" - app:layout_constraintBottom_toBottomOf="parent" - android:drawableLeft="@drawable/ic_outline_password_24" - android:drawableTint="@color/white" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/tvActivityChangeUserDataUsername" - app:shapeAppearanceOverlay="@style/Circular" /> <ImageView diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_chat.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_chat.xml index 0b4a589..3b92058 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_chat.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_chat.xml @@ -6,18 +6,6 @@ android:layout_height="match_parent" tools:context=".Activities.ChatActivity"> - <ImageButton - android:id="@+id/addNewMessage" - android:layout_width="60dp" - android:layout_height="60dp" - android:clickable="true" - android:elevation="50dp" - android:focusable="true" - android:backgroundTint="@color/unfollow" - android:src="@drawable/ic_baseline_add_message_24" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" /> - <androidx.appcompat.widget.LinearLayoutCompat android:layout_width="match_parent" android:id="@+id/llHeader" @@ -61,23 +49,27 @@ <androidx.swiperefreshlayout.widget.SwipeRefreshLayout android:id="@+id/swipeContainer" android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_marginTop="8dp" + android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintTop_toBottomOf="@+id/llHeader" - app:layout_constraintVertical_bias="1.0" - tools:layout_editor_absoluteX="-27dp"> + app:layout_constraintTop_toBottomOf="@id/llHeader" + app:layout_constraintVertical_bias="0.0" + tools:layout_editor_absoluteX="0dp"> - <androidx.recyclerview.widget.RecyclerView - android:id="@+id/rvMain" + <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" - android:layout_height="wrap_content" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent"> + android:layout_height="match_parent"> - </androidx.recyclerview.widget.RecyclerView> + <androidx.recyclerview.widget.RecyclerView + android:id="@+id/rvMain" + android:layout_width="match_parent" + android:layout_height="wrap_content" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> + </androidx.recyclerview.widget.RecyclerView> + </androidx.constraintlayout.widget.ConstraintLayout> </androidx.swiperefreshlayout.widget.SwipeRefreshLayout> + </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_chat_conversation.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_chat_conversation.xml index 4dcab31..f6b767c 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_chat_conversation.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_chat_conversation.xml @@ -30,6 +30,7 @@ <androidx.appcompat.widget.LinearLayoutCompat android:layout_width="match_parent" android:id="@+id/llHeader" + android:clickable="true" android:layout_height="50dp"> <ImageView android:id="@+id/ivUserImage" @@ -44,34 +45,9 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:gravity="center_vertical" - android:text="Chat" android:textSize="20dp" /> </androidx.appcompat.widget.LinearLayoutCompat> - <androidx.cardview.widget.CardView - android:id="@+id/cvParentUsername" - android:layout_width="wrap_content" - android:layout_height="40dp" - android:layout_gravity="center_vertical" - android:layout_weight="1" - 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/etReceiverUsername" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@drawable/rounded_white_button_login" - android:hint=" kome slati poruku?" - android:inputType="textPersonName" - android:paddingLeft="15dp" /> - - - </androidx.cardview.widget.CardView> </androidx.appcompat.widget.LinearLayoutCompat> @@ -92,16 +68,19 @@ </androidx.recyclerview.widget.RecyclerView> </androidx.constraintlayout.widget.ConstraintLayout> +<androidx.appcompat.widget.LinearLayoutCompat + android:layout_width="match_parent" + android:layout_height="wrap_content"> <androidx.cardview.widget.CardView android:id="@+id/cvParentMessageEdit" - android:layout_width="match_parent" - android:layout_height="40dp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:minHeight="40dp" android:layout_marginBottom="5dp" - android:layout_marginStart="16dp" - android:layout_marginTop="10dp" - android:layout_marginEnd="16dp" - android:elevation="0dp" + android:layout_marginHorizontal="10dp" + android:elevation="16dp" app:cardCornerRadius="20dp"> @@ -109,24 +88,37 @@ android:id="@+id/etNewMessage" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@drawable/rounded_white_button_login" - android:hint=" poruka" - android:inputType="textPersonName" - android:paddingLeft="15dp" + android:backgroundTint="@color/white" + android:hint="Ukucajte poruku..." + android:paddingLeft="10dp" tools:ignore="TouchTargetSizeCheck" - android:autofillHints="emailAddress"/> + android:inputType="textCapSentences|textMultiLine"/> + + </androidx.cardview.widget.CardView> + <androidx.cardview.widget.CardView + android:id="@+id/cvParentSendButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="bottom" + android:minHeight="40dp" + android:backgroundTint="@color/purple_500" + android:layout_marginBottom="5dp" + android:layout_marginEnd="5dp" + android:elevation="16dp" + app:cardCornerRadius="20dp"> + <ImageButton android:id="@+id/btnSendMessage" android:layout_width="25dp" android:layout_height="25dp" - android:layout_gravity="right|center_vertical" - android:scaleType="centerCrop" - android:layout_marginEnd="10dp" + android:layout_gravity="center" + android:layout_margin="10dp" android:background="@null" - android:src="@drawable/post_comment" + android:scaleType="fitCenter" + android:src="@drawable/ic_baseline_send_white_24" app:cornerRadius="16dp" tools:ignore="SpeakableTextPresentCheck" /> - </androidx.cardview.widget.CardView> +</androidx.appcompat.widget.LinearLayoutCompat> </androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_forgotten_password.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_forgotten_password.xml index 5841b49..95545c2 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_forgotten_password.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_forgotten_password.xml @@ -5,10 +5,12 @@ android:layout_width="match_parent" android:layout_height="match_parent" tools:context=".Activities.ActivityForgottenPassword"> - +<androidx.constraintlayout.widget.ConstraintLayout + android:layout_width="match_parent" + android:layout_height="match_parent"> <LinearLayout - android:layout_width="399dp" - android:layout_height="556dp" + android:layout_width="350dp" + android:layout_height="570dp" android:orientation="vertical" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -71,5 +73,6 @@ android:layout_height="30dp" /> </LinearLayout> +</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_forgotten_password_verify.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_forgotten_password_verify.xml index c652469..0b8b7f0 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_forgotten_password_verify.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_forgotten_password_verify.xml @@ -6,8 +6,11 @@ android:layout_height="match_parent" tools:context=".Activities.ActivityForgottenPassword"> + <androidx.constraintlayout.widget.ConstraintLayout + android:layout_width="match_parent" + android:layout_height="match_parent"> <LinearLayout - android:layout_width="398dp" + android:layout_width="350dp" android:layout_height="match_parent" android:orientation="vertical" app:layout_constraintBottom_toBottomOf="parent" @@ -102,5 +105,6 @@ android:layout_height="30dp" /> </LinearLayout> + </androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_maps.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_maps.xml index 0051893..6cb0f4e 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_maps.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_maps.xml @@ -6,6 +6,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" tools:context=".Activities.MapsActivity"> + <org.osmdroid.views.MapView android:id="@+id/ActivityMapsMapView" android:layout_width="fill_parent" @@ -13,8 +14,7 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - /> - + app:layout_constraintTop_toTopOf="parent" /> <com.google.android.material.floatingactionbutton.FloatingActionButton @@ -22,9 +22,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentStart="true" + android:layout_marginEnd="32dp" + android:layout_marginBottom="32dp" android:backgroundTint="#FFFFFF" - android:layout_marginRight="10dp" - android:layout_marginBottom="80dp" android:clickable="true" android:focusable="true" android:tint="#FFFFFF" @@ -39,17 +39,17 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentStart="true" - android:layout_marginBottom="80dp" - android:layout_marginLeft="10dp" + android:layout_marginStart="32dp" + android:layout_marginBottom="32dp" android:backgroundTint="#FFFFFF" android:clickable="true" android:focusable="true" android:tint="#FFFFFF" + android:visibility="invisible" app:layout_constraintBottom_toBottomOf="@+id/ActivityMapsMapView" app:layout_constraintStart_toStartOf="parent" app:rippleColor="#FFFFFF" - app:srcCompat="@drawable/ic_baseline_check_24" - android:visibility="invisible"/> + app:srcCompat="@drawable/ic_baseline_check_24" /> <androidx.cardview.widget.CardView android:id="@+id/ActivityMapsCardViewSearch" @@ -69,7 +69,7 @@ android:id="@+id/ActivityMapsSearchBar" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@drawable/rounded_white_button_login" + android:background="@drawable/rounded_picture_background" android:hint=" Pretraga" android:inputType="textPersonName" android:paddingLeft="15dp" /> diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_navigation.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_navigation.xml index afe1bbf..f86ba9e 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_navigation.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_navigation.xml @@ -19,10 +19,11 @@ <com.google.android.material.bottomnavigation.BottomNavigationView android:id="@+id/bottomNavigationView" android:layout_width="match_parent" - android:layout_height="75dp" + android:layout_height="60dp" + app:labelVisibilityMode="unlabeled" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.5" + app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" - app:menu="@menu/bottom_nav_menu"/> + app:menu="@menu/bottom_nav_menu" /> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_opened_images.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_opened_images.xml new file mode 100644 index 0000000..53bed93 --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_opened_images.xml @@ -0,0 +1,48 @@ +<?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.ActivityOpenedImages" + android:background="@color/design_default_color_background"> + <androidx.constraintlayout.widget.ConstraintLayout + android:layout_width="match_parent" + android:layout_height="50dp" + android:elevation="5dp" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintStart_toStartOf="parent" + android:background="@color/unfollow_transparent" + android:id="@+id/clImageHeader"> + + <ImageButton + android:id="@+id/btnBackToPost" + android:layout_width="50dp" + android:layout_height="50dp" + android:background="@null" + android:src="@drawable/ic_baseline_arrow_back" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <ImageButton + android:id="@+id/btnDownload" + android:layout_width="50dp" + android:layout_height="50dp" + android:background="@null" + android:src="@drawable/ic_baseline_download_24" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + </androidx.constraintlayout.widget.ConstraintLayout> + <androidx.appcompat.widget.LinearLayoutCompat + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:id="@+id/rvParent"> + + <androidx.recyclerview.widget.RecyclerView + android:layout_width="match_parent" + android:layout_height="match_parent" + android:id="@+id/rvImages"/> + </androidx.appcompat.widget.LinearLayoutCompat> + +</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 cf5327a..fd7c119 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,196 +1,266 @@ <?xml version="1.0" encoding="utf-8"?> - -<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" - android:orientation="vertical" +<androidx.swiperefreshlayout.widget.SwipeRefreshLayout 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" + tools:context=".Activities.ActivitySinglePost" android:layout_width="match_parent" android:layout_height="match_parent" - xmlns:app="http://schemas.android.com/apk/res-auto" - tools:context=".Activities.ActivitySinglePost"> - - <androidx.recyclerview.widget.RecyclerView - android:id="@+id/rvMain" - android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_margin="0dp" - android:paddingBottom="@dimen/component_padding" - app:layout_constraintBottom_toTopOf="@+id/linearLayout2" - 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="0.0" /> + android:elevation="10dp" + android:id="@+id/PostSwipeRefresh"> <androidx.constraintlayout.widget.ConstraintLayout - android:id="@+id/linearLayout2" android:layout_width="match_parent" - android:layout_height="308dp" - android:background="@drawable/view_top_corner_radius" - android:elevation="30dp" - android:paddingHorizontal="16dp" - android:paddingTop="16dp" - android:paddingBottom="0dp" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.0" - app:layout_constraintStart_toStartOf="parent"> - - - <TextView - android:id="@+id/tvTitle" - style="@style/title" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="24dp" - android:gravity="top|start" - android:padding="@dimen/text_padding" - android:text="Naslov" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> - - <ImageView - android:id="@+id/imageView12" - android:layout_width="30dp" - android:layout_height="30dp" - android:src="@drawable/ic_baseline_location_on_24" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/tvTitle" /> - - <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_constraintStart_toEndOf="@+id/imageView12" - app:layout_constraintTop_toBottomOf="@+id/tvTitle" /> - - <TextView - android:id="@+id/tvLocationType" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginEnd="16dp" - android:gravity="top|start" - android:padding="@dimen/text_padding" - android:text="Tip lokacije" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toBottomOf="@+id/tvTitle" /> - - <TextView - android:id="@+id/tvUser" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="4dp" - android:clickable="true" - android:gravity="top|start" - android:padding="@dimen/text_padding" - android:text="User" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/tvLocationType" /> - - <TextView - android:id="@+id/tvRating" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="24dp" - android:layout_marginEnd="4dp" - android:padding="@dimen/text_padding" - android:text="4.2" - android:textStyle="bold" - app:layout_constraintEnd_toStartOf="@+id/tvNumberOfRatings" - app:layout_constraintTop_toTopOf="parent" /> - - <TextView - android:id="@+id/tvNumberOfRatings" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="24dp" - android:padding="@dimen/text_padding" - android:text="(10,500)" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toTopOf="parent" /> - - <ImageView - android:id="@+id/activitySinglePostChangeHeightUp" - android:layout_width="100dp" - android:layout_height="30dp" - android:clickable="true" - android:src="@drawable/ic_round_keyboard_arrow_up_24" - android:text="Button" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> - - <ImageView - android:id="@+id/activitySinglePostChangeHeightDown" - android:layout_width="100dp" - android:layout_height="30dp" - android:clickable="true" - android:src="@drawable/ic_round_keyboard_arrow_down_24" - android:text="Button" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + android:layout_height="match_parent" + android:orientation="vertical"> - <org.osmdroid.views.MapView - android:id="@+id/MapDialogueMapView" + <androidx.recyclerview.widget.RecyclerView + android:id="@+id/rvMain" android:layout_width="match_parent" - android:layout_height="150dp" - android:layout_marginTop="8dp" + android:layout_height="0dp" + android:layout_margin="0dp" + android:paddingBottom="@dimen/component_padding" + app:layout_constraintBottom_toTopOf="@+id/linearLayout2" app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/tvUser" /> + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0.0" /> <androidx.constraintlayout.widget.ConstraintLayout - android:id="@+id/singlePostDetail" + android:id="@+id/linearLayout2" android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_marginTop="8dp" + android:layout_height="340dp" + android:background="@drawable/view_top_corner_radius" + android:elevation="30dp" + android:paddingHorizontal="16dp" + android:paddingTop="16dp" + android:paddingBottom="0dp" + android:textSize="15dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/MapDialogueMapView"> + tools:backgroundTint="@color/white"> + - <Button - android:id="@+id/btnActivitySinglePostDescription" - android:layout_width="150dp" + <TextView + android:id="@+id/tvTitle" + style="@style/title" + android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginStart="8dp" - android:layout_marginTop="8dp" - android:layout_marginBottom="8dp" - android:backgroundTint="#FFFFFF" - android:stateListAnimator="@null" - android:text="opis" - android:textColor="@color/cardview_dark_background" + android:layout_marginTop="24dp" + android:ellipsize="end" + android:gravity="top|start" + android:maxLines="1" + android:padding="@dimen/text_padding" + android:paddingRight="20dp" + android:text="Naslov" + app:layout_constraintEnd_toStartOf="@+id/ivFavourite" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> - <Button - android:id="@+id/btnActivitySinglePostComments" - android:layout_width="150dp" + <ImageView + android:id="@+id/imageView12" + android:layout_width="30dp" + android:layout_height="30dp" + android:src="@drawable/ic_baseline_location_on_24" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/tvTitle" /> + + <TextView + android:id="@+id/tvLocationParent" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="8dp" - android:layout_marginEnd="8dp" - android:layout_marginBottom="8dp" - android:backgroundTint="#FFFFFF" - android:stateListAnimator="@null" - android:text="Komentari" - android:textColor="@color/cardview_dark_background" + android:gravity="top|start" + android:padding="@dimen/text_padding" + android:text="Drzava, grad" + android:textSize="15dp" + app:layout_constraintStart_toEndOf="@+id/imageView12" + app:layout_constraintTop_toBottomOf="@+id/tvTitle" /> + + <TextView + android:id="@+id/tvLocationType" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginEnd="16dp" + android:gravity="top|start" + android:padding="@dimen/text_padding" + android:text="Tip lokacije" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toBottomOf="@+id/tvTitle" /> + + <TextView + android:id="@+id/tvUser" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="4dp" + android:clickable="true" + android:gravity="top|start" + android:padding="@dimen/text_padding" + android:text="User" + android:textColor="#FF03DAC5" + android:textSize="20dp" + android:textStyle="bold" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/tvLocationType" /> + + <TextView + android:id="@+id/tvDatePosted" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginEnd="16dp" + android:gravity="top|start" + android:padding="@dimen/text_padding" + android:text="Timestamp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toBottomOf="@+id/tvLocationType" /> + + <LinearLayout + android:id="@+id/llTags" + android:layout_width="match_parent" + android:layout_height="20dp" + android:orientation="horizontal" app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/tvUser"></LinearLayout> + + <ImageView + android:id="@+id/ivFavourite" + android:layout_width="30dp" + android:layout_height="30dp" + android:layout_marginRight="5dp" + android:clickable="true" + android:src="@drawable/ic_baseline_favorite_border_24" + app:layout_constraintBottom_toBottomOf="@+id/tvRating" + app:layout_constraintEnd_toStartOf="@+id/tvRating" + app:layout_constraintTop_toTopOf="@+id/tvRating" /> + + <TextView + android:id="@+id/tvRating" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="24dp" + android:layout_marginEnd="4dp" + android:padding="@dimen/text_padding" + android:text="4.2" + android:textSize="15dp" + android:textStyle="bold" + app:layout_constraintEnd_toStartOf="@+id/tvNumberOfRatings" + app:layout_constraintTop_toTopOf="parent" /> + + <TextView + android:id="@+id/tvNumberOfRatings" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="24dp" + android:padding="@dimen/text_padding" + android:text="(10,500)" + android:textSize="15dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <ImageView + android:id="@+id/activitySinglePostChangeHeightUp" + android:layout_width="100dp" + android:layout_height="30dp" + android:clickable="true" + android:src="@drawable/ic_round_keyboard_arrow_up_24" + android:text="Button" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <ImageView + android:id="@+id/activitySinglePostChangeHeightDown" + android:layout_width="100dp" + android:layout_height="30dp" + android:clickable="true" + android:src="@drawable/ic_round_keyboard_arrow_down_24" + android:text="Button" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> - <FrameLayout - android:id="@+id/flSinglePostFragmentContainer" + <androidx.cardview.widget.CardView + android:id="@+id/MapDialogueMapView" + android:layout_width="match_parent" + android:layout_height="150dp" + android:layout_marginHorizontal="3dp" + + android:layout_marginTop="8dp" + android:elevation="15dp" + app:cardCornerRadius="10dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/llTags"> + + <org.osmdroid.views.MapView + android:id="@+id/MapDialogueMap" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + + </androidx.cardview.widget.CardView> + + <androidx.constraintlayout.widget.ConstraintLayout + android:id="@+id/singlePostDetail" android:layout_width="match_parent" android:layout_height="0dp" - android:paddingHorizontal="16dp" + android:layout_marginTop="8dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/btnActivitySinglePostComments" - app:layout_constraintVertical_bias="1.0"></FrameLayout> + app:layout_constraintTop_toBottomOf="@+id/MapDialogueMapView"> + + <Button + android:id="@+id/btnActivitySinglePostDescription" + android:layout_width="150dp" + android:layout_height="wrap_content" + android:layout_marginStart="8dp" + android:layout_marginTop="8dp" + android:layout_marginBottom="8dp" + android:backgroundTint="#FFFFFF" + android:stateListAnimator="@null" + android:text="opis" + android:textColor="@color/cardview_dark_background" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <Button + android:id="@+id/btnActivitySinglePostComments" + android:layout_width="150dp" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:layout_marginEnd="8dp" + android:layout_marginBottom="8dp" + android:backgroundTint="#FFFFFF" + android:stateListAnimator="@null" + android:text="Komentari" + android:textColor="@color/cardview_dark_background" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <FrameLayout + android:id="@+id/flSinglePostFragmentContainer" + android:layout_width="match_parent" + android:layout_height="0dp" + android:paddingHorizontal="5dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/divider5" + app:layout_constraintVertical_bias="1.0"></FrameLayout> + + <View + android:id="@+id/divider5" + android:layout_width="376dp" + android:layout_height="1dp" + android:background="?android:attr/listDivider" + android:elevation="10dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/btnActivitySinglePostDescription" /> + </androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout> - </androidx.constraintlayout.widget.ConstraintLayout> -</androidx.constraintlayout.widget.ConstraintLayout> + </androidx.constraintlayout.widget.ConstraintLayout> +</androidx.swiperefreshlayout.widget.SwipeRefreshLayout> 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 5c0ceb8..f6d2b69 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 @@ -6,254 +6,260 @@ android:layout_height="match_parent" tools:context=".Activities.ActivityUserProfile"> - - <androidx.constraintlayout.widget.ConstraintLayout + <androidx.swiperefreshlayout.widget.SwipeRefreshLayout android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + android:id="@+id/ProfileSwipeRefresh"> - <ImageView - android:scaleType="centerCrop" - android:id="@+id/imageView3" + <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" - android:layout_height="180dp" - android:foreground="@drawable/b3" - android:foregroundGravity="center_vertical|center|center_horizontal|fill" - android:src="@drawable/b3" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> - - - <com.google.android.material.imageview.ShapeableImageView - - android:id="@+id/tvFragmentProfileInfoContainer" - android:layout_width="0dp" - android:layout_height="199dp" - android:layout_marginStart="20dp" - android:layout_marginTop="90dp" - android:layout_marginEnd="20dp" - android:adjustViewBounds="true" - android:background="#E8FFFFFF" - android:elevation="1dp" - android:scaleType="fitEnd" - - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.0" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="@+id/imageView3" - app:shapeAppearanceOverlay="@style/imageViewRoundedEdge" /> - - - <androidx.cardview.widget.CardView - android:id="@+id/cvFragmentHomePageProfile" - android:layout_width="120dp" - android:layout_height="120dp" - android:layout_gravity="center" - android:layout_marginTop="24dp" - android:elevation="10dp" - app:cardCornerRadius="250dp" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent"> + android:layout_height="match_parent"> <ImageView - - android:id="@+id/tvActivityProfileProfilePicture" + android:scaleType="centerCrop" + android:id="@+id/imageView3" android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_height="180dp" + android:foreground="@drawable/b3" + android:foregroundGravity="center_vertical|center|center_horizontal|fill" + android:src="@drawable/b3" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + + <com.google.android.material.imageview.ShapeableImageView + + android:id="@+id/tvFragmentProfileInfoContainer" + android:layout_width="0dp" + android:layout_height="199dp" + android:layout_marginStart="20dp" + android:layout_marginTop="90dp" + android:layout_marginEnd="20dp" + android:adjustViewBounds="true" + android:background="#E8FFFFFF" + android:elevation="1dp" + android:scaleType="fitEnd" + + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.0" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="@+id/imageView3" + app:shapeAppearanceOverlay="@style/imageViewRoundedEdge" /> + + + <androidx.cardview.widget.CardView + android:id="@+id/cvFragmentHomePageProfile" + android:layout_width="120dp" + android:layout_height="120dp" + android:layout_gravity="center" + android:layout_marginTop="24dp" android:elevation="10dp" - android:scaleType="centerCrop" - android:src="@drawable/ic_baseline_person_24" - tools:ignore="ContentDescription" /> - </androidx.cardview.widget.CardView> - - <View - android:id="@+id/divider" - android:layout_width="409dp" - android:layout_height="1dp" - android:background="?android:attr/listDivider" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/buttons" /> - - <LinearLayout - android:id="@+id/buttons" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:weightSum="3" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/tvFragmentProfileInfoContainer"> - - <Button - android:layout_weight="1" - android:id="@+id/btnActivityUserProfileShowPosts" - android:layout_width="120dp" - android:layout_height="wrap_content" - android:backgroundTint="#FFFFFF" - android:stateListAnimator="@null" - android:text="Objave" - android:textColor="@color/cardview_dark_background" - /> - - <Button - android:layout_weight="1" - android:id="@+id/btnFragmentUserProfileShowData" - android:layout_width="110dp" - android:layout_height="wrap_content" - android:backgroundTint="#FFFFFF" - android:stateListAnimator="@null" - android:text="Nalog" - android:textColor="@color/cardview_dark_background" - /> - - <Button - android:id="@+id/btnFragmentUserProfileShowRecensions" - android:layout_width="120dp" - android:layout_height="wrap_content" - android:backgroundTint="#FFFFFF" - android:stateListAnimator="@null" - android:text="Recenzije" - android:textColor="@color/cardview_dark_background" - /> - </LinearLayout> - <FrameLayout - android:layout_weight="1" - android:id="@+id/flActivityProfileFragmentContainer" - android:layout_width="match_parent" - android:layout_height="0dp" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.0" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="@+id/divider" - app:layout_constraintVertical_bias="0.0"></FrameLayout> - - <TableLayout - - android:layout_width="350dp" - android:layout_height="140dp" - android:layout_marginStart="35dp" - android:layout_marginEnd="35dp" - android:elevation="1dp" - android:numColumns="3" - app:layout_constraintBottom_toBottomOf="@+id/tvFragmentProfileInfoContainer" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="@+id/tvFragmentProfileInfoContainer" - app:layout_constraintVertical_bias="0.88"> - - <TableRow - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_column="1" - > - - <TextView - android:id="@+id/tvActivityUserProfileName" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_gravity="center" - android:text="Petar Petrović" - android:textSize="23sp" - android:textStyle="bold" /> - </TableRow> + app:cardCornerRadius="250dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> + + <ImageView + android:id="@+id/tvActivityProfileProfilePicture" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:elevation="10dp" + android:scaleType="centerCrop" + android:src="@drawable/ic_baseline_person_24" + tools:ignore="ContentDescription" /> + </androidx.cardview.widget.CardView> + + <View + android:id="@+id/divider" + android:layout_width="409dp" + android:layout_height="1dp" + android:background="?android:attr/listDivider" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/buttons" /> - <TableRow - android:gravity="center" - android:layout_marginLeft="10dp" - android:layout_marginRight="10dp" - android:layout_marginTop="5dp"> <LinearLayout - android:orientation="horizontal" + android:id="@+id/buttons" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_width="wrap_content" android:weightSum="3" - > - <TextView - android:id="@+id/tvFragmentUserProfilePosts" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/tvFragmentProfileInfoContainer"> + + <Button android:layout_weight="1" - android:backgroundTint="@color/white" - android:gravity="center" - android:layout_width="110dp" + android:id="@+id/btnActivityUserProfileShowPosts" + android:layout_width="125dp" android:layout_height="wrap_content" - android:textSize="14sp" + android:backgroundTint="#FFFFFF" android:stateListAnimator="@null" - android:text="OBJAVE" - - android:textColor="#757471" /> + android:text="Objave" + android:textColor="@color/cardview_dark_background" + /> <Button - android:id="@+id/tvActivityUserProfileFollowers" - android:layout_width="110dp" - android:layout_height="27dp" - android:layout_margin="0dp" - android:backgroundTint="@color/white" - android:clickable="true" android:layout_weight="1" - android:gravity="center" - android:padding="0dp" + android:id="@+id/btnFragmentUserProfileShowData" + android:layout_width="100dp" + android:layout_height="wrap_content" + android:backgroundTint="#FFFFFF" android:stateListAnimator="@null" - android:text="PRATIOCI" - android:textColor="#757471" - android:textSize="14sp" - tools:ignore="TouchTargetSizeCheck" /> + android:text="Mapa" + android:textColor="@color/cardview_dark_background" + /> <Button - android:textSize="14sp" - android:id="@+id/tvActivityUserProfileFollow" - android:layout_width="110dp" - android:layout_height="27dp" - android:layout_margin="0dp" - android:backgroundTint="@color/white" - android:clickable="true" - android:layout_weight="1" - android:gravity="center" - android:padding="0dp" + android:id="@+id/btnFragmentUserProfileShowRecensions" + android:layout_width="125dp" + android:layout_height="wrap_content" + android:backgroundTint="#FFFFFF" android:stateListAnimator="@null" - android:text="PRAĆENJA" - android:textColor="#757471" - tools:ignore="TouchTargetSizeCheck" /> + android:text="Statistika" + android:textColor="@color/cardview_dark_background" + /> </LinearLayout> + <FrameLayout + android:layout_weight="1" + android:id="@+id/flActivityProfileFragmentContainer" + android:layout_width="match_parent" + android:layout_height="0dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.0" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="@+id/divider" + app:layout_constraintVertical_bias="0.0"></FrameLayout> + + <TableLayout + + android:layout_width="350dp" + android:layout_height="140dp" + android:layout_marginStart="35dp" + android:layout_marginEnd="35dp" + android:elevation="1dp" + android:numColumns="3" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/cvFragmentHomePageProfile" + app:layout_constraintVertical_bias="0.88"> + + <TableRow + android:layout_width="match_parent" + android:layout_height="match_parent" + android:gravity="center_horizontal" + android:layout_column="1" + > + + <TextView + android:id="@+id/tvActivityUserProfileName" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_gravity="center" + android:text="Petar Petrović" + android:textSize="23sp" + android:textStyle="bold" /> + </TableRow> - </TableRow> - - <TableRow - android:layout_marginLeft="10dp" - android:layout_marginRight="10dp" - android:layout_gravity="center" - android:layout_height="wrap_content"> - <LinearLayout> - <TextView - android:id="@+id/tvActivityUserProfilePostsNo" - android:layout_width="110dp" - android:layout_height="wrap_content" - android:gravity="center" - android:text="156" - - android:textSize="20dp" - android:textStyle="bold" /> - - <TextView - android:layout_width="110dp" - android:layout_height="wrap_content" - android:id="@+id/tvActivityUserProfileFollowersNo" - android:gravity="center" - android:text="50" - android:textSize="20dp" - android:textStyle="bold" /> - <TextView - android:id="@+id/tvActivityUserProfileFollowNo" - android:layout_width="110dp" - android:layout_height="wrap_content" + <TableRow android:gravity="center" - android:text="40" - android:textSize="20dp" - android:textStyle="bold" /> - </LinearLayout> - </TableRow> + android:layout_marginLeft="10dp" + android:layout_marginRight="10dp" + android:layout_marginTop="5dp"> + <LinearLayout + android:orientation="horizontal" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:weightSum="3" + > + <TextView + android:id="@+id/tvFragmentUserProfilePosts" + android:layout_weight="1" + android:backgroundTint="@color/white" + android:gravity="center" + android:layout_width="110dp" + android:layout_height="wrap_content" + android:textSize="14sp" + android:stateListAnimator="@null" + android:text="OBJAVE" + + android:textColor="#757471" /> + + <Button + android:id="@+id/tvActivityUserProfileFollowers" + android:layout_width="110dp" + android:layout_height="27dp" + android:layout_margin="0dp" + android:backgroundTint="@color/white" + android:clickable="true" + android:layout_weight="1" + android:gravity="center" + android:padding="0dp" + android:stateListAnimator="@null" + android:text="PRATIOCI" + android:textColor="#757471" + android:textSize="14sp" + tools:ignore="TouchTargetSizeCheck" /> + + <Button + android:textSize="14sp" + android:id="@+id/tvActivityUserProfileFollow" + android:layout_width="110dp" + android:layout_height="27dp" + android:layout_margin="0dp" + android:backgroundTint="@color/white" + android:clickable="true" + android:layout_weight="1" + android:gravity="center" + android:padding="0dp" + android:stateListAnimator="@null" + android:text="PRATI" + android:textColor="#757471" + tools:ignore="TouchTargetSizeCheck" /> + </LinearLayout> + + </TableRow> + + <TableRow + android:layout_marginLeft="10dp" + android:layout_marginRight="10dp" + android:layout_gravity="center" + android:layout_height="wrap_content"> + <LinearLayout> + <TextView + android:id="@+id/tvActivityUserProfilePostsNo" + android:layout_width="110dp" + android:layout_height="wrap_content" + android:gravity="center" + android:text="156" + + android:textSize="20dp" + android:textStyle="bold" /> + + <TextView + android:clickable="true" + android:layout_width="110dp" + android:layout_height="wrap_content" + android:id="@+id/tvActivityUserProfileFollowersNo" + android:gravity="center" + android:text="50" + android:textSize="20dp" + android:textStyle="bold" /> + + <TextView + android:clickable="true" + android:id="@+id/tvActivityUserProfileFollowNo" + android:layout_width="110dp" + android:layout_height="wrap_content" + android:gravity="center" + android:text="40" + android:textSize="20dp" + android:textStyle="bold" /> + </LinearLayout> + </TableRow> @@ -263,7 +269,9 @@ android:layout_marginTop="10dp" android:layout_marginStart="10dp" android:layout_marginEnd="10dp" - android:layout_gravity="center"> + android:layout_gravity="center" + android:id="@+id/clActivityUserProfileFollow_Chat_Row" + android:visibility="gone"> <Button @@ -319,9 +327,11 @@ tools:ignore="SpeakableTextPresentCheck,TouchTargetSizeCheck" /> </androidx.constraintlayout.widget.ConstraintLayout> - </TableLayout> + </TableLayout> + + </androidx.constraintlayout.widget.ConstraintLayout> + </androidx.swiperefreshlayout.widget.SwipeRefreshLayout> - </androidx.constraintlayout.widget.ConstraintLayout> </FrameLayout>
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/bottom_sheet_add_new_post.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/bottom_sheet_add_new_post.xml index 10aa669..2fcf6dd 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/bottom_sheet_add_new_post.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/bottom_sheet_add_new_post.xml @@ -1,63 +1,55 @@ <?xml version="1.0" encoding="utf-8"?> -<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" +<com.google.android.material.circularreveal.CircularRevealLinearLayout 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:id="@+id/bottomSheetAddNewForNav" android:layout_width="match_parent" android:layout_height="wrap_content" -> + android:orientation="vertical" + android:background="@drawable/view_top_corner_radius"> + + <TextView android:id="@+id/textView6" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="16dp" + android:layout_gravity="center" + android:layout_marginTop="10dp" android:fontFamily="sans-serif-black" android:text="Dodaj novu objavu" android:textSize="20sp" + app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> - <ImageButton + <Button android:id="@+id/btnBottomSheetAddNewPostOpenAddPost" - android:layout_width="0dp" - android:layout_height="60dp" - android:layout_marginStart="30dp" - - android:layout_marginTop="16dp" - android:layout_marginEnd="40dp" - android:layout_marginBottom="24dp" - android:background="@drawable/button_choose_from_gallery" + style="@style/clean_button_margin" + android:layout_width="match_parent" + android:layout_marginTop="20dp" + android:gravity="left|center_vertical" + android:drawableLeft="@drawable/ic_outline_add_photo_alternate_24" + android:text="Izaberi fotografije iz galerije" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/btnBottomSheetAddNewPostOpenCapturePost" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/textView6" app:layout_constraintVertical_bias="0.0" /> - <ImageButton + <Button android:id="@+id/btnBottomSheetAddNewPostOpenCapturePost" - - android:layout_width="0dp" - android:layout_height="60dp" - android:layout_marginTop="16dp" - android:layout_marginEnd="30dp" - android:layout_marginBottom="24dp" - android:background="@drawable/button_capture" + style="@style/clean_button_margin" + android:layout_width="match_parent" + android:drawableLeft="@drawable/ic_outline_add_a_photo_24" +android:layout_marginBottom="16dp" + android:text="Fotografiši" + android:gravity="left|center_vertical" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="1.0" - app:layout_constraintStart_toEndOf="@+id/btnBottomSheetAddNewPostOpenAddPost" - app:layout_constraintTop_toBottomOf="@+id/textView6" - app:layout_constraintVertical_bias="1.0" /> - - <ImageButton - android:id="@+id/btnBottomSheetAddNewPostClose" - android:layout_width="65dp" - android:layout_height="17dp" - app:cornerRadius="50dp" - app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toBottomOf="@+id/btnBottomSheetAddNewPostOpenAddPost" + app:shapeAppearance="@style/imageViewRoundedEdge" /> -</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file +</com.google.android.material.circularreveal.CircularRevealLinearLayout>
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/bottom_sheet_filter.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/bottom_sheet_filter.xml index 249c654..85915f0 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/bottom_sheet_filter.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/bottom_sheet_filter.xml @@ -17,7 +17,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> - <TextView + <!-- <TextView android:id="@+id/textView8" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -32,8 +32,8 @@ app:layout_constraintTop_toBottomOf="@+id/textView7" /> <EditText - android:id="@+id/dateFromBSF" - android:layout_width="140dp" + android:id="@+id/filterDateFrom" + android:layout_width="150dp" android:layout_height="48dp" android:layout_marginStart="8dp" android:layout_marginTop="8dp" @@ -43,105 +43,294 @@ app:layout_constraintTop_toBottomOf="@+id/textView8" tools:ignore="SpeakableTextPresentCheck" /> + <TextView + android:id="@+id/textView9" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="16dp" + android:layout_marginTop="20dp" + android:text="Od:" + app:layout_constraintStart_toStartOf="parent" + app:layout_constrain_toBottomOf="@+id/textView8" /> + + <TextView + android:id="@+id/textView10" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="20dp" + android:layout_marginEnd="8dp" + android:text="Do:" + app:layout_constraintEnd_toStartOf="@+id/filterDateTo" + app:layout_constraintTop_toBottomOf="@+id/textView8" /> + + <EditText + android:id="@+id/filterDateTo" + android:layout_width="150dp" + android:layout_height="48dp" + android:layout_marginTop="8dp" + android:layout_marginEnd="16dp" + android:ems="10" + android:inputType="date" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toBottomOf="@+id/textView8" + tools:ignore="SpeakableTextPresentCheck" />--> + + <RadioGroup + android:id="@+id/radioGroupFilter" + android:layout_width="match_parent" + android:layout_height="wrap_content" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="1.0" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/textView8"> + + <RadioButton + android:id="@+id/filterLastweek" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="16dp" + android:layout_marginTop="12dp" + android:text="Prethodna nedelja" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.0" + app:layout_constraintStart_toStartOf="parent" /> + + <RadioButton + android:id="@+id/filterLastMonth" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="16dp" + android:text="Prethodni mesec" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/radioButton" /> + + <RadioButton + android:id="@+id/filterLastThreeMonths" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="16dp" + android:text="Prethodna tri meseca" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintTop_toBottomOf="@+id/radioButton4" /> + + + <RadioButton + android:id="@+id/filterLastYear" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="16dp" + android:text="Prethodna godina" + app:layout_constraintTop_toBottomOf="@+id/radioButton3" + tools:layout_editor_absoluteX="16dp" /> + + </RadioGroup> + <TextView - android:id="@+id/textView9" + android:id="@+id/textView15" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="16dp" - android:layout_marginTop="20dp" - android:text="@string/od" + android:text="Rejting" + android:textSize="17sp" + android:textStyle="bold" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/textView8" /> + app:layout_constraintTop_toBottomOf="@+id/radioGroupFilter" /> <TextView - android:id="@+id/textView10" + android:id="@+id/ratingFromtxt" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginStart="16dp" + android:layout_marginTop="20dp" + android:text="Od:" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/textView15" /> + + <TextView + android:id="@+id/ratingTotxt" + android:layout_width="wrap_content" + android:layout_height="19dp" android:layout_marginTop="20dp" android:layout_marginEnd="8dp" - android:text="Do" - app:layout_constraintEnd_toStartOf="@+id/dateToBSF" - app:layout_constraintTop_toBottomOf="@+id/textView8" /> + android:text="Do:" + app:layout_constraintEnd_toStartOf="@+id/filterRatingTo" + app:layout_constraintTop_toBottomOf="@+id/textView15" /> - <EditText - android:id="@+id/dateToBSF" - android:layout_width="140dp" - android:layout_height="48dp" + <!-- <View + android:id="@+id/divider2" + android:layout_width="409dp" + android:layout_height="1dp" + android:background="?android:attr/listDivider" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/filterDateFrom" /> +--> + <View + android:id="@+id/divider4" + android:layout_width="409dp" + android:layout_height="1dp" + android:background="?android:attr/listDivider" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.0" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/filterViewsFrom" /> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:layout_marginEnd="16dp" + android:layout_marginBottom="16dp" + android:orientation="horizontal" + android:weightSum="1" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.0" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/divider4" + app:layout_constraintVertical_bias="1.0"> + + <Button + android:id="@+id/btnBSFFilter" + android:layout_width="10dp" + android:layout_height="39dp" + android:layout_marginHorizontal="10dp" + android:layout_marginTop="16dp" + android:layout_weight="1" + android:background="@drawable/view_corner_radius" + android:text="Primeni" + + tools:ignore="TouchTargetSizeCheck" /> + + </LinearLayout> + + <EditText + android:id="@+id/filterRatingFrom" + android:layout_width="111dp" + android:layout_height="51dp" + android:layout_marginStart="8dp" android:ems="10" - android:inputType="date" + android:inputType="number" + app:layout_constraintStart_toEndOf="@+id/ratingFromtxt" + app:layout_constraintTop_toBottomOf="@+id/textView15" /> + + <ImageView + android:id="@+id/imageView18" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="16dp" + android:layout_marginTop="20dp" + app:layout_constraintStart_toEndOf="@+id/filterRatingFrom" + app:layout_constraintTop_toBottomOf="@+id/textView15" + app:srcCompat="@drawable/ic_baseline_star_rate_24" /> + + + <EditText + android:id="@+id/filterRatingTo" + android:layout_width="111dp" + android:layout_height="51dp" + android:layout_marginEnd="12dp" + android:ems="10" + android:inputType="number" + app:layout_constraintEnd_toStartOf="@+id/imageView19" + app:layout_constraintTop_toBottomOf="@+id/textView15" /> + + <ImageView + android:id="@+id/imageView19" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="20dp" + android:layout_marginEnd="20dp" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toBottomOf="@+id/textView8" - tools:ignore="SpeakableTextPresentCheck" /> + app:layout_constraintTop_toBottomOf="@+id/textView15" + app:srcCompat="@drawable/ic_baseline_star_rate_24" /> <TextView - android:id="@+id/textView11" + android:id="@+id/textView20" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="16dp" - android:layout_marginTop="16dp" - android:text="Lokacija" + android:layout_marginStart="17dp" + android:layout_marginTop="8dp" + android:layout_marginEnd="292dp" + android:text="Broj pregleda" android:textSize="17sp" android:textStyle="bold" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/divider8" /> + + <TextView + android:id="@+id/viewsFromtxt" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="16dp" + android:layout_marginTop="20dp" + android:text="Od:" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/divider2" /> + app:layout_constraintTop_toBottomOf="@+id/textView20" /> + + <TextView + android:id="@+id/viewsTotxt" + android:layout_width="wrap_content" + android:layout_height="19dp" + android:layout_marginTop="20dp" + android:layout_marginEnd="5dp" + android:text="Do:" + app:layout_constraintEnd_toStartOf="@+id/filterViewsTo" + app:layout_constraintTop_toBottomOf="@+id/textView20" /> <View - android:id="@+id/divider2" + android:id="@+id/divider8" android:layout_width="409dp" android:layout_height="1dp" android:background="?android:attr/listDivider" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/dateFromBSF" /> + app:layout_constraintTop_toBottomOf="@+id/filterRatingFrom" /> <EditText - android:id="@+id/locationBSF" - android:layout_width="0dp" + android:id="@+id/filterViewsFrom" + android:layout_width="150dp" android:layout_height="wrap_content" - android:layout_marginStart="16dp" - android:layout_marginTop="8dp" - android:layout_marginEnd="24dp" + android:layout_marginStart="8dp" + android:layout_marginTop="5dp" android:ems="10" - android:inputType="textPersonName" - app:layout_constraintEnd_toStartOf="@+id/imageView8" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/textView11" - tools:ignore="TouchTargetSizeCheck,SpeakableTextPresentCheck" /> + android:inputType="number" + app:layout_constraintStart_toEndOf="@+id/viewsFromtxt" + app:layout_constraintTop_toBottomOf="@+id/textView20" /> - <ImageView - android:id="@+id/imageView8" - android:layout_width="50dp" - android:layout_height="40dp" - android:layout_marginTop="8dp" - android:layout_marginEnd="16dp" + <EditText + android:id="@+id/filterViewsTo" + android:layout_width="150dp" + android:layout_height="wrap_content" + android:layout_marginTop="5dp" + android:layout_marginEnd="12dp" + android:ems="10" + android:inputType="number" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toBottomOf="@+id/textView11" - app:srcCompat="@drawable/button_find_on_map" /> + app:layout_constraintTop_toBottomOf="@+id/textView20" /> + + <TextView + android:id="@+id/textView8" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:text="Datum" + android:textSize="17sp" + android:textStyle="bold" + android:layout_marginStart="16dp" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/textView7" /> <View - android:id="@+id/divider4" - android:layout_width="409dp" + android:id="@+id/divider2" + android:layout_width="match_parent" android:layout_height="1dp" android:background="?android:attr/listDivider" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/locationBSF" /> + app:layout_constraintTop_toBottomOf="@+id/radioGroupFilter" /> - <Button - android:id="@+id/btnBSFFilter" - android:layout_width="169dp" - android:layout_height="39dp" - android:layout_marginTop="16dp" - android:layout_marginBottom="24dp" - android:background="@drawable/rounded_cyan_button" - android:text="Primeni" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/divider4" - app:layout_constraintVertical_bias="1.0" - tools:ignore="TouchTargetSizeCheck" /> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/bottom_sheet_sort.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/bottom_sheet_sort.xml index fb06308..72fac70 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/bottom_sheet_sort.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/bottom_sheet_sort.xml @@ -6,6 +6,7 @@ android:layout_height="wrap_content"> <RadioGroup + android:id="@+id/radioGroup" android:layout_width="match_parent" android:layout_height="wrap_content" app:layout_constraintEnd_toEndOf="parent" @@ -13,7 +14,7 @@ app:layout_constraintTop_toBottomOf="@+id/textView12"> <RadioButton - android:id="@+id/radioButton" + android:id="@+id/sortLatest" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="16dp" @@ -21,38 +22,56 @@ android:text="Najnovije" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" - app:layout_constraintStart_toStartOf="parent" - /> + app:layout_constraintStart_toStartOf="parent" /> <RadioButton - android:id="@+id/radioButton2" + android:id="@+id/sortOldest" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="16dp" - android:text="Najbolje ocenjeno" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintTop_toBottomOf="@+id/radioButton4" /> + android:text="Najstarije" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/radioButton" /> <RadioButton - android:id="@+id/radioButton3" + android:id="@+id/sortBest" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="16dp" - android:text="Najstarije" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/radioButton" /> + android:text="Najbolje ocenjeno" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintTop_toBottomOf="@+id/radioButton4" /> + <RadioButton - android:id="@+id/radioButton4" + android:id="@+id/sortMostViewed" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="16dp" - android:text="Najviše pregleda" app:layout_constraintTop_toBottomOf="@+id/radioButton3" tools:layout_editor_absoluteX="16dp" /> + </RadioGroup> + <Button + android:id="@+id/btnSortPosts" + android:layout_width="match_parent" + android:layout_height="39dp" + android:layout_marginHorizontal="10dp" + android:layout_marginTop="16dp" + android:layout_marginBottom="16dp" + android:layout_weight="1" + android:background="@drawable/view_corner_radius" + android:text="Primeni" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="1.0" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/radioGroup" + app:layout_constraintVertical_bias="0.0" + tools:ignore="TouchTargetSizeCheck" /> + <TextView android:id="@+id/textView12" android:layout_width="wrap_content" diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/chat_message.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/chat_message.xml index f7ef08c..0642a58 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/chat_message.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/chat_message.xml @@ -24,7 +24,7 @@ android:id="@+id/cvContainer" android:layout_width="wrap_content" android:minWidth="40dp" - android:layout_height="30dp" + android:layout_height="wrap_content" android:layout_marginBottom="10dp" android:layout_marginLeft="10dp" android:backgroundTint="@color/unfollow" @@ -38,10 +38,12 @@ android:id="@+id/tvMessage" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:maxLines="50" + android:maxWidth="300dp" android:backgroundTint="@color/unfollow" android:padding="5dp" android:paddingHorizontal="15dp" - android:text="blabla" + app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" /> </androidx.cardview.widget.CardView> diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/chat_message_other.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/chat_message_other.xml index b076cf8..a396f07 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/chat_message_other.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/chat_message_other.xml @@ -23,10 +23,10 @@ android:id="@+id/cvContainer" android:layout_width="wrap_content" android:minWidth="40dp" - android:layout_height="30dp" + android:layout_height="wrap_content" android:layout_marginBottom="10dp" android:layout_marginLeft="10dp" - android:backgroundTint="#eef1f6" + android:backgroundTint="@color/purple_500" android:background="@drawable/view_corner_radius" app:cardCornerRadius="15dp" app:layout_constraintStart_toStartOf="parent" @@ -37,10 +37,12 @@ android:id="@+id/tvMessage" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:backgroundTint="#eef1f6" + android:maxLines="50" + android:maxWidth="300dp" + android:textColor="@color/white" android:padding="5dp" android:paddingHorizontal="15dp" - android:text="blabla" + app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" /> </androidx.cardview.widget.CardView> diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/chat_preview.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/chat_preview.xml index c995b4b..694cabe 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/chat_preview.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/chat_preview.xml @@ -8,6 +8,8 @@ android:layout_width="5dp" android:id="@+id/readIndicator" android:layout_height="5dp" + android:background="@drawable/rounded_picture_background" + android:backgroundTint="@null" android:layout_gravity="center_vertical"/> <ImageView android:id="@+id/ivUserImage" @@ -40,15 +42,23 @@ android:textSize="@dimen/header2_size" android:textColor="@color/unfollow"/> </androidx.appcompat.widget.LinearLayoutCompat> + <androidx.constraintlayout.widget.ConstraintLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_marginEnd="10dp"> <TextView - android:layout_width="match_parent" + android:layout_width="0dp" android:layout_height="wrap_content" android:id="@+id/tvLastMessage" - android:text="hej, sta ima novo?" + android:maxLines="1" + android:ellipsize="end" android:layout_weight="1" android:gravity="center_vertical" android:textAlignment="gravity" android:textSize="@dimen/header2_size" - android:textColor="@color/unfollow"/> + android:textColor="@color/unfollow" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toEndOf="parent"/> + </androidx.constraintlayout.widget.ConstraintLayout> </androidx.appcompat.widget.LinearLayoutCompat> </androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/follower_item.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/follower_item.xml index d0c6a2d..b295b43 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/follower_item.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/follower_item.xml @@ -20,8 +20,8 @@ <androidx.cardview.widget.CardView android:id="@+id/cvFragmentHomePageProfile" - android:layout_width="80dp" - android:layout_height="80dp" + android:layout_width="70dp" + android:layout_height="70dp" android:layout_gravity="center" android:elevation="10dp" @@ -47,11 +47,11 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="15dp" android:layout_marginStart="24dp" - android:layout_marginTop="28dp" + android:layout_marginTop="20dp" android:text="Petar Petrovic" android:textSize="17sp" android:textStyle="bold" - app:layout_constraintEnd_toStartOf="@+id/materialButton" + app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toEndOf="@+id/cvFragmentHomePageProfile" app:layout_constraintTop_toTopOf="parent"> @@ -63,27 +63,12 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="Petar Petrovic" + android:layout_marginStart="24dp" android:textSize="15sp" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toStartOf="@+id/materialButton" - app:layout_constraintHorizontal_bias="0.597" - app:layout_constraintStart_toStartOf="parent" + app:layout_constraintStart_toEndOf="@id/cvFragmentHomePageProfile" app:layout_constraintTop_toBottomOf="@+id/tvFollowerItemName" app:layout_constraintVertical_bias="0.0" /> - <ImageButton - - android:id="@+id/materialButton" - android:layout_width="101dp" - android:layout_height="39dp" - android:layout_marginEnd="16dp" - android:background="@drawable/rounded_transparent_button" - android:foreground="@drawable/button_follow" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toTopOf="parent" - app:layout_constraintVertical_bias="0.508" - tools:ignore="TouchTargetSizeCheck" /> - </androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file 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 9e6dd9d..911b2b9 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_browse.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_browse.xml @@ -18,17 +18,18 @@ /> - <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_marginEnd="16dp" android:layout_marginBottom="80dp" + android:backgroundTint="#FFFFFF" android:clickable="true" android:focusable="true" android:tint="#FFFFFF" + android:elevation="10dp" app:layout_constraintBottom_toBottomOf="@+id/FragmentBrowseMapView" app:layout_constraintEnd_toEndOf="parent" app:rippleColor="#FFFFFF" @@ -52,7 +53,7 @@ android:id="@+id/FragmentBrowseSearchBar" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@drawable/rounded_white_button_login" + android:backgroundTint="@color/white" android:hint=" Pretraga" android:inputType="textPersonName" android:paddingLeft="15dp" /> diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_followers.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_followers.xml index 6092e01..073cd91 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_followers.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_followers.xml @@ -31,7 +31,8 @@ <androidx.recyclerview.widget.RecyclerView android:id="@+id/rvFragmentShowFollowers" android:layout_width="match_parent" - android:layout_height="match_parent" /> + android:layout_height="match_parent" + android:orientation="vertical"/> </LinearLayout> </FrameLayout>
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_following.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_following.xml index 424094f..a673bd5 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_following.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_following.xml @@ -31,7 +31,8 @@ <androidx.recyclerview.widget.RecyclerView android:id="@+id/rvFragmentShowFollowing" android:layout_width="match_parent" - android:layout_height="match_parent" /> + android:layout_height="match_parent" + android:orientation="vertical"/> </LinearLayout> </FrameLayout>
\ 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 index 12c37e8..889b5b2 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_home_page.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_home_page.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="#f6f6f6" + android:background="#FFFCFCFC" tools:context=".Fragments.FragmentHomePage"> <TextView @@ -48,6 +48,7 @@ android:layout_width="50dp" android:layout_height="50dp" android:scaleType="centerCrop" + android:clickable="true" android:src="@drawable/ic_baseline_person_24" tools:ignore="ContentDescription" tools:layout_editor_absoluteX="9dp" @@ -73,7 +74,7 @@ android:layout_width="0dp" android:layout_height="40dp" android:layout_marginStart="16dp" - android:layout_marginTop="45dp" + android:layout_marginTop="35dp" android:layout_marginEnd="16dp" android:elevation="0dp" app:cardCornerRadius="20dp" @@ -111,7 +112,7 @@ android:layout_height="40dp" android:layout_marginTop="8dp" android:clickable="true" - android:src="@drawable/ic_baseline_arrow_back_24" + android:src="@drawable/ic_baseline_arrow_back" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/cvFragmentHomePageSearch" /> @@ -119,7 +120,6 @@ android:id="@+id/flFragmentHomePageMainContent" android:layout_width="match_parent" android:layout_height="0dp" - android:layout_marginBottom="8dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" 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 index 07d34a3..3666635 100644 --- 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 @@ -1,240 +1,233 @@ <?xml version="1.0" encoding="utf-8"?> -<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" +<androidx.swiperefreshlayout.widget.SwipeRefreshLayout 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" + tools:context=".Fragments.FragmentHomePageMainScroll" android:layout_width="match_parent" android:layout_height="match_parent" - xmlns:app="http://schemas.android.com/apk/res-auto" - tools:context=".Fragments.FragmentHomePageMainScroll"> - -<LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical"> - - - <androidx.cardview.widget.CardView - android:backgroundTint="#f6f6f6" - android:layout_marginStart="10dp" - android:layout_marginEnd="16dp" -app:cardElevation="0dp" - android:id="@+id/cvFragmentHomePageText2" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:stateListAnimator="@null" - android:elevation="0dp" - android:layout_marginTop="16dp"> - - <TextView - android:id="@+id/tvFragmentHomePageNewest" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_gravity="left" - android:text="Najnovije" - android:clickable="true" - 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:layout_marginStart="16dp" - android:layout_marginEnd="16dp" - android:id="@+id/rvFragmentHomePageNewest" - android:layout_marginBottom="20dp" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> - - <HorizontalScrollView - android:layout_marginStart="16dp" - android:layout_marginEnd="16dp" - android:id="@+id/hsvFragmentHomePageLocationButtonScroll" - android:layout_width="match_parent" - android:layout_height="wrap_content" + android:id="@+id/swipeContainer"> - > + <ScrollView - <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> - <LinearLayout android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal"> + android:layout_height="match_parent"> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical"> -<LinearLayout - android:orientation="vertical" - android:id="@+id/ll1" - android:layout_width="match_parent" - android:layout_height="wrap_content"> - <androidx.cardview.widget.CardView - android:backgroundTint="#f6f6f6" - android:layout_marginTop="16dp" - android:id="@+id/cvFragmentHomePageText1" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginStart="16dp" - android:layout_marginEnd="16dp" - android:elevation="0dp" - app:cardElevation="0dp" - > - - <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_marginStart="16dp" - android:layout_marginEnd="16dp" - android:layout_marginBottom="16dp" /> - - </LinearLayout> - <LinearLayout - android:id="@+id/ll2" - - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="wrap_content"> - <androidx.cardview.widget.CardView - android:backgroundTint="#f6f6f6" -app:cardElevation="0dp" - android:layout_marginStart="16dp" - android:layout_marginEnd="16dp" - 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="Najbolje ocenjeno" - 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:layout_marginStart="16dp" - android:layout_marginEnd="16dp" - android:id="@+id/rvFragmentHomePageBestRated" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> - -</LinearLayout></LinearLayout> -</LinearLayout> -</LinearLayout> -</ScrollView>
\ No newline at end of file + <androidx.cardview.widget.CardView + android:id="@+id/cvFragmentHomePageText2" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginStart="16dp" + android:layout_marginTop="16dp" + android:layout_marginEnd="16dp" + android:layout_marginBottom="5dp" + android:backgroundTint="#FFFCFCFC" + android:elevation="0dp" + android:stateListAnimator="@null" + app:cardElevation="0dp"> + + <TextView + android:id="@+id/tvFragmentHomePageNewest" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_gravity="left" + android:clickable="true" + android:text="Najnovije" + android:textSize="16dp" + android:textStyle="bold" /> + + + </androidx.cardview.widget.CardView> + + <androidx.recyclerview.widget.RecyclerView + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" + android:id="@+id/rvFragmentHomePageNewest" + android:layout_marginBottom="20dp" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + + <HorizontalScrollView + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" + 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> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical"> + <LinearLayout + android:orientation="vertical" + android:id="@+id/ll1" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <androidx.cardview.widget.CardView + android:id="@+id/cvFragmentHomePageText1" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginStart="16dp" + android:layout_marginTop="16dp" + android:layout_marginEnd="16dp" + android:backgroundTint="#FFFCFCFC" + android:elevation="0dp" + android:layout_marginBottom="5dp" + + app:cardElevation="0dp"> + + <TextView + android:id="@+id/tvFragmentHomePagePopular" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_gravity="left" + android:text="Popularno" + android:textSize="16dp" + android:textStyle="bold" /> + + + </androidx.cardview.widget.CardView> + + <androidx.recyclerview.widget.RecyclerView + android:id="@+id/rvFragmentHomePagePopular" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" + android:layout_marginBottom="8dp" /> + + </LinearLayout> + <LinearLayout + android:id="@+id/ll2" + + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <androidx.cardview.widget.CardView + android:layout_marginBottom="5dp" + + android:id="@+id/cvFragmentHomePageText3" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginStart="16dp" + android:layout_marginTop="16dp" + android:layout_marginEnd="16dp" + android:backgroundTint="#FFFCFCFC" + app:cardElevation="0dp"> + + <TextView + android:id="@+id/tvFragmentHomePageBestRated" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="left" + android:text="Najbolje ocenjeno" + android:textStyle="bold" /> + + + </androidx.cardview.widget.CardView> + + <androidx.recyclerview.widget.RecyclerView + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" + android:id="@+id/rvFragmentHomePageBestRated" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + + </LinearLayout></LinearLayout> + </LinearLayout> + </LinearLayout> + </ScrollView> +</androidx.swiperefreshlayout.widget.SwipeRefreshLayout> diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_login.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_login.xml index c45051b..8db797c 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_login.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_login.xml @@ -54,6 +54,7 @@ android:layout_marginTop="0dp" android:ems="10" android:hint="*********" + android:nextFocusDown="@+id/btnFragmentLoginLogin" android:inputType="textPassword" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="1.0" diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_my_profile_info.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_my_profile_info.xml index eaf014d..eee59aa 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_my_profile_info.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_my_profile_info.xml @@ -6,7 +6,9 @@ android:layout_height="match_parent" android:orientation="vertical" tools:context=".Fragments.FragmentMyProfileInfo"> - +<ScrollView + android:layout_width="match_parent" + android:layout_height="match_parent"> <LinearLayout android:layout_width="match_parent" android:layout_height="0dp" @@ -46,6 +48,7 @@ android:drawableLeft="@drawable/ic_outline_share_24" android:text="Pozovite prijatelje" /> </LinearLayout> +</ScrollView> <Button android:id="@+id/buttonLogOut" @@ -55,7 +58,7 @@ android:layout_gravity="bottom" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" - android:layout_marginBottom="16dp" + android:layout_marginBottom="0dp" android:drawableLeft="@drawable/ic_baseline_logout_24" android:text="Izlogujte se" android:drawableTint="@color/white" diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_my_recensions.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_my_recensions.xml index 72706e0..76690e9 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_my_recensions.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_my_recensions.xml @@ -23,6 +23,8 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/materialDivider" - android:layout_marginHorizontal="16dp"/> + android:layout_marginHorizontal="16dp" + android:paddingBottom="50dp"/> + </androidx.constraintlayout.widget.ConstraintLayout>
\ 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 8fe6ee6..b5988e0 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_profile.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_profile.xml @@ -6,314 +6,324 @@ android:layout_height="match_parent" tools:context=".Fragments.FragmentProfile"> - - <androidx.constraintlayout.widget.ConstraintLayout + <androidx.swiperefreshlayout.widget.SwipeRefreshLayout android:layout_width="match_parent" - android:layout_height="match_parent"> - - <ImageView - - android:id="@+id/imageView3" - android:layout_width="match_parent" - android:layout_height="190dp" - android:foreground="@drawable/b3" - android:foregroundGravity="center_vertical|center|center_horizontal|fill" - android:src="@drawable/b3" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> - - <ImageView + android:layout_height="match_parent" + android:id="@+id/ProfileSwipeRefresh"> - android:id="@+id/imageView4" + <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" - android:layout_height="190dp" - app:layout_constraintBottom_toBottomOf="@+id/imageView3" - app:layout_constraintEnd_toEndOf="@id/imageView3" - app:layout_constraintHorizontal_bias="0.0" - app:layout_constraintStart_toStartOf="@+id/imageView3" - app:layout_constraintTop_toTopOf="@+id/imageView3" - app:layout_constraintVertical_bias="0.0" /> - - <com.google.android.material.imageview.ShapeableImageView - - android:id="@+id/tvFragmentProfileInfoContainer" - android:layout_width="0dp" - android:layout_height="199dp" - android:layout_marginStart="20dp" - android:layout_marginTop="90dp" - android:layout_marginEnd="20dp" - android:adjustViewBounds="true" - android:background="#E8FFFFFF" - android:elevation="1dp" - android:scaleType="fitEnd" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.494" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="@+id/imageView3" - app:shapeAppearanceOverlay="@style/imageViewRoundedEdge" /> - - - <androidx.cardview.widget.CardView - android:id="@+id/cvFragmentHomePageProfile" - android:layout_width="120dp" - android:layout_height="120dp" - android:layout_gravity="center" - android:elevation="10dp" - app:cardCornerRadius="250dp" - app:layout_constraintBottom_toTopOf="@+id/tableLayout" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.498" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - app:layout_constraintVertical_bias="0.65999997"> + android:layout_height="match_parent"> <ImageView - android:id="@+id/tvFragmentProfileProfilePicture" - android:layout_width="120dp" - android:layout_height="120dp" - android:elevation="20dp" - 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" - android:layout_width="0dp" - android:layout_height="120dp" - android:elevation="20dp" - android:gravity="center" - android:stretchColumns="1" - app:layout_constraintBottom_toBottomOf="@+id/tvFragmentProfileInfoContainer" - app:layout_constraintEnd_toEndOf="@+id/tvFragmentProfileInfoContainer" - app:layout_constraintHorizontal_bias="0.488" - app:layout_constraintStart_toStartOf="@+id/tvFragmentProfileInfoContainer" - app:layout_constraintTop_toTopOf="@+id/tvFragmentProfileInfoContainer" - app:layout_constraintVertical_bias="0.87"> - - <TableRow - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:gravity="center"> - - <TextView - android:id="@+id/tvFragmentProfileName" - android:textSize="23sp" - android:textStyle="bold" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:gravity="center" - android:layout_marginBottom="10dp" - android:text="Petar Petrović" /> - </TableRow> - - <TableRow - android:layout_width="fill_parent" - android:layout_height="wrap_content" - - android:gravity="center"> + android:id="@+id/imageView3" + android:layout_width="match_parent" + android:layout_height="190dp" + android:foreground="@drawable/b3" + android:foregroundGravity="center_vertical|center|center_horizontal|fill" + android:src="@drawable/b3" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - <TextView - android:id="@+id/tvFragmentProfileUserName" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:gravity="center" - android:text="PetarP" - android:textSize="17sp" /> - </TableRow> + <ImageView - <TableRow + android:id="@+id/imageView4" android:layout_width="match_parent" - android:layout_height="100dp"> + android:layout_height="190dp" + app:layout_constraintBottom_toBottomOf="@+id/imageView3" + app:layout_constraintEnd_toEndOf="@id/imageView3" + app:layout_constraintHorizontal_bias="0.0" + app:layout_constraintStart_toStartOf="@+id/imageView3" + app:layout_constraintTop_toTopOf="@+id/imageView3" + app:layout_constraintVertical_bias="0.0" /> + + <com.google.android.material.imageview.ShapeableImageView + + android:id="@+id/tvFragmentProfileInfoContainer" + android:layout_width="0dp" + android:layout_height="199dp" + android:layout_marginStart="20dp" + android:layout_marginTop="90dp" + android:layout_marginEnd="20dp" + android:adjustViewBounds="true" + android:background="#E8FFFFFF" + android:elevation="1dp" + android:scaleType="fitEnd" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.494" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="@+id/imageView3" + app:shapeAppearanceOverlay="@style/imageViewRoundedEdge" /> - <Button - android:layout_height="8dp" - android:background="@drawable/rounded_transparent_button" - android:clickable="false" - android:visibility="invisible" /> - </TableRow> + <androidx.cardview.widget.CardView + android:id="@+id/cvFragmentHomePageProfile" + android:layout_width="120dp" + android:layout_height="120dp" + android:layout_gravity="center" + android:elevation="10dp" + app:cardCornerRadius="250dp" + app:layout_constraintBottom_toTopOf="@+id/tableLayout" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.498" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0.65999997"> + + <ImageView + + android:id="@+id/tvFragmentProfileProfilePicture" + android:layout_width="120dp" + android:layout_height="120dp" + android:elevation="20dp" + 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" /> - <TableRow - android:layout_width="match_parent" - android:layout_height="wrap_content" + <TableLayout + android:id="@+id/tableLayout" + android:layout_width="0dp" + android:layout_height="120dp" + android:elevation="20dp" android:gravity="center" - android:weightSum="1"> - - <LinearLayout - android:layout_width="wrap_content" + android:stretchColumns="1" + app:layout_constraintBottom_toBottomOf="@+id/tvFragmentProfileInfoContainer" + app:layout_constraintEnd_toEndOf="@+id/tvFragmentProfileInfoContainer" + app:layout_constraintHorizontal_bias="0.488" + app:layout_constraintStart_toStartOf="@+id/tvFragmentProfileInfoContainer" + app:layout_constraintTop_toTopOf="@+id/tvFragmentProfileInfoContainer" + app:layout_constraintVertical_bias="0.87"> + + <TableRow + android:layout_width="fill_parent" android:layout_height="wrap_content" - android:orientation="horizontal" - android:weightSum="3"> + android:gravity="center"> <TextView - android:id="@+id/tvFragmentProfilePosts" - android:layout_width="110dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:width="100dp" - android:textSize="15dp" - android:textColor="#757471" + android:id="@+id/tvFragmentProfileName" + android:textSize="23sp" + android:textStyle="bold" + android:layout_width="match_parent" + android:layout_height="match_parent" android:gravity="center" - android:text="OBJAVE" /> + android:layout_marginBottom="10dp" + android:text="Petar Petrović" /> + </TableRow> - <TextView - android:id="@+id/tvFragmentProfileFollowers" - android:layout_width="110dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:width="100dp" - android:textSize="15sp" - android:clickable="true" - android:textColor="#757471" - android:gravity="center" - android:text="PRATIOCI" /> + <TableRow + android:layout_width="fill_parent" + android:layout_height="wrap_content" + + android:gravity="center"> <TextView - android:id="@+id/tvFragmentProfileFollow" - android:layout_width="110dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:width="100dp" + android:id="@+id/tvFragmentProfileUserName" + android:layout_width="match_parent" + android:layout_height="match_parent" android:gravity="center" - android:textSize="15sp" - android:textColor="#757471" - android:text="PRAĆENJA" /> - </LinearLayout> - </TableRow> + android:text="PetarP" + android:textSize="17sp" /> + </TableRow> - <TableRow - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:gravity="center" - android:weightSum="1"> + <TableRow + android:layout_width="match_parent" + android:layout_height="100dp"> - <LinearLayout> + <Button + android:layout_height="8dp" + android:background="@drawable/rounded_transparent_button" + android:clickable="false" + android:visibility="invisible" /> + </TableRow> - <TextView - android:id="@+id/tvFragmentProfilePostsNo" - android:layout_width="110dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:gravity="center" - android:text="156" - android:textSize="20dp" - android:textStyle="bold" /> - <TextView - android:id="@+id/tvFragmentProfileFollowersNo" - android:layout_width="110dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:gravity="center" - android:text="50" - android:textSize="20dp" - android:textStyle="bold" /> + <TableRow + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="center" + android:weightSum="1"> - <TextView - android:id="@+id/tvFragmentProfileFollowNo" - android:layout_width="110dp" + <LinearLayout + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_weight="1" - android:gravity="center" - android:text="40" - android:textSize="20dp" - android:textStyle="bold" /> - </LinearLayout> - </TableRow> - </TableLayout> - - - <LinearLayout - android:id="@+id/buttons" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:weightSum="3" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/tvFragmentProfileInfoContainer"> - - <Button - android:id="@+id/btnFragmentProfileShowMyPosts" - android:layout_width="110dp" + android:orientation="horizontal" + android:weightSum="3"> + + <TextView + android:id="@+id/tvFragmentProfilePosts" + android:layout_width="110dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:width="100dp" + android:textSize="15dp" + android:textColor="#757471" + android:gravity="center" + android:text="OBJAVE" /> + + <TextView + android:id="@+id/tvFragmentProfileFollowers" + android:layout_width="110dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:width="100dp" + android:textSize="15sp" + android:clickable="true" + android:textColor="#757471" + android:gravity="center" + android:text="PRATIOCI" /> + + <TextView + android:id="@+id/tvFragmentProfileFollow" + android:layout_width="110dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:width="100dp" + android:gravity="center" + android:textSize="15sp" + android:textColor="#757471" + android:text="PRATI" /> + </LinearLayout> + </TableRow> + + <TableRow + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="center" + android:weightSum="1"> + + <LinearLayout> + + <TextView + + android:id="@+id/tvFragmentProfilePostsNo" + android:layout_width="110dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:gravity="center" + android:text="156" + android:textSize="20dp" + android:textStyle="bold" /> + + <TextView + android:clickable="true" + android:id="@+id/tvFragmentProfileFollowersNo" + android:layout_width="110dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:gravity="center" + android:text="50" + android:textSize="20dp" + android:textStyle="bold" /> + + <TextView + android:clickable="true" + android:id="@+id/tvFragmentProfileFollowNo" + android:layout_width="110dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:gravity="center" + android:text="40" + android:textSize="20dp" + android:textStyle="bold" /> + </LinearLayout> + </TableRow> + </TableLayout> + + + <LinearLayout + android:id="@+id/buttons" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_weight="1" - android:backgroundTint="#FFFFFF" - android:stateListAnimator="@null" - android:text="Objave" - android:textColor="@color/cardview_dark_background" + android:weightSum="3" + app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/tvFragmentProfileInfoContainer" /> + app:layout_constraintTop_toBottomOf="@+id/tvFragmentProfileInfoContainer"> - <Button - android:id="@+id/btnFragmentProfileShowMyRecensions" - android:layout_width="110dp" - android:layout_height="wrap_content" - android:layout_gravity="end" - android:layout_weight="1" - android:backgroundTint="#FFFFFF" - android:stateListAnimator="@null" - android:text="Istorija" - android:textColor="@color/cardview_dark_background" - app:layout_constraintStart_toEndOf="@+id/btnFragmentProfileShowMyPosts" - app:layout_constraintTop_toBottomOf="@+id/tvFragmentProfileInfoContainer" /> - - <Button - android:id="@+id/btnFragmentProfileShowMyData" - android:layout_width="110dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:backgroundTint="#FFFFFF" - android:stateListAnimator="@null" + <Button + android:id="@+id/btnFragmentProfileShowMyPosts" + android:layout_width="110dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:backgroundTint="#FFFFFF" + android:stateListAnimator="@null" + android:text="Objave" + android:textColor="@color/cardview_dark_background" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/tvFragmentProfileInfoContainer" /> + + <Button + android:id="@+id/btnFragmentProfileShowMyRecensions" + android:layout_width="110dp" + android:layout_height="wrap_content" + android:layout_gravity="end" + android:layout_weight="1" + android:backgroundTint="#FFFFFF" + android:stateListAnimator="@null" + android:text="Istorija" + android:textColor="@color/cardview_dark_background" + app:layout_constraintStart_toEndOf="@+id/btnFragmentProfileShowMyPosts" + app:layout_constraintTop_toBottomOf="@+id/tvFragmentProfileInfoContainer" /> - android:text="Nalog" - android:textColor="@color/cardview_dark_background" + <Button + android:id="@+id/btnFragmentProfileShowMyData" + android:layout_width="110dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:backgroundTint="#FFFFFF" + android:stateListAnimator="@null" + + android:text="Nalog" + android:textColor="@color/cardview_dark_background" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="1.0" + app:layout_constraintStart_toEndOf="@+id/btnFragmentProfileShowMyRecensions" + app:layout_constraintTop_toBottomOf="@+id/tvFragmentProfileInfoContainer" /> + + </LinearLayout> + + <FrameLayout + android:id="@+id/flFragmentProfileFragmentContainer" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_marginTop="4dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/divider6"></FrameLayout> + + <View + android:id="@+id/divider6" + android:layout_width="409dp" + android:layout_height="1dp" + android:layout_marginTop="4dp" + android:background="?android:attr/listDivider" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="1.0" - app:layout_constraintStart_toEndOf="@+id/btnFragmentProfileShowMyRecensions" - app:layout_constraintTop_toBottomOf="@+id/tvFragmentProfileInfoContainer" /> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/buttons" /> + </androidx.constraintlayout.widget.ConstraintLayout> - </LinearLayout> + </androidx.swiperefreshlayout.widget.SwipeRefreshLayout> - <FrameLayout - android:id="@+id/flFragmentProfileFragmentContainer" - android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_marginTop="4dp" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/divider6"></FrameLayout> - - <View - android:id="@+id/divider6" - android:layout_width="409dp" - android:layout_height="1dp" - android:layout_marginTop="4dp" - android:background="?android:attr/listDivider" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/buttons" /> - </androidx.constraintlayout.widget.ConstraintLayout> </FrameLayout>
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_profile_statistics.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_profile_statistics.xml new file mode 100644 index 0000000..797e2b7 --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_profile_statistics.xml @@ -0,0 +1,253 @@ +<?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=".FragmentProfileStatistics" + android:paddingHorizontal="16dp" + android:paddingTop="16dp" + > + + <LinearLayout + android:id="@+id/linearLayout8" + android:layout_width="match_parent" + android:layout_height="wrap_content" + + android:orientation="vertical" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> + + <androidx.constraintlayout.widget.ConstraintLayout + android:id="@+id/linearLayout3" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:layout_marginBottom="5dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> + + <ImageView + android:id="@+id/imageView13" + android:layout_width="30dp" + android:layout_height="30dp" + android:src="@drawable/ic_total_views" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <TextView + android:id="@+id/textView5" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_marginStart="8dp" + android:gravity="center" + android:text="Broj pregleda" + android:textAllCaps="true" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toEndOf="@+id/imageView13" + app:layout_constraintTop_toTopOf="parent" /> + + <TextView + android:id="@+id/tvProfileStatisticsViews" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_marginEnd="16dp" + android:gravity="center" + android:text="0" + android:textSize="20dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + </androidx.constraintlayout.widget.ConstraintLayout> + + <androidx.constraintlayout.widget.ConstraintLayout + android:id="@+id/linearLayout4" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:layout_marginBottom="5dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/linearLayout3"> + + <ImageView + android:id="@+id/imageView14" + android:layout_width="30dp" + android:layout_height="30dp" + android:src="@drawable/ic_baseline_star_24" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <TextView + android:id="@+id/textView13" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_marginStart="8dp" + android:gravity="center" + android:text="Broj ocena" + android:textAllCaps="true" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toEndOf="@+id/imageView14" + app:layout_constraintTop_toTopOf="parent" /> + + <TextView + android:id="@+id/tvProfileStatisticsRatingNumber" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_marginEnd="16dp" + android:gravity="center" + android:text="0" + android:textSize="20dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + </androidx.constraintlayout.widget.ConstraintLayout> + + <androidx.constraintlayout.widget.ConstraintLayout + android:id="@+id/linearLayout5" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="5dp" + android:orientation="horizontal" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/linearLayout4"> + + <ImageView + android:id="@+id/imageView15" + android:layout_width="30dp" + android:layout_height="30dp" + android:src="@drawable/ic_baseline_star_half_24" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <TextView + android:id="@+id/textView14" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_marginStart="8dp" + android:gravity="center" + android:text="Prosečna ocena po objavi" + android:textAllCaps="true" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toEndOf="@+id/imageView15" + app:layout_constraintTop_toTopOf="parent" /> + + <TextView + android:id="@+id/tvProfileStatisticsAverageRating" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_marginEnd="16dp" + android:gravity="center" + android:text="0" + android:textSize="20dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + + </androidx.constraintlayout.widget.ConstraintLayout> + + <androidx.constraintlayout.widget.ConstraintLayout + android:id="@+id/linearLayout7" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:layout_marginBottom="5dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/linearLayout5"> + + <ImageView + android:id="@+id/imageView16" + android:layout_width="30dp" + android:layout_height="30dp" + android:src="@drawable/ic_baseline_favorite_24" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <TextView + android:id="@+id/textView15" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_marginStart="8dp" + android:gravity="center" + android:text="Broj omiljenih objava" + android:textAllCaps="true" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toEndOf="@+id/imageView16" + app:layout_constraintTop_toTopOf="parent" /> + + <TextView + android:id="@+id/tvProfileStatisticsFavouriteNumber" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_marginEnd="16dp" + android:gravity="center" + android:text="0" + android:textSize="20dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + + </androidx.constraintlayout.widget.ConstraintLayout> + + <androidx.constraintlayout.widget.ConstraintLayout + android:id="@+id/linearLayout6" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="5dp" + android:orientation="horizontal" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/linearLayout7"> + + <ImageView + android:id="@+id/imageView17" + android:layout_width="30dp" + android:layout_height="30dp" + android:src="@drawable/ic_baseline_calendar_month_24" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_marginStart="8dp" + android:gravity="center" + android:text="Pregledi po mesecima" + android:textAllCaps="true" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toEndOf="@+id/imageView17" + app:layout_constraintTop_toTopOf="parent" /> + + </androidx.constraintlayout.widget.ConstraintLayout> + + <View + android:id="@+id/divider7" + android:layout_width="match_parent" + android:layout_height="1dp" + android:background="?android:attr/listDivider" /> + + + </LinearLayout> + + <androidx.recyclerview.widget.RecyclerView + android:id="@+id/rvFragmentProfileStatisticsMonths" + android:layout_width="match_parent" + android:layout_height="0dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/linearLayout8" /> +</androidx.constraintlayout.widget.ConstraintLayout>
\ 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 e3db4bc..f2b0ca3 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 @@ -1,20 +1,22 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout 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:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent" - xmlns:app="http://schemas.android.com/apk/res-auto" + + android:background="#FFFCFCFC" + android:orientation="vertical" tools:context=".Fragments.FragmentShowPosts"> <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_marginTop="10dp" android:layout_marginEnd="16dp" - android:elevation="0dp" + android:elevation="10dp" app:cardCornerRadius="20dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -25,10 +27,11 @@ android:id="@+id/etFragmentShowPostsSearch" 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" /> + + android:backgroundTint="@color/white" + android:hint="Pretraga" + android:inputType="textPersonName" + android:paddingHorizontal="20dp" /> <com.google.android.material.button.MaterialButton android:id="@+id/mbFragmentHomePageSearch" @@ -54,7 +57,7 @@ android:layout_height="50dp" android:layout_alignParentRight="true" android:layout_marginStart="16dp" - android:background="@color/white" + android:background="#FFFCFCFC" android:padding="@dimen/component_padding" android:scaleType="centerCrop" android:src="@drawable/button_filter" @@ -66,36 +69,24 @@ android:layout_width="50dp" android:layout_height="50dp" android:layout_weight="1" - android:background="@color/white" + android:visibility="gone" + android:background="#FFFCFCFC" android:padding="@dimen/component_padding" android:scaleType="centerCrop" android:src="@drawable/button_sort" app:layout_constraintStart_toEndOf="@+id/btnSortType" app:layout_constraintTop_toTopOf="parent" /> - <ImageButton - android:id="@+id/btnChat" - android:layout_width="84dp" - 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="@android:drawable/sym_action_chat" - app:layout_constraintStart_toEndOf="@+id/btnSortDirection" - app:layout_constraintTop_toTopOf="parent" /> <ImageButton 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:background="#FFFCFCFC" android:padding="@dimen/component_padding" android:scaleType="centerCrop" - android:src="@drawable/list_empty" + android:src="@drawable/ic_round_view_list_24" app:layout_constraintEnd_toStartOf="@+id/btnGridLayout" app:layout_constraintHorizontal_bias="1.0" app:layout_constraintStart_toEndOf="@+id/btnSortDirection" @@ -106,29 +97,32 @@ android:layout_width="50dp" android:layout_height="50dp" android:layout_marginStart="220dp" + android:layout_marginEnd="16dp" android:layout_weight="1" - android:background="@color/white" + android:background="#FFFCFCFC" android:clickable="true" android:padding="@dimen/component_padding" android:scaleType="centerCrop" - android:src="@drawable/grid_full" + android:src="@drawable/ic_round_grid_view_24" + app:layout_constraintEnd_toEndOf="parent" 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" + <androidx.swiperefreshlayout.widget.SwipeRefreshLayout + android:id="@+id/swipeContainer" android:layout_width="match_parent" - android:layout_height="wrap_content" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" > + android:layout_height="match_parent"> + + <androidx.recyclerview.widget.RecyclerView + android:id="@+id/rvMain" + android:layout_width="match_parent" + android:layout_height="wrap_content" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> - </androidx.recyclerview.widget.RecyclerView> -</androidx.swiperefreshlayout.widget.SwipeRefreshLayout> + </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_single_post_comments.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_single_post_comments.xml index 250f640..91f1fd7 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_single_post_comments.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_single_post_comments.xml @@ -6,7 +6,16 @@ android:layout_width="match_parent" android:layout_height="match_parent" tools:context=".FragmentSinglePostComments"> - +<androidx.core.widget.NestedScrollView + android:layout_width="match_parent" + android:layout_height="wrap_content" + app:layout_constraintTop_toTopOf="parent" + > + <androidx.constraintlayout.widget.ConstraintLayout + android:id="@+id/constraintLayout2" + android:layout_width="match_parent" + android:layout_height="wrap_content" + app:layout_constraintTop_toTopOf="parent"> <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/constraintLayout" android:layout_width="match_parent" @@ -50,29 +59,62 @@ app:layout_constraintTop_toBottomOf="@+id/postCommentLayout"> </androidx.recyclerview.widget.RecyclerView> - - <LinearLayout + <androidx.appcompat.widget.LinearLayoutCompat android:id="@+id/postCommentLayout" android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="horizontal" app:layout_constraintTop_toBottomOf="@+id/constraintLayout"> - <EditText - android:id="@+id/NewComment" - android:layout_width="match_parent" + <androidx.cardview.widget.CardView + android:id="@+id/cvParentCommentEdit" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="1" - android:hint="Unesite komentar ovde" /> + android:minHeight="40dp" + android:layout_marginBottom="5dp" + android:layout_marginHorizontal="10dp" + android:elevation="16dp" + app:cardCornerRadius="20dp"> + - <ImageView - android:id="@+id/btnPostComment" - android:layout_width="30dp" - android:layout_height="30dp" - android:backgroundTint="@color/white" - android:scaleType="fitCenter" - android:src="@drawable/ic_baseline_send_24" /> + <com.google.android.material.textfield.TextInputEditText + android:id="@+id/NewComment" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:backgroundTint="@color/white" + android:hint="Unesite komentar..." + android:paddingLeft="10dp" + tools:ignore="TouchTargetSizeCheck" + android:inputType="textCapSentences|textMultiLine"/> - </LinearLayout> + </androidx.cardview.widget.CardView> + <androidx.cardview.widget.CardView + android:id="@+id/cvParentSendButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="bottom" + android:minHeight="40dp" + android:backgroundTint="@color/purple_500" + android:layout_marginBottom="5dp" + android:layout_marginEnd="5dp" + android:elevation="16dp" + app:cardCornerRadius="20dp"> + + + <ImageButton + android:id="@+id/btnPostComment" + android:layout_width="25dp" + android:layout_height="25dp" + android:layout_gravity="center" + android:layout_margin="10dp" + android:background="@null" + android:scaleType="fitCenter" + android:src="@drawable/ic_baseline_send_white_24" + app:cornerRadius="16dp" + tools:ignore="SpeakableTextPresentCheck" /> + </androidx.cardview.widget.CardView> + </androidx.appcompat.widget.LinearLayoutCompat> + </androidx.constraintlayout.widget.ConstraintLayout> +</androidx.core.widget.NestedScrollView> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_single_post_description.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_single_post_description.xml index 5bbdb14..bf90b04 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_single_post_description.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_single_post_description.xml @@ -13,81 +13,136 @@ android:padding="@dimen/component_padding" tools:layout_editor_absoluteX="0dp"> - - <TextView - android:id="@+id/tvDescription" - android:layout_width="wrap_content" + <androidx.cardview.widget.CardView + android:id="@+id/cvDescription" + app:cardCornerRadius="10dp" + android:elevation="15dp" + android:layout_margin="3dp" + android:padding="5dp" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="TextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextView" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.526" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="parent"> - <TextView - android:id="@+id/title" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="32dp" - android:text="Oceni" - android:textColor="@color/cardview_dark_background" - android:textSize="@dimen/header1_size" - android:textStyle="bold" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.005" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/tvDescription" /> + <TextView + android:layout_margin="5dp" + android:id="@+id/tvDescription" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="TextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextView" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + </androidx.cardview.widget.CardView> <LinearLayout + + android:id="@+id/linearLayout9" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="8dp" + android:layout_marginTop="30dp" android:orientation="horizontal" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/title"> + app:layout_constraintTop_toBottomOf="@+id/cvDescription"> + <TextView + android:id="@+id/title" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:text="Oceni" + + style="@style/title" + android:gravity="center_vertical" + android:layout_weight="1" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.005" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/tvDescription" /> <ImageView - android:clickable="true" android:id="@+id/rateStar1" android:layout_width="50dp" android:layout_height="50dp" + android:clickable="true" android:scaleType="centerCrop" - android:src="@drawable/ic_round_star_outline_24" /> + android:src="@drawable/ic_outline_star_border_24" /> <ImageView - android:clickable="true" android:id="@+id/rateStar2" android:layout_width="50dp" android:layout_height="50dp" + android:clickable="true" android:scaleType="centerCrop" - android:src="@drawable/ic_round_star_outline_24" /> + android:src="@drawable/ic_outline_star_border_24" /> <ImageView - android:clickable="true" android:id="@+id/rateStar3" android:layout_width="50dp" android:layout_height="50dp" + android:clickable="true" android:scaleType="centerCrop" - android:src="@drawable/ic_round_star_outline_24" /> + android:src="@drawable/ic_outline_star_border_24" /> <ImageView - android:clickable="true" android:id="@+id/rateStar4" android:layout_width="50dp" android:layout_height="50dp" + android:clickable="true" android:scaleType="centerCrop" - android:src="@drawable/ic_round_star_outline_24" /> + android:src="@drawable/ic_outline_star_border_24" /> <ImageView - android:clickable="true" android:id="@+id/rateStar5" android:layout_width="50dp" android:layout_height="50dp" + android:clickable="true" android:scaleType="centerCrop" - android:src="@drawable/ic_round_star_outline_24" /> + android:src="@drawable/ic_outline_star_border_24" /> </LinearLayout> + + <TextView + android:id="@+id/tvObrisi" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="Sigurno? Brisanje je trajno." + android:visibility="gone" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/btnObrisi" /> + + <Button + android:id="@+id/btnObrisi" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="19dp" + android:text="Obrisi objavu" + android:visibility="gone" + android:backgroundTint="#8B0000" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/linearLayout9" /> + + <Button + android:id="@+id/btnObrisiN" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:backgroundTint="#FFFFFF" + android:textColor="@color/cardview_dark_background" + android:layout_marginStart="20dp" + android:text="Odustani" + android:visibility="gone" + app:layout_constraintStart_toEndOf="@+id/btnObrisiY" + app:layout_constraintTop_toBottomOf="@+id/tvObrisi" /> + + <Button + android:id="@+id/btnObrisiY" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="Potvrdi" + android:visibility="gone" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/tvObrisi" /> + <!--<LinearLayout android:id="@+id/linearLayout2" android:layout_width="match_parent" diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_followers.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_followers.xml index 8b820bc..579e402 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_followers.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_followers.xml @@ -1,18 +1,58 @@ <?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:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" + xmlns:app="http://schemas.android.com/apk/res-auto" tools:context=".Fragments.FragmentUserFollowers"> <!-- TODO: Update blank fragment layout --> <TextView + android:id="@+id/textView17" android:layout_width="match_parent" android:layout_height="match_parent" /> + <androidx.cardview.widget.CardView + android:id="@+id/FragmentBrowseCardViewSearch" + android:layout_width="0dp" + android:layout_height="40dp" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" + android:elevation="10dp" + app:cardCornerRadius="20dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> + + + <AutoCompleteTextView + android:id="@+id/FragmentFollowersSearchBar" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:backgroundTint="@color/white" + android:hint=" Pretraga" + android:inputType="textPersonName" + android:paddingLeft="15dp" /> + + <com.google.android.material.button.MaterialButton + android:id="@+id/FragmentFollowersSearchBButton" + 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.recyclerview.widget.RecyclerView android:id="@+id/rvFragmentUserFollowers" android:layout_width="match_parent" - android:layout_height="match_parent" /> + android:layout_height="wrap_content" + android:layout_marginTop="15dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/FragmentBrowseCardViewSearch" /> -</FrameLayout>
\ No newline at end of file +</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_following.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_following.xml index 7558375..f7c07df 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_following.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_following.xml @@ -1,18 +1,58 @@ <?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:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" + xmlns:app="http://schemas.android.com/apk/res-auto" tools:context=".Fragments.FragmentUserFollowing"> <!-- TODO: Update blank fragment layout --> <TextView + android:id="@+id/textView16" android:layout_width="match_parent" android:layout_height="match_parent" /> + <androidx.cardview.widget.CardView + android:id="@+id/FragmentBrowseCardViewSearch" + android:layout_width="0dp" + android:layout_height="40dp" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" + android:elevation="10dp" + app:cardCornerRadius="20dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> + + + <AutoCompleteTextView + android:id="@+id/FragmentFollowingSearchBar" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:backgroundTint="@color/white" + android:hint=" Pretraga" + android:inputType="textPersonName" + android:paddingLeft="15dp" /> + + <com.google.android.material.button.MaterialButton + android:id="@+id/FragmentFollowingSearchBButton" + 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.recyclerview.widget.RecyclerView android:id="@+id/rvFragmentUserFollowing" android:layout_width="match_parent" - android:layout_height="match_parent" /> + android:layout_height="wrap_content" + android:layout_marginTop="15dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/FragmentBrowseCardViewSearch" /> -</FrameLayout>
\ No newline at end of file +</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/opened_post_image.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/opened_post_image.xml new file mode 100644 index 0000000..e63a903 --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/opened_post_image.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8"?> +<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + xmlns:app="http://schemas.android.com/apk/res-auto"> + + <com.github.piasy.biv.view.BigImageView + android:layout_width="match_parent" + android:layout_height="match_parent" + app:initScaleType="centerInside" + app:optimizeDisplay="true" + android:id="@+id/ivOpenedImage"/> + +</androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/post_item_grid_view.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/post_item_grid_view.xml new file mode 100644 index 0000000..4b5a03c --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/post_item_grid_view.xml @@ -0,0 +1,39 @@ +<?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="wrap_content"> + + <com.google.android.material.imageview.ShapeableImageView + android:id="@+id/postItemGridViewImage" + android:layout_width="match_parent" + android:layout_height="200dp" + android:layout_marginStart="8dp" + android:layout_marginTop="8dp" + android:layout_marginEnd="8dp" + android:layout_marginBottom="8dp" + android:elevation="5dp" + android:scaleType="centerCrop" + android:src="@color/white" + app:layout_constraintBottom_toBottomOf="parent" + 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="0.0" + app:shapeAppearanceOverlay="@style/Circular" /> + + <ImageView + android:id="@+id/ivPostItemMultipleImagesIcon" + android:layout_width="20dp" + android:layout_height="20dp" + android:layout_marginTop="8dp" + android:layout_marginEnd="8dp" + android:elevation="10dp" + android:src="@drawable/ic_baseline_multiple_images_24" + android:visibility="invisible" + app:layout_constraintEnd_toEndOf="@+id/postItemGridViewImage" + app:layout_constraintTop_toTopOf="@+id/postItemGridViewImage" /> + +</androidx.constraintlayout.widget.ConstraintLayout>
\ 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 2d32b2d..6584d5c 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 @@ -7,8 +7,8 @@ <com.google.android.material.imageview.ShapeableImageView android:id="@+id/imageView9" - android:layout_width="170dp" - android:layout_height="240dp" + android:layout_width="165dp" + android:layout_height="223dp" android:layout_marginStart="8dp" android:layout_marginTop="4dp" android:layout_marginEnd="8dp" @@ -17,13 +17,27 @@ android:src="@color/white" app:layout_constraintBottom_toBottomOf="parent" 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" app:shapeAppearanceOverlay="@style/Circular" /> + <ImageView + android:id="@+id/ivMultipleImagesIcon" + android:layout_width="20dp" + android:layout_height="20dp" + android:layout_marginTop="8dp" + android:layout_marginEnd="8dp" + android:elevation="10dp" + android:src="@drawable/ic_baseline_multiple_images_24" + android:visibility="invisible" + app:layout_constraintEnd_toEndOf="@+id/ivPIHPBackground" + app:layout_constraintTop_toTopOf="@+id/imageView9" /> + <com.google.android.material.imageview.ShapeableImageView android:id="@+id/ivPIHPBackground" - android:layout_width="172dp" + android:layout_width="165dp" android:layout_height="185dp" android:layout_marginStart="1dp" android:layout_marginEnd="1dp" @@ -39,52 +53,55 @@ <TextView android:id="@+id/tvPIHPLocationName" - android:layout_width="wrap_content" + android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginStart="16dp" - android:layout_marginTop="4dp" + android:layout_marginStart="12dp" + android:layout_marginBottom="2dp" + android:maxLines="1" + android:ellipsize="end" android:elevation="3dp" android:text="TextView" - android:textSize="14sp" + android:textSize="13sp" android:textStyle="bold" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/ivPIHPBackground" /> + app:layout_constraintBottom_toTopOf="@+id/tvPIHPLocationDetail" + app:layout_constraintEnd_toStartOf="@+id/imageView10" + app:layout_constraintStart_toStartOf="parent" /> <TextView android:id="@+id/tvPIHPRecension" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="8dp" - android:layout_marginEnd="8dp" + android:layout_marginEnd="4dp" + android:layout_marginBottom="18dp" android:elevation="3dp" android:text="TextView" android:textSize="11dp" android:textStyle="bold" - app:layout_constraintEnd_toEndOf="@+id/imageView9" - app:layout_constraintTop_toBottomOf="@+id/ivPIHPBackground" /> + app:layout_constraintBottom_toBottomOf="@+id/imageView9" + app:layout_constraintEnd_toEndOf="@+id/imageView9" /> <ImageView android:id="@+id/imageView10" android:layout_width="15dp" android:layout_height="15dp" - android:layout_marginTop="8dp" + android:layout_marginBottom="18dp" android:elevation="3dp" + app:layout_constraintBottom_toBottomOf="@+id/imageView9" app:layout_constraintEnd_toStartOf="@+id/tvPIHPRecension" - app:layout_constraintTop_toBottomOf="@+id/ivPIHPBackground" app:srcCompat="@drawable/ic_baseline_star_rate_24" /> <ImageView android:id="@+id/imageView11" - android:layout_width="20dp" - android:layout_height="19dp" - android:layout_marginStart="12dp" - android:layout_marginTop="2dp" + android:layout_width="18dp" + android:layout_height="18dp" + android:layout_marginStart="8dp" + android:layout_marginBottom="3dp" android:elevation="3dp" + app:layout_constraintBottom_toBottomOf="@+id/imageView9" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/tvPIHPLocationName" app:srcCompat="@drawable/ic_baseline_location_on_24" /> <TextView @@ -92,15 +109,14 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="4dp" - android:layout_marginTop="4dp" + android:layout_marginBottom="3dp" android:elevation="3dp" android:text="TextView" android:textSize="11dp" + app:layout_constraintBottom_toBottomOf="@+id/imageView9" app:layout_constraintEnd_toEndOf="@+id/imageView9" app:layout_constraintHorizontal_bias="0.0" - app:layout_constraintStart_toEndOf="@+id/imageView11" - app:layout_constraintTop_toBottomOf="@+id/tvPIHPLocationName" /> + app:layout_constraintStart_toEndOf="@+id/imageView11" /> " /> diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/post_item_user_post.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/post_item_user_post.xml new file mode 100644 index 0000000..1b78ba9 --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/post_item_user_post.xml @@ -0,0 +1,122 @@ +<?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:padding="10dp" + android:layout_height="wrap_content"> + + <com.google.android.material.imageview.ShapeableImageView + android:id="@+id/piupbackgroi" + android:layout_width="match_parent" + android:layout_height="210dp" + android:layout_marginTop="3dp" + android:layout_marginBottom="3dp" + android:layout_marginHorizontal="3dp" + android:elevation="3dp" + android:src="@color/white" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:shapeAppearanceOverlay="@style/Circular" /> + + <ImageView + android:id="@+id/ivMultipleImagesIcon" + android:layout_width="20dp" + android:layout_height="20dp" + android:layout_marginTop="8dp" + android:layout_marginEnd="8dp" + android:elevation="10dp" + android:src="@drawable/ic_baseline_multiple_images_24" + android:visibility="invisible" + app:layout_constraintEnd_toEndOf="@+id/piupbackground" + app:layout_constraintTop_toTopOf="@+id/piupbackgroi" /> + + <com.google.android.material.imageview.ShapeableImageView + android:id="@+id/piupbackground" + android:layout_width="match_parent" + android:layout_height="170dp" + android:layout_marginStart="3dp" + android:layout_marginEnd="3dp" + android:layout_marginHorizontal="3dp" + android:elevation="3dp" + android:scaleType="centerCrop" + app:layout_constraintBottom_toBottomOf="@+id/piupbackgroi" + app:layout_constraintEnd_toEndOf="@id/piupbackgroi" + app:layout_constraintStart_toStartOf="@id/piupbackgroi" + app:layout_constraintTop_toTopOf="@id/piupbackgroi" + app:layout_constraintVertical_bias="0.0" + app:shapeAppearanceOverlay="@style/roundedTop" + app:srcCompat="@drawable/b1" /> + + <TextView + android:id="@+id/piupLocation" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginStart="12dp" + android:layout_marginTop="2dp" + android:maxLines="1" + android:ellipsize="end" + android:elevation="3dp" + android:text="TextView" + android:textSize="13sp" + android:textStyle="bold" + app:layout_constraintEnd_toStartOf="@+id/imageView10" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/piupbackground" /> + + <TextView + android:id="@+id/piuprating" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="3dp" + + android:layout_marginEnd="4dp" + android:elevation="3dp" + android:text="TextView" + android:textSize="11dp" + android:textStyle="bold" + app:layout_constraintEnd_toEndOf="@+id/piupbackgroi" + app:layout_constraintTop_toBottomOf="@+id/piupbackground" /> + + <ImageView + android:id="@+id/imageView10" + + android:layout_width="15dp" + android:layout_height="15dp" + android:layout_marginTop="3dp" + android:elevation="3dp" + app:layout_constraintEnd_toStartOf="@+id/piuprating" + app:layout_constraintTop_toBottomOf="@+id/piupbackground" + app:srcCompat="@drawable/ic_baseline_star_rate_24" /> + + <ImageView + android:id="@+id/imageView11" + + android:layout_width="18dp" + android:layout_height="18dp" + android:layout_marginStart="8dp" + android:layout_marginTop="2dp" + android:elevation="3dp" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/piupLocation" + app:srcCompat="@drawable/ic_baseline_location_on_24" /> + + <TextView + android:id="@+id/piupLocationDetail" + + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="2dp" + android:elevation="3dp" + android:text="TextView" + android:textSize="11dp" + app:layout_constraintEnd_toEndOf="@+id/piupbackgroi" + app:layout_constraintHorizontal_bias="0.0" + app:layout_constraintStart_toEndOf="@+id/imageView11" + app:layout_constraintTop_toBottomOf="@+id/piupLocation" /> + " /> + + +</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 73e546f..54b11b0 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/post_preview.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/post_preview.xml @@ -17,24 +17,38 @@ tools:layout_editor_absoluteY="295dp" />--> <com.google.android.material.imageview.ShapeableImageView - app:shapeAppearanceOverlay="@style/roundedTop" android:id="@+id/locationImage" android:layout_width="match_parent" - android:layout_height="250dp" + android:layout_height="180dp" android:layout_marginStart="16dp" android:layout_marginTop="16dp" android:layout_marginEnd="16dp" android:background="@drawable/b1" + android:elevation="10dp" android:scaleType="centerCrop" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="parent" + app:shapeAppearanceOverlay="@style/roundedTop" /> + + + <ImageView + android:id="@+id/ivMultipleImagesIcon" + android:layout_width="25dp" + android:layout_height="25dp" + android:layout_marginTop="7dp" + android:layout_marginRight="5dp" + android:elevation="10dp" + android:src="@drawable/ic_baseline_multiple_images_24" + android:visibility="invisible" + app:layout_constraintEnd_toEndOf="@+id/locationImage" + app:layout_constraintTop_toTopOf="@+id/locationImage" /> <View android:id="@+id/vBanner" android:layout_width="match_parent" - android:layout_height="70dp" + android:layout_height="55dp" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" android:layout_marginBottom="16dp" @@ -46,36 +60,41 @@ app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/locationImage" - app:layout_constraintVertical_bias="0.0"> + app:layout_constraintVertical_bias="1.0"> </View> <TextView android:id="@+id/tvTitle" - android:layout_width="wrap_content" + android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginStart="28dp" - android:layout_marginTop="8dp" + android:layout_marginTop="4dp" android:elevation="10dp" + android:ellipsize="end" android:gravity="top|left" + android:paddingLeft="5dp" + android:maxLines="1" + android:paddingRight="20dp" android:text="Naslov" - android:textSize="20sp" + android:textSize="18sp" android:textStyle="bold" - app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toStartOf="@+id/tvPostPreviewRating" + app:layout_constraintStart_toStartOf="@+id/locationImage" app:layout_constraintTop_toBottomOf="@+id/locationImage" /> <TextView - android:elevation="10dp" android:id="@+id/tvLocationParent" android:layout_width="wrap_content" android:layout_height="match_parent" - android:layout_marginStart="28dp" - android:layout_marginTop="4dp" + android:layout_marginStart="24dp" + android:layout_marginTop="1dp" android:drawableLeft="@drawable/ic_baseline_location_on_24" + android:elevation="10dp" android:text="grad, drzava" android:textAlignment="viewEnd" + android:textSize="16sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/tvTitle" /> @@ -83,13 +102,25 @@ android:id="@+id/tvPostPreviewRating" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="40dp" - android:layout_marginEnd="32dp" + android:layout_marginTop="6dp" + android:layout_marginEnd="24dp" android:drawableLeft="@drawable/ic_baseline_star_rate_24" android:elevation="10dp" android:text="TextView" - android:textSize="17dp" + android:textSize="16dp" android:textStyle="bold" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@+id/locationImage" /> + + <TextView + android:id="@+id/tvPostPreviewDate" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="2dp" + android:layout_marginEnd="24dp" + android:elevation="10dp" + + android:textSize="16sp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toBottomOf="@+id/tvPostPreviewRating" /> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/single_comment.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/single_comment.xml index 5e0dc03..33c40ae 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/single_comment.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/single_comment.xml @@ -3,8 +3,8 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" + android:id="@+id/llroot" android:orientation="vertical" - android:padding="@dimen/component_padding" xmlns:app="http://schemas.android.com/apk/res-auto"> <androidx.appcompat.widget.LinearLayoutCompat android:layout_width="match_parent" @@ -19,6 +19,7 @@ app:layout_constraintEnd_toStartOf="@+id/tvCommentText" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" + android:clickable="true" android:scaleType="centerCrop" tools:layout_editor_absoluteY="27dp" /> <androidx.appcompat.widget.LinearLayoutCompat @@ -26,14 +27,43 @@ android:layout_height="wrap_content" android:orientation="vertical" android:layout_weight="1"> + <androidx.appcompat.widget.LinearLayoutCompat + android:layout_width="match_parent" + android:layout_height="wrap_content"> + <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"/> + <androidx.constraintlayout.widget.ConstraintLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:visibility="gone" + android:id="@+id/clReplyCount"> + + <androidx.constraintlayout.widget.ConstraintLayout + android:id="@+id/constraintLayout4" + android:layout_width="5dp" + android:layout_height="5dp" + android:background="@drawable/rounded_picture_background" + android:backgroundTint="@color/unfollow" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <TextView + android:id="@+id/etReplyCount" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:clickable="true" + android:padding="@dimen/text_padding" + android:text="0 odgovora" + app:layout_constraintStart_toEndOf="@id/constraintLayout4" + tools:layout_editor_absoluteY="0dp" /> + </androidx.constraintlayout.widget.ConstraintLayout> + </androidx.appcompat.widget.LinearLayoutCompat> - <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" @@ -58,30 +88,78 @@ </androidx.appcompat.widget.LinearLayoutCompat> <androidx.appcompat.widget.LinearLayoutCompat + android:id="@+id/llReply" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:id="@+id/llReply"> + android:layout_height="wrap_content"> - <EditText - android:layout_width="match_parent" + <androidx.cardview.widget.CardView + android:id="@+id/cvParentCommentEdit" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="1" - android:id="@+id/etReply" - android:hint="odgovor na komentar"/> - <ImageButton - android:id="@+id/btnPostReply" - android:layout_width="50dp" - android:layout_height="50dp" - android:layout_gravity="end" - android:layout_weight="0" - android:backgroundTint="@color/white" - android:scaleType="centerCrop" - android:src="@drawable/post_comment" /> + android:minHeight="40dp" + android:layout_marginBottom="5dp" + android:layout_marginHorizontal="10dp" + android:elevation="16dp" + app:cardCornerRadius="20dp"> + + + <com.google.android.material.textfield.TextInputEditText + android:id="@+id/etReply" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:backgroundTint="@color/white" + android:hint="Unesite komentar..." + android:paddingLeft="10dp" + tools:ignore="TouchTargetSizeCheck" + android:inputType="textCapSentences|textMultiLine"/> + + </androidx.cardview.widget.CardView> + <androidx.cardview.widget.CardView + android:id="@+id/cvParentSendReplyButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="bottom" + android:minHeight="40dp" + android:backgroundTint="@color/purple_500" + android:layout_marginBottom="5dp" + android:layout_marginEnd="5dp" + android:elevation="16dp" + app:cardCornerRadius="20dp"> + + + <ImageButton + android:id="@+id/btnPostReply" + android:layout_width="25dp" + android:layout_height="25dp" + android:layout_gravity="center" + android:layout_margin="10dp" + android:background="@null" + android:scaleType="fitCenter" + android:src="@drawable/ic_baseline_send_white_24" + app:cornerRadius="16dp" + tools:ignore="SpeakableTextPresentCheck" /> + </androidx.cardview.widget.CardView> </androidx.appcompat.widget.LinearLayoutCompat> - <androidx.recyclerview.widget.RecyclerView + <androidx.appcompat.widget.LinearLayoutCompat android:layout_width="match_parent" android:layout_height="wrap_content" - android:id="@+id/rvReplies"/> + android:visibility="gone" + android:id="@+id/llReplies"> + + <androidx.constraintlayout.widget.ConstraintLayout + android:layout_width="2dp" + android:layout_height="match_parent" + android:backgroundTint="@color/unfollow" + android:layout_marginHorizontal="23dp" + android:background="@drawable/rounded_picture_background" + /> + + <androidx.recyclerview.widget.RecyclerView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1" + android:id="@+id/rvReplies"/> + </androidx.appcompat.widget.LinearLayoutCompat> </androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/single_date_view.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/single_date_view.xml new file mode 100644 index 0000000..f2726db --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/single_date_view.xml @@ -0,0 +1,31 @@ +<?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" + android:layout_width="match_parent" + android:padding="10dp" + android:layout_height="50dp"> + + <TextView + android:id="@+id/tvMonth" + android:layout_width="80dp" + android:layout_height="match_parent" + android:gravity="left|center_vertical" + android:text="Mesec" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0.0" /> + + <TextView + android:id="@+id/tvMonthViews" + android:layout_width="50dp" + android:layout_height="match_parent" + android:gravity="left|center_vertical" + android:text="5" + android:textStyle="bold" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.0" + app:layout_constraintStart_toEndOf="@+id/tvMonth" + 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/single_post_history.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/single_post_history.xml index 72ead29..16c5814 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/single_post_history.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/single_post_history.xml @@ -30,16 +30,19 @@ <TextView android:id="@+id/tvTitleSinglePostHistory" - android:layout_width="wrap_content" + android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="32dp" android:elevation="5dp" + android:ellipsize="end" android:gravity="top|left" + android:maxLines="1" + android:paddingRight="20dp" android:text="Naslov" android:textSize="20sp" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintEnd_toEndOf="@+id/vBannerSinglePostHistory" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@+id/vBannerSinglePostHistory" |