diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2b715c20955038b8549fde226f7eb5885beebd9c..f79b02642e970e47f63117dc8684329efaaa4df6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -18,7 +18,7 @@
android:theme="@style/Theme.Tubespbd"
tools:targetApi="31">
<activity
- android:name=".SplashActivity"
+ android:name=".MainActivity"
android:exported="true"
android:label="@string/app_name">
<intent-filter>
@@ -27,8 +27,6 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
- <activity android:name=".LoginActivity" />
- <activity android:name=".MainActivity" />
<service
android:name=".auth.TokenExpirationService"
android:foregroundServiceType="dataSync"
diff --git a/app/src/main/java/com/example/tubespbd/MainActivity.kt b/app/src/main/java/com/example/tubespbd/MainActivity.kt
index 3407b02f6bb935ad51afdb96109ddc10bfbf033d..b53a08cb5c9ac1ce0e2c2466a2994fd88c7a50c2 100644
--- a/app/src/main/java/com/example/tubespbd/MainActivity.kt
+++ b/app/src/main/java/com/example/tubespbd/MainActivity.kt
@@ -39,7 +39,7 @@ class MainActivity : AppCompatActivity() {
val appBarConfiguration = AppBarConfiguration(
setOf(
- R.id.navigation_home, R.id.navigation_scan, R.id.navigation_dashboard, R.id.navigation_notifications
+ R.id.navigation_home, R.id.navigation_scan, R.id.navigation_dashboard, R.id.navigation_settings
)
)
setupActionBarWithNavController(navController, appBarConfiguration)
diff --git a/app/src/main/java/com/example/tubespbd/ui/notifications/NotificationsFragment.kt b/app/src/main/java/com/example/tubespbd/ui/settings/SettingsFragment.kt
similarity index 53%
rename from app/src/main/java/com/example/tubespbd/ui/notifications/NotificationsFragment.kt
rename to app/src/main/java/com/example/tubespbd/ui/settings/SettingsFragment.kt
index f1621b98b3484f2174db6c002b313599c8415b20..117ba03b322578eee68a964a95a5797e219a172b 100644
--- a/app/src/main/java/com/example/tubespbd/ui/notifications/NotificationsFragment.kt
+++ b/app/src/main/java/com/example/tubespbd/ui/settings/SettingsFragment.kt
@@ -1,4 +1,4 @@
-package com.example.tubespbd.ui.notifications
+package com.example.tubespbd.ui.settings
import android.os.Bundle
import android.view.LayoutInflater
@@ -7,11 +7,11 @@ import android.view.ViewGroup
import android.widget.TextView
import androidx.fragment.app.Fragment
import androidx.lifecycle.ViewModelProvider
-import com.example.tubespbd.databinding.FragmentNotificationsBinding
+import com.example.tubespbd.databinding.FragmentSettingsBinding
-class NotificationsFragment : Fragment() {
+class SettingsFragment : Fragment() {
- private var _binding: FragmentNotificationsBinding? = null
+ private var _binding: FragmentSettingsBinding? = null
// This property is only valid between onCreateView and
// onDestroyView.
@@ -22,16 +22,11 @@ class NotificationsFragment : Fragment() {
container: ViewGroup?,
savedInstanceState: Bundle?
): View {
- val notificationsViewModel =
- ViewModelProvider(this).get(NotificationsViewModel::class.java)
+ val settingsViewModel =
+ ViewModelProvider(this).get(SettingsViewModel::class.java)
- _binding = FragmentNotificationsBinding.inflate(inflater, container, false)
+ _binding = FragmentSettingsBinding.inflate(inflater, container, false)
val root: View = binding.root
-
- val textView: TextView = binding.textNotifications
- notificationsViewModel.text.observe(viewLifecycleOwner) {
- textView.text = it
- }
return root
}
diff --git a/app/src/main/java/com/example/tubespbd/ui/notifications/NotificationsViewModel.kt b/app/src/main/java/com/example/tubespbd/ui/settings/SettingsViewModel.kt
similarity index 61%
rename from app/src/main/java/com/example/tubespbd/ui/notifications/NotificationsViewModel.kt
rename to app/src/main/java/com/example/tubespbd/ui/settings/SettingsViewModel.kt
index af2aba6d87e8595c728d77ac960977f9854a579d..fa3702ed1d8fb21ab4b2ab15c3a164839f288466 100644
--- a/app/src/main/java/com/example/tubespbd/ui/notifications/NotificationsViewModel.kt
+++ b/app/src/main/java/com/example/tubespbd/ui/settings/SettingsViewModel.kt
@@ -1,13 +1,13 @@
-package com.example.tubespbd.ui.notifications
+package com.example.tubespbd.ui.settings
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
-class NotificationsViewModel : ViewModel() {
+class SettingsViewModel : ViewModel() {
private val _text = MutableLiveData<String>().apply {
- value = "This is notifications Fragment"
+ value = "This is settings Fragment"
}
val text: LiveData<String> = _text
}
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_notifications.xml b/app/src/main/res/layout/fragment_notifications.xml
deleted file mode 100644
index d41793572bb3b8347ec4bced74b7bd4a43bed5d4..0000000000000000000000000000000000000000
--- a/app/src/main/res/layout/fragment_notifications.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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:layout_width="match_parent"
- android:layout_height="match_parent"
- tools:context=".ui.notifications.NotificationsFragment">
-
- <TextView
- android:id="@+id/text_notifications"
- android:layout_width="match_parent"
- 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_settings.xml b/app/src/main/res/layout/fragment_settings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e7dc2a8cf8e29579644b72af54aef06bc7525941
--- /dev/null
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -0,0 +1,39 @@
+<?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:layout_width="match_parent"
+ android:layout_height="match_parent"
+ tools:context=".ui.settings.SettingsFragment">
+
+ <Button
+ android:id="@+id/save_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="Simpan Daftar Transaksi"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="0.496"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <Button
+ android:id="@+id/send_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="Kirim Daftar Transaksi"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <Button
+ android:id="@+id/logout_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="Logout"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintVertical_bias="0.614" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/bottom_nav_menu.xml b/app/src/main/res/menu/bottom_nav_menu.xml
index f6d827483bea6a497b00e9d87f487d5bf1b741fc..8b9da09e0a465b600432144cbc8a664225601dd0 100644
--- a/app/src/main/res/menu/bottom_nav_menu.xml
+++ b/app/src/main/res/menu/bottom_nav_menu.xml
@@ -17,8 +17,8 @@
android:title="@string/title_scan" />
<item
- android:id="@+id/navigation_notifications"
+ android:id="@+id/navigation_settings"
android:icon="@drawable/ic_notifications_black_24dp"
- android:title="@string/title_notifications" />
+ android:title="@string/title_settings" />
</menu>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml
index 23bccfa13e0486dbad49f8c58d55ae6b8688e6a8..53caca97aededdc140b449646247b9938a11b599 100644
--- a/app/src/main/res/navigation/mobile_navigation.xml
+++ b/app/src/main/res/navigation/mobile_navigation.xml
@@ -24,8 +24,8 @@
tools:layout="@layout/fragment_scan"/>
<fragment
- android:id="@+id/navigation_notifications"
- android:name="com.example.tubespbd.ui.notifications.NotificationsFragment"
- android:label="@string/title_notifications"
- tools:layout="@layout/fragment_notifications" />
+ android:id="@+id/navigation_settings"
+ android:name="com.example.tubespbd.ui.settings.SettingsFragment"
+ android:label="@string/title_settings"
+ tools:layout="@layout/fragment_settings" />
</navigation>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 67f88db6782bab6e4d04fed22b3d5e450c40871d..3f23b7b5412e56016cd394c05fb5f0bd268c83a5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,7 +2,7 @@
<string name="app_name">tubespbd</string>
<string name="title_home">Home</string>
<string name="title_dashboard">Dashboard</string>
- <string name="title_notifications">Notifications</string>
+ <string name="title_settings">Settings</string>
<string name="splash_text">
ꦧꦺꦴꦤ꧀ê¦ê¦ºê¦´
ꦩꦤ꧀