Skip to content

Commit

Permalink
Android Sample App Consolidation and Kotlin Conversion (#410)
Browse files Browse the repository at this point in the history
* Consolidation of Android Samples and conversion to Kotlin.

* Working with new main activity!

* Removed viewBinding

* Working combined app!

* File downloading and viewing is now working!

* Removed the "main" activity which was moved over from the Kotlin Sample application.  Removing this as the code has been migrated into UserActivity.

* Removed Dead Code

* Replaced all AsyncTasks with Coroutines

* Fixed Layout and Cleaned up dead code.

* Removed Picasso so we can just use Glide.

* Fixing compile error.

* Fixing proguarding issue after kotlin conversion.

* Splitting up Github Actions for easier diagnosis.

* Running the right commands in Github Actions.

* Final cleanup and fixes for merging of sample apps.

* Formatting
  • Loading branch information
handstandsam authored Aug 12, 2022
1 parent 84523a0 commit 97f2c2b
Show file tree
Hide file tree
Showing 80 changed files with 1,697 additions and 2,574 deletions.
22 changes: 20 additions & 2 deletions .github/workflows/ci-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,26 @@ jobs:
REFRESH_TOKEN: ${{ secrets.REFRESH_TOKEN }}
run: ./generate-ci-auth-file

- name: Run Integration Tests
run: ./scripts/run-integration-tests $(find `pwd` -name auth_output)
- name: Check
run: ./gradlew check

- name: Check Examples
run: cd examples && ./gradlew check

- name: Assemble Examples
run: cd examples && ./gradlew assemble

- name: Run Integration Tests - OkHttpRequestor
run: ./gradlew -Pcom.dropbox.test.httpRequestor=OkHttpRequestor -Pcom.dropbox.test.authInfoFile=auth_output integrationTest &&
./gradlew -Pcom.dropbox.test.httpRequestor=OkHttpRequestor -Pcom.dropbox.test.authInfoFile=../auth_output proguardTest

- name: Run Integration Tests - OkHttp3Requestor
run: ./gradlew -Pcom.dropbox.test.httpRequestor=OkHttp3Requestor -Pcom.dropbox.test.authInfoFile=auth_output integrationTest &&
./gradlew -Pcom.dropbox.test.httpRequestor=OkHttp3Requestor -Pcom.dropbox.test.authInfoFile=../auth_output proguardTest

- name: Run Integration Tests - StandardHttpRequestor
run: ./gradlew -Pcom.dropbox.test.httpRequestor=StandardHttpRequestor -Pcom.dropbox.test.authInfoFile=auth_output integrationTest &&
./gradlew -Pcom.dropbox.test.httpRequestor=StandardHttpRequestor -Pcom.dropbox.test.authInfoFile=../auth_output proguardTest

- name: Upload Artifacts
run: ./gradlew publishAllPublicationsToMavenCentralRepository --no-daemon --no-parallel
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,6 @@ classyshark*

# macOS
*.DS_Store

# Integration Test Auth Info
auth_output
5 changes: 0 additions & 5 deletions examples/DropboxAndroid/.gitignore

This file was deleted.

112 changes: 0 additions & 112 deletions examples/DropboxAndroid/README.md

This file was deleted.

1 change: 0 additions & 1 deletion examples/DropboxAndroid/app/.gitignore

This file was deleted.

73 changes: 0 additions & 73 deletions examples/DropboxAndroid/app/build.gradle

This file was deleted.

21 changes: 0 additions & 21 deletions examples/DropboxAndroid/app/proguard-rules.pro

This file was deleted.

39 changes: 0 additions & 39 deletions examples/DropboxAndroid/app/src/main/AndroidManifest.xml

This file was deleted.

Binary file not shown.
Loading

0 comments on commit 97f2c2b

Please sign in to comment.