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 2016/10/03 14:49:58 UTC
[48/50] [abbrv] incubator-taverna-mobile git commit: add all
suggestion
add all suggestion
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/b1a458ad
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/b1a458ad
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/b1a458ad
Branch: refs/heads/master
Commit: b1a458ad8a80b4d252ff94ef92b179246cd7a8f2
Parents: 3809ea2
Author: Sagar <ku...@gmail.com>
Authored: Thu Sep 29 23:03:23 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Thu Sep 29 23:03:23 2016 +0530
----------------------------------------------------------------------
.../apache/taverna/mobile/data/DataManager.java | 9 +-
.../mobile/data/local/PreferencesHelper.java | 3 -
.../data/remote/TavernaPlayerService.java | 3 +-
.../taverna/mobile/ui/DownloadingFragment.java | 17 +--
.../FavouriteWorkflowDetailFragment.java | 10 +-
.../ui/playerlogin/PlayerLoginFragment.java | 23 +---
.../ui/playerlogin/PlayerLoginMvpView.java | 2 +-
.../ui/playerlogin/PlayerLoginPresenter.java | 5 +-
.../workflowdetail/WorkflowDetailFragment.java | 20 ++--
.../ui/workflowrun/WorkflowRunActivity.java | 25 +++--
.../apache/taverna/mobile/utils/Constants.java | 27 +++++
.../apache/taverna/mobile/utils/WebViewGen.java | 111 ------------------
.../taverna/mobile/utils/WebViewGenerator.java | 112 +++++++++++++++++++
.../res/layout/fragment_detail_workflow.xml | 8 +-
.../main/res/layout/fragment_downloading.xml | 5 +-
.../res/layout/fragment_player_login_layout.xml | 4 +-
app/src/main/res/values/strings.xml | 17 +++
17 files changed, 208 insertions(+), 193 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b1a458ad/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java b/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java
index 5171763..56dc3d2 100644
--- a/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java
@@ -195,14 +195,7 @@ public class DataManager {
public Observable<ResponseBody> authPlayerUserLoginDetail(final String credentials,
final boolean flagLogin) {
- return mBaseApiManager.getTavernaPlayerApi().playerlogin(credentials)
- .concatMap(new Func1<ResponseBody, Observable<? extends ResponseBody>>() {
- @Override
- public Observable<? extends ResponseBody> call(ResponseBody responseBody) {
-
- return Observable.just(responseBody);
- }
- });
+ return mBaseApiManager.getTavernaPlayerApi().playerlogin(credentials);
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b1a458ad/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java b/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java
index 04241c6..41d29e3 100644
--- a/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java
@@ -183,14 +183,11 @@ public class PreferencesHelper {
}
public void setUserPlayerLoggedInFlagAndCredential(Boolean flag, String credential) {
-
mPref.edit().putBoolean(PREF_KEY_PLAYER_LOGGED_IN, flag).apply();
-
mPref.edit().putString(PREF_KEY_PLAYER_CREDENTIAL, credential).apply();
}
public void setUserPlayerLoggedInFlag(Boolean flag) {
-
mPref.edit().putBoolean(PREF_KEY_PLAYER_LOGGED_IN, flag).apply();
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b1a458ad/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaPlayerService.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaPlayerService.java b/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaPlayerService.java
index 1a21f6b..e71ea38 100644
--- a/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaPlayerService.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaPlayerService.java
@@ -43,8 +43,7 @@ public interface TavernaPlayerService {
String authorization);
@POST("/users/sign_in")
- @Headers({
- APIEndPoint.XML_ACCEPT_HEADER})
+ @Headers({APIEndPoint.XML_ACCEPT_HEADER})
Observable<ResponseBody> playerlogin(@Header("Authorization") String
authorization);
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b1a458ad/app/src/main/java/org/apache/taverna/mobile/ui/DownloadingFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/DownloadingFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/DownloadingFragment.java
index a2eb05f..3a44fb3 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/DownloadingFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/DownloadingFragment.java
@@ -27,6 +27,7 @@ import android.view.ViewGroup;
import android.widget.TextView;
import org.apache.taverna.mobile.R;
+import org.apache.taverna.mobile.utils.Constants;
import butterknife.BindView;
import butterknife.ButterKnife;
@@ -34,17 +35,17 @@ import butterknife.ButterKnife;
public class DownloadingFragment extends Fragment {
- private static final String ARGS_MESSAGE = "args_message";
- String message;
+
+ private String message;
@BindView(R.id.tvMessage)
- TextView tvMessage;
+ TextView tv_Message;
public static DownloadingFragment newInstance(String message) {
Bundle args = new Bundle();
- args.putString(ARGS_MESSAGE, message);
+ args.putString(Constants.ARGS_MESSAGE, message);
DownloadingFragment fragment = new DownloadingFragment();
fragment.setArguments(args);
return fragment;
@@ -54,9 +55,9 @@ public class DownloadingFragment extends Fragment {
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
-
- message = getArguments().getString(ARGS_MESSAGE);
-
+ if(getArguments()!=null) {
+ message = getArguments().getString(Constants.ARGS_MESSAGE);
+ }
}
@Nullable
@@ -74,7 +75,7 @@ public class DownloadingFragment extends Fragment {
public void onActivityCreated(@Nullable Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
- tvMessage.setText(message);
+ tv_Message.setText(message);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b1a458ad/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailFragment.java
index 7ca26a9..f217b6c 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailFragment.java
@@ -41,7 +41,6 @@ import android.widget.ProgressBar;
import android.widget.RelativeLayout;
import android.widget.ScrollView;
import android.widget.TextView;
-import android.widget.Toast;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
@@ -179,15 +178,10 @@ public class FavouriteWorkflowDetailFragment extends Fragment
@OnClick(R.id.fabRun)
- void fabRunClick(View v) {
- if (mWorkflow.getType().getContent().equals("Taverna 2")) {
+ void fabClickRunWorkflow(View v) {
Intent intent = new Intent(getActivity(), WorkflowRunActivity.class);
intent.putExtra(WorkflowRunActivity.WORKFLOW_URL, mWorkflow.getContentUri());
startActivity(intent);
- } else {
- Toast.makeText(getActivity(), "We can only run Taverna 2 workflow", Toast
- .LENGTH_LONG).show();
- }
}
@OnClick(R.id.ivWorkflowImage)
@@ -265,7 +259,7 @@ public class FavouriteWorkflowDetailFragment extends Fragment
licenceId = workflow.getLicenseType().getId();
}
- if (mWorkflow.getType().getContent().equals("Taverna 2")) {
+ if (mWorkflow.getType().getContent().equals(getString(R.string.t2_workflow_type))) {
fabRun.setVisibility(View.VISIBLE);
}else {
fabRun.setVisibility(View.GONE);
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b1a458ad/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginFragment.java
index 0d74489..324d2a6 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginFragment.java
@@ -97,20 +97,11 @@ public class PlayerLoginFragment extends Fragment implements PlayerLoginMvpView,
public void onActivityCreated(@Nullable Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
-
mEditTextEmail.addTextChangedListener(new CustomTextWatcher(mEditTextEmail));
-
-
- mEditTextPassword.addTextChangedListener(new CustomTextWatcher(mEditTextPassword));
-
mEditTextEmail.setOnFocusChangeListener(this);
+ mEditTextPassword.addTextChangedListener(new CustomTextWatcher(mEditTextPassword));
mEditTextPassword.setOnFocusChangeListener(this);
-
-
- //mPlayerLoginPresenter.PlayerLogin("kumarsagar15795@gmail.com", "Sagarishere", true);
-
-
}
@@ -133,17 +124,17 @@ public class PlayerLoginFragment extends Fragment implements PlayerLoginMvpView,
} else {
- showError("Please enter valid credential");
+ showError(R.string.error_vaild_credential);
}
} else {
- showError("NO Internet Connection");
+ showError(R.string.no_internet);
}
}
@Override
- public void showError(String string) {
- final Snackbar snackbar = Snackbar.make(mEditTextPassword, string, Snackbar
+ public void showError(int stringID) {
+ final Snackbar snackbar = Snackbar.make(mEditTextPassword, getString(stringID), Snackbar
.LENGTH_LONG);
snackbar.setAction("OK", new View.OnClickListener() {
@Override
@@ -171,10 +162,8 @@ public class PlayerLoginFragment extends Fragment implements PlayerLoginMvpView,
private void validateEmail() {
if (mEditTextEmail.getText().toString().trim().isEmpty()) {
-
mTextInputEmail.setError(getString(R.string.err_login_email));
} else {
-
mTextInputEmail.setError(null);
}
@@ -190,10 +179,8 @@ public class PlayerLoginFragment extends Fragment implements PlayerLoginMvpView,
private void validatePassword() {
if (mEditTextPassword.getText().toString().trim().isEmpty()) {
-
mTextInputPassword.setError(getString(R.string.err_login_password));
} else {
-
mTextInputPassword.setError(null);
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b1a458ad/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginMvpView.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginMvpView.java b/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginMvpView.java
index d3840ee..4b4d84d 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginMvpView.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginMvpView.java
@@ -23,7 +23,7 @@ import org.apache.taverna.mobile.ui.base.MvpView;
public interface PlayerLoginMvpView extends MvpView {
- void showError(String string);
+ void showError(int stringID);
void showCredentialError();
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b1a458ad/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginPresenter.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginPresenter.java b/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginPresenter.java
index 25c8fea..8113cbd 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginPresenter.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginPresenter.java
@@ -21,6 +21,7 @@ package org.apache.taverna.mobile.ui.playerlogin;
import android.util.Base64;
import android.util.Log;
+import org.apache.taverna.mobile.R;
import org.apache.taverna.mobile.data.DataManager;
import org.apache.taverna.mobile.ui.base.BasePresenter;
@@ -81,14 +82,14 @@ public class PlayerLoginPresenter extends BasePresenter<PlayerLoginMvpView> {
getEncodedCredential(username, password));
} else {
- getMvpView().showError("Server Error");
+ getMvpView().showError(R.string.servererr);
}
}
}
@Override
public void onNext(ResponseBody responseBody) {
- Log.e(TAG, "onCompleted: " + responseBody.byteStream());
+ Log.d(TAG, "onCompleted: " + responseBody.byteStream());
}
});
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b1a458ad/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 b435986..094511e 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
@@ -40,7 +40,6 @@ import android.widget.ProgressBar;
import android.widget.RelativeLayout;
import android.widget.ScrollView;
import android.widget.TextView;
-import android.widget.Toast;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
@@ -173,15 +172,12 @@ public class WorkflowDetailFragment extends Fragment implements WorkflowDetailMv
@OnClick(R.id.fabRun)
- void fabRunClick(View v) {
- if (mWorkflow.getType().getContent().equals("Taverna 2")) {
- Intent intent = new Intent(getActivity(), WorkflowRunActivity.class);
- intent.putExtra(WorkflowRunActivity.WORKFLOW_URL, mWorkflow.getContentUri());
- startActivity(intent);
- } else {
- Toast.makeText(getActivity(), "We can only run Taverna 2 workflow", Toast
- .LENGTH_LONG).show();
- }
+ void fabClickRunWorkflow(View v) {
+
+ Intent intent = new Intent(getActivity(), WorkflowRunActivity.class);
+ intent.putExtra(WorkflowRunActivity.WORKFLOW_URL, mWorkflow.getContentUri());
+ startActivity(intent);
+
}
@OnClick(R.id.ivWorkflowImage)
@@ -256,9 +252,9 @@ public class WorkflowDetailFragment extends Fragment implements WorkflowDetailMv
licenceId = workflow.getLicenseType().getId();
}
- if (mWorkflow.getType().getContent().equals("Taverna 2")) {
+ if (mWorkflow.getType().getContent().equals(getString(R.string.t2_workflow_type))) {
fabRun.setVisibility(View.VISIBLE);
- }else {
+ } else {
fabRun.setVisibility(View.GONE);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b1a458ad/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunActivity.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunActivity.java b/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunActivity.java
index 1a40847..b96ce16 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunActivity.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunActivity.java
@@ -36,7 +36,7 @@ import org.apache.taverna.mobile.data.local.PreferencesHelper;
import org.apache.taverna.mobile.ui.DownloadingFragment;
import org.apache.taverna.mobile.ui.playerlogin.PlayerLoginFragment;
import org.apache.taverna.mobile.utils.NonSwipeableViewPager;
-import org.apache.taverna.mobile.utils.WebViewGen;
+import org.apache.taverna.mobile.utils.WebViewGenerator;
import butterknife.BindView;
import butterknife.ButterKnife;
@@ -47,15 +47,23 @@ public class WorkflowRunActivity extends FragmentActivity implements WorkflowRun
PlayerLoginFragment.OnSuccessful {
public static final String WORKFLOW_URL = "Workflow_url";
- private final String[] labels = {"Player\nLogin", "Download", "Upload", "Inputs &\n Run"};
+
+ private String[] labels;
+
@BindView(R.id.stepsView)
StepsView mStepsView;
+
@BindView(R.id.viewpager)
NonSwipeableViewPager mPager;
+
int position = 0;
- String workflowRunURL;
+
+ private String workflowRunURL;
+
private DataManager dataManager;
+
private WorkflowRunPresenter mWorkflowRunPresenter;
+
private PagerAdapter mPagerAdapter;
@Override
@@ -72,6 +80,7 @@ public class WorkflowRunActivity extends FragmentActivity implements WorkflowRun
mWorkflowRunPresenter.attachView(this);
+ labels=getResources().getStringArray(R.array.player_run_slider_view_labels);
mStepsView.setCompletedPosition(position % labels.length)
.setLabels(labels)
@@ -139,7 +148,7 @@ public class WorkflowRunActivity extends FragmentActivity implements WorkflowRun
@Override
public void showError() {
- Toast.makeText(this, "Server Error. Please try after sometime", Toast
+ Toast.makeText(this, getString(R.string.servererr), Toast
.LENGTH_LONG).show();
finish();
}
@@ -156,13 +165,11 @@ public class WorkflowRunActivity extends FragmentActivity implements WorkflowRun
case 0:
return PlayerLoginFragment.newInstance();
case 1:
- return DownloadingFragment.newInstance("Downloading Workflow");
+ return DownloadingFragment.newInstance(getString(R.string.downloading_workflow_lable));
case 2:
- return DownloadingFragment.newInstance("Uploading Workflow");
- case 3:
- return WebViewGen.newInstance(workflowRunURL);
+ return DownloadingFragment.newInstance(getString(R.string.uploading_workflow_lable));
default:
- return DownloadingFragment.newInstance("Uploading1+ Workflow");
+ return WebViewGenerator.newInstance(workflowRunURL);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b1a458ad/app/src/main/java/org/apache/taverna/mobile/utils/Constants.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/utils/Constants.java b/app/src/main/java/org/apache/taverna/mobile/utils/Constants.java
new file mode 100644
index 0000000..bcbff27
--- /dev/null
+++ b/app/src/main/java/org/apache/taverna/mobile/utils/Constants.java
@@ -0,0 +1,27 @@
+/*
+ * 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. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, 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.
+ */
+package org.apache.taverna.mobile.utils;
+
+
+public class Constants {
+
+ public static final String ARGS_MESSAGE = "args_message";
+
+ public static final String ARGS_URL = "url";
+}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b1a458ad/app/src/main/java/org/apache/taverna/mobile/utils/WebViewGen.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/utils/WebViewGen.java b/app/src/main/java/org/apache/taverna/mobile/utils/WebViewGen.java
deleted file mode 100644
index 96cceac..0000000
--- a/app/src/main/java/org/apache/taverna/mobile/utils/WebViewGen.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * 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. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, 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.
- */
-package org.apache.taverna.mobile.utils;
-
-import android.graphics.Bitmap;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
-import android.widget.ProgressBar;
-
-import org.apache.taverna.mobile.R;
-
-public class WebViewGen extends Fragment {
- private static final String PARAM1 = "url";
- private int flag;
- private ProgressBar progressBar;
- private WebView web;
- private String url;
-
- public static WebViewGen newInstance(String URL) {
-
- Bundle args = new Bundle();
- args.putString(PARAM1, URL);
- WebViewGen fragment = new WebViewGen();
- fragment.setArguments(args);
- return fragment;
- }
-
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- if (getArguments() != null) {
- url = getArguments().getString(PARAM1);
- }
- }
-
- @Nullable
- @Override
- public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle
- savedInstanceState) {
- View layout = inflater.inflate(R.layout.webviewgen, container, false);
-
- web = (WebView) layout.findViewById(R.id.webView);
-
- progressBar = (ProgressBar) layout.findViewById(R.id.progressBar);
-
- web.setWebViewClient(new WebClient());
- web.getSettings().setJavaScriptEnabled(true);
- web.getSettings().setBuiltInZoomControls(true);
- web.loadUrl(url);
- web.canGoBack();
- return layout;
-
- }
-
- private void getServer() {
-
- }
-
-
- public class WebClient extends WebViewClient {
-
-
- @Override
- public void onPageStarted(WebView view, String url, Bitmap favicon) {
-
- super.onPageStarted(view, url, favicon);
-
- }
-
- @Override
- public boolean shouldOverrideUrlLoading(WebView view, String url) {
-
- progressBar.setVisibility(View.VISIBLE);
- view.loadUrl(url);
- return true;
-
- }
-
- @Override
- public void onPageFinished(WebView view, String url) {
-
- super.onPageFinished(view, url);
-
- progressBar.setVisibility(View.GONE);
- }
- }
-
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b1a458ad/app/src/main/java/org/apache/taverna/mobile/utils/WebViewGenerator.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/utils/WebViewGenerator.java b/app/src/main/java/org/apache/taverna/mobile/utils/WebViewGenerator.java
new file mode 100644
index 0000000..79c4c0a
--- /dev/null
+++ b/app/src/main/java/org/apache/taverna/mobile/utils/WebViewGenerator.java
@@ -0,0 +1,112 @@
+/*
+ * 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. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, 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.
+ */
+package org.apache.taverna.mobile.utils;
+
+import android.graphics.Bitmap;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+import android.widget.ProgressBar;
+
+import org.apache.taverna.mobile.R;
+
+public class WebViewGenerator extends Fragment {
+
+ private ProgressBar progressBar;
+
+ private WebView web;
+
+ private String url;
+
+ public static WebViewGenerator newInstance(String URL) {
+
+ Bundle args = new Bundle();
+ args.putString(Constants.ARGS_URL, URL);
+ WebViewGenerator fragment = new WebViewGenerator();
+ fragment.setArguments(args);
+ return fragment;
+ }
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ if (getArguments() != null) {
+ url = getArguments().getString(Constants.ARGS_URL);
+ }
+ }
+
+ @Nullable
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle
+ savedInstanceState) {
+ View layout = inflater.inflate(R.layout.webviewgen, container, false);
+
+ web = (WebView) layout.findViewById(R.id.webView);
+
+ progressBar = (ProgressBar) layout.findViewById(R.id.progressBar);
+
+ web.setWebViewClient(new WebClient());
+ web.getSettings().setJavaScriptEnabled(true);
+ web.getSettings().setBuiltInZoomControls(true);
+ web.loadUrl(url);
+ web.canGoBack();
+ return layout;
+
+ }
+
+ private void getServer() {
+
+ }
+
+
+ public class WebClient extends WebViewClient {
+
+
+ @Override
+ public void onPageStarted(WebView view, String url, Bitmap favicon) {
+
+ super.onPageStarted(view, url, favicon);
+
+ }
+
+ @Override
+ public boolean shouldOverrideUrlLoading(WebView view, String url) {
+
+ progressBar.setVisibility(View.VISIBLE);
+ view.loadUrl(url);
+ return true;
+
+ }
+
+ @Override
+ public void onPageFinished(WebView view, String url) {
+
+ super.onPageFinished(view, url);
+
+ progressBar.setVisibility(View.GONE);
+ }
+ }
+
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b1a458ad/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 83348a4..d202268 100644
--- a/app/src/main/res/layout/fragment_detail_workflow.xml
+++ b/app/src/main/res/layout/fragment_detail_workflow.xml
@@ -73,7 +73,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="10dp"
- android:text="title"
android:textColor="@android:color/black"
android:textSize="20sp"/>
@@ -101,7 +100,6 @@
android:id="@+id/tvUploaderName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="name"
android:textColor="@android:color/black"
android:textSize="18sp"/>
@@ -109,8 +107,7 @@
android:id="@+id/tvDate"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentBottom="true"
- android:text="Date"/>
+ android:layout_alignParentBottom="true"/>
<TextView
android:id="@+id/tvType"
@@ -122,8 +119,7 @@
android:paddingEnd="10dp"
android:paddingLeft="0dp"
android:paddingRight="10dp"
- android:paddingStart="0dp"
- android:text="type"/>
+ android:paddingStart="0dp"/>
</RelativeLayout>
</LinearLayout>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b1a458ad/app/src/main/res/layout/fragment_downloading.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/layout/fragment_downloading.xml b/app/src/main/res/layout/fragment_downloading.xml
index 108afc7..5558946 100644
--- a/app/src/main/res/layout/fragment_downloading.xml
+++ b/app/src/main/res/layout/fragment_downloading.xml
@@ -36,8 +36,7 @@ limitations under the License.
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="10dp"
- android:textSize="20sp"
- android:text="Downloading Workflow"/>
+ android:textSize="20sp"/>
<TextView
android:id="@+id/textView4"
android:layout_width="wrap_content"
@@ -46,5 +45,5 @@ limitations under the License.
android:layout_marginTop="10dp"
android:textSize="18sp"
android:layout_below="@id/tvMessage"
- android:text="Please Wait ..."/>
+ android:text="@string/please_wait"/>
</RelativeLayout>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b1a458ad/app/src/main/res/layout/fragment_player_login_layout.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/layout/fragment_player_login_layout.xml b/app/src/main/res/layout/fragment_player_login_layout.xml
index ea87d99..594fb6f 100644
--- a/app/src/main/res/layout/fragment_player_login_layout.xml
+++ b/app/src/main/res/layout/fragment_player_login_layout.xml
@@ -31,7 +31,7 @@ limitations under the License.
android:layout_height="wrap_content"
android:gravity="center"
android:textSize="24sp"
- android:text="Taverna Player Portal Login"/>
+ android:text="@string/headline_taverna_player_portal_login"/>
<android.support.design.widget.TextInputLayout
android:layout_below="@id/header"
@@ -79,7 +79,7 @@ limitations under the License.
android:id="@+id/bLogin"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="Login"
+ android:text="@string/button_text_login"
android:layout_marginTop="20dp"
android:layout_below="@id/cbRemember"/>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b1a458ad/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 fea986f..14f4948 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -122,4 +122,21 @@ limitations under the License.
<string name="err_login_password">Enter valid password</string>
<string name="my_workflows">My Workflows</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>
+
+
+ <string-array name="player_run_slider_view_labels">
+ <item>Player \nLogin</item>
+ <item>Download</item>
+ <item>Upload</item>
+ <item>Inputs &\nRun</item>
+ </string-array>
+
+ <string name="downloading_workflow_lable">Downloading Workflow</string>
+ <string name="uploading_workflow_lable">Uploading Workflow</string>
+ <string name="please_wait">Please Wait ...</string>
+ <string name="headline_taverna_player_portal_login">Taverna Player Portal Login</string>
+ <string name="button_text_login">Login</string>
+
</resources>