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 2015/06/10 16:07:23 UTC
[61/64] [abbrv] incubator-taverna-mobile git commit: Improved UI and
added sample data for the favorites and the workflow streams
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/db0ba8b1/app/build/intermediates/res/debug/layout/fragment_navigation_drawer.xml
----------------------------------------------------------------------
diff --git a/app/build/intermediates/res/debug/layout/fragment_navigation_drawer.xml b/app/build/intermediates/res/debug/layout/fragment_navigation_drawer.xml
index 2a7f7fe..97c773a 100644
--- a/app/build/intermediates/res/debug/layout/fragment_navigation_drawer.xml
+++ b/app/build/intermediates/res/debug/layout/fragment_navigation_drawer.xml
@@ -1,3 +1,22 @@
+<!--
+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"
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/db0ba8b1/app/build/intermediates/res/debug/layout/menu_item_layout.xml
----------------------------------------------------------------------
diff --git a/app/build/intermediates/res/debug/layout/menu_item_layout.xml b/app/build/intermediates/res/debug/layout/menu_item_layout.xml
index f623490..b482995 100644
--- a/app/build/intermediates/res/debug/layout/menu_item_layout.xml
+++ b/app/build/intermediates/res/debug/layout/menu_item_layout.xml
@@ -1,4 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
+<!--
+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"
android:orientation="horizontal"
android:layout_width="match_parent"
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/db0ba8b1/app/build/intermediates/res/debug/layout/workflow_item_layout.xml
----------------------------------------------------------------------
diff --git a/app/build/intermediates/res/debug/layout/workflow_item_layout.xml b/app/build/intermediates/res/debug/layout/workflow_item_layout.xml
index 449e893..0f8f7d7 100644
--- a/app/build/intermediates/res/debug/layout/workflow_item_layout.xml
+++ b/app/build/intermediates/res/debug/layout/workflow_item_layout.xml
@@ -1,10 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
- <android.support.v7.widget.CardView
+<!--
+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.v7.widget.CardView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
- card_view:cardElevation="@dimen/abc_text_size_caption_material"
+ card_view:cardElevation="@dimen/abc_text_size_menu_material"
card_view:cardBackgroundColor="@color/background_floating_material_light"
card_view:cardCornerRadius="2dp"
card_view:paddingEnd="2dp"
@@ -27,7 +46,8 @@
android:elevation="5dp"
android:src="@drawable/ic_userprofile"
android:background="@drawable/round_shape"/>
- <LinearLayout
+
+ <LinearLayout
android:id="@+id/linearlayout_workflow_info"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -38,7 +58,38 @@
android:layout_height="wrap_content"
android:text="@string/workflow_authorhint"/>
- </LinearLayout>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textAppearance="?android:attr/textAppearanceLarge"
+ android:text="Large Text"
+ android:id="@+id/workflow_datecreated" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textAppearance="?android:attr/textAppearanceLarge"
+ android:text="Large Text"
+ android:id="@+id/workflow_dateupdated"
+ android:layout_gravity="center_vertical" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textAppearance="?android:attr/textAppearanceLarge"
+ android:text="Large Text"
+ android:id="@+id/workflow_title" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textAppearance="?android:attr/textAppearanceLarge"
+ android:text="See more"
+ android:id="@+id/show_more"
+ android:typeface="serif"
+ android:background="@color/material_deep_teal_200" />
+
+ </LinearLayout>
</LinearLayout>
<ImageView
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/db0ba8b1/app/build/intermediates/res/debug/layout/workflow_layout.xml
----------------------------------------------------------------------
diff --git a/app/build/intermediates/res/debug/layout/workflow_layout.xml b/app/build/intermediates/res/debug/layout/workflow_layout.xml
index 884487d..d09fd8c 100644
--- a/app/build/intermediates/res/debug/layout/workflow_layout.xml
+++ b/app/build/intermediates/res/debug/layout/workflow_layout.xml
@@ -1,4 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
+<!--
+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"
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent">
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/db0ba8b1/app/build/intermediates/res/debug/menu/dashboard_main.xml
----------------------------------------------------------------------
diff --git a/app/build/intermediates/res/debug/menu/dashboard_main.xml b/app/build/intermediates/res/debug/menu/dashboard_main.xml
index f719d01..99e0d60 100644
--- a/app/build/intermediates/res/debug/menu/dashboard_main.xml
+++ b/app/build/intermediates/res/debug/menu/dashboard_main.xml
@@ -1,3 +1,22 @@
+<!--
+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.
+-->
<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"
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/db0ba8b1/app/build/intermediates/res/debug/menu/global.xml
----------------------------------------------------------------------
diff --git a/app/build/intermediates/res/debug/menu/global.xml b/app/build/intermediates/res/debug/menu/global.xml
index 426911c..763a7d6 100644
--- a/app/build/intermediates/res/debug/menu/global.xml
+++ b/app/build/intermediates/res/debug/menu/global.xml
@@ -1,3 +1,22 @@
+<!--
+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.
+-->
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item android:id="@+id/action_settings" android:title="@string/action_settings"
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/db0ba8b1/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 c44a637..05dea32 100644
--- a/app/build/intermediates/res/debug/values/values.xml
+++ b/app/build/intermediates/res/debug/values/values.xml
@@ -212,12 +212,16 @@
<string name="app_name">TavernaMobile</string>
<string name="brand">Powered By</string>
<string name="completebrand">Powered By Apache Taverna</string>
+ <string name="created">Workflow Created On:</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="loginbutton">Login</string>
<string name="loginpassword">Password</string>
<string name="loginusername">Email or Username</string>
+ <string name="marked">Marked On</string>
<string name="menu_search">Search</string>
+ <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="search_hint"> Search workflows by name</string>
@@ -229,8 +233,11 @@
<string name="title_favorite">Favorites</string>
<string name="title_openworkflow">Open Workflow</string>
<string name="title_usage">Usage</string>
+ <string name="wktitle">TITLE</string>
<string name="workflow_authorhint">Workflow Author</string>
+ <string name="workflow_component">Workflow component</string>
<string name="workflow_download">Download</string>
+ <string name="workflow_empty"> No <b>Workflows</b> Available. Check your Connection to the Internet</string>
<string name="workflow_mark">Favorite</string>
<string name="workflow_read">View</string>
<!-- From: file:/root/Desktop/AndroidLab/TavernaMobile2/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.0.0/res/values/values.xml -->
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/db0ba8b1/app/build/intermediates/res/debug/xml/searchable.xml
----------------------------------------------------------------------
diff --git a/app/build/intermediates/res/debug/xml/searchable.xml b/app/build/intermediates/res/debug/xml/searchable.xml
index 29d94c1..35e78de 100644
--- a/app/build/intermediates/res/debug/xml/searchable.xml
+++ b/app/build/intermediates/res/debug/xml/searchable.xml
@@ -1,4 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
+<!--
+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.
+-->
<searchable xmlns:android="http://schemas.android.com/apk/res/android"
android:hint="@string/search_hint"
android:autoUrlDetect="true"
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/db0ba8b1/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 759b082..d02ec50 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/db0ba8b1/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 1687d25..411eaef 100644
--- a/app/build/intermediates/symbols/debug/R.txt
+++ b/app/build/intermediates/symbols/debug/R.txt
@@ -390,31 +390,35 @@ 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 0x7f0b0063
-int id action_settings 0x7f0b0064
+int id action_search 0x7f0b006e
+int id action_settings 0x7f0b006f
int id activity_chooser_view_content 0x7f0b0021
int id always 0x7f0b0016
-int id author_profile_image 0x7f0b005b
+int id author 0x7f0b0048
+int id author_profile_image 0x7f0b004a
int id beginning 0x7f0b0013
-int id button 0x7f0b0049
-int id button_download_workflow 0x7f0b0060
-int id button_mark_workflow 0x7f0b0061
-int id button_view_workflow 0x7f0b005f
+int id button_download_workflow 0x7f0b006b
+int id button_mark_workflow 0x7f0b006c
+int id button_view_workflow 0x7f0b006a
int id checkbox 0x7f0b0029
int id collapseActionView 0x7f0b0017
int id container 0x7f0b0042
+int id date_created 0x7f0b0050
+int id date_modified 0x7f0b0052
+int id date_set 0x7f0b004e
int id decor_content_parent 0x7f0b002f
int id default_activity_button 0x7f0b0024
int id dialog 0x7f0b001b
int id disableHome 0x7f0b000c
int id drawer_layout 0x7f0b003f
int id dropdown 0x7f0b001c
-int id editTextUsername 0x7f0b004f
+int id editTextUsername 0x7f0b0058
int id edit_query 0x7f0b0033
-int id edittextPassword 0x7f0b0051
+int id edittextPassword 0x7f0b005a
int id end 0x7f0b0014
int id expand_activities_button 0x7f0b0022
int id expanded_menu 0x7f0b0028
+int id favorite_title 0x7f0b004c
int id home 0x7f0b0004
int id homeAsUp 0x7f0b000d
int id icon 0x7f0b0026
@@ -422,19 +426,19 @@ int id ifRoom 0x7f0b0018
int id image 0x7f0b0023
int id imageView 0x7f0b0044
int id imageView2 0x7f0b0045
-int id imageView3 0x7f0b0054
-int id imageView4 0x7f0b0055
-int id linearlayout_workflow_info 0x7f0b005c
+int id imageView3 0x7f0b005d
+int id imageView4 0x7f0b005e
+int id linearlayout_workflow_info 0x7f0b0049
int id listMode 0x7f0b0009
int id list_item 0x7f0b0025
-int id loginbutton 0x7f0b0052
-int id loginlayout 0x7f0b004c
-int id logo 0x7f0b004a
-int id menuIcon 0x7f0b0058
-int id menuItemText 0x7f0b0059
+int id loginbutton 0x7f0b005b
+int id loginlayout 0x7f0b0055
+int id logo 0x7f0b0053
+int id menuIcon 0x7f0b0061
+int id menuItemText 0x7f0b0062
int id middle 0x7f0b0015
int id navigation_drawer 0x7f0b0043
-int id navigation_drawer_listview 0x7f0b0056
+int id navigation_drawer_listview 0x7f0b005f
int id never 0x7f0b0019
int id none 0x7f0b000e
int id normal 0x7f0b000a
@@ -443,8 +447,7 @@ int id pager_title_strip 0x7f0b0041
int id progress_circular 0x7f0b0005
int id progress_horizontal 0x7f0b0006
int id radio 0x7f0b002b
-int id radioButton 0x7f0b0048
-int id recycler_list 0x7f0b0062
+int id recycler_list 0x7f0b006d
int id search_badge 0x7f0b0035
int id search_bar 0x7f0b0034
int id search_button 0x7f0b0036
@@ -459,24 +462,32 @@ int id shortcut 0x7f0b002a
int id showCustom 0x7f0b000f
int id showHome 0x7f0b0010
int id showTitle 0x7f0b0011
+int id show_more 0x7f0b0068
int id split_action_bar 0x7f0b0007
int id submit_area 0x7f0b003c
int id tabMode 0x7f0b000b
int id textView 0x7f0b0046
+int id textView10 0x7f0b004d
+int id textView11 0x7f0b004f
+int id textView12 0x7f0b0051
int id textView2 0x7f0b0047
-int id textView3 0x7f0b004b
-int id textView4 0x7f0b004d
-int id textView5 0x7f0b004e
-int id textView6 0x7f0b0050
-int id textView7 0x7f0b0053
-int id textView8 0x7f0b0057
+int id textView3 0x7f0b0054
+int id textView4 0x7f0b0056
+int id textView5 0x7f0b0057
+int id textView6 0x7f0b0059
+int id textView7 0x7f0b005c
+int id textView8 0x7f0b0060
+int id textView9 0x7f0b004b
int id title 0x7f0b0027
int id up 0x7f0b0008
int id useLogo 0x7f0b0012
int id withText 0x7f0b001a
-int id wkll 0x7f0b005a
-int id workflow_author 0x7f0b005d
-int id workflow_image 0x7f0b005e
+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 wrap_content 0x7f0b001d
int integer abc_config_activityDefaultDur 0x7f0c0000
int integer abc_config_activityShortDur 0x7f0c0001
@@ -506,16 +517,17 @@ 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 fragment_dashboard_main 0x7f040019
-int layout fragment_item 0x7f040022
-int layout fragment_item_grid 0x7f04001a
-int layout fragment_item_list 0x7f04001b
-int layout fragment_login 0x7f04001c
-int layout fragment_navigation_drawer 0x7f04001d
-int layout menu_item_layout 0x7f04001e
-int layout support_simple_spinner_dropdown_item 0x7f04001f
-int layout workflow_item_layout 0x7f040020
-int layout workflow_layout 0x7f040021
+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 menu dashboard_main 0x7f0f0000
int menu global 0x7f0f0001
int mipmap ic_about 0x7f030000
@@ -555,27 +567,34 @@ int string action_settings 0x7f0d0012
int string app_name 0x7f0d0013
int string brand 0x7f0d0014
int string completebrand 0x7f0d0015
-int string hello_blank_fragment 0x7f0d0016
-int string hello_world 0x7f0d0017
-int string loginbutton 0x7f0d0018
-int string loginpassword 0x7f0d0019
-int string loginusername 0x7f0d001a
-int string menu_search 0x7f0d001b
-int string navigation_drawer_close 0x7f0d001c
-int string navigation_drawer_open 0x7f0d001d
-int string search_hint 0x7f0d001e
-int string title_about 0x7f0d001f
-int string title_activity_dashboard_main 0x7f0d0020
-int string title_activity_flash_screen 0x7f0d0021
-int string title_exit 0x7f0d0022
-int string title_explore 0x7f0d0023
-int string title_favorite 0x7f0d0024
-int string title_openworkflow 0x7f0d0025
-int string title_usage 0x7f0d0026
-int string workflow_authorhint 0x7f0d0027
-int string workflow_download 0x7f0d0028
-int string workflow_mark 0x7f0d0029
-int string workflow_read 0x7f0d002a
+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 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/db0ba8b1/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 814318c..7675035 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/db0ba8b1/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 bb08954..ed6e7f4 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/db0ba8b1/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 1509564..b717d33 100644
--- a/app/build/outputs/logs/manifest-merger-debug-report.txt
+++ b/app/build/outputs/logs/manifest-merger-debug-report.txt
@@ -13,61 +13,69 @@ ADDED from AndroidManifest.xml:21:1
android:versionCode
INJECTED from AndroidManifest.xml:0:0
INJECTED from AndroidManifest.xml:0:0
-application
+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
+application
+ADDED from AndroidManifest.xml:26: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:27:9
+ ADDED from AndroidManifest.xml:29:9
android:allowBackup
- ADDED from AndroidManifest.xml:25:9
+ ADDED from AndroidManifest.xml:27:9
android:icon
- ADDED from AndroidManifest.xml:26:9
- android:theme
ADDED from AndroidManifest.xml:28:9
+ android:theme
+ ADDED from AndroidManifest.xml:30:9
activity#org.apache.taverna.mobile.activities.LoginActivity
-ADDED from AndroidManifest.xml:29:9
+ADDED from AndroidManifest.xml:31:9
android:label
- ADDED from AndroidManifest.xml:31:13
+ ADDED from AndroidManifest.xml:33:13
android:name
- ADDED from AndroidManifest.xml:30:13
+ ADDED from AndroidManifest.xml:32:13
activity#org.apache.taverna.mobile.activities.FlashScreenActivity
-ADDED from AndroidManifest.xml:33:9
+ADDED from AndroidManifest.xml:35:9
android:label
- ADDED from AndroidManifest.xml:35:13
+ ADDED from AndroidManifest.xml:37:13
android:name
- ADDED from AndroidManifest.xml:34:13
+ ADDED from AndroidManifest.xml:36:13
intent-filter#android.intent.action.MAIN+android.intent.category.LAUNCHER
-ADDED from AndroidManifest.xml:36:13
+ADDED from AndroidManifest.xml:38:13
action#android.intent.action.MAIN
-ADDED from AndroidManifest.xml:37:17
+ADDED from AndroidManifest.xml:39:17
android:name
- ADDED from AndroidManifest.xml:37:25
+ ADDED from AndroidManifest.xml:39:25
category#android.intent.category.LAUNCHER
-ADDED from AndroidManifest.xml:39:17
+ADDED from AndroidManifest.xml:41:17
android:name
- ADDED from AndroidManifest.xml:39:27
+ ADDED from AndroidManifest.xml:41:27
activity#org.apache.taverna.mobile.activities.DashboardMainActivity
-ADDED from AndroidManifest.xml:42:9
+ADDED from AndroidManifest.xml:44:9
android:label
- ADDED from AndroidManifest.xml:44:13
+ ADDED from AndroidManifest.xml:46:13
android:name
- ADDED from AndroidManifest.xml:43:13
+ ADDED from AndroidManifest.xml:45:13
intent-filter#android.intent.action.SEARCH
-ADDED from AndroidManifest.xml:45:13
+ADDED from AndroidManifest.xml:47:13
action#android.intent.action.SEARCH
-ADDED from AndroidManifest.xml:46:17
+ADDED from AndroidManifest.xml:48:17
android:name
- ADDED from AndroidManifest.xml:46:25
+ ADDED from AndroidManifest.xml:48:25
meta-data#android.app.searchable
-ADDED from AndroidManifest.xml:48:13
+ADDED from AndroidManifest.xml:50:13
android:resource
- ADDED from AndroidManifest.xml:49:17
+ ADDED from AndroidManifest.xml:51:17
android:name
- ADDED from AndroidManifest.xml:48:24
+ ADDED from AndroidManifest.xml:50:24
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/db0ba8b1/app/src/main/AndroidManifest.xml
----------------------------------------------------------------------
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index bcafa5f..9a940e3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -20,6 +20,8 @@ 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"/>
<application
android:allowBackup="true"
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/db0ba8b1/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 c7ebb9c..1ed74db 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
@@ -28,7 +28,9 @@ package org.apache.taverna.mobile.activities;
import android.app.SearchManager;
import android.content.Context;
import android.content.Intent;
+import android.net.Uri;
import android.os.Bundle;
+import android.os.Environment;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentPagerAdapter;
@@ -44,12 +46,14 @@ import android.view.MenuItem;
import android.widget.Toast;
import org.apache.taverna.mobile.R;
-import org.apache.taverna.mobile.fragments.DashboardFragment;
+import org.apache.taverna.mobile.fragments.FavoriteFragment;
import org.apache.taverna.mobile.fragments.NavigationDrawerFragment;
import org.apache.taverna.mobile.fragments.WorkflowItemFragment;
+import java.io.File;
+
public class DashboardMainActivity extends ActionBarActivity
- implements NavigationDrawerFragment.NavigationDrawerCallbacks, WorkflowItemFragment.OnWorkflowSelectedListener {
+ implements NavigationDrawerFragment.NavigationDrawerCallbacks, WorkflowItemFragment.OnWorkflowSelectedListener, FavoriteFragment.FavoriteItemSelected {
/**
* Fragment managing the behaviors, interactions and presentation of the navigation drawer.
@@ -62,6 +66,8 @@ public class DashboardMainActivity extends ActionBarActivity
private CharSequence mTitle;
static final int NUM_ITEMS = 2;
+ private final int SELECT_WORKFLOW = 10;
+ public final String APP_DIRECTORY_NAME = "TavernaMobile";
MyAdapter mAdapter;
@@ -94,6 +100,7 @@ public class DashboardMainActivity extends ActionBarActivity
String query = searchIntent.getStringExtra(SearchManager.QUERY);
Toast.makeText(this,"Query = "+query, Toast.LENGTH_SHORT).show();
}
+ setUpWorkflowDirectory(this);
}
@Override
@@ -104,28 +111,37 @@ public class DashboardMainActivity extends ActionBarActivity
case 1:
fragmentManager.beginTransaction()
.replace(R.id.container, WorkflowItemFragment.newInstance("param1", "param2"))
- .setTransition(FragmentTransaction.TRANSIT_ENTER_MASK)
+ .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_CLOSE)
.commit();
+ try {
+ mPager.setCurrentItem(0);
+ }catch (NullPointerException np){
+ np.printStackTrace();
+ }
break;
- case 2:
- fragmentManager.beginTransaction()
- .replace(R.id.container, DashboardFragment.newInstance(position + 1))
- .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
- .commit();
+ case 2: //open workflow
+ Intent workflowSelectIntent = new Intent(Intent.ACTION_GET_CONTENT)
+ .setType("text/t2flow")
+ .setData(Uri.parse(Environment.getExternalStorageDirectory()+File.separator+APP_DIRECTORY_NAME));
+
+ Intent loadWorkflowIntent = Intent.createChooser(workflowSelectIntent,
+ "Choose Workflow (.t2flow)");
+ startActivityForResult(loadWorkflowIntent, SELECT_WORKFLOW);
+
break;
- case 3:
+ case 3: //show usage
fragmentManager.beginTransaction()
- .replace(R.id.container, DashboardFragment.newInstance(position + 1))
+ .replace(R.id.container, FavoriteFragment.newInstance(position + 1))
.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
.commit();
break;
- case 4:
+ case 4: //show about
fragmentManager.beginTransaction()
- .replace(R.id.container, DashboardFragment.newInstance(position + 1))
+ .replace(R.id.container, FavoriteFragment.newInstance(position + 1))
.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
.commit();
break;
- case 5:
+ case 5: //logout user
this.finish();
break;
default:
@@ -133,6 +149,16 @@ public class DashboardMainActivity extends ActionBarActivity
}
}
+ @Override
+ public void onActivityResult(int requestCode , int resultCode, Intent data){
+ if(resultCode == RESULT_OK){
+ if(requestCode == SELECT_WORKFLOW){
+ String workflowPath = data.getData().getPath();
+ Toast.makeText(getBaseContext(), "Path: "+workflowPath, Toast.LENGTH_LONG).show();
+ }
+ }
+ }
+
public void onSectionAttached(int number) {
switch (number) {
case 1:
@@ -160,6 +186,18 @@ public class DashboardMainActivity extends ActionBarActivity
actionBar.setTitle(mTitle);
}
+ private void setUpWorkflowDirectory(Context context){
+ File workflowDirectory = new File(Environment.getExternalStorageDirectory()+File.separator+APP_DIRECTORY_NAME);
+ if(!workflowDirectory.exists()){
+ boolean state = workflowDirectory.mkdirs();
+ if(state){
+ Toast.makeText(context, "Storage Ready", Toast.LENGTH_SHORT).show();
+ }else{
+ Toast.makeText(context, "Storage Error. Directory not created", Toast.LENGTH_SHORT).show();
+ }
+// workflowDirectory.list();
+ }
+ }
@Override
public boolean onCreateOptionsMenu(Menu menu) {
if (!mNavigationDrawerFragment.isDrawerOpen()) {
@@ -191,6 +229,11 @@ public class DashboardMainActivity extends ActionBarActivity
public void onWorkflowSelected(String id) {
}
+ @Override
+ public void onFavoriteItemSelected(int position) {
+ //trigger when a favorite item is selected.
+ }
+
public class MyAdapter extends FragmentPagerAdapter {
public MyAdapter(FragmentManager fm) {
super(fm);
@@ -218,7 +261,7 @@ public class DashboardMainActivity extends ActionBarActivity
case 1:
return WorkflowItemFragment.newInstance("Workflows","Running ...");
case 2:
- return DashboardFragment.newInstance(position);
+ return FavoriteFragment.newInstance(position);
}
return WorkflowItemFragment.newInstance("","");
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/db0ba8b1/app/src/main/java/org/apache/taverna/mobile/adapters/FavoriteAdapter.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/adapters/FavoriteAdapter.java b/app/src/main/java/org/apache/taverna/mobile/adapters/FavoriteAdapter.java
deleted file mode 100644
index ce2fce1..0000000
--- a/app/src/main/java/org/apache/taverna/mobile/adapters/FavoriteAdapter.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.apache.taverna.mobile.adapters;
-
-/**
- * Created by root on 6/8/15.
- */
-public class FavoriteAdapter {
-}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/db0ba8b1/app/src/main/java/org/apache/taverna/mobile/adapters/FavoriteWorkflowAdapter.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/adapters/FavoriteWorkflowAdapter.java b/app/src/main/java/org/apache/taverna/mobile/adapters/FavoriteWorkflowAdapter.java
new file mode 100644
index 0000000..ea5586b
--- /dev/null
+++ b/app/src/main/java/org/apache/taverna/mobile/adapters/FavoriteWorkflowAdapter.java
@@ -0,0 +1,64 @@
+package org.apache.taverna.mobile.adapters;
+
+import android.content.Context;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import org.apache.taverna.mobile.R;
+
+import java.util.List;
+
+/**
+ * Created by root on 6/9/15.
+ */
+public class FavoriteWorkflowAdapter extends RecyclerView.Adapter<FavoriteWorkflowAdapter.FViewHolder> {
+
+ private Context context;
+ private List<String[]> dataSet;
+
+ public FavoriteWorkflowAdapter(Context c, List<String[]> data) {
+ context = c;
+ dataSet = data;
+ }
+
+ @Override
+ public FViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
+ View itemview = LayoutInflater.from(context).inflate(R.layout.favorite_item_layout, viewGroup, false);
+ FViewHolder vh = new FViewHolder(itemview);
+ return vh;
+ }
+
+ @Override
+ public void onBindViewHolder(FViewHolder fViewHolder, int i) {
+ String[] mdata = dataSet.get(i);
+ fViewHolder.author.setText(mdata[0]);
+ fViewHolder.title.setText(mdata[1]);
+ fViewHolder.dateMarked.setText(mdata[2]);
+ fViewHolder.dateAdd.setText(mdata[3]);
+ fViewHolder.dateModified.setText(mdata[4]);
+ }
+
+ @Override
+ public int getItemCount() {
+ return dataSet.size();
+ }
+
+ public class FViewHolder extends RecyclerView.ViewHolder {
+
+ public final ImageView favorite_thumb;
+ public final TextView author, title, dateMarked, dateAdd, dateModified;
+ public FViewHolder(View itemView) {
+ super(itemView);
+ favorite_thumb = (ImageView) itemView.findViewById(R.id.author_profile_image);
+ author = (TextView) itemView.findViewById(R.id.author);
+ title = (TextView) itemView.findViewById(R.id.favorite_title);
+ dateMarked = (TextView) itemView.findViewById(R.id.date_set);
+ dateAdd = (TextView) itemView.findViewById(R.id.date_created);
+ dateModified = (TextView) itemView.findViewById(R.id.date_modified);
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/db0ba8b1/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 6a88615..a682b33 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
@@ -56,12 +56,6 @@ public class WorkflowAdapter extends RecyclerView.Adapter<WorkflowAdapter.ViewHo
return size;
}
- public View getView(int i, View view, ViewGroup viewGroup) {
- View workflow_root = LayoutInflater.from(context).inflate(R.layout.workflow_item_layout, viewGroup,false);
-
- return workflow_root;
- }
-
public static class ViewHolder extends RecyclerView.ViewHolder {
public final ImageView author_profile;
public final TextView author_name;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/db0ba8b1/app/src/main/java/org/apache/taverna/mobile/fragments/DashboardFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/fragments/DashboardFragment.java b/app/src/main/java/org/apache/taverna/mobile/fragments/DashboardFragment.java
deleted file mode 100644
index 3df220d..0000000
--- a/app/src/main/java/org/apache/taverna/mobile/fragments/DashboardFragment.java
+++ /dev/null
@@ -1,77 +0,0 @@
-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;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import org.apache.taverna.mobile.R;
-import org.apache.taverna.mobile.activities.DashboardMainActivity;
-
-/**
- * Created by Larry Akah on 6/6/15.
- */
-public class DashboardFragment 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 DashboardFragment newInstance(int sectionNumber) {
- DashboardFragment fragment = new DashboardFragment();
- Bundle args = new Bundle();
- args.putInt(ARG_SECTION_NUMBER, sectionNumber);
- fragment.setArguments(args);
- return fragment;
- }
-
- public DashboardFragment() {
- }
-
- @Override
- public View onCreateView(LayoutInflater inflater, ViewGroup container,
- Bundle savedInstanceState) {
- View rootView = inflater.inflate(R.layout.fragment_dashboard_main, container, false);
- return rootView;
- }
-
- @Override
- public void onAttach(Activity activity) {
- super.onAttach(activity);
- ((DashboardMainActivity) activity).onSectionAttached(
- getArguments().getInt(ARG_SECTION_NUMBER));
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/db0ba8b1/app/src/main/java/org/apache/taverna/mobile/fragments/FavoriteFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/fragments/FavoriteFragment.java b/app/src/main/java/org/apache/taverna/mobile/fragments/FavoriteFragment.java
new file mode 100644
index 0000000..5a9cf32
--- /dev/null
+++ b/app/src/main/java/org/apache/taverna/mobile/fragments/FavoriteFragment.java
@@ -0,0 +1,156 @@
+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;
+import android.support.v4.app.Fragment;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.TextView;
+
+import org.apache.taverna.mobile.R;
+import org.apache.taverna.mobile.activities.DashboardMainActivity;
+import org.apache.taverna.mobile.adapters.FavoriteWorkflowAdapter;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Created by Larry Akah on 6/6/15.
+ */
+public class FavoriteFragment extends Fragment implements AdapterView.OnItemClickListener{
+ /**
+ * The fragment argument representing the section number for this
+ * fragment.
+ */
+ private static final String ARG_SECTION_NUMBER = "SECTION_NUMBER";
+ private FavoriteWorkflowAdapter favoriteAdapter;
+ private RecyclerView wFavoriteListView;
+ private FavoriteItemSelected favItemListener;
+
+ /**
+ * Returns a new instance of this fragment for the given section
+ * number.
+ */
+ public static FavoriteFragment newInstance(int sectionNumber) {
+ FavoriteFragment fragment = new FavoriteFragment();
+ Bundle args = new Bundle();
+ args.putInt(ARG_SECTION_NUMBER, sectionNumber);
+ fragment.setArguments(args);
+ return fragment;
+ }
+
+ public FavoriteFragment() {
+ }
+
+ @Override
+ public void onCreate(Bundle savedInstanceState){
+ super.onCreate(savedInstanceState);
+
+ //TODO : Collect data through API (ICEBASE)
+ //create a sample list of data. future data come s from an API on local storage
+ List<String[]> sampledata = new ArrayList<String[]>();
+ sampledata.add(new String[]{"Larry", "Prokaryotic symbiosis",
+ new SimpleDateFormat().format(new Date()),
+ new SimpleDateFormat().format(new Date()),
+ new SimpleDateFormat().format(new Date()),
+ new SimpleDateFormat().format(new Date())});
+ sampledata.add(new String[]{"Meeze Ball", "Fluid Traffic analysis",
+ new SimpleDateFormat().format(new Date()),
+ new SimpleDateFormat().format(new Date()),
+ new SimpleDateFormat().format(new Date()),
+ new SimpleDateFormat().format(new Date())});
+ sampledata.add(new String[]{"Halway Law", "Photosynthetic tissue disengagement",
+ new SimpleDateFormat().format(new Date()),
+ new SimpleDateFormat().format(new Date()),
+ new SimpleDateFormat().format(new Date()),
+ new SimpleDateFormat().format(new Date())});
+
+ favoriteAdapter = new FavoriteWorkflowAdapter(getActivity(), sampledata);
+ }
+
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container,
+ Bundle savedInstanceState) {
+ View rootView = inflater.inflate(R.layout.fragment_dashboard_main, container, false);
+ wFavoriteListView = (RecyclerView)rootView.findViewById(android.R.id.list);
+ wFavoriteListView.setHasFixedSize(true);
+ wFavoriteListView.setLayoutManager(new LinearLayoutManager(getActivity()));
+ wFavoriteListView.setAdapter(favoriteAdapter);
+
+ return rootView;
+ }
+
+ @Override
+ public void onAttach(Activity activity) {
+ super.onAttach(activity);
+ try {
+ favItemListener = (FavoriteItemSelected) activity;
+ ((DashboardMainActivity) activity).onSectionAttached(
+ getArguments().getInt(ARG_SECTION_NUMBER));
+ }catch (ClassCastException ex){
+ ex.printStackTrace();
+ }
+ }
+
+ /**
+ * Called when the fragment is no longer attached to its activity. This
+ * is called after {@link #onDestroy()}.
+ */
+ @Override
+ public void onDetach() {
+ super.onDetach();
+ favItemListener = null;
+ }
+
+ @Override
+ public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
+ favItemListener.onFavoriteItemSelected(i);
+ }
+
+ /**
+ * Causes the empty textView to be set and become visible
+ */
+ private void setEmptyText(){
+ View emptyView = wFavoriteListView.getChildAt(1);
+ if(emptyView instanceof TextView){
+ emptyView.setVisibility(View.VISIBLE);
+ }
+ }
+
+ public interface FavoriteItemSelected{
+ //implemented by activity when sending click events to this fragments views
+ public void onFavoriteItemSelected(int position);
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/db0ba8b1/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 5c38316..f2ea4e5 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
@@ -48,7 +48,6 @@ public class WorkflowItemFragment extends Fragment implements AdapterView.OnItem
* The Adapter which will be used to populate the ListView/GridView with
* Views.
*/
- private ListAdapter mAdapter;
private WorkflowAdapter workflowAdapter;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/db0ba8b1/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 b9dc168..bc05e07 100644
--- a/app/src/main/res/layout/activity_dashboard_main.xml
+++ b/app/src/main/res/layout/activity_dashboard_main.xml
@@ -36,13 +36,14 @@ limitations under the License.
android:textColor="#fff"
android:paddingTop="4dp"
android:paddingBottom="4dp"
- android:elevation="@dimen/abc_action_bar_default_height_material"
+ android:elevation="@dimen/abc_text_size_menu_material"
/>
<FrameLayout
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="match_parent"
>
+
</FrameLayout>
</android.support.v4.view.ViewPager>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/db0ba8b1/app/src/main/res/layout/favorite_item_layout.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/layout/favorite_item_layout.xml b/app/src/main/res/layout/favorite_item_layout.xml
new file mode 100644
index 0000000..25e809a
--- /dev/null
+++ b/app/src/main/res/layout/favorite_item_layout.xml
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+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.v7.widget.CardView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:card_view="http://schemas.android.com/apk/res-auto"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ card_view:cardElevation="@dimen/abc_text_size_menu_material"
+ card_view:cardBackgroundColor="@color/background_floating_material_light"
+ card_view:cardCornerRadius="2dp"
+ card_view:paddingEnd="2dp"
+ card_view:paddingStart="2dp" >
+
+ <LinearLayout
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textAppearance="?android:attr/textAppearanceLarge"
+ android:id="@+id/author"
+ android:hint="@string/workflow_authorhint"
+ android:textSize="25sp" />
+
+ <LinearLayout
+ android:id="@+id/linearlayout_workflow_info"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="horizontal">
+ <ImageView
+ android:id="@+id/author_profile_image"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:elevation="5dp"
+ android:background="@drawable/round_shape"
+ android:contentDescription="@string/workflow_component" />
+
+ <LinearLayout
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="5dp">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/wktitle"
+ android:id="@+id/textView9" />
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textAppearance="?android:attr/textAppearanceLarge"
+ android:id="@+id/favorite_title"
+ android:hint="@string/title_favorite" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/marked"
+ android:id="@+id/textView10"
+ android:layout_gravity="center_horizontal" />
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textAppearance="?android:attr/textAppearanceLarge"
+ android:hint="Date workflow was marked"
+ android:id="@+id/date_set"
+ android:typeface="serif"
+ android:textColor="@color/material_deep_teal_200"
+ android:textSize="15dp"
+ android:focusableInTouchMode="false"
+ android:layout_gravity="center_horizontal"
+ android:gravity="center_horizontal" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/created"
+ android:id="@+id/textView11"
+ android:layout_gravity="center_horizontal" />
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textAppearance="?android:attr/textAppearanceLarge"
+ android:hint="Date workflow was Created"
+ android:id="@+id/date_created"
+ android:typeface="serif"
+ android:textColor="@color/material_deep_teal_200"
+ android:textSize="15dp"
+ android:layout_gravity="center_horizontal"
+ android:gravity="center_horizontal" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/modified"
+ android:id="@+id/textView12"
+ android:layout_gravity="center_horizontal" />
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textAppearance="?android:attr/textAppearanceLarge"
+ android:hint="Date workflow was lastly Modified"
+ android:id="@+id/date_modified"
+ android:typeface="serif"
+ android:textColor="@color/material_deep_teal_200"
+ android:textSize="15dp"
+ android:layout_gravity="center_horizontal"
+ android:gravity="center_horizontal" />
+ </LinearLayout>
+
+ </LinearLayout>
+
+ </LinearLayout>
+
+</android.support.v7.widget.CardView>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/db0ba8b1/app/src/main/res/layout/fragment_dashboard_main.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/layout/fragment_dashboard_main.xml b/app/src/main/res/layout/fragment_dashboard_main.xml
index abb8812..5627944 100644
--- a/app/src/main/res/layout/fragment_dashboard_main.xml
+++ b/app/src/main/res/layout/fragment_dashboard_main.xml
@@ -14,25 +14,25 @@ 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"
+ android:layout_height="match_parent"
tools:context="org.apache.taverna.mobile.activities.DashboardMainActivity$PlaceholderFragment"
- android:orientation="vertical">
+ android:orientation="vertical"
+ android:padding="2dp">
+ <android.support.v7.widget.RecyclerView
+ xmlns:recycler_view="http://schemas.android.com/apk/res-auto"
+ android:id="@android:id/list"
+ android:theme="@style/Theme.AppCompat.Light"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@color/button_material_light">
- <RadioButton
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="New RadioButton"
- android:id="@+id/radioButton"
- android:layout_gravity="center_horizontal" />
+ </android.support.v7.widget.RecyclerView>
- <Button
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="New Button"
- android:id="@+id/button"
- android:layout_gravity="center_horizontal" />
+ <TextView android:id="@android:id/empty"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:gravity="center"
+ android:visibility="gone"
+ android:text="@string/favorite_empty"/>
</LinearLayout>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/db0ba8b1/app/src/main/res/layout/fragment_item_list.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/layout/fragment_item_list.xml b/app/src/main/res/layout/fragment_item_list.xml
index 5889156..d6050f1 100644
--- a/app/src/main/res/layout/fragment_item_list.xml
+++ b/app/src/main/res/layout/fragment_item_list.xml
@@ -34,6 +34,8 @@ limitations under the License.
<TextView android:id="@android:id/empty"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:gravity="center" />
+ android:gravity="center"
+ android:visibility="gone"
+ android:text="@string/workflow_empty"/>
</FrameLayout>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/db0ba8b1/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 d5d242a..e0fac85 100644
--- a/app/src/main/res/layout/workflow_item_layout.xml
+++ b/app/src/main/res/layout/workflow_item_layout.xml
@@ -23,7 +23,7 @@ limitations under the License.
xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
- card_view:cardElevation="@dimen/abc_text_size_caption_material"
+ card_view:cardElevation="@dimen/abc_text_size_menu_material"
card_view:cardBackgroundColor="@color/background_floating_material_light"
card_view:cardCornerRadius="2dp"
card_view:paddingEnd="2dp"
@@ -46,7 +46,8 @@ limitations under the License.
android:elevation="5dp"
android:src="@drawable/ic_userprofile"
android:background="@drawable/round_shape"/>
- <LinearLayout
+
+ <LinearLayout
android:id="@+id/linearlayout_workflow_info"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -57,7 +58,38 @@ limitations under the License.
android:layout_height="wrap_content"
android:text="@string/workflow_authorhint"/>
- </LinearLayout>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textAppearance="?android:attr/textAppearanceLarge"
+ android:text="Large Text"
+ android:id="@+id/workflow_datecreated" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textAppearance="?android:attr/textAppearanceLarge"
+ android:text="Large Text"
+ android:id="@+id/workflow_dateupdated"
+ android:layout_gravity="center_vertical" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textAppearance="?android:attr/textAppearanceLarge"
+ android:text="Large Text"
+ android:id="@+id/workflow_title" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textAppearance="?android:attr/textAppearanceLarge"
+ android:text="See more"
+ android:id="@+id/show_more"
+ android:typeface="serif"
+ android:background="@color/material_deep_teal_200" />
+
+ </LinearLayout>
</LinearLayout>
<ImageView
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/db0ba8b1/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 c641713..db35b82 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -54,5 +54,12 @@ limitations under the License.
<string name="workflow_read">View</string>
<string name="workflow_mark">Favorite</string>
<string name="workflow_authorhint">Workflow Author</string>
+ <string name="workflow_component">Workflow component</string>
+ <string name="favorite_empty"> No Favorites Added Yet</string>
+ <string name="workflow_empty"> No <b>Workflows</b> Available. Check your Connection to the Internet</string>
+ <string name="wktitle">TITLE</string>
+ <string name="marked">Marked On</string>
+ <string name="created">Workflow Created On:</string>
+ <string name="modified">Modified On:</string>
</resources>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/db0ba8b1/build/intermediates/model_data.bin
----------------------------------------------------------------------
diff --git a/build/intermediates/model_data.bin b/build/intermediates/model_data.bin
index 91d42b3..747b9ec 100644
Binary files a/build/intermediates/model_data.bin and b/build/intermediates/model_data.bin differ