Merge remote-tracking branch 'origin/dev' into dev
# Conflicts: # .idea/deploymentTargetDropDown.xml # app/src/main/java/com/pbd/psi/TransactionDetailActivity.kt
Showing
- .idea/deploymentTargetDropDown.xml 1 addition, 14 deletions.idea/deploymentTargetDropDown.xml
- README.md 131 additions, 92 deletionsREADME.md
- app/src/main/AndroidManifest.xml 0 additions, 3 deletionsapp/src/main/AndroidManifest.xml
- app/src/main/java/com/pbd/psi/AddTransactionActivity.kt 147 additions, 17 deletionsapp/src/main/java/com/pbd/psi/AddTransactionActivity.kt
- app/src/main/java/com/pbd/psi/TransactionDetailActivity.kt 60 additions, 22 deletionsapp/src/main/java/com/pbd/psi/TransactionDetailActivity.kt
- app/src/main/java/com/pbd/psi/ui/add_transaction/AddTransactionViewModel.kt 1 addition, 4 deletions...com/pbd/psi/ui/add_transaction/AddTransactionViewModel.kt
- app/src/main/java/com/pbd/psi/ui/transaction/TransactionFragment.kt 10 additions, 2 deletions...in/java/com/pbd/psi/ui/transaction/TransactionFragment.kt
- app/src/main/java/com/pbd/psi/ui/transaction/TransactionViewAdapter.kt 3 additions, 1 deletion...java/com/pbd/psi/ui/transaction/TransactionViewAdapter.kt
- app/src/main/java/com/pbd/psi/ui/transaction/TransactionViewHolder.kt 8 additions, 12 deletions.../java/com/pbd/psi/ui/transaction/TransactionViewHolder.kt
- app/src/main/res/drawable/spinner_list_holder.xml 9 additions, 0 deletionsapp/src/main/res/drawable/spinner_list_holder.xml
- app/src/main/res/layout/activity_add_transaction.xml 15 additions, 16 deletionsapp/src/main/res/layout/activity_add_transaction.xml
- app/src/main/res/layout/activity_transaction_detail.xml 19 additions, 2 deletionsapp/src/main/res/layout/activity_transaction_detail.xml
- app/src/main/res/layout/fragment_transaction.xml 2 additions, 1 deletionapp/src/main/res/layout/fragment_transaction.xml
- app/src/main/res/layout/income_card.xml 93 additions, 30 deletionsapp/src/main/res/layout/income_card.xml
- app/src/main/res/layout/list_category.xml 2 additions, 2 deletionsapp/src/main/res/layout/list_category.xml
- app/src/main/res/values/strings.xml 1 addition, 0 deletionsapp/src/main/res/values/strings.xml
- screenshots/1.jpg 0 additions, 0 deletionsscreenshots/1.jpg
- screenshots/10.jpg 0 additions, 0 deletionsscreenshots/10.jpg
- screenshots/11.jpg 0 additions, 0 deletionsscreenshots/11.jpg
- screenshots/12.jpg 0 additions, 0 deletionsscreenshots/12.jpg
Please register or sign in to comment