Merge branch 'feat/orientation_awareness' into feat/scan
# Conflicts: # app/src/main/java/pbd/tubes/exe_android/MainActivity.kt # app/src/main/res/layout/activity_main.xml # app/src/main/res/layout/transaction_list_item.xml
Showing
- app/src/main/AndroidManifest.xml 2 additions, 1 deletionapp/src/main/AndroidManifest.xml
- app/src/main/java/pbd/tubes/exe_android/MainActivity.kt 34 additions, 10 deletionsapp/src/main/java/pbd/tubes/exe_android/MainActivity.kt
- app/src/main/res/layout-land/activity_main.xml 47 additions, 0 deletionsapp/src/main/res/layout-land/activity_main.xml
- app/src/main/res/layout/activity_main.xml 2 additions, 3 deletionsapp/src/main/res/layout/activity_main.xml
- app/src/main/res/layout/fragment_add_transaction.xml 76 additions, 69 deletionsapp/src/main/res/layout/fragment_add_transaction.xml
- app/src/main/res/layout/fragment_edit_transaction.xml 16 additions, 26 deletionsapp/src/main/res/layout/fragment_edit_transaction.xml
- app/src/main/res/menu/bottom_nav_menu.xml 3 additions, 1 deletionapp/src/main/res/menu/bottom_nav_menu.xml
Please register or sign in to comment