refactor code
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/d4072b5b Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/d4072b5b Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/d4072b5b Branch: refs/heads/master Commit: d4072b5b09c8e07413d3ff6ae03bdd1fdfc21c31 Parents: de2e174 Author: Sagar <[email protected]> Authored: Mon Oct 31 23:45:30 2016 +0530 Committer: Sagar <[email protected]> Committed: Mon Oct 31 23:45:30 2016 +0530 ---------------------------------------------------------------------- app/src/main/AndroidManifest.xml | 52 ++++---------------- .../taverna/mobile/ui/FlashScreenActivity.java | 1 - .../taverna/mobile/ui/login/LoginFragment.java | 2 +- app/src/main/res/menu/dashboard_main.xml | 2 +- 4 files changed, 11 insertions(+), 46 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/d4072b5b/app/src/main/AndroidManifest.xml ---------------------------------------------------------------------- diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3fe8240..4ba864c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -45,7 +45,7 @@ limitations under the License. </intent-filter> </activity> <activity - android:name=".activities.DashboardMainActivity" + android:name=".ui.DashboardMainActivity" android:label="@string/title_activity_dashboard_main" android:launchMode="singleTop"> <intent-filter> @@ -56,68 +56,34 @@ limitations under the License. android:name="android.app.searchable" android:resource="@xml/searchable"/> </activity> - <activity - android:name=".activities.WorkflowDetailActivity" - android:label="@string/title_activity_workflow_detail" - android:parentActivityName=".activities.DashboardMainActivity"> - <meta-data - android:name="android.support.PARENT_ACTIVITY" - android:value="org.apache.taverna.mobile.activities.DashboardMainActivity"/> - </activity> - <receiver - android:name=".broadcastreceivers.WorkflowDownloadReceiver" - android:enabled="true" - android:exported="true"> - <intent-filter> - <action android:name="android.intent.action.DOWNLOAD_COMPLETE"/> - </intent-filter> - </receiver> <activity android:name=".activities.SettingsActivity" android:label="@string/title_activity_settings" - android:parentActivityName=".activities.DashboardMainActivity"> + android:parentActivityName=".ui.DashboardMainActivity"> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value="org.apache.taverna.mobile.activities.DashboardMainActivity"/> - </activity> - <activity - android:name=".activities.RunResult" - android:label="@string/title_activity_run_result" - android:parentActivityName=".activities.WorkflowDetailActivity"> - <meta-data - android:name="android.support.PARENT_ACTIVITY" - android:value="org.apache.taverna.mobile.activities.WorkflowDetailActivity"/> - </activity> - <activity - android:name="com.dropbox.client2.android.AuthActivity" - android:launchMode="singleTask" - android:configChanges="orientation|keyboard"> - <intent-filter> - <!-- Change this to be db- followed by your app key --> - <data android:scheme="db-doicbvkfyzligh2"/> - <action android:name="android.intent.action.VIEW"/> - <category android:name="android.intent.category.BROWSABLE"/> - <category android:name="android.intent.category.DEFAULT"/> - </intent-filter> + android:value="org.apache.taverna.mobile.ui.DashboardMainActivity"/> </activity> + + <activity android:name=".ui.workflowdetail.WorkflowDetailActivity" android:label="@string/title_activity_run_result" - android:parentActivityName=".activities.DashboardMainActivity"> + android:parentActivityName=".ui.DashboardMainActivity"> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value="org.apache.taverna.mobile.activities.DashboardMainActivity"/> + android:value="org.apache.taverna.mobile.ui.DashboardMainActivity"/> </activity> <activity android:name=".ui.favouriteworkflowdetail.FavouriteWorkflowDetailActivity" android:label="@string/title_activity_run_result" - android:parentActivityName=".activities.DashboardMainActivity"> + android:parentActivityName=".ui.DashboardMainActivity"> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value="org.apache.taverna.mobile.activities.DashboardMainActivity"/> + android:value="org.apache.taverna.mobile.ui.DashboardMainActivity"/> </activity> <activity android:name=".ui.imagezoom.ImageZoomActivity" http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/d4072b5b/app/src/main/java/org/apache/taverna/mobile/ui/FlashScreenActivity.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/FlashScreenActivity.java b/app/src/main/java/org/apache/taverna/mobile/ui/FlashScreenActivity.java index 33c5e98..9029900 100644 --- a/app/src/main/java/org/apache/taverna/mobile/ui/FlashScreenActivity.java +++ b/app/src/main/java/org/apache/taverna/mobile/ui/FlashScreenActivity.java @@ -25,7 +25,6 @@ import android.support.annotation.Nullable; import android.support.v7.app.AppCompatActivity; import org.apache.taverna.mobile.R; -import org.apache.taverna.mobile.activities.DashboardMainActivity; import org.apache.taverna.mobile.data.DataManager; import org.apache.taverna.mobile.data.local.PreferencesHelper; import org.apache.taverna.mobile.ui.login.LoginActivity; http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/d4072b5b/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginFragment.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginFragment.java index 4c6b7be..957586f 100644 --- a/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginFragment.java +++ b/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginFragment.java @@ -36,7 +36,7 @@ import android.widget.CheckBox; import android.widget.EditText; import org.apache.taverna.mobile.R; -import org.apache.taverna.mobile.activities.DashboardMainActivity; +import org.apache.taverna.mobile.ui.DashboardMainActivity; import org.apache.taverna.mobile.data.DataManager; import org.apache.taverna.mobile.data.local.PreferencesHelper; import org.apache.taverna.mobile.utils.ConnectionInfo; http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/d4072b5b/app/src/main/res/menu/dashboard_main.xml ---------------------------------------------------------------------- diff --git a/app/src/main/res/menu/dashboard_main.xml b/app/src/main/res/menu/dashboard_main.xml index d272ee7..acde62a 100644 --- a/app/src/main/res/menu/dashboard_main.xml +++ b/app/src/main/res/menu/dashboard_main.xml @@ -20,7 +20,7 @@ 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.activities.DashboardMainActivity"> + tools:context="org.apache.taverna.mobile.ui.DashboardMainActivity"> <item android:id="@+id/action_search" android:title="@string/menu_search"
