From e724e67c83fd5f4ef16560194db76eb09658c178 Mon Sep 17 00:00:00 2001 From: TAMARA JERINIC Date: Mon, 12 Dec 2022 19:12:58 +0100 Subject: Izmena stranica home page, single post, home page item, --- .../Activities/ActivitySinglePost.kt | 4 +- .../Activities/NavigationActivity.kt | 10 ++--- .../brzodolokacije/Adapters/ShowPostsAdapter.kt | 2 + .../main/res/drawable/ic_baseline_download_24.xml | 5 +++ .../res/drawable/ic_outline_star_border_24.xml | 5 +++ .../main/res/drawable/view_top_corner_radius.xml | 4 +- .../src/main/res/layout/activity_opened_images.xml | 13 +++--- .../src/main/res/layout/activity_single_post.xml | 18 ++++---- .../main/res/layout/bottom_sheet_add_new_post.xml | 3 +- .../app/src/main/res/layout/fragment_home_page.xml | 3 +- .../res/layout/fragment_home_page_main_scroll.xml | 48 ++++++++++++---------- .../layout/fragment_single_post_description.xml | 39 +++++++++++------- .../src/main/res/layout/post_item_home_page.xml | 36 ++++++++-------- .../app/src/main/res/layout/post_preview.xml | 2 +- 14 files changed, 114 insertions(+), 78 deletions(-) create mode 100644 Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_download_24.xml create mode 100644 Client/BrzoDoLokacije/app/src/main/res/drawable/ic_outline_star_border_24.xml diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivitySinglePost.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivitySinglePost.kt index 54eab14..040edf3 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivitySinglePost.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivitySinglePost.kt @@ -2,6 +2,7 @@ package com.example.brzodolokacije.Activities import android.content.Intent import android.graphics.Color +import android.graphics.drawable.GradientDrawable import android.os.Bundle import android.preference.PreferenceManager import android.util.TypedValue @@ -41,6 +42,7 @@ import org.osmdroid.views.MapView import org.osmdroid.views.overlay.Marker import retrofit2.Call import retrofit2.Response +import java.text.SimpleDateFormat class ActivitySinglePost : AppCompatActivity(),OnRefreshListener { @@ -315,7 +317,7 @@ class ActivitySinglePost : AppCompatActivity(),OnRefreshListener { tvNumberOfRatings.invalidate() //tvRating.text=String.format("%.2f",data.ratings) //tvNumberOfRatings.text=String.format("%d",data.ratingscount) - tvDatePosted.text=post.createdAt.toLocaleString() + tvDatePosted.text=SimpleDateFormat("dd/MM/yyyy").format(post.lastViewed) tvDatePosted.invalidate() } diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/NavigationActivity.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/NavigationActivity.kt index 61c69a0..01c6993 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/NavigationActivity.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/NavigationActivity.kt @@ -63,7 +63,7 @@ class NavigationActivity : AppCompatActivity() { bottomSheetDialog2.setContentView(R.layout.bottom_sheet_add_new_post) bottomSheetDialog2.show() - var close=bottomSheetDialog2.findViewById(R.id.btnBottomSheetAddNewPostClose) as ImageButton + var openAddPost=bottomSheetDialog2.findViewById(R.id.btnBottomSheetAddNewPostOpenAddPost) as Button var capturePost=bottomSheetDialog2.findViewById(R.id.btnBottomSheetAddNewPostOpenCapturePost) as Button @@ -77,9 +77,7 @@ class NavigationActivity : AppCompatActivity() { val intent = Intent (this, ActivityCapturePost::class.java) startActivity(intent) } - close.setOnClickListener { - bottomSheetDialog2.dismiss() - } + } private fun showBottomSheetAddNew(){ @@ -103,9 +101,7 @@ class NavigationActivity : AppCompatActivity() { startActivity(intent) } - close.setOnClickListener { - bottomSheetDialog.dismiss() - } + } fun KeyboardEvents(){ 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 d287097..f0de037 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 @@ -17,6 +17,7 @@ import com.example.brzodolokacije.Models.PostPreview import com.example.brzodolokacije.Services.RetrofitHelper import com.example.brzodolokacije.Services.SharedPreferencesHelper import com.example.brzodolokacije.databinding.PostPreviewBinding +import java.text.SimpleDateFormat class ShowPostsAdapter (val activity:Activity,val items : MutableList?=null) @@ -67,6 +68,7 @@ class ShowPostsAdapter (val activity:Activity,val items : MutableList + + diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_outline_star_border_24.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_outline_star_border_24.xml new file mode 100644 index 0000000..458d104 --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_outline_star_border_24.xml @@ -0,0 +1,5 @@ + + + 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 index dad1a7a..cbf3e2c 100644 --- 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 @@ -2,8 +2,8 @@ diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_opened_images.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_opened_images.xml index 3a1fbbc..53bed93 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_opened_images.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_opened_images.xml @@ -14,21 +14,24 @@ app:layout_constraintStart_toStartOf="parent" android:background="@color/unfollow_transparent" android:id="@+id/clImageHeader"> + + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + android:src="@drawable/ic_baseline_download_24" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" /> @@ -93,9 +94,9 @@ android:gravity="top|start" android:padding="@dimen/text_padding" android:text="User" + android:textColor="#FF03DAC5" android:textSize="20dp" android:textStyle="bold" - android:textColor="#FF03DAC5" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/tvLocationType" /> @@ -123,8 +124,8 @@ android:id="@+id/ivFavourite" android:layout_width="30dp" android:layout_height="30dp" - android:clickable="true" android:layout_marginRight="5dp" + android:clickable="true" android:src="@drawable/ic_baseline_favorite_border_24" app:layout_constraintBottom_toBottomOf="@+id/tvRating" app:layout_constraintEnd_toStartOf="@+id/tvRating" @@ -132,13 +133,13 @@ @@ -149,8 +150,8 @@ android:layout_height="wrap_content" android:layout_marginTop="24dp" android:padding="@dimen/text_padding" - android:textSize="15dp" android:text="(10,500)" + android:textSize="15dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -178,8 +179,11 @@ + android:orientation="vertical" + android:background="@drawable/view_top_corner_radius"> + android:layout_height="match_parent"> + android:stateListAnimator="@null" + app:cardElevation="0dp"> - + + android:layout_marginBottom="5dp" + + app:cardElevation="0dp"> @@ -183,7 +186,7 @@ android:layout_height="wrap_content" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" - android:layout_marginBottom="16dp" /> + android:layout_marginBottom="8dp" /> + + android:layout_marginStart="16dp" + android:layout_marginTop="16dp" + android:layout_marginEnd="16dp" + android:backgroundTint="#FFFCFCFC" + app:cardElevation="0dp"> - - + app:layout_constraintTop_toTopOf="parent"> + + + app:layout_constraintTop_toBottomOf="@+id/cvDescription"> + android:src="@drawable/ic_outline_star_border_24" /> + android:src="@drawable/ic_outline_star_border_24" /> + android:src="@drawable/ic_outline_star_border_24" /> + android:src="@drawable/ic_outline_star_border_24" /> + android:src="@drawable/ic_outline_star_border_24" /> 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 3aa56f9..9622c34 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/post_item_home_page.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/post_item_home_page.xml @@ -7,8 +7,8 @@ + app:layout_constraintBottom_toTopOf="@+id/tvPIHPLocationDetail" + app:layout_constraintStart_toStartOf="parent" /> + app:layout_constraintBottom_toBottomOf="@+id/imageView9" + app:layout_constraintEnd_toEndOf="@+id/imageView9" /> + app:layout_constraintStart_toEndOf="@+id/imageView11" /> " /> 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 3821869..0ce4776 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/post_preview.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/post_preview.xml @@ -115,7 +115,7 @@ android:layout_marginTop="2dp" android:layout_marginEnd="24dp" android:elevation="10dp" - android:text="TextView" + android:textSize="16sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@+id/tvPostPreviewRating" /> -- cgit v1.2.3