diff --git a/app/src/main/java/com/example/bondoyap/ui/graph/GraphFragment.kt b/app/src/main/java/com/example/bondoyap/ui/graph/GraphFragment.kt
index fbb4a1d441124ff52fe2d7c67e557883a6f10c42..2699f7ae6afc2649b643b34422251ea4a54e62db 100644
--- a/app/src/main/java/com/example/bondoyap/ui/graph/GraphFragment.kt
+++ b/app/src/main/java/com/example/bondoyap/ui/graph/GraphFragment.kt
@@ -6,6 +6,7 @@ import androidx.fragment.app.Fragment
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
+import android.widget.TextView
import com.example.bondoyap.R
class GraphFragment : Fragment() {
@@ -26,6 +27,15 @@ class GraphFragment : Fragment() {
inflater: LayoutInflater, container: ViewGroup?,
savedInstanceState: Bundle?
): View {
- return inflater.inflate(R.layout.fragment_graph, container, false)
+
+ val root = inflater.inflate(R.layout.fragment_graph, container, false)
+
+ val textView: TextView = root.findViewById(R.id.text_graph)
+
+ viewModel.text.observe(viewLifecycleOwner) {
+ textView.text = it
+ }
+
+ return root
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/bondoyap/ui/graph/GraphViewModel.kt b/app/src/main/java/com/example/bondoyap/ui/graph/GraphViewModel.kt
index 100034f76b046c83841ca5b5d84d9eec7b869b48..4135310bb4de0d8826d6148bc33f4fddb1c38517 100644
--- a/app/src/main/java/com/example/bondoyap/ui/graph/GraphViewModel.kt
+++ b/app/src/main/java/com/example/bondoyap/ui/graph/GraphViewModel.kt
@@ -1,7 +1,13 @@
package com.example.bondoyap.ui.graph
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
class GraphViewModel : ViewModel() {
- // TODO: Implement the ViewModel
+
+ private val _text = MutableLiveData<String>().apply {
+ value = "This is Graph Fragment"
+ }
+ val text: LiveData<String> = _text
}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/bondoyap/ui/scanner/ScannerFragment.kt b/app/src/main/java/com/example/bondoyap/ui/scanner/ScannerFragment.kt
index 20427edfb74d28bc590b7563ff57c3a368f88291..0996dc927745fd359a7ac320a90b845d8ffb9083 100644
--- a/app/src/main/java/com/example/bondoyap/ui/scanner/ScannerFragment.kt
+++ b/app/src/main/java/com/example/bondoyap/ui/scanner/ScannerFragment.kt
@@ -28,7 +28,7 @@ class ScannerFragment : Fragment() {
_binding = FragmentScannerBinding.inflate(inflater, container, false)
val root: View = binding.root
- val textView: TextView = binding.textNotifications
+ val textView: TextView = binding.textScanner
scannerViewModel.text.observe(viewLifecycleOwner) {
textView.text = it
}
diff --git a/app/src/main/java/com/example/bondoyap/ui/settings/SettingsFragment.kt b/app/src/main/java/com/example/bondoyap/ui/settings/SettingsFragment.kt
index 17805dc49dc976d24294368bd137e06de3eec285..9433c1071c0e9bc4cd8fcac9326e5c7b3acc43cc 100644
--- a/app/src/main/java/com/example/bondoyap/ui/settings/SettingsFragment.kt
+++ b/app/src/main/java/com/example/bondoyap/ui/settings/SettingsFragment.kt
@@ -28,7 +28,7 @@ class SettingsFragment : Fragment() {
_binding = FragmentSettingsBinding.inflate(inflater, container, false)
val root: View = binding.root
- val textView: TextView = binding.textHome
+ val textView: TextView = binding.textSettings
settingsViewModel.text.observe(viewLifecycleOwner) {
textView.text = it
}
diff --git a/app/src/main/java/com/example/bondoyap/ui/transactions/TransactionsFragment.kt b/app/src/main/java/com/example/bondoyap/ui/transactions/TransactionsFragment.kt
index a9a7d64348d9f628215b3426a96def1e367ab5ae..b8cbc5f6ddde72493ea3dc5d9e81c53015e6557e 100644
--- a/app/src/main/java/com/example/bondoyap/ui/transactions/TransactionsFragment.kt
+++ b/app/src/main/java/com/example/bondoyap/ui/transactions/TransactionsFragment.kt
@@ -28,7 +28,7 @@ class TransactionsFragment : Fragment() {
_binding = FragmentTransactionsBinding.inflate(inflater, container, false)
val root: View = binding.root
- val textView: TextView = binding.textDashboard
+ val textView: TextView = binding.textTransactions
transactionsViewModel.text.observe(viewLifecycleOwner) {
textView.text = it
}
diff --git a/app/src/main/res/layout/fragment_graph.xml b/app/src/main/res/layout/fragment_graph.xml
index e325d1cfe5ec337ab1bdf424dc613335e3e6af6b..54053eed4448bd44ec27178a235b2435bc7e12f4 100644
--- a/app/src/main/res/layout/fragment_graph.xml
+++ b/app/src/main/res/layout/fragment_graph.xml
@@ -1,13 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".ui.graph.GraphFragment">
<TextView
+ android:id="@+id/text_graph"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:text="Graph Fragment" />
-
-</FrameLayout>
\ No newline at end of file
+ android:layout_height="wrap_content"
+ android:layout_marginStart="8dp"
+ android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
+ android:textAlignment="center"
+ android:textSize="20sp"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_scanner.xml b/app/src/main/res/layout/fragment_scanner.xml
index 0c94f948f9d97cf41a4969c8dd43415bf3739fcd..883e701ac332ec99a2870cc89a74d2e6a979e81f 100644
--- a/app/src/main/res/layout/fragment_scanner.xml
+++ b/app/src/main/res/layout/fragment_scanner.xml
@@ -7,7 +7,7 @@
tools:context=".ui.scanner.ScannerFragment">
<TextView
- android:id="@+id/text_notifications"
+ android:id="@+id/text_scanner"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index b2193ebe9fba031b2a4c9bf2d5fc877743fe17c2..5f90bc6adda3319a6073dd79512e10f163e686f2 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -7,7 +7,7 @@
tools:context=".ui.settings.SettingsFragment">
<TextView
- android:id="@+id/text_home"
+ android:id="@+id/text_settings"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
diff --git a/app/src/main/res/layout/fragment_transactions.xml b/app/src/main/res/layout/fragment_transactions.xml
index 25c7c265ffb8e6ef7dfb22301bf658128e219f53..45fe32c51b6329dc85f34563c32e86ecd2491f52 100644
--- a/app/src/main/res/layout/fragment_transactions.xml
+++ b/app/src/main/res/layout/fragment_transactions.xml
@@ -7,7 +7,7 @@
tools:context=".ui.transactions.TransactionsFragment">
<TextView
- android:id="@+id/text_dashboard"
+ android:id="@+id/text_transactions"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml
index 982e225a820b2dcf8d2411ea81702da9c7c7fede..efa5003d6cdb2778fc6190e8d2ef6edc22bf9d79 100644
--- a/app/src/main/res/navigation/mobile_navigation.xml
+++ b/app/src/main/res/navigation/mobile_navigation.xml
@@ -5,6 +5,12 @@
android:id="@+id/mobile_navigation"
app:startDestination="@+id/navigation_transactions">
+ <fragment
+ android:id="@+id/navigation_login"
+ android:name="com.example.bondoyap.ui.login.LoginFragment"
+ android:label="@string/title_login"
+ tools:layout="@layout/fragment_transactions" />
+
<fragment
android:id="@+id/navigation_transactions"
android:name="com.example.bondoyap.ui.transactions.TransactionsFragment"