From 2bca4c889e3f12aaead975a530be8f8c046b1b16 Mon Sep 17 00:00:00 2001 From: Ognjen Cirkovic Date: Fri, 9 Dec 2022 22:56:27 +0100 Subject: Omogucena pretraga po tagovima sa pocetne strane. Izbrisana ikonica za chat na fragmentu sve objave. --- .../Fragments/FragmentHomePageMainScroll.kt | 84 +++++----------------- .../brzodolokacije/Fragments/FragmentShowPosts.kt | 5 +- .../src/main/res/layout/fragment_show_posts.xml | 13 +--- 3 files changed, 19 insertions(+), 83 deletions(-) (limited to 'Client') 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 df41b3a..0c822f1 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 @@ -13,6 +13,7 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import androidx.swiperefreshlayout.widget.SwipeRefreshLayout import androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener +import com.example.brzodolokacije.Activities.NavigationActivity import com.example.brzodolokacije.Adapters.ShowPostsHomePageAdapter import com.example.brzodolokacije.Interfaces.IBackendApi import com.example.brzodolokacije.Models.LocationType @@ -85,101 +86,44 @@ private lateinit var change:Button var fragment=FragmentShowPostsByLocation() location_spa.setOnClickListener { - filter=LocationType.BANJA - filterString=filter.toString() - bundle.putString("data",filterString) - fragment.arguments=bundle + tagSearch("Banja") + - val parentFrag: FragmentHomePage = this@FragmentHomePageMainScroll.getParentFragment() as FragmentHomePage - parentFrag.changeScrollVIewToLocationView() - parentFrag.setBtnBackVisible() } location_waterfall.setOnClickListener { - filter=LocationType.VODOPAD - filterString=filter.toString() - bundle.putString("data",filterString) - fragment.arguments=bundle - - val parentFrag: FragmentHomePage = this@FragmentHomePageMainScroll.getParentFragment() as FragmentHomePage - parentFrag.changeScrollVIewToLocationView() - parentFrag.setBtnBackVisible() + tagSearch("Vodopad") } location_mountain.setOnClickListener { - filter=LocationType.PLANINA - filterString=filter.toString() - bundle.putString("data",filterString) - fragment.arguments=bundle - - val parentFrag: FragmentHomePage = this@FragmentHomePageMainScroll.getParentFragment() as FragmentHomePage - parentFrag.changeScrollVIewToLocationView() - parentFrag.setBtnBackVisible() + tagSearch("Planina") } location_landmark.setOnClickListener { - filter=LocationType.LOKALITET - filterString=filter.toString() - bundle.putString("data",filterString) - fragment.arguments=bundle - - val parentFrag: FragmentHomePage = this@FragmentHomePageMainScroll.getParentFragment() as FragmentHomePage - parentFrag.changeScrollVIewToLocationView() - parentFrag.setBtnBackVisible() + tagSearch("Lokalitet") } location_city.setOnClickListener { - filter=LocationType.GRAD - filterString=filter.toString() - bundle.putString("data",filterString) - fragment.arguments=bundle - - val parentFrag: FragmentHomePage = this@FragmentHomePageMainScroll.getParentFragment() as FragmentHomePage - parentFrag.changeScrollVIewToLocationView() - parentFrag.setBtnBackVisible() + tagSearch("Grad") } location_lake.setOnClickListener { - filter=LocationType.JEZERO - filterString=filter.toString() - bundle.putString("data",filterString) - fragment.arguments=bundle - val parentFrag: FragmentHomePage = this@FragmentHomePageMainScroll.getParentFragment() as FragmentHomePage - parentFrag.changeScrollVIewToLocationView() - parentFrag.setBtnBackVisible() + tagSearch("Jezero") } location_attraction.setOnClickListener { - filter=LocationType.ATRAKCIJA - filterString=filter.toString() - bundle.putString("data",filterString) - fragment.arguments=bundle - val parentFrag: FragmentHomePage = this@FragmentHomePageMainScroll.getParentFragment() as FragmentHomePage - parentFrag.changeScrollVIewToLocationView() - parentFrag.setBtnBackVisible() + tagSearch("Atrakcija") } location_amusement_park.setOnClickListener { - filter=LocationType.ZABAVNI_PARK - filterString=filter.toString() - bundle.putString("data",filterString) - fragment.arguments=bundle - val parentFrag: FragmentHomePage = this@FragmentHomePageMainScroll.getParentFragment() as FragmentHomePage - parentFrag.changeScrollVIewToLocationView() - parentFrag.setBtnBackVisible() + tagSearch("Zabavni park") } location_beach.setOnClickListener { - filter=LocationType.PLAZA - filterString=filter.toString() - bundle.putString("data",filterString) - fragment.arguments=bundle - val parentFrag: FragmentHomePage = this@FragmentHomePageMainScroll.getParentFragment() as FragmentHomePage - parentFrag.changeScrollVIewToLocationView() - parentFrag.setBtnBackVisible() + tagSearch("Plaza") } /* ll1.isVisible=true @@ -350,5 +294,11 @@ private lateinit var change:Button } + private fun tagSearch(tag:String){ + var act = requireActivity() as NavigationActivity + act.searchQuery = tag + act.searchId = "" + act.bottomNav.selectedItemId = R.id.navAllPosts + } } \ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentShowPosts.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentShowPosts.kt index 76fa4e0..f0f5244 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentShowPosts.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentShowPosts.kt @@ -151,10 +151,7 @@ class FragmentShowPosts : Fragment(), SwipeRefreshLayout.OnRefreshListener { Log.d("main","klik") } - rootView?.findViewById(R.id.btnChat)?.setOnClickListener() { - val intent: Intent = Intent(activity, ChatActivity::class.java) - requireActivity().startActivity(intent) - } + } fun requestToBack(searchParams: SearchParams){ diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_show_posts.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_show_posts.xml index e3db4bc..9447ea7 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_show_posts.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_show_posts.xml @@ -73,18 +73,7 @@ app:layout_constraintStart_toEndOf="@+id/btnSortType" app:layout_constraintTop_toTopOf="parent" /> - +