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:17 UTC
[55/64] [abbrv] incubator-taverna-mobile git commit: Added material
design and sample data for visualisation.
Added material design and sample data for visualisation.
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/commit/95c5ba52
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/95c5ba52
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/95c5ba52
Branch: refs/heads/master
Commit: 95c5ba527adeff18fdd9442aff9c77f9cd1bbbe8
Parents: 51a7277
Author: larrytech7 <la...@gmail.com>
Authored: Mon Jun 8 22:33:31 2015 +0100
Committer: larrytech7 <la...@gmail.com>
Committed: Mon Jun 8 22:33:31 2015 +0100
----------------------------------------------------------------------
.../mobile/adapters/FavoriteAdapter.java | 7 +++
.../mobile/fragments/WorkflowItemFragment.java | 12 +----
.../mobile/fragments/dummy/DummyContent.java | 55 --------------------
.../main/res/layout/workflow_item_layout.xml | 14 +++--
4 files changed, 14 insertions(+), 74 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/95c5ba52/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
new file mode 100644
index 0000000..ce2fce1
--- /dev/null
+++ b/app/src/main/java/org/apache/taverna/mobile/adapters/FavoriteAdapter.java
@@ -0,0 +1,7 @@
+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/95c5ba52/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 0744eb3..5c38316 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
@@ -3,24 +3,18 @@ package org.apache.taverna.mobile.fragments;
import android.app.Activity;
import android.os.Bundle;
import android.support.v4.app.Fragment;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.ActionBarActivity;
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.AbsListView;
import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
import android.widget.ListAdapter;
import android.widget.TextView;
import org.apache.taverna.mobile.R;
-
import org.apache.taverna.mobile.activities.DashboardMainActivity;
import org.apache.taverna.mobile.adapters.WorkflowAdapter;
-import org.apache.taverna.mobile.fragments.dummy.DummyContent;
import org.apache.taverna.mobile.utils.Workflow;
/**
@@ -84,10 +78,6 @@ public class WorkflowItemFragment extends Fragment implements AdapterView.OnItem
mParam2 = getArguments().getString(ARG_PARAM2);
}
- // TODO: Change Adapter to display your content
- mAdapter =
- new ArrayAdapter<DummyContent.DummyItem>(getActivity(),
- android.R.layout.simple_list_item_1, android.R.id.text1, DummyContent.ITEMS);
workflowAdapter = new WorkflowAdapter(getActivity(), new Workflow[]{new Workflow(getActivity(), null),
new Workflow(getActivity(), null),
new Workflow(getActivity(), null)});
@@ -131,7 +121,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(DummyContent.ITEMS.get(position).id);
+ mListener.onWorkflowSelected("");
}
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/95c5ba52/app/src/main/java/org/apache/taverna/mobile/fragments/dummy/DummyContent.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/fragments/dummy/DummyContent.java b/app/src/main/java/org/apache/taverna/mobile/fragments/dummy/DummyContent.java
deleted file mode 100644
index 665ccaf..0000000
--- a/app/src/main/java/org/apache/taverna/mobile/fragments/dummy/DummyContent.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.apache.taverna.mobile.fragments.dummy;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Helper class for providing sample content for user interfaces created by
- * Android template wizards.
- * <p/>
- * TODO: Replace all uses of this class before publishing your app.
- */
-public class DummyContent {
-
- /**
- * An array of sample (dummy) items.
- */
- public static List<DummyItem> ITEMS = new ArrayList<DummyItem>();
-
- /**
- * A map of sample (dummy) items, by ID.
- */
- public static Map<String, DummyItem> ITEM_MAP = new HashMap<String, DummyItem>();
-
- static {
- // Add 3 sample items.
- addItem(new DummyItem("1", "Item 1"));
- addItem(new DummyItem("2", "Item 2"));
- addItem(new DummyItem("3", "Item 3"));
- }
-
- private static void addItem(DummyItem item) {
- ITEMS.add(item);
- ITEM_MAP.put(item.id, item);
- }
-
- /**
- * A dummy item representing a piece of content.
- */
- public static class DummyItem {
- public String id;
- public String content;
-
- public DummyItem(String id, String content) {
- this.id = id;
- this.content = content;
- }
-
- @Override
- public String toString() {
- return content;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/95c5ba52/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 7b0a2b0..5ffe2d9 100644
--- a/app/src/main/res/layout/workflow_item_layout.xml
+++ b/app/src/main/res/layout/workflow_item_layout.xml
@@ -56,31 +56,29 @@
android:layout_height="wrap_content"
android:textStyle="normal"
android:layout_weight="0.33"
- android:background="#ccc"
style="android:buttonBarButtonStyle"
- android:drawableLeft="@drawable/ic_viewworkflow"
android:text="@string/workflow_read"
- />
+ android:background="#ddd"
+ android:drawableLeft="@android:drawable/ic_menu_view" />
<Button
android:id="@+id/button_download_workflow"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textStyle="normal"
android:layout_weight="0.33"
- android:background="#ccc"
+ android:background="#ddd"
style="android:buttonBarButtonStyle"
android:text="@string/workflow_download"
- android:drawableLeft="@drawable/ic_downloadworkflow"
- />
+ android:drawableLeft="@android:drawable/ic_dialog_dialer" />
<Button
android:id="@+id/button_mark_workflow"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textStyle="normal"
android:layout_weight="0.33"
- android:background="#ccc"
+ android:background="#ddd"
android:text="@string/workflow_mark"
- android:drawableLeft="@drawable/ic_markworkflow_selected"
+ android:drawableLeft="@android:drawable/btn_star_big_off"
style="android:buttonBarButtonStyle"/>
</LinearLayout>
</LinearLayout>