diff options
| author | Ognjen Cirkovic <ciraboxkg@gmail.com> | 2022-11-29 14:21:11 +0000 |
|---|---|---|
| committer | Ognjen Cirkovic <ciraboxkg@gmail.com> | 2022-11-29 14:21:11 +0000 |
| commit | b76cefc486097d776e3ff374b27ce3bfb0786b56 (patch) | |
| tree | 70473d781e771c8a74585cc2b4160acec80f8b3b /Client/BrzoDoLokacije/app/src/main/res/layout | |
| parent | f67344d076adfd2899dfeff7fc547d5d07358453 (diff) | |
| parent | 5879726908af8e631054a972ad39eea4f8623e14 (diff) | |
Merge branch 'develop' into 'master'
Merge develop-> master
See merge request BrzoDoLokacije2022/odyssey/brzodolokacije!9
Diffstat (limited to 'Client/BrzoDoLokacije/app/src/main/res/layout')
22 files changed, 861 insertions, 605 deletions
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_add_post.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_add_post.xml index fbe2230..405c221 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_add_post.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_add_post.xml @@ -46,66 +46,57 @@ tools:ignore="SpeakableTextPresentCheck" /> <Button - android:clickable="false" android:id="@+id/btnActivityAddPostUploadFromGallery" android:layout_width="177dp" android:layout_height="19dp" + android:clickable="false" android:text="Otvori galeriju" android:visibility="invisible" app:cornerRadius="20dp" - app:layout_constraintBottom_toTopOf="@+id/tvActivityAddPostLocationtext" + app:layout_constraintBottom_toTopOf="@+id/btnActivityAddPostAddLocation" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.497" app:layout_constraintStart_toStartOf="parent" /> - <TextView - android:id="@+id/tvActivityAddPostLocationtext" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginStart="16dp" - android:layout_marginEnd="16dp" - android:layout_marginBottom="16dp" - android:text="Lokacija" - app:layout_constraintBottom_toTopOf="@+id/etActivityAddPostLocation" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.0" - app:layout_constraintStart_toStartOf="parent" /> - - <EditText - android:id="@+id/etActivityAddPostLocation" - android:layout_width="200dp" - android:layout_height="50dp" - android:layout_marginStart="16dp" - android:layout_marginEnd="16dp" - android:ems="10" - android:hint="Reykjavik, Iceland" - android:inputType="textEmailAddress" - app:layout_constraintBottom_toTopOf="@+id/tvActivityAddPostDescriptiontext" - app:layout_constraintStart_toStartOf="parent" /> <Button android:id="@+id/btnActivityAddPostAddLocation" android:layout_width="wrap_content" android:layout_height="50dp" - android:layout_marginStart="16dp" - android:layout_marginEnd="16dp" - android:background="@drawable/rounded_cyan_button" - android:backgroundTint="#1C789A" + android:stateListAnimator="@null" + android:backgroundTint="@color/white" + android:drawableLeft="@drawable/ic_baseline_location_on_24" android:text="Dodaj lokaciju" + android:textColor="#757471" app:layout_constraintBottom_toTopOf="@+id/tvActivityAddPostDescriptiontext" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toEndOf="@+id/etActivityAddPostLocation" /> - + app:layout_constraintHorizontal_bias="0.074" + app:layout_constraintStart_toStartOf="parent" /> - <TextView + <EditText + android:id="@+id/etActivityAddPostLocationText" + android:layout_width="wrap_content" + android:layout_height="50dp" + android:ems="10" + android:enabled="false" + android:visibility="gone" + app:layout_constraintBottom_toBottomOf="@+id/btnActivityAddPostAddLocation" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toEndOf="@+id/btnActivityAddPostAddLocation" /> + <Button android:id="@+id/tvActivityAddPostDescriptiontext" - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" - android:text="Opis" + android:backgroundTint="@color/white" + android:drawableLeft="@drawable/ic_baseline_description_24" + android:stateListAnimator="@null" + android:text="Dodaj opis" + android:textColor="#757471" app:layout_constraintBottom_toTopOf="@+id/etActivityAddPostDescription" app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" /> <EditText @@ -117,6 +108,7 @@ android:ems="10" android:hint="Reykjavik, Iceland" android:inputType="textEmailAddress" + android:visibility="gone" app:layout_constraintBottom_toTopOf="@+id/llTags" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" /> @@ -151,12 +143,12 @@ <LinearLayout android:id="@+id/llTags" - android:layout_width="0dp" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="20dp" android:layout_marginRight="20dp" android:orientation="horizontal" - app:layout_constraintBottom_toTopOf="@+id/acTags" + app:layout_constraintBottom_toTopOf="@+id/btnActivityAddPostAddTag" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent"></LinearLayout> @@ -164,29 +156,27 @@ android:id="@+id/acTags" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginLeft="20dp" - android:layout_marginRight="20dp" + android:layout_marginStart="28dp" android:hint="Planina,Reka,Park..." + android:maxLength="12" android:minHeight="48dp" - android:maxLength= "12" + android:visibility="gone" app:layout_constraintBottom_toTopOf="@+id/btnActivityAddPostPost" - app:layout_constraintEnd_toStartOf="@+id/btnActivityAddPostAddTag" app:layout_constraintStart_toStartOf="parent" /> <Button android:id="@+id/btnActivityAddPostAddTag" android:layout_width="wrap_content" android:layout_height="40dp" - android:layout_marginTop="5dp" - android:layout_marginEnd="20dp" - android:layout_marginStart="20dp" - android:layout_marginBottom="5dp" - android:background="@drawable/rounded_cyan_button" - android:backgroundTint="#1C789A" + android:layout_marginStart="16dp" + android:backgroundTint="@color/white" + android:drawableLeft="@drawable/ic_baseline_tag_24" + android:stateListAnimator="@null" + android:text="Dodaj tag" - app:layout_constraintBottom_toTopOf="@+id/btnActivityAddPostPost" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toBottomOf="@+id/llTags" /> + android:textColor="#757471" + app:layout_constraintBottom_toTopOf="@+id/acTags" + app:layout_constraintStart_toStartOf="parent" /> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_capture_post.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_capture_post.xml index 2b64a27..cb2c8dc 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_capture_post.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_capture_post.xml @@ -14,8 +14,10 @@ android:scaleType="fitCenter" app:layout_constraintBottom_toTopOf="@+id/btnActivityCapturePostCapture" app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="1.0" tools:ignore="ImageContrastCheck" tools:srcCompat="@tools:sample/avatars" /> @@ -23,68 +25,56 @@ android:id="@+id/btnActivityCapturePostCapture" android:layout_width="68dp" android:layout_height="15dp" + android:clickable="false" android:visibility="invisible" app:cornerRadius="30dp" app:icon="@android:drawable/ic_menu_camera" app:iconTint="#FFFFFF" - android:clickable="false" - app:layout_constraintBottom_toTopOf="@+id/tvActivityCapturePostLocationtext" + app:layout_constraintBottom_toTopOf="@+id/btnActivityCapturePostAddLocation" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.498" app:layout_constraintStart_toStartOf="parent" tools:ignore="SpeakableTextPresentCheck" /> - <TextView - android:id="@+id/tvActivityCapturePostLocationtext" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginStart="16dp" - android:layout_marginEnd="16dp" - android:text="Lokacija" - app:layout_constraintBottom_toTopOf="@+id/etActivityCapturePostLocation" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.0" - app:layout_constraintStart_toStartOf="parent" /> - <EditText - android:id="@+id/etActivityCapturePostLocation" - android:layout_width="200dp" - android:layout_height="50dp" - android:layout_marginStart="16dp" - android:layout_marginEnd="16dp" - android:ems="10" - android:hint="Reykjavik, Iceland" - android:importantForAutofill="no" - android:inputType="textEmailAddress" - app:layout_constraintBottom_toTopOf="@+id/tvActivityCapturePostDescriptiontext" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.0" - app:layout_constraintStart_toStartOf="parent" - tools:ignore="DuplicateSpeakableTextCheck,TextContrastCheck" /> <Button android:id="@+id/btnActivityCapturePostAddLocation" android:layout_width="wrap_content" android:layout_height="50dp" - android:layout_marginStart="16dp" - android:layout_marginEnd="16dp" - android:background="@drawable/rounded_cyan_button" - android:backgroundTint="#1C789A" + android:backgroundTint="@color/white" + android:drawableLeft="@drawable/ic_baseline_location_on_24" + android:stateListAnimator="@null" android:text="Dodaj lokaciju" + android:textColor="#757471" app:layout_constraintBottom_toTopOf="@+id/tvActivityCapturePostDescriptiontext" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toEndOf="@+id/etActivityCapturePostLocation" /> - + app:layout_constraintHorizontal_bias="0.092" + app:layout_constraintStart_toStartOf="parent" /> + <EditText + android:id="@+id/etActivityAddPostLocationText" + android:layout_width="wrap_content" + android:layout_height="50dp" + android:ems="10" + android:enabled="false" + android:visibility="gone" + app:layout_constraintBottom_toBottomOf="@+id/btnActivityCapturePostAddLocation" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toEndOf="@+id/btnActivityCapturePostAddLocation" /> - <TextView + <Button android:id="@+id/tvActivityCapturePostDescriptiontext" - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" - android:text="Opis" + android:backgroundTint="@color/white" + android:drawableLeft="@drawable/ic_baseline_description_24" + android:stateListAnimator="@null" + android:text="Dodaj opis" + android:textColor="#757471" app:layout_constraintBottom_toTopOf="@+id/etActivityCapturePostDescription" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="1.0" + app:layout_constraintHorizontal_bias="0.017" app:layout_constraintStart_toStartOf="parent" /> <EditText @@ -95,6 +85,7 @@ android:layout_marginEnd="16dp" android:ems="10" android:hint="Reykjavik, Iceland" + android:visibility="gone" android:importantForAutofill="no" android:inputType="textEmailAddress" app:layout_constraintBottom_toTopOf="@+id/llTagsCap" @@ -142,36 +133,38 @@ android:layout_marginLeft="20dp" android:layout_marginRight="20dp" android:orientation="horizontal" - app:layout_constraintBottom_toTopOf="@+id/acTagsCap" + app:layout_constraintBottom_toTopOf="@+id/btnActivityAddPostAddTagCap" app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.4" app:layout_constraintStart_toStartOf="parent"></LinearLayout> <EditText android:id="@+id/acTagsCap" - android:layout_width="0dp" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="20dp" - android:layout_marginRight="20dp" + android:layout_marginBottom="28dp" android:hint="Planina,Reka,Park..." + android:maxLength="12" android:minHeight="48dp" - android:maxLength= "12" + android:visibility="gone" app:layout_constraintBottom_toTopOf="@+id/btnActivityCapturePostPost" - app:layout_constraintEnd_toStartOf="@+id/btnActivityAddPostAddTagCap" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.08" app:layout_constraintStart_toStartOf="parent" /> <Button android:id="@+id/btnActivityAddPostAddTagCap" android:layout_width="wrap_content" android:layout_height="40dp" - android:layout_marginTop="5dp" - android:layout_marginEnd="20dp" - android:layout_marginStart="20dp" - android:layout_marginBottom="5dp" - android:background="@drawable/rounded_cyan_button" - android:backgroundTint="#1C789A" + android:layout_marginBottom="20dp" + android:backgroundTint="@color/white" + android:drawableLeft="@drawable/ic_baseline_tag_24" + android:stateListAnimator="@null" android:text="Dodaj tag" - app:layout_constraintBottom_toTopOf="@+id/btnActivityCapturePostPost" + android:textColor="#757471" + app:layout_constraintBottom_toTopOf="@+id/acTagsCap" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toBottomOf="@+id/llTagsCap" /> + app:layout_constraintHorizontal_bias="0.076" + app:layout_constraintStart_toStartOf="parent" /> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_chat.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_chat.xml index 9e28d6d..680bada 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_chat.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_chat.xml @@ -5,47 +5,65 @@ android:layout_width="match_parent" android:layout_height="match_parent" tools:context=".Activities.ChatActivity"> - <androidx.constraintlayout.widget.ConstraintLayout - android:id="@+id/topBanner" - android:layout_width="match_parent" - android:clickable="true" - android:layout_height="50dp" - android:background="@color/dark_blue_transparent" - app:layout_constraintStart_toStartOf="parent"> - <TextView - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:textSize="40dp" - android:id="@+id/tvFragmentTitle" - android:text="Chat" - android:textColor="@color/white"/> - - </androidx.constraintlayout.widget.ConstraintLayout> + <ImageButton - android:layout_width="match_parent" - android:layout_height="wrap_content" android:id="@+id/addNewMessage" + android:layout_width="60dp" + android:layout_height="60dp" android:clickable="true" + android:elevation="50dp" android:focusable="true" - app:layout_constraintTop_toBottomOf="@id/topBanner" - android:src="@drawable/button_chat"> + android:backgroundTint="@color/unfollow" + android:src="@drawable/ic_baseline_add_message_24" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" /> - </ImageButton> - <androidx.swiperefreshlayout.widget.SwipeRefreshLayout + <ImageView + android:id="@+id/btnActivityShowFollowersAndFollowingBackToUser" + android:layout_width="35dp" + android:layout_height="35dp" + android:layout_marginStart="16dp" + android:layout_marginTop="16dp" + 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/tvActivityShowFollowersOrFollowingShow" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_width="match_parent" + android:layout_marginTop="16dp" + android:layout_marginEnd="268dp" + android:text="Poruke" + android:textSize="25dp" + android:textStyle="bold" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <androidx.swiperefreshlayout.widget.SwipeRefreshLayout android:id="@+id/swipeContainer" - app:layout_constraintTop_toBottomOf="@id/addNewMessage"> + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_marginTop="8dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintTop_toBottomOf="@+id/tvActivityShowFollowersOrFollowingShow" + app:layout_constraintVertical_bias="1.0" + tools:layout_editor_absoluteX="-27dp"> <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" > + app:layout_constraintTop_toTopOf="parent"> </androidx.recyclerview.widget.RecyclerView> + + </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_maps.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_maps.xml index 8d37c29..0051893 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_maps.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_maps.xml @@ -33,6 +33,7 @@ app:rippleColor="#FFFFFF" app:srcCompat="@android:drawable/ic_menu_mylocation" /> + <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/ActivityMapsConfirmLocation" android:layout_width="wrap_content" @@ -64,7 +65,7 @@ app:layout_constraintTop_toTopOf="parent"> - <com.google.android.material.textfield.TextInputEditText + <AutoCompleteTextView android:id="@+id/ActivityMapsSearchBar" android:layout_width="match_parent" android:layout_height="match_parent" @@ -86,4 +87,21 @@ </androidx.cardview.widget.CardView> +<!-- <Spinner--> +<!-- android:id="@+id/MapsActivitySpinner"--> +<!-- android:layout_width="match_parent"--> +<!-- android:layout_height="40dp"--> +<!-- android:background="@null"--> +<!-- app:layout_constraintEnd_toEndOf="parent"--> +<!-- app:layout_constraintStart_toStartOf="parent"--> +<!-- app:layout_constraintTop_toBottomOf="@+id/ActivityMapsCardViewSearch" />--> + +<!-- <AutoCompleteTextView--> +<!-- android:id="@+id/ActivityMapsAutoCompleteTextView"--> +<!-- android:layout_width="match_parent"--> +<!-- android:layout_height="40dp"--> +<!-- app:layout_constraintEnd_toEndOf="parent"--> +<!-- app:layout_constraintStart_toStartOf="parent"--> +<!-- app:layout_constraintTop_toBottomOf="@+id/ActivityMapsCardViewSearch" />--> + </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_show_followers_and_following.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_show_followers_and_following.xml new file mode 100644 index 0000000..7ee4cbe --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_show_followers_and_following.xml @@ -0,0 +1,83 @@ +<?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:padding="16dp" + android:layout_width="match_parent" + android:layout_height="match_parent" + tools:context=".Activities.ActivityShowFollowersAndFollowing"> + + <!-- + <View + android:id="@+id/divider" + 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_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/btnActivityShowFollowersAndwingShowFollowers" /> + + <Button + android:id="@+id/btnActivityShowFollowersAndFollowingShowFollowers" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="16dp" + android:backgroundTint="#FFFFFF" + android:stateListAnimator="@null" + android:text="Pratioci" + android:textColor="@color/cardview_dark_background" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/btnActiShowFollowersAndFollowingBackToUser" /> + + <Button + android:id="@+id/btnActivityShowFollowersAndFollowingShowFollowing" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginEnd="20dp" + android:backgroundTint="#FFFFFF" + android:stateListAnimator="@null" + android:text="Praćenja" + android:textColor="@color/cardview_dark_background" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toBottomOf="@+id/btnActivityShowFollowersAndFollowingBackToUser" /> + --> + + <ImageView + android:id="@+id/btnActivityShowFollowersAndFollowingBackToUser" + android:layout_width="35dp" + android:layout_height="35dp" + android:layout_marginStart="4dp" + android:layout_marginTop="4dp" + 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/tvActivityShowFollowersOrFollowingShow" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="4dp" + android:textSize="25dp" + android:textStyle="bold" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.11" + app:layout_constraintStart_toEndOf="@+id/btnActivityShowFollowersAndFollowingBackToUser" + app:layout_constraintTop_toTopOf="parent" /> + + <FrameLayout + android:id="@+id/flActivityShowFollowerAndFollowing" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_marginTop="16dp" + android:orientation="vertical" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/btnActivityShowFollowersAndFollowingBackToUser"/> + </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_user_profile.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_user_profile.xml index 8762183..cbcafc5 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 @@ -15,7 +15,7 @@ android:id="@+id/imageView3" android:layout_width="match_parent" - android:layout_height="300dp" + android:layout_height="250dp" android:foreground="@drawable/b3" android:foregroundGravity="center_vertical|center|center_horizontal|fill" android:src="@drawable/b3" @@ -28,9 +28,9 @@ android:id="@+id/tvFragmentProfileInfoContainer" android:layout_width="0dp" - android:layout_height="199dp" + android:layout_height="240dp" android:layout_marginStart="20dp" - android:layout_marginTop="150dp" + android:layout_marginTop="120dp" android:layout_marginEnd="20dp" android:adjustViewBounds="true" android:background="@drawable/profile_view_background" @@ -46,10 +46,10 @@ <androidx.cardview.widget.CardView android:id="@+id/cvFragmentHomePageProfile" - android:layout_width="140dp" - android:layout_height="140dp" + android:layout_width="130dp" + android:layout_height="130dp" android:layout_gravity="center" - android:layout_marginTop="80dp" + android:layout_marginTop="60dp" android:elevation="10dp" app:cardCornerRadius="250dp" app:layout_constraintEnd_toEndOf="parent" @@ -74,10 +74,10 @@ android:background="?android:attr/listDivider" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/btnFragmentUserProfileShowPosts" /> + app:layout_constraintTop_toBottomOf="@+id/btnActivityUserProfileShowPosts" /> <Button - android:id="@+id/btnFragmentUserProfileShowPosts" + android:id="@+id/btnActivityUserProfileShowPosts" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="20dp" @@ -116,26 +116,27 @@ android:stateListAnimator="@null" android:text="Recenzije" android:textColor="@color/cardview_dark_background" - app:layout_constraintStart_toEndOf="@+id/btnFragmentUserProfileShowPosts" + app:layout_constraintStart_toEndOf="@+id/btnActivityUserProfileShowPosts" app:layout_constraintTop_toBottomOf="@+id/tvFragmentProfileInfoContainer" /> <FrameLayout - android:id="@+id/flFragmentProfileFragmentContainer" + android:id="@+id/flActivityProfileFragmentContainer" android:layout_width="409dp" android:layout_height="319dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="@+id/divider"> - </FrameLayout> + app:layout_constraintTop_toTopOf="@+id/divider" + app:layout_constraintVertical_bias="0.0"></FrameLayout> <TableLayout android:layout_width="363dp" - android:layout_height="122dp" + android:layout_height="wrap_content" android:layout_marginStart="30dp" - android:layout_marginTop="8dp" + android:layout_marginTop="5dp" android:layout_marginEnd="30dp" android:layout_marginBottom="8dp" android:elevation="1dp" @@ -145,7 +146,8 @@ app:layout_constraintBottom_toBottomOf="@+id/tvFragmentProfileInfoContainer" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/cvFragmentHomePageProfile"> + app:layout_constraintTop_toBottomOf="@+id/cvFragmentHomePageProfile" + app:layout_constraintVertical_bias="0.35000002"> <TableRow android:layout_width="match_parent" @@ -158,92 +160,149 @@ android:layout_height="match_parent" android:layout_column="1" android:layout_gravity="center" - android:layout_marginBottom="5dp" android:text="Petar Petrović" - android:textSize="20sp" /> + android:textStyle="bold" + android:textSize="23sp" /> </TableRow> - <TableRow> - - <androidx.constraintlayout.widget.ConstraintLayout android:layout_span="3"> - - <ImageButton - android:id="@+id/materialButton" - android:layout_width="115dp" - android:layout_height="40dp" - android:layout_marginStart="16dp" - android:background="@drawable/rounded_transparent_button" - android:foreground="@drawable/button_follow" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - app:layout_constraintVertical_bias="0.0" - tools:ignore="TouchTargetSizeCheck" /> - - <ImageButton - android:layout_width="115dp" - android:layout_height="40dp" - android:layout_gravity="center" - android:layout_marginEnd="16dp" - android:height="40dp" - android:background="@drawable/rounded_transparent_button" - android:foreground="@drawable/button_chat" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toTopOf="parent" - app:layout_constraintVertical_bias="0.0" - tools:ignore="SpeakableTextPresentCheck" /> - </androidx.constraintlayout.widget.ConstraintLayout> - </TableRow> - - - <TableRow android:layout_marginTop="5dp"> + <TableRow android:layout_marginTop="20dp"> <TextView android:id="@+id/tvFragmentUserProfilePosts" - android:layout_width="110dp" + android:layout_width="105dp" android:gravity="center" - android:text="OBJAVE" /> + android:text="OBJAVE" + android:stateListAnimator="@null" + android:backgroundTint="@color/white" + android:textColor="#757471"/> - <TextView - android:id="@+id/tvFragmentUserProfileFollowers" - android:layout_width="10dp" + <Button + android:id="@+id/tvActivityUserProfileFollowers" + android:layout_width="110dp" + android:layout_height="28dp" + android:layout_margin="0dp" + android:backgroundTint="@color/white" + android:clickable="true" android:gravity="center" - android:text="PRATIOCI" /> + android:padding="0dp" + android:stateListAnimator="@null" + android:text="PRATIOCI" + android:textColor="#757471" - <TextView - android:id="@+id/tvFragmentUserProfileFollow" + tools:ignore="TouchTargetSizeCheck" /> + <Button + android:id="@+id/tvActivityUserProfileFollow" android:layout_width="110dp" + android:layout_height="28dp" + android:layout_margin="0dp" + android:backgroundTint="@color/white" + android:clickable="true" android:gravity="center" - android:text="PRAĆENJA" /> + android:padding="0dp" + android:stateListAnimator="@null" + android:text="PRAĆENJA" + android:textColor="#757471" + tools:ignore="TouchTargetSizeCheck" /> </TableRow> - <TableRow> - + <TableRow + android:layout_height="wrap_content" + > <TextView android:id="@+id/tvActivityUserProfilePostsNo" android:layout_width="110dp" - android:layout_height="match_parent" + android:layout_height="wrap_content" android:gravity="center" android:text="156" - android:textFontWeight="700" /> + android:textSize="20dp" + android:textStyle="bold" /> <TextView android:id="@+id/tvActivityUserProfileFollowersNo" android:layout_width="110dp" android:gravity="center" - android:text="50" /> + android:text="50" + android:textSize="20dp" + android:textStyle="bold"/> <TextView android:id="@+id/tvActivityUserProfileFollowNo" android:layout_width="110dp" android:gravity="center" - android:text="40" /> + android:text="40" + android:textSize="20dp" + android:textStyle="bold"/> </TableRow> + <TableRow + android:layout_height="wrap_content" + android:layout_marginTop="10dp" + > + + <androidx.constraintlayout.widget.ConstraintLayout android:layout_span="3"> + + <Button + + android:id="@+id/btnActivityUserProfileFollow" + android:layout_width="280dp" + android:layout_height="30dp" + android:layout_marginStart="16dp" + android:clickable="true" + android:drawableLeft="@drawable/ic_outline_person_add_alt_24" + android:insetTop="0dp" + android:insetBottom="0dp" + android:backgroundTint="@color/button_main" + android:text="PRATI" + android:visibility="visible" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0.13" + app:shapeAppearanceOverlay="@style/Circular" + tools:ignore="TouchTargetSizeCheck" /> + + <Button + + android:id="@+id/btnActivityUserProfileUnFollow" + android:layout_width="280dp" + android:layout_height="30dp" + android:layout_marginStart="16dp" + android:clickable="false" + android:drawableLeft="@drawable/ic_outline_person_remove_24" + android:insetTop="0dp" + android:insetBottom="0dp" + android:text="NE PRATI više" + android:backgroundTint="@color/unfollow" + + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0.13" + app:shapeAppearanceOverlay="@style/Circular" + tools:ignore="TouchTargetSizeCheck" /> + + + <ImageButton + android:id="@+id/activityUserProfileOpenChat" + android:layout_width="35dp" + android:layout_height="30dp" + android:layout_gravity="center" + android:layout_marginEnd="16dp" + android:height="40dp" + android:background="@drawable/rounded_button" + android:backgroundTint="@color/button_main" + android:src="@drawable/ic_round_message_24" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0.0" + app:shapeAppearanceOverlay="@style/Circular" + tools:ignore="SpeakableTextPresentCheck,TouchTargetSizeCheck" /> + </androidx.constraintlayout.widget.ConstraintLayout> + </TableRow> </TableLayout> </androidx.constraintlayout.widget.ConstraintLayout> 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 2342779..7858e94 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/chat_message.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/chat_message.xml @@ -1,26 +1,78 @@ <?xml version="1.0" encoding="utf-8"?> <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="wrap_content" - android:layout_height="wrap_content" xmlns:app="http://schemas.android.com/apk/res-auto" - android:background="@drawable/rounded_cyan_button" - android:clipToOutline="true" + android:id="@+id/clMessage" android:layout_margin="@dimen/text_padding" + android:layout_height="wrap_content" + android:layout_width="wrap_content" android:layout_gravity="end"> + + <androidx.cardview.widget.CardView + android:id="@+id/cardView" + android:layout_width="wrap_content" + android:layout_height="30dp" + android:backgroundTint="@color/unfollow" + android:elevation="5dp" + app:cardCornerRadius="15dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + + <com.google.android.material.textview.MaterialTextView + + android:id="@+id/tvMessage" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginEnd="16dp" + android:background="@drawable/view_corner_radius" + android:backgroundTint="@color/unfollow" + android:padding="5dp" + android:text="blabla" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <TextView + android:id="@+id/tvDate" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="32dp" + android:paddingStart="8dp" + android:paddingTop="4dp" + android:paddingEnd="8dp" + android:paddingBottom="4dp" + android:text="June 10" + android:textColor="#C0C0C0" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + <androidx.cardview.widget.CardView + android:id="@+id/cvContainer" android:layout_width="wrap_content" android:layout_height="wrap_content" + app:cardBackgroundColor="@color/dark_blue_transparent" + app:cardCornerRadius="12dp" + app:cardElevation="0dp" + app:cardPreventCornerOverlap="false" + app:cardUseCompatPadding="true" app:layout_constraintEnd_toEndOf="parent" - app:cardBackgroundColor="@color/cardview_dark_background"> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textColor="@color/white" - android:id="@+id/tvMessage" - android:text="blabla" - android:padding="@dimen/component_padding"/> + app:layout_constraintTop_toBottomOf="@id/tvDate"> + + + + </androidx.cardview.widget.CardView> + <TextView + android:id="@+id/tvTimestamp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="10:00" + android:textColor="#C0C0C0" + android:textSize="10sp" + app:layout_constraintBottom_toBottomOf="@+id/cvContainer" + app:layout_constraintEnd_toStartOf="@+id/cvContainer" /> + + </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file 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 647127c..aaabd86 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 @@ -1,23 +1,78 @@ <?xml version="1.0" encoding="utf-8"?> <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="wrap_content" - android:layout_height="wrap_content" xmlns:app="http://schemas.android.com/apk/res-auto" - android:background="@drawable/rounded_cyan_button" + + xmlns:tools="http://schemas.android.com/tools" android:id="@+id/clMessage" - android:layout_margin="@dimen/text_padding" - android:clipToOutline="true"> + android:layout_width="wrap_content" + android:layout_height="wrap_content" - <androidx.cardview.widget.CardView + android:layout_marginStart="8dp" + android:layout_marginTop="16dp"> + + <TextView + android:id="@+id/tvDate" android:layout_width="wrap_content" android:layout_height="wrap_content" - app:cardBackgroundColor="@color/dark_blue_transparent"> + android:layout_marginTop="32dp" + android:elevation="10dp" + + android:paddingTop="4dp" + android:paddingEnd="8dp" + android:paddingBottom="4dp" + android:text="June 10" + android:textColor="#C0C0C0" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.0" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <androidx.cardview.widget.CardView + android:id="@+id/cvContainer" + android:layout_width="wrap_content" + android:layout_height="30dp" + android:layout_margin="5dp" + android:elevation="5dp" + app:cardCornerRadius="10dp" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> + + + + <LinearLayout + android:id="@+id/llContainer" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="vertical"> + <TextView + android:id="@+id/tvMessage" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:padding="5dp" + android:text="blabla" + app:cardBackgroundColor="#eef1f6" + app:cardCornerRadius="12dp" + app:cardElevation="0dp" + app:cardPreventCornerOverlap="false" + app:cardUseCompatPadding="true" + app:layout_constraintTop_toBottomOf="@+id/tvDate"/> + + </LinearLayout> + + </androidx.cardview.widget.CardView> + + <TextView + android:id="@+id/tvTimestamp" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/white" - android:id="@+id/tvMessage" - android:text="blabla" - android:padding="@dimen/component_padding"/> - </androidx.cardview.widget.CardView> + android:layout_marginStart="4dp" + android:layout_marginTop="-5dp" + android:text="8:00" + android:textColor="#C0C0C0" + android:textSize="10sp" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/tvDate" /> + + </androidx.constraintlayout.widget.ConstraintLayout>
\ 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 bc43f1b..d0c6a2d 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/follower_item.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/follower_item.xml @@ -4,13 +4,14 @@ xmlns:tools="http://schemas.android.com/tools" android:id="@+id/tvFolloewItemUsername" android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_height="wrap_content" android:layout_marginBottom="10dp"> <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" + android:elevation="10dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="1.0" app:layout_constraintStart_toStartOf="parent" @@ -19,8 +20,8 @@ <androidx.cardview.widget.CardView android:id="@+id/cvFragmentHomePageProfile" - android:layout_width="100dp" - android:layout_height="100dp" + android:layout_width="80dp" + android:layout_height="80dp" android:layout_gravity="center" android:elevation="10dp" @@ -58,13 +59,14 @@ </TextView> <TextView + android:id="@+id/tvFollowerItemUsername" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="Petar Petrovic" android:textSize="15sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/materialButton" - app:layout_constraintHorizontal_bias="0.656" + app:layout_constraintHorizontal_bias="0.597" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/tvFollowerItemName" app:layout_constraintVertical_bias="0.0" /> 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 5d9e62c..f39acf2 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,44 +4,56 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="#f6f6f6" tools:context=".Fragments.FragmentHomePage"> + <TextView + android:id="@+id/brzodolokacije" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="20dp" + android:layout_marginTop="40dp" + android:text="BrzoDoLokacije" + android:textSize="20dp" + android:textStyle="bold" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + <!-- <TextView android:id="@+id/tvFragmentHomePageHelloName" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginStart="16dp" + android:layout_marginStart="20dp" android:layout_marginTop="56dp" - android:layout_marginEnd="107dp" android:text="Zdravo, Mia" - app:layout_constraintEnd_toStartOf="@+id/cvFragmentHomePageProfile" - app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toEndOf="@+id/cvFragmentHomePageProfile" app:layout_constraintTop_toTopOf="parent" /> - + --> <androidx.cardview.widget.CardView android:id="@+id/cvFragmentHomePageProfile" - android:layout_width="70dp" - android:layout_height="70dp" + android:layout_width="50dp" + android:layout_height="50dp" android:layout_gravity="center" android:layout_marginTop="24dp" - android:layout_marginEnd="24dp" + android:layout_marginEnd="16dp" app:cardCornerRadius="250dp" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toEndOf="@+id/tvFragmentHomePageHelloName" app:layout_constraintTop_toTopOf="parent"> <ImageView android:id="@+id/ivFragmentHomePageProfile" - android:layout_width="70dp" - android:layout_height="70dp" + android:layout_width="50dp" + android:layout_height="50dp" android:scaleType="centerCrop" android:src="@drawable/ic_baseline_person_24" - tools:ignore="ContentDescription" /> + tools:ignore="ContentDescription" + tools:layout_editor_absoluteX="9dp" + tools:layout_editor_absoluteY="15dp" /> </androidx.cardview.widget.CardView> - - +<!-- <TextView android:id="@+id/tvFragmentHomePageSearch" android:layout_width="wrap_content" @@ -49,34 +61,35 @@ android:layout_marginStart="16dp" android:layout_marginTop="8dp" android:text="Pretraži lokacije" + android:visibility="invisible" android:textSize="20sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/cvFragmentHomePageProfile" /> - + --> <androidx.cardview.widget.CardView android:id="@+id/cvFragmentHomePageSearch" android:layout_width="0dp" android:layout_height="40dp" - android:layout_marginTop="10dp" android:layout_marginStart="16dp" + android:layout_marginTop="45dp" android:layout_marginEnd="16dp" android:elevation="0dp" app:cardCornerRadius="20dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/tvFragmentHomePageSearch"> + app:layout_constraintTop_toBottomOf="@+id/brzodolokacije"> <com.google.android.material.textfield.TextInputEditText android:id="@+id/etFragmentHomePageSearch" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@drawable/rounded_white_button_login" - android:hint=" Pretraga" - android:paddingLeft="15dp" - android:inputType="textPersonName" /> + android:backgroundTint="@color/white" + android:hint=" Pretraži lokacije" + android:inputType="textPersonName" + android:paddingLeft="15dp" /> <com.google.android.material.button.MaterialButton android:layout_width="49dp" @@ -95,6 +108,7 @@ android:id="@+id/btnFragmentHomePageBack" android:layout_width="63dp" android:layout_height="40dp" + android:layout_marginTop="8dp" android:clickable="true" android:src="@drawable/ic_baseline_arrow_back_24" app:layout_constraintStart_toStartOf="parent" @@ -104,8 +118,6 @@ android:id="@+id/flFragmentHomePageMainContent" android:layout_width="match_parent" android:layout_height="0dp" - android:layout_marginStart="16dp" - android:layout_marginEnd="16dp" android:layout_marginBottom="8dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -113,4 +125,17 @@ app:layout_constraintTop_toBottomOf="@+id/btnFragmentHomePageBack"> </FrameLayout> + + <ImageView + android:id="@+id/ivFragmentHomePageChat" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="40dp" + android:layout_marginEnd="20dp" + android:clickable="true" + android:src="@drawable/ic_round_chat_24" + app:layout_constraintEnd_toStartOf="@+id/cvFragmentHomePageProfile" + app:layout_constraintTop_toTopOf="parent" /> + + </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_home_page_main_scroll.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_home_page_main_scroll.xml index 90d1037..07d34a3 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 @@ -3,6 +3,7 @@ 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.FragmentHomePageMainScroll"> <LinearLayout @@ -12,37 +13,47 @@ <androidx.cardview.widget.CardView - android:id="@+id/cvFragmentHomePageText1" + 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:layout_height="wrap_content" + android:stateListAnimator="@null" + android:elevation="0dp" + android:layout_marginTop="16dp"> <TextView - android:id="@+id/tvFragmentHomePagePopular" + android:id="@+id/tvFragmentHomePageNewest" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_gravity="left" - android:text="Popularno" + android:text="Najnovije" + android:clickable="true" android:textStyle="bold" /> + <TextView - android:id="@+id/tvFragmentHomePagePopularShowAll" + 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" - - tools:ignore="TouchTargetSizeCheck" /> - + android:text="Prikaži sve" /> </androidx.cardview.widget.CardView> <androidx.recyclerview.widget.RecyclerView - android:id="@+id/rvFragmentHomePagePopular" + 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" - android:layout_marginBottom="16dp" /> + 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" @@ -128,36 +139,72 @@ </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/cvFragmentHomePageText2" + android:backgroundTint="#f6f6f6" + android:layout_marginTop="16dp" + android:id="@+id/cvFragmentHomePageText1" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="16dp"> + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" + android:elevation="0dp" + app:cardElevation="0dp" + > <TextView - android:id="@+id/tvFragmentHomePageNewest" + android:id="@+id/tvFragmentHomePagePopular" android:layout_width="wrap_content" - android:layout_height="wrap_content" + android:layout_height="match_parent" android:layout_gravity="left" - android:text="Najnovije" + android:text="Popularno" android:textStyle="bold" /> <TextView - android:id="@+id/tvFragmentHomePageNewestShowAll" + 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" /> + android:text="Prikaži sve" + + tools:ignore="TouchTargetSizeCheck" /> + </androidx.cardview.widget.CardView> <androidx.recyclerview.widget.RecyclerView - android:id="@+id/rvFragmentHomePageNewest" + android:id="@+id/rvFragmentHomePagePopular" android:layout_width="match_parent" - android:layout_height="wrap_content" /> + 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" @@ -168,7 +215,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="left" - android:text="Najposećenije" + android:text="Najbolje ocenjeno" android:textStyle="bold" /> <TextView @@ -181,10 +228,13 @@ </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 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 ec78de6..7531cf5 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_profile.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_profile.xml @@ -188,8 +188,7 @@ <View android:id="@+id/divider" android:layout_width="409dp" - android:layout_height="1dp" - android:background="?android:attr/listDivider" + android:layout_height="40dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/btnFragmentProfileShowMyPosts" /> @@ -241,6 +240,7 @@ android:id="@+id/flFragmentProfileFragmentContainer" android:layout_width="409dp" android:layout_height="319dp" + android:layout_marginTop="40dp" 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_show_user_posts.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_show_user_posts.xml new file mode 100644 index 0000000..59450d3 --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_show_user_posts.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8"?> +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + tools:context=".Fragments.FragmentShowUserPosts"> + + <!-- TODO: Update blank fragment layout --> + <TextView + android:layout_width="match_parent" + android:layout_height="match_parent" /> + + <androidx.recyclerview.widget.RecyclerView + android:layout_width="match_parent" + android:layout_height="match_parent" /> + +</FrameLayout>
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_followers.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_followers.xml new file mode 100644 index 0000000..8b820bc --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_followers.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8"?> +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + tools:context=".Fragments.FragmentUserFollowers"> + + <!-- TODO: Update blank fragment layout --> + <TextView + android:layout_width="match_parent" + android:layout_height="match_parent" /> + + <androidx.recyclerview.widget.RecyclerView + android:id="@+id/rvFragmentUserFollowers" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + +</FrameLayout>
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_following.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_following.xml new file mode 100644 index 0000000..7558375 --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_following.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8"?> +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + tools:context=".Fragments.FragmentUserFollowing"> + + <!-- TODO: Update blank fragment layout --> + <TextView + android:layout_width="match_parent" + android:layout_height="match_parent" /> + + <androidx.recyclerview.widget.RecyclerView + android:id="@+id/rvFragmentUserFollowing" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + +</FrameLayout>
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_posts.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_posts.xml index effb6e5..a396416 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_posts.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_posts.xml @@ -10,8 +10,7 @@ android:orientation="vertical" <!-- TODO: Update blank fragment layout --> <androidx.cardview.widget.CardView - android:layout_marginTop="35dp" - android:layout_width="match_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> <ImageView diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_posts_profile_activity.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_posts_profile_activity.xml new file mode 100644 index 0000000..2c5012e --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_posts_profile_activity.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8"?> +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + tools:context=".Fragments.FragmentUserPostsProfileActivity"> + + <!-- TODO: Update blank fragment layout --> + <TextView + android:layout_width="match_parent" + android:layout_height="match_parent" /> + + <androidx.recyclerview.widget.RecyclerView + android:id="@+id/rvFragmentUserPostsProfileActivity" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + +</FrameLayout>
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_profile.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_profile.xml deleted file mode 100644 index 15031e3..0000000 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_profile.xml +++ /dev/null @@ -1,248 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - xmlns:tools="http://schemas.android.com/tools" - android:layout_width="match_parent" - android:layout_height="match_parent" - tools:context=".Fragments.FragmentUserProfile"> - - - <androidx.constraintlayout.widget.ConstraintLayout - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <ImageView - - android:id="@+id/imageView3" - android:layout_width="match_parent" - android:layout_height="300dp" - 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="150dp" - android:layout_marginEnd="20dp" - android:adjustViewBounds="true" - android:background="@drawable/profile_view_background" - - 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="140dp" - android:layout_height="140dp" - android:layout_gravity="center" - android:layout_marginTop="80dp" - android:elevation="10dp" - app:cardCornerRadius="250dp" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent"> - - <ImageView - - android:id="@+id/tvFragmentProfileProfilePicture" - 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/btnFragmentUserProfileShowPosts" /> - - <Button - android:id="@+id/btnFragmentUserProfileShowPosts" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="20dp" - android:layout_marginTop="4dp" - 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/btnFragmentUserProfileShowData" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="4dp" - android:layout_marginEnd="20dp" - android:backgroundTint="#FFFFFF" - android:stateListAnimator="@null" - android:text="Podaci" - - android:textColor="@color/cardview_dark_background" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="1.0" - app:layout_constraintStart_toEndOf="@+id/btnFragmentUserProfileShowRecensions" - app:layout_constraintTop_toBottomOf="@+id/tvFragmentProfileInfoContainer" /> - - <Button - android:id="@+id/btnFragmentUserProfileShowRecensions" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="36dp" - android:layout_marginTop="4dp" - android:backgroundTint="#FFFFFF" - android:stateListAnimator="@null" - android:text="Recenzije" - android:textColor="@color/cardview_dark_background" - app:layout_constraintStart_toEndOf="@+id/btnFragmentUserProfileShowPosts" - app:layout_constraintTop_toBottomOf="@+id/tvFragmentProfileInfoContainer" /> - - <FrameLayout - android:id="@+id/flFragmentProfileFragmentContainer" - android:layout_width="409dp" - android:layout_height="319dp" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="@+id/divider"> - </FrameLayout> - - <TableLayout - android:elevation="1dp" - - android:layout_width="0dp" - android:layout_height="0dp" - android:layout_marginStart="30dp" - android:layout_marginTop="8dp" - android:layout_marginEnd="30dp" - android:layout_marginBottom="8dp" - android:numColumns="3" - - android:stretchColumns="1" - app:layout_constraintBottom_toBottomOf="@+id/tvFragmentProfileInfoContainer" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/cvFragmentHomePageProfile"> - - <TableRow android:layout_column="1"> - - <TextView - android:id="@+id/tvFragmentUserProfileName" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_column="1" - android:layout_gravity="center" - android:text="Petar Petrović" - android:textSize="20sp" - android:layout_marginBottom="5dp"/> - </TableRow> - - <TableRow> - <androidx.constraintlayout.widget.ConstraintLayout - android:layout_span="3"> - - <ImageButton - - android:id="@+id/materialButton" - android:layout_width="115dp" - android:layout_height="40dp" - android:layout_marginStart="16dp" - android:background="@drawable/rounded_transparent_button" - android:foreground="@drawable/button_follow" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - app:layout_constraintVertical_bias="0.0" - tools:ignore="TouchTargetSizeCheck" /> - - <ImageButton - android:layout_width="115dp" - android:layout_height="40dp" - android:layout_gravity="center" - android:layout_marginEnd="16dp" - android:height="40dp" - android:background="@drawable/rounded_transparent_button" - android:foreground="@drawable/button_chat" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toTopOf="parent" - app:layout_constraintVertical_bias="0.0" - tools:ignore="SpeakableTextPresentCheck" /> - </androidx.constraintlayout.widget.ConstraintLayout> - </TableRow> - - - <TableRow - android:layout_marginTop="5dp"> - - <TextView - android:id="@+id/tvFragmentUserProfilePosts" - android:layout_width="110dp" - android:gravity="center" - android:text="OBJAVE" /> - - <TextView - android:id="@+id/tvFragmentUserProfileFollowers" - android:layout_width="10dp" - android:gravity="center" - android:text="PRATIOCI" /> - - <TextView - android:id="@+id/tvFragmentUserProfileFollow" - - android:layout_width="110dp" - android:gravity="center" - android:text="PRAĆENJA" /> - </TableRow> - - <TableRow> - - <TextView - android:id="@+id/tvFragmentUserProfilePostsNo" - android:layout_width="110dp" - android:gravity="center" - android:textFontWeight="700" - android:text="156" /> - - <TextView - android:id="@+id/tvFragmentUserProfileFollowersNo" - android:layout_width="110dp" - android:gravity="center" - android:text="50" /> - - <TextView - android:id="@+id/tvFragmentUserProfileFollowNo" - android:layout_width="110dp" - android:gravity="center" - android:text="40" /> - - </TableRow> - - </TableLayout> - - </androidx.constraintlayout.widget.ConstraintLayout> - - -</FrameLayout>
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/map_dialogue.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/map_dialogue.xml new file mode 100644 index 0000000..8b48d9d --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/map_dialogue.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="300dp" + android:id="@+id/map_dialogue"> + + <org.osmdroid.views.MapView + android:id="@+id/MapDialogueMapView" + android:layout_width="match_parent" + android:layout_height="match_parent" /> +</RelativeLayout>
\ 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 441f97b..2d32b2d 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 @@ -2,46 +2,106 @@ <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" - android:layout_width="150dp" - android:layout_height="180dp"> + android:layout_width="wrap_content" + android:layout_height="wrap_content"> <com.google.android.material.imageview.ShapeableImageView - android:id="@+id/ivPIHPBackground" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_marginTop="8dp" - android:layout_marginEnd="16dp" - android:layout_marginBottom="8dp" - android:scaleType="fitXY" + android:id="@+id/imageView9" + android:layout_width="170dp" + android:layout_height="240dp" + android:layout_marginStart="8dp" + android:layout_marginTop="4dp" + android:layout_marginEnd="8dp" + android:layout_marginBottom="10dp" + 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" - app:srcCompat="@drawable/b1" /> + app:shapeAppearanceOverlay="@style/Circular" /> <com.google.android.material.imageview.ShapeableImageView - android:id="@+id/ivPIHPMenu" - android:layout_width="0dp" - android:layout_height="22dp" - app:layout_constraintBottom_toBottomOf="@+id/ivPIHPBackground" - - app:layout_constraintEnd_toEndOf="@+id/ivPIHPBackground" - app:layout_constraintHorizontal_bias="0.0" - app:layout_constraintStart_toStartOf="@+id/ivPIHPBackground" - app:shapeAppearanceOverlay="@style/roundedBottom" - app:srcCompat="@color/dark_blue_transparent" /> + android:id="@+id/ivPIHPBackground" + android:layout_width="172dp" + android:layout_height="185dp" + android:layout_marginStart="1dp" + android:layout_marginEnd="1dp" + android:elevation="3dp" + android:scaleType="centerCrop" + app:layout_constraintBottom_toBottomOf="@+id/imageView9" + app:layout_constraintEnd_toEndOf="@id/imageView9" + app:layout_constraintStart_toStartOf="@id/imageView9" + app:layout_constraintTop_toTopOf="@id/imageView9" + app:layout_constraintVertical_bias="0.0" + app:shapeAppearanceOverlay="@style/roundedTop" + app:srcCompat="@drawable/b1" /> <TextView android:id="@+id/tvPIHPLocationName" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="8dp" + android:layout_marginStart="16dp" + android:layout_marginTop="4dp" + android:elevation="3dp" + android:text="TextView" + android:textSize="14sp" + android:textStyle="bold" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/ivPIHPBackground" /> + + <TextView + android:id="@+id/tvPIHPRecension" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + + android:layout_marginEnd="8dp" + android:elevation="3dp" android:text="TextView" - android:textColor="@color/white" - android:textSize="10dp" - app:layout_constraintStart_toStartOf="@+id/ivPIHPMenu" - app:layout_constraintTop_toTopOf="@+id/ivPIHPMenu" /> + android:textSize="11dp" + android:textStyle="bold" + app:layout_constraintEnd_toEndOf="@+id/imageView9" + app:layout_constraintTop_toBottomOf="@+id/ivPIHPBackground" /> + + <ImageView + android:id="@+id/imageView10" + + android:layout_width="15dp" + android:layout_height="15dp" + android:layout_marginTop="8dp" + android:elevation="3dp" + 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:elevation="3dp" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/tvPIHPLocationName" + app:srcCompat="@drawable/ic_baseline_location_on_24" /> + + <TextView + android:id="@+id/tvPIHPLocationDetail" + + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="4dp" + android:layout_marginTop="4dp" + android:elevation="3dp" + android:text="TextView" + android:textSize="11dp" + app:layout_constraintEnd_toEndOf="@+id/imageView9" + app:layout_constraintHorizontal_bias="0.0" + app:layout_constraintStart_toEndOf="@+id/imageView11" + app:layout_constraintTop_toBottomOf="@+id/tvPIHPLocationName" /> + " /> </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 dad1d41..73e546f 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/post_preview.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/post_preview.xml @@ -2,36 +2,51 @@ <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_width="wrap_content" android:layout_height="wrap_content" - android:layout_margin="0dp" - android:background="@drawable/rounded_picture_background" - android:clipToOutline="true" > - <ImageView + <!-- <TextView + android:id="@+id/tvLocationType" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="Tip lokacije" + android:textColor="@color/unfollow" + tools:layout_editor_absoluteX="146dp" + 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_marginStart="16dp" android:layout_marginTop="16dp" - android:outlineProvider="background" + android:layout_marginEnd="16dp" + android:background="@drawable/b1" android:scaleType="centerCrop" - 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:layout_constraintTop_toTopOf="parent" /> <View android:id="@+id/vBanner" android:layout_width="match_parent" - android:layout_height="80dp" - android:background="@color/dark_blue_transparent" - android:outlineProvider="background" - app:layout_constraintBottom_toBottomOf="@+id/locationImage" - tools:layout_editor_absoluteX="10dp"> + android:layout_height="70dp" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" + android:layout_marginBottom="16dp" + android:background="@drawable/view_bottom_corner_radius" + android:backgroundTint="#FFFFFF" + android:elevation="10dp" + 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/locationImage" + app:layout_constraintVertical_bias="0.0"> </View> @@ -40,41 +55,41 @@ android:id="@+id/tvTitle" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginStart="28dp" + android:layout_marginTop="8dp" + android:elevation="10dp" android:gravity="top|left" android:text="Naslov" - android:textColor="@color/white" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.076" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="@+id/vBanner" - app:layout_constraintVertical_bias="0.18" /> - - <TextView - android:id="@+id/tvLocationType" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="Tip lokacije" - android:textColor="@color/white" - app:layout_constraintBottom_toBottomOf="@+id/vBanner" - app:layout_constraintEnd_toStartOf="@+id/tvLocationParent" - app:layout_constraintHorizontal_bias="0.112" + android:textSize="20sp" + android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="@+id/vBanner" - app:layout_constraintVertical_bias="0.721" /> + 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:drawableLeft="@drawable/ic_baseline_location_on_24" + android:text="grad, drzava" android:textAlignment="viewEnd" - android:textColor="@color/white" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.952" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="@+id/vBanner" - app:layout_constraintVertical_bias="0.737" /> + app:layout_constraintTop_toBottomOf="@+id/tvTitle" /> + <TextView + android:id="@+id/tvPostPreviewRating" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="40dp" + android:layout_marginEnd="32dp" + android:drawableLeft="@drawable/ic_baseline_star_rate_24" + android:elevation="10dp" + android:text="TextView" + android:textSize="17dp" + android:textStyle="bold" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toBottomOf="@+id/locationImage" /> </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 12c29ee..72ead29 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 @@ -5,28 +5,25 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="0dp" - android:background="@drawable/rounded_picture_background" - android:clipToOutline="true" > - - <View android:id="@+id/vBannerSinglePostHistory" android:layout_width="match_parent" android:layout_height="80dp" - android:background="@color/dark_blue_transparent" - android:outlineProvider="background" + android:layout_marginStart="16dp" + android:layout_marginTop="16dp" + android:layout_marginEnd="16dp" + android:layout_marginBottom="16dp" + android:background="@drawable/view_corner_radius" + android:elevation="5dp" 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" - tools:layout_editor_absoluteX="10dp" - android:layout_marginTop="5dp" - > + app:layout_constraintVertical_bias="0.0"> </View> @@ -35,25 +32,29 @@ android:id="@+id/tvTitleSinglePostHistory" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginStart="32dp" + android:elevation="5dp" android:gravity="top|left" android:text="Naslov" - android:textColor="@color/white" + android:textSize="20sp" + android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.076" + app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@+id/vBannerSinglePostHistory" - app:layout_constraintVertical_bias="0.18" /> + app:layout_constraintVertical_bias="0.246" /> <TextView android:id="@+id/tvLocationTypeSinglePostHistory" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginStart="32dp" + android:elevation="5dp" android:text="Tip lokacije" - android:textColor="@color/white" app:layout_constraintBottom_toBottomOf="@+id/vBannerSinglePostHistory" app:layout_constraintEnd_toStartOf="@+id/tvLocationParentSinglePostHistory" - app:layout_constraintHorizontal_bias="0.112" + app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@+id/vBannerSinglePostHistory" app:layout_constraintVertical_bias="0.721" /> @@ -62,14 +63,16 @@ android:id="@+id/tvLocationParentSinglePostHistory" android:layout_width="wrap_content" android:layout_height="match_parent" + android:layout_marginEnd="32dp" + android:elevation="5dp" android:text="22.11.2022" + android:textAlignment="viewEnd" - android:textColor="@color/white" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.952" + app:layout_constraintHorizontal_bias="1.0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@+id/vBannerSinglePostHistory" - app:layout_constraintVertical_bias="0.737" /> + app:layout_constraintVertical_bias="0.792" /> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file |