Merge branch 'staging' into fix/navigation
# Conflicts: # app/src/main/java/com/example/transactionapp/ui/screen/splash/SplashActivity.kt
Showing
- app/src/main/java/com/example/transactionapp/ui/screen/mainmenu/MainActivity.kt 14 additions, 7 deletions...example/transactionapp/ui/screen/mainmenu/MainActivity.kt
- app/src/main/java/com/example/transactionapp/ui/screen/mainmenu/fragment/Scan.kt 32 additions, 21 deletions...xample/transactionapp/ui/screen/mainmenu/fragment/Scan.kt
- app/src/main/java/com/example/transactionapp/ui/screen/mainmenu/fragment/TransactionDetails.kt 94 additions, 24 deletions...tionapp/ui/screen/mainmenu/fragment/TransactionDetails.kt
- app/src/main/java/com/example/transactionapp/ui/screen/mainmenu/fragment/TransactionForm.kt 17 additions, 0 deletions...sactionapp/ui/screen/mainmenu/fragment/TransactionForm.kt
- app/src/main/java/com/example/transactionapp/ui/viewmodel/transaction/Transaction.kt 30 additions, 3 deletions...le/transactionapp/ui/viewmodel/transaction/Transaction.kt
- app/src/main/res/drawable/rounded_button.xml 1 addition, 1 deletionapp/src/main/res/drawable/rounded_button.xml
- app/src/main/res/drawable/rounded_input_field.xml 1 addition, 1 deletionapp/src/main/res/drawable/rounded_input_field.xml
- app/src/main/res/drawable/spinner_input_field.xml 1 addition, 1 deletionapp/src/main/res/drawable/spinner_input_field.xml
- app/src/main/res/layout/activity_login.xml 27 additions, 25 deletionsapp/src/main/res/layout/activity_login.xml
- app/src/main/res/layout/activity_main.xml 28 additions, 13 deletionsapp/src/main/res/layout/activity_main.xml
- app/src/main/res/layout/activity_splash.xml 4 additions, 2 deletionsapp/src/main/res/layout/activity_splash.xml
- app/src/main/res/layout/bondoman_dark_logo.xml 9 additions, 11 deletionsapp/src/main/res/layout/bondoman_dark_logo.xml
- app/src/main/res/layout/dropdown_item.xml 4 additions, 5 deletionsapp/src/main/res/layout/dropdown_item.xml
- app/src/main/res/layout/fragment_settings.xml 69 additions, 73 deletionsapp/src/main/res/layout/fragment_settings.xml
- app/src/main/res/layout/fragment_transaction.xml 27 additions, 35 deletionsapp/src/main/res/layout/fragment_transaction.xml
- app/src/main/res/layout/fragment_transaction_details.xml 81 additions, 96 deletionsapp/src/main/res/layout/fragment_transaction_details.xml
- app/src/main/res/layout/fragment_transaction_form.xml 71 additions, 85 deletionsapp/src/main/res/layout/fragment_transaction_form.xml
- app/src/main/res/layout/selected_dropdown_item.xml 2 additions, 3 deletionsapp/src/main/res/layout/selected_dropdown_item.xml
- app/src/main/res/layout/transaction_card_view.xml 17 additions, 17 deletionsapp/src/main/res/layout/transaction_card_view.xml
- app/src/main/res/layout/transaction_history_list.xml 4 additions, 6 deletionsapp/src/main/res/layout/transaction_history_list.xml
Please register or sign in to comment