Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile
# Conflicts: # build.gradle Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/commit/1febfcb4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/1febfcb4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/1febfcb4 Branch: refs/heads/master Commit: 1febfcb4a85a091e765d55da3228be663b7dcb0d Parents: 329bcd7 7a3ccba Author: Ian Dunlop <[email protected]> Authored: Mon Jun 11 14:54:30 2018 +0100 Committer: Ian Dunlop <[email protected]> Committed: Mon Jun 11 14:54:30 2018 +0100 ---------------------------------------------------------------------- .github/PULL_REQUEST_TEMPLATE.md | 7 + AndroidStyle.xml | 151 +++++++++ README.md | 27 +- app/build.gradle | 75 +++-- app/src/main/AndroidManifest.xml | 14 +- app/src/main/assets/apache_licence_notice.html | 2 + .../apache/taverna/mobile/data/DataManager.java | 28 +- .../taverna/mobile/data/local/DBHelper.java | 92 +++--- .../mobile/data/local/PreferencesHelper.java | 25 +- .../mobile/data/model/TutorialSliderEnum.java | 42 +++ .../mobile/data/remote/BaseApiManager.java | 6 +- .../data/remote/TavernaPlayerService.java | 3 +- .../mobile/data/remote/TavernaService.java | 4 +- .../taverna/mobile/ui/DashboardActivity.java | 102 +++++- .../taverna/mobile/ui/FlashScreenActivity.java | 47 ++- .../ui/adapter/TutorialSliderAdapter.java | 59 ++++ .../ui/anouncements/AnnouncementFragment.java | 6 + .../ui/anouncements/AnnouncementPresenter.java | 70 ++-- .../FavouriteWorkflowsActivity.java | 60 ++++ .../FavouriteWorkflowsFragment.java | 6 +- .../FavouriteWorkflowsPresenter.java | 48 ++- .../FavouriteWorkflowDetailPresenter.java | 111 +++---- .../mobile/ui/imagezoom/ImageZoomFragment.java | 17 - .../taverna/mobile/ui/login/LoginFragment.java | 28 +- .../taverna/mobile/ui/login/LoginPresenter.java | 33 +- .../ui/myworkflows/MyWorkflowFragment.java | 6 +- .../ui/myworkflows/MyWorkflowPresenter.java | 58 ++-- .../ui/myworkflows/MyWorkflowsActivity.java | 60 ++++ .../ui/playerlogin/PlayerLoginPresenter.java | 38 +-- .../mobile/ui/tutorial/TutorialActivity.java | 150 +++++++++ .../taverna/mobile/ui/usage/UsageActivity.java | 62 ++++ .../ui/userprofile/UserProfileActivity.java | 71 +++++ .../ui/userprofile/UserProfileFragment.java | 141 +++++++++ .../mobile/ui/workflow/WorkflowPresenter.java | 89 +++--- .../workflowdetail/WorkflowDetailFragment.java | 10 - .../workflowdetail/WorkflowDetailPresenter.java | 109 +++---- .../ui/workflowrun/WorkflowRunPresenter.java | 60 ++-- .../apache/taverna/mobile/utils/RxSearch.java | 8 +- .../res/drawable-hdpi/ic_star_black_24dp.png | Bin 369 -> 0 bytes .../drawable-hdpi/ic_star_border_black_24dp.png | Bin 500 -> 0 bytes .../res/drawable-mdpi/ic_star_black_24dp.png | Bin 263 -> 0 bytes .../drawable-mdpi/ic_star_border_black_24dp.png | Bin 332 -> 0 bytes .../res/drawable-xhdpi/ic_star_black_24dp.png | Bin 467 -> 0 bytes .../ic_star_border_black_24dp.png | Bin 674 -> 0 bytes .../res/drawable-xxhdpi/ic_star_black_24dp.png | Bin 668 -> 0 bytes .../ic_star_border_black_24dp.png | Bin 971 -> 0 bytes .../res/drawable-xxxhdpi/ic_star_black_24dp.png | Bin 887 -> 0 bytes .../ic_star_border_black_24dp.png | Bin 1301 -> 0 bytes app/src/main/res/drawable/download.jpg | Bin .../drawable/ic_account_circle_black_24dp.xml | 9 + .../main/res/drawable/ic_email_black_24dp.xml | 9 + .../ic_keyboard_arrow_right_black_24dp.xml | 9 + .../res/drawable/ic_language_black_24dp.xml | 9 + .../drawable/ic_location_city_black_24dp.xml | 9 + .../res/drawable/ic_location_on_black_24dp.xml | 9 + .../main/res/drawable/ic_lock_black_24dp.xml | 9 + .../main/res/drawable/ic_person_black_24dp.xml | 9 + .../main/res/drawable/ic_search_black_24dp.xml | 9 + .../main/res/drawable/ic_star_black_24dp.xml | 9 + .../res/drawable/ic_star_border_black_24dp.xml | 9 + .../main/res/drawable/ic_stars_grey_24dp.xml | 9 + .../main/res/drawable/ic_storage_black_24dp.xml | 9 + .../main/res/drawable/ic_storage_grey_24dp.xml | 9 + app/src/main/res/drawable/login_button.xml | 24 ++ app/src/main/res/drawable/myexlogo.png | Bin 0 -> 36097 bytes app/src/main/res/drawable/nav_header.png | Bin 0 -> 74018 bytes .../res/layout/activity_favourite_workflows.xml | 33 ++ .../main/res/layout/activity_flash_screen.xml | 32 +- .../main/res/layout/activity_my_workflows.xml | 33 ++ app/src/main/res/layout/activity_tutorial.xml | 66 ++++ app/src/main/res/layout/activity_usage.xml | 193 +++++++++++ .../main/res/layout/activity_user_profile.xml | 31 ++ app/src/main/res/layout/fragment_dashboard.xml | 31 +- .../res/layout/fragment_detail_workflow.xml | 53 ++-- .../layout/fragment_favourite_workflow_list.xml | 29 +- app/src/main/res/layout/fragment_image_zoom.xml | 31 +- app/src/main/res/layout/fragment_login.xml | 98 ++++-- .../main/res/layout/fragment_user_profile.xml | 317 +++++++++++++++++++ app/src/main/res/layout/item_announcement.xml | 8 +- app/src/main/res/layout/nav_header.xml | 84 +++-- app/src/main/res/layout/tutorial_slide1.xml | 48 +++ app/src/main/res/layout/tutorial_slide2.xml | 50 +++ app/src/main/res/layout/tutorial_slide3.xml | 50 +++ app/src/main/res/layout/tutorial_slide4.xml | 50 +++ app/src/main/res/layout/usage_layout.xml | 109 ------- app/src/main/res/menu/dashboard_main.xml | 2 +- app/src/main/res/values-v21/styles.xml | 4 + app/src/main/res/values/colors.xml | 34 ++ app/src/main/res/values/dimens.xml | 108 ++++++- app/src/main/res/values/strings.xml | 46 ++- .../mobile/AnnouncementPresenterTest.java | 17 +- .../mobile/FavouriteWorkflowsPresenterTest.java | 2 +- .../mobile/utils/RxSchedulersOverrideRule.java | 67 ++-- app/src/test/resources/announcement.xml | 1 + build.gradle | 1 + 95 files changed, 2894 insertions(+), 809 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/1febfcb4/build.gradle ---------------------------------------------------------------------- diff --cc build.gradle index 1475934,b628d75..6318b19 --- a/build.gradle +++ b/build.gradle @@@ -8,9 -8,9 +8,10 @@@ buildscript maven { url 'https://oss.sonatype.org/content/repositories/snapshots' } } dependencies { - classpath 'com.android.tools.build:gradle:3.1.0' + classpath 'com.android.tools.build:gradle:3.1.3' classpath 'com.jakewharton:butterknife-gradle-plugin:9.0.0-SNAPSHOT' classpath "gradle.plugin.org.nosphere.apache:creadur-rat-gradle:0.2.1" ++ classpath 'de.hdodenhof:circleimageview:2.2.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files }
