From 75ff22fde1e7ebc566f54a7d9271923ac156ab89 Mon Sep 17 00:00:00 2001 From: TAMARA JERINIC Date: Tue, 29 Nov 2022 10:31:58 +0100 Subject: Izmenjen izgled objava, početne strane, poruka. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../brzodolokacije/Adapters/MyPostsAdapter.kt | 3 +- .../brzodolokacije/Adapters/ShowPostsAdapter.kt | 2 +- .../Fragments/FragmentUserPostsProfileActivity.kt | 2 +- .../app/src/main/res/drawable/ic_round_chat_24.xml | 5 ++ .../res/drawable/view_bottom_corner_radius.xml | 10 +++ .../src/main/res/drawable/view_corner_radius.xml | 10 +++ .../main/res/drawable/view_top_corner_radius.xml | 10 +++ .../app/src/main/res/layout/chat_message.xml | 19 +++-- .../app/src/main/res/layout/chat_message_other.xml | 30 +++---- .../app/src/main/res/layout/fragment_home_page.xml | 48 ++++++++--- .../res/layout/fragment_home_page_main_scroll.xml | 88 ++++++++++---------- .../src/main/res/layout/post_item_home_page.xml | 4 +- .../app/src/main/res/layout/post_preview.xml | 93 +++++++++++++--------- .../src/main/res/layout/single_post_history.xml | 39 ++++----- .../app/src/main/res/values/styles.xml | 8 +- 15 files changed, 226 insertions(+), 145 deletions(-) create mode 100644 Client/BrzoDoLokacije/app/src/main/res/drawable/ic_round_chat_24.xml create mode 100644 Client/BrzoDoLokacije/app/src/main/res/drawable/view_bottom_corner_radius.xml create mode 100644 Client/BrzoDoLokacije/app/src/main/res/drawable/view_corner_radius.xml create mode 100644 Client/BrzoDoLokacije/app/src/main/res/drawable/view_top_corner_radius.xml 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 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() 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 @@ + + + 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 @@ + + + + + \ 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 @@ + + + + + \ 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 @@ + + + + + \ 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"> + + app:layout_constraintTop_toTopOf="parent"> + + + /> \ 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 @@ + android:layout_width="wrap_content" + android:layout_height="35dp"> + > - + android:layout_height="30dp" + android:layout_margin="5dp" + android:elevation="5dp" + app:cardCornerRadius="15dp" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> + + \ 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"> + + - + + app:layout_constraintTop_toBottomOf="@+id/brzodolokacije"> + + \ 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"> + android:stateListAnimator="@null" + android:elevation="0dp" + android:layout_marginTop="16dp"> + - + android:text="Prikaži sve" /> + android:layout_height="wrap_content" /> - + app:cardElevation="0dp" + > - + android:text="Prikaži sve" + + tools:ignore="TouchTargetSizeCheck" /> + - + android:layout_marginBottom="16dp" /> + + - + - --> + + + app:layout_constraintTop_toTopOf="parent" /> + 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"> @@ -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" /> - - + app:layout_constraintTop_toBottomOf="@+id/locationImage" /> + app:layout_constraintTop_toBottomOf="@+id/tvTitle" /> + \ 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" > - - + app:layout_constraintVertical_bias="0.0"> @@ -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" /> @@ -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" /> \ 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 @@