Merge branch 'develop' into 'main'
Develop See merge request !30
Showing
- app/src/main/java/com/example/bondoman/activities/LoginActivity.kt 0 additions, 2 deletions...ain/java/com/example/bondoman/activities/LoginActivity.kt
- app/src/main/java/com/example/bondoman/activities/MainActivity.kt 63 additions, 6 deletions...main/java/com/example/bondoman/activities/MainActivity.kt
- app/src/main/java/com/example/bondoman/fragments/SettingsFragment.kt 1 addition, 1 deletion...n/java/com/example/bondoman/fragments/SettingsFragment.kt
- app/src/main/res/layout/activity_add_transaksi.xml 10 additions, 8 deletionsapp/src/main/res/layout/activity_add_transaksi.xml
- app/src/main/res/layout/activity_edit_transaksi.xml 20 additions, 13 deletionsapp/src/main/res/layout/activity_edit_transaksi.xml
- app/src/main/res/layout/activity_login.xml 8 additions, 3 deletionsapp/src/main/res/layout/activity_login.xml
- app/src/main/res/layout/activity_main.xml 8 additions, 2 deletionsapp/src/main/res/layout/activity_main.xml
- app/src/main/res/layout/fragment_scan.xml 6 additions, 3 deletionsapp/src/main/res/layout/fragment_scan.xml
- app/src/main/res/layout/fragment_settings.xml 2 additions, 1 deletionapp/src/main/res/layout/fragment_settings.xml
- app/src/main/res/layout/fragment_transaksi.xml 4 additions, 1 deletionapp/src/main/res/layout/fragment_transaksi.xml
- app/src/main/res/layout/fragment_twibbon.xml 16 additions, 5 deletionsapp/src/main/res/layout/fragment_twibbon.xml
- app/src/main/res/menu/menu_nav.xml 2 additions, 1 deletionapp/src/main/res/menu/menu_nav.xml
- app/src/main/res/values/colors.xml 4 additions, 4 deletionsapp/src/main/res/values/colors.xml
- app/src/main/res/values/strings.xml 8 additions, 1 deletionapp/src/main/res/values/strings.xml
- app/src/main/res/values/styles.xml 7 additions, 1 deletionapp/src/main/res/values/styles.xml
Please register or sign in to comment