You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by sa...@apache.org on 2018/03/03 15:33:23 UTC
incubator-taverna-mobile git commit: Fix: Replace fav workflow icon
image view with floating action button to enhance the UI
Repository: incubator-taverna-mobile
Updated Branches:
refs/heads/master 4a41e24fb -> f0a4e6843
Fix: Replace fav workflow icon image view with floating action button to enhance the 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/f0a4e684
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/f0a4e684
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/f0a4e684
Branch: refs/heads/master
Commit: f0a4e6843031f9acc9bf08fdb371322c9d85471a
Parents: 4a41e24
Author: Hitesh Gautam <ga...@gmail.com>
Authored: Fri Mar 2 13:32:22 2018 +0530
Committer: Hitesh Gautam <ga...@gmail.com>
Committed: Fri Mar 2 13:32:22 2018 +0530
----------------------------------------------------------------------
.../res/drawable-hdpi/ic_star_black_24dp.png | Bin 369 -> 0 bytes
.../drawable-hdpi/ic_star_border_black_24dp.png | Bin 500 -> 0 bytes
.../res/drawable-mdpi/ic_star_black_24dp.png | Bin 263 -> 0 bytes
.../drawable-mdpi/ic_star_border_black_24dp.png | Bin 332 -> 0 bytes
.../res/drawable-xhdpi/ic_star_black_24dp.png | Bin 467 -> 0 bytes
.../ic_star_border_black_24dp.png | Bin 674 -> 0 bytes
.../res/drawable-xxhdpi/ic_star_black_24dp.png | Bin 668 -> 0 bytes
.../ic_star_border_black_24dp.png | Bin 971 -> 0 bytes
.../res/drawable-xxxhdpi/ic_star_black_24dp.png | Bin 887 -> 0 bytes
.../ic_star_border_black_24dp.png | Bin 1301 -> 0 bytes
.../main/res/drawable/ic_star_black_24dp.xml | 9 ++++
.../res/drawable/ic_star_border_black_24dp.xml | 9 ++++
.../res/layout/fragment_detail_workflow.xml | 53 ++++++++++---------
app/src/main/res/values/dimens.xml | 26 +++++++++
14 files changed, 71 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/f0a4e684/app/src/main/res/drawable-hdpi/ic_star_black_24dp.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/drawable-hdpi/ic_star_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_star_black_24dp.png
deleted file mode 100644
index 92a0f58..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_star_black_24dp.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/f0a4e684/app/src/main/res/drawable-hdpi/ic_star_border_black_24dp.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/drawable-hdpi/ic_star_border_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_star_border_black_24dp.png
deleted file mode 100644
index cb31ce2..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_star_border_black_24dp.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/f0a4e684/app/src/main/res/drawable-mdpi/ic_star_black_24dp.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/drawable-mdpi/ic_star_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_star_black_24dp.png
deleted file mode 100644
index a728afe..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_star_black_24dp.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/f0a4e684/app/src/main/res/drawable-mdpi/ic_star_border_black_24dp.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/drawable-mdpi/ic_star_border_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_star_border_black_24dp.png
deleted file mode 100644
index b753848..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_star_border_black_24dp.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/f0a4e684/app/src/main/res/drawable-xhdpi/ic_star_black_24dp.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/drawable-xhdpi/ic_star_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_star_black_24dp.png
deleted file mode 100644
index c636ce8..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_star_black_24dp.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/f0a4e684/app/src/main/res/drawable-xhdpi/ic_star_border_black_24dp.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/drawable-xhdpi/ic_star_border_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_star_border_black_24dp.png
deleted file mode 100644
index 4f978e7..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_star_border_black_24dp.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/f0a4e684/app/src/main/res/drawable-xxhdpi/ic_star_black_24dp.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/drawable-xxhdpi/ic_star_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_star_black_24dp.png
deleted file mode 100644
index 54d3065..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_star_black_24dp.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/f0a4e684/app/src/main/res/drawable-xxhdpi/ic_star_border_black_24dp.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/drawable-xxhdpi/ic_star_border_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_star_border_black_24dp.png
deleted file mode 100644
index f10d427..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_star_border_black_24dp.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/f0a4e684/app/src/main/res/drawable-xxxhdpi/ic_star_black_24dp.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_star_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_star_black_24dp.png
deleted file mode 100644
index 7be2280..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_star_black_24dp.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/f0a4e684/app/src/main/res/drawable-xxxhdpi/ic_star_border_black_24dp.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_star_border_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_star_border_black_24dp.png
deleted file mode 100644
index 041aa6b..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_star_border_black_24dp.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/f0a4e684/app/src/main/res/drawable/ic_star_black_24dp.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/drawable/ic_star_black_24dp.xml b/app/src/main/res/drawable/ic_star_black_24dp.xml
new file mode 100644
index 0000000..a87ca09
--- /dev/null
+++ b/app/src/main/res/drawable/ic_star_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"/>
+</vector>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/f0a4e684/app/src/main/res/drawable/ic_star_border_black_24dp.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/drawable/ic_star_border_black_24dp.xml b/app/src/main/res/drawable/ic_star_border_black_24dp.xml
new file mode 100644
index 0000000..b36536b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_star_border_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z"/>
+</vector>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/f0a4e684/app/src/main/res/layout/fragment_detail_workflow.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/layout/fragment_detail_workflow.xml b/app/src/main/res/layout/fragment_detail_workflow.xml
index d202268..1c94c49 100644
--- a/app/src/main/res/layout/fragment_detail_workflow.xml
+++ b/app/src/main/res/layout/fragment_detail_workflow.xml
@@ -49,51 +49,52 @@
<ImageView
android:id="@+id/ivWorkflowImage"
android:layout_width="match_parent"
- android:layout_height="300dp"
+ android:layout_height="@dimen/ivWorkflowImage_height"
android:scaleType="fitCenter"
android:src="@mipmap/ic_launcher"/>
<View
android:layout_width="match_parent"
- android:layout_height="1dp"
+ android:layout_height="@dimen/view_height"
android:background="@color/grey_background"/>
- <ImageView
+ <android.support.design.widget.FloatingActionButton
android:id="@+id/ivFav"
- android:layout_width="40dp"
- android:layout_height="40dp"
+ android:layout_width="@dimen/ivFav_width"
+ android:layout_height="@dimen/ivFav_height"
android:layout_gravity="right"
- android:layout_marginRight="20dp"
- android:layout_marginTop="-20dp"
- android:background="@drawable/background_fav_button"
- app:srcCompat="@drawable/ic_star_border_black_24dp"/>
+ android:layout_marginRight="@dimen/ivFav_marginRight"
+ android:layout_marginTop="@dimen/ivFav_marginTop"
+ android:backgroundTint="@color/colorPrimaryDark"
+ app:borderWidth="@dimen/ivFav_borderWidth"
+ android:src="@drawable/ic_star_border_black_24dp"/>
<TextView
android:id="@+id/tvTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:padding="10dp"
+ android:padding="@dimen/tvTitle_padding"
android:textColor="@android:color/black"
- android:textSize="20sp"/>
+ android:textSize="@dimen/tvTitle_textSize"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="5dp"
+ android:layout_marginTop="@dimen/LinearLayout_margin_top"
android:orientation="horizontal">
<ImageView
android:id="@+id/ivUploader"
- android:layout_width="50dp"
- android:layout_height="50dp"
- android:paddingLeft="10dp"
+ android:layout_width="@dimen/ivUploader_width"
+ android:layout_height="@dimen/ivUploader_height"
+ android:paddingLeft="@dimen/ivUploader_paddingLeft"
android:src="@mipmap/ic_launcher"/>
<RelativeLayout
- android:layout_width="0dp"
- android:layout_height="50dp"
- android:layout_marginLeft="10dp"
- android:layout_marginStart="10dp"
+ android:layout_width="@dimen/relLay2_width"
+ android:layout_height="@dimen/relLay2_height"
+ android:layout_marginLeft="@dimen/relLay2_marginLeft"
+ android:layout_marginStart="@dimen/relLay2_marginStart"
android:layout_weight="1">
<TextView
@@ -101,7 +102,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@android:color/black"
- android:textSize="18sp"/>
+ android:textSize="@dimen/tvUploaderName_textSize"/>
<TextView
android:id="@+id/tvDate"
@@ -116,10 +117,10 @@
android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
- android:paddingEnd="10dp"
- android:paddingLeft="0dp"
- android:paddingRight="10dp"
- android:paddingStart="0dp"/>
+ android:paddingEnd="@dimen/tvType_paddingEnd"
+ android:paddingLeft="@dimen/tvType_paddingLeft"
+ android:paddingRight="@dimen/tvType_paddingRight"
+ android:paddingStart="@dimen/tvType_paddingStart"/>
</RelativeLayout>
</LinearLayout>
@@ -129,13 +130,13 @@
android:layout_height="match_parent"
android:background="@color/grey_background"
android:orientation="vertical"
- android:padding="15dp">
+ android:padding="@dimen/linLay2_padding">
<WebView
android:id="@+id/tvDescription"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:padding="5dp"
+ android:padding="@dimen/tvDescription_padding"
/>
</LinearLayout>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/f0a4e684/app/src/main/res/values/dimens.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 3aa0017..7d2f772 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -36,6 +36,32 @@ limitations under the License.
<dimen name="usageCardViewPaddingBotton">10sp</dimen>
<dimen name="usageCardSpaceHeight">10sp</dimen>
+ <!--Fragment Detail Workflow Dimens-->
+ <dimen name="ivWorkflowImage_height">300dp</dimen>
+ <dimen name="view_height">1sp</dimen>
+ <dimen name="ivFav_width">55dp</dimen>
+ <dimen name="ivFav_height">55dp</dimen>
+ <dimen name="ivFav_marginRight">16dp</dimen>
+ <dimen name="ivFav_marginTop">-27dp</dimen>
+ <dimen name="ivFav_borderWidth">0sp</dimen>
+ <dimen name="tvTitle_padding">10sp</dimen>
+ <dimen name="tvTitle_textSize">20sp</dimen>
+ <dimen name="LinearLayout_margin_top">5sp</dimen>
+ <dimen name="ivUploader_width">50sp</dimen>
+ <dimen name="ivUploader_height">50sp</dimen>
+ <dimen name="ivUploader_paddingLeft">10sp</dimen>
+ <dimen name="relLay2_width">0sp</dimen>
+ <dimen name="relLay2_height">50sp</dimen>
+ <dimen name="relLay2_marginLeft">10sp</dimen>
+ <dimen name="relLay2_marginStart">10sp</dimen>
+ <dimen name="tvUploaderName_textSize">18sp</dimen>
+ <dimen name="tvType_paddingEnd">10sp</dimen>
+ <dimen name="tvType_paddingLeft">0sp</dimen>
+ <dimen name="tvType_paddingRight">10sp</dimen>
+ <dimen name="tvType_paddingStart">0sp</dimen>
+ <dimen name="linLay2_padding">15sp</dimen>
+ <dimen name="tvDescription_padding">5sp</dimen>
+
<!-- Per the design guidelines, navigation drawers should be between 240dp and 320dp:
https://developer.android.com/design/patterns/navigation-drawer.html -->
<dimen name="navigation_drawer_width">240dp</dimen>