Ispravljen typo na backu. Dodato dugme za logout i implementovan logout.

5 files changed, 49 insertions, 50 deletions

diff --git a/Client/BrzoDoLokacije/app/src/main/AndroidManifest.xml b/Client/BrzoDoLokacije/app/src/main/AndroidManifest.xml
index 5ec6ac0..fd5bdfb 100644
--- a/Client/BrzoDoLokacije/app/src/main/AndroidManifest.xml
+++ b/Client/BrzoDoLokacije/app/src/main/AndroidManifest.xml
@@ -15,18 +15,8 @@
         android:theme="@style/Theme.BrzoDoLokacije"
         android:usesCleartextTraffic="true"
         tools:targetApi="31">
-        <activity
-
-            android:name=".NavigationActivity">
-    </activity>
-    <activity android:name=".ActivityForgottenPassword">
-
-            <!--<meta-data
-                android:name="android.app.lib_name"
-                android:value="" />-->
-        </activity>
+        <activity android:name=".Activities.ActivityForgottenPassword"/>
         <activity android:name=".Activities.ActivityLoginRegister" />
-
         <activity android:name=".Activities.NavigationActivity"/>
 
         <activity
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityLoginRegister.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityLoginRegister.kt
index 8aba11a..c80992c 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityLoginRegister.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityLoginRegister.kt
@@ -28,7 +28,10 @@ class ActivityLoginRegister : AppCompatActivity() {
         register=findViewById<View>(R.id.btnFragmentActivityLRRegister) as Button
         //var fm: FragmentTransaction =supportFragmentManager.beginTransaction()
         //fm.replace(R.id.flFragmentActivityLRFragmentsView,FragmentLogin())
+        var fm: FragmentTransaction =supportFragmentManager.beginTransaction()
 
+        fm.replace(R.id.flFragmentActivityLRFragmentsView,FragmentLogin())
+        fm.commit()
         login.setOnClickListener{
             Log.d("main","prijavi se")
             var fm: FragmentTransaction =supportFragmentManager.beginTransaction()
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 855cffc..b6452e9 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
@@ -1,60 +1,48 @@
 package com.example.brzodolokacije.Fragments
 
+import android.content.Intent
 import android.os.Bundle
 import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
+import com.example.brzodolokacije.Activities.ActivityLoginRegister
+import com.example.brzodolokacije.Activities.NavigationActivity
 import com.example.brzodolokacije.R
+import com.example.brzodolokacije.Services.SharedPreferencesHelper
 
-// 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 [FragmentAddPost.newInstance] factory method to
- * create an instance of this 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
+
+
 
     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? {
+        val view:View=inflater.inflate(R.layout.fragment_add_post, container, false)
         // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.fragment_add_post, container, false)
+        val logOutButton=view.findViewById<View>(R.id.btnFragmentAddLogOut) as Button
+        logOutButton.setOnClickListener{
+            logOut()
+        }
+        return view;
     }
 
-    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 FragmentAddPost.
-         */
-        // TODO: Rename and change types and number of parameters
-        @JvmStatic
-        fun newInstance(param1: String, param2: String) =
-            FragmentAddPost().apply {
-                arguments = Bundle().apply {
-                    putString(ARG_PARAM1, param1)
-                    putString(ARG_PARAM2, param2)
-                }
-            }
+    fun logOut(){
+        if(SharedPreferencesHelper.removeValue("jwt",requireActivity()))
+        {
+            val intent= Intent(requireActivity(), ActivityLoginRegister::class.java)
+            startActivity(intent)
+        }
     }
+
+
 }
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Services/SharedPreferencesHelper.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Services/SharedPreferencesHelper.kt
index 83e88be..a6da94a 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Services/SharedPreferencesHelper.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Services/SharedPreferencesHelper.kt
@@ -13,21 +13,30 @@ object SharedPreferencesHelper {
         var pref:SharedPreferences=act.getSharedPreferences(prefName,Context.MODE_PRIVATE)
         return pref.getString(key,null)
     }
+    fun getValue(key:String,act: Activity):String?{
+        var pref:SharedPreferences=act.getSharedPreferences(prefName,Context.MODE_PRIVATE)
+        return pref.getString(key,null)
+    }
     fun addValue(key:String,value:String,act:FragmentActivity):Boolean{
         var pref:SharedPreferences=act.getSharedPreferences(prefName,Context.MODE_PRIVATE)
         var editor:Editor=pref.edit()
         editor.putString(key,value)
         return editor.commit()
     }
-    fun getValue(key:String,act: Activity):String?{
-        var pref:SharedPreferences=act.getSharedPreferences(prefName,Context.MODE_PRIVATE)
-        return pref.getString(key,null)
-    }
     fun addValue(key:String,value:String,act:Activity):Boolean{
         var pref:SharedPreferences=act.getSharedPreferences(prefName,Context.MODE_PRIVATE)
         var editor:Editor=pref.edit()
         editor.putString(key,value)
         return editor.commit()
     }
+    fun removeValue(key:String,act: FragmentActivity):Boolean{
+        var pref:SharedPreferences=act.getSharedPreferences(prefName,Context.MODE_PRIVATE)
+        return pref.edit().remove(key).commit()
+    }
+    fun removeValue(key:String,act: Activity):Boolean{
+        var pref:SharedPreferences=act.getSharedPreferences(prefName,Context.MODE_PRIVATE)
+        return pref.edit().remove(key).commit()
+    }
+
 
 }
\ 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 9bed54c..2cf3c8c 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
@@ -11,4 +11,13 @@
         android:layout_height="match_parent"
         android:text="Post Add" />
 
+    <Button
+        android:id="@+id/btnFragmentAddLogOut"
+        android:layout_width="200dp"
+        android:layout_height="40dp"
+        android:layout_marginTop="40dp"
+        android:background="@drawable/rounded_cyan_button"
+        android:backgroundTint="#1C789A"
+        android:text="Log Out" />
+
 </FrameLayout>
\ No newline at end of file