Merge branch 'twibbon' into 'dev'

fix: randomizetransaction reset data

See merge request !31

app/src/main/java/com/example/bandung_bondowoso/view/setting/SettingFragment.kt

@@ -196,7 +196,7 @@ class SettingFragment : Fragment(), ConnectionChangeListener {
             val randomNumber = (0..100000).random()
             val randomAmount = (1 .. 9999999).random()
             intent.putExtra("name", "Random Transaction $randomNumber")
-            intent.putExtra("amount", randomAmount)
+            intent.putExtra("amount", randomAmount.toDouble())
             LocalBroadcastManager.getInstance(requireContext()).sendBroadcast(intent)
 
         }

app/src/main/java/com/example/bandung_bondowoso/view/transaction/CreateTransactionFragment.kt

@@ -131,9 +131,9 @@ class CreateTransactionFragment : Fragment() {
                 clearField()
                 Navigation.findNavController(view).navigate(R.id.action_newTransactionFragment_to_navigation_transaction)
                 (activity as MainActivity).binding.navView.selectedItemId = R.id.navigation_transaction
-                Toast.makeText(requireContext(), "Create ETransaction Success", Toast.LENGTH_SHORT).show()
+                Toast.makeText(requireContext(), "Create Transaction Success", Toast.LENGTH_SHORT).show()
             } else {
-                Toast.makeText(requireContext(), "Create ETransaction Failed", Toast.LENGTH_SHORT).show()
+                Toast.makeText(requireContext(), "Create Transaction Failed", Toast.LENGTH_SHORT).show()
             }
         }
         cancelButton = binding.btnCancel
@@ -163,10 +163,14 @@ class CreateTransactionFragment : Fragment() {
         }
 
         randomizeTransactionViewModel.transactionName.observe(viewLifecycleOwner) { name ->
-            transactionName.setText(name)
+            if(name != null){
+                transactionName.setText(name)
+            }
         }
         randomizeTransactionViewModel.transactionAmount.observe(viewLifecycleOwner) { amount ->
-            transactionAmount.setText(amount.toString())
+            if(amount != null){
+                transactionAmount.setText(amount.toString())
+            }
         }
 
         if (ActivityCompat.checkSelfPermission(
@@ -250,7 +254,7 @@ class CreateTransactionFragment : Fragment() {
             ActivityResultContracts.RequestMultiplePermissions()
         ) { permissions ->
             when {
-                permissions.getOrDefault(android.Manifest.permission.ACCESS_COARSE_LOCATION, false) -> {
+                permissions.getOrDefault(Manifest.permission.ACCESS_COARSE_LOCATION, false) -> {
                     Log.d("HomeFragment", "Approximate location access granted")
                     getLastLocation()
                 } else -> {
@@ -263,14 +267,20 @@ class CreateTransactionFragment : Fragment() {
         }
 
         locationPermissionRequest.launch(arrayOf(
-            android.Manifest.permission.ACCESS_FINE_LOCATION,
-            android.Manifest.permission.ACCESS_COARSE_LOCATION)
+            Manifest.permission.ACCESS_FINE_LOCATION,
+            Manifest.permission.ACCESS_COARSE_LOCATION)
         )
     }
 
+    override fun onStop() {
+        super.onStop()
+        randomizeTransactionViewModel.resetData()
+    }
+
     override fun onDestroyView() {
         Log.d(tag, "onDestroy")
         super.onDestroyView()
+        randomizeTransactionViewModel.resetData()
         (activity as MainActivity).binding.navView.visibility = View.VISIBLE
     }
 }
\ No newline at end of file

app/src/main/java/com/example/bandung_bondowoso/viewmodel/transaction/RandomizeTransactionViewModel.kt

@@ -10,11 +10,11 @@ class RandomizeTransactionViewModel: ViewModel(), RandomizeTransactionListener {
     private val _isRandomized = MutableLiveData<Boolean>()
     val isRandomized = _isRandomized
 
-    private val _transactionName = MutableLiveData<String>()
-    val transactionName: LiveData<String> = _transactionName
+    private val _transactionName = MutableLiveData<String?>()
+    val transactionName: LiveData<String?> = _transactionName
 
-    private val _transactionAmount = MutableLiveData<Double>()
-    val transactionAmount:LiveData<Double> = _transactionAmount
+    private val _transactionAmount = MutableLiveData<Double?>()
+    val transactionAmount:LiveData<Double?> = _transactionAmount
 
     override fun onRandomized() {
         Log.d("RandomizeTransactionViewModel", "onRandomized")
@@ -33,7 +33,14 @@ class RandomizeTransactionViewModel: ViewModel(), RandomizeTransactionListener {
     fun getTransactionName(): String? {
         return _transactionName.value
     }
+    fun getTransactionAmount(): Double?{
+        return _transactionAmount.value
+    }
 
+    fun resetData(){
+        _transactionName.value = null
+        _transactionAmount.value = null
+    }
 
 
 }

app/src/main/res/drawable/bg_settings_card_user.xml

 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/md_theme_scrim" />
+    <solid android:color="@color/md_theme_blue" />
     <corners android:radius="10dp" />
 </shape>
\ No newline at end of file

app/src/main/res/values-night/colors.xml

@@ -8,7 +8,7 @@
     <color name="md_theme_green">#44C34A</color>
     <color name="md_theme_peach">#F12BFF</color>
     <color name="md_theme_light_green">#3B4279</color>
-    <color name="md_theme_blue">#ADC7FF</color>
+    <color name="md_theme_blue">#B2C5ED</color>
     <color name="md_theme_secondary">#BCC3FF</color>
     <color name="md_theme_onSecondary">#242C61</color>
     <color name="md_theme_secondaryContainer">#3B4279</color>

app/src/main/res/values/colors.xml

@@ -8,7 +8,7 @@
     <color name="md_theme_green">#44C34A</color>
     <color name="md_theme_peach">#FF639A</color>
     <color name="md_theme_light_green">#C7ECC1</color>
-    <color name="md_theme_blue">#ADC7FF</color>
+    <color name="md_theme_blue">#B2C5ED</color>
     <color name="md_theme_primaryContainer">#DFE0FF</color>
     <color name="md_theme_onPrimaryContainer">#0D154B</color>
     <color name="md_theme_secondary">#535A92</color>