You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by ia...@apache.org on 2016/03/16 17:05:32 UTC
[3/7] incubator-taverna-mobile git commit: chaning images into
drawable and change - to _ in images names and removing Material library and
Added design support library
chaning images into drawable and change - to _ in images names and removing Material library and Added design support library
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/aa97a852
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/aa97a852
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/aa97a852
Branch: refs/heads/master
Commit: aa97a8520bb822bd34c39d5d6da4178d5c5876df
Parents: d2055a9
Author: therajanmaurya <ra...@gmail.com>
Authored: Tue Mar 8 20:35:15 2016 +0530
Committer: therajanmaurya <ra...@gmail.com>
Committed: Tue Mar 8 20:35:15 2016 +0530
----------------------------------------------------------------------
app/build.gradle | 15 +++----
app/src/main/AndroidManifest.xml | 2 +-
.../activities/DashboardMainActivity.java | 1 +
.../adapters/FavoriteWorkflowAdapter.java | 10 ++---
.../WorkflowRunHistoryFragment.java | 2 +-
app/src/main/res/drawable/ic_about-web.png | Bin 12726 -> 0 bytes
app/src/main/res/drawable/ic_about_web.png | Bin 0 -> 12726 bytes
.../main/res/drawable/ic_dashboard_home-web.png | Bin 2121 -> 0 bytes
.../main/res/drawable/ic_dashboard_home_web.png | Bin 0 -> 2121 bytes
app/src/main/res/drawable/ic_download-web.png | Bin 4063 -> 0 bytes
app/src/main/res/drawable/ic_download__web.jpg | Bin 0 -> 2230 bytes
app/src/main/res/drawable/ic_download_web.jpg | Bin 2230 -> 0 bytes
app/src/main/res/drawable/ic_download_web.png | Bin 0 -> 4063 bytes
.../res/drawable/ic_downloadworkflow-web.png | Bin 3972 -> 0 bytes
.../res/drawable/ic_downloadworkflow_web.png | Bin 0 -> 3972 bytes
app/src/main/res/drawable/ic_launcher-web.png | Bin 72617 -> 0 bytes
app/src/main/res/drawable/ic_launcher_web.png | Bin 0 -> 72617 bytes
app/src/main/res/drawable/ic_loading-web.png | Bin 32040 -> 0 bytes
app/src/main/res/drawable/ic_loading_web.png | Bin 0 -> 32040 bytes
app/src/main/res/drawable/ic_logout-web.png | Bin 8213 -> 0 bytes
app/src/main/res/drawable/ic_logout_web.png | Bin 0 -> 8213 bytes
.../drawable/ic_markworkflow_selected-web.png | Bin 15757 -> 0 bytes
.../drawable/ic_markworkflow_selected_web.png | Bin 0 -> 15757 bytes
.../drawable/ic_markworkflow_unselected-web.png | Bin 10274 -> 0 bytes
.../drawable/ic_markworkflow_unselected_web.png | Bin 0 -> 10274 bytes
app/src/main/res/drawable/ic_openwk-web.png | Bin 5721 -> 0 bytes
app/src/main/res/drawable/ic_openwk_web.png | Bin 0 -> 5721 bytes
app/src/main/res/drawable/ic_poweredby-web.png | Bin 13169 -> 0 bytes
app/src/main/res/drawable/ic_poweredby_web.png | Bin 0 -> 13169 bytes
app/src/main/res/drawable/ic_quit-web.png | Bin 22378 -> 0 bytes
app/src/main/res/drawable/ic_quit_web.png | Bin 0 -> 22378 bytes
.../res/drawable/ic_setting_workflows-web.png | Bin 5276 -> 0 bytes
.../res/drawable/ic_setting_workflows_web.png | Bin 0 -> 5276 bytes
app/src/main/res/drawable/ic_usage-web.png | Bin 5028 -> 0 bytes
app/src/main/res/drawable/ic_usage_web.png | Bin 0 -> 5028 bytes
app/src/main/res/drawable/ic_user-web.png | Bin 3907 -> 0 bytes
app/src/main/res/drawable/ic_user_web.png | Bin 0 -> 3907 bytes
.../main/res/drawable/ic_viewworkflow-web.png | Bin 2734 -> 0 bytes
.../main/res/drawable/ic_viewworkflow_web.png | Bin 0 -> 2734 bytes
.../main/res/drawable/icuserprofiles-web.png | Bin 8459 -> 0 bytes
.../main/res/drawable/icuserprofiles_web.png | Bin 0 -> 8459 bytes
.../main/res/layout/favorite_item_layout.xml | 42 +++++++++----------
.../res/layout/fragment_workflow_detail.xml | 2 +-
app/src/main/res/menu/drawer_view.xml | 12 +++---
app/src/main/res/values-v21/styles.xml | 2 +-
app/src/main/res/values/styles.xml | 2 +-
build.gradle | 4 ++
47 files changed, 49 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/aa97a852/app/build.gradle
----------------------------------------------------------------------
diff --git a/app/build.gradle b/app/build.gradle
index 7fe97c2..0e7fee3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -25,13 +25,14 @@ repositories {
jcenter()
}
dependencies {
- compile fileTree(include: ['*.jar'], dir: 'libs')
- compile 'com.android.support:appcompat-v7:22.0.0'
- compile 'com.android.support:cardview-v7:22.0.0'
- compile 'com.android.support:recyclerview-v7:22.0.0'
- compile 'com.android.support:support-v4:22.0.0'
+ compile fileTree(dir: 'libs', include: ['*.jar'])
+ compile 'com.android.support:appcompat-v7:21.0.0'
+ compile 'com.android.support:cardview-v7:21.0.0'
+ compile 'com.android.support:recyclerview-v7:21.0.0'
+ compile 'com.android.support:support-v4:21.0.0'
compile files('libs/dropbox-android-sdk-1.6.3.jar')
- compile 'com.github.navasmdc:MaterialDesign:1.5@aar'
+ //compile 'com.github.navasmdc:MaterialDesign:1.5@aar'
+ // compile 'com.github.rey5137:material:1.2.2'
compile 'com.nineoldandroids:library:2.4.+'
-
+ compile 'com.android.support:design:22.2.0'
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/aa97a852/app/src/main/AndroidManifest.xml
----------------------------------------------------------------------
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b1ac3d4..9ce80dc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -28,7 +28,7 @@ limitations under the License.
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
- android:theme="@style/Base.Theme.Taverna" >
+ android:theme="@style/Theme.Taverna" >
<activity
android:name=".activities.LoginActivity"
android:label="@string/app_name" >
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/aa97a852/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 ba2d67a..9b7bb26 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
@@ -68,6 +68,7 @@ public class DashboardMainActivity extends ActionBarActivity
*/
private NavigationDrawerFragment mNavigationDrawerFragment;
+
/**
* Used to store the last screen title. For use in {@link #restoreActionBar()}.
*/
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/aa97a852/app/src/main/java/org/apache/taverna/mobile/adapters/FavoriteWorkflowAdapter.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/adapters/FavoriteWorkflowAdapter.java b/app/src/main/java/org/apache/taverna/mobile/adapters/FavoriteWorkflowAdapter.java
index b52ac1c..a32be48 100644
--- a/app/src/main/java/org/apache/taverna/mobile/adapters/FavoriteWorkflowAdapter.java
+++ b/app/src/main/java/org/apache/taverna/mobile/adapters/FavoriteWorkflowAdapter.java
@@ -29,6 +29,7 @@ import android.content.Context;
import android.content.SharedPreferences;
import android.graphics.Color;
import android.preference.PreferenceManager;
+import android.support.design.widget.FloatingActionButton;
import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
@@ -39,9 +40,6 @@ import android.widget.ImageView;
import android.widget.TextView;
import android.widget.Toast;
-import com.gc.materialdesign.views.ButtonFlat;
-import com.gc.materialdesign.views.ButtonFloat;
-
import org.apache.taverna.mobile.R;
import org.apache.taverna.mobile.utils.Workflow_DB;
import org.json.JSONException;
@@ -113,7 +111,7 @@ public class FavoriteWorkflowAdapter extends RecyclerView.Adapter<FavoriteWorkfl
fViewHolder.author.setText((CharSequence) data.get(6));
fViewHolder.title.setText((CharSequence) data.get(2));
fViewHolder.dateMarked.setText((CharSequence) data.get(4));
- fViewHolder.btn_delete.setOnClickListener(new ButtonFloat.OnClickListener() {
+ fViewHolder.btn_delete.setOnClickListener(new FloatingActionButton.OnClickListener() {
@Override
public void onClick(View view) {
try {
@@ -170,7 +168,7 @@ public class FavoriteWorkflowAdapter extends RecyclerView.Adapter<FavoriteWorkfl
public final ImageView favorite_thumb;
public final TextView author, title, dateMarked;// dateAdd;
- public final ButtonFloat btn_delete;
+ public final FloatingActionButton btn_delete;
public final Button btn_view_fav;
public FViewHolder(View itemView) {
super(itemView);
@@ -178,7 +176,7 @@ public class FavoriteWorkflowAdapter extends RecyclerView.Adapter<FavoriteWorkfl
author = (TextView) itemView.findViewById(R.id.author);
title = (TextView) itemView.findViewById(R.id.favorite_title);
dateMarked = (TextView) itemView.findViewById(R.id.date_set);
- btn_delete = (ButtonFloat) itemView.findViewById(R.id.favoriteButtonDelete);
+ btn_delete = (FloatingActionButton) itemView.findViewById(R.id.favoriteButtonDelete);
btn_view_fav = (Button) itemView.findViewById(R.id.buttonOpenFavorite);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/aa97a852/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowRunHistoryFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowRunHistoryFragment.java b/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowRunHistoryFragment.java
index 4d6182c..dee8539 100644
--- a/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowRunHistoryFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowRunHistoryFragment.java
@@ -123,7 +123,7 @@ public class WorkflowRunHistoryFragment extends Fragment implements LoaderManage
public void onResume() {
super.onResume();
mRecyclerView.setAdapter(runAdapter);
- mRecyclerView.setScrollingTouchSlop(RecyclerView.TOUCH_SLOP_PAGING);
+ // mRecyclerView.setScrollingTouchSlop(RecyclerView.TOUCH_SLOP_PAGING);
//getActivity().getLoaderManager().initLoader(1,null,this);
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/aa97a852/app/src/main/res/drawable/ic_about-web.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/drawable/ic_about-web.png b/app/src/main/res/drawable/ic_about-web.png
deleted file mode 100644
index 34525d8..0000000
Binary files a/app/src/main/res/drawable/ic_about-web.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/aa97a852/app/src/main/res/drawable/ic_about_web.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/drawable/ic_about_web.png b/app/src/main/res/drawable/ic_about_web.png
new file mode 100644
index 0000000..34525d8
Binary files /dev/null and b/app/src/main/res/drawable/ic_about_web.png differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/aa97a852/app/src/main/res/drawable/ic_dashboard_home-web.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/drawable/ic_dashboard_home-web.png b/app/src/main/res/drawable/ic_dashboard_home-web.png
deleted file mode 100644
index 5810950..0000000
Binary files a/app/src/main/res/drawable/ic_dashboard_home-web.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/aa97a852/app/src/main/res/drawable/ic_dashboard_home_web.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/drawable/ic_dashboard_home_web.png b/app/src/main/res/drawable/ic_dashboard_home_web.png
new file mode 100644
index 0000000..5810950
Binary files /dev/null and b/app/src/main/res/drawable/ic_dashboard_home_web.png differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/aa97a852/app/src/main/res/drawable/ic_download-web.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/drawable/ic_download-web.png b/app/src/main/res/drawable/ic_download-web.png
deleted file mode 100644
index 732222f..0000000
Binary files a/app/src/main/res/drawable/ic_download-web.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/aa97a852/app/src/main/res/drawable/ic_download__web.jpg
----------------------------------------------------------------------
diff --git a/app/src/main/res/drawable/ic_download__web.jpg b/app/src/main/res/drawable/ic_download__web.jpg
new file mode 100755
index 0000000..27b0373
Binary files /dev/null and b/app/src/main/res/drawable/ic_download__web.jpg differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/aa97a852/app/src/main/res/drawable/ic_download_web.jpg
----------------------------------------------------------------------
diff --git a/app/src/main/res/drawable/ic_download_web.jpg b/app/src/main/res/drawable/ic_download_web.jpg
deleted file mode 100755
index 27b0373..0000000
Binary files a/app/src/main/res/drawable/ic_download_web.jpg and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/aa97a852/app/src/main/res/drawable/ic_download_web.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/drawable/ic_download_web.png b/app/src/main/res/drawable/ic_download_web.png
new file mode 100644
index 0000000..732222f
Binary files /dev/null and b/app/src/main/res/drawable/ic_download_web.png differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/aa97a852/app/src/main/res/drawable/ic_downloadworkflow-web.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/drawable/ic_downloadworkflow-web.png b/app/src/main/res/drawable/ic_downloadworkflow-web.png
deleted file mode 100644
index b4e2070..0000000
Binary files a/app/src/main/res/drawable/ic_downloadworkflow-web.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/aa97a852/app/src/main/res/drawable/ic_downloadworkflow_web.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/drawable/ic_downloadworkflow_web.png b/app/src/main/res/drawable/ic_downloadworkflow_web.png
new file mode 100644
index 0000000..b4e2070
Binary files /dev/null and b/app/src/main/res/drawable/ic_downloadworkflow_web.png differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/aa97a852/app/src/main/res/drawable/ic_launcher-web.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/drawable/ic_launcher-web.png b/app/src/main/res/drawable/ic_launcher-web.png
deleted file mode 100644
index a06ff39..0000000
Binary files a/app/src/main/res/drawable/ic_launcher-web.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/aa97a852/app/src/main/res/drawable/ic_launcher_web.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/drawable/ic_launcher_web.png b/app/src/main/res/drawable/ic_launcher_web.png
new file mode 100644
index 0000000..a06ff39
Binary files /dev/null and b/app/src/main/res/drawable/ic_launcher_web.png differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/aa97a852/app/src/main/res/drawable/ic_loading-web.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/drawable/ic_loading-web.png b/app/src/main/res/drawable/ic_loading-web.png
deleted file mode 100644
index 1adde64..0000000
Binary files a/app/src/main/res/drawable/ic_loading-web.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/aa97a852/app/src/main/res/drawable/ic_loading_web.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/drawable/ic_loading_web.png b/app/src/main/res/drawable/ic_loading_web.png
new file mode 100644
index 0000000..1adde64
Binary files /dev/null and b/app/src/main/res/drawable/ic_loading_web.png differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/aa97a852/app/src/main/res/drawable/ic_logout-web.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/drawable/ic_logout-web.png b/app/src/main/res/drawable/ic_logout-web.png
deleted file mode 100644
index 2464014..0000000
Binary files a/app/src/main/res/drawable/ic_logout-web.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/aa97a852/app/src/main/res/drawable/ic_logout_web.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/drawable/ic_logout_web.png b/app/src/main/res/drawable/ic_logout_web.png
new file mode 100644
index 0000000..2464014
Binary files /dev/null and b/app/src/main/res/drawable/ic_logout_web.png differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/aa97a852/app/src/main/res/drawable/ic_markworkflow_selected-web.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/drawable/ic_markworkflow_selected-web.png b/app/src/main/res/drawable/ic_markworkflow_selected-web.png
deleted file mode 100644
index 951bf69..0000000
Binary files a/app/src/main/res/drawable/ic_markworkflow_selected-web.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/aa97a852/app/src/main/res/drawable/ic_markworkflow_selected_web.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/drawable/ic_markworkflow_selected_web.png b/app/src/main/res/drawable/ic_markworkflow_selected_web.png
new file mode 100644
index 0000000..951bf69
Binary files /dev/null and b/app/src/main/res/drawable/ic_markworkflow_selected_web.png differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/aa97a852/app/src/main/res/drawable/ic_markworkflow_unselected-web.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/drawable/ic_markworkflow_unselected-web.png b/app/src/main/res/drawable/ic_markworkflow_unselected-web.png
deleted file mode 100644
index d5cf5a3..0000000
Binary files a/app/src/main/res/drawable/ic_markworkflow_unselected-web.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/aa97a852/app/src/main/res/drawable/ic_markworkflow_unselected_web.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/drawable/ic_markworkflow_unselected_web.png b/app/src/main/res/drawable/ic_markworkflow_unselected_web.png
new file mode 100644
index 0000000..d5cf5a3
Binary files /dev/null and b/app/src/main/res/drawable/ic_markworkflow_unselected_web.png differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/aa97a852/app/src/main/res/drawable/ic_openwk-web.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/drawable/ic_openwk-web.png b/app/src/main/res/drawable/ic_openwk-web.png
deleted file mode 100644
index ffa22e5..0000000
Binary files a/app/src/main/res/drawable/ic_openwk-web.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/aa97a852/app/src/main/res/drawable/ic_openwk_web.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/drawable/ic_openwk_web.png b/app/src/main/res/drawable/ic_openwk_web.png
new file mode 100644
index 0000000..ffa22e5
Binary files /dev/null and b/app/src/main/res/drawable/ic_openwk_web.png differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/aa97a852/app/src/main/res/drawable/ic_poweredby-web.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/drawable/ic_poweredby-web.png b/app/src/main/res/drawable/ic_poweredby-web.png
deleted file mode 100644
index 4248f9e..0000000
Binary files a/app/src/main/res/drawable/ic_poweredby-web.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/aa97a852/app/src/main/res/drawable/ic_poweredby_web.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/drawable/ic_poweredby_web.png b/app/src/main/res/drawable/ic_poweredby_web.png
new file mode 100644
index 0000000..4248f9e
Binary files /dev/null and b/app/src/main/res/drawable/ic_poweredby_web.png differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/aa97a852/app/src/main/res/drawable/ic_quit-web.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/drawable/ic_quit-web.png b/app/src/main/res/drawable/ic_quit-web.png
deleted file mode 100644
index 04a8771..0000000
Binary files a/app/src/main/res/drawable/ic_quit-web.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/aa97a852/app/src/main/res/drawable/ic_quit_web.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/drawable/ic_quit_web.png b/app/src/main/res/drawable/ic_quit_web.png
new file mode 100644
index 0000000..04a8771
Binary files /dev/null and b/app/src/main/res/drawable/ic_quit_web.png differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/aa97a852/app/src/main/res/drawable/ic_setting_workflows-web.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/drawable/ic_setting_workflows-web.png b/app/src/main/res/drawable/ic_setting_workflows-web.png
deleted file mode 100644
index 88da2e7..0000000
Binary files a/app/src/main/res/drawable/ic_setting_workflows-web.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/aa97a852/app/src/main/res/drawable/ic_setting_workflows_web.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/drawable/ic_setting_workflows_web.png b/app/src/main/res/drawable/ic_setting_workflows_web.png
new file mode 100644
index 0000000..88da2e7
Binary files /dev/null and b/app/src/main/res/drawable/ic_setting_workflows_web.png differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/aa97a852/app/src/main/res/drawable/ic_usage-web.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/drawable/ic_usage-web.png b/app/src/main/res/drawable/ic_usage-web.png
deleted file mode 100644
index 550ffa6..0000000
Binary files a/app/src/main/res/drawable/ic_usage-web.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/aa97a852/app/src/main/res/drawable/ic_usage_web.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/drawable/ic_usage_web.png b/app/src/main/res/drawable/ic_usage_web.png
new file mode 100644
index 0000000..550ffa6
Binary files /dev/null and b/app/src/main/res/drawable/ic_usage_web.png differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/aa97a852/app/src/main/res/drawable/ic_user-web.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/drawable/ic_user-web.png b/app/src/main/res/drawable/ic_user-web.png
deleted file mode 100644
index 6849809..0000000
Binary files a/app/src/main/res/drawable/ic_user-web.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/aa97a852/app/src/main/res/drawable/ic_user_web.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/drawable/ic_user_web.png b/app/src/main/res/drawable/ic_user_web.png
new file mode 100644
index 0000000..6849809
Binary files /dev/null and b/app/src/main/res/drawable/ic_user_web.png differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/aa97a852/app/src/main/res/drawable/ic_viewworkflow-web.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/drawable/ic_viewworkflow-web.png b/app/src/main/res/drawable/ic_viewworkflow-web.png
deleted file mode 100644
index dfcaadb..0000000
Binary files a/app/src/main/res/drawable/ic_viewworkflow-web.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/aa97a852/app/src/main/res/drawable/ic_viewworkflow_web.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/drawable/ic_viewworkflow_web.png b/app/src/main/res/drawable/ic_viewworkflow_web.png
new file mode 100644
index 0000000..dfcaadb
Binary files /dev/null and b/app/src/main/res/drawable/ic_viewworkflow_web.png differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/aa97a852/app/src/main/res/drawable/icuserprofiles-web.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/drawable/icuserprofiles-web.png b/app/src/main/res/drawable/icuserprofiles-web.png
deleted file mode 100644
index 5f537e2..0000000
Binary files a/app/src/main/res/drawable/icuserprofiles-web.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/aa97a852/app/src/main/res/drawable/icuserprofiles_web.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/drawable/icuserprofiles_web.png b/app/src/main/res/drawable/icuserprofiles_web.png
new file mode 100644
index 0000000..5f537e2
Binary files /dev/null and b/app/src/main/res/drawable/icuserprofiles_web.png differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/aa97a852/app/src/main/res/layout/favorite_item_layout.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/layout/favorite_item_layout.xml b/app/src/main/res/layout/favorite_item_layout.xml
index b2dcdee..6da614c 100644
--- a/app/src/main/res/layout/favorite_item_layout.xml
+++ b/app/src/main/res/layout/favorite_item_layout.xml
@@ -19,16 +19,16 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:card_view="http://schemas.android.com/apk/res-auto"
-
- xmlns:materialdesign="http://schemas.android.com/apk/res-auto"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- card_view:cardElevation="@dimen/abc_text_size_menu_material"
- card_view:cardBackgroundColor="@color/background_floating_material_light"
- card_view:cardCornerRadius="2dp"
- card_view:paddingEnd="2dp"
- card_view:paddingStart="2dp">
+ xmlns:card_view="http://schemas.android.com/apk/res-auto"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:materialdesign="http://schemas.android.com/apk/res-auto"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ card_view:cardElevation="@dimen/abc_text_size_menu_material"
+ card_view:cardBackgroundColor="@color/background_floating_material_light"
+ card_view:cardCornerRadius="2dp"
+ card_view:paddingEnd="2dp"
+ card_view:paddingStart="2dp">
<LinearLayout
android:orientation="vertical"
@@ -50,24 +50,24 @@ limitations under the License.
android:elevation="5dp"
android:layout_weight="1" />
-<!-- <ImageButton
+ <ImageButton
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/favoriteButonDelete"
android:src="@android:drawable/ic_menu_delete"
android:background="#eee"
android:layout_gravity="right"
- android:visibility="gone" />-->
+ android:visibility="gone" />
<!-- @drawable/ic_delete_favorite -->
- <com.gc.materialdesign.views.ButtonFloat
- android:id="@+id/favoriteButtonDelete"
- android:layout_gravity="right"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_margin="5dp"
- android:background="#33b5ee"
- materialdesign:animate="false"
- materialdesign:iconDrawable="@android:drawable/ic_menu_delete" />
+
+ <android.support.design.widget.FloatingActionButton
+ android:id="@+id/favoriteButtonDelete"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ app:layout_anchorGravity="bottom|right|end"
+ android:layout_margin="5dp"
+ android:background="#33b5ee"
+ android:src="@android:drawable/ic_menu_delete" />
</LinearLayout>
<LinearLayout
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/aa97a852/app/src/main/res/layout/fragment_workflow_detail.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/layout/fragment_workflow_detail.xml b/app/src/main/res/layout/fragment_workflow_detail.xml
index 295054d..fd941b8 100644
--- a/app/src/main/res/layout/fragment_workflow_detail.xml
+++ b/app/src/main/res/layout/fragment_workflow_detail.xml
@@ -150,7 +150,7 @@ limitations under the License.
android:id="@+id/download_wk"
android:paddingLeft="5dp"
android:elegantTextHeight="true"
- android:drawableLeft="@drawable/ic_download_web" />
+ android:drawableLeft="@drawable/ic_download__web" />
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/aa97a852/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 3dd4b63..93ecd84 100644
--- a/app/src/main/res/menu/drawer_view.xml
+++ b/app/src/main/res/menu/drawer_view.xml
@@ -19,15 +19,15 @@
<group android:checkableBehavior="single">
<item
android:id="@+id/nav_dashboard"
- android:icon="@drawable/ic_dashboard_home-web"
+ android:icon="@drawable/ic_dashboard_home_web"
android:title="Workflows" />
<item
android:id="@+id/nav_openworkflow"
- android:icon="@drawable/ic_openwk-web"
+ android:icon="@drawable/ic_openwk_web"
android:title="Open Workflow" />
<item
android:id="@+id/nav_usage"
- android:icon="@drawable/ic_usage-web"
+ android:icon="@drawable/ic_usage_web"
android:title="Usage" />
</group>
@@ -35,15 +35,15 @@
<menu>
<item
android:id="@+id/nav_about"
- android:icon="@drawable/ic_about-web"
+ android:icon="@drawable/ic_about_web"
android:title="Sub item 1" />
<item
android:id="@+id/nav_settings"
- android:icon="@drawable/ic_setting_workflows-web"
+ android:icon="@drawable/ic_setting_workflows_web"
android:title="Sub item 1" />
<item
android:id="@+id/nav_logout"
- android:icon="@drawable/ic_logout-web"
+ android:icon="@drawable/ic_logout_web"
android:title="Sub item 1" />
</menu>
</item>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/aa97a852/app/src/main/res/values-v21/styles.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index e06b019..2b9706e 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -17,7 +17,7 @@
<resources>
- <style name="Theme.DesignDemo" parent="Base.Theme.Taverna">
+ <style name="Theme.Taverna" parent="Base.Theme.Taverna">
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
<item name="android:statusBarColor">@android:color/transparent</item>
</style>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/aa97a852/app/src/main/res/values/styles.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 150ee78..62f0cb8 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -14,7 +14,7 @@ limitations under the License.
-->
<resources>
- <style name="Theme.DesignDemo" parent="Base.Theme.Taverna">
+ <style name="Theme.Taverna" parent="Base.Theme.Taverna">
</style>
<style name="Base.Theme.Taverna" parent="Theme.AppCompat.Light.NoActionBar">
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/aa97a852/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index a6fcfe1..c9cad19 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,5 +15,9 @@ buildscript {
allprojects {
repositories {
jcenter()
+ maven {
+ url "https://oss.sonatype.org/content/repositories/snapshots"
+ }
+ maven { url "https://jitpack.io" }
}
}