prepravke posle merge-a

4 files changed, 23 insertions, 18 deletions

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 b6452e9..7fca83b 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
@@ -29,10 +29,10 @@ class FragmentAddPost : Fragment(R.layout.fragment_add_post) {
     ): View? {
         val view:View=inflater.inflate(R.layout.fragment_add_post, container, false)
         // Inflate the layout for this fragment
-        val logOutButton=view.findViewById<View>(R.id.btnFragmentAddLogOut) as Button
+        /*val logOutButton=view.findViewById<View>(R.id.btnFragmentAddLogOut) as Button
         logOutButton.setOnClickListener{
             logOut()
-        }
+        }*/
         return view;
     }
 
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 8dcef02..6bc9d12 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
@@ -11,7 +11,7 @@ import com.example.brzodolokacije.Adapters.SampleAdapter
 import com.example.brzodolokacije.Adapters.ShowPostsAdapter
 import com.example.brzodolokacije.Models.ListItemModel
 import com.example.brzodolokacije.Models.Location
-import com.example.brzodolokacije.Models.LocationTypes
+import com.example.brzodolokacije.Models.LocationType
 import com.example.brzodolokacije.Models.Post
 import com.example.brzodolokacije.R
 import com.example.brzodolokacije.databinding.FragmentHomeBinding
@@ -35,22 +35,22 @@ class FragmentShowPosts : Fragment() {
     }
 
     private fun loadData() {
-        posts.add(Post("123","213",
+        posts.add(Post("123",
             Location("asd","Ajfelov toranj","Pariz",
-                "Francuska","idk","asda","asdsd",LocationTypes.Grad),"opsiopsaid",1.1,56,
-            mutableListOf(),mutableListOf()))
-        posts.add(Post("123","213",
+                "Francuska","idk",1.1,1.1, LocationType.GRAD),"opsiopsaid","opasdiad",
+            mutableListOf(),mutableListOf(),mutableListOf(),mutableListOf(),mutableListOf()))
+        posts.add(Post("123",
             Location("asd","Ajfelov toranj","Pariz",
-                "Francuska","idk","asda","asdsd",LocationTypes.Grad),"opsiopsaid",1.1,56,
-            mutableListOf(),mutableListOf(),))
-        posts.add(Post("123","213",
+                "Francuska","idk",1.1,1.1, LocationType.GRAD),"opsiopsaid","opasdiad",
+            mutableListOf(),mutableListOf(),mutableListOf(),mutableListOf(),mutableListOf()))
+        posts.add(Post("123",
             Location("asd","Ajfelov toranj","Pariz",
-                "Francuska","idk","asda","asdsd",LocationTypes.Grad),"opsiopsaid",1.1,56,
-            mutableListOf(),mutableListOf(),))
-        posts.add(Post("123","213",
+                "Francuska","idk",1.1,1.1, LocationType.GRAD),"opsiopsaid","opasdiad",
+            mutableListOf(),mutableListOf(),mutableListOf(),mutableListOf(),mutableListOf()))
+        posts.add(Post("123",
             Location("asd","Ajfelov toranj","Pariz",
-                "Francuska","idk","asda","asdsd",LocationTypes.Grad),"opsiopsaid",1.1,56,
-            mutableListOf(),mutableListOf(),))
+                "Francuska","idk",1.1,1.1, LocationType.GRAD),"opsiopsaid","opasdiad",
+            mutableListOf(),mutableListOf(),mutableListOf(),mutableListOf(),mutableListOf()))
     }
 
     override fun onCreateView(
diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/rounded_picture_background.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/rounded_picture_background.xml
index 2f898b0..0a8e933 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/drawable/rounded_picture_background.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/rounded_picture_background.xml
@@ -2,4 +2,11 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <corners  android:radius="20dp"/>
     <solid android:color="#FFFFFF"></solid>
+<!--    <padding-->
+<!--        android:left="10dp"-->
+<!--        android:top="5dp"-->
+<!--        android:right="10dp"-->
+<!--        android:bottom="5dp" >-->
+
+<!--    </padding>-->
 </shape>
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/post_preview.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/post_preview.xml
index a3642e2..ffdd5d7 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/post_preview.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/post_preview.xml
@@ -4,8 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_padding="5dp"
-    android:layout_margin="0dp"
     android:layout_margin="0dp"
     android:background="@drawable/rounded_picture_background"
     android:clipToOutline="true"
@@ -31,7 +29,7 @@
         android:background="@color/dark_blue_transparent"
         android:outlineProvider="background"
         app:layout_constraintBottom_toBottomOf="@+id/locationImage"
-        tools:layout_editor_absoluteX="0dp">
+        tools:layout_editor_absoluteX="10dp">
 
 
     </View>