Repository: incubator-taverna-mobile Updated Branches: refs/heads/master 249488589 -> 934b897c2
Fix: Replacing empty screens with messages in myworkflows and favorit_workflows fragments 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/470224d1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/470224d1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/470224d1 Branch: refs/heads/master Commit: 470224d1587ca5c5818e36bd19a166280b6054aa Parents: e7dff17 Author: Hitesh Gautam <[email protected]> Authored: Sat Apr 28 22:59:11 2018 +0530 Committer: Hitesh Gautam <[email protected]> Committed: Mon Apr 30 13:50:11 2018 +0530 ---------------------------------------------------------------------- .../FavouriteWorkflowsFragment.java | 6 ++-- .../ui/myworkflows/MyWorkflowFragment.java | 6 ++-- .../main/res/drawable/ic_stars_grey_24dp.xml | 9 ++++++ .../main/res/drawable/ic_storage_grey_24dp.xml | 9 ++++++ app/src/main/res/layout/fragment_dashboard.xml | 31 +++++++++++++++++--- .../layout/fragment_favourite_workflow_list.xml | 29 +++++++++++++++--- app/src/main/res/values/dimens.xml | 7 +++-- app/src/main/res/values/strings.xml | 4 +-- 8 files changed, 83 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/470224d1/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 8519e6f..d988d78 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 @@ -44,7 +44,7 @@ import android.view.MenuInflater; import android.view.View; import android.view.ViewGroup; import android.widget.ProgressBar; -import android.widget.TextView; +import android.widget.RelativeLayout; import android.widget.Toast; import java.util.ArrayList; @@ -65,8 +65,8 @@ public class FavouriteWorkflowsFragment extends Fragment @BindView(R.id.progress_circular) ProgressBar mProgressBar; - @BindView(R.id.error_no_workflow) - TextView tvNoWorkflowError; + @BindView(R.id.layout_empty_fav_workflow) + RelativeLayout tvNoWorkflowError; private DataManager dataManager; http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/470224d1/app/src/main/java/org/apache/taverna/mobile/ui/myworkflows/MyWorkflowFragment.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/myworkflows/MyWorkflowFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/myworkflows/MyWorkflowFragment.java index c574225..0247d90 100644 --- a/app/src/main/java/org/apache/taverna/mobile/ui/myworkflows/MyWorkflowFragment.java +++ b/app/src/main/java/org/apache/taverna/mobile/ui/myworkflows/MyWorkflowFragment.java @@ -42,7 +42,7 @@ import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; import android.widget.ProgressBar; -import android.widget.TextView; +import android.widget.RelativeLayout; import java.util.ArrayList; import java.util.List; @@ -64,8 +64,8 @@ public class MyWorkflowFragment extends Fragment implements MyWorkflowMvpView, @BindView(R.id.swipe_refresh) ScrollChildSwipeRefreshLayout mSwipeRefresh; - @BindView(R.id.tvNoWorkflow) - TextView mTextViewNoWorkflow; + @BindView(R.id.layout_empty_workflows) + RelativeLayout mTextViewNoWorkflow; private DataManager dataManager; http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/470224d1/app/src/main/res/drawable/ic_stars_grey_24dp.xml ---------------------------------------------------------------------- diff --git a/app/src/main/res/drawable/ic_stars_grey_24dp.xml b/app/src/main/res/drawable/ic_stars_grey_24dp.xml new file mode 100644 index 0000000..8e3f34e --- /dev/null +++ b/app/src/main/res/drawable/ic_stars_grey_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="#B0BEC5" + android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM16.23,18L12,15.45 7.77,18l1.12,-4.81 -3.73,-3.23 4.92,-0.42L12,5l1.92,4.53 4.92,0.42 -3.73,3.23L16.23,18z"/> +</vector> http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/470224d1/app/src/main/res/drawable/ic_storage_grey_24dp.xml ---------------------------------------------------------------------- diff --git a/app/src/main/res/drawable/ic_storage_grey_24dp.xml b/app/src/main/res/drawable/ic_storage_grey_24dp.xml new file mode 100644 index 0000000..30f79d2 --- /dev/null +++ b/app/src/main/res/drawable/ic_storage_grey_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="#B0BEC5" + android:pathData="M2,20h20v-4L2,16v4zM4,17h2v2L4,19v-2zM2,4v4h20L22,4L2,4zM6,7L4,7L4,5h2v2zM2,14h20v-4L2,10v4zM4,11h2v2L4,13v-2z"/> +</vector> http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/470224d1/app/src/main/res/layout/fragment_dashboard.xml ---------------------------------------------------------------------- diff --git a/app/src/main/res/layout/fragment_dashboard.xml b/app/src/main/res/layout/fragment_dashboard.xml index c16fb63..21c4394 100644 --- a/app/src/main/res/layout/fragment_dashboard.xml +++ b/app/src/main/res/layout/fragment_dashboard.xml @@ -21,14 +21,35 @@ android:layout_height="match_parent" android:background="@color/grey_background"> - <TextView - android:id="@+id/tvNoWorkflow" + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_centerVertical="true" + android:layout_centerHorizontal="true" + android:visibility="gone" + android:id="@+id/layout_empty_workflows" + android:layout_marginBottom="@dimen/relative_layout_margin_bottom"> + + <ImageView + android:id="@+id/image_workflows" + android:layout_width="@dimen/center_icon_height_width" + android:layout_height="@dimen/center_icon_height_width" + android:src="@drawable/ic_storage_grey_24dp" + android:layout_centerVertical="true" + android:layout_centerHorizontal="true" /> + + <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerInParent="true" android:text="@string/no_my_workflow" - android:textSize="20sp" - android:visibility="gone"/> + android:textStyle="bold" + android:textSize="@dimen/message_text_size" + android:layout_below="@id/image_workflows" + android:layout_centerHorizontal="true" + android:layout_centerVertical="true"/> + + </RelativeLayout> <org.apache.taverna.mobile.utils.ScrollChildSwipeRefreshLayout android:id="@+id/swipe_refresh" @@ -41,6 +62,7 @@ android:layout_height="match_parent" android:clipToPadding="false" android:padding="@dimen/item_offset"/> + </org.apache.taverna.mobile.utils.ScrollChildSwipeRefreshLayout> <ProgressBar @@ -50,4 +72,5 @@ android:layout_centerHorizontal="true" android:layout_centerVertical="true" android:visibility="visible"/> + </RelativeLayout> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/470224d1/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 2ac917d..6537c39 100644 --- a/app/src/main/res/layout/fragment_favourite_workflow_list.xml +++ b/app/src/main/res/layout/fragment_favourite_workflow_list.xml @@ -37,13 +37,34 @@ android:layout_centerVertical="true" android:visibility="visible"/> - <TextView - android:id="@+id/error_no_workflow" + + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_centerVertical="true" + android:layout_centerHorizontal="true" + android:visibility="gone" + android:id="@+id/layout_empty_fav_workflow" + android:layout_marginBottom="@dimen/relative_layout_margin_bottom" > + + <ImageView + android:id="@+id/image_fav_workflow" + android:layout_width="@dimen/center_icon_height_width" + android:layout_height="@dimen/center_icon_height_width" + android:src="@drawable/ic_stars_grey_24dp" + android:layout_centerVertical="true" + android:layout_centerHorizontal="true" /> + + <TextView 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"/> + android:textSize="@dimen/message_text_size" + android:layout_below="@id/image_fav_workflow" + android:layout_centerHorizontal="true" + android:layout_centerVertical="true"/> + + </RelativeLayout> </RelativeLayout> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/470224d1/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 01e3137..b9512c5 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -62,8 +62,6 @@ limitations under the License. <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> <dimen name="item_offset">3dp</dimen> <dimen name="fab_margin">16dp</dimen> @@ -92,6 +90,11 @@ limitations under the License. <dimen name="logo_width">70dp</dimen> <dimen name="login_button_radius">80dp</dimen> + <!--fragment_dashboard and fragment_fav_workflow_list dimens --> + <dimen name="relative_layout_margin_bottom">25sp</dimen> + <dimen name="center_icon_height_width">130sp</dimen> + <dimen name="message_text_size">15sp</dimen> + <!-- Tutorial Screen --> <dimen name="dots_height">30dp</dimen> <dimen name="dots_margin_bottom">20dp</dimen> http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/470224d1/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 cc65d09..9739e25 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -157,7 +157,7 @@ limitations under the License. <string name="announcement">Announcementss</string> <string name="no_internet_connection">No Internet Connection</string> <string name="licence">Licence</string> - <string name="no_favourite_workflow_found">No Favourite Workflow Found!!!</string> + <string name="no_favourite_workflow_found">No Favourite Workflow Found !</string> <string name="image_zoom">Image Zoom</string> <string name="hint_email">Email or Username</string> <string name="hint_email_player">Email</string> @@ -167,7 +167,7 @@ limitations under the License. <string name="err_login_password">Enter valid password</string> <string name="error_failed_to_fetch_workflow">Failed to fetch Workflow</string> - <string name="no_my_workflow">You have not created any workflow yet !!!!!</string> + <string name="no_my_workflow">You have not created any workflow yet !</string> <string name="error_vaild_credential">Please enter valid credential</string> <string name="t2_workflow_type">Taverna 2</string>
