Repository: incubator-taverna-mobile Updated Branches: refs/heads/master 6a1d31de4 -> ca8ada18e
Enhancement in exit button 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/276fa40e Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/276fa40e Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/276fa40e Branch: refs/heads/master Commit: 276fa40e713cb339acffc24728f38f921cb30a89 Parents: 55a8d96 Author: Hitesh Gautam <gautam31.hit...@gmail.com> Authored: Fri Feb 23 13:23:22 2018 +0530 Committer: Hitesh Gautam <gautam31.hit...@gmail.com> Committed: Fri Feb 23 13:23:22 2018 +0530 ---------------------------------------------------------------------- .../mobile/ui/imagezoom/ImageZoomFragment.java | 17 ----------- .../workflowdetail/WorkflowDetailFragment.java | 10 ------- app/src/main/res/layout/fragment_image_zoom.xml | 31 ++++++++++---------- 3 files changed, 16 insertions(+), 42 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/276fa40e/app/src/main/java/org/apache/taverna/mobile/ui/imagezoom/ImageZoomFragment.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/imagezoom/ImageZoomFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/imagezoom/ImageZoomFragment.java index 8fab037..ad5680f 100644 --- a/app/src/main/java/org/apache/taverna/mobile/ui/imagezoom/ImageZoomFragment.java +++ b/app/src/main/java/org/apache/taverna/mobile/ui/imagezoom/ImageZoomFragment.java @@ -73,27 +73,19 @@ public class ImageZoomFragment extends Fragment implements ImageZoomMvpView { public static ImageZoomFragment newInstance(String jpgURI, String svgURI) { - Bundle args = new Bundle(); - args.putString(JPG_URI, jpgURI); - args.putString(SVG_URI, svgURI); - ImageZoomFragment fragment = new ImageZoomFragment(); fragment.setArguments(args); - return fragment; } @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - svgURI = getArguments().getString(SVG_URI); - jpgURI = getArguments().getString(JPG_URI); - mImageZoomPresenter = new ImageZoomPresenter(); } @@ -115,19 +107,14 @@ public class ImageZoomFragment extends Fragment implements ImageZoomMvpView { super.onActivityCreated(savedInstanceState); if (ConnectionInfo.isConnectingToInternet(getContext())) { - mImageZoomPresenter.loadImage(svgURI, workflowImage); } else { - showErrorSnackBar(getString(R.string.no_internet_connection)); } - - } @OnClick(R.id.ivClose) public void closeActivity(View v) { - getActivity().finish(); } @@ -136,20 +123,16 @@ public class ImageZoomFragment extends Fragment implements ImageZoomMvpView { public void showErrorSnackBar(String error) { final Snackbar snackbar = Snackbar.make(workflowImage, error, Snackbar.LENGTH_INDEFINITE); - snackbar.setAction("OK", new View.OnClickListener() { @Override public void onClick(View view) { - snackbar.dismiss(); getActivity().finish(); } }); - snackbar.show(); Handler handler = new Handler(); - handler.postDelayed(new Runnable() { public void run() { snackbar.dismiss(); http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/276fa40e/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java index d6920a5..b332882 100644 --- a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java +++ b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java @@ -177,7 +177,6 @@ public class WorkflowDetailFragment extends Fragment implements WorkflowDetailMv @OnClick(R.id.fabRun) void fabClickRunWorkflow(View v) { - Intent intent = new Intent(getActivity(), WorkflowRunActivity.class); intent.putExtra(Constants.WORKFLOW_URL, mWorkflow.getContentUri()); startActivity(intent); @@ -204,19 +203,15 @@ public class WorkflowDetailFragment extends Fragment implements WorkflowDetailMv case R.id.licence: if (licenceId == null) { - showErrorSnackBar("Please wait"); } else if (licenceId.isEmpty()) { - showErrorSnackBar("No Licence Found"); } else { - mWorkflowDetailPresenter.loadLicenseDetail(licenceId); } return true; } - return super.onOptionsItemSelected(item); } @@ -271,19 +266,16 @@ public class WorkflowDetailFragment extends Fragment implements WorkflowDetailMv @Override public void setImage(User user) { - Glide.with(getContext()) .load(user.getAvatar().getResource()) .diskCacheStrategy(DiskCacheStrategy.SOURCE) .placeholder(R.drawable.placeholder) .error(R.drawable.placeholder) .into(uploaderImage); - } @Override public void showErrorSnackBar(String error) { - final Snackbar snackbar = Snackbar.make(rootLayout, error, Snackbar .LENGTH_INDEFINITE); snackbar.setAction("OK", new View.OnClickListener() { @@ -292,9 +284,7 @@ public class WorkflowDetailFragment extends Fragment implements WorkflowDetailMv snackbar.dismiss(); } }); - snackbar.show(); - } @Override http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/276fa40e/app/src/main/res/layout/fragment_image_zoom.xml ---------------------------------------------------------------------- diff --git a/app/src/main/res/layout/fragment_image_zoom.xml b/app/src/main/res/layout/fragment_image_zoom.xml index ae0c742..4f27835 100644 --- a/app/src/main/res/layout/fragment_image_zoom.xml +++ b/app/src/main/res/layout/fragment_image_zoom.xml @@ -1,5 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?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. @@ -17,20 +16,22 @@ --> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"; - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@android:color/white"> + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@android:color/white"> - <ImageView android:id="@+id/ivWorkflowImage" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_centerInParent="true" - /> + <ImageView + android:id="@+id/ivWorkflowImage" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_centerInParent="true" /> - <ImageView android:id="@+id/ivClose" - android:layout_width="50dp" - android:layout_height="50dp" - android:src="@drawable/ic_clear_black_24dp" - android:background="@android:color/white"/> + <ImageView + android:id="@+id/ivClose" + android:layout_width="35dp" + android:layout_height="35dp" + android:layout_margin="8dp" + android:background="@android:color/white" + android:src="@drawable/ic_clear_black_24dp" /> </RelativeLayout> \ No newline at end of file
