Fixing workflow image zoom
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/54c66d80 Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/54c66d80 Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/54c66d80 Branch: refs/heads/master Commit: 54c66d8041179c7ac889cfeefafe80b8189b39c2 Parents: 5699f7c Author: larrytech7 <larrya...@gmail.com> Authored: Fri Jul 10 22:19:11 2015 +0100 Committer: larrytech7 <larrya...@gmail.com> Committed: Fri Jul 10 22:19:11 2015 +0100 ---------------------------------------------------------------------- .../mobile/fragments/workflowdetails/RunFragment.java | 14 ++++++-------- app/src/main/res/anim/zoomin | 13 +++++++------ 2 files changed, 13 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/54c66d80/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/RunFragment.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/RunFragment.java b/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/RunFragment.java index 3dbde9e..a55eed6 100644 --- a/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/RunFragment.java +++ b/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/RunFragment.java @@ -170,14 +170,15 @@ public class RunFragment extends Fragment implements View.OnClickListener{ try { runStartTime.setHint(runInfo.getString("start_time")); runEndTime.setHint(runInfo.getString("finish_time")); + runStateTextView.setText(runInfo.getString("status_message")); - if(runInfo.getString("state").contains("Pending")) + if(runInfo.getString("status_message").contains("Pending")) status.setImageResource(android.R.drawable.presence_busy); - else if (runInfo.getString("state").contains("Running")) + else if (runInfo.getString("status_message").contains("Running")) status.setImageResource(android.R.drawable.presence_away); - else if (runInfo.getString("state").contains("Finished")) + else if (runInfo.getString("status_message").contains("Finished")) status.setImageResource(android.R.drawable.presence_online); - else if (runInfo.getString("state").contains("Failed")) + else if (runInfo.getString("status_message").contains("Failed")) status.setImageResource(android.R.drawable.presence_offline); else status.setImageResource(android.R.drawable.presence_invisible); @@ -206,12 +207,8 @@ public class RunFragment extends Fragment implements View.OnClickListener{ URL workflowurl = new URL(new TavernaPlayerAPI(this.context).PLAYER_RUN_URL+this.runid); HttpURLConnection connection = (HttpURLConnection) workflowurl.openConnection(); - String userpass = "icep...@gmail.com" + ":" + "creationfox"; - String basicAuth = "Basic " + Base64.encodeToString(userpass.getBytes(), Base64.DEFAULT); - // connection.setRequestProperty("Authorization", basicAuth); connection.setRequestProperty("Accept", "application/json"); - // connection.setRequestProperty("Content-Type", "application/json"); connection.setRequestMethod("GET"); connection.connect(); //send request @@ -228,6 +225,7 @@ public class RunFragment extends Fragment implements View.OnClickListener{ connection.disconnect(); JSONObject runInfo = new JSONObject(sb.toString()); + // System.out.println(runInfo.toString(2)); updateRun(runInfo); }catch (IOException ex){ http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/54c66d80/app/src/main/res/anim/zoomin ---------------------------------------------------------------------- diff --git a/app/src/main/res/anim/zoomin b/app/src/main/res/anim/zoomin index 691c50e..e36b773 100644 --- a/app/src/main/res/anim/zoomin +++ b/app/src/main/res/anim/zoomin @@ -1,15 +1,16 @@ <?xml version="1.0" encoding="utf-8"?> <set xmlns:android="http://schemas.android.com/apk/res/android"; - android:fillAfter="true" > + android:interpolator="@android:anim/linear_interpolator"> <scale - xmlns:android="http://schemas.android.com/apk/res/android"; - android:duration="20000" - android:fromXScale="1" + android:duration="1500" + android:fromXScale="1.0" android:fromYScale="1" android:pivotX="50%" android:pivotY="50%" - android:toXScale="3" - android:toYScale="3" > + android:toXScale="3.0" + android:toYScale="3.0" + android:repeatCount="1" + android:repeatMode="reverse"> </scale> </set> \ No newline at end of file
