diff options
8 files changed, 131 insertions, 13 deletions
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentAddRecension.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentAddRecension.kt new file mode 100644 index 0000000..16709f7 --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentAddRecension.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 [FragmentAddRecension.newInstance] factory method to + * create an instance of this fragment. + */ +class FragmentAddRecension : 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_add_recension, 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 FragmentAddRecension. + */ + // TODO: Rename and change types and number of parameters + @JvmStatic + fun newInstance(param1: String, param2: String) = + FragmentAddRecension().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/java/com/example/brzodolokacije/Models/File.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/File.kt new file mode 100644 index 0000000..030f658 --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/File.kt @@ -0,0 +1,6 @@ +package com.example.brzodolokacije.Models + +data class File ( + var _id:String, + var path:String + )
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/Location.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/Location.kt new file mode 100644 index 0000000..25125cd --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/Location.kt @@ -0,0 +1,14 @@ +package com.example.brzodolokacije.Models + +import com.example.brzodolokacije.Models.LocationType + +data class Location ( + var _id:String, + var name:String, + var city:String, + var country:String, + var adress:String, + var latitude:Double, + var longitude:Double, + var type:LocationType + ) 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 new file mode 100644 index 0000000..a078863 --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/LocationType.kt @@ -0,0 +1,7 @@ +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 +}
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/LocationTypes.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/LocationTypes.kt deleted file mode 100644 index c599dae..0000000 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/LocationTypes.kt +++ /dev/null @@ -1,4 +0,0 @@ -package com.example.brzodolokacije.Models - -enum class LocationTypes { -}
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/Post.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/Post.kt index 9c0eae1..3fa1f70 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/Post.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/Post.kt @@ -1,12 +1,30 @@ package com.example.brzodolokacije.Models +import java.time.LocalDateTime import java.util.* data class Post ( var _id:String, - var creationDate: Date, - var country:String,//drzava - var city:String, - var location:String,//naziv grada/naziv planine/naziv jezera/....... - var type:LocationTypes //tip lokacije - )
\ No newline at end of file + var location:Location, + var ownerId:String, + var description:String, + var views:List<String>, + var reports:List<String>, + var ratings:List<Rating>, + var comments:List<Comment>, + var images:List<File> + + + ) + +data class Comment ( + var userId:String, + var comment:String, + var parent:Comment, + var timeStamp: LocalDateTime +) + +data class Rating( + var useridval :String, + var rating:Int +)
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_add_post.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_add_post.xml index 2cf3c8c..c106fcd 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_add_post.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_add_post.xml @@ -6,10 +6,14 @@ tools:context=".Fragments.FragmentAddPost"> <!-- TODO: Update blank fragment layout --> + <TextView android:layout_width="match_parent" - android:layout_height="match_parent" - android:text="Post Add" /> + android:layout_height="20dp"/> + + + + <!-- <Button android:id="@+id/btnFragmentAddLogOut" @@ -18,6 +22,6 @@ android:layout_marginTop="40dp" android:background="@drawable/rounded_cyan_button" android:backgroundTint="#1C789A" - android:text="Log Out" /> + android:text="Log Out" />--> </FrameLayout>
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_add_recension.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_add_recension.xml new file mode 100644 index 0000000..433ae0e --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_add_recension.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + tools:context=".Fragments.FragmentAddRecension"> + + <!-- TODO: Update blank fragment layout --> + <TextView + android:layout_width="match_parent" + android:layout_height="match_parent" /> + +</FrameLayout>
\ No newline at end of file |