diff --git a/app/src/main/java/com/example/pbd_jwr/LoginActivity.kt b/app/src/main/java/com/example/pbd_jwr/LoginActivity.kt
index 238340df6670d7b737518fe7c570958537cd6867..bb2613c43a996c4177f94008b4d6a0d5e9d8e579 100644
--- a/app/src/main/java/com/example/pbd_jwr/LoginActivity.kt
+++ b/app/src/main/java/com/example/pbd_jwr/LoginActivity.kt
@@ -49,7 +49,6 @@ class LoginActivity : AppCompatActivity() {
connectivityManager = getSystemService(CONNECTIVITY_SERVICE) as ConnectivityManager
networkCallback = NetworkCallbackImplementation(this)
- registerNetworkCallback()
if (isLoggedIn()) {
// If the user credential is stored, login and start the MainActivity
@@ -113,7 +112,6 @@ class LoginActivity : AppCompatActivity() {
override fun onDestroy() {
super.onDestroy()
- unregisterNetworkCallback()
}
private fun isLoggedIn(): Boolean {
diff --git a/app/src/main/java/com/example/pbd_jwr/MainActivity.kt b/app/src/main/java/com/example/pbd_jwr/MainActivity.kt
index f2fb8e02a71bb37cb299847227fe809934aa06d2..0cad702ff6caac03d70db790e045d5f344858072 100644
--- a/app/src/main/java/com/example/pbd_jwr/MainActivity.kt
+++ b/app/src/main/java/com/example/pbd_jwr/MainActivity.kt
@@ -66,7 +66,7 @@ class MainActivity : AppCompatActivity() {
// menu should be considered as top level destinations.
val appBarConfiguration = AppBarConfiguration(
setOf(
- R.id.navigation_transaction, R.id.navigation_dashboard, R.id.navigation_settings, R.id.navigation_transaction_add, R.id.navigation_transaction_detail, R.id.navigation_twibbon
+ R.id.navigation_transaction, R.id.navigation_dashboard, R.id.navigation_settings, R.id.navigation_transaction_add, R.id.navigation_transaction_detail, R.id.navigation_twibbon, R.id.navigation_scan
)
)
setupActionBarWithNavController(navController, appBarConfiguration)
@@ -74,8 +74,11 @@ class MainActivity : AppCompatActivity() {
val fab: FloatingActionButton = binding.fabScan
fab.setOnClickListener {
- // Start ScanActivity
+ // Navigate ScanFragment
navController.navigate(R.id.navigation_scan)
+ val menuItem = navView.menu.findItem(R.id.navigation_scan)
+ menuItem.isChecked = true
+
}
navView.setOnItemSelectedListener { menuItem ->
when (menuItem.itemId) {
@@ -105,6 +108,10 @@ class MainActivity : AppCompatActivity() {
finish()
true
}
+ R.id.navigation_scan->{
+ navController.navigate(R.id.navigation_scan)
+ true
+ }
else -> false
}
}
diff --git a/app/src/main/res/layout/fragment_scan.xml b/app/src/main/res/layout/fragment_scan.xml
index eec985485c17768e71b95b7e28f15a2d4d629d81..89feaea6c2e0ddd15761e2a96667755ef3080b22 100644
--- a/app/src/main/res/layout/fragment_scan.xml
+++ b/app/src/main/res/layout/fragment_scan.xml
@@ -1,55 +1,60 @@
<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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.scan.ScanFragment">
+ android:overScrollMode="never"
+ >
+<androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ tools:context=".ui.scan.ScanFragment"
+ android:paddingHorizontal="8dp"
+ >
<Button
android:id="@+id/scanBtn"
android:layout_width="75dp"
android:layout_height="wrap_content"
- android:layout_marginStart="8dp"
- android:text="Scan"
+ android:text="@string/title_scan"
app:layout_constraintBottom_toTopOf="@+id/listDummyTransaction"
- app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintLeft_toLeftOf="parent"
+ app:layout_constraintRight_toLeftOf="@id/galleryBtn"
app:layout_constraintTop_toBottomOf="@+id/imageView"
- app:layout_constraintVertical_bias="0.3" />
+ />
<Button
android:id="@+id/galleryBtn"
android:layout_width="90dp"
android:layout_height="wrap_content"
- android:layout_marginStart="8dp"
- android:text="Album"
+ android:text="@string/album"
app:layout_constraintBottom_toTopOf="@+id/listDummyTransaction"
- app:layout_constraintStart_toEndOf="@+id/scanBtn"
+ app:layout_constraintLeft_toRightOf="@id/scanBtn"
+ app:layout_constraintRight_toLeftOf="@id/uploadBtn"
app:layout_constraintTop_toBottomOf="@+id/imageView"
- app:layout_constraintVertical_bias="0.3"/>
+ />
<Button
android:id="@+id/uploadBtn"
android:layout_width="75dp"
android:layout_height="wrap_content"
- android:layout_marginStart="8dp"
- android:layout_marginEnd="8dp"
- android:text="Send"
+ android:text="@string/send"
app:layout_constraintBottom_toTopOf="@+id/listDummyTransaction"
- app:layout_constraintEnd_toStartOf="@+id/saveTransactionsBtn"
- app:layout_constraintStart_toEndOf="@+id/galleryBtn"
+ app:layout_constraintRight_toLeftOf="@id/saveTransactionsBtn"
+ app:layout_constraintLeft_toRightOf="@id/galleryBtn"
app:layout_constraintTop_toBottomOf="@+id/imageView"
- app:layout_constraintVertical_bias="0.3" />
+
+ />
<ImageView
android:id="@+id/imageView"
android:layout_width="335dp"
android:layout_height="335dp"
- android:contentDescription="PreviewImg"
+ android:contentDescription="@string/previewimg"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintVertical_bias="0.366"
tools:srcCompat="@tools:sample/avatars" />
@@ -57,33 +62,37 @@
android:id="@+id/saveTransactionsBtn"
android:layout_width="80dp"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
- android:text="Save"
+ android:text="@string/save"
app:layout_constraintBottom_toTopOf="@+id/listDummyTransaction"
- app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintRight_toRightOf="parent"
+ app:layout_constraintLeft_toRightOf="@id/uploadBtn"
app:layout_constraintTop_toBottomOf="@+id/imageView"
- app:layout_constraintVertical_bias="0.3" />
+ />
<ListView
android:id="@+id/listDummyTransaction"
android:layout_width="323dp"
android:layout_height="193dp"
app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.494"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/imageView" />
+ app:layout_constraintLeft_toLeftOf="parent"
+ app:layout_constraintRight_toRightOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/textView"
+ android:textSize="16sp"
+ />
<TextView
android:id="@+id/textView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="Transactions:"
+ android:text="@string/title_transaction"
android:textSize="25sp"
+ android:layout_marginTop="10dp"
+ android:layout_marginBottom="10dp"
app:layout_constraintBottom_toTopOf="@+id/listDummyTransaction"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.165"
- app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintLeft_toLeftOf="parent"
+ app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/scanBtn" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
+
+</ScrollView>
\ 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 434bcfa7121630326f7ccf66f9ee87bfe6d4cb58..026fdbc425c86d47e02723b27fe9aae753d513d0 100644
--- a/app/src/main/res/menu/bottom_nav_menu.xml
+++ b/app/src/main/res/menu/bottom_nav_menu.xml
@@ -13,7 +13,7 @@
/>
<item
- android:id="@+id/floatingNav"
+ android:id="@+id/navigation_scan"
android:title="@string/title_scan"
/>
<item
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7584bd2a3d9b345f11fcda9f4b9311e9b57ddb70..74c6cb1e5d9743f090b30ff036d6048d1029db9e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -20,4 +20,7 @@
<string name="amount">Amount</string>
<string name="title">Title</string>
<string name="back">Back</string>
+ <string name="album">Album</string>
+ <string name="send">Send</string>
+ <string name="previewimg">PreviewImg</string>
</resources>
\ No newline at end of file