diff --git a/app/src/main/java/com/example/bandung_bondowoso/MainActivity.kt b/app/src/main/java/com/example/bandung_bondowoso/MainActivity.kt
index 8d833a5f7464d58ae52f2baae53188617a961204..d6ec0f3c536725a84454a2fc738fb43e2b3d4a69 100644
--- a/app/src/main/java/com/example/bandung_bondowoso/MainActivity.kt
+++ b/app/src/main/java/com/example/bandung_bondowoso/MainActivity.kt
@@ -7,6 +7,7 @@ import android.os.Bundle
import android.util.Log
import android.view.View
import android.view.ViewGroup
+import android.widget.Toast
import androidx.appcompat.app.AppCompatActivity
import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.lifecycleScope
@@ -78,6 +79,7 @@ class MainActivity : AppCompatActivity(), ConnectionChangeListener {
if (navController.currentDestination?.id != R.id.fragment_login) {
navController.popBackStack(R.id.mobile_navigation, true)
navController.navigate(R.id.fragment_login)
+ Toast.makeText(this, "Unauthorized", Toast.LENGTH_SHORT).show()
}
} else if (it != null) {
Log.d("MainActivity", "onValid")
diff --git a/app/src/main/java/com/example/bandung_bondowoso/service/JwtCheckerService.kt b/app/src/main/java/com/example/bandung_bondowoso/service/JwtCheckerService.kt
index 44dce71863b1ca6726c05a8757737abc37a753f9..89f113255436d33eb77d387ce035bd6525558ce5 100644
--- a/app/src/main/java/com/example/bandung_bondowoso/service/JwtCheckerService.kt
+++ b/app/src/main/java/com/example/bandung_bondowoso/service/JwtCheckerService.kt
@@ -34,9 +34,6 @@ class JwtCheckerService : Service(), ConnectionChangeListener, JwtExpiredListene
super.onStartCommand(intent, flags, startId)
Log.d("JwtCheckerService", "JwtCheckerService is starting")
- Toast.makeText(this, "service starting", Toast.LENGTH_SHORT).show()
-
-
// Coroutine to fetch periodically the token
scope.launch {
while (true) {
@@ -97,7 +94,6 @@ class JwtCheckerService : Service(), ConnectionChangeListener, JwtExpiredListene
Log.d("JwtCheckerService", "JwtCheckerService is destroyed")
super.onDestroy()
job.cancel()
- Toast.makeText(this, "service done", Toast.LENGTH_SHORT).show()
}
override fun onConnectionChanged(isConnected: Boolean) {
diff --git a/app/src/main/java/com/example/bandung_bondowoso/view/transaction/CreateTransactionFragment.kt b/app/src/main/java/com/example/bandung_bondowoso/view/transaction/CreateTransactionFragment.kt
index f30df0e85416a2f6706f9acdad40dec866eb1975..e00e63405ac7a01f94d24914e85eb7fa464da604 100644
--- a/app/src/main/java/com/example/bandung_bondowoso/view/transaction/CreateTransactionFragment.kt
+++ b/app/src/main/java/com/example/bandung_bondowoso/view/transaction/CreateTransactionFragment.kt
@@ -281,6 +281,7 @@ class CreateTransactionFragment : Fragment() {
Log.d(tag, "onDestroy")
super.onDestroyView()
randomizeTransactionViewModel.resetData()
+ dialog.dismiss()
(activity as MainActivity).binding.navView.visibility = View.VISIBLE
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/bandung_bondowoso/view/transaction/TransactionAdapter.kt b/app/src/main/java/com/example/bandung_bondowoso/view/transaction/TransactionAdapter.kt
index 285fd5b4a5538509df983807dc5aad5929ca64d6..93054df1c2b99665204fdcd91c2a525540762301 100644
--- a/app/src/main/java/com/example/bandung_bondowoso/view/transaction/TransactionAdapter.kt
+++ b/app/src/main/java/com/example/bandung_bondowoso/view/transaction/TransactionAdapter.kt
@@ -160,6 +160,7 @@ class TransactionAdapter(
val dateFormat = SimpleDateFormat("dd/MM/yyyy HH:mm:ss", Locale.getDefault())
holder.tvTransactionCategory.text = transaction.type.name
holder.tvTransactionLocation.text = transaction.locationName
+ holder.tvTransactionLocation.contentDescription = "${transaction.locationName} + ${transactionList[position].name}"
holder.tvTransactionDate.text = dateFormat.format((transaction.createdAt))
holder.locationLayout.setOnClickListener {
itemClickListener.onOpenMap(transaction.name, transaction.locationName)
diff --git a/app/src/main/res/layout/bottom_dialog_map.xml b/app/src/main/res/layout/bottom_dialog_map.xml
index cfe1ccaf306118c3a8f6ab6849b63e238f9d1423..7f48d9bbd45738c5d3faef363855473366a164e5 100644
--- a/app/src/main/res/layout/bottom_dialog_map.xml
+++ b/app/src/main/res/layout/bottom_dialog_map.xml
@@ -3,11 +3,12 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:padding="10dp"
>
<TextView
android:id="@+id/tv_btm_dialog_name"
- android:layout_width="330dp"
+ android:layout_width="wrap_content"
style="@style/TextAppearance.HeadlineMedium"
android:textColor="@color/md_theme_primary"
android:layout_marginTop="20dp"
@@ -19,7 +20,7 @@
<TextView
android:id="@+id/tv_address"
- android:layout_width="330dp"
+ android:layout_width="wrap_content"
style="@style/TextAppearance.BodyLarge"
android:textColor="@color/md_theme_primary"
android:layout_marginTop="20dp"
@@ -32,8 +33,9 @@
<Button
android:id="@+id/btn_open_map"
style="@style/buttonStylePrimary"
- android:layout_width="330dp"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:paddingHorizontal="20dp"
android:layout_gravity="center_horizontal"
android:layout_marginTop="30dp"
android:width="200dp"
diff --git a/app/src/main/res/layout/dialog_custom.xml b/app/src/main/res/layout/dialog_custom.xml
index f52ce33c94992c9c8eb9a4c3502eb6d869e243d9..6a5bae1dabcdb5c3daf67c8890b2f1427f164174 100644
--- a/app/src/main/res/layout/dialog_custom.xml
+++ b/app/src/main/res/layout/dialog_custom.xml
@@ -19,6 +19,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+
android:paddingVertical="20dp"
android:paddingHorizontal="20dp"
app:layout_constraintBottom_toBottomOf="parent"
@@ -42,8 +43,7 @@
<TextView
android:id="@+id/dialog_tv_message"
style="@style/TextAppearance.BodyMedium"
- android:maxWidth="280dp"
- android:layout_width="match_parent"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="@string/dialog_message"
diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml
index d13c249d4328a0e0e313f42b7774290928643140..67c7e94716cf7d7fc308e87b28c38a2cad5a330f 100644
--- a/app/src/main/res/layout/fragment_login.xml
+++ b/app/src/main/res/layout/fragment_login.xml
@@ -54,10 +54,12 @@
android:layout_marginTop="2dp"
android:hint="@string/hint_email"
android:layout_marginBottom="20dp"
+ app:boxStrokeColor="@color/md_theme_primary"
app:layout_constraintBottom_toTopOf="@id/password_text_input"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@id/text_login">
+ app:layout_constraintTop_toBottomOf="@id/text_login"
+ >
<!--This is the actual edit text which takes the input-->
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/et_email"
@@ -78,6 +80,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:hint="@string/hint_password"
+ app:boxStrokeColor="@color/md_theme_primary"
app:passwordToggleEnabled="true"
app:layout_constraintBottom_toTopOf="@id/button_next_container"
app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/fragment_transaction_create.xml b/app/src/main/res/layout/fragment_transaction_create.xml
index 75353276801aa562d45f8c7b92f6716ec507a7d9..c4949f4f01fe01eab6dcef1221244a141c9cfb49 100644
--- a/app/src/main/res/layout/fragment_transaction_create.xml
+++ b/app/src/main/res/layout/fragment_transaction_create.xml
@@ -44,6 +44,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
+ app:boxStrokeColor="@color/md_theme_primary"
android:hint="@string/hint_transaction_new"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -78,6 +79,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
+ app:boxStrokeColor="@color/md_theme_primary"
android:hint="@string/hint_transaction_price"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -114,6 +116,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:hint="@string/hint_transaction_location"
+ app:boxStrokeColor="@color/md_theme_primary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_transaction_location">
@@ -154,9 +157,9 @@
style="@style/TextAppearance.LabelLarge"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginEnd="10dp"
android:text="@string/label_pembelian"
android:buttonTint="@color/md_theme_primary"
+ android:layout_marginEnd="20dp"
android:textColor="@color/md_theme_primary" />
<RadioButton
@@ -184,6 +187,7 @@
android:id="@+id/btn_cancel"
android:layout_width="0dp"
android:layout_height="wrap_content"
+ android:paddingHorizontal="40dp"
android:text="@string/btn_cancel"
style="@style/buttonStyleDanger"
app:backgroundTint="@null"
@@ -199,6 +203,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
style="@style/buttonStylePrimary"
+ android:paddingHorizontal="40dp"
android:text="@string/btn_submit"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/btn_cancel"
diff --git a/app/src/main/res/layout/fragment_twibbon.xml b/app/src/main/res/layout/fragment_twibbon.xml
index cc8ac0dc63ed15d7aa6644a7a703bccb7a22470e..7025d8612c1812df11af332f71a791b5de7375fe 100644
--- a/app/src/main/res/layout/fragment_twibbon.xml
+++ b/app/src/main/res/layout/fragment_twibbon.xml
@@ -15,6 +15,7 @@
style="@style/TextAppearance.HeadlineLarge"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:minHeight="48dp"
android:layout_marginStart="@dimen/title_start_margin"
android:layout_marginTop="@dimen/title_top_margin"
android:text="@string/title_twibbon"
@@ -87,8 +88,6 @@
app:layout_constraintTop_toBottomOf="@+id/cardView"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
- android:text="@string/label_shutter"
- android:textColor="@color/md_theme_primary"
android:tooltipText="@string/label_shutter"
android:contentDescription="@string/cd_take_twibbon" />
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 45cc5b9dd6b1f15fbecac9b67930b0f2dc494205..9e40d25df62e54e3a4c2183ffc7fe6ccdf3592b9 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -152,4 +152,5 @@
<color name="black">#000000</color>
<color name="white">#FFFFFF</color>
<color name="textColor">#000E8E</color>
+ <color name="mtrl_textinput_default_box_stroke_color">#32323A</color>
</resources>
\ No newline at end of file