Skip to content
Snippets Groups Projects
Commit 10f4be98 authored by mrsyaban's avatar mrsyaban
Browse files

fix: minor bug

parent cf57a514
2 merge requests!8Dev,!6Feat/update transaction
...@@ -3,20 +3,7 @@ ...@@ -3,20 +3,7 @@
<component name="deploymentTargetDropDown"> <component name="deploymentTargetDropDown">
<value> <value>
<entry key="app"> <entry key="app">
<State> <State />
<runningDeviceTargetSelectedWithDropDown>
<Target>
<type value="RUNNING_DEVICE_TARGET" />
<deviceKey>
<Key>
<type value="VIRTUAL_DEVICE_PATH" />
<value value="C:\Users\ASUS\.android\avd\Pixel_5_API_34.avd" />
</Key>
</deviceKey>
</Target>
</runningDeviceTargetSelectedWithDropDown>
<timeTargetWasSelectedWithDropDown value="2024-04-01T10:48:27.918936Z" />
</State>
</entry> </entry>
</value> </value>
</component> </component>
......
...@@ -4,29 +4,42 @@ import androidx.appcompat.app.AppCompatActivity ...@@ -4,29 +4,42 @@ import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle import android.os.Bundle
import androidx.activity.viewModels import androidx.activity.viewModels
import androidx.lifecycle.LiveData import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.Observer import androidx.lifecycle.Observer
import com.pbd.psi.databinding.ActivityTransactionDetailBinding import com.pbd.psi.databinding.ActivityTransactionDetailBinding
import com.pbd.psi.room.Category
import com.pbd.psi.room.TransactionEntity import com.pbd.psi.room.TransactionEntity
import com.pbd.psi.ui.transaction_detail.TransactionDetailViewModel import com.pbd.psi.ui.transaction_detail.TransactionDetailViewModel
import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.AndroidEntryPoint
@AndroidEntryPoint @AndroidEntryPoint
class TransactionDetailActivity : AppCompatActivity() { class TransactionDetailActivity : AppCompatActivity() {
private var displayData: MutableLiveData<TransactionEntity> = MutableLiveData<TransactionEntity>()
private lateinit var binding: ActivityTransactionDetailBinding
private val viewModel: TransactionDetailViewModel by viewModels() private val viewModel: TransactionDetailViewModel by viewModels()
private lateinit var transactionInfo:LiveData<TransactionEntity> private lateinit var transactionInfo:LiveData<TransactionEntity>
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
val binding = ActivityTransactionDetailBinding.inflate(layoutInflater) binding = ActivityTransactionDetailBinding.inflate(layoutInflater)
setContentView(binding.root) setContentView(binding.root)
val intent = intent val intent = intent
val itemId = intent.getIntExtra("id", -1) val itemId = intent.getIntExtra("id", -1)
transactionInfo = viewModel.getTransById(itemId) transactionInfo = viewModel.getTransById(itemId)
transactionInfo.observe(this, Observer { trans -> transactionInfo.observe(this, Observer { trans ->
displayData.postValue(trans)
binding.updateName.setText(trans.name) binding.updateName.setText(trans.name)
}) })
} }
override fun onStart() {
super.onStart()
binding.backButtonDetail.setOnClickListener{
viewModel.updateTransaction()
finish()
}
}
} }
\ No newline at end of file
...@@ -42,7 +42,7 @@ class AddTransactionFragment : Fragment() { ...@@ -42,7 +42,7 @@ class AddTransactionFragment : Fragment() {
if (inputAmountStr.isNotEmpty()) { if (inputAmountStr.isNotEmpty()) {
val inputAmount = inputAmountStr.toInt() val inputAmount = inputAmountStr.toInt()
viewModel.addTransaction(inputName, Category.EXPENSE, inputAmount) viewModel.addTransaction(inputName, Category.EXPENSE, inputAmount)
requireActivity().finish()
} else { } else {
// Handle case where amount input is empty // Handle case where amount input is empty
Toast.makeText(requireContext(), "Please enter a valid amount", Toast.LENGTH_SHORT).show() Toast.makeText(requireContext(), "Please enter a valid amount", Toast.LENGTH_SHORT).show()
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment