diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml index e72b8a29322f87761eaca407bf3b73078e787d25..0c0c3383890637b4721df1f49d0b229e55c0f361 100644 --- a/.idea/deploymentTargetDropDown.xml +++ b/.idea/deploymentTargetDropDown.xml @@ -3,20 +3,7 @@ <component name="deploymentTargetDropDown"> <value> <entry key="app"> - <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> + <State /> </entry> </value> </component> diff --git a/app/src/main/java/com/pbd/psi/TransactionDetailActivity.kt b/app/src/main/java/com/pbd/psi/TransactionDetailActivity.kt index e2eae49a3e7bd5c715cba3825a3a7392cb1da2cd..382bb9a63d682ba66ceb45945c7ac32e1e8cf5e1 100644 --- a/app/src/main/java/com/pbd/psi/TransactionDetailActivity.kt +++ b/app/src/main/java/com/pbd/psi/TransactionDetailActivity.kt @@ -4,29 +4,42 @@ import androidx.appcompat.app.AppCompatActivity import android.os.Bundle import androidx.activity.viewModels import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData import androidx.lifecycle.Observer import com.pbd.psi.databinding.ActivityTransactionDetailBinding +import com.pbd.psi.room.Category import com.pbd.psi.room.TransactionEntity import com.pbd.psi.ui.transaction_detail.TransactionDetailViewModel import dagger.hilt.android.AndroidEntryPoint @AndroidEntryPoint class TransactionDetailActivity : AppCompatActivity() { - + private var displayData: MutableLiveData<TransactionEntity> = MutableLiveData<TransactionEntity>() + private lateinit var binding: ActivityTransactionDetailBinding private val viewModel: TransactionDetailViewModel by viewModels() private lateinit var transactionInfo:LiveData<TransactionEntity> + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - val binding = ActivityTransactionDetailBinding.inflate(layoutInflater) + binding = ActivityTransactionDetailBinding.inflate(layoutInflater) setContentView(binding.root) val intent = intent val itemId = intent.getIntExtra("id", -1) transactionInfo = viewModel.getTransById(itemId) transactionInfo.observe(this, Observer { trans -> + displayData.postValue(trans) binding.updateName.setText(trans.name) }) } + override fun onStart() { + super.onStart() + binding.backButtonDetail.setOnClickListener{ + viewModel.updateTransaction() + finish() + } + } + } \ No newline at end of file diff --git a/app/src/main/java/com/pbd/psi/ui/add_transaction/AddTransactionFragment.kt b/app/src/main/java/com/pbd/psi/ui/add_transaction/AddTransactionFragment.kt index 794ffce576fd80d51d1f600b7e1a00537bc1ba6a..fefa23e99cd43e2bd007f19dfb76f437dd1263de 100644 --- a/app/src/main/java/com/pbd/psi/ui/add_transaction/AddTransactionFragment.kt +++ b/app/src/main/java/com/pbd/psi/ui/add_transaction/AddTransactionFragment.kt @@ -42,7 +42,7 @@ class AddTransactionFragment : Fragment() { if (inputAmountStr.isNotEmpty()) { val inputAmount = inputAmountStr.toInt() viewModel.addTransaction(inputName, Category.EXPENSE, inputAmount) - + requireActivity().finish() } else { // Handle case where amount input is empty Toast.makeText(requireContext(), "Please enter a valid amount", Toast.LENGTH_SHORT).show()