Povezani fragmenti login i register. Omogućen njihov prikaz nakon pokretanja aplikacije.

7 files changed, 98 insertions, 32 deletions

diff --git a/Client/BrzoDoLokacije/app/src/main/AndroidManifest.xml b/Client/BrzoDoLokacije/app/src/main/AndroidManifest.xml
index 1dff3df..e0a5a2b 100644
--- a/Client/BrzoDoLokacije/app/src/main/AndroidManifest.xml
+++ b/Client/BrzoDoLokacije/app/src/main/AndroidManifest.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
+
     <uses-permission android:name="android.permission.INTERNET" />
+
     <application
-        android:usesCleartextTraffic="true"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
@@ -12,8 +13,12 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.BrzoDoLokacije"
+        android:usesCleartextTraffic="true"
         tools:targetApi="31">
         <activity
+            android:name=".Activities.ActivityLoginRegister"
+        />
+        <activity
             android:name=".MainActivity"
             android:exported="true">
             <intent-filter>
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 fdfd0e2..8aba11a 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
@@ -2,11 +2,49 @@ package com.example.brzodolokacije.Activities
 
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import android.util.Log
+import android.view.View
+import android.widget.Button
+import android.widget.Toast
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
+import androidx.fragment.app.FragmentTransaction
+import com.example.brzodolokacije.Fragments.FragmentLogin
+import com.example.brzodolokacije.Fragments.FragmentRegister
 import com.example.brzodolokacije.R
+import com.google.android.material.internal.ContextUtils.getActivity
 
 class ActivityLoginRegister : AppCompatActivity() {
+
+    private lateinit var login: Button
+    private lateinit var register: Button
+
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_login_register)
+        Log.d("main","123456")
+        login=findViewById<View>(R.id.btnFragmentActivityLRLogin) as Button
+        register=findViewById<View>(R.id.btnFragmentActivityLRRegister) as Button
+        //var fm: FragmentTransaction =supportFragmentManager.beginTransaction()
+        //fm.replace(R.id.flFragmentActivityLRFragmentsView,FragmentLogin())
+
+        login.setOnClickListener{
+            Log.d("main","prijavi se")
+            var fm: FragmentTransaction =supportFragmentManager.beginTransaction()
+
+            fm.replace(R.id.flFragmentActivityLRFragmentsView,FragmentLogin())
+            fm.commit()
+        }
+
+        register.setOnClickListener{
+            Log.d("main","prijavi se")
+
+            var fm: FragmentTransaction =supportFragmentManager.beginTransaction()
+
+            fm.replace(R.id.flFragmentActivityLRFragmentsView, FragmentRegister())
+            fm.commit()
+        }
     }
-}
\ No newline at end of file
+
+}
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/MainActivity.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/MainActivity.kt
index 03d6236..abf041a 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/MainActivity.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/MainActivity.kt
@@ -1,11 +1,24 @@
 package com.example.brzodolokacije
 
+import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import android.util.Log
+import android.view.View
+import android.widget.Button
+import androidx.fragment.app.FragmentTransaction
+import com.example.brzodolokacije.Activities.ActivityLoginRegister
+import com.example.brzodolokacije.Fragments.FragmentLogin
+import com.example.brzodolokacije.Fragments.FragmentRegister
 
 class MainActivity : AppCompatActivity() {
+
     override fun onCreate(savedInstanceState: Bundle?) {
+
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
+
+        val intent= Intent(this, ActivityLoginRegister::class.java)
+        startActivity(intent)
     }
 }
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_login_register.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_login_register.xml
index d276a63..50d903b 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_login_register.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_login_register.xml
@@ -4,25 +4,41 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:foreground="@drawable/b3"
+    android:elevation="0dp"
     android:foregroundGravity="fill"
     android:foregroundTint="#5E010F13"
     android:foregroundTintMode="add"
-    tools:context=".Activities.ActivityLoginRegister" >
+    tools:context=".Activities.ActivityLoginRegister">
 
-    <androidx.viewpager2.widget.ViewPager2
+    <Button
+        android:id="@+id/btnFragmentActivityLRLogin"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:elevation="1dp"
+        android:text="Prijavi se"
+        app:layout_constraintEnd_toStartOf="@+id/btnFragmentActivityLRRegister"
+        app:layout_constraintHorizontal_bias="0.846"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <Button
+        android:id="@+id/btnFragmentActivityLRRegister"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="52dp"
+        android:elevation="100dp"
+        android:text="Registruj se"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <FrameLayout
+        android:id="@+id/flFragmentActivityLRFragmentsView"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:layout_marginStart="50dp"
-        android:layout_marginTop="150dp"
-        android:layout_marginEnd="50dp"
-        android:layout_marginBottom="150dp"
-        android:background="#FFFFFF"
-        android:backgroundTint="#F1EDED"
-        android:foregroundGravity="center"
-        android:foregroundTint="#FFFFFF"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toBottomOf="@+id/btnFragmentActivityLRLogin">
+
+    </FrameLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_main.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_main.xml
index 17eab17..312e35d 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_main.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_main.xml
@@ -5,14 +5,9 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".MainActivity">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Hello World!"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
+<TextView
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:text="MAIN"
+    />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_login.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_login.xml
index 0cefaa3..6942362 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_login.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_login.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".Fragments.fragmentLogin">
+    tools:context=".Fragments.FragmentLogin">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="400dp"
@@ -23,7 +23,7 @@
             app:layout_constraintHorizontal_bias="0.0"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            tools:text="Email" />
+            android:text="Email" />
 
         <EditText
             android:id="@+id/etFragmentLoginEmail"
@@ -43,12 +43,12 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="24dp"
-            android:text="TextView"
+            android:text="Lozinka"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.0"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/etFragmentLoginEmail"
-            tools:text="Lozinka" />
+            />
 
         <EditText
             android:id="@+id/etFragmentLoginPassword"
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_register.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_register.xml
index 4eade84..0c59f09 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_register.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_register.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".Fragments.fragmentRegister">
+    tools:context=".Fragments.FragmentRegister">
 
     <!-- TODO: Update blank fragment layout -->
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -46,8 +46,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.0"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/etFragmentRegisterEmail"
-            tools:text="Lozinka" />
+            app:layout_constraintTop_toBottomOf="@+id/etFragmentRegisterEmail" />
 
         <TextView
             android:id="@+id/tvFragmentRegisterEmail"
@@ -59,7 +58,7 @@
             app:layout_constraintHorizontal_bias="0.0"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/etFragmentRegisterName"
-            tools:text="Email" />
+            android:text="Email" />
 
         <EditText
             android:id="@+id/etFragmentRegisterUser"