Dodat bottom sheet dialog za dodavanje fotografija.

3 files changed, 80 insertions, 6 deletions

diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityAddPost.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityAddPost.kt
index c81e7fe..ce18f16 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityAddPost.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityAddPost.kt
@@ -33,9 +33,9 @@ class ActivityAddPost : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_add_post)
-        Toast.makeText(
-            applicationContext, "Add new ", Toast.LENGTH_LONG
-        ).show();
+//        Toast.makeText(
+//            applicationContext, "Add new ", Toast.LENGTH_LONG
+//        ).show();
         uploadedImages= ArrayList()
 
         //paths= ArrayList()
@@ -83,7 +83,7 @@ class ActivityAddPost : AppCompatActivity() {
             if(place>0){
                 place=place-1
                 switcher.setImageURI(uploadedImages!![place])
-
+                showNextImage.isEnabled=true
             }
             else{
                 showPreviousImage.isEnabled=false
@@ -95,7 +95,7 @@ class ActivityAddPost : AppCompatActivity() {
             if(place<uploadedImages!!.size-1){
                 place=place+1
                 switcher.setImageURI(uploadedImages!![place])
-
+                showPreviousImage.isEnabled=true
             }
             else{
                 showNextImage.isEnabled=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
index baa83ee..89d6c19 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
@@ -1,15 +1,22 @@
 package com.example.brzodolokacije.Activities
 
+import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.view.View
 import android.widget.Button
+import android.widget.Toast
 import androidx.fragment.app.Fragment
 import com.example.brzodolokacije.Fragments.*
 import com.example.brzodolokacije.R
 import com.google.android.material.bottomnavigation.BottomNavigationView
+import com.google.android.material.bottomsheet.BottomSheetDialog
 
 class NavigationActivity : AppCompatActivity() {
+
+    //lateinit var openAddPost:Button
+    //lateinit var capturePost:Button
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_navigation)
@@ -23,7 +30,8 @@ class NavigationActivity : AppCompatActivity() {
         bottomNav.setOnNavigationItemSelectedListener {
             when(it.itemId){
                 R.id.navHome->setCurrentFragment(fragmentShowPosts)
-                R.id.navAddPost->setCurrentFragment(addPostFragment)
+                //R.id.navAddPost->setCurrentFragment(addPostFragment)
+                R.id.navAddPost->showBottomSheetAddNew()
                 R.id.navBrowse->setCurrentFragment(browseFragment)
                 R.id.navProfile->setCurrentFragment(profileFragment)
 
@@ -39,5 +47,26 @@ class NavigationActivity : AppCompatActivity() {
             commit()
         }
 
+    private fun showBottomSheetAddNew(){
+        var bottomSheetDialog:BottomSheetDialog
+        val bottomSheetView = layoutInflater.inflate(R.layout.bottom_sheet_add_new, null)
+        bottomSheetDialog=BottomSheetDialog(this)
+        bottomSheetDialog.setContentView(R.layout.bottom_sheet_add_new)
+        bottomSheetDialog.show()
+
+
+        var openAddPost=bottomSheetDialog.findViewById<View>(R.id.btnBottomSheetAddNewOpenAddPost) as Button
+        var capturePost=bottomSheetDialog.findViewById<View>(R.id.btnBottomSheetAddNewOpenCapturePost) as Button
+
+        openAddPost.setOnClickListener{
+            Toast.makeText(
+                applicationContext, "Open ", Toast.LENGTH_LONG
+            ).show();
+            val intent = Intent (this, ActivityAddPost::class.java)
+            startActivity(intent)
+        }
+
+    }
+
 
 }
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/bottom_sheet_add_new.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/bottom_sheet_add_new.xml
new file mode 100644
index 0000000..8f9700e
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/bottom_sheet_add_new.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/bottomSheetAddNewForNav"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <TextView
+        android:id="@+id/textView6"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Dodaj novu objavu"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <Button
+        android:id="@+id/btnBottomSheetAddNewOpenAddPost"
+        android:layout_width="165dp"
+        android:layout_height="88dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="8dp"
+        android:text="Izaberi fotografije iz galerije"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textView6"
+        app:layout_constraintVertical_bias="1.0" />
+
+    <Button
+        android:id="@+id/btnBottomSheetAddNewOpenCapturePost"
+
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:text="Nova fotografija"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.862"
+        app:layout_constraintStart_toEndOf="@+id/btnBottomSheetAddNewOpenAddPost"
+        app:layout_constraintTop_toBottomOf="@+id/textView6"
+        app:layout_constraintVertical_bias="0.666" />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file