From 19b29a7941105ec6ca66b3a8e9cfbd72358dd449 Mon Sep 17 00:00:00 2001 From: TAMARA JERINIC Date: Sat, 26 Nov 2022 00:37:55 +0100 Subject: Izmenjen prikaz objava na početnoj strani. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Adapters/ShowPostsHomePageAdapter.kt | 5 + .../Fragments/FragmentHomePageMainScroll.kt | 21 +++- .../res/drawable/ic_baseline_location_on_24.xml | 5 + .../main/res/drawable/ic_baseline_star_rate_24.xml | 5 + .../app/src/main/res/layout/fragment_home_page.xml | 36 +++---- .../res/layout/fragment_home_page_main_scroll.xml | 45 +++++++- .../src/main/res/layout/post_item_home_page.xml | 113 ++++++++++++++++----- .../app/src/main/res/values/styles.xml | 1 + 8 files changed, 183 insertions(+), 48 deletions(-) create mode 100644 Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_location_on_24.xml create mode 100644 Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_star_rate_24.xml (limited to 'Client') diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ShowPostsHomePageAdapter.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ShowPostsHomePageAdapter.kt index 3391355..acea646 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ShowPostsHomePageAdapter.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ShowPostsHomePageAdapter.kt @@ -47,6 +47,8 @@ class ShowPostsHomePageAdapter(var postPreview:MutableList,val acti inner class PostViewHolder(view: View):RecyclerView.ViewHolder(view){ private val background:com.google.android.material.imageview.ShapeableImageView=view.findViewById(R.id.ivPIHPBackground) private val locationName:TextView=view.findViewById(R.id.tvPIHPLocationName) + private val locationDetail:TextView=view.findViewById(R.id.tvPIHPLocationDetail) + private val rating:TextView=view.findViewById(R.id.tvPIHPRecension) fun bindView(postPreview:PostPreview){ //background.setImageURI(postPreview.images[0]._id.to) @@ -56,6 +58,9 @@ inner class PostViewHolder(view: View):RecyclerView.ViewHolder(view){ .into(background) } locationName.text=postPreview.location.name + rating.text=postPreview.ratings.toString() + locationDetail.text="Srbija, Kragujevac" + } } } \ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentHomePageMainScroll.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentHomePageMainScroll.kt index cf811df..3846d6c 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentHomePageMainScroll.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentHomePageMainScroll.kt @@ -4,8 +4,11 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.Button import android.widget.ImageButton +import android.widget.LinearLayout import android.widget.Toast +import androidx.core.view.isVisible import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentTransaction import androidx.recyclerview.widget.LinearLayoutManager @@ -17,6 +20,7 @@ import com.example.brzodolokacije.Models.PostPreview import com.example.brzodolokacije.R import com.example.brzodolokacije.Services.RetrofitHelper import com.example.brzodolokacije.Services.SharedPreferencesHelper +import kotlinx.android.synthetic.main.fragment_home_page_main_scroll.* import retrofit2.Call import retrofit2.Callback import retrofit2.Response @@ -42,9 +46,11 @@ class FragmentHomePageMainScroll : Fragment() { private lateinit var location_amusement_park: ImageButton private lateinit var location_attraction: ImageButton private lateinit var location_landmark: ImageButton - +private lateinit var change:Button private lateinit var filter: LocationType private lateinit var filterString: String + private lateinit var ll1: LinearLayout + private lateinit var ll2:LinearLayout override fun onCreateView( @@ -59,7 +65,9 @@ class FragmentHomePageMainScroll : Fragment() { rvPopular=view.findViewById(R.id.rvFragmentHomePagePopular) rvNewest=view.findViewById(R.id.rvFragmentHomePageNewest) rvBestRated=view.findViewById(R.id.rvFragmentHomePageBestRated) - + //change=view.findViewById(R.id.change) + ll1=view.findViewById(R.id.ll1) + ll2=view.findViewById(R.id.ll2) location_amusement_park=view.findViewById(R.id.btnFragmentHomePagelocation_amusement_park) location_attraction=view.findViewById(R.id.btnFragmentHomePagelocation_attraction) location_beach=view.findViewById(R.id.btnFragmentHomePagelocation_beach) @@ -174,9 +182,14 @@ class FragmentHomePageMainScroll : Fragment() { parentFrag.setBtnBackVisible() } + /* ll1.isVisible=true + ll2.isVisible=false + change.setOnClickListener { + ll1.isVisible=true + ll2.isVisible=false + } - - +*/ return view } diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_location_on_24.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_location_on_24.xml new file mode 100644 index 0000000..c0bbc95 --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_location_on_24.xml @@ -0,0 +1,5 @@ + + + diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_star_rate_24.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_star_rate_24.xml new file mode 100644 index 0000000..cdafe07 --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_star_rate_24.xml @@ -0,0 +1,5 @@ + + + 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..cbde9c6 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,6 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="#f6f6f6" tools:context=".Fragments.FragmentHomePage"> @@ -11,13 +12,12 @@ 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" /> + tools:ignore="ContentDescription" + tools:layout_editor_absoluteX="9dp" + tools:layout_editor_absoluteY="15dp" /> - + android:backgroundTint="@color/white" + android:hint=" Pretraži lokacije" + android:inputType="textPersonName" + android:paddingLeft="15dp" /> + + \ 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..2883291 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 @@ -12,9 +12,14 @@ + android:layout_height="wrap_content" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" + > + + + + + + + + - \ 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..9d26ddc 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,109 @@ + android:layout_width="wrap_content" + android:layout_height="wrap_content"> + app:shapeAppearanceOverlay="@style/Circular" /> + android:layout_height="180dp" + android:layout_marginStart="16dp" + android:layout_marginTop="14dp" + android:layout_marginEnd="12dp" + android:elevation="3dp" + android:scaleType="fitXY" + app:layout_constraintBottom_toBottomOf="@+id/imageView9" + app:layout_constraintEnd_toEndOf="@+id/imageView9" + app:layout_constraintHorizontal_bias="1.0" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0.04" + app:shapeAppearanceOverlay="@style/Circular" + app:srcCompat="@drawable/b1" /> + android:textSize="14sp" + android:textStyle="bold" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/ivPIHPBackground" /> + + + + + + + + + " /> \ 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 d8a3730..cad0a8a 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/values/styles.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/values/styles.xml @@ -12,6 +12,7 @@