From d3d0c25a0d3d14d61f60d1cdca7c642f998860d4 Mon Sep 17 00:00:00 2001
From: 0xzre <alilo.ghazali@gmail.com>
Date: Thu, 14 Mar 2024 22:34:35 +0700
Subject: [PATCH] fix navigation
---
.../ui/transaction/TransactionFragment.kt | 14 +++++++++++++-
app/src/main/res/layout/activity_main.xml | 4 +++-
app/src/main/res/layout/fragment_settings.xml | 2 +-
app/src/main/res/layout/fragment_transaction.xml | 4 ++--
app/src/main/res/menu/bottom_navigation_menu.xml | 8 ++++----
5 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/app/src/main/java/com/atm/bondowowo/ui/transaction/TransactionFragment.kt b/app/src/main/java/com/atm/bondowowo/ui/transaction/TransactionFragment.kt
index 79b9202..d41b87e 100644
--- a/app/src/main/java/com/atm/bondowowo/ui/transaction/TransactionFragment.kt
+++ b/app/src/main/java/com/atm/bondowowo/ui/transaction/TransactionFragment.kt
@@ -1,6 +1,18 @@
package com.atm.bondowowo.ui.transaction
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
import androidx.fragment.app.Fragment
+import com.atm.bondowowo.R
-class TransactionFragment : Fragment()
+class TransactionFragment : Fragment() {
+ override fun onCreateView(
+ inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
+ ): View? {
+ return inflater.inflate(R.layout.fragment_transaction, container, false)
+ }
+
+}
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index d6224d9..4bfc45d 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -14,6 +14,8 @@
app:defaultNavHost="true"
app:navGraph="@navigation/nav_graph" />
- <include android:id="@+id/bottom_nav_layout" layout="@layout/bottom_navigation_layout" />
+ <include
+ android:id="@+id/bottom_nav_layout"
+ layout="@layout/bottom_navigation_layout" />
</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index 95f66a2..b4319d3 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- tools:context="com.atm.bondowowo.ui.scan.ScanFragment">
+ tools:context="com.atm.bondowowo.ui.settings.SettingsFragment">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/header"
diff --git a/app/src/main/res/layout/fragment_transaction.xml b/app/src/main/res/layout/fragment_transaction.xml
index e33768f..4854239 100644
--- a/app/src/main/res/layout/fragment_transaction.xml
+++ b/app/src/main/res/layout/fragment_transaction.xml
@@ -42,9 +42,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="16dp"
+ android:contentDescription="@string/add"
android:src="@drawable/add"
app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- android:contentDescription="@string/add" />
+ app:layout_constraintEnd_toEndOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/bottom_navigation_menu.xml b/app/src/main/res/menu/bottom_navigation_menu.xml
index ec232f4..8224cd3 100644
--- a/app/src/main/res/menu/bottom_navigation_menu.xml
+++ b/app/src/main/res/menu/bottom_navigation_menu.xml
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
- android:id="@+id/menuTransaksi"
+ android:id="@+id/transactionFragment"
android:icon="@drawable/ic_transaksi"
android:title="@string/transaksi" />
<item
- android:id="@+id/menuScan"
+ android:id="@+id/scanFragment"
android:icon="@drawable/ic_scan"
android:title="@string/scan" />
<item
- android:id="@+id/menuGrafik"
+ android:id="@+id/graphFragment"
android:icon="@drawable/ic_grafik"
android:title="@string/grafik" />
<item
- android:id="@+id/menuPengaturan"
+ android:id="@+id/settingsFragment"
android:icon="@drawable/ic_pengaturan"
android:title="@string/pengaturan" />
</menu>
\ No newline at end of file
--
GitLab