From 3e50cfd211671a9ea405c758368584b174ca5417 Mon Sep 17 00:00:00 2001 From: TAMARA JERINIC Date: Fri, 11 Nov 2022 00:42:14 +0100 Subject: Dodat fragment za početnu stranu. Dodati neki resursi. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Activities/NavigationActivity.kt | 1 + .../brzodolokacije/Fragments/FragmentHomePage.kt | 60 +++++++ .../app/src/main/res/drawable/circle_view.xml | 6 + .../app/src/main/res/drawable/location_beach.xml | 15 ++ .../app/src/main/res/drawable/location_city.xml | 32 ++++ .../src/main/res/drawable/location_mountain.xml | 15 ++ .../src/main/res/drawable/location_waterfall.xml | 15 ++ .../app/src/main/res/layout/fragment_home_page.xml | 183 +++++++++++++++++++++ 8 files changed, 327 insertions(+) create mode 100644 Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentHomePage.kt create mode 100644 Client/BrzoDoLokacije/app/src/main/res/drawable/circle_view.xml create mode 100644 Client/BrzoDoLokacije/app/src/main/res/drawable/location_beach.xml create mode 100644 Client/BrzoDoLokacije/app/src/main/res/drawable/location_city.xml create mode 100644 Client/BrzoDoLokacije/app/src/main/res/drawable/location_mountain.xml create mode 100644 Client/BrzoDoLokacije/app/src/main/res/drawable/location_waterfall.xml create mode 100644 Client/BrzoDoLokacije/app/src/main/res/layout/fragment_home_page.xml 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 0a69722..c2997ee 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 @@ -93,6 +93,7 @@ class NavigationActivity : AppCompatActivity() { var newLocation=bottomSheetDialog.findViewById(R.id.btnBottomSheetAddNewLocation) as ImageButton newPost.setOnClickListener{ + bottomSheetDialog.dismiss() showBottomSheetAddPost() } 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 new file mode 100644 index 0000000..7685296 --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentHomePage.kt @@ -0,0 +1,60 @@ +package com.example.brzodolokacije.Fragments + +import android.os.Bundle +import androidx.fragment.app.Fragment +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import com.example.brzodolokacije.R + +// TODO: Rename parameter arguments, choose names that match +// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER +private const val ARG_PARAM1 = "param1" +private const val ARG_PARAM2 = "param2" + +/** + * A simple [Fragment] subclass. + * Use the [FragmentHomePage.newInstance] factory method to + * create an instance of this fragment. + */ +class FragmentHomePage : Fragment() { + // TODO: Rename and change types of parameters + private var param1: String? = null + private var param2: String? = null + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + arguments?.let { + param1 = it.getString(ARG_PARAM1) + param2 = it.getString(ARG_PARAM2) + } + } + + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + // Inflate the layout for this fragment + return inflater.inflate(R.layout.fragment_home_page, container, false) + } + + companion object { + /** + * Use this factory method to create a new instance of + * this fragment using the provided parameters. + * + * @param param1 Parameter 1. + * @param param2 Parameter 2. + * @return A new instance of fragment FragmentHomePage. + */ + // TODO: Rename and change types and number of parameters + @JvmStatic + fun newInstance(param1: String, param2: String) = + FragmentHomePage().apply { + arguments = Bundle().apply { + putString(ARG_PARAM1, param1) + putString(ARG_PARAM2, param2) + } + } + } +} \ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/circle_view.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/circle_view.xml new file mode 100644 index 0000000..8317243 --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/circle_view.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/location_beach.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/location_beach.xml new file mode 100644 index 0000000..c42b8a5 --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/location_beach.xml @@ -0,0 +1,15 @@ + + + + + \ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/location_city.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/location_city.xml new file mode 100644 index 0000000..a0a3a26 --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/location_city.xml @@ -0,0 +1,32 @@ + + + + + + + + + \ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/location_mountain.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/location_mountain.xml new file mode 100644 index 0000000..4f436f7 --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/location_mountain.xml @@ -0,0 +1,15 @@ + + + + + \ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/location_waterfall.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/location_waterfall.xml new file mode 100644 index 0000000..b909b31 --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/location_waterfall.xml @@ -0,0 +1,15 @@ + + + + + \ 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 new file mode 100644 index 0000000..5289d88 --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_home_page.xml @@ -0,0 +1,183 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file -- cgit v1.2.3