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 2015/06/15 12:43:01 UTC
[06/15] incubator-taverna-mobile git commit: Added scroll feature on
short screens in the login layout
Added scroll feature on short screens in the login layout
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/1ecf5bef
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/1ecf5bef
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/1ecf5bef
Branch: refs/heads/master
Commit: 1ecf5beff9a1b67ae2981a3cc5ad308d198d4dbe
Parents: 7e5b359
Author: larrytech7 <la...@gmail.com>
Authored: Sat Jun 13 18:23:13 2015 +0100
Committer: larrytech7 <la...@gmail.com>
Committed: Sat Jun 13 18:23:13 2015 +0100
----------------------------------------------------------------------
.../mobile/activities/DashboardMainActivity.java | 4 ++--
.../taverna/mobile/fragments/WorkflowItemFragment.java | 8 +++++---
.../apache/taverna/mobile/utils/WorkflowLoader.java | 2 ++
app/src/main/res/layout/fragment_login.xml | 13 ++++++++++---
4 files changed, 19 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/1ecf5bef/app/src/main/java/org/apache/taverna/mobile/activities/DashboardMainActivity.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/activities/DashboardMainActivity.java b/app/src/main/java/org/apache/taverna/mobile/activities/DashboardMainActivity.java
index fd38391..ec18acd 100644
--- a/app/src/main/java/org/apache/taverna/mobile/activities/DashboardMainActivity.java
+++ b/app/src/main/java/org/apache/taverna/mobile/activities/DashboardMainActivity.java
@@ -105,8 +105,8 @@ public class DashboardMainActivity extends ActionBarActivity
Toast.makeText(this,"Query = "+query, Toast.LENGTH_SHORT).show();
}
setUpWorkflowDirectory(this);
- if (savedInstanceState == null)
- getSupportFragmentManager().beginTransaction().add(R.id.container, WorkflowItemFragment.newInstance("","")).commit();
+ /*if (savedInstanceState == null)
+ getSupportFragmentManager().beginTransaction().add(R.id.container, WorkflowItemFragment.newInstance("","")).commit();*/
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/1ecf5bef/app/src/main/java/org/apache/taverna/mobile/fragments/WorkflowItemFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/fragments/WorkflowItemFragment.java b/app/src/main/java/org/apache/taverna/mobile/fragments/WorkflowItemFragment.java
index 7270e55..3bfb0a0 100644
--- a/app/src/main/java/org/apache/taverna/mobile/fragments/WorkflowItemFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/fragments/WorkflowItemFragment.java
@@ -37,6 +37,7 @@ import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
+import android.view.Window;
import android.view.animation.Animation;
import android.view.animation.AnimationUtils;
import android.widget.AdapterView;
@@ -119,6 +120,7 @@ public class WorkflowItemFragment extends Fragment implements AdapterView.OnItem
mlist.add(new Workflow(getActivity(), null));
mlist.add(new Workflow(getActivity(), null)); */
workflowAdapter = new WorkflowAdapter(getActivity(), mlist );
+ getActivity().setProgressBarIndeterminateVisibility(true);
}
@Override
@@ -131,7 +133,7 @@ public class WorkflowItemFragment extends Fragment implements AdapterView.OnItem
mListView.setLayoutManager(new LinearLayoutManager(getActivity()));
if(workflowAdapter.getItemCount() == 0){
setEmptyText("No Workflows available");
- mListView.swapAdapter(null, false);
+ mListView.swapAdapter(workflowAdapter, false);
}else {
mListView.setAdapter(workflowAdapter);
mListView.setAnimation(in);
@@ -237,13 +239,13 @@ public class WorkflowItemFragment extends Fragment implements AdapterView.OnItem
*/
@Override
public android.content.Loader<List<Workflow>> onCreateLoader(int id, Bundle args) {
- getActivity().setProgressBarIndeterminateVisibility(true);
+ //getActivity().setProgressBarIndeterminateVisibility(true);
return new WorkflowLoader(getActivity());
}
@Override
public void onLoadFinished(android.content.Loader<List<Workflow>> loader, List<Workflow> workflows) {
- getActivity().setProgressBarIndeterminateVisibility(false);
+ // getActivity().setProgressBarIndeterminateVisibility(false);
loader.stopLoading();
workflowAdapter = new WorkflowAdapter(getActivity(), workflows);
if(workflows.size() > 0)
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/1ecf5bef/app/src/main/java/org/apache/taverna/mobile/utils/WorkflowLoader.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/utils/WorkflowLoader.java b/app/src/main/java/org/apache/taverna/mobile/utils/WorkflowLoader.java
index 9c97485..198b4ba 100644
--- a/app/src/main/java/org/apache/taverna/mobile/utils/WorkflowLoader.java
+++ b/app/src/main/java/org/apache/taverna/mobile/utils/WorkflowLoader.java
@@ -23,6 +23,7 @@ package org.apache.taverna.mobile.utils;
* specific language governing permissions and limitations
* under the License.
*/
+import android.app.Activity;
import android.content.AsyncTaskLoader;
import android.content.Context;
@@ -117,6 +118,7 @@ public class WorkflowLoader extends AsyncTaskLoader<List<Workflow>> {
@Override
protected void onStartLoading() {
//if there is data available, deliver it at once
+ ((Activity)ctx).setProgressBarIndeterminateVisibility(true);
if(userWorkflows != null)
deliverResult(userWorkflows);
else{
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/1ecf5bef/app/src/main/res/layout/fragment_login.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml
index b188789..b1206c3 100644
--- a/app/src/main/res/layout/fragment_login.xml
+++ b/app/src/main/res/layout/fragment_login.xml
@@ -17,9 +17,15 @@ 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.
-->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
- android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
+<ScrollView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+<RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:paddingBottom="@dimen/activity_vertical_margin"
@@ -138,3 +144,4 @@ limitations under the License.
</LinearLayout>
</RelativeLayout>
+</ScrollView>
\ No newline at end of file