You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by ia...@apache.org on 2016/03/16 17:05:36 UTC
[7/7] incubator-taverna-mobile git commit: Merge branch
'Material_Theme' of
https://github.com/therajanmaurya/incubator-taverna-mobile This closes #10
Merge branch 'Material_Theme' of https://github.com/therajanmaurya/incubator-taverna-mobile This closes #10
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/d8255f18
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/d8255f18
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/d8255f18
Branch: refs/heads/master
Commit: d8255f180dcdb392107f3b2a1684f473219039cd
Parents: 73eb989 40339a9
Author: Ian Dunlop <ia...@manchester.ac.uk>
Authored: Tue Mar 15 16:21:41 2016 +0000
Committer: Ian Dunlop <ia...@manchester.ac.uk>
Committed: Wed Mar 16 16:04:35 2016 +0000
----------------------------------------------------------------------
app/build.gradle | 13 +-
app/src/main/AndroidManifest.xml | 2 +-
app/src/main/ic_about-web.png | Bin 12726 -> 0 bytes
app/src/main/ic_dashboard_home-web.png | Bin 2121 -> 0 bytes
app/src/main/ic_download-web.png | Bin 4063 -> 0 bytes
app/src/main/ic_downloadworkflow-web.png | Bin 3972 -> 0 bytes
app/src/main/ic_launcher-web.png | Bin 72617 -> 0 bytes
app/src/main/ic_loading-web.png | Bin 32040 -> 0 bytes
app/src/main/ic_logout-web.png | Bin 8213 -> 0 bytes
app/src/main/ic_markworkflow_selected-web.png | Bin 15757 -> 0 bytes
app/src/main/ic_markworkflow_unselected-web.png | Bin 10274 -> 0 bytes
app/src/main/ic_openwk-web.png | Bin 5721 -> 0 bytes
app/src/main/ic_poweredby-web.png | Bin 13169 -> 0 bytes
app/src/main/ic_quit-web.png | Bin 22378 -> 0 bytes
app/src/main/ic_usage-web.png | Bin 5028 -> 0 bytes
app/src/main/ic_user-web.png | Bin 3907 -> 0 bytes
app/src/main/ic_viewworkflow-web.png | Bin 2734 -> 0 bytes
app/src/main/ic_workflows-web.png | Bin 5276 -> 0 bytes
app/src/main/icuserprofiles-web.png | Bin 8459 -> 0 bytes
.../activities/DashboardMainActivity.java | 312 +++++++++----------
.../mobile/activities/FlashScreenActivity.java | 2 +-
.../mobile/activities/LoginActivity.java | 2 +-
.../adapters/FavoriteWorkflowAdapter.java | 10 +-
.../mobile/fragments/WorkflowItemFragment.java | 3 +-
.../mobile/fragments/Workflow_viewpager.java | 113 +++++++
.../WorkflowRunHistoryFragment.java | 2 +-
app/src/main/res/anim/zoomin | 16 -
app/src/main/res/anim/zoomin.xml | 16 +
app/src/main/res/anim/zoomout | 15 -
app/src/main/res/anim/zoomout.xml | 15 +
app/src/main/res/drawable-hdpi/ic_menu.png | Bin 0 -> 116 bytes
app/src/main/res/drawable-mdpi/ic_menu.png | Bin 0 -> 99 bytes
app/src/main/res/drawable-xhdpi/ic_menu.png | Bin 0 -> 135 bytes
app/src/main/res/drawable-xxhdpi/ic_menu.png | Bin 0 -> 183 bytes
app/src/main/res/drawable-xxxhdpi/ic_menu.png | Bin 0 -> 235 bytes
app/src/main/res/drawable/ic_about_web.png | Bin 0 -> 12726 bytes
.../main/res/drawable/ic_dashboard_home_web.png | Bin 0 -> 2121 bytes
app/src/main/res/drawable/ic_download__web.jpg | Bin 0 -> 2230 bytes
app/src/main/res/drawable/ic_download_web.jpg | Bin 2230 -> 0 bytes
app/src/main/res/drawable/ic_download_web.png | Bin 0 -> 4063 bytes
.../res/drawable/ic_downloadworkflow_web.png | Bin 0 -> 3972 bytes
app/src/main/res/drawable/ic_launcher_web.png | Bin 0 -> 72617 bytes
app/src/main/res/drawable/ic_loading_web.png | Bin 0 -> 32040 bytes
app/src/main/res/drawable/ic_logout_web.png | Bin 0 -> 8213 bytes
.../drawable/ic_markworkflow_selected_web.png | Bin 0 -> 15757 bytes
.../drawable/ic_markworkflow_unselected_web.png | Bin 0 -> 10274 bytes
app/src/main/res/drawable/ic_openwk_web.png | Bin 0 -> 5721 bytes
app/src/main/res/drawable/ic_poweredby_web.png | Bin 0 -> 13169 bytes
app/src/main/res/drawable/ic_quit_web.png | Bin 0 -> 22378 bytes
.../res/drawable/ic_setting_workflows_web.png | Bin 0 -> 5276 bytes
app/src/main/res/drawable/ic_usage_web.png | Bin 0 -> 5028 bytes
app/src/main/res/drawable/ic_user_web.png | Bin 0 -> 3907 bytes
.../main/res/drawable/ic_viewworkflow_web.png | Bin 0 -> 2734 bytes
.../main/res/drawable/icuserprofiles_web.png | Bin 0 -> 8459 bytes
.../res/layout-land/activity_dashboard_main.xml | 68 ++--
.../main/res/layout/activity_dashboard_main.xml | 69 ++--
.../main/res/layout/favorite_item_layout.xml | 42 +--
.../res/layout/fragment_workflow_detail.xml | 2 +-
app/src/main/res/layout/nav_header.xml | 55 ++++
app/src/main/res/layout/viewpager_workflow.xml | 54 ++++
app/src/main/res/menu/drawer_view.xml | 46 +++
app/src/main/res/values-v21/styles.xml | 26 ++
app/src/main/res/values/colors.xml | 7 +
app/src/main/res/values/dimens.xml | 1 +
app/src/main/res/values/styles.xml | 21 +-
build.gradle | 2 +-
build/intermediates/dex-cache/cache.xml | 75 -----
incubator-taverna-mobile.iml | 19 ++
68 files changed, 609 insertions(+), 399 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/d8255f18/build/intermediates/dex-cache/cache.xml
----------------------------------------------------------------------
diff --cc build/intermediates/dex-cache/cache.xml
index 8c5384d,fba8db8..0000000
deleted file mode 100644,100644
--- a/build/intermediates/dex-cache/cache.xml
+++ /dev/null
@@@ -1,75 -1,2 +1,0 @@@
--<?xml version="1.0" encoding="utf-8"?>
- <items version="2" >
-
- <item
- jar="/root/Desktop/AndroidLab/TavernaMobile2/app/build/intermediates/exploded-aar/com.android.support/support-v4/22.0.0/classes.jar"
- jumboMode="false"
- revision="21.1.2"
- sha1="4e86306289ace4aa0cfec44a05ed2b410d36989d">
- <dex dex="/root/Desktop/AndroidLab/TavernaMobile2/app/build/intermediates/pre-dexed/debug/classes-be9904e841d6b70d2ec429ffa7d3732bb544b8ab.jar" />
- </item>
- <item
- jar="/root/Desktop/AndroidLab/TavernaMobile2/app/libs/dropbox-android-sdk-1.6.3.jar"
- jumboMode="false"
- revision="21.1.2"
- sha1="986e7a58e925c6f91b88ae8d3224a0550b65acc7">
- <dex dex="/root/Desktop/AndroidLab/TavernaMobile2/app/build/intermediates/pre-dexed/debug/dropbox-android-sdk-1.6.3-49f85fff2c0dd0aeb7ee59e23d24ce3535e37e81.jar" />
- </item>
- <item
- jar="/root/Desktop/AndroidLab/TavernaMobile2/app/build/intermediates/exploded-aar/com.android.support/support-v4/22.0.0/libs/internal_impl-22.0.0.jar"
- jumboMode="false"
- revision="21.1.2"
- sha1="b5b92f469d515a13d778900f6d50c03d12f35504">
- <dex dex="/root/Desktop/AndroidLab/TavernaMobile2/app/build/intermediates/pre-dexed/debug/internal_impl-22.0.0-ab39a2263976cb0fd278360818acc6d173a8d8e0.jar" />
- </item>
- <item
- jar="/root/Desktop/AndroidLab/TavernaMobile2/app/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/22.0.0/classes.jar"
- jumboMode="false"
- revision="21.1.2"
- sha1="c6d79137693d494dee16372d3921f919eb724ced">
- <dex dex="/root/Desktop/AndroidLab/TavernaMobile2/app/build/intermediates/pre-dexed/debug/classes-ebdf15783ac01747301cff830c2f3174571cec96.jar" />
- </item>
- <item
- jar="/root/Desktop/AndroidLab/TavernaMobile2/app/libs/sjxp-2.2.jar"
- jumboMode="false"
- revision="21.1.2"
- sha1="d7072ec248612a8f861f895a950eb7cc480de9c0">
- <dex dex="/root/Desktop/AndroidLab/TavernaMobile2/app/build/intermediates/pre-dexed/debug/sjxp-2.2-0d4fc236477cdd67ed93ea2414c2be9703cf2dce.jar" />
- </item>
- <item
- jar="/root/Desktop/AndroidLab/TavernaMobile2/app/libs/simple-xml-2.7.1.jar"
- jumboMode="false"
- revision="21.1.2"
- sha1="083623424bcfa03bd598e709765bad0816c2375d">
- <dex dex="/root/Desktop/AndroidLab/TavernaMobile2/app/build/intermediates/pre-dexed/debug/simple-xml-2.7.1-0337a02c2c7a819ce7d4f1cb9e7af39ace3fc996.jar" />
- </item>
- <item
- jar="/root/Desktop/android-studio/sdk/extras/android/m2repository/com/android/support/support-annotations/22.0.0/support-annotations-22.0.0.jar"
- jumboMode="false"
- revision="21.1.2"
- sha1="685d0b2c590447e85284ed84712cb363ba04eff8">
- <dex dex="/root/Desktop/AndroidLab/TavernaMobile2/app/build/intermediates/pre-dexed/debug/support-annotations-22.0.0-2f3cb2807dead79ef0327bdd9269035b879fdd27.jar" />
- </item>
- <item
- jar="/root/Desktop/AndroidLab/TavernaMobile2/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.0.0/classes.jar"
- jumboMode="false"
- revision="21.1.2"
- sha1="d84409890828e07d344a3b9b1da545dba9897b51">
- <dex dex="/root/Desktop/AndroidLab/TavernaMobile2/app/build/intermediates/pre-dexed/debug/classes-cb13d360204b697dbd760e7e80b4357b182d723b.jar" />
- </item>
- <item
- jar="/root/Desktop/AndroidLab/TavernaMobile2/app/build/intermediates/exploded-aar/com.android.support/cardview-v7/22.0.0/classes.jar"
- jumboMode="false"
- revision="21.1.2"
- sha1="11842de6a309c447b3a3d60d73ad637a87c58994">
- <dex dex="/root/Desktop/AndroidLab/TavernaMobile2/app/build/intermediates/pre-dexed/debug/classes-2dbcae8b037134953fc4e3eb3645a66e2931661a.jar" />
- </item>
- <item
- jar="/root/Desktop/AndroidLab/TavernaMobile2/app/libs/json_simple-1.1.jar"
- jumboMode="false"
- revision="21.1.2"
- sha1="5e303a03d04e6788dddfa3655272580ae0fc13bb">
- <dex dex="/root/Desktop/AndroidLab/TavernaMobile2/app/build/intermediates/pre-dexed/debug/json_simple-1.1-c6f2833f7d87dc082af9be3e409fbd98def079fd.jar" />
- </item>
-
- </items>
-<items version="2" />