Repository: incubator-taverna-mobile Updated Branches: refs/heads/master c850e0593 -> ed7298ffa
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b93d871c/app/src/main/res/layout/fragment_run_result.xml ---------------------------------------------------------------------- diff --git a/app/src/main/res/layout/fragment_run_result.xml b/app/src/main/res/layout/fragment_run_result.xml deleted file mode 100644 index 676c307..0000000 --- a/app/src/main/res/layout/fragment_run_result.xml +++ /dev/null @@ -1,164 +0,0 @@ -<!-- - Apache Taverna Mobile - Copyright 2016 The Apache Software Foundation - - This product includes software developed at - The Apache Software Foundation (http://www.apache.org/). - - 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. ---> -<LinearLayout 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" - android:paddingRight="@dimen/activity_horizontal_margin" - android:paddingTop="@dimen/activity_vertical_margin" - android:paddingBottom="@dimen/activity_vertical_margin" - android:orientation="vertical" - > - - <LinearLayout - android:orientation="horizontal" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="10dp"> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceLarge" - android:id="@+id/textView_runName" - android:layout_weight="2" /> - - </LinearLayout> - - <LinearLayout - android:orientation="horizontal" - android:layout_width="match_parent" - android:layout_height="wrap_content"> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceMedium" - android:text="@string/runid_text" - android:id="@+id/textView24" - android:layout_weight="1" /> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:background="@drawable/round_shape" - android:id="@+id/textview_runid" - android:layout_gravity="left" - android:text="1" - android:gravity="center" /> - - </LinearLayout> - - <LinearLayout - android:orientation="horizontal" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="10dp"> - - <ImageButton - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:id="@+id/statusButton" - android:src="@android:drawable/presence_online" - android:background="#eee" /> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceMedium" - android:text="Medium Text" - android:id="@+id/statusTextView" /> - </LinearLayout> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceMedium" - android:text="@string/runstarted" - android:id="@+id/textView11" - android:gravity="center" - android:layout_gravity="center_horizontal" - android:textSize="25dp" /> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceMedium" - android:id="@+id/start_time" - android:hint="started" /> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceLarge" - android:text="@string/run_finishtime" - android:id="@+id/textView12" - android:textSize="25dp" - android:layout_gravity="center_horizontal" /> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceMedium" - android:id="@+id/runfinish" - android:hint="finish" /> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceLarge" - android:text="inputs from run" - android:id="@+id/runinputsTextView" - android:minLines="5" - android:scrollbars="vertical" - android:layout_marginTop="10dp" - android:layout_weight="1.5" - android:layout_marginBottom="10dp" /> - - <LinearLayout - android:orientation="horizontal" - android:layout_width="match_parent" - android:layout_height="wrap_content"> - - <Button - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="download output" - android:id="@+id/buttonWorkflowDownloadOutput" - android:layout_weight="1" - android:background="#1F9FEA" - android:layout_marginRight="5dp" /> - - <Button - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="Download Logs" - android:id="@+id/downloadRunLogs" - android:layout_gravity="center_horizontal" - android:layout_weight="1" - android:background="#1F9FEA" - android:layout_marginLeft="5dp" /> - </LinearLayout> - -</LinearLayout> http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b93d871c/app/src/main/res/layout/fragment_workflow_about.xml ---------------------------------------------------------------------- diff --git a/app/src/main/res/layout/fragment_workflow_about.xml b/app/src/main/res/layout/fragment_workflow_about.xml deleted file mode 100644 index fb78aed..0000000 --- a/app/src/main/res/layout/fragment_workflow_about.xml +++ /dev/null @@ -1,39 +0,0 @@ -<!-- -Apache Taverna Mobile -Copyright 2015 The Apache Software Foundation -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). - -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. ---> -<FrameLayout 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" - tools:context="org.apache.taverna.mobile.fragments.workflowdetails.WorkflowAboutFragment" - android:background="@color/button_material_light"> - - <TextView android:layout_width="match_parent" - android:layout_height="match_parent" - android:text="@string/hello_blank_fragment" - android:elevation="5sp" - android:layout_margin="2dp" - android:backgroundTintMode="screen" - android:ellipsize="start" - android:id="@+id/aboutworkflowTextView" - android:typeface="serif" - android:scrollbars="vertical" - android:fadeScrollbars="true" - android:textIsSelectable="true" /> - -</FrameLayout> http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b93d871c/app/src/main/res/layout/fragment_workflow_detail.xml ---------------------------------------------------------------------- diff --git a/app/src/main/res/layout/fragment_workflow_detail.xml b/app/src/main/res/layout/fragment_workflow_detail.xml deleted file mode 100644 index 8016f44..0000000 --- a/app/src/main/res/layout/fragment_workflow_detail.xml +++ /dev/null @@ -1,190 +0,0 @@ -<!-- -Apache Taverna Mobile -Copyright 2015 The Apache Software Foundation -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). - -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. ---> -<LinearLayout 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" - tools:context="org.apache.taverna.mobile.activities.WorkflowDetailActivity$PlaceholderFragment" - android:orientation="vertical" - android:padding="5dp" - android:background="@color/button_material_light"> - - <ScrollView - android:layout_width="match_parent" - android:layout_height="0dp" - android:id="@+id/scrollView" - android:layout_weight="1" > - - <LinearLayout - android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceLarge" - android:id="@+id/wtitle" - android:layout_marginTop="5dp" - android:hint="@string/detail_title_section1" /> - <LinearLayout - android:orientation="horizontal" - android:layout_width="fill_parent" - android:layout_height="wrap_content"> - - <TextView android:id="@+id/wkf_author" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:typeface="serif" - android:textStyle="normal" - android:text="@string/workflow_author" - android:textIsSelectable="true" - android:layout_gravity="center" - android:textAppearance="?android:attr/textAppearanceMedium" - android:layout_marginRight="5dp" /> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:id="@+id/wkf_author_text" - android:layout_gravity="center" - android:textStyle="bold" - android:textAppearance="?android:attr/textAppearanceMedium" /> - </LinearLayout> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceMedium" - android:id="@+id/wcreatedat" - android:layout_marginTop="5dp" - android:text="@string/created" - android:phoneNumber="false" /> - - <!-- <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceMedium" - android:id="@+id/wupdatedat" - android:layout_marginTop="5dp" - android:text="@string/modified" />--> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceMedium" - android:id="@+id/wtype" - android:layout_marginTop="5dp" - android:text="@string/workflow_type_text" - android:singleLine="true" /> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceLarge" - android:id="@+id/wdescription" - android:layout_marginTop="5dp" - android:minLines="3" - android:hint="@string/description" /> - - - - - - <ImageView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:id="@+id/wkf_image" - android:src="@mipmap/ic_loading" - android:backgroundTint="@color/accent_material_light" - android:backgroundTintMode="src_atop" - android:adjustViewBounds="true" - android:scaleType="fitCenter" - android:layout_marginLeft="10dp" - android:layout_marginRight="10dp" /> - - </LinearLayout> - </ScrollView> - <LinearLayout - android:orientation="horizontal" - android:layout_marginTop="10dp" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="bottom|center" - android:gravity="bottom|right"> - - <ImageButton - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:id="@+id/saveToDropboxButton" - android:src="@drawable/dropbox_icon" - android:layout_gravity="left" - android:layout_marginRight="20dp" - android:background="@color/button_material_light" /> - - <ImageButton - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:id="@+id/saveToGoogleDriveButton" - android:src="@drawable/google_drive_icon" - android:layout_gravity="right" - android:background="@color/button_material_light" /> - </LinearLayout> - <LinearLayout - android:orientation="horizontal" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:id="@+id/actionLayout"> - - <Button - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textStyle="normal" - android:layout_weight="0.33" - android:background="#33b5e5" - style="android:buttonBarButtonStyle" - android:text="@string/play_workflow" - android:drawableLeft="@android:drawable/ic_menu_edit" - android:id="@+id/run_wk" /> - <Button - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textStyle="normal" - android:layout_weight="0.33" - android:background="#33b5e5" - style="android:buttonBarButtonStyle" - android:text="@string/workflow_download" - android:layout_marginLeft="2dp" - android:layout_marginRight="2dp" - android:id="@+id/download_wk" - android:paddingLeft="5dp" - android:elegantTextHeight="true" - android:drawableLeft="@drawable/ic_download__web" /> - <Button - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textStyle="normal" - android:layout_weight="0.33" - android:background="#33b5e5" - style="android:buttonBarButtonStyle" - android:text="@string/workflow_mark" - android:drawableLeft="@android:drawable/btn_star_big_off" - android:id="@+id/mark_wk" /> - </LinearLayout> - -</LinearLayout> http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b93d871c/app/src/main/res/layout/fragment_workflow_licence.xml ---------------------------------------------------------------------- diff --git a/app/src/main/res/layout/fragment_workflow_licence.xml b/app/src/main/res/layout/fragment_workflow_licence.xml deleted file mode 100644 index 9b15538..0000000 --- a/app/src/main/res/layout/fragment_workflow_licence.xml +++ /dev/null @@ -1,39 +0,0 @@ -<!-- -Apache Taverna Mobile -Copyright 2015 The Apache Software Foundation -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). - -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. ---> -<FrameLayout 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" - tools:context="org.apache.taverna.mobile.fragments.workflowdetails.WorkflowLicenceFragment" - android:background="@color/button_material_light"> - - <!-- TODO: Update blank fragment layout --> - <TextView android:layout_width="match_parent" - android:layout_height="match_parent" - android:text="@string/hello_blank_fragment" - android:elevation="5sp" - android:layout_margin="2dp" - android:scrollbars="vertical" - android:fadeScrollbars="true" - android:id="@+id/workflowpolicyTextView" - android:textAlignment="center" - android:typeface="serif" - android:textIsSelectable="true" /> - -</FrameLayout> http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b93d871c/app/src/main/res/layout/fragment_workflow_run_history.xml ---------------------------------------------------------------------- diff --git a/app/src/main/res/layout/fragment_workflow_run_history.xml b/app/src/main/res/layout/fragment_workflow_run_history.xml deleted file mode 100644 index b1d075f..0000000 --- a/app/src/main/res/layout/fragment_workflow_run_history.xml +++ /dev/null @@ -1,44 +0,0 @@ -<!-- -Apache Taverna Mobile -Copyright 2015 The Apache Software Foundation -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). - -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. ---> -<FrameLayout 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" - tools:context="org.apache.taverna.mobile.fragments.workflowdetails.WorkflowRunHistoryFragment"> - - <android.support.v7.widget.RecyclerView - xmlns:recycler_view="http://schemas.android.com/apk/res-auto"; - android:id="@android:id/list" - android:theme="@style/Theme.AppCompat.Light" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="@color/button_material_light" - > - - </android.support.v7.widget.RecyclerView> - - <TextView - android:id="@android:id/empty" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:gravity="center" - android:visibility="gone" - android:text="@string/workflow_run_empty"/> - -</FrameLayout> http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b93d871c/app/src/main/res/layout/menu_item_layout.xml ---------------------------------------------------------------------- diff --git a/app/src/main/res/layout/menu_item_layout.xml b/app/src/main/res/layout/menu_item_layout.xml deleted file mode 100644 index 08c28f8..0000000 --- a/app/src/main/res/layout/menu_item_layout.xml +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -Apache Taverna Mobile -Copyright 2015 The Apache Software Foundation -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). - -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. ---> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"; - android:orientation="horizontal" - android:layout_width="match_parent" - android:layout_height="wrap_content" - > - - <ImageView - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:id="@+id/menuIcon" - android:src="@drawable/abc_btn_radio_to_on_mtrl_015" - android:layout_margin="5dp" - android:layout_gravity="top|left" - android:accessibilityLiveRegion="polite" - android:contentDescription="@string/app_name" /> - - <TextView - android:layout_width="match_parent" - android:layout_height="match_parent" - android:textAppearance="?android:attr/textAppearanceLarge" - android:id="@+id/menuItemText" - android:hint="@string/action_example" - android:layout_margin="5dp" /> -</LinearLayout> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b93d871c/app/src/main/res/layout/viewpager_workflow.xml ---------------------------------------------------------------------- diff --git a/app/src/main/res/layout/viewpager_workflow.xml b/app/src/main/res/layout/viewpager_workflow.xml deleted file mode 100644 index a8b72c0..0000000 --- a/app/src/main/res/layout/viewpager_workflow.xml +++ /dev/null @@ -1,56 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - ~ Copyright (C) 2015 The Android Open Source Project - ~ - ~ Licensed 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. - --> - -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"; - xmlns:app="http://schemas.android.com/apk/res-auto"; - android:id="@+id/main_content" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <android.support.design.widget.AppBarLayout - android:id="@+id/appbar" - android:layout_width="match_parent" - android:layout_height="wrap_content" - app:layout_scrollFlags="scroll|exitUntilCollapsed" - android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"> - - <android.support.v7.widget.Toolbar - android:id="@+id/toolbar" - android:layout_width="match_parent" - android:layout_height="?attr/actionBarSize" - android:background="?attr/colorPrimary" - android:paddingTop="@dimen/app_bar_top_padding" - app:popupTheme="@style/ThemeOverlay.AppCompat.Light" - app:layout_scrollFlags="scroll|enterAlways" - /> - - <android.support.design.widget.TabLayout - android:id="@+id/mtablayout" - android:layout_width="match_parent" - android:layout_height="wrap_content"/> - - </android.support.design.widget.AppBarLayout> - - <android.support.v4.view.ViewPager - android:id="@+id/mviewpager" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_below="@+id/appbar" - android:layout_alignParentRight="true" - android:layout_alignParentEnd="true"/> - -</RelativeLayout> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b93d871c/app/src/main/res/layout/workflow_item_layout.xml ---------------------------------------------------------------------- diff --git a/app/src/main/res/layout/workflow_item_layout.xml b/app/src/main/res/layout/workflow_item_layout.xml deleted file mode 100644 index 01fee20..0000000 --- a/app/src/main/res/layout/workflow_item_layout.xml +++ /dev/null @@ -1,173 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -Apache Taverna Mobile -Copyright 2015 The Apache Software Foundation -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). - -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. - ---> -<android.support.v7.widget.CardView - xmlns:android="http://schemas.android.com/apk/res/android"; - xmlns:card_view="http://schemas.android.com/apk/res-auto"; - xmlns:materialdesign="http://schemas.android.com/apk/res-auto"; - android:layout_width="match_parent" - android:layout_height="wrap_content" - card_view:cardBackgroundColor="@color/background_floating_material_light" - card_view:cardCornerRadius="2dp" - card_view:cardElevation="@dimen/abc_text_size_menu_material" - android:layout_marginBottom="@dimen/cardMarginVertical" - android:layout_marginLeft="@dimen/cardMarginHorizontal" - android:layout_marginRight="@dimen/cardMarginHorizontal" - android:layout_marginTop="@dimen/cardMarginVertical" - card_view:paddingEnd="2dp" - card_view:paddingStart="2dp"> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> - - <RelativeLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:padding="10dp"> - - <ImageView - android:id="@+id/author_profile_image" - android:layout_width="116dp" - android:layout_height="116dp" - android:layout_marginRight="10dp" - /> - - <TextView - android:id="@+id/workflow_author" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_toRightOf="@+id/author_profile_image" - android:textSize="16dp" - android:hint="@string/workflow_authorhint" /> - - <TextView - android:id="@+id/workflow_title" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_below="@+id/workflow_author" - android:layout_marginTop="5dp" - android:layout_toRightOf="@+id/author_profile_image" - android:textSize="18dp" - android:hint="@string/wktitle" /> - - </RelativeLayout> - - <LinearLayout - android:id="@+id/layoutinfo" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:dividerPadding="1dp" - android:orientation="vertical" - android:showDividers="middle|beginning" - android:visibility="gone"> - - <!-- <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceLarge" - android:text="@string/created" - android:id="@+id/workflow_datecreated" - android:gravity="center" /> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceLarge" - android:text="@string/modified" - android:id="@+id/workflow_dateupdated" - android:layout_gravity="center_vertical" - android:gravity="center" />--> - <TextView - android:id="@+id/workflow_brief_description" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:hint="@string/description" - android:minLines="2" - android:textAppearance="?android:attr/textAppearanceLarge"/> - </LinearLayout> - - <ImageView - android:id="@+id/workflow_image" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:contentDescription="@string/workflow_component" - android:src="@drawable/tavernalogo" - android:visibility="gone"/> - - <TextView - android:id="@+id/show_more" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="@color/material_deep_teal_200" - android:text="@string/abc_activity_chooser_view_see_all" - android:textAppearance="?android:attr/textAppearanceLarge" - android:typeface="serif" - /> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="10dp"> - - <Button - android:id="@+id/button_view_workflow" - style="android:buttonBarButtonStyle" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="3dp" - android:layout_weight="0.33" - android:background="#33b5e5" - android:drawableLeft="@android:drawable/ic_menu_view" - android:text="@string/workflow_read" - android:textStyle="normal"/> - - <Button - android:id="@+id/button_download_workflow" - style="android:buttonBarButtonStyle" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="2dp" - android:layout_marginRight="2dp" - android:layout_weight="0.33" - android:background="#33b5e5" - android:drawableLeft="@drawable/download" - android:text="@string/workflow_download" - android:textStyle="normal" - android:visibility="gone"/> - - <Button - android:id="@+id/button_mark_workflow" - style="android:buttonBarButtonStyle" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="3dp" - android:layout_weight="0.33" - android:background="#33b5e5" - android:drawableLeft="@android:drawable/btn_star_big_off" - android:text="@string/workflow_mark" - android:textStyle="normal"/> - </LinearLayout> - </LinearLayout> - -</android.support.v7.widget.CardView> http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b93d871c/app/src/main/res/layout/workflow_layout.xml ---------------------------------------------------------------------- diff --git a/app/src/main/res/layout/workflow_layout.xml b/app/src/main/res/layout/workflow_layout.xml deleted file mode 100644 index 6bc3160..0000000 --- a/app/src/main/res/layout/workflow_layout.xml +++ /dev/null @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -Apache Taverna Mobile -Copyright 2015 The Apache Software Foundation -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). - -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. ---> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"; - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - - <android.support.v7.widget.RecyclerView - xmlns:recycler_view="http://schemas.android.com/apk/res-auto"; - android:id="@+id/recycler_list" - android:theme="@style/Theme.AppCompat.Light" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@color/button_material_light"> - - </android.support.v7.widget.RecyclerView> -</LinearLayout> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b93d871c/app/src/main/res/layout/workflow_run_item.xml ---------------------------------------------------------------------- diff --git a/app/src/main/res/layout/workflow_run_item.xml b/app/src/main/res/layout/workflow_run_item.xml deleted file mode 100644 index ce05d85..0000000 --- a/app/src/main/res/layout/workflow_run_item.xml +++ /dev/null @@ -1,136 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -Apache Taverna Mobile -Copyright 2015 The Apache Software Foundation -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). - -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. ---> -<android.support.v7.widget.CardView - xmlns:android="http://schemas.android.com/apk/res/android"; - xmlns:card_view="http://schemas.android.com/apk/res-auto"; - android:layout_width="match_parent" - android:layout_height="match_parent" - card_view:cardElevation="5dp" - card_view:cardBackgroundColor="@color/background_floating_material_light" - card_view:cardCornerRadius="2dp" - card_view:paddingEnd="2dp" - card_view:paddingStart="2dp" > - - <LinearLayout - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceLarge" - android:text="runtitile" - android:id="@+id/runtitle" - android:layout_gravity="center_horizontal" /> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceLarge" - android:text="author" - android:id="@+id/run_authorTextview" /> - - <LinearLayout - android:orientation="horizontal" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="5dp"> - - <LinearLayout - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - android:layout_weight="1"> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceLarge" - android:text="Started" - android:id="@+id/textView13" - android:layout_gravity="center_vertical" /> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceMedium" - android:text="now" - android:id="@+id/runstarted" /> - </LinearLayout> - - <TextView - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:textAppearance="?android:attr/textAppearanceLarge" - android:text="|" - android:id="@+id/textView14" - android:layout_weight="1" - android:background="#111" /> - - <LinearLayout - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - android:layout_weight="1"> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceLarge" - android:text="Finished" - android:id="@+id/textView15" - android:layout_weight="1" /> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceMedium" - android:text="later" - android:id="@+id/runfinished" /> - </LinearLayout> - </LinearLayout> - - <LinearLayout - android:orientation="horizontal" - android:layout_width="match_parent" - android:layout_height="wrap_content"> - - <ImageButton - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:id="@+id/imageButtonState" - android:layout_margin="5dp" - android:src="@android:drawable/presence_online" - android:background="#fff" /> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceLarge" - android:text="State" - android:id="@+id/textState" /> - </LinearLayout> - </LinearLayout> - -</android.support.v7.widget.CardView> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b93d871c/app/src/main/res/menu/run_result.xml ---------------------------------------------------------------------- diff --git a/app/src/main/res/menu/run_result.xml b/app/src/main/res/menu/run_result.xml deleted file mode 100644 index 3e4a309..0000000 --- a/app/src/main/res/menu/run_result.xml +++ /dev/null @@ -1,34 +0,0 @@ -<!-- - Apache Taverna Mobile - Copyright 2016 The Apache Software Foundation - - This product includes software developed at - The Apache Software Foundation (http://www.apache.org/). - - 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. ---> -<menu xmlns:android="http://schemas.android.com/apk/res/android"; - xmlns:app="http://schemas.android.com/apk/res-auto"; - xmlns:tools="http://schemas.android.com/tools"; - tools:context="org.apache.taverna.mobile.fragments.workflowdetails.RunFragment"> - - <item android:id="@+id/action_refresh" - android:title="Refresh" - app:showAsAction="always|withText" - android:icon="@android:drawable/stat_notify_sync"/> -</menu> http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b93d871c/app/src/main/res/values-large/refs.xml ---------------------------------------------------------------------- diff --git a/app/src/main/res/values-large/refs.xml b/app/src/main/res/values-large/refs.xml deleted file mode 100644 index 32bdd10..0000000 --- a/app/src/main/res/values-large/refs.xml +++ /dev/null @@ -1,31 +0,0 @@ -<!-- -Apache Taverna Mobile -Copyright 2015 The Apache Software Foundation -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). - -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. ---> -<resources> - - <!-- - Layout alias to replace the single-pane version of the layout with a - two-pane version on Large screens. - - For more on layout aliases, see: - http://developer.android.com/training/multiscreen/screensizes.html#TaskUseAliasFilters - --> - <item name="fragment_item" type="layout">@layout/fragment_item_grid</item> - -</resources> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b93d871c/app/src/main/res/values-large/strings.xml ---------------------------------------------------------------------- diff --git a/app/src/main/res/values-large/strings.xml b/app/src/main/res/values-large/strings.xml deleted file mode 100644 index 04157a7..0000000 --- a/app/src/main/res/values-large/strings.xml +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -Apache Taverna Mobile -Copyright 2015 The Apache Software Foundation -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). - -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. ---> -<resources> - <string name="completebrand">Powered By Apache Taverna</string> - <string name="play_workflow">Run</string> - <string name="usage_login_accounts">When the app is started you are initially prompted with an accounts page to login. Use Your myExperiment account to login. You will need to configure a Taverna player account in the settings when you have successfully logged-in to the app. you can also choose to remain logged-in or not from the login page.</string> - <string name="usage_dashboard">Usage | Dashboard</string> - <string name="usage_dashboard_Text">Once logged-in to the app, a stream of workflows appears as a stream from which you could view, mark workflows for offline viewing. There are two tabs on the dashboard, the second tab presents a list of marked workflows. there is a menu button the pulls out a navigation drawer menu from the left corner of the dashboard. You can also swipe finger from the extreme left of the screen to pull out the menu. Scrolling to the bottom of the workflow screen will load more workflows. You can pull down to refresh workflows for the initial workflow list. the search bar is used to fetch amongst currently loaded workflows.</string> - <string name="usage_menus">Usage | Menus</string> - - <string name="usage_menu_Text">The navigation drawer brings up a menu. The workflow menu item allows one to quickly return to the workflow streams page from any screen. The \'Open Workflow\' item allows users to pick a valid workflow from external storage and run it against a Taverna Server through a Taverna Player. Settings allow user to configure player accounts and portal urls. Logout allows users to log-out of the app</string> - <string name="usage_detail">Usage | Workfow Detail</string> - <string name="usage_detail_text">The details screen allows users to run particular worklows and provides detailed information about the workflows. Workflows can also be downloaded from here. Workflows can also be marked from this screen which would save much more data for offline use than on the dashboard screen. This screen also provides a set of runs for the workflow from other users</string> - -</resources> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b93d871c/app/src/main/res/values-sw600dp/refs.xml ---------------------------------------------------------------------- diff --git a/app/src/main/res/values-sw600dp/refs.xml b/app/src/main/res/values-sw600dp/refs.xml deleted file mode 100644 index 32bdd10..0000000 --- a/app/src/main/res/values-sw600dp/refs.xml +++ /dev/null @@ -1,31 +0,0 @@ -<!-- -Apache Taverna Mobile -Copyright 2015 The Apache Software Foundation -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). - -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. ---> -<resources> - - <!-- - Layout alias to replace the single-pane version of the layout with a - two-pane version on Large screens. - - For more on layout aliases, see: - http://developer.android.com/training/multiscreen/screensizes.html#TaskUseAliasFilters - --> - <item name="fragment_item" type="layout">@layout/fragment_item_grid</item> - -</resources> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b93d871c/app/src/main/res/values-sw600dp/strings.xml ---------------------------------------------------------------------- diff --git a/app/src/main/res/values-sw600dp/strings.xml b/app/src/main/res/values-sw600dp/strings.xml deleted file mode 100644 index acbb78f..0000000 --- a/app/src/main/res/values-sw600dp/strings.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -Apache Taverna Mobile -Copyright 2015 The Apache Software Foundation -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). - -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. ---> -<resources> - <string name="completebrand">Powered By Apache Taverna</string> - <string name="usage_login_accounts">When the app is started you are initially prompted with an accounts page to login. Use Your myExperiment account to login. You will need to configure a Taverna player account in the settings when you have successfully logged-in to the app. you can also choose to remain logged-in or not from the login page.</string> - <string name="usage_dashboard">Usage | Dashboard</string> -</resources> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b93d871c/app/src/main/res/values-w820dp/strings.xml ---------------------------------------------------------------------- diff --git a/app/src/main/res/values-w820dp/strings.xml b/app/src/main/res/values-w820dp/strings.xml deleted file mode 100644 index 0abd9c2..0000000 --- a/app/src/main/res/values-w820dp/strings.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -Apache Taverna Mobile -Copyright 2015 The Apache Software Foundation -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). - -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. ---> -<resources> - <string name="completebrand">Powered By Apache Taverna</string> - <string name="usage_login_accounts">When the app is started you are initially prompted with an accounts page to login. Use Your myExperiment account to login. You will need to configure a Taverna player account in the settings when you have successfully logged-in to the app. you can also choose to remain logged-in or not from the login page.</string> - <string name="usage_dashboard">Usage | Dashboard</string> - <string name="usage_menu_Text">The navigation drawer brings up a menu. The workflow menu item allows one to quickly return to the workflow streams page from any screen. The \'Open Workflow\' item allows users to pick a valid workflow from external storage and run it against a Taverna Server through a Taverna Player. Settings allow user to configure player accounts and portal urls. Logout allows users to log-out of the app</string> - <string name="usage_detail">Usage | Workfow Detail</string> - <string name="usage_detail_text">The details screen allows users to run particular worklows and provides detailed information about the workflows. Workflows can also be downloaded from here. Workflows can also be marked from this screen which would save much more data for offline use than on the dashboard screen. This screen also provides a set of runs for the workflow from other users</string> -</resources> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b93d871c/app/src/main/res/values/refs.xml ---------------------------------------------------------------------- diff --git a/app/src/main/res/values/refs.xml b/app/src/main/res/values/refs.xml deleted file mode 100644 index 5315aa8..0000000 --- a/app/src/main/res/values/refs.xml +++ /dev/null @@ -1,31 +0,0 @@ -<!-- -Apache Taverna Mobile -Copyright 2015 The Apache Software Foundation -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). - -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. ---> -<resources> - - <!-- - Layout alias to replace the single-pane version of the layout with a - two-pane version on Large screens. - - For more on layout aliases, see: - http://developer.android.com/training/multiscreen/screensizes.html#TaskUseAliasFilters - --> - <item name="fragment_item" type="layout">@layout/fragment_item_list</item> - -</resources> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b93d871c/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 fe0ef68..be96d13 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -181,4 +181,26 @@ limitations under the License. <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> + + + <string name="title_activity_settings">Settings</string> + + <!-- Strings related to Settings --> + + <string name="pref_header_general">General</string> + + <!-- Login status info--> + <string name="pref_remainLogged_in">Remain Logged-in</string> + <string name="pref_login_description">Decide whether or not to be automatically logged-in when the app starts</string> + <!-- Player Portal url info --> + <string name="pref_player_default"> http://heater.cs.man.ac.uk:3000/</string> <!-- default value --> + <string name="pref_player_title">Configure Taverna player portal</string> + <string name="pref_player_des">Configure a different player URL for the app to use. End with the mount point(/)</string> + + <!-- Server Portal url info --> + <string name="pref_server_default"> http://heater.cs.man.ac.uk:8090/</string> <!-- default value --> + <string name="pref_server_title">Configure Taverna Server </string> + <string name="pref_server_des">Configure a different Taverna Server for the app</string> + + <!-- Strings related to Settings --> </resources> http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b93d871c/app/src/main/res/values/strings_activity_settings.xml ---------------------------------------------------------------------- diff --git a/app/src/main/res/values/strings_activity_settings.xml b/app/src/main/res/values/strings_activity_settings.xml deleted file mode 100644 index 2744a15..0000000 --- a/app/src/main/res/values/strings_activity_settings.xml +++ /dev/null @@ -1,46 +0,0 @@ -<!-- - Apache Taverna Mobile - Copyright 2016 The Apache Software Foundation - - This product includes software developed at - The Apache Software Foundation (http://www.apache.org/). - - 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. ---> -<resources> - <string name="title_activity_settings">Settings</string> - - <!-- Strings related to Settings --> - - <!-- Example General settings --> - <string name="pref_header_general">General</string> - - <!-- Login status info--> - <string name="pref_remainLogged_in">Remain Logged-in</string> - <string name="pref_login_description">Decide whether or not to be automatically logged-in when the app starts</string> - <!-- Player Portal url info --> - <string name="pref_player_default"> http://heater.cs.man.ac.uk:3000/</string> <!-- default value --> - <string name="pref_player_title">Configure Taverna player portal</string> - <string name="pref_player_des">Configure a different player URL for the app to use. End with the mount point(/)</string> - - <!-- Server Portal url info --> - <string name="pref_server_default"> http://heater.cs.man.ac.uk:8090/</string> <!-- default value --> - <string name="pref_server_title">Configure Taverna Server </string> - <string name="pref_server_des">Configure a different Taverna Server for the app</string> - -</resources>
