diff options
Diffstat (limited to 'Client')
15 files changed, 226 insertions, 145 deletions
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/MyPostsAdapter.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/MyPostsAdapter.kt index d8a70c6..e557e02 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/MyPostsAdapter.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/MyPostsAdapter.kt @@ -49,7 +49,8 @@ class MyPostsAdapter (val activity:Activity,val items : MutableList<PostPreview> binding.apply { tvTitle.text = item.location.name tvLocationParent.text = item.location.country - tvLocationType.text = "TODO" + tvPostPreviewRating.text=item.ratings.toString() + // tvLocationType.text = "TODO" if(item.images.isNotEmpty()) { Glide.with(activity) .load(RetrofitHelper.baseUrl + "/api/post/image/compress/" + item.images[0]._id) diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ShowPostsAdapter.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ShowPostsAdapter.kt index 8d5007c..8605246 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ShowPostsAdapter.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ShowPostsAdapter.kt @@ -68,7 +68,7 @@ class ShowPostsAdapter (val activity:Activity,val items : MutableList<PostPrevie binding.apply { tvTitle.text = item.location.name tvLocationParent.text = item.location.country - tvLocationType.text = "TODO" + //tvLocationType.text = "TODO" if(item.images.isNotEmpty()) { Glide.with(activity) .load(RetrofitHelper.baseUrl + "/api/post/image/compress/" + item.images[0]._id) diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentUserPostsProfileActivity.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentUserPostsProfileActivity.kt index d841430..9a051e5 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentUserPostsProfileActivity.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentUserPostsProfileActivity.kt @@ -46,7 +46,7 @@ class FragmentUserPostsProfileActivity : Fragment() { } var posts = response.body()!!.toMutableList<PostPreview>() recyclerView.apply { - layoutManager= GridLayoutManager(requireContext(),3, + layoutManager= GridLayoutManager(requireContext(),2, GridLayoutManager.VERTICAL,false) adapter= MyPostsAdapter(requireActivity(),posts) } diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_round_chat_24.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_round_chat_24.xml new file mode 100644 index 0000000..69108ca --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_round_chat_24.xml @@ -0,0 +1,5 @@ +<vector android:autoMirrored="true" android:height="24dp" + android:tint="#747474" android:viewportHeight="24" + android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="@android:color/white" android:pathData="M20,2L4,2c-1.1,0 -1.99,0.9 -1.99,2L2,22l4,-4h14c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM7,9h10c0.55,0 1,0.45 1,1s-0.45,1 -1,1L7,11c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1zM13,14L7,14c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1h6c0.55,0 1,0.45 1,1s-0.45,1 -1,1zM17,8L7,8c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1h10c0.55,0 1,0.45 1,1s-0.45,1 -1,1z"/> +</vector> diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/view_bottom_corner_radius.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/view_bottom_corner_radius.xml new file mode 100644 index 0000000..b5b8ad3 --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/view_bottom_corner_radius.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<shape xmlns:android="http://schemas.android.com/apk/res/android"> + <solid android:color="#FFFFFFFF"/> + <corners + android:topLeftRadius="0dp" + android:topRightRadius="0dp" + android:bottomLeftRadius="10dp" + android:bottomRightRadius="10dp" + /> +</shape>
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/view_corner_radius.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/view_corner_radius.xml new file mode 100644 index 0000000..dd92db4 --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/view_corner_radius.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<shape xmlns:android="http://schemas.android.com/apk/res/android"> + <solid android:color="#FFFFFFFF"/> + <corners + android:topLeftRadius="10dp" + android:topRightRadius="10dp" + android:bottomLeftRadius="10dp" + android:bottomRightRadius="10dp" + /> +</shape>
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/view_top_corner_radius.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/view_top_corner_radius.xml new file mode 100644 index 0000000..dad1a7a --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/view_top_corner_radius.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<shape xmlns:android="http://schemas.android.com/apk/res/android"> + <solid android:color="#FFFFFFFF"/> + <corners + android:topLeftRadius="10dp" + android:topRightRadius="10dp" + android:bottomLeftRadius="0dp" + android:bottomRightRadius="0dp" + /> +</shape>
\ No newline at end of file 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..57269e7 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/chat_message.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/chat_message.xml @@ -3,24 +3,27 @@ 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_gravity="end"> + <androidx.cardview.widget.CardView + android:elevation="5dp" android:layout_width="wrap_content" - android:layout_height="wrap_content" + android:layout_height="30dp" + android:backgroundTint="@color/unfollow" + app:cardCornerRadius="15dp" app:layout_constraintEnd_toEndOf="parent" - app:cardBackgroundColor="@color/cardview_dark_background"> + app:layout_constraintTop_toTopOf="parent"> + + <com.google.android.material.textview.MaterialTextView - <TextView + android:id="@+id/tvMessage" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/white" - android:id="@+id/tvMessage" + android:padding="5dp" android:text="blabla" - android:padding="@dimen/component_padding"/> + /> </androidx.cardview.widget.CardView> </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..56dc09c 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,25 @@ <?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:id="@+id/clMessage" - android:layout_margin="@dimen/text_padding" - android:clipToOutline="true"> + android:layout_width="wrap_content" + android:layout_height="35dp"> + > <androidx.cardview.widget.CardView android:layout_width="wrap_content" - android:layout_height="wrap_content" - app:cardBackgroundColor="@color/dark_blue_transparent"> - <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"/> + android:layout_height="30dp" + android:layout_margin="5dp" + android:elevation="5dp" + app:cardCornerRadius="15dp" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> + + <TextView + android:id="@+id/tvMessage" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:padding="5dp" + android:text="blabla" /> </androidx.cardview.widget.CardView> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_home_page.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_home_page.xml index cbde9c6..0752536 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 @@ -7,6 +7,18 @@ 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" @@ -19,29 +31,29 @@ 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_marginStart="20dp" - android:layout_marginTop="20dp" + android:layout_marginTop="24dp" + android:layout_marginEnd="16dp" app:cardCornerRadius="250dp" - app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toEndOf="parent" 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:layout_editor_absoluteX="9dp" tools:layout_editor_absoluteY="15dp" /> </androidx.cardview.widget.CardView> - +<!-- <TextView android:id="@+id/tvFragmentHomePageSearch" android:layout_width="wrap_content" @@ -55,20 +67,19 @@ 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_marginStart="16dp" - android:layout_marginTop="10dp" + android:layout_marginTop="45dp" android:layout_marginEnd="16dp" - android:layout_marginBottom="15dp" 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 @@ -97,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" @@ -114,5 +126,15 @@ </FrameLayout> + <ImageView + android:id="@+id/imageView12" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="40dp" + android:layout_marginEnd="20dp" + 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 efae8d4..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 @@ -13,41 +14,42 @@ <androidx.cardview.widget.CardView android:backgroundTint="#f6f6f6" -android:layout_marginTop="16dp" - android:id="@+id/cvFragmentHomePageText1" + 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_marginStart="16dp" - android:layout_marginEnd="16dp" - > + 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:layout_marginStart="16dp" android:layout_marginEnd="16dp" - android:id="@+id/rvFragmentHomePagePopular" + 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" @@ -151,55 +153,47 @@ android:layout_marginTop="16dp" android:id="@+id/ll1" android:layout_width="match_parent" android:layout_height="wrap_content"> - <androidx.cardview.widget.CardView android:backgroundTint="#f6f6f6" - android:layout_marginStart="10dp" - android:layout_marginEnd="16dp" - - android:id="@+id/cvFragmentHomePageText2" + android:layout_marginTop="16dp" + android:id="@+id/cvFragmentHomePageText1" android:layout_width="match_parent" android:layout_height="wrap_content" - android:stateListAnimator="@null" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" android:elevation="0dp" - android:layout_marginTop="16dp"> + app:cardElevation="0dp" + > <TextView - android:id="@+id/tvFragmentHomePageNewest" + android:id="@+id/tvFragmentHomePagePopular" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_gravity="left" - android:drawableBottom="@drawable/ic_baseline_circle_7" - android:text="Najnovije" - android:clickable="true" - android:textStyle="bold" /> - <TextView - android:id="@+id/tvFragmentHomePageBestRated" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="left" - android:text="Najposećenije" - android:layout_marginStart="80dp" - android:drawableBottom="@drawable/ic_baseline_circle_7" - + 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/rvFragmentHomePagePopular" + android:layout_width="match_parent" + android:layout_height="wrap_content" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" - android:id="@+id/rvFragmentHomePageNewest" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> -</LinearLayout> + android:layout_marginBottom="16dp" /> + + </LinearLayout> <LinearLayout android:id="@+id/ll2" @@ -208,7 +202,7 @@ android:layout_marginTop="16dp" 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" @@ -216,7 +210,13 @@ android:layout_marginTop="16dp" 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" 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 d2c503f..f940efd 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 @@ -9,9 +9,9 @@ android:id="@+id/imageView9" android:layout_width="170dp" android:layout_height="240dp" - android:layout_marginStart="7dp" + android:layout_marginStart="8dp" android:layout_marginTop="4dp" - android:layout_marginEnd="7dp" + android:layout_marginEnd="8dp" android:layout_marginBottom="10dp" android:elevation="3dp" android:src="@color/white" 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 diff --git a/Client/BrzoDoLokacije/app/src/main/res/values/styles.xml b/Client/BrzoDoLokacije/app/src/main/res/values/styles.xml index 8c8a1fd..ca3ca44 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/values/styles.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/values/styles.xml @@ -7,16 +7,16 @@ </style> <style name="imageViewRoundedEdge" parent=""> <item name="cornerFamily">rounded</item> - <item name="cornerSize">15dp</item> + <item name="cornerSize">10dp</item> <item name="color">@color/white</item> </style> <style name="Circular"> - <item name="cornerSize">12dp</item> + <item name="cornerSize">10dp</item> </style> <style name="roundedBottom"> - <item name="cornerSizeBottomLeft">20dp</item> - <item name="cornerSizeBottomRight">20dp</item> + <item name="cornerSizeBottomLeft">10dp</item> + <item name="cornerSizeBottomRight">10dp</item> </style> <style name="roundedTop"> |