You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by ia...@apache.org on 2016/07/14 16:04:52 UTC
[01/21] incubator-taverna-mobile git commit: reposition favourite
workflows to navigation drawer menu
Repository: incubator-taverna-mobile
Updated Branches:
refs/heads/master d73dc2005 -> a90f32eb1
reposition favourite workflows to navigation drawer menu
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/77b4704e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/77b4704e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/77b4704e
Branch: refs/heads/master
Commit: 77b4704e5ab8a9ec0dc0c7e6441c378e0bc10fb9
Parents: d73dc20
Author: Sagar <ku...@gmail.com>
Authored: Fri Jul 8 22:35:37 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Fri Jul 8 22:35:37 2016 +0530
----------------------------------------------------------------------
.../mobile/activities/DashboardMainActivity.java | 19 +++++++++++++++++--
app/src/main/res/menu/drawer_view.xml | 8 +++++++-
2 files changed, 24 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/77b4704e/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 6ec84d8..ad31a28 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
@@ -26,8 +26,10 @@ package org.apache.taverna.mobile.activities;
*/
import org.apache.taverna.mobile.R;
+import org.apache.taverna.mobile.fragments.FavoriteFragment;
import org.apache.taverna.mobile.fragments.WorkflowViewpager;
import org.apache.taverna.mobile.ui.anouncements.AnnouncementFragment;
+import org.apache.taverna.mobile.ui.workflow.WorkflowFragment;
import org.apache.taverna.mobile.utils.WorkflowOpen;
import android.app.Dialog;
@@ -116,9 +118,9 @@ public class DashboardMainActivity extends AppCompatActivity {
Fragment fragment;
switch (menuItem.getItemId()) {
- case R.id.nav_dashboard:
+ case R.id.nav_workflows:
- fragment = new WorkflowViewpager();
+ fragment = new WorkflowFragment();
fragmentManager.beginTransaction()
.replace(R.id.frame_container, fragment)
.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_CLOSE)
@@ -127,6 +129,19 @@ public class DashboardMainActivity extends AppCompatActivity {
menuItem.setChecked(true);
mDrawerLayout.closeDrawers();
return true;
+
+ case R.id.nav_favourite_workflow:
+
+ fragment = new FavoriteFragment();
+ fragmentManager.beginTransaction()
+ .replace(R.id.frame_container, fragment)
+ .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_CLOSE)
+ .commit();
+
+ menuItem.setChecked(true);
+ mDrawerLayout.closeDrawers();
+ return true;
+
case R.id.nav_announcement:
fragment = new AnnouncementFragment();
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/77b4704e/app/src/main/res/menu/drawer_view.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/menu/drawer_view.xml b/app/src/main/res/menu/drawer_view.xml
index f56e06d..47b451b 100644
--- a/app/src/main/res/menu/drawer_view.xml
+++ b/app/src/main/res/menu/drawer_view.xml
@@ -18,9 +18,15 @@
<group android:checkableBehavior="single">
<item
- android:id="@+id/nav_dashboard"
+ android:id="@+id/nav_workflows"
android:icon="@drawable/ic_dashboard_home_web"
android:title="Workflows"/>
+
+ <item
+ android:id="@+id/nav_favourite_workflow"
+ android:icon="@drawable/ic_star_black_24dp"
+ android:title="Favourite Workflows"/>
+
<item
android:id="@+id/nav_openworkflow"
android:icon="@drawable/ic_openwk_web"
[17/21] incubator-taverna-mobile git commit: replace Fragment
Transaction by fragment transaction function in util
Posted by ia...@apache.org.
replace Fragment Transaction by fragment transaction function in util
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/8bc9a980
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/8bc9a980
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/8bc9a980
Branch: refs/heads/master
Commit: 8bc9a9802f18473187d8e3b24a4d7514114d5589
Parents: bafa7a7
Author: Sagar <ku...@gmail.com>
Authored: Tue Jul 12 19:38:02 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Tue Jul 12 19:38:02 2016 +0530
----------------------------------------------------------------------
.../activities/DashboardMainActivity.java | 40 ++++++++++----------
1 file changed, 21 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/8bc9a980/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 e79a0f5..75cff20 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
@@ -29,6 +29,7 @@ import org.apache.taverna.mobile.R;
import org.apache.taverna.mobile.ui.anouncements.AnnouncementFragment;
import org.apache.taverna.mobile.ui.favouriteworkflow.FavouriteWorkflowsFragment;
import org.apache.taverna.mobile.ui.workflow.WorkflowFragment;
+import org.apache.taverna.mobile.utils.ActivityUtils;
import org.apache.taverna.mobile.utils.WorkflowOpen;
import android.app.Dialog;
@@ -122,17 +123,17 @@ public class DashboardMainActivity extends AppCompatActivity {
public boolean onNavigationItemSelected(MenuItem menuItem) {
- FragmentManager fragmentManager = getSupportFragmentManager();
Fragment fragment;
switch (menuItem.getItemId()) {
case R.id.nav_workflows:
fragment = new WorkflowFragment();
- fragmentManager.beginTransaction()
- .replace(R.id.frame_container, fragment)
- .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_CLOSE)
- .commit();
+ ActivityUtils
+ .addFragmentToActivity(
+ getSupportFragmentManager(),
+ fragment,
+ R.id.frame_container);
menuItem.setChecked(true);
mDrawerLayout.closeDrawers();
@@ -141,11 +142,11 @@ public class DashboardMainActivity extends AppCompatActivity {
case R.id.nav_favourite_workflow:
fragment = new FavouriteWorkflowsFragment();
- fragmentManager.beginTransaction()
- .replace(R.id.frame_container, fragment)
- .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_CLOSE)
- .commit();
-
+ ActivityUtils
+ .addFragmentToActivity(
+ getSupportFragmentManager(),
+ fragment,
+ R.id.frame_container);
menuItem.setChecked(true);
mDrawerLayout.closeDrawers();
return true;
@@ -153,10 +154,11 @@ public class DashboardMainActivity extends AppCompatActivity {
case R.id.nav_announcement:
fragment = new AnnouncementFragment();
- fragmentManager.beginTransaction()
- .replace(R.id.frame_container, fragment)
- .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_CLOSE)
- .commit();
+ ActivityUtils
+ .addFragmentToActivity(
+ getSupportFragmentManager(),
+ fragment,
+ R.id.frame_container);
menuItem.setChecked(true);
mDrawerLayout.closeDrawers();
@@ -167,11 +169,11 @@ public class DashboardMainActivity extends AppCompatActivity {
Intent workflowSelectIntent =
new Intent(Intent.ACTION_GET_CONTENT)
.setDataAndTypeAndNormalize(
- Uri.parse(String.format("%s%s%s",
- Environment.getExternalStorageDirectory(),
- File.separator,
- APP_DIRECTORY_NAME)),
- "application/vnd.taverna.t2flow+xml");
+ Uri.parse(String.format("%s%s%s",
+ Environment.getExternalStorageDirectory(),
+ File.separator,
+ APP_DIRECTORY_NAME)),
+ "application/vnd.taverna.t2flow+xml");
Intent loadWorkflowIntent = Intent.createChooser
(workflowSelectIntent,
[20/21] incubator-taverna-mobile git commit: rename
ShowNoWorkflowError -> ShowEmptyWorkflow
Posted by ia...@apache.org.
rename ShowNoWorkflowError -> ShowEmptyWorkflow
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/20fa6c76
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/20fa6c76
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/20fa6c76
Branch: refs/heads/master
Commit: 20fa6c768038d74dd20644f7f01860da9c52776a
Parents: 3c9f48a
Author: Sagar <ku...@gmail.com>
Authored: Tue Jul 12 19:42:57 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Tue Jul 12 19:42:57 2016 +0530
----------------------------------------------------------------------
.../mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java | 2 +-
.../mobile/ui/favouriteworkflow/FavouriteWorkflowsMvpView.java | 2 +-
.../mobile/ui/favouriteworkflow/FavouriteWorkflowsPresenter.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/20fa6c76/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
index 16e34e9..18ff017 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
@@ -126,7 +126,7 @@ public class FavouriteWorkflowsFragment extends Fragment implements FavouriteWor
}
@Override
- public void showNoWorkflowError() {
+ public void showEmptyWorkflow() {
tvNoWorkflowError.setVisibility(View.VISIBLE);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/20fa6c76/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsMvpView.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsMvpView.java b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsMvpView.java
index 678f8b4..57d259d 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsMvpView.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsMvpView.java
@@ -32,5 +32,5 @@ public interface FavouriteWorkflowsMvpView extends MvpView {
void showWorkflows(List<Workflow> workflowList);
- void showNoWorkflowError();
+ void showEmptyWorkflow();
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/20fa6c76/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsPresenter.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsPresenter.java b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsPresenter.java
index 498fa9c..ba3655b 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsPresenter.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsPresenter.java
@@ -73,7 +73,7 @@ public class FavouriteWorkflowsPresenter extends BasePresenter<FavouriteWorkflow
if (workflowList.size() != 0) {
getMvpView().showWorkflows(workflowList);
} else {
- getMvpView().showNoWorkflowError();
+ getMvpView().showEmptyWorkflow();
}
}
});
[03/21] incubator-taverna-mobile git commit: add favourite workflow
list item layout xml
Posted by ia...@apache.org.
add favourite workflow list item layout xml
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/1e66e3bf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/1e66e3bf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/1e66e3bf
Branch: refs/heads/master
Commit: 1e66e3bfedb22ec8f54a9cdd8eefdd370df01acd
Parents: 021d7aa
Author: Sagar <ku...@gmail.com>
Authored: Sat Jul 9 23:08:45 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Sat Jul 9 23:08:45 2016 +0530
----------------------------------------------------------------------
...tem_recyclerview_favourite_workflow_list.xml | 77 ++++++++++++++++++++
1 file changed, 77 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/1e66e3bf/app/src/main/res/layout/item_recyclerview_favourite_workflow_list.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/layout/item_recyclerview_favourite_workflow_list.xml b/app/src/main/res/layout/item_recyclerview_favourite_workflow_list.xml
new file mode 100644
index 0000000..9fe6384
--- /dev/null
+++ b/app/src/main/res/layout/item_recyclerview_favourite_workflow_list.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v7.widget.CardView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_margin="5dp"
+ android:layout_height="250dp"
+ app:cardCornerRadius="5dp"
+ app:cardElevation="1dp">
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+ <ImageView
+ android:id="@+id/ivWorkflowImage"
+ android:layout_width="match_parent"
+ android:layout_height="300dp"
+ android:scaleType="fitXY"
+ android:src="@drawable/sliding_header"/>
+ <TextView
+ android:background="@color/black_background"
+ android:id="@+id/tvUploader"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignBottom="@id/ivWorkflowImage"
+ android:text="Uploader"
+ android:paddingLeft="10dp"
+ android:paddingStart="10dp"
+ android:paddingRight="0dp"
+ android:paddingEnd="0dp"
+ android:paddingBottom="5dp"
+ android:textSize="14sp"
+ android:textColor="@android:color/white"/>
+ <TextView
+ android:background="@color/black_background"
+ android:id="@+id/tvDate"
+ android:layout_above="@id/tvUploader"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="date"
+ android:paddingLeft="10dp"
+ android:paddingStart="10dp"
+ android:paddingRight="0dp"
+ android:paddingEnd="0dp"
+ android:paddingBottom="5dp"
+ android:textSize="14sp"
+ android:textColor="@android:color/white"/>
+ <TextView
+ android:background="@color/black_background"
+ android:id="@+id/tvType"
+ android:layout_above="@id/tvDate"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="type"
+ android:paddingLeft="10dp"
+ android:paddingStart="10dp"
+ android:paddingRight="0dp"
+ android:paddingEnd="0dp"
+ android:paddingBottom="5dp"
+ android:textSize="16sp"
+ android:textColor="@android:color/white"/>
+ <TextView
+ android:background="@color/black_background"
+ android:id="@+id/tvTitle"
+ android:layout_above="@id/tvType"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="type"
+ android:paddingLeft="10dp"
+ android:paddingStart="10dp"
+ android:paddingRight="0dp"
+ android:paddingEnd="0dp"
+ android:paddingBottom="5dp"
+ android:textSize="18sp"
+ android:textColor="@android:color/white"/>
+ </RelativeLayout>
+</android.support.v7.widget.CardView>
\ No newline at end of file
[02/21] incubator-taverna-mobile git commit: add favourite workflow
list fragment layout xml
Posted by ia...@apache.org.
add favourite workflow list fragment layout xml
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/021d7aac
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/021d7aac
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/021d7aac
Branch: refs/heads/master
Commit: 021d7aac56dbf6653323f30ad260c56e883a490a
Parents: 77b4704
Author: Sagar <ku...@gmail.com>
Authored: Sat Jul 9 22:51:23 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Sat Jul 9 22:51:23 2016 +0530
----------------------------------------------------------------------
.../layout/fragment_favourite_workflow_list.xml | 23 ++++++++++++++++++++
1 file changed, 23 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/021d7aac/app/src/main/res/layout/fragment_favourite_workflow_list.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/layout/fragment_favourite_workflow_list.xml b/app/src/main/res/layout/fragment_favourite_workflow_list.xml
new file mode 100644
index 0000000..e1a4c9a
--- /dev/null
+++ b/app/src/main/res/layout/fragment_favourite_workflow_list.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@color/grey_background">
+
+ <android.support.v7.widget.RecyclerView
+ android:id="@+id/rv_workflows"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:clipToPadding="false"
+ android:padding="@dimen/item_offset"
+ android:visibility="gone"/>
+
+ <ProgressBar
+ android:id="@+id/progress_circular"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerHorizontal="true"
+ android:layout_centerVertical="true"
+ android:visibility="visible"/>
+</RelativeLayout>
\ No newline at end of file
[13/21] incubator-taverna-mobile git commit: add NO Favourite
workflow error logic in UI
Posted by ia...@apache.org.
add NO Favourite workflow error logic in UI
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/84d40fda
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/84d40fda
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/84d40fda
Branch: refs/heads/master
Commit: 84d40fda9bc7718355296c727d62890ae3a6e288
Parents: bde1377
Author: Sagar <ku...@gmail.com>
Authored: Sun Jul 10 00:42:11 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Sun Jul 10 00:42:11 2016 +0530
----------------------------------------------------------------------
.../mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/84d40fda/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
index 0af0101..4447351 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
@@ -16,6 +16,7 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ProgressBar;
+import android.widget.TextView;
import java.util.List;
@@ -32,6 +33,8 @@ public class FavouriteWorkflowsFragment extends Fragment implements FavouriteWor
@BindView(R.id.progress_circular)
ProgressBar mProgressBar;
+ @BindView(R.id.error_no_workflow)
+ TextView tvNoWorkflowError;
private DataManager dataManager;
private FavouriteWorkflowsPresenter mFavouriteWorkflowsPresenter;
@@ -104,6 +107,6 @@ public class FavouriteWorkflowsFragment extends Fragment implements FavouriteWor
@Override
public void showNoWorkflowError() {
-
+ tvNoWorkflowError.setVisibility(View.VISIBLE);
}
}
[19/21] incubator-taverna-mobile git commit: comment debug log in
adapter
Posted by ia...@apache.org.
comment debug log in adapter
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/3c9f48aa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/3c9f48aa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/3c9f48aa
Branch: refs/heads/master
Commit: 3c9f48aa6520ad04e245f406abe4aa19dc9aed15
Parents: 8383afb
Author: Sagar <ku...@gmail.com>
Authored: Tue Jul 12 19:41:48 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Tue Jul 12 19:41:48 2016 +0530
----------------------------------------------------------------------
.../taverna/mobile/ui/adapter/FavouriteWorkflowsAdapter.java | 3 +--
.../org/apache/taverna/mobile/ui/adapter/WorkflowAdapter.java | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/3c9f48aa/app/src/main/java/org/apache/taverna/mobile/ui/adapter/FavouriteWorkflowsAdapter.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/adapter/FavouriteWorkflowsAdapter.java b/app/src/main/java/org/apache/taverna/mobile/ui/adapter/FavouriteWorkflowsAdapter.java
index 4bdb0d5..5c8d0ee 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/adapter/FavouriteWorkflowsAdapter.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/adapter/FavouriteWorkflowsAdapter.java
@@ -9,7 +9,6 @@ import org.apache.taverna.mobile.data.model.Workflow;
import android.content.Context;
import android.net.Uri;
import android.support.v7.widget.RecyclerView;
-import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -79,7 +78,7 @@ public class FavouriteWorkflowsAdapter extends RecyclerView.Adapter<RecyclerView
@Override
public int getItemCount() {
- Log.d(TAG, "getItemCount: " + mWorkflowList.size());
+ //Log.d(TAG, "getItemCount: " + mWorkflowList.size());
return mWorkflowList.size();
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/3c9f48aa/app/src/main/java/org/apache/taverna/mobile/ui/adapter/WorkflowAdapter.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/adapter/WorkflowAdapter.java b/app/src/main/java/org/apache/taverna/mobile/ui/adapter/WorkflowAdapter.java
index 66c70dc..82ca86b 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/adapter/WorkflowAdapter.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/adapter/WorkflowAdapter.java
@@ -9,7 +9,6 @@ import org.apache.taverna.mobile.data.model.Workflow;
import android.content.Context;
import android.net.Uri;
import android.support.v7.widget.RecyclerView;
-import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -90,7 +89,7 @@ public class WorkflowAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
@Override
public int getItemCount() {
- Log.d(TAG, "getItemCount: " + mWorkflowList.size());
+ //Log.d(TAG, "getItemCount: " + mWorkflowList.size());
return mWorkflowList.size();
}
[11/21] incubator-taverna-mobile git commit: add toolbar and remove
viewpager from onCreate
Posted by ia...@apache.org.
add toolbar and remove viewpager from onCreate
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/fae286a5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/fae286a5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/fae286a5
Branch: refs/heads/master
Commit: fae286a5f9e0b7389862acac695c54104c64e72c
Parents: 7c00a86
Author: Sagar <ku...@gmail.com>
Authored: Sun Jul 10 00:31:44 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Sun Jul 10 00:31:44 2016 +0530
----------------------------------------------------------------------
.../activities/DashboardMainActivity.java | 20 +++++---
.../main/res/layout/activity_dashboard_main.xml | 53 ++++++++++----------
2 files changed, 41 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/fae286a5/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 ad31a28..6e9cb77 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
@@ -26,9 +26,8 @@ package org.apache.taverna.mobile.activities;
*/
import org.apache.taverna.mobile.R;
-import org.apache.taverna.mobile.fragments.FavoriteFragment;
-import org.apache.taverna.mobile.fragments.WorkflowViewpager;
import org.apache.taverna.mobile.ui.anouncements.AnnouncementFragment;
+import org.apache.taverna.mobile.ui.favouriteworkflow.FavouriteWorkflowsFragment;
import org.apache.taverna.mobile.ui.workflow.WorkflowFragment;
import org.apache.taverna.mobile.utils.WorkflowOpen;
@@ -48,6 +47,7 @@ import android.support.v4.view.GravityCompat;
import android.support.v4.widget.DrawerLayout;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
import android.view.Menu;
import android.view.MenuItem;
import android.webkit.MimeTypeMap;
@@ -83,6 +83,16 @@ public class DashboardMainActivity extends AppCompatActivity {
setUpWorkflowDirectory(this);
aboutDialog = new Dialog(this);
+ Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+ setSupportActionBar(toolbar);
+
+ final ActionBar ab = getSupportActionBar();
+ if(ab !=null) {
+ ab.setHomeAsUpIndicator(R.drawable.ic_menu);
+ ab.setDisplayHomeAsUpEnabled(true);
+ }
+
+
/**
* Setting the Fragment in FrameLayout
*/
@@ -91,13 +101,11 @@ public class DashboardMainActivity extends AppCompatActivity {
FragmentManager fragmentManager = getSupportFragmentManager();
Fragment fragment;
- fragment = new WorkflowViewpager();
+ fragment = new WorkflowFragment();
fragmentManager.beginTransaction()
.replace(R.id.frame_container, fragment)
.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_CLOSE)
.commit();
-
-
}
}
@@ -132,7 +140,7 @@ public class DashboardMainActivity extends AppCompatActivity {
case R.id.nav_favourite_workflow:
- fragment = new FavoriteFragment();
+ fragment = new FavouriteWorkflowsFragment();
fragmentManager.beginTransaction()
.replace(R.id.frame_container, fragment)
.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_CLOSE)
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/fae286a5/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 a6fd6a5..54982fc 100644
--- a/app/src/main/res/layout/activity_dashboard_main.xml
+++ b/app/src/main/res/layout/activity_dashboard_main.xml
@@ -14,34 +14,35 @@ limitations under the License.
-->
<!-- A DrawerLayout is intended to be used as the top-level content view using match_parent for both width and height to consume the full space available. -->
<android.support.v4.widget.DrawerLayout
- android:id="@+id/drawer_layout"
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- >
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:id="@+id/drawer_layout"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+>
- <LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical">
+ <LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+ <include
+ layout="@layout/appbar"/>
+ <FrameLayout
+ android:id="@+id/frame_container"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"/>
- <FrameLayout
- android:id="@+id/frame_container"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1"/>
+ </LinearLayout>
- </LinearLayout>
-
- <android.support.design.widget.NavigationView
- android:id="@+id/nav_view"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:layout_gravity="start"
- android:fitsSystemWindows="true"
- app:headerLayout="@layout/nav_header"
- app:menu="@menu/drawer_view"/>
+ <android.support.design.widget.NavigationView
+ android:id="@+id/nav_view"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_gravity="start"
+ android:fitsSystemWindows="true"
+ app:headerLayout="@layout/nav_header"
+ app:menu="@menu/drawer_view"/>
</android.support.v4.widget.DrawerLayout>
[07/21] incubator-taverna-mobile git commit: add favourite workflow
list recyclerview adapter
Posted by ia...@apache.org.
add favourite workflow list recyclerview adapter
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/dc880ac9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/dc880ac9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/dc880ac9
Branch: refs/heads/master
Commit: dc880ac97d4d1f46b09c8514ce8c331b9bec15f1
Parents: 3c7f4c1
Author: Sagar <ku...@gmail.com>
Authored: Sat Jul 9 23:54:49 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Sat Jul 9 23:54:49 2016 +0530
----------------------------------------------------------------------
.../ui/adapter/FavouriteWorkflowsAdapter.java | 117 +++++++++++++++++++
1 file changed, 117 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/dc880ac9/app/src/main/java/org/apache/taverna/mobile/ui/adapter/FavouriteWorkflowsAdapter.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/adapter/FavouriteWorkflowsAdapter.java b/app/src/main/java/org/apache/taverna/mobile/ui/adapter/FavouriteWorkflowsAdapter.java
new file mode 100644
index 0000000..93431ba
--- /dev/null
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/adapter/FavouriteWorkflowsAdapter.java
@@ -0,0 +1,117 @@
+package org.apache.taverna.mobile.ui.adapter;
+
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
+
+import org.apache.taverna.mobile.R;
+import org.apache.taverna.mobile.data.model.Workflow;
+
+import android.content.Context;
+import android.net.Uri;
+import android.support.v7.widget.RecyclerView;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+public class FavouriteWorkflowsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+
+ private static final String TAG = FavouriteWorkflowsAdapter.class.getName();
+
+ private final List<Workflow> mWorkflowList;
+
+ private final Context context;
+
+ public FavouriteWorkflowsAdapter(List<Workflow> mWorkflowList, Context context) {
+ this.mWorkflowList = mWorkflowList;
+ this.context = context;
+
+ }
+
+ public void addWorkflow(Workflow workflow) {
+ this.mWorkflowList.add(workflow);
+ this.notifyDataSetChanged();
+
+ }
+
+ @Override
+ public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+ RecyclerView.ViewHolder vh;
+
+ View v = LayoutInflater.from(parent.getContext()).inflate(
+ R.layout.item_recyclerview_favourite_workflow_list, parent, false);
+ vh = new ViewHolder(v);
+
+ return vh;
+ }
+
+ @Override
+ public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
+ if (holder instanceof ViewHolder) {
+
+ Workflow workflow = mWorkflowList.get(position);
+ String date = workflow.getCreatedAt()
+ .substring(0, workflow.getCreatedAt().indexOf(' '));
+
+ String title = workflow.getTitle().substring(0,
+ Math.min(workflow.getTitle().length(), 50));
+
+ if (workflow.getTitle().length() > 50) {
+ title = title + " ... ";
+ }
+
+ ((ViewHolder) holder).tvDate.setText(date);
+ ((ViewHolder) holder).tvTitle.setText(title);
+ ((ViewHolder) holder).tvType.setText(workflow.getType().getContent());
+ ((ViewHolder) holder).tvUploader.setText(workflow.getUploader().getContent());
+
+ Uri uri = Uri.parse(workflow.getPreviewUri());
+
+ Glide.with(context)
+ .load(uri)
+ .diskCacheStrategy(DiskCacheStrategy.SOURCE)
+ .placeholder(R.drawable.placeholder)
+ .error(R.drawable.placeholder)
+ .into(((ViewHolder) holder).ivWorkflowImage);
+ }
+ }
+
+ @Override
+ public int getItemCount() {
+ Log.d(TAG, "getItemCount: " + mWorkflowList.size());
+ return mWorkflowList.size();
+ }
+
+
+ class ViewHolder extends RecyclerView.ViewHolder {
+
+ @BindView(R.id.tvDate)
+ TextView tvDate;
+
+ @BindView(R.id.tvTitle)
+ TextView tvTitle;
+
+ @BindView(R.id.tvType)
+ TextView tvType;
+
+ @BindView(R.id.tvUploader)
+ TextView tvUploader;
+
+ @BindView(R.id.ivWorkflowImage)
+ ImageView ivWorkflowImage;
+
+ public ViewHolder(View itemView) {
+ super(itemView);
+ ButterKnife.bind(this, itemView);
+
+ }
+ }
+
+}
[16/21] incubator-taverna-mobile git commit: add Activity utils class
Posted by ia...@apache.org.
add Activity utils class
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/bafa7a71
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/bafa7a71
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/bafa7a71
Branch: refs/heads/master
Commit: bafa7a71b4e357ea6ff4a17c6ec4347f645a7d1d
Parents: 1257c51
Author: Sagar <ku...@gmail.com>
Authored: Tue Jul 12 19:37:49 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Tue Jul 12 19:37:49 2016 +0530
----------------------------------------------------------------------
.../taverna/mobile/utils/ActivityUtils.java | 37 ++++++++++++++++++++
1 file changed, 37 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/bafa7a71/app/src/main/java/org/apache/taverna/mobile/utils/ActivityUtils.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/utils/ActivityUtils.java b/app/src/main/java/org/apache/taverna/mobile/utils/ActivityUtils.java
new file mode 100644
index 0000000..c7f68f5
--- /dev/null
+++ b/app/src/main/java/org/apache/taverna/mobile/utils/ActivityUtils.java
@@ -0,0 +1,37 @@
+/*
+ * 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.
+ */
+package org.apache.taverna.mobile.utils;
+
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentTransaction;
+
+public class ActivityUtils {
+
+
+ public static void addFragmentToActivity (FragmentManager fragmentManager,
+ Fragment fragment, int frameId) {
+ FragmentTransaction transaction = fragmentManager.beginTransaction();
+ transaction.replace(frameId, fragment);
+ transaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_CLOSE);
+ transaction.addToBackStack(null);
+ transaction.commit();
+ }
+
+}
\ No newline at end of file
[10/21] incubator-taverna-mobile git commit: add Favourite Workflow
List UI
Posted by ia...@apache.org.
add Favourite Workflow List UI
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/7c00a863
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/7c00a863
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/7c00a863
Branch: refs/heads/master
Commit: 7c00a863f9dcd5038c3fc26172b1bfb29e9c881e
Parents: 1b78a0f
Author: Sagar <ku...@gmail.com>
Authored: Sun Jul 10 00:29:51 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Sun Jul 10 00:29:51 2016 +0530
----------------------------------------------------------------------
.../FavouriteWorkflowsFragment.java | 109 +++++++++++++++++++
.../layout/fragment_favourite_workflow_list.xml | 2 +-
2 files changed, 110 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/7c00a863/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
new file mode 100644
index 0000000..0af0101
--- /dev/null
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
@@ -0,0 +1,109 @@
+package org.apache.taverna.mobile.ui.favouriteworkflow;
+
+
+import org.apache.taverna.mobile.R;
+import org.apache.taverna.mobile.data.DataManager;
+import org.apache.taverna.mobile.data.model.Workflow;
+import org.apache.taverna.mobile.ui.adapter.FavouriteWorkflowsAdapter;
+
+import android.os.Bundle;
+import android.support.design.widget.Snackbar;
+import android.support.v4.app.Fragment;
+import android.support.v7.widget.DefaultItemAnimator;
+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.ProgressBar;
+
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+public class FavouriteWorkflowsFragment extends Fragment implements FavouriteWorkflowsMvpView {
+
+ public final String LOG_TAG = getClass().getSimpleName();
+
+ @BindView(R.id.rv_fav_workflows)
+ RecyclerView mRecyclerView;
+
+ @BindView(R.id.progress_circular)
+ ProgressBar mProgressBar;
+
+ private DataManager dataManager;
+
+ private FavouriteWorkflowsPresenter mFavouriteWorkflowsPresenter;
+
+ private FavouriteWorkflowsAdapter mFavouriteWorkflowsAdapter;
+
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ dataManager = new DataManager();
+
+ mFavouriteWorkflowsPresenter = new FavouriteWorkflowsPresenter(dataManager);
+ }
+
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle
+ savedInstanceState) {
+
+ View rootView = inflater.inflate(R.layout.fragment_favourite_workflow_list, container, false);
+
+ ButterKnife.bind(this, rootView);
+
+ mFavouriteWorkflowsPresenter.attachView(this);
+
+ final LinearLayoutManager layoutManager = new LinearLayoutManager(getActivity());
+
+ mRecyclerView.setLayoutManager(layoutManager);
+ mRecyclerView.setItemAnimator(new DefaultItemAnimator());
+ mRecyclerView.hasFixedSize();
+
+ showProgressbar(true);
+ mFavouriteWorkflowsPresenter.loadAllWorkflow();
+
+ return rootView;
+ }
+
+
+ @Override
+ public void showProgressbar(boolean b) {
+ if (b) {
+ mProgressBar.setVisibility(View.VISIBLE);
+ } else {
+ mProgressBar.setVisibility(View.GONE);
+ mRecyclerView.setVisibility(View.VISIBLE);
+ }
+ }
+
+ @Override
+ public void showErrorSnackBar() {
+ final Snackbar snackbar = Snackbar.make(mRecyclerView, "Error occurred.Please try after some time", Snackbar
+ .LENGTH_INDEFINITE);
+ snackbar.setAction("OK", new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ snackbar.dismiss();
+ }
+ });
+
+ snackbar.show();
+ }
+
+ @Override
+ public void showWorkflows(List<Workflow> workflowList) {
+
+ mFavouriteWorkflowsAdapter = new FavouriteWorkflowsAdapter(workflowList, getContext());
+ mRecyclerView.setAdapter(mFavouriteWorkflowsAdapter);
+ }
+
+ @Override
+ public void showNoWorkflowError() {
+
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/7c00a863/app/src/main/res/layout/fragment_favourite_workflow_list.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/layout/fragment_favourite_workflow_list.xml b/app/src/main/res/layout/fragment_favourite_workflow_list.xml
index e1a4c9a..8d5fef6 100644
--- a/app/src/main/res/layout/fragment_favourite_workflow_list.xml
+++ b/app/src/main/res/layout/fragment_favourite_workflow_list.xml
@@ -6,7 +6,7 @@
android:background="@color/grey_background">
<android.support.v7.widget.RecyclerView
- android:id="@+id/rv_workflows"
+ android:id="@+id/rv_fav_workflows"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
[18/21] incubator-taverna-mobile git commit: add single line in xml
Posted by ia...@apache.org.
add single line in xml
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/8383afbe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/8383afbe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/8383afbe
Branch: refs/heads/master
Commit: 8383afbe1e95c79fa5b248e0486c4c2309821018
Parents: 8bc9a98
Author: Sagar <ku...@gmail.com>
Authored: Tue Jul 12 19:40:56 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Tue Jul 12 19:40:56 2016 +0530
----------------------------------------------------------------------
.../taverna/mobile/ui/adapter/FavouriteWorkflowsAdapter.java | 8 +-------
.../apache/taverna/mobile/ui/adapter/WorkflowAdapter.java | 8 +-------
app/src/main/res/layout/item_recyclerview_dashboard.xml | 2 ++
.../res/layout/item_recyclerview_favourite_workflow_list.xml | 2 ++
4 files changed, 6 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/8383afbe/app/src/main/java/org/apache/taverna/mobile/ui/adapter/FavouriteWorkflowsAdapter.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/adapter/FavouriteWorkflowsAdapter.java b/app/src/main/java/org/apache/taverna/mobile/ui/adapter/FavouriteWorkflowsAdapter.java
index e327534..4bdb0d5 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/adapter/FavouriteWorkflowsAdapter.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/adapter/FavouriteWorkflowsAdapter.java
@@ -60,15 +60,9 @@ public class FavouriteWorkflowsAdapter extends RecyclerView.Adapter<RecyclerView
String date = workflow.getCreatedAt()
.substring(0, workflow.getCreatedAt().indexOf(' '));
- String title = workflow.getTitle().substring(0,
- Math.min(workflow.getTitle().length(), 50));
-
- if (workflow.getTitle().length() > 50) {
- title = title + " ... ";
- }
((ViewHolder) holder).tvDate.setText(date);
- ((ViewHolder) holder).tvTitle.setText(title);
+ ((ViewHolder) holder).tvTitle.setText(workflow.getTitle());
((ViewHolder) holder).tvType.setText(workflow.getType().getContent());
((ViewHolder) holder).tvUploader.setText(workflow.getUploader().getContent());
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/8383afbe/app/src/main/java/org/apache/taverna/mobile/ui/adapter/WorkflowAdapter.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/adapter/WorkflowAdapter.java b/app/src/main/java/org/apache/taverna/mobile/ui/adapter/WorkflowAdapter.java
index 30dff3e..66c70dc 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/adapter/WorkflowAdapter.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/adapter/WorkflowAdapter.java
@@ -71,15 +71,9 @@ public class WorkflowAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
String date = workflow.getCreatedAt()
.substring(0, workflow.getCreatedAt().indexOf(' '));
- String title = workflow.getTitle().substring(0,
- Math.min(workflow.getTitle().length(), 50));
-
- if (workflow.getTitle().length() > 50) {
- title = title + " ... ";
- }
((ViewHolder) holder).tvDate.setText(date);
- ((ViewHolder) holder).tvTitle.setText(title);
+ ((ViewHolder) holder).tvTitle.setText(workflow.getTitle());
((ViewHolder) holder).tvType.setText(workflow.getType().getContent());
((ViewHolder) holder).tvUploader.setText(workflow.getUploader().getContent());
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/8383afbe/app/src/main/res/layout/item_recyclerview_dashboard.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/layout/item_recyclerview_dashboard.xml b/app/src/main/res/layout/item_recyclerview_dashboard.xml
index 88658bd..0785e1b 100644
--- a/app/src/main/res/layout/item_recyclerview_dashboard.xml
+++ b/app/src/main/res/layout/item_recyclerview_dashboard.xml
@@ -87,6 +87,8 @@
android:paddingRight="0dp"
android:paddingEnd="0dp"
android:paddingBottom="5dp"
+ android:singleLine="true"
+ android:ellipsize="end"
android:textSize="18sp"
android:textColor="@android:color/white"/>
</RelativeLayout>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/8383afbe/app/src/main/res/layout/item_recyclerview_favourite_workflow_list.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/layout/item_recyclerview_favourite_workflow_list.xml b/app/src/main/res/layout/item_recyclerview_favourite_workflow_list.xml
index 88658bd..0785e1b 100644
--- a/app/src/main/res/layout/item_recyclerview_favourite_workflow_list.xml
+++ b/app/src/main/res/layout/item_recyclerview_favourite_workflow_list.xml
@@ -87,6 +87,8 @@
android:paddingRight="0dp"
android:paddingEnd="0dp"
android:paddingBottom="5dp"
+ android:singleLine="true"
+ android:ellipsize="end"
android:textSize="18sp"
android:textColor="@android:color/white"/>
</RelativeLayout>
[12/21] incubator-taverna-mobile git commit: add NO Favourite
workflow error textview in xml
Posted by ia...@apache.org.
add NO Favourite workflow error textview in xml
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/bde13771
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/bde13771
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/bde13771
Branch: refs/heads/master
Commit: bde1377179e099d3c58c5f5ed00fb5cbf27ff5b2
Parents: fae286a
Author: Sagar <ku...@gmail.com>
Authored: Sun Jul 10 00:39:38 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Sun Jul 10 00:39:38 2016 +0530
----------------------------------------------------------------------
.../main/res/layout/fragment_favourite_workflow_list.xml | 10 ++++++++++
app/src/main/res/values/strings.xml | 1 +
2 files changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/bde13771/app/src/main/res/layout/fragment_favourite_workflow_list.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/layout/fragment_favourite_workflow_list.xml b/app/src/main/res/layout/fragment_favourite_workflow_list.xml
index 8d5fef6..e7bf0ef 100644
--- a/app/src/main/res/layout/fragment_favourite_workflow_list.xml
+++ b/app/src/main/res/layout/fragment_favourite_workflow_list.xml
@@ -20,4 +20,14 @@
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:visibility="visible"/>
+
+ <TextView
+ android:id="@+id/error_no_workflow"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerInParent="true"
+ android:text="@string/no_favourite_workflow_found"
+ android:textStyle="bold"
+ android:visibility="gone"
+ android:textSize="20sp"/>
</RelativeLayout>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/bde13771/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 a13b6f9..e53dc06 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -112,4 +112,5 @@ limitations under the License.
<string name="announcement">Announcementss</string>
<string name="no_internet">No Internet Connection</string>
<string name="licence">Licence</string>
+ <string name="no_favourite_workflow_found">No Favourite Workflow Found!!!</string>
</resources>
[15/21] incubator-taverna-mobile git commit: remove checkstyle error
Posted by ia...@apache.org.
remove checkstyle error
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/1257c51e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/1257c51e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/1257c51e
Branch: refs/heads/master
Commit: 1257c51eba4b8809ad747ba19d63877e8a1429b0
Parents: 6aca1bd
Author: Sagar <ku...@gmail.com>
Authored: Sun Jul 10 00:55:41 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Sun Jul 10 00:55:41 2016 +0530
----------------------------------------------------------------------
.../taverna/mobile/activities/DashboardMainActivity.java | 6 +++---
.../taverna/mobile/ui/adapter/FavouriteWorkflowsAdapter.java | 6 +++---
.../ui/favouriteworkflow/FavouriteWorkflowsFragment.java | 8 +++++---
.../ui/favouriteworkflow/FavouriteWorkflowsPresenter.java | 4 ++--
4 files changed, 13 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/1257c51e/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 6e9cb77..e79a0f5 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
@@ -87,7 +87,7 @@ public class DashboardMainActivity extends AppCompatActivity {
setSupportActionBar(toolbar);
final ActionBar ab = getSupportActionBar();
- if(ab !=null) {
+ if (ab != null) {
ab.setHomeAsUpIndicator(R.drawable.ic_menu);
ab.setDisplayHomeAsUpEnabled(true);
}
@@ -167,11 +167,11 @@ public class DashboardMainActivity extends AppCompatActivity {
Intent workflowSelectIntent =
new Intent(Intent.ACTION_GET_CONTENT)
.setDataAndTypeAndNormalize(
- Uri.parse(String.format("%s%s%s",
+ Uri.parse(String.format("%s%s%s",
Environment.getExternalStorageDirectory(),
File.separator,
APP_DIRECTORY_NAME)),
- "application/vnd.taverna.t2flow+xml");
+ "application/vnd.taverna.t2flow+xml");
Intent loadWorkflowIntent = Intent.createChooser
(workflowSelectIntent,
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/1257c51e/app/src/main/java/org/apache/taverna/mobile/ui/adapter/FavouriteWorkflowsAdapter.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/adapter/FavouriteWorkflowsAdapter.java b/app/src/main/java/org/apache/taverna/mobile/ui/adapter/FavouriteWorkflowsAdapter.java
index 93431ba..e327534 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/adapter/FavouriteWorkflowsAdapter.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/adapter/FavouriteWorkflowsAdapter.java
@@ -45,9 +45,9 @@ public class FavouriteWorkflowsAdapter extends RecyclerView.Adapter<RecyclerView
public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
RecyclerView.ViewHolder vh;
- View v = LayoutInflater.from(parent.getContext()).inflate(
- R.layout.item_recyclerview_favourite_workflow_list, parent, false);
- vh = new ViewHolder(v);
+ View v = LayoutInflater.from(parent.getContext()).inflate(
+ R.layout.item_recyclerview_favourite_workflow_list, parent, false);
+ vh = new ViewHolder(v);
return vh;
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/1257c51e/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
index 7d4588d..16e34e9 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
@@ -73,7 +73,8 @@ public class FavouriteWorkflowsFragment extends Fragment implements FavouriteWor
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle
savedInstanceState) {
- View rootView = inflater.inflate(R.layout.fragment_favourite_workflow_list, container, false);
+ View rootView = inflater.inflate(R.layout.fragment_favourite_workflow_list,
+ container, false);
ButterKnife.bind(this, rootView);
@@ -104,8 +105,9 @@ public class FavouriteWorkflowsFragment extends Fragment implements FavouriteWor
@Override
public void showErrorSnackBar() {
- final Snackbar snackbar = Snackbar.make(mRecyclerView, "Error occurred.Please try after some time", Snackbar
- .LENGTH_INDEFINITE);
+ final Snackbar snackbar = Snackbar.make(mRecyclerView,
+ "Error occurred.Please try after some time", Snackbar
+ .LENGTH_INDEFINITE);
snackbar.setAction("OK", new View.OnClickListener() {
@Override
public void onClick(View view) {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/1257c51e/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsPresenter.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsPresenter.java b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsPresenter.java
index b46d41e..498fa9c 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsPresenter.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsPresenter.java
@@ -70,9 +70,9 @@ public class FavouriteWorkflowsPresenter extends BasePresenter<FavouriteWorkflow
@Override
public void onNext(List<Workflow> workflowList) {
- if(workflowList.size()!=0) {
+ if (workflowList.size() != 0) {
getMvpView().showWorkflows(workflowList);
- }else{
+ } else {
getMvpView().showNoWorkflowError();
}
}
[06/21] incubator-taverna-mobile git commit: add favourite workflow
list presenter layer
Posted by ia...@apache.org.
add favourite workflow list presenter layer
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/3c7f4c1d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/3c7f4c1d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/3c7f4c1d
Branch: refs/heads/master
Commit: 3c7f4c1dbcf663a6b055e6af84e31cf9a559e00c
Parents: c39d6b4
Author: Sagar <ku...@gmail.com>
Authored: Sat Jul 9 23:50:17 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Sat Jul 9 23:50:17 2016 +0530
----------------------------------------------------------------------
.../FavouriteWorkflowsMvpView.java | 36 +++++++++
.../FavouriteWorkflowsPresenter.java | 84 ++++++++++++++++++++
2 files changed, 120 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/3c7f4c1d/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsMvpView.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsMvpView.java b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsMvpView.java
new file mode 100644
index 0000000..678f8b4
--- /dev/null
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsMvpView.java
@@ -0,0 +1,36 @@
+/*
+ * 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.
+ */
+package org.apache.taverna.mobile.ui.favouriteworkflow;
+
+
+import org.apache.taverna.mobile.data.model.Workflow;
+import org.apache.taverna.mobile.ui.base.MvpView;
+
+import java.util.List;
+
+public interface FavouriteWorkflowsMvpView extends MvpView {
+
+ void showProgressbar(boolean b);
+
+ void showErrorSnackBar();
+
+ void showWorkflows(List<Workflow> workflowList);
+
+ void showNoWorkflowError();
+}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/3c7f4c1d/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsPresenter.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsPresenter.java b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsPresenter.java
new file mode 100644
index 0000000..b46d41e
--- /dev/null
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsPresenter.java
@@ -0,0 +1,84 @@
+/*
+ * 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.
+ */
+package org.apache.taverna.mobile.ui.favouriteworkflow;
+
+import org.apache.taverna.mobile.data.DataManager;
+import org.apache.taverna.mobile.data.model.Workflow;
+import org.apache.taverna.mobile.ui.base.BasePresenter;
+
+import java.util.List;
+
+import rx.Observer;
+import rx.Subscription;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+public class FavouriteWorkflowsPresenter extends BasePresenter<FavouriteWorkflowsMvpView> {
+
+ public final String LOG_TAG = getClass().getSimpleName();
+ private DataManager mDataManager;
+ private Subscription mSubscriptions;
+
+
+ public FavouriteWorkflowsPresenter(DataManager dataManager) {
+ mDataManager = dataManager;
+ }
+
+ @Override
+ public void attachView(FavouriteWorkflowsMvpView mvpView) {
+ super.attachView(mvpView);
+ }
+
+ @Override
+ public void detachView() {
+ super.detachView();
+ if (mSubscriptions != null) mSubscriptions.unsubscribe();
+ }
+
+ public void loadAllWorkflow() {
+ if (mSubscriptions != null) mSubscriptions.unsubscribe();
+ mSubscriptions = mDataManager.getFavoriteWorkflowList()
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribeOn(Schedulers.io())
+ .subscribe(new Observer<List<Workflow>>() {
+ @Override
+ public void onCompleted() {
+ getMvpView().showProgressbar(false);
+ }
+
+ @Override
+ public void onError(Throwable e) {
+ getMvpView().showProgressbar(false);
+ getMvpView().showErrorSnackBar();
+ }
+
+ @Override
+ public void onNext(List<Workflow> workflowList) {
+ if(workflowList.size()!=0) {
+ getMvpView().showWorkflows(workflowList);
+ }else{
+ getMvpView().showNoWorkflowError();
+ }
+ }
+ });
+
+ }
+
+
+}
[05/21] incubator-taverna-mobile git commit: add method in Data layer
to interact DB layer to get favourite workflow list
Posted by ia...@apache.org.
add method in Data layer to interact DB layer to get favourite workflow list
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/c39d6b4d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/c39d6b4d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/c39d6b4d
Branch: refs/heads/master
Commit: c39d6b4d0cb3bad3fcf1a3c6fc96b74087cae18f
Parents: c4698a8
Author: Sagar <ku...@gmail.com>
Authored: Sat Jul 9 23:30:27 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Sat Jul 9 23:30:27 2016 +0530
----------------------------------------------------------------------
.../java/org/apache/taverna/mobile/data/DataManager.java | 9 +++++++++
1 file changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/c39d6b4d/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java b/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java
index ce414ad..e1ce8e6 100644
--- a/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java
@@ -27,6 +27,7 @@ import org.apache.taverna.mobile.data.model.User;
import org.apache.taverna.mobile.data.model.Workflows;
import org.apache.taverna.mobile.data.remote.BaseApiManager;
+import java.util.List;
import java.util.Map;
import rx.Observable;
@@ -115,4 +116,12 @@ public class DataManager {
return mDBHelper.getFavouriteWorkflow(id);
}
+ /**
+ * @return Favourite Workflow list
+ */
+
+ public Observable<List<Workflow>> getFavoriteWorkflowList() {
+ return mDBHelper.getFavouriteWorkflow();
+ }
+
}
\ No newline at end of file
[14/21] incubator-taverna-mobile git commit: add ASF header
Posted by ia...@apache.org.
add ASF header
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/6aca1bd1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/6aca1bd1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/6aca1bd1
Branch: refs/heads/master
Commit: 6aca1bd1a4bb0a15365c936384c372aa68b480d3
Parents: 84d40fd
Author: Sagar <ku...@gmail.com>
Authored: Sun Jul 10 00:48:22 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Sun Jul 10 00:48:22 2016 +0530
----------------------------------------------------------------------
.../FavouriteWorkflowsFragment.java | 18 ++++++++++++
app/src/main/res/layout/appbar.xml | 16 +++++++++++
.../layout/fragment_favourite_workflow_list.xml | 16 +++++++++++
...tem_recyclerview_favourite_workflow_list.xml | 16 +++++++++++
app/src/main/res/menu/drawer_view.xml | 29 ++++++++++----------
5 files changed, 81 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/6aca1bd1/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
index 4447351..7d4588d 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
package org.apache.taverna.mobile.ui.favouriteworkflow;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/6aca1bd1/app/src/main/res/layout/appbar.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/layout/appbar.xml b/app/src/main/res/layout/appbar.xml
index f7793a6..29776a1 100644
--- a/app/src/main/res/layout/appbar.xml
+++ b/app/src/main/res/layout/appbar.xml
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
+<!--
+ 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.Toolbar
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/6aca1bd1/app/src/main/res/layout/fragment_favourite_workflow_list.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/layout/fragment_favourite_workflow_list.xml b/app/src/main/res/layout/fragment_favourite_workflow_list.xml
index e7bf0ef..2ac917d 100644
--- a/app/src/main/res/layout/fragment_favourite_workflow_list.xml
+++ b/app/src/main/res/layout/fragment_favourite_workflow_list.xml
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
+<!--
+ 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.
+-->
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/6aca1bd1/app/src/main/res/layout/item_recyclerview_favourite_workflow_list.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/layout/item_recyclerview_favourite_workflow_list.xml b/app/src/main/res/layout/item_recyclerview_favourite_workflow_list.xml
index 9fe6384..88658bd 100644
--- a/app/src/main/res/layout/item_recyclerview_favourite_workflow_list.xml
+++ b/app/src/main/res/layout/item_recyclerview_favourite_workflow_list.xml
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
+<!--
+ 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:app="http://schemas.android.com/apk/res-auto"
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/6aca1bd1/app/src/main/res/menu/drawer_view.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/menu/drawer_view.xml b/app/src/main/res/menu/drawer_view.xml
index 47b451b..4e799ee 100644
--- a/app/src/main/res/menu/drawer_view.xml
+++ b/app/src/main/res/menu/drawer_view.xml
@@ -1,19 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (C) 2015 The Android Open Source Project
- ~
- ~ Licensed 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.
- -->
+ 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">
<group android:checkableBehavior="single">
[08/21] incubator-taverna-mobile git commit: add toolbar layout
Posted by ia...@apache.org.
add toolbar layout
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/79b8636c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/79b8636c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/79b8636c
Branch: refs/heads/master
Commit: 79b8636c7fbc5566c09a857b9e1a6db87bf4c3ad
Parents: dc880ac
Author: Sagar <ku...@gmail.com>
Authored: Sun Jul 10 00:27:44 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Sun Jul 10 00:27:44 2016 +0530
----------------------------------------------------------------------
app/src/main/res/layout/appbar.xml | 12 ++++++++++++
1 file changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/79b8636c/app/src/main/res/layout/appbar.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/layout/appbar.xml b/app/src/main/res/layout/appbar.xml
new file mode 100644
index 0000000..f7793a6
--- /dev/null
+++ b/app/src/main/res/layout/appbar.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v7.widget.Toolbar
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:layout_width="match_parent"
+ android:id="@+id/toolbar"
+ android:layout_height="?attr/actionBarSize"
+ android:background="?attr/colorPrimary"
+ android:paddingTop="@dimen/app_bar_top_padding"
+ android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+ app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"/>
+
[09/21] incubator-taverna-mobile git commit: remove toolbar
Posted by ia...@apache.org.
remove toolbar
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/1b78a0fc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/1b78a0fc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/1b78a0fc
Branch: refs/heads/master
Commit: 1b78a0fc13f1275e8bd5dbb3d0cfec002a8e38d3
Parents: 79b8636
Author: Sagar <ku...@gmail.com>
Authored: Sun Jul 10 00:28:50 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Sun Jul 10 00:28:50 2016 +0530
----------------------------------------------------------------------
.../mobile/ui/anouncements/AnnouncementFragment.java | 12 ------------
app/src/main/res/layout/fragment_announcement.xml | 10 ----------
2 files changed, 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/1b78a0fc/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementFragment.java
index a066da7..5ebac60 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementFragment.java
@@ -33,13 +33,10 @@ import android.os.Bundle;
import android.support.design.widget.Snackbar;
import android.support.v4.app.Fragment;
import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.app.ActionBar;
import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.DefaultItemAnimator;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
@@ -116,15 +113,6 @@ public class AnnouncementFragment extends Fragment implements RecyclerItemClickL
ButterKnife.bind(this, rootView);
mAnnouncementPresenter.attachView(this);
- Toolbar toolbar = (Toolbar) rootView.findViewById(R.id.toolbar);
- ((AppCompatActivity) getActivity()).setSupportActionBar(toolbar);
-
- final ActionBar ab = ((AppCompatActivity) getActivity()).getSupportActionBar();
- if (ab != null) {
- ab.setHomeAsUpIndicator(R.drawable.ic_menu);
- ab.setDisplayHomeAsUpEnabled(true);
- }
-
final LinearLayoutManager layoutManager = new LinearLayoutManager(getActivity());
mRecyclerView.setLayoutManager(layoutManager);
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/1b78a0fc/app/src/main/res/layout/fragment_announcement.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/layout/fragment_announcement.xml b/app/src/main/res/layout/fragment_announcement.xml
index 335a1b8..93fee6e 100644
--- a/app/src/main/res/layout/fragment_announcement.xml
+++ b/app/src/main/res/layout/fragment_announcement.xml
@@ -17,18 +17,8 @@
-->
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent">
- <android.support.v7.widget.Toolbar
- android:id="@+id/toolbar"
- android:layout_width="match_parent"
- android:layout_height="?attr/actionBarSize"
- android:background="?attr/colorPrimary"
- android:paddingTop="@dimen/app_bar_top_padding"
- android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
- app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
- />
<org.apache.taverna.mobile.utils.ScrollChildSwipeRefreshLayout
[04/21] incubator-taverna-mobile git commit: add read method in DB
layer to get favourite workflow
Posted by ia...@apache.org.
add read method in DB layer to get favourite workflow
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/c4698a80
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/c4698a80
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/c4698a80
Branch: refs/heads/master
Commit: c4698a8072df5860e085b77932e477cbddaea89e
Parents: 1e66e3b
Author: Sagar <ku...@gmail.com>
Authored: Sat Jul 9 23:25:54 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Sat Jul 9 23:25:54 2016 +0530
----------------------------------------------------------------------
.../taverna/mobile/data/local/DBHelper.java | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/c4698a80/app/src/main/java/org/apache/taverna/mobile/data/local/DBHelper.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/data/local/DBHelper.java b/app/src/main/java/org/apache/taverna/mobile/data/local/DBHelper.java
index ee27a3f..f81f88e 100644
--- a/app/src/main/java/org/apache/taverna/mobile/data/local/DBHelper.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/local/DBHelper.java
@@ -27,6 +27,8 @@ import org.apache.taverna.mobile.data.model.Workflows;
import android.support.annotation.Nullable;
+import java.util.List;
+
import rx.Observable;
import rx.Subscriber;
@@ -184,6 +186,24 @@ public class DBHelper {
return false;
}
+ public Observable<List<Workflow>> getFavouriteWorkflow() {
+ return Observable.create(new Observable.OnSubscribe<List<Workflow>>() {
+ @Override
+ public void call(Subscriber<? super List<Workflow>> subscriber) {
+ if (subscriber.isUnsubscribed()) return;
+ List<Workflow> workflows = SQLite.select()
+ .from(Workflow.class)
+ .where(Workflow_Table.favourite.eq(true))
+ .queryList();
+
+ subscriber.onNext(workflows);
+ subscriber.onCompleted();
+
+ }
+ });
+
+ }
+
}
[21/21] incubator-taverna-mobile git commit: remove checkstyle error
Posted by ia...@apache.org.
remove checkstyle error
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/a90f32eb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/a90f32eb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/a90f32eb
Branch: refs/heads/master
Commit: a90f32eb1082d9003849a33b4689f53e5602f89b
Parents: 20fa6c7
Author: Sagar <ku...@gmail.com>
Authored: Tue Jul 12 19:44:43 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Tue Jul 12 19:44:43 2016 +0530
----------------------------------------------------------------------
.../taverna/mobile/activities/DashboardMainActivity.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/a90f32eb/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 75cff20..aba4947 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
@@ -169,11 +169,11 @@ public class DashboardMainActivity extends AppCompatActivity {
Intent workflowSelectIntent =
new Intent(Intent.ACTION_GET_CONTENT)
.setDataAndTypeAndNormalize(
- Uri.parse(String.format("%s%s%s",
- Environment.getExternalStorageDirectory(),
- File.separator,
- APP_DIRECTORY_NAME)),
- "application/vnd.taverna.t2flow+xml");
+ Uri.parse(String.format("%s%s%s",
+ Environment.getExternalStorageDirectory(),
+ File.separator,
+ APP_DIRECTORY_NAME)),
+ "application/vnd.taverna.t2flow+xml");
Intent loadWorkflowIntent = Intent.createChooser
(workflowSelectIntent,