From 67b51b69ba37c328d7deedbf118503854c8963da Mon Sep 17 00:00:00 2001 From: Ognjen Cirkovic Date: Sun, 30 Oct 2022 16:47:17 +0100 Subject: Dodat navigacioni meni i povezan sa fragmentima. --- .../debug/res/drawable-anydpi/ic_nav_addpost.xml | 11 +++++ .../debug/res/drawable-anydpi/ic_nav_browse.xml | 11 +++++ .../src/debug/res/drawable-anydpi/ic_nav_home.xml | 11 +++++ .../debug/res/drawable-anydpi/ic_nav_profile.xml | 11 +++++ .../src/debug/res/drawable-hdpi/ic_nav_addpost.png | Bin 0 -> 538 bytes .../src/debug/res/drawable-hdpi/ic_nav_browse.png | Bin 0 -> 552 bytes .../src/debug/res/drawable-hdpi/ic_nav_home.png | Bin 0 -> 265 bytes .../src/debug/res/drawable-hdpi/ic_nav_profile.png | Bin 0 -> 312 bytes .../src/debug/res/drawable-mdpi/ic_nav_addpost.png | Bin 0 -> 306 bytes .../src/debug/res/drawable-mdpi/ic_nav_browse.png | Bin 0 -> 350 bytes .../src/debug/res/drawable-mdpi/ic_nav_home.png | Bin 0 -> 239 bytes .../src/debug/res/drawable-mdpi/ic_nav_profile.png | Bin 0 -> 234 bytes .../debug/res/drawable-xhdpi/ic_nav_addpost.png | Bin 0 -> 725 bytes .../src/debug/res/drawable-xhdpi/ic_nav_browse.png | Bin 0 -> 774 bytes .../src/debug/res/drawable-xhdpi/ic_nav_home.png | Bin 0 -> 402 bytes .../debug/res/drawable-xhdpi/ic_nav_profile.png | Bin 0 -> 385 bytes .../debug/res/drawable-xxhdpi/ic_nav_addpost.png | Bin 0 -> 1142 bytes .../debug/res/drawable-xxhdpi/ic_nav_browse.png | Bin 0 -> 1239 bytes .../src/debug/res/drawable-xxhdpi/ic_nav_home.png | Bin 0 -> 617 bytes .../debug/res/drawable-xxhdpi/ic_nav_profile.png | Bin 0 -> 559 bytes .../app/src/main/AndroidManifest.xml | 10 ++++- .../Activities/NavigationActivity.kt | 46 +++++++++++++++++++++ .../brzodolokacije/Fragments/FragmentAddPost.kt | 2 +- .../brzodolokacije/Fragments/FragmentBrowse.kt | 2 +- .../brzodolokacije/Fragments/FragmentHome.kt | 2 +- .../brzodolokacije/Fragments/FragmentProfile.kt | 2 +- .../src/main/res/layout/activity_navigation.xml | 28 +++++++++++++ .../app/src/main/res/menu/bottom_nav_menu.xml | 19 +++++++++ 28 files changed, 149 insertions(+), 6 deletions(-) create mode 100644 Client/BrzoDoLokacije/app/src/debug/res/drawable-anydpi/ic_nav_addpost.xml create mode 100644 Client/BrzoDoLokacije/app/src/debug/res/drawable-anydpi/ic_nav_browse.xml create mode 100644 Client/BrzoDoLokacije/app/src/debug/res/drawable-anydpi/ic_nav_home.xml create mode 100644 Client/BrzoDoLokacije/app/src/debug/res/drawable-anydpi/ic_nav_profile.xml create mode 100644 Client/BrzoDoLokacije/app/src/debug/res/drawable-hdpi/ic_nav_addpost.png create mode 100644 Client/BrzoDoLokacije/app/src/debug/res/drawable-hdpi/ic_nav_browse.png create mode 100644 Client/BrzoDoLokacije/app/src/debug/res/drawable-hdpi/ic_nav_home.png create mode 100644 Client/BrzoDoLokacije/app/src/debug/res/drawable-hdpi/ic_nav_profile.png create mode 100644 Client/BrzoDoLokacije/app/src/debug/res/drawable-mdpi/ic_nav_addpost.png create mode 100644 Client/BrzoDoLokacije/app/src/debug/res/drawable-mdpi/ic_nav_browse.png create mode 100644 Client/BrzoDoLokacije/app/src/debug/res/drawable-mdpi/ic_nav_home.png create mode 100644 Client/BrzoDoLokacije/app/src/debug/res/drawable-mdpi/ic_nav_profile.png create mode 100644 Client/BrzoDoLokacije/app/src/debug/res/drawable-xhdpi/ic_nav_addpost.png create mode 100644 Client/BrzoDoLokacije/app/src/debug/res/drawable-xhdpi/ic_nav_browse.png create mode 100644 Client/BrzoDoLokacije/app/src/debug/res/drawable-xhdpi/ic_nav_home.png create mode 100644 Client/BrzoDoLokacije/app/src/debug/res/drawable-xhdpi/ic_nav_profile.png create mode 100644 Client/BrzoDoLokacije/app/src/debug/res/drawable-xxhdpi/ic_nav_addpost.png create mode 100644 Client/BrzoDoLokacije/app/src/debug/res/drawable-xxhdpi/ic_nav_browse.png create mode 100644 Client/BrzoDoLokacije/app/src/debug/res/drawable-xxhdpi/ic_nav_home.png create mode 100644 Client/BrzoDoLokacije/app/src/debug/res/drawable-xxhdpi/ic_nav_profile.png create mode 100644 Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/NavigationActivity.kt create mode 100644 Client/BrzoDoLokacije/app/src/main/res/layout/activity_navigation.xml create mode 100644 Client/BrzoDoLokacije/app/src/main/res/menu/bottom_nav_menu.xml (limited to 'Client') diff --git a/Client/BrzoDoLokacije/app/src/debug/res/drawable-anydpi/ic_nav_addpost.xml b/Client/BrzoDoLokacije/app/src/debug/res/drawable-anydpi/ic_nav_addpost.xml new file mode 100644 index 0000000..768552f --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/debug/res/drawable-anydpi/ic_nav_addpost.xml @@ -0,0 +1,11 @@ + + + diff --git a/Client/BrzoDoLokacije/app/src/debug/res/drawable-anydpi/ic_nav_browse.xml b/Client/BrzoDoLokacije/app/src/debug/res/drawable-anydpi/ic_nav_browse.xml new file mode 100644 index 0000000..8beebb7 --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/debug/res/drawable-anydpi/ic_nav_browse.xml @@ -0,0 +1,11 @@ + + + diff --git a/Client/BrzoDoLokacije/app/src/debug/res/drawable-anydpi/ic_nav_home.xml b/Client/BrzoDoLokacije/app/src/debug/res/drawable-anydpi/ic_nav_home.xml new file mode 100644 index 0000000..cd6cfd6 --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/debug/res/drawable-anydpi/ic_nav_home.xml @@ -0,0 +1,11 @@ + + + diff --git a/Client/BrzoDoLokacije/app/src/debug/res/drawable-anydpi/ic_nav_profile.xml b/Client/BrzoDoLokacije/app/src/debug/res/drawable-anydpi/ic_nav_profile.xml new file mode 100644 index 0000000..198e013 --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/debug/res/drawable-anydpi/ic_nav_profile.xml @@ -0,0 +1,11 @@ + + + diff --git a/Client/BrzoDoLokacije/app/src/debug/res/drawable-hdpi/ic_nav_addpost.png b/Client/BrzoDoLokacije/app/src/debug/res/drawable-hdpi/ic_nav_addpost.png new file mode 100644 index 0000000..5a45901 Binary files /dev/null and b/Client/BrzoDoLokacije/app/src/debug/res/drawable-hdpi/ic_nav_addpost.png differ diff --git a/Client/BrzoDoLokacije/app/src/debug/res/drawable-hdpi/ic_nav_browse.png b/Client/BrzoDoLokacije/app/src/debug/res/drawable-hdpi/ic_nav_browse.png new file mode 100644 index 0000000..79684b3 Binary files /dev/null and b/Client/BrzoDoLokacije/app/src/debug/res/drawable-hdpi/ic_nav_browse.png differ diff --git a/Client/BrzoDoLokacije/app/src/debug/res/drawable-hdpi/ic_nav_home.png b/Client/BrzoDoLokacije/app/src/debug/res/drawable-hdpi/ic_nav_home.png new file mode 100644 index 0000000..c6da75f Binary files /dev/null and b/Client/BrzoDoLokacije/app/src/debug/res/drawable-hdpi/ic_nav_home.png differ diff --git a/Client/BrzoDoLokacije/app/src/debug/res/drawable-hdpi/ic_nav_profile.png b/Client/BrzoDoLokacije/app/src/debug/res/drawable-hdpi/ic_nav_profile.png new file mode 100644 index 0000000..d065a96 Binary files /dev/null and b/Client/BrzoDoLokacije/app/src/debug/res/drawable-hdpi/ic_nav_profile.png differ diff --git a/Client/BrzoDoLokacije/app/src/debug/res/drawable-mdpi/ic_nav_addpost.png b/Client/BrzoDoLokacije/app/src/debug/res/drawable-mdpi/ic_nav_addpost.png new file mode 100644 index 0000000..6ab5495 Binary files /dev/null and b/Client/BrzoDoLokacije/app/src/debug/res/drawable-mdpi/ic_nav_addpost.png differ diff --git a/Client/BrzoDoLokacije/app/src/debug/res/drawable-mdpi/ic_nav_browse.png b/Client/BrzoDoLokacije/app/src/debug/res/drawable-mdpi/ic_nav_browse.png new file mode 100644 index 0000000..4356671 Binary files /dev/null and b/Client/BrzoDoLokacije/app/src/debug/res/drawable-mdpi/ic_nav_browse.png differ diff --git a/Client/BrzoDoLokacije/app/src/debug/res/drawable-mdpi/ic_nav_home.png b/Client/BrzoDoLokacije/app/src/debug/res/drawable-mdpi/ic_nav_home.png new file mode 100644 index 0000000..cb1f92f Binary files /dev/null and b/Client/BrzoDoLokacije/app/src/debug/res/drawable-mdpi/ic_nav_home.png differ diff --git a/Client/BrzoDoLokacije/app/src/debug/res/drawable-mdpi/ic_nav_profile.png b/Client/BrzoDoLokacije/app/src/debug/res/drawable-mdpi/ic_nav_profile.png new file mode 100644 index 0000000..9de92dc Binary files /dev/null and b/Client/BrzoDoLokacije/app/src/debug/res/drawable-mdpi/ic_nav_profile.png differ diff --git a/Client/BrzoDoLokacije/app/src/debug/res/drawable-xhdpi/ic_nav_addpost.png b/Client/BrzoDoLokacije/app/src/debug/res/drawable-xhdpi/ic_nav_addpost.png new file mode 100644 index 0000000..d58180b Binary files /dev/null and b/Client/BrzoDoLokacije/app/src/debug/res/drawable-xhdpi/ic_nav_addpost.png differ diff --git a/Client/BrzoDoLokacije/app/src/debug/res/drawable-xhdpi/ic_nav_browse.png b/Client/BrzoDoLokacije/app/src/debug/res/drawable-xhdpi/ic_nav_browse.png new file mode 100644 index 0000000..26b1bf3 Binary files /dev/null and b/Client/BrzoDoLokacije/app/src/debug/res/drawable-xhdpi/ic_nav_browse.png differ diff --git a/Client/BrzoDoLokacije/app/src/debug/res/drawable-xhdpi/ic_nav_home.png b/Client/BrzoDoLokacije/app/src/debug/res/drawable-xhdpi/ic_nav_home.png new file mode 100644 index 0000000..f6c17d5 Binary files /dev/null and b/Client/BrzoDoLokacije/app/src/debug/res/drawable-xhdpi/ic_nav_home.png differ diff --git a/Client/BrzoDoLokacije/app/src/debug/res/drawable-xhdpi/ic_nav_profile.png b/Client/BrzoDoLokacije/app/src/debug/res/drawable-xhdpi/ic_nav_profile.png new file mode 100644 index 0000000..8c2ff94 Binary files /dev/null and b/Client/BrzoDoLokacije/app/src/debug/res/drawable-xhdpi/ic_nav_profile.png differ diff --git a/Client/BrzoDoLokacije/app/src/debug/res/drawable-xxhdpi/ic_nav_addpost.png b/Client/BrzoDoLokacije/app/src/debug/res/drawable-xxhdpi/ic_nav_addpost.png new file mode 100644 index 0000000..573a645 Binary files /dev/null and b/Client/BrzoDoLokacije/app/src/debug/res/drawable-xxhdpi/ic_nav_addpost.png differ diff --git a/Client/BrzoDoLokacije/app/src/debug/res/drawable-xxhdpi/ic_nav_browse.png b/Client/BrzoDoLokacije/app/src/debug/res/drawable-xxhdpi/ic_nav_browse.png new file mode 100644 index 0000000..90f6390 Binary files /dev/null and b/Client/BrzoDoLokacije/app/src/debug/res/drawable-xxhdpi/ic_nav_browse.png differ diff --git a/Client/BrzoDoLokacije/app/src/debug/res/drawable-xxhdpi/ic_nav_home.png b/Client/BrzoDoLokacije/app/src/debug/res/drawable-xxhdpi/ic_nav_home.png new file mode 100644 index 0000000..40d14fb Binary files /dev/null and b/Client/BrzoDoLokacije/app/src/debug/res/drawable-xxhdpi/ic_nav_home.png differ diff --git a/Client/BrzoDoLokacije/app/src/debug/res/drawable-xxhdpi/ic_nav_profile.png b/Client/BrzoDoLokacije/app/src/debug/res/drawable-xxhdpi/ic_nav_profile.png new file mode 100644 index 0000000..99793cc Binary files /dev/null and b/Client/BrzoDoLokacije/app/src/debug/res/drawable-xxhdpi/ic_nav_profile.png differ diff --git a/Client/BrzoDoLokacije/app/src/main/AndroidManifest.xml b/Client/BrzoDoLokacije/app/src/main/AndroidManifest.xml index e0a5a2b..93463e8 100644 --- a/Client/BrzoDoLokacije/app/src/main/AndroidManifest.xml +++ b/Client/BrzoDoLokacije/app/src/main/AndroidManifest.xml @@ -16,8 +16,14 @@ android:usesCleartextTraffic="true" tools:targetApi="31"> + android:name=".NavigationActivity" + android:exported="false"> + + + + 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 new file mode 100644 index 0000000..0933460 --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/NavigationActivity.kt @@ -0,0 +1,46 @@ +package com.example.brzodolokacije.Activities + +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import android.view.View +import android.widget.Button +import androidx.fragment.app.Fragment +import com.example.brzodolokacije.Fragments.FragmentAddPost +import com.example.brzodolokacije.Fragments.FragmentBrowse +import com.example.brzodolokacije.Fragments.FragmentHome +import com.example.brzodolokacije.Fragments.FragmentProfile +import com.example.brzodolokacije.R +import com.google.android.material.bottomnavigation.BottomNavigationView + +class NavigationActivity : AppCompatActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_navigation) + + val homeFragment=FragmentHome() + val browseFragment=FragmentBrowse() + val addPostFragment=FragmentAddPost() + val profileFragment=FragmentProfile() + val bottomNav=findViewById(R.id.bottomNavigationView) as BottomNavigationView + setCurrentFragment(homeFragment) + bottomNav.setOnNavigationItemSelectedListener { + when(it.itemId){ + R.id.navHome->setCurrentFragment(homeFragment) + R.id.navAddPost->setCurrentFragment(addPostFragment) + R.id.navBrowse->setCurrentFragment(browseFragment) + R.id.navProfile->setCurrentFragment(profileFragment) + + } + true + } + + + } + private fun setCurrentFragment(fragment: Fragment)= + supportFragmentManager.beginTransaction().apply { + replace(R.id.flNavigationFragment,fragment) + commit() + } + + +} \ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentAddPost.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentAddPost.kt index dff3948..855cffc 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentAddPost.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentAddPost.kt @@ -17,7 +17,7 @@ private const val ARG_PARAM2 = "param2" * Use the [FragmentAddPost.newInstance] factory method to * create an instance of this fragment. */ -class FragmentAddPost : Fragment() { +class FragmentAddPost : Fragment(R.layout.fragment_add_post) { // TODO: Rename and change types of parameters private var param1: String? = null private var param2: String? = null diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentBrowse.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentBrowse.kt index 7ac572f..1bd98a0 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentBrowse.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentBrowse.kt @@ -17,7 +17,7 @@ private const val ARG_PARAM2 = "param2" * Use the [FragmentBrowse.newInstance] factory method to * create an instance of this fragment. */ -class FragmentBrowse : Fragment() { +class FragmentBrowse : Fragment(R.layout.fragment_browse) { // TODO: Rename and change types of parameters private var param1: String? = null private var param2: String? = null diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentHome.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentHome.kt index 397e1cf..9544cd6 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentHome.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentHome.kt @@ -17,7 +17,7 @@ private const val ARG_PARAM2 = "param2" * Use the [FragmentHome.newInstance] factory method to * create an instance of this fragment. */ -class FragmentHome : Fragment() { +class FragmentHome : Fragment(R.layout.fragment_home) { // TODO: Rename and change types of parameters private var param1: String? = null private var param2: String? = null diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentProfile.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentProfile.kt index 87c9d56..a63bc3c 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentProfile.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentProfile.kt @@ -17,7 +17,7 @@ private const val ARG_PARAM2 = "param2" * Use the [FragmentProfile.newInstance] factory method to * create an instance of this fragment. */ -class FragmentProfile : Fragment() { +class FragmentProfile : Fragment(R.layout.fragment_profile) { // TODO: Rename and change types of parameters private var param1: String? = null private var param2: String? = null diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_navigation.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_navigation.xml new file mode 100644 index 0000000..afe1bbf --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_navigation.xml @@ -0,0 +1,28 @@ + + + + + + + \ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/menu/bottom_nav_menu.xml b/Client/BrzoDoLokacije/app/src/main/res/menu/bottom_nav_menu.xml new file mode 100644 index 0000000..da6577e --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/res/menu/bottom_nav_menu.xml @@ -0,0 +1,19 @@ + + + + + + + \ No newline at end of file -- cgit v1.2.3