Merge branch 'gmail' into 'dev'
# Conflicts: # app/src/main/java/com/example/bondoyap/ui/settings/SettingsFragment.kt # app/src/main/java/com/example/bondoyap/ui/settings/TransactionsExporter.kt
Showing
- app/src/main/AndroidManifest.xml 22 additions, 0 deletionsapp/src/main/AndroidManifest.xml
- app/src/main/java/com/example/bondoyap/ui/settings/EmailHelper.kt 26 additions, 0 deletions...main/java/com/example/bondoyap/ui/settings/EmailHelper.kt
- app/src/main/java/com/example/bondoyap/ui/settings/SettingsFragment.kt 44 additions, 1 deletion...java/com/example/bondoyap/ui/settings/SettingsFragment.kt
- app/src/main/java/com/example/bondoyap/ui/settings/TransactionsExporter.kt 23 additions, 3 deletions.../com/example/bondoyap/ui/settings/TransactionsExporter.kt
- app/src/main/res/xml/file_path.xml 10 additions, 0 deletionsapp/src/main/res/xml/file_path.xml
Please register or sign in to comment