Repository: incubator-taverna-mobile Updated Branches: refs/heads/master ec81f1eaa -> 66577e326
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/593c74a0/app/build/intermediates/res/debug/values-large-v4/values.xml ---------------------------------------------------------------------- diff --git a/app/build/intermediates/res/debug/values-large-v4/values.xml b/app/build/intermediates/res/debug/values-large-v4/values.xml index aa98ad7..afb209d 100644 --- a/app/build/intermediates/res/debug/values-large-v4/values.xml +++ b/app/build/intermediates/res/debug/values-large-v4/values.xml @@ -17,6 +17,7 @@ <!-- From: file:/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/values-large/strings.xml --> <eat-comment/> <string name="completebrand">Powered By Apache Taverna</string> + <string name="play_workflow">Run</string> <!-- From: file:/root/Desktop/AndroidLab/TavernaMobile2/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.0.0/res/values-large-v4/values.xml --> <eat-comment/> <style name="Base.Theme.AppCompat.DialogWhenLarge" parent="Base.Theme.AppCompat.Dialog.FixedSize"/> http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/593c74a0/app/build/intermediates/res/debug/values/values.xml ---------------------------------------------------------------------- diff --git a/app/build/intermediates/res/debug/values/values.xml b/app/build/intermediates/res/debug/values/values.xml index 05dea32..a3b7490 100644 --- a/app/build/intermediates/res/debug/values/values.xml +++ b/app/build/intermediates/res/debug/values/values.xml @@ -213,9 +213,13 @@ <string name="brand">Powered By</string> <string name="completebrand">Powered By Apache Taverna</string> <string name="created">Workflow Created On:</string> + <string name="detail_title_section1">Workflow </string> + <string name="detail_title_section2">Run History</string> + <string name="detail_title_section3">Licence | Policy</string> + <string name="detail_title_section4"> About </string> <string name="favorite_empty"> No Favorites Added Yet</string> - <string name="hello_blank_fragment">Hello blank fragment</string> - <string name="hello_world">Hello world!</string> + <string name="hello_blank_fragment"> About Workflow </string> + <string name="hello_world"> Empty </string> <string name="loginbutton">Login</string> <string name="loginpassword">Password</string> <string name="loginusername">Email or Username</string> @@ -224,10 +228,12 @@ <string name="modified">Modified On:</string> <string name="navigation_drawer_close">Close navigation drawer</string> <string name="navigation_drawer_open">Open navigation drawer</string> + <string name="play_workflow">Run</string> <string name="search_hint"> Search workflows by name</string> <string name="title_about">About </string> <string name="title_activity_dashboard_main">Dashboard</string> <string name="title_activity_flash_screen">Taverna Mobile</string> + <string name="title_activity_workflow_detail">Workflow Detail</string> <string name="title_exit">Logout</string> <string name="title_explore">Workflows</string> <string name="title_favorite">Favorites</string> http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/593c74a0/app/build/intermediates/resources/resources-debug.ap_ ---------------------------------------------------------------------- diff --git a/app/build/intermediates/resources/resources-debug.ap_ b/app/build/intermediates/resources/resources-debug.ap_ index d02ec50..ba388ba 100644 Binary files a/app/build/intermediates/resources/resources-debug.ap_ and b/app/build/intermediates/resources/resources-debug.ap_ differ http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/593c74a0/app/build/intermediates/symbols/debug/R.txt ---------------------------------------------------------------------- diff --git a/app/build/intermediates/symbols/debug/R.txt b/app/build/intermediates/symbols/debug/R.txt index 411eaef..74b3650 100644 --- a/app/build/intermediates/symbols/debug/R.txt +++ b/app/build/intermediates/symbols/debug/R.txt @@ -366,17 +366,20 @@ int drawable abc_textfield_search_activated_mtrl_alpha 0x7f020034 int drawable abc_textfield_search_default_mtrl_alpha 0x7f020035 int drawable abc_textfield_search_material 0x7f020036 int drawable download 0x7f020037 -int drawable drawer_shadow 0x7f020038 -int drawable gear_icon 0x7f020039 -int drawable ic_downloadworkflow 0x7f02003a -int drawable ic_drawer 0x7f02003b -int drawable ic_markworkflow_selected 0x7f02003c -int drawable ic_markworkflow_unselected 0x7f02003d -int drawable ic_userprofile 0x7f02003e -int drawable ic_viewworkflow 0x7f02003f -int drawable round_shape 0x7f020040 -int drawable sliding_header 0x7f020041 -int drawable tavernalogo 0x7f020042 +int drawable downloadwk 0x7f020038 +int drawable drawer_shadow 0x7f020039 +int drawable gear_icon 0x7f02003a +int drawable ic_downloadworkflow 0x7f02003b +int drawable ic_drawer 0x7f02003c +int drawable ic_markworkflow_selected 0x7f02003d +int drawable ic_markworkflow_unselected 0x7f02003e +int drawable ic_userprofile 0x7f02003f +int drawable ic_viewworkflow 0x7f020040 +int drawable round_shape 0x7f020041 +int drawable sliding_header 0x7f020042 +int drawable tavernalogo 0x7f020043 +int id aboutworkflowTextView 0x7f0b0061 +int id actionLayout 0x7f0b0064 int id action_bar 0x7f0b0031 int id action_bar_activity_content 0x7f0b0000 int id action_bar_container 0x7f0b0030 @@ -390,16 +393,16 @@ int id action_menu_presenter 0x7f0b0003 int id action_mode_bar 0x7f0b002e int id action_mode_bar_stub 0x7f0b002d int id action_mode_close_button 0x7f0b0020 -int id action_search 0x7f0b006e -int id action_settings 0x7f0b006f +int id action_search 0x7f0b0076 +int id action_settings 0x7f0b0077 int id activity_chooser_view_content 0x7f0b0021 int id always 0x7f0b0016 int id author 0x7f0b0048 int id author_profile_image 0x7f0b004a int id beginning 0x7f0b0013 -int id button_download_workflow 0x7f0b006b -int id button_mark_workflow 0x7f0b006c -int id button_view_workflow 0x7f0b006a +int id button_download_workflow 0x7f0b0073 +int id button_mark_workflow 0x7f0b0074 +int id button_view_workflow 0x7f0b0072 int id checkbox 0x7f0b0029 int id collapseActionView 0x7f0b0017 int id container 0x7f0b0042 @@ -410,6 +413,7 @@ int id decor_content_parent 0x7f0b002f int id default_activity_button 0x7f0b0024 int id dialog 0x7f0b001b int id disableHome 0x7f0b000c +int id download_wk 0x7f0b0066 int id drawer_layout 0x7f0b003f int id dropdown 0x7f0b001c int id editTextUsername 0x7f0b0058 @@ -434,8 +438,9 @@ int id list_item 0x7f0b0025 int id loginbutton 0x7f0b005b int id loginlayout 0x7f0b0055 int id logo 0x7f0b0053 -int id menuIcon 0x7f0b0061 -int id menuItemText 0x7f0b0062 +int id mark_wk 0x7f0b0067 +int id menuIcon 0x7f0b0069 +int id menuItemText 0x7f0b006a int id middle 0x7f0b0015 int id navigation_drawer 0x7f0b0043 int id navigation_drawer_listview 0x7f0b005f @@ -447,7 +452,9 @@ int id pager_title_strip 0x7f0b0041 int id progress_circular 0x7f0b0005 int id progress_horizontal 0x7f0b0006 int id radio 0x7f0b002b -int id recycler_list 0x7f0b006d +int id recycler_list 0x7f0b0075 +int id run_wk 0x7f0b0065 +int id scrollView 0x7f0b0063 int id search_badge 0x7f0b0035 int id search_bar 0x7f0b0034 int id search_button 0x7f0b0036 @@ -462,7 +469,7 @@ int id shortcut 0x7f0b002a int id showCustom 0x7f0b000f int id showHome 0x7f0b0010 int id showTitle 0x7f0b0011 -int id show_more 0x7f0b0068 +int id show_more 0x7f0b0070 int id split_action_bar 0x7f0b0007 int id submit_area 0x7f0b003c int id tabMode 0x7f0b000b @@ -482,12 +489,14 @@ int id title 0x7f0b0027 int id up 0x7f0b0008 int id useLogo 0x7f0b0012 int id withText 0x7f0b001a -int id wkll 0x7f0b0063 -int id workflow_author 0x7f0b0064 -int id workflow_datecreated 0x7f0b0065 -int id workflow_dateupdated 0x7f0b0066 -int id workflow_image 0x7f0b0069 -int id workflow_title 0x7f0b0067 +int id wkf_author 0x7f0b0062 +int id wkll 0x7f0b006b +int id workflow_author 0x7f0b006c +int id workflow_datecreated 0x7f0b006d +int id workflow_dateupdated 0x7f0b006e +int id workflow_image 0x7f0b0071 +int id workflow_title 0x7f0b006f +int id workflowpolicyTextView 0x7f0b0068 int id wrap_content 0x7f0b001d int integer abc_config_activityDefaultDur 0x7f0c0000 int integer abc_config_activityShortDur 0x7f0c0001 @@ -517,34 +526,38 @@ int layout abc_simple_dropdown_hint 0x7f040015 int layout activity_dashboard_main 0x7f040016 int layout activity_flash_screen 0x7f040017 int layout activity_login 0x7f040018 -int layout favorite_item_layout 0x7f040019 -int layout fragment_dashboard_main 0x7f04001a -int layout fragment_item 0x7f040023 -int layout fragment_item_grid 0x7f04001b -int layout fragment_item_list 0x7f04001c -int layout fragment_login 0x7f04001d -int layout fragment_navigation_drawer 0x7f04001e -int layout menu_item_layout 0x7f04001f -int layout support_simple_spinner_dropdown_item 0x7f040020 -int layout workflow_item_layout 0x7f040021 -int layout workflow_layout 0x7f040022 +int layout activity_workflow_detail 0x7f040019 +int layout favorite_item_layout 0x7f04001a +int layout fragment_dashboard_main 0x7f04001b +int layout fragment_item 0x7f040028 +int layout fragment_item_grid 0x7f04001c +int layout fragment_item_list 0x7f04001d +int layout fragment_login 0x7f04001e +int layout fragment_navigation_drawer 0x7f04001f +int layout fragment_workflow_about 0x7f040020 +int layout fragment_workflow_detail 0x7f040021 +int layout fragment_workflow_licence 0x7f040022 +int layout fragment_workflow_run_history 0x7f040023 +int layout menu_item_layout 0x7f040024 +int layout support_simple_spinner_dropdown_item 0x7f040025 +int layout workflow_item_layout 0x7f040026 +int layout workflow_layout 0x7f040027 int menu dashboard_main 0x7f0f0000 int menu global 0x7f0f0001 +int menu menu_workflow_detail 0x7f0f0002 int mipmap ic_about 0x7f030000 -int mipmap ic_download 0x7f030001 -int mipmap ic_downloadworkflow 0x7f030002 -int mipmap ic_launcher 0x7f030003 -int mipmap ic_logout 0x7f030004 -int mipmap ic_markworkflow_selected 0x7f030005 -int mipmap ic_markworkflow_unselected 0x7f030006 -int mipmap ic_openwk 0x7f030007 -int mipmap ic_poweredby 0x7f030008 -int mipmap ic_quit 0x7f030009 -int mipmap ic_usage 0x7f03000a -int mipmap ic_user 0x7f03000b -int mipmap ic_viewworkflow 0x7f03000c -int mipmap ic_workflows 0x7f03000d -int mipmap icuserprofiles 0x7f03000e +int mipmap ic_launcher 0x7f030001 +int mipmap ic_logout 0x7f030002 +int mipmap ic_markworkflow_selected 0x7f030003 +int mipmap ic_markworkflow_unselected 0x7f030004 +int mipmap ic_openwk 0x7f030005 +int mipmap ic_poweredby 0x7f030006 +int mipmap ic_quit 0x7f030007 +int mipmap ic_usage 0x7f030008 +int mipmap ic_user 0x7f030009 +int mipmap ic_viewworkflow 0x7f03000a +int mipmap ic_workflows 0x7f03000b +int mipmap icuserprofiles 0x7f03000c int string Logininfo 0x7f0d0000 int string abc_action_bar_home_description 0x7f0d0001 int string abc_action_bar_home_description_format 0x7f0d0002 @@ -568,33 +581,39 @@ int string app_name 0x7f0d0013 int string brand 0x7f0d0014 int string completebrand 0x7f0d0015 int string created 0x7f0d0016 -int string favorite_empty 0x7f0d0017 -int string hello_blank_fragment 0x7f0d0018 -int string hello_world 0x7f0d0019 -int string loginbutton 0x7f0d001a -int string loginpassword 0x7f0d001b -int string loginusername 0x7f0d001c -int string marked 0x7f0d001d -int string menu_search 0x7f0d001e -int string modified 0x7f0d001f -int string navigation_drawer_close 0x7f0d0020 -int string navigation_drawer_open 0x7f0d0021 -int string search_hint 0x7f0d0022 -int string title_about 0x7f0d0023 -int string title_activity_dashboard_main 0x7f0d0024 -int string title_activity_flash_screen 0x7f0d0025 -int string title_exit 0x7f0d0026 -int string title_explore 0x7f0d0027 -int string title_favorite 0x7f0d0028 -int string title_openworkflow 0x7f0d0029 -int string title_usage 0x7f0d002a -int string wktitle 0x7f0d002b -int string workflow_authorhint 0x7f0d002c -int string workflow_component 0x7f0d002d -int string workflow_download 0x7f0d002e -int string workflow_empty 0x7f0d002f -int string workflow_mark 0x7f0d0030 -int string workflow_read 0x7f0d0031 +int string detail_title_section1 0x7f0d0017 +int string detail_title_section2 0x7f0d0018 +int string detail_title_section3 0x7f0d0019 +int string detail_title_section4 0x7f0d001a +int string favorite_empty 0x7f0d001b +int string hello_blank_fragment 0x7f0d001c +int string hello_world 0x7f0d001d +int string loginbutton 0x7f0d001e +int string loginpassword 0x7f0d001f +int string loginusername 0x7f0d0020 +int string marked 0x7f0d0021 +int string menu_search 0x7f0d0022 +int string modified 0x7f0d0023 +int string navigation_drawer_close 0x7f0d0024 +int string navigation_drawer_open 0x7f0d0025 +int string play_workflow 0x7f0d0026 +int string search_hint 0x7f0d0027 +int string title_about 0x7f0d0028 +int string title_activity_dashboard_main 0x7f0d0029 +int string title_activity_flash_screen 0x7f0d002a +int string title_activity_workflow_detail 0x7f0d002b +int string title_exit 0x7f0d002c +int string title_explore 0x7f0d002d +int string title_favorite 0x7f0d002e +int string title_openworkflow 0x7f0d002f +int string title_usage 0x7f0d0030 +int string wktitle 0x7f0d0031 +int string workflow_authorhint 0x7f0d0032 +int string workflow_component 0x7f0d0033 +int string workflow_download 0x7f0d0034 +int string workflow_empty 0x7f0d0035 +int string workflow_mark 0x7f0d0036 +int string workflow_read 0x7f0d0037 int style Animation_AppCompat_DropDownUp 0x7f0e0000 int style AppTheme 0x7f0e0001 int style Base_Animation_AppCompat_DropDownUp 0x7f0e0002 http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/593c74a0/app/build/outputs/apk/app-debug-unaligned.apk ---------------------------------------------------------------------- diff --git a/app/build/outputs/apk/app-debug-unaligned.apk b/app/build/outputs/apk/app-debug-unaligned.apk index 7675035..fc526c3 100644 Binary files a/app/build/outputs/apk/app-debug-unaligned.apk and b/app/build/outputs/apk/app-debug-unaligned.apk differ http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/593c74a0/app/build/outputs/apk/app-debug.apk ---------------------------------------------------------------------- diff --git a/app/build/outputs/apk/app-debug.apk b/app/build/outputs/apk/app-debug.apk index ed6e7f4..2b8f4d6 100644 Binary files a/app/build/outputs/apk/app-debug.apk and b/app/build/outputs/apk/app-debug.apk differ http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/593c74a0/app/build/outputs/logs/manifest-merger-debug-report.txt ---------------------------------------------------------------------- diff --git a/app/build/outputs/logs/manifest-merger-debug-report.txt b/app/build/outputs/logs/manifest-merger-debug-report.txt index b717d33..f84fda2 100644 --- a/app/build/outputs/logs/manifest-merger-debug-report.txt +++ b/app/build/outputs/logs/manifest-merger-debug-report.txt @@ -14,68 +14,82 @@ ADDED from AndroidManifest.xml:21:1 INJECTED from AndroidManifest.xml:0:0 INJECTED from AndroidManifest.xml:0:0 uses-permission#android.permission.INTERNET -ADDED from AndroidManifest.xml:23:5 - android:name - ADDED from AndroidManifest.xml:23:22 -uses-permission#android.permission.WRITE_EXTERNAL_STORAGE ADDED from AndroidManifest.xml:24:5 android:name ADDED from AndroidManifest.xml:24:22 +uses-permission#android.permission.WRITE_EXTERNAL_STORAGE +ADDED from AndroidManifest.xml:25:5 + android:name + ADDED from AndroidManifest.xml:25:22 application -ADDED from AndroidManifest.xml:26:5 +ADDED from AndroidManifest.xml:27:5 MERGED from com.android.support:appcompat-v7:22.0.0:22:5 MERGED from com.android.support:support-v4:22.0.0:22:5 MERGED from com.android.support:cardview-v7:22.0.0:22:5 MERGED from com.android.support:recyclerview-v7:22.0.0:22:5 MERGED from com.android.support:support-v4:22.0.0:22:5 android:label - ADDED from AndroidManifest.xml:29:9 + ADDED from AndroidManifest.xml:30:9 android:allowBackup - ADDED from AndroidManifest.xml:27:9 - android:icon ADDED from AndroidManifest.xml:28:9 + android:icon + ADDED from AndroidManifest.xml:29:9 android:theme - ADDED from AndroidManifest.xml:30:9 + ADDED from AndroidManifest.xml:31:9 activity#org.apache.taverna.mobile.activities.LoginActivity -ADDED from AndroidManifest.xml:31:9 +ADDED from AndroidManifest.xml:32:9 android:label - ADDED from AndroidManifest.xml:33:13 + ADDED from AndroidManifest.xml:34:13 android:name - ADDED from AndroidManifest.xml:32:13 + ADDED from AndroidManifest.xml:33:13 activity#org.apache.taverna.mobile.activities.FlashScreenActivity -ADDED from AndroidManifest.xml:35:9 +ADDED from AndroidManifest.xml:36:9 android:label - ADDED from AndroidManifest.xml:37:13 + ADDED from AndroidManifest.xml:38:13 android:name - ADDED from AndroidManifest.xml:36:13 + ADDED from AndroidManifest.xml:37:13 intent-filter#android.intent.action.MAIN+android.intent.category.LAUNCHER -ADDED from AndroidManifest.xml:38:13 +ADDED from AndroidManifest.xml:39:13 action#android.intent.action.MAIN -ADDED from AndroidManifest.xml:39:17 +ADDED from AndroidManifest.xml:40:17 android:name - ADDED from AndroidManifest.xml:39:25 + ADDED from AndroidManifest.xml:40:25 category#android.intent.category.LAUNCHER -ADDED from AndroidManifest.xml:41:17 +ADDED from AndroidManifest.xml:42:17 android:name - ADDED from AndroidManifest.xml:41:27 + ADDED from AndroidManifest.xml:42:27 activity#org.apache.taverna.mobile.activities.DashboardMainActivity -ADDED from AndroidManifest.xml:44:9 +ADDED from AndroidManifest.xml:45:9 android:label - ADDED from AndroidManifest.xml:46:13 + ADDED from AndroidManifest.xml:47:13 android:name - ADDED from AndroidManifest.xml:45:13 + ADDED from AndroidManifest.xml:46:13 intent-filter#android.intent.action.SEARCH -ADDED from AndroidManifest.xml:47:13 +ADDED from AndroidManifest.xml:48:13 action#android.intent.action.SEARCH -ADDED from AndroidManifest.xml:48:17 +ADDED from AndroidManifest.xml:49:17 android:name - ADDED from AndroidManifest.xml:48:25 + ADDED from AndroidManifest.xml:49:25 meta-data#android.app.searchable -ADDED from AndroidManifest.xml:50:13 +ADDED from AndroidManifest.xml:52:13 android:resource - ADDED from AndroidManifest.xml:51:17 + ADDED from AndroidManifest.xml:54:17 + android:name + ADDED from AndroidManifest.xml:53:17 +activity#org.apache.taverna.mobile.activities.WorkflowDetailActivity +ADDED from AndroidManifest.xml:56:9 + android:label + ADDED from AndroidManifest.xml:58:13 + android:parentActivityName + ADDED from AndroidManifest.xml:59:13 + android:name + ADDED from AndroidManifest.xml:57:13 +meta-data#android.support.PARENT_ACTIVITY +ADDED from AndroidManifest.xml:60:13 + android:value + ADDED from AndroidManifest.xml:62:17 android:name - ADDED from AndroidManifest.xml:50:24 + ADDED from AndroidManifest.xml:61:17 uses-sdk INJECTED from AndroidManifest.xml:0:0 reason: use-sdk injection requested MERGED from com.android.support:appcompat-v7:22.0.0:20:5 http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/593c74a0/app/src/main/AndroidManifest.xml ---------------------------------------------------------------------- diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9a940e3..d97a064 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -20,8 +20,9 @@ limitations under the License. --> <manifest xmlns:android="http://schemas.android.com/apk/res/android"; package="org.apache.taverna.mobile" > - <uses-permission android:name="android.permission.INTERNET"/> - <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> + + <uses-permission android:name="android.permission.INTERNET" /> + <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <application android:allowBackup="true" @@ -45,11 +46,20 @@ limitations under the License. android:name=".activities.DashboardMainActivity" android:label="@string/title_activity_dashboard_main" > <intent-filter> - <action android:name="android.intent.action.SEARCH"></action> + <action android:name="android.intent.action.SEARCH" /> </intent-filter> - <meta-data android:name="android.app.searchable" - android:resource="@xml/searchable" /> + <meta-data + android:name="android.app.searchable" + android:resource="@xml/searchable" /> + </activity> + <activity + android:name=".activities.WorkflowDetailActivity" + android:label="@string/title_activity_workflow_detail" + android:parentActivityName=".activities.DashboardMainActivity" > + <meta-data + android:name="android.support.PARENT_ACTIVITY" + android:value="org.apache.taverna.mobile.activities.DashboardMainActivity" /> </activity> </application> http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/593c74a0/app/src/main/java/org/apache/taverna/mobile/activities/DashboardMainActivity.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/activities/DashboardMainActivity.java b/app/src/main/java/org/apache/taverna/mobile/activities/DashboardMainActivity.java index 1ed74db..2fb7e1d 100644 --- a/app/src/main/java/org/apache/taverna/mobile/activities/DashboardMainActivity.java +++ b/app/src/main/java/org/apache/taverna/mobile/activities/DashboardMainActivity.java @@ -70,10 +70,8 @@ public class DashboardMainActivity extends ActionBarActivity public final String APP_DIRECTORY_NAME = "TavernaMobile"; MyAdapter mAdapter; - ViewPager mPager; - @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -226,12 +224,16 @@ public class DashboardMainActivity extends ActionBarActivity } @Override - public void onWorkflowSelected(String id) { + public void onWorkflowSelected(int id) { + //send all details to the next Activity which should display the Workflow details in full + startActivity(new Intent(this, WorkflowDetailActivity.class)); + } @Override public void onFavoriteItemSelected(int position) { //trigger when a favorite item is selected. + startActivity(new Intent(this, WorkflowDetailActivity.class)); } public class MyAdapter extends FragmentPagerAdapter { http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/593c74a0/app/src/main/java/org/apache/taverna/mobile/activities/WorkflowDetailActivity.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/activities/WorkflowDetailActivity.java b/app/src/main/java/org/apache/taverna/mobile/activities/WorkflowDetailActivity.java new file mode 100644 index 0000000..d4b20ba --- /dev/null +++ b/app/src/main/java/org/apache/taverna/mobile/activities/WorkflowDetailActivity.java @@ -0,0 +1,145 @@ +package org.apache.taverna.mobile.activities; + +/** + * Apache Taverna Mobile + * Copyright 2015 The Apache Software Foundation + + * This product includes software developed at + * The Apache Software Foundation (http://www.apache.org/). + + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import android.os.Bundle; +import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentManager; +import android.support.v4.app.FragmentPagerAdapter; +import android.support.v4.view.ViewPager; +import android.support.v7.app.ActionBarActivity; +import android.view.KeyEvent; +import android.view.Menu; +import android.view.MenuItem; + +import org.apache.taverna.mobile.R; +import org.apache.taverna.mobile.fragments.workflowdetails.WorkflowAboutFragment; +import org.apache.taverna.mobile.fragments.workflowdetails.WorkflowLicenceFragment; +import org.apache.taverna.mobile.fragments.workflowdetails.WorkflowRunHistoryFragment; +import org.apache.taverna.mobile.fragments.workflowdetails.WorkflowdetailFragment; + +import java.util.Locale; + +public class WorkflowDetailActivity extends ActionBarActivity { + + /** + * The {@link android.support.v4.view.PagerAdapter} that will provide + * fragments for each of the sections. We use a + * {@link FragmentPagerAdapter} derivative, which will keep every + * loaded fragment in memory. If this becomes too memory intensive, it + * may be best to switch to a + * {@link android.support.v4.app.FragmentStatePagerAdapter}. + */ + SectionsPagerAdapter mSectionsPagerAdapter; + + /** + * The {@link ViewPager} that will host the section contents. + */ + ViewPager mViewPager; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_workflow_detail); + // Create the adapter that will return a fragment for each of the three + // primary sections of the activity. + mSectionsPagerAdapter = new SectionsPagerAdapter(getSupportFragmentManager()); + + // Set up the ViewPager with the sections adapter. + mViewPager = (ViewPager) findViewById(R.id.pager); + mViewPager.setAdapter(mSectionsPagerAdapter); + + } + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + return false; + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + // Handle action bar item clicks here. The action bar will + if(item.getItemId() == android.R.id.home){ + finish(); + this.overridePendingTransition(android.R.anim.fade_in, android.R.anim.slide_out_right ); + } + return super.onOptionsItemSelected(item); + } + @Override + public void onBackPressed(){ + finish(); + this.overridePendingTransition(android.R.anim.fade_in, android.R.anim.slide_out_right ); + } + + /** + * A {@link FragmentPagerAdapter} that returns a fragment corresponding to + * one of the sections/tabs/pages. + */ + public class SectionsPagerAdapter extends FragmentPagerAdapter { + + public SectionsPagerAdapter(FragmentManager fm) { + super(fm); + } + + @Override + public Fragment getItem(int position) { + switch(position +1){ + case 1: + return WorkflowdetailFragment.newInstance(position + 1); + case 2: + return WorkflowRunHistoryFragment.newInstance("",""); + case 3: + return WorkflowLicenceFragment.newInstance("",""); + case 4: + return WorkflowAboutFragment.newInstance("",""); + } + return WorkflowdetailFragment.newInstance(position + 1); + } + + @Override + public int getCount() { + // Show 4 total pages. + return 4; + } + + @Override + public CharSequence getPageTitle(int position) { + Locale l = Locale.getDefault(); + switch (position) { + case 0: + return getString(R.string.detail_title_section1).toUpperCase(l); + case 1: + return getString(R.string.detail_title_section2).toUpperCase(l); + case 2: + return getString(R.string.detail_title_section3).toUpperCase(l); + case 3: + return getString(R.string.detail_title_section4).toUpperCase(l); + } + return ""; + } + } + +} http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/593c74a0/app/src/main/java/org/apache/taverna/mobile/adapters/WorkflowAdapter.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/adapters/WorkflowAdapter.java b/app/src/main/java/org/apache/taverna/mobile/adapters/WorkflowAdapter.java index a682b33..0833a18 100644 --- a/app/src/main/java/org/apache/taverna/mobile/adapters/WorkflowAdapter.java +++ b/app/src/main/java/org/apache/taverna/mobile/adapters/WorkflowAdapter.java @@ -1,21 +1,49 @@ package org.apache.taverna.mobile.adapters; +/** + * Apache Taverna Mobile + * Copyright 2015 The Apache Software Foundation + + * This product includes software developed at + * The Apache Software Foundation (http://www.apache.org/). + + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +import android.app.Activity; import android.content.Context; +import android.content.Intent; import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.BaseAdapter; +import android.widget.Button; import android.widget.ImageView; import android.widget.TextView; import org.apache.taverna.mobile.R; +import org.apache.taverna.mobile.activities.WorkflowDetailActivity; import org.apache.taverna.mobile.utils.Workflow; /** * Created by root on 6/8/15. */ -public class WorkflowAdapter extends RecyclerView.Adapter<WorkflowAdapter.ViewHolder>{ +public class WorkflowAdapter extends RecyclerView.Adapter<WorkflowAdapter.ViewHolder> implements View.OnClickListener{ private Context context; private Workflow[] workflow; private WorkflowAdapter.ViewHolder mViewHolder; @@ -39,7 +67,8 @@ public class WorkflowAdapter extends RecyclerView.Adapter<WorkflowAdapter.ViewHo @Override public void onBindViewHolder(ViewHolder viewHolder, int i) { viewHolder.author_name.setText(workflow[i].getWorkflow_author()); - viewHolder.author_profile.setImageBitmap(workflow[i].getWorkflow_author_bitmap()); + //viewHolder.author_profile.setImageBitmap(workflow[i].getWorkflow_author_bitmap()); + viewHolder.btn_view_workflow.setOnClickListener(this); } @Override @@ -56,14 +85,26 @@ public class WorkflowAdapter extends RecyclerView.Adapter<WorkflowAdapter.ViewHo return size; } + @Override + public void onClick(View view) { + switch(view.getId()){ + case R.id.button_view_workflow: + context.startActivity(new Intent(context, WorkflowDetailActivity.class)); + ((Activity) context).overridePendingTransition(android.R.anim.slide_in_left, android.R.anim.fade_out); + break; + } + } + public static class ViewHolder extends RecyclerView.ViewHolder { public final ImageView author_profile; public final TextView author_name; + public final Button btn_view_workflow; public ViewHolder(View v) { super(v); author_profile = (ImageView) v.findViewById(R.id.author_profile_image); author_name = (TextView) v.findViewById(R.id.workflow_author); + btn_view_workflow = (Button) v.findViewById(R.id.button_view_workflow); } } } http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/593c74a0/app/src/main/java/org/apache/taverna/mobile/fragments/WorkflowItemFragment.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/fragments/WorkflowItemFragment.java b/app/src/main/java/org/apache/taverna/mobile/fragments/WorkflowItemFragment.java index f2ea4e5..781e6d1 100644 --- a/app/src/main/java/org/apache/taverna/mobile/fragments/WorkflowItemFragment.java +++ b/app/src/main/java/org/apache/taverna/mobile/fragments/WorkflowItemFragment.java @@ -1,4 +1,28 @@ package org.apache.taverna.mobile.fragments; +/** + * Apache Taverna Mobile + * Copyright 2015 The Apache Software Foundation + + * This product includes software developed at + * The Apache Software Foundation (http://www.apache.org/). + + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ import android.app.Activity; import android.os.Bundle; @@ -120,7 +144,7 @@ public class WorkflowItemFragment extends Fragment implements AdapterView.OnItem if (null != mListener) { // Notify the active callbacks interface (the activity, if the // fragment is attached to one) that an item has been selected. - mListener.onWorkflowSelected(""); + mListener.onWorkflowSelected(position); } } /** @@ -148,7 +172,7 @@ public class WorkflowItemFragment extends Fragment implements AdapterView.OnItem */ public interface OnWorkflowSelectedListener { // TODO: Update argument type and name - public void onWorkflowSelected(String id); + public void onWorkflowSelected(int workflowPosition); } } http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/593c74a0/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowAboutFragment.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowAboutFragment.java b/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowAboutFragment.java new file mode 100644 index 0000000..e54cdaf --- /dev/null +++ b/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowAboutFragment.java @@ -0,0 +1,88 @@ +package org.apache.taverna.mobile.fragments.workflowdetails; +/** + * Apache Taverna Mobile + * Copyright 2015 The Apache Software Foundation + + * This product includes software developed at + * The Apache Software Foundation (http://www.apache.org/). + + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import android.os.Bundle; +import android.support.v4.app.Fragment; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import org.apache.taverna.mobile.R; + +/** + * A simple {@link Fragment} subclass. + * Use the {@link WorkflowAboutFragment#newInstance} factory method to + * create an instance of this fragment. + */ +public class WorkflowAboutFragment extends Fragment { + // TODO: Rename parameter arguments, choose names that match + // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER + private static final String ARG_PARAM1 = "param1"; + private static final String ARG_PARAM2 = "param2"; + + // TODO: Rename and change types of parameters + private String mParam1; + private String mParam2; + + /** + * Use this factory method to create a new instance of + * this fragment using the provided parameters. + * + * @param param1 Parameter 1. + * @param param2 Parameter 2. + * @return A new instance of fragment WorkflowAboutFragment. + */ + // TODO: Rename and change types and number of parameters + public static WorkflowAboutFragment newInstance(String param1, String param2) { + WorkflowAboutFragment fragment = new WorkflowAboutFragment(); + Bundle args = new Bundle(); + args.putString(ARG_PARAM1, param1); + args.putString(ARG_PARAM2, param2); + fragment.setArguments(args); + return fragment; + } + + public WorkflowAboutFragment() { + } + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + if (getArguments() != null) { + mParam1 = getArguments().getString(ARG_PARAM1); + mParam2 = getArguments().getString(ARG_PARAM2); + } + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + // Inflate the layout for this fragment + return inflater.inflate(R.layout.fragment_workflow_about, container, false); + } + + +} http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/593c74a0/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowLicenceFragment.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowLicenceFragment.java b/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowLicenceFragment.java new file mode 100644 index 0000000..8226dc3 --- /dev/null +++ b/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowLicenceFragment.java @@ -0,0 +1,93 @@ +package org.apache.taverna.mobile.fragments.workflowdetails; +/** + * Apache Taverna Mobile + * Copyright 2015 The Apache Software Foundation + + * This product includes software developed at + * The Apache Software Foundation (http://www.apache.org/). + + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import android.os.Bundle; +import android.support.v4.app.Fragment; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import org.apache.taverna.mobile.R; + +/** + * A simple {@link Fragment} subclass. + * Use the {@link WorkflowLicenceFragment#newInstance} factory method to + * create an instance of this fragment. + */ +public class WorkflowLicenceFragment extends Fragment { + // TODO: Rename parameter arguments, choose names that match + // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER + private static final String ARG_PARAM1 = "param1"; + private static final String ARG_PARAM2 = "param2"; + + // TODO: Rename and change types of parameters + private String mParam1; + private String mParam2; + + /** + * Use this factory method to create a new instance of + * this fragment using the provided parameters. + * + * @param param1 Parameter 1. + * @param param2 Parameter 2. + * @return A new instance of fragment WorkflowLicenceFragment. + */ + // TODO: Rename and change types and number of parameters + public static WorkflowLicenceFragment newInstance(String param1, String param2) { + WorkflowLicenceFragment fragment = new WorkflowLicenceFragment(); + Bundle args = new Bundle(); + args.putString(ARG_PARAM1, param1); + args.putString(ARG_PARAM2, param2); + fragment.setArguments(args); + return fragment; + } + + public WorkflowLicenceFragment() { + // Required empty public constructor + } + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + if (getArguments() != null) { + mParam1 = getArguments().getString(ARG_PARAM1); + mParam2 = getArguments().getString(ARG_PARAM2); + } + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + // Inflate the layout for this fragment + return inflater.inflate(R.layout.fragment_workflow_licence, container, false); + } + + @Override + public void onDetach() { + super.onDetach(); + } + +} http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/593c74a0/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowRunHistoryFragment.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowRunHistoryFragment.java b/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowRunHistoryFragment.java new file mode 100644 index 0000000..68fefae --- /dev/null +++ b/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowRunHistoryFragment.java @@ -0,0 +1,91 @@ +package org.apache.taverna.mobile.fragments.workflowdetails; +/** + * Apache Taverna Mobile + * Copyright 2015 The Apache Software Foundation + + * This product includes software developed at + * The Apache Software Foundation (http://www.apache.org/). + + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import android.os.Bundle; +import android.support.v4.app.Fragment; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import org.apache.taverna.mobile.R; + +/** + * A simple {@link Fragment} subclass. + * Use the {@link WorkflowRunHistoryFragment#newInstance} factory method to + * create an instance of this fragment. + */ +public class WorkflowRunHistoryFragment extends Fragment { + // TODO: Rename parameter arguments, choose names that match + // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER + private static final String ARG_PARAM1 = "param1"; + private static final String ARG_PARAM2 = "param2"; + + // TODO: Rename and change types of parameters + private String mParam1; + private String mParam2; + + /** + * Use this factory method to create a new instance of + * this fragment using the provided parameters. + * + * @param param1 Parameter 1. + * @param param2 Parameter 2. + * @return A new instance of fragment WorkflowRunHistoryFragment. + */ + // TODO: Rename and change types and number of parameters + public static WorkflowRunHistoryFragment newInstance(String param1, String param2) { + WorkflowRunHistoryFragment fragment = new WorkflowRunHistoryFragment(); + Bundle args = new Bundle(); + args.putString(ARG_PARAM1, param1); + args.putString(ARG_PARAM2, param2); + fragment.setArguments(args); + return fragment; + } + + public WorkflowRunHistoryFragment() { + // Required empty public constructor + } + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + if (getArguments() != null) { + mParam1 = getArguments().getString(ARG_PARAM1); + mParam2 = getArguments().getString(ARG_PARAM2); + } + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + // Inflate the layout for this fragment + return inflater.inflate(R.layout.fragment_workflow_run_history, container, false); + } + @Override + public void onDetach() { + super.onDetach(); + } +} http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/593c74a0/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowdetailFragment.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowdetailFragment.java b/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowdetailFragment.java new file mode 100644 index 0000000..c7e8a24 --- /dev/null +++ b/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowdetailFragment.java @@ -0,0 +1,66 @@ +package org.apache.taverna.mobile.fragments.workflowdetails; +/** + * Apache Taverna Mobile + * Copyright 2015 The Apache Software Foundation + + * This product includes software developed at + * The Apache Software Foundation (http://www.apache.org/). + + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import android.os.Bundle; +import android.support.v4.app.Fragment; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import org.apache.taverna.mobile.R; + +/** + * Created by Larry Akah on 6/9/15. + */ +public class WorkflowdetailFragment extends Fragment { + /** + * The fragment argument representing the section number for this + * fragment. + */ + private static final String ARG_SECTION_NUMBER = "section_number"; + + /** + * Returns a new instance of this fragment for the given section + * number. + */ + public static WorkflowdetailFragment newInstance(int sectionNumber) { + WorkflowdetailFragment fragment = new WorkflowdetailFragment(); + Bundle args = new Bundle(); + args.putInt(ARG_SECTION_NUMBER, sectionNumber); + fragment.setArguments(args); + return fragment; + } + + public WorkflowdetailFragment() { + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + View rootView = inflater.inflate(R.layout.fragment_workflow_detail, container, false); + return rootView; + } +} http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/593c74a0/app/src/main/res/drawable/download.jpg ---------------------------------------------------------------------- diff --git a/app/src/main/res/drawable/download.jpg b/app/src/main/res/drawable/download.jpg new file mode 100755 index 0000000..06df0bf Binary files /dev/null and b/app/src/main/res/drawable/download.jpg differ http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/593c74a0/app/src/main/res/drawable/download.png ---------------------------------------------------------------------- diff --git a/app/src/main/res/drawable/download.png b/app/src/main/res/drawable/download.png deleted file mode 100644 index 12eab7b..0000000 Binary files a/app/src/main/res/drawable/download.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/593c74a0/app/src/main/res/drawable/downloadwk.png ---------------------------------------------------------------------- diff --git a/app/src/main/res/drawable/downloadwk.png b/app/src/main/res/drawable/downloadwk.png new file mode 100644 index 0000000..12eab7b Binary files /dev/null and b/app/src/main/res/drawable/downloadwk.png differ http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/593c74a0/app/src/main/res/layout/activity_dashboard_main.xml ---------------------------------------------------------------------- diff --git a/app/src/main/res/layout/activity_dashboard_main.xml b/app/src/main/res/layout/activity_dashboard_main.xml index bc05e07..65b2ca1 100644 --- a/app/src/main/res/layout/activity_dashboard_main.xml +++ b/app/src/main/res/layout/activity_dashboard_main.xml @@ -30,7 +30,7 @@ limitations under the License. <android.support.v4.view.PagerTitleStrip android:id="@+id/pager_title_strip" android:layout_width="match_parent" - android:layout_height="wrap_content" + android:layout_height="50sp" android:layout_gravity="top" android:background="#33b5e5" android:textColor="#fff" http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/593c74a0/app/src/main/res/layout/activity_flash_screen.xml ---------------------------------------------------------------------- diff --git a/app/src/main/res/layout/activity_flash_screen.xml b/app/src/main/res/layout/activity_flash_screen.xml index 7e5c74c..e1dd5e4 100644 --- a/app/src/main/res/layout/activity_flash_screen.xml +++ b/app/src/main/res/layout/activity_flash_screen.xml @@ -53,7 +53,8 @@ limitations under the License. android:layout_alignEnd="@+id/textView" android:layout_alignLeft="@+id/textView" android:layout_alignStart="@+id/textView" - android:layout_above="@+id/imageView" /> + android:layout_above="@+id/imageView" + android:scaleType="fitStart" /> <TextView android:layout_width="wrap_content" http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/593c74a0/app/src/main/res/layout/activity_workflow_detail.xml ---------------------------------------------------------------------- diff --git a/app/src/main/res/layout/activity_workflow_detail.xml b/app/src/main/res/layout/activity_workflow_detail.xml new file mode 100644 index 0000000..56edf11 --- /dev/null +++ b/app/src/main/res/layout/activity_workflow_detail.xml @@ -0,0 +1,39 @@ +<!-- +Apache Taverna Mobile +Copyright 2015 The Apache Software Foundation +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + +Licensed to the Apache Software Foundation (ASF) under one or more +contributor license agreements. See the NOTICE file distributed with +this work for additional information regarding copyright ownership. +The ASF licenses this file to You under the Apache License, Version 2.0 +(the "License"); you may not use this file except in compliance with +the License. You may obtain a copy of the License at +http://www.apache.org/licenses/LICENSE-2.0 +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +--> +<android.support.v4.view.ViewPager xmlns:android="http://schemas.android.com/apk/res/android"; + xmlns:tools="http://schemas.android.com/tools"; + android:id="@+id/pager" + android:layout_width="match_parent" + android:layout_height="match_parent" + tools:context="org.apache.taverna.mobile.activities.WorkflowDetailActivity" > + <android.support.v4.view.PagerTitleStrip + android:id="@+id/pager_title_strip" + android:layout_width="match_parent" + android:layout_height="50sp" + android:layout_gravity="top" + android:background="#33b5e5" + android:textColor="#fff" + android:paddingTop="1dp" + android:paddingBottom="1dp" + android:animateLayoutChanges="true" + android:elevation="@dimen/abc_text_size_menu_material" + /> + +</android.support.v4.view.ViewPager> http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/593c74a0/app/src/main/res/layout/fragment_workflow_about.xml ---------------------------------------------------------------------- diff --git a/app/src/main/res/layout/fragment_workflow_about.xml b/app/src/main/res/layout/fragment_workflow_about.xml new file mode 100644 index 0000000..4cab59c --- /dev/null +++ b/app/src/main/res/layout/fragment_workflow_about.xml @@ -0,0 +1,40 @@ +<!-- +Apache Taverna Mobile +Copyright 2015 The Apache Software Foundation +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + +Licensed to the Apache Software Foundation (ASF) under one or more +contributor license agreements. See the NOTICE file distributed with +this work for additional information regarding copyright ownership. +The ASF licenses this file to You under the Apache License, Version 2.0 +(the "License"); you may not use this file except in compliance with +the License. You may obtain a copy of the License at +http://www.apache.org/licenses/LICENSE-2.0 +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +--> +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"; + xmlns:tools="http://schemas.android.com/tools"; android:layout_width="match_parent" + android:layout_height="match_parent" + tools:context="org.apache.taverna.mobile.fragments.workflowdetails.WorkflowAboutFragment"> + + <!-- TODO: Update blank fragment layout --> + <TextView android:layout_width="match_parent" + android:layout_height="match_parent" + android:text="@string/hello_blank_fragment" + android:elevation="5sp" + android:layout_margin="2dp" + android:background="@color/accent_material_dark" + android:backgroundTintMode="screen" + android:ellipsize="start" + android:id="@+id/aboutworkflowTextView" + android:typeface="serif" + android:scrollbars="vertical" + android:fadeScrollbars="true" + android:textIsSelectable="true" /> + +</FrameLayout> http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/593c74a0/app/src/main/res/layout/fragment_workflow_detail.xml ---------------------------------------------------------------------- diff --git a/app/src/main/res/layout/fragment_workflow_detail.xml b/app/src/main/res/layout/fragment_workflow_detail.xml new file mode 100644 index 0000000..250e964 --- /dev/null +++ b/app/src/main/res/layout/fragment_workflow_detail.xml @@ -0,0 +1,86 @@ +<!-- +Apache Taverna Mobile +Copyright 2015 The Apache Software Foundation +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + +Licensed to the Apache Software Foundation (ASF) under one or more +contributor license agreements. See the NOTICE file distributed with +this work for additional information regarding copyright ownership. +The ASF licenses this file to You under the Apache License, Version 2.0 +(the "License"); you may not use this file except in compliance with +the License. You may obtain a copy of the License at +http://www.apache.org/licenses/LICENSE-2.0 +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +--> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"; + xmlns:tools="http://schemas.android.com/tools"; + android:layout_width="match_parent" + android:layout_height="match_parent" + android:paddingLeft="@dimen/activity_horizontal_margin" + android:paddingRight="@dimen/activity_horizontal_margin" + android:paddingTop="@dimen/activity_vertical_margin" + android:paddingBottom="@dimen/activity_vertical_margin" + tools:context="org.apache.taverna.mobile.activities.WorkflowDetailActivity$PlaceholderFragment" + android:orientation="vertical"> + + <TextView android:id="@+id/wkf_author" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:hint="@string/detail_title_section1" + android:typeface="serif" + android:textStyle="italic" + android:text="@string/workflow_authorhint" + android:textSize="20sp" /> + + <ScrollView + android:layout_width="match_parent" + android:layout_height="0dp" + android:id="@+id/scrollView" + android:layout_weight="1" /> + + <LinearLayout + android:orientation="horizontal" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:id="@+id/actionLayout"> + + <Button + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textStyle="normal" + android:layout_weight="0.33" + android:background="#ddd" + style="android:buttonBarButtonStyle" + android:text="@string/play_workflow" + android:drawableLeft="@android:drawable/ic_media_play" + android:id="@+id/run_wk" /> + <Button + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textStyle="normal" + android:layout_weight="0.33" + android:background="#ddd" + style="android:buttonBarButtonStyle" + android:text="@string/workflow_download" + android:drawableLeft="@drawable/download" + android:layout_marginLeft="2dp" + android:layout_marginRight="2dp" + android:id="@+id/download_wk" /> + <Button + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textStyle="normal" + android:layout_weight="0.33" + android:background="#ddd" + style="android:buttonBarButtonStyle" + android:text="@string/workflow_mark" + android:drawableLeft="@android:drawable/btn_star_big_off" + android:id="@+id/mark_wk" /> + </LinearLayout> + +</LinearLayout> http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/593c74a0/app/src/main/res/layout/fragment_workflow_licence.xml ---------------------------------------------------------------------- diff --git a/app/src/main/res/layout/fragment_workflow_licence.xml b/app/src/main/res/layout/fragment_workflow_licence.xml new file mode 100644 index 0000000..f239737 --- /dev/null +++ b/app/src/main/res/layout/fragment_workflow_licence.xml @@ -0,0 +1,39 @@ +<!-- +Apache Taverna Mobile +Copyright 2015 The Apache Software Foundation +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + +Licensed to the Apache Software Foundation (ASF) under one or more +contributor license agreements. See the NOTICE file distributed with +this work for additional information regarding copyright ownership. +The ASF licenses this file to You under the Apache License, Version 2.0 +(the "License"); you may not use this file except in compliance with +the License. You may obtain a copy of the License at +http://www.apache.org/licenses/LICENSE-2.0 +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +--> +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"; + xmlns:tools="http://schemas.android.com/tools"; android:layout_width="match_parent" + android:layout_height="match_parent" + tools:context="org.apache.taverna.mobile.fragments.workflowdetails.WorkflowLicenceFragment"> + + <!-- TODO: Update blank fragment layout --> + <TextView android:layout_width="match_parent" + android:layout_height="match_parent" + android:text="@string/hello_blank_fragment" + android:elevation="5sp" + android:layout_margin="2dp" + android:background="@color/accent_material_dark" + android:scrollbars="vertical" + android:fadeScrollbars="true" + android:id="@+id/workflowpolicyTextView" + android:textAlignment="center" + android:typeface="serif" + android:textIsSelectable="true" /> + +</FrameLayout> http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/593c74a0/app/src/main/res/layout/fragment_workflow_run_history.xml ---------------------------------------------------------------------- diff --git a/app/src/main/res/layout/fragment_workflow_run_history.xml b/app/src/main/res/layout/fragment_workflow_run_history.xml new file mode 100644 index 0000000..33b66f7 --- /dev/null +++ b/app/src/main/res/layout/fragment_workflow_run_history.xml @@ -0,0 +1,29 @@ +<!-- +Apache Taverna Mobile +Copyright 2015 The Apache Software Foundation +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + +Licensed to the Apache Software Foundation (ASF) under one or more +contributor license agreements. See the NOTICE file distributed with +this work for additional information regarding copyright ownership. +The ASF licenses this file to You under the Apache License, Version 2.0 +(the "License"); you may not use this file except in compliance with +the License. You may obtain a copy of the License at +http://www.apache.org/licenses/LICENSE-2.0 +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +--> +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"; + xmlns:tools="http://schemas.android.com/tools"; android:layout_width="match_parent" + android:layout_height="match_parent" + tools:context="org.apache.taverna.mobile.fragments.workflowdetails.WorkflowRunHistoryFragment"> + + <!-- TODO: Update blank fragment layout --> + <TextView android:layout_width="match_parent" android:layout_height="match_parent" + android:text="@string/hello_blank_fragment" /> + +</FrameLayout> http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/593c74a0/app/src/main/res/layout/workflow_item_layout.xml ---------------------------------------------------------------------- diff --git a/app/src/main/res/layout/workflow_item_layout.xml b/app/src/main/res/layout/workflow_item_layout.xml index e0fac85..0f01d93 100644 --- a/app/src/main/res/layout/workflow_item_layout.xml +++ b/app/src/main/res/layout/workflow_item_layout.xml @@ -44,7 +44,7 @@ limitations under the License. android:layout_width="wrap_content" android:layout_height="wrap_content" android:elevation="5dp" - android:src="@drawable/ic_userprofile" + android:src="@mipmap/icuserprofiles" android:background="@drawable/round_shape"/> <LinearLayout http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/593c74a0/app/src/main/res/menu/menu_workflow_detail.xml ---------------------------------------------------------------------- diff --git a/app/src/main/res/menu/menu_workflow_detail.xml b/app/src/main/res/menu/menu_workflow_detail.xml new file mode 100644 index 0000000..ac1714e --- /dev/null +++ b/app/src/main/res/menu/menu_workflow_detail.xml @@ -0,0 +1,7 @@ +<menu xmlns:android="http://schemas.android.com/apk/res/android"; + xmlns:app="http://schemas.android.com/apk/res-auto"; + xmlns:tools="http://schemas.android.com/tools"; + tools:context="org.apache.taverna.mobile.activities.WorkflowDetailActivity"> + <item android:id="@+id/action_settings" android:title="@string/action_settings" + android:orderInCategory="100" app:showAsAction="never" /> +</menu> http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/593c74a0/app/src/main/res/mipmap-hdpi/ic_download.png ---------------------------------------------------------------------- diff --git a/app/src/main/res/mipmap-hdpi/ic_download.png b/app/src/main/res/mipmap-hdpi/ic_download.png deleted file mode 100644 index 20c62d0..0000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_download.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/593c74a0/app/src/main/res/mipmap-hdpi/ic_downloadworkflow.png ---------------------------------------------------------------------- diff --git a/app/src/main/res/mipmap-hdpi/ic_downloadworkflow.png b/app/src/main/res/mipmap-hdpi/ic_downloadworkflow.png deleted file mode 100644 index bcb4093..0000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_downloadworkflow.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/593c74a0/app/src/main/res/mipmap-mdpi/ic_download.png ---------------------------------------------------------------------- diff --git a/app/src/main/res/mipmap-mdpi/ic_download.png b/app/src/main/res/mipmap-mdpi/ic_download.png deleted file mode 100644 index de4ea04..0000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_download.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/593c74a0/app/src/main/res/mipmap-mdpi/ic_downloadworkflow.png ---------------------------------------------------------------------- diff --git a/app/src/main/res/mipmap-mdpi/ic_downloadworkflow.png b/app/src/main/res/mipmap-mdpi/ic_downloadworkflow.png deleted file mode 100644 index e24fde0..0000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_downloadworkflow.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/593c74a0/app/src/main/res/mipmap-xhdpi/ic_download.png ---------------------------------------------------------------------- diff --git a/app/src/main/res/mipmap-xhdpi/ic_download.png b/app/src/main/res/mipmap-xhdpi/ic_download.png deleted file mode 100644 index 326d646..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_download.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/593c74a0/app/src/main/res/mipmap-xhdpi/ic_downloadworkflow.png ---------------------------------------------------------------------- diff --git a/app/src/main/res/mipmap-xhdpi/ic_downloadworkflow.png b/app/src/main/res/mipmap-xhdpi/ic_downloadworkflow.png deleted file mode 100644 index fa50553..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_downloadworkflow.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/593c74a0/app/src/main/res/mipmap-xxhdpi/ic_download.png ---------------------------------------------------------------------- diff --git a/app/src/main/res/mipmap-xxhdpi/ic_download.png b/app/src/main/res/mipmap-xxhdpi/ic_download.png deleted file mode 100644 index f7ae278..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_download.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/593c74a0/app/src/main/res/mipmap-xxhdpi/ic_downloadworkflow.png ---------------------------------------------------------------------- diff --git a/app/src/main/res/mipmap-xxhdpi/ic_downloadworkflow.png b/app/src/main/res/mipmap-xxhdpi/ic_downloadworkflow.png deleted file mode 100644 index 6d94151..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_downloadworkflow.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/593c74a0/app/src/main/res/mipmap-xxxhdpi/ic_download.png ---------------------------------------------------------------------- diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_download.png b/app/src/main/res/mipmap-xxxhdpi/ic_download.png deleted file mode 100644 index c5481ae..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_download.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/593c74a0/app/src/main/res/mipmap-xxxhdpi/ic_downloadworkflow.png ---------------------------------------------------------------------- diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_downloadworkflow.png b/app/src/main/res/mipmap-xxxhdpi/ic_downloadworkflow.png deleted file mode 100644 index 0f5a81a..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_downloadworkflow.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/593c74a0/app/src/main/res/values-large/strings.xml ---------------------------------------------------------------------- diff --git a/app/src/main/res/values-large/strings.xml b/app/src/main/res/values-large/strings.xml index 26ada7f..3df8fe7 100644 --- a/app/src/main/res/values-large/strings.xml +++ b/app/src/main/res/values-large/strings.xml @@ -20,4 +20,5 @@ limitations under the License. --> <resources> <string name="completebrand">Powered By Apache Taverna</string> + <string name="play_workflow">Run</string> </resources> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/593c74a0/app/src/main/res/values/strings.xml ---------------------------------------------------------------------- diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index db35b82..911aa38 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -14,7 +14,7 @@ limitations under the License. --> <resources> <string name="app_name">TavernaMobile</string> - <string name="hello_world">Hello world!</string> + <string name="hello_world"> Empty </string> <string name="action_settings">Settings</string> <string name="title_activity_flash_screen">Taverna Mobile</string> <string name="brand">Powered By</string> @@ -28,7 +28,7 @@ limitations under the License. <item>Date Last Run</item> </array> <!-- TODO: Remove or change this placeholder text --> - <string name="hello_blank_fragment">Hello blank fragment</string> + <string name="hello_blank_fragment"> About Workflow </string> <string name="Logininfo">Login to your Account</string> <string name="loginusername">Email or Username</string> <string name="loginpassword">Password</string> @@ -61,5 +61,13 @@ limitations under the License. <string name="marked">Marked On</string> <string name="created">Workflow Created On:</string> <string name="modified">Modified On:</string> + <string name="title_activity_workflow_detail">Workflow Detail</string> + + + <string name="detail_title_section1">Workflow </string> + <string name="detail_title_section2">Run History</string> + <string name="detail_title_section3">Licence | Policy</string> + <string name="detail_title_section4"> About </string> + <string name="play_workflow">Run</string> </resources> http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/593c74a0/build/intermediates/model_data.bin ---------------------------------------------------------------------- diff --git a/build/intermediates/model_data.bin b/build/intermediates/model_data.bin index 747b9ec..2ce9e58 100644 Binary files a/build/intermediates/model_data.bin and b/build/intermediates/model_data.bin differ
