From 019c885d1fbf5fa91d14bfa81eea38b5ab5d9eef Mon Sep 17 00:00:00 2001 From: TAMARA JERINIC Date: Sun, 13 Nov 2022 16:49:24 +0100 Subject: Povezana početna strana sa objavama iz baze. Dodati dugmići za prikaz filtriranih lokacija. Izmenjen izgled početne strane. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Client/BrzoDoLokacije/app/build.gradle | 2 + .../app/src/main/AndroidManifest.xml | 48 +-- .../Activities/NavigationActivity.kt | 2 +- .../brzodolokacije/Fragments/FragmentHomePage.kt | 17 +- .../example/brzodolokacije/Models/LocationType.kt | 44 ++- .../main/res/drawable/ic_baseline_search_24.xml | 5 + .../main/res/drawable/location_amusement_park.xml | 15 + .../src/main/res/drawable/location_attraction.xml | 15 + .../src/main/res/drawable/location_landmark.xml | 17 + .../app/src/main/res/drawable/location_spa.xml | 16 + .../app/src/main/res/layout/fragment_home_page.xml | 369 +++++++++++++-------- .../src/main/res/layout/post_item_home_page.xml | 6 +- .../app/src/main/res/values/dimens.xml | 6 +- 13 files changed, 366 insertions(+), 196 deletions(-) create mode 100644 Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_search_24.xml create mode 100644 Client/BrzoDoLokacije/app/src/main/res/drawable/location_amusement_park.xml create mode 100644 Client/BrzoDoLokacije/app/src/main/res/drawable/location_attraction.xml create mode 100644 Client/BrzoDoLokacije/app/src/main/res/drawable/location_landmark.xml create mode 100644 Client/BrzoDoLokacije/app/src/main/res/drawable/location_spa.xml diff --git a/Client/BrzoDoLokacije/app/build.gradle b/Client/BrzoDoLokacije/app/build.gradle index d0eabb6..63d28a8 100644 --- a/Client/BrzoDoLokacije/app/build.gradle +++ b/Client/BrzoDoLokacije/app/build.gradle @@ -49,6 +49,8 @@ dependencies { implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' implementation 'com.google.android.gms:play-services-maps:18.1.0' + implementation 'androidx.legacy:legacy-support-v4:1.0.0' + implementation 'androidx.recyclerview:recyclerview:1.2.1' testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.3' androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' diff --git a/Client/BrzoDoLokacije/app/src/main/AndroidManifest.xml b/Client/BrzoDoLokacije/app/src/main/AndroidManifest.xml index e33932c..56bdb58 100644 --- a/Client/BrzoDoLokacije/app/src/main/AndroidManifest.xml +++ b/Client/BrzoDoLokacije/app/src/main/AndroidManifest.xml @@ -40,37 +40,18 @@ android:usesCleartextTraffic="true" tools:targetApi="31"> - - - - - - - + + + + + android:exported="true" + android:screenOrientation="portrait" > @@ -81,17 +62,12 @@ android:name="android.app.lib_name" android:value="" /> - - - - - - - + + + + + + (R.id.bottomNavigationView) as BottomNavigationView - setCurrentFragment(fragmentShowPosts) + setCurrentFragment(fragmentHomePage) bottomNav.setOnNavigationItemSelectedListener { when(it.itemId){ R.id.navHomePage->setCurrentFragment(fragmentHomePage) diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentHomePage.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentHomePage.kt index 874d9de..3e02442 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentHomePage.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentHomePage.kt @@ -14,13 +14,13 @@ import com.example.brzodolokacije.Models.PostPreview import com.example.brzodolokacije.R import com.example.brzodolokacije.Services.RetrofitHelper.baseUrl import com.example.brzodolokacije.Services.SharedPreferencesHelper -import kotlinx.android.synthetic.main.activity_single_post.view.* import retrofit2.Call import retrofit2.Callback import retrofit2.Response import retrofit2.Retrofit import retrofit2.converter.gson.GsonConverterFactory + class FragmentHomePage : Fragment() { private lateinit var posts : MutableList private lateinit var mostViewedPosts : MutableList @@ -28,6 +28,7 @@ class FragmentHomePage : Fragment() { private lateinit var bestRatedPosts:MutableList private lateinit var rvPopular: RecyclerView private lateinit var rvNewest:RecyclerView + private lateinit var rvBestRated:RecyclerView /* override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -41,7 +42,8 @@ class FragmentHomePage : Fragment() { var view:View= inflater.inflate(R.layout.fragment_home_page, container, false) rvPopular=view.findViewById(R.id.rvFragmentHomePagePopular) - rvNewest=view.findViewById(R.id.rvFragmentHomePageLatest) + rvNewest=view.findViewById(R.id.rvFragmentHomePageNewest) + rvBestRated=view.findViewById(R.id.rvFragmentHomePageBestRated) //pokupi sve objave iz baze' getAllPosts() @@ -60,7 +62,7 @@ class FragmentHomePage : Fragment() { val token= SharedPreferencesHelper.getValue("jwt", requireActivity()) val data=api.getPosts("Bearer "+token) - data.enqueue(object : Callback>{ + data.enqueue(object : Callback> { override fun onResponse( call: Call>, response: Response> @@ -97,8 +99,8 @@ class FragmentHomePage : Fragment() { mostViewedPosts=allPosts mostViewedPosts.sortByDescending { it.views } rvPopular.apply { - layoutManager=LinearLayoutManager(activity,LinearLayoutManager.HORIZONTAL,false) - adapter=ShowPostsHomePageAdapter(mostViewedPosts) + layoutManager= LinearLayoutManager(activity,LinearLayoutManager.HORIZONTAL,false) + adapter= ShowPostsHomePageAdapter(mostViewedPosts) } @@ -121,6 +123,11 @@ class FragmentHomePage : Fragment() { ).show(); bestRatedPosts=allPosts bestRatedPosts.sortByDescending { it.ratings } + rvBestRated.apply { + layoutManager=LinearLayoutManager(activity,LinearLayoutManager.HORIZONTAL,false) + adapter=ShowPostsHomePageAdapter(bestRatedPosts) + } + } diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/LocationType.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/LocationType.kt index a078863..4714bab 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/LocationType.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/LocationType.kt @@ -1,7 +1,45 @@ package com.example.brzodolokacije.Models enum class LocationType { - GRAD,ULICA,JEZERO,REKA,PLAZA,OKEAN, MORE, MOREUZ, MOST,BANJA, - PLANINA, VISORAVAN, PIRAMIDA, LIVADA, SELO, OSTRVO, POLUOSTRVO, KLISURA, ARHIPELAG, - ADA, DELTA, FJORD, GEJZIR, IZVOR, KOTLINA, MINERALNI_IZVOR, PECINA ,SUMA, VODOPAD,VULKAN + GRAD, + ULICA, + JEZERO, + REKA, + PLAZA, + OKEAN, + MORE, + MOREUZ, + MOST, + BANJA, + PLANINA, + VISORAVAN, + PIRAMIDA, + LIVADA, + SELO, + OSTRVO, + POLUOSTRVO, + KLISURA, + ARHIPELAG, + ADA, + DELTA, + FJORD, + GEJZIR, + IZVOR, + KOTLINA, + MINERALNI_IZVOR, + PECINA, + SUMA, + VODOPAD, + VULKAN, + + AERODROM, + ZABAVNI_PARK, + PRODAVNICA, + ATRAKCIJA, + ZOOLOSKI_VRT, + TRZNI_CENTAR, + PARK, + LOKALITET, + + } \ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_search_24.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_search_24.xml new file mode 100644 index 0000000..5f22c2e --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_search_24.xml @@ -0,0 +1,5 @@ + + + diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/location_amusement_park.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/location_amusement_park.xml new file mode 100644 index 0000000..c6b2c37 --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/location_amusement_park.xml @@ -0,0 +1,15 @@ + + + + + \ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/location_attraction.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/location_attraction.xml new file mode 100644 index 0000000..7174bda --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/location_attraction.xml @@ -0,0 +1,15 @@ + + + + + \ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/location_landmark.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/location_landmark.xml new file mode 100644 index 0000000..3ed6824 --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/location_landmark.xml @@ -0,0 +1,17 @@ + + + + + + + \ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/location_spa.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/location_spa.xml new file mode 100644 index 0000000..ff19c94 --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/location_spa.xml @@ -0,0 +1,16 @@ + + + + + \ 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 7d1c73a..fcfe90c 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 @@ -6,20 +6,9 @@ android:layout_height="match_parent" tools:context=".Fragments.FragmentHomePage"> - - - + + app:layout_constraintTop_toBottomOf="@+id/cvFragmentHomePageProfile" /> - + app:layout_constraintTop_toBottomOf="@+id/tvFragmentHomePageSearch"> - - + + + + + + + app:layout_constraintTop_toBottomOf="@+id/cvFragmentHomePageSearch" + app:layout_constraintVertical_bias="0.0"> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="parent" + app:layout_constraintVertical_bias="0.0"> - + > - - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="1" - android:background='@color/white' - android:src="@drawable/location_mountain" - tools:ignore="SpeakableTextPresentCheck" /> - - + + + - - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + android:layout_marginTop="16dp"> + - - + + - - android:layout_marginStart="16dp" - android:layout_marginTop="12dp" - android:text="Najnovije" - android:textStyle="bold" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.0" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/scrollview" /> + - + - + + + + + + + + \ 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 f8ff70e..441f97b 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 @@ -3,12 +3,12 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="150dp" - android:layout_height="150dp"> + android:layout_height="180dp"> - 16dp + 16dp 5dp 20dp 10dp - \ No newline at end of file + 16dp + 8dp + \ No newline at end of file -- cgit v1.2.3