You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by ia...@apache.org on 2015/08/24 13:09:15 UTC
[36/38] incubator-taverna-mobile git commit: Added some material
design component to the favorite workflows in the favorites tab
Added some material design component to the favorite workflows in the favorites tab
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/2d5bddce
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/2d5bddce
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/2d5bddce
Branch: refs/heads/master
Commit: 2d5bddce38ff62189b1e08d5b90ba1a8a5b10f6a
Parents: e0b2113
Author: larrytech7 <la...@gmail.com>
Authored: Fri Aug 21 19:21:21 2015 +0100
Committer: larrytech7 <la...@gmail.com>
Committed: Fri Aug 21 19:21:21 2015 +0100
----------------------------------------------------------------------
app/build.gradle | 2 ++
.../adapters/FavoriteWorkflowAdapter.java | 7 +++--
.../WorkflowRunHistoryFragment.java | 8 ++++--
.../main/res/layout/favorite_item_layout.xml | 29 ++++++++++++++------
4 files changed, 34 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/2d5bddce/app/build.gradle
----------------------------------------------------------------------
diff --git a/app/build.gradle b/app/build.gradle
index 66d1e2d..7fe97c2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -31,5 +31,7 @@ dependencies {
compile 'com.android.support:recyclerview-v7:22.0.0'
compile 'com.android.support:support-v4:22.0.0'
compile files('libs/dropbox-android-sdk-1.6.3.jar')
+ compile 'com.github.navasmdc:MaterialDesign:1.5@aar'
+ compile 'com.nineoldandroids:library:2.4.+'
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/2d5bddce/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 56a0d8e..3aa468e 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
@@ -39,6 +39,9 @@ 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;
@@ -165,7 +168,7 @@ public class FavoriteWorkflowAdapter extends RecyclerView.Adapter<FavoriteWorkfl
public final ImageView favorite_thumb;
public final TextView author, title, dateMarked;// dateAdd;
- public final ImageButton btn_delete;
+ public final ButtonFloat btn_delete;
public final Button btn_view_fav;
public FViewHolder(View itemView) {
super(itemView);
@@ -173,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 = (ImageButton) itemView.findViewById(R.id.favoriteButtonDelete);
+ btn_delete = (ButtonFloat) 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/2d5bddce/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 c0b01cf..4d6182c 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
@@ -144,13 +144,17 @@ public class WorkflowRunHistoryFragment extends Fragment implements LoaderManage
public void onLoadFinished(Loader<Workflow> workflowLoader, Workflow workflow) {
runAdapter.setRunList(workflow.getWorkflow_runs());
mRecyclerView.setAdapter(runAdapter);
- if(runAdapter.getRunList().size() ==0){
+ try {
+ if (runAdapter.getRunList().size() == 0) {
mRecyclerView.setVisibility(View.GONE);
emptyRunHistoryTextView.setVisibility(View.VISIBLE);
- }else{
+ } else {
mRecyclerView.setVisibility(View.VISIBLE);
emptyRunHistoryTextView.setVisibility(View.GONE);
}
+ }catch(NullPointerException np){
+ np.printStackTrace();
+ }
// progressDialog.dismiss();
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/2d5bddce/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 c01ab27..b2dcdee 100644
--- a/app/src/main/res/layout/favorite_item_layout.xml
+++ b/app/src/main/res/layout/favorite_item_layout.xml
@@ -18,16 +18,17 @@ 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"
+<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" >
+ card_view:paddingStart="2dp">
<LinearLayout
android:orientation="vertical"
@@ -37,7 +38,8 @@ limitations under the License.
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
- android:layout_height="wrap_content">
+ android:layout_height="wrap_content"
+ >
<TextView
android:layout_width="wrap_content"
@@ -48,13 +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/favoriteButtonDelete"
- android:src="@drawable/ic_delete_favorite"
+ android:id="@+id/favoriteButonDelete"
+ android:src="@android:drawable/ic_menu_delete"
android:background="#eee"
- android:layout_gravity="right" />
+ android:layout_gravity="right"
+ 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" />
</LinearLayout>
<LinearLayout