Merge branch 'develop' into 'main' (00f15864) · Commits · Antonio Natthan Krishna / IF3210 2024 Android SKS

There was an error fetching the commit references. Please try again later.

Commit 00f15864 authored 1 year ago by

Nathania Calista

Merge branch 'develop' into 'main'

Develop

See merge request !15

parents 8b588d80 8856d217

Hide whitespace changes

Inline Side-by-side

Showing

.idea/deploymentTargetDropDown.xml 3 additions, 0 deletions

.idea/deploymentTargetDropDown.xml
app/.gitignore 2 additions, 1 deletion

app/.gitignore
app/build.gradle.kts 34 additions, 12 deletions

app/build.gradle.kts
app/src/main/AndroidManifest.xml 8 additions, 1 deletion

app/src/main/AndroidManifest.xml
app/src/main/java/com/example/bondoman/activities/LoginActivity.kt 2 additions, 9 deletions

...ain/java/com/example/bondoman/activities/LoginActivity.kt
app/src/main/java/com/example/bondoman/adapter/TransactionListAdapter.kt 1 addition, 1 deletion

...va/com/example/bondoman/adapter/TransactionListAdapter.kt
app/src/main/java/com/example/bondoman/apiServices/IScanService.kt 10 additions, 3 deletions

...ain/java/com/example/bondoman/apiServices/IScanService.kt
app/src/main/java/com/example/bondoman/apiServices/UploadResponse.kt 22 additions, 0 deletions

...n/java/com/example/bondoman/apiServices/UploadResponse.kt
app/src/main/java/com/example/bondoman/exceptions/InvalidFileFormat.kt 6 additions, 0 deletions

...java/com/example/bondoman/exceptions/InvalidFileFormat.kt
app/src/main/java/com/example/bondoman/fragments/GrafFragment.kt 48 additions, 35 deletions

.../main/java/com/example/bondoman/fragments/GrafFragment.kt
app/src/main/java/com/example/bondoman/fragments/ScanFragment.kt 287 additions, 34 deletions

.../main/java/com/example/bondoman/fragments/ScanFragment.kt
app/src/main/java/com/example/bondoman/fragments/SettingsFragment.kt 102 additions, 4 deletions

...n/java/com/example/bondoman/fragments/SettingsFragment.kt
app/src/main/java/com/example/bondoman/fragments/TwibbonFragment.kt 236 additions, 32 deletions

...in/java/com/example/bondoman/fragments/TwibbonFragment.kt
app/src/main/java/com/example/bondoman/lib/ITransactionFileAdapter.kt 8 additions, 0 deletions

.../java/com/example/bondoman/lib/ITransactionFileAdapter.kt
app/src/main/java/com/example/bondoman/lib/ITransactionGraphAdapter.kt 7 additions, 0 deletions

...java/com/example/bondoman/lib/ITransactionGraphAdapter.kt
app/src/main/java/com/example/bondoman/lib/SecurePreferences.kt 15 additions, 1 deletion

...c/main/java/com/example/bondoman/lib/SecurePreferences.kt
app/src/main/java/com/example/bondoman/lib/TransactionDownloader.kt 42 additions, 0 deletions

...in/java/com/example/bondoman/lib/TransactionDownloader.kt
app/src/main/java/com/example/bondoman/lib/TransactionExcelAdapter.kt 47 additions, 0 deletions

.../java/com/example/bondoman/lib/TransactionExcelAdapter.kt
app/src/main/java/com/example/bondoman/lib/TransactionGraphGenerator.kt 0 additions, 9 deletions

...ava/com/example/bondoman/lib/TransactionGraphGenerator.kt
app/src/main/java/com/example/bondoman/lib/TransactionPieChartAdapter.kt 56 additions, 0 deletions

...va/com/example/bondoman/lib/TransactionPieChartAdapter.kt

with 936 additions and 142 deletions

Please register or to comment

Admin message

Merge branch 'develop' into 'main'