You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by sa...@apache.org on 2016/10/31 20:11:15 UTC
[1/4] incubator-taverna-mobile git commit: move dashboardMainActivity
to MVP UI package and remove useless code
Repository: incubator-taverna-mobile
Updated Branches:
refs/heads/master c888831c5 -> 03b5b4cb1
move dashboardMainActivity to MVP UI package and remove useless 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/de2e1746
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/de2e1746
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/de2e1746
Branch: refs/heads/master
Commit: de2e17464cbd97fb9732cd11a47a771d3ce50054
Parents: c888831
Author: Sagar <ku...@gmail.com>
Authored: Mon Oct 31 23:43:40 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Mon Oct 31 23:43:40 2016 +0530
----------------------------------------------------------------------
.../activities/DashboardMainActivity.java | 338 -------------------
.../mobile/ui/DashboardMainActivity.java | 241 +++++++++++++
2 files changed, 241 insertions(+), 338 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/de2e1746/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
deleted file mode 100644
index bca3e04..0000000
--- a/app/src/main/java/org/apache/taverna/mobile/activities/DashboardMainActivity.java
+++ /dev/null
@@ -1,338 +0,0 @@
-package org.apache.taverna.mobile.activities;
-
-/**
- * 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.
- */
-
-import android.app.Dialog;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.os.Bundle;
-import android.os.Environment;
-import android.preference.PreferenceManager;
-import android.support.design.widget.NavigationView;
-import android.support.design.widget.Snackbar;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v4.view.GravityCompat;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.TableLayout;
-import android.widget.Toast;
-
-import org.apache.taverna.mobile.R;
-import org.apache.taverna.mobile.data.DataManager;
-import org.apache.taverna.mobile.data.local.PreferencesHelper;
-import org.apache.taverna.mobile.ui.anouncements.AnnouncementFragment;
-import org.apache.taverna.mobile.ui.favouriteworkflow.FavouriteWorkflowsFragment;
-import org.apache.taverna.mobile.ui.licence.LicenceFragment;
-import org.apache.taverna.mobile.ui.myworkflows.MyWorkflowFragment;
-import org.apache.taverna.mobile.ui.workflow.WorkflowFragment;
-import org.apache.taverna.mobile.utils.ActivityUtils;
-
-import java.io.File;
-
-public class DashboardMainActivity extends AppCompatActivity {
-
- public static final String APP_DIRECTORY_NAME = "TavernaMobile";
- private final int SELECT_WORKFLOW = 10;
- /**
- * Used to store the last screen title. For use in {@link #restoreActionBar()}.
- */
- private CharSequence mTitle = "Dashboard";
- private Dialog aboutDialog;
- private DrawerLayout mDrawerLayout;
- private DataManager dataManager;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_dashboard_main);
-
- NavigationView navigationView = (NavigationView) findViewById(R.id.nav_view);
- if (navigationView != null) {
- setupDrawerContent(navigationView);
- }
-
-
- mDrawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
-
- setUpWorkflowDirectory(this);
- aboutDialog = new Dialog(this);
-
- Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
- setSupportActionBar(toolbar);
-
- final ActionBar ab = getSupportActionBar();
- if (ab != null) {
- ab.setHomeAsUpIndicator(R.drawable.ic_menu);
- ab.setDisplayHomeAsUpEnabled(true);
- }
-
-
- /**
- * Setting the Fragment in FrameLayout
- */
- if (savedInstanceState == null) {
-
- FragmentManager fragmentManager = getSupportFragmentManager();
- Fragment fragment;
-
- fragment = new WorkflowFragment();
- fragmentManager.beginTransaction()
- .replace(R.id.frame_container, fragment)
- .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_CLOSE)
- .commit();
- }
- dataManager = new DataManager(new PreferencesHelper(this));
- }
-
-
- /**
- * @param navigationView Design Support NavigationView OnClick Listener Event
- */
- private void setupDrawerContent(final NavigationView navigationView) {
- navigationView.setNavigationItemSelectedListener(
- new NavigationView.OnNavigationItemSelectedListener() {
-
- @Override
- public boolean onNavigationItemSelected(MenuItem menuItem) {
-
-
- Fragment fragment;
-
- switch (menuItem.getItemId()) {
- case R.id.nav_workflows:
-
- fragment = new WorkflowFragment();
- ActivityUtils
- .addFragmentToActivity(
- getSupportFragmentManager(),
- fragment,
- R.id.frame_container);
-
- menuItem.setChecked(true);
- mDrawerLayout.closeDrawers();
- return true;
-
- case R.id.nav_my_workflows:
-
- fragment = new MyWorkflowFragment();
- ActivityUtils
- .addFragmentToActivity(
- getSupportFragmentManager(),
- fragment,
- R.id.frame_container);
-
- menuItem.setChecked(true);
- mDrawerLayout.closeDrawers();
- return true;
-
- case R.id.nav_favourite_workflow:
-
- fragment = new FavouriteWorkflowsFragment();
- ActivityUtils
- .addFragmentToActivity(
- getSupportFragmentManager(),
- fragment,
- R.id.frame_container);
- menuItem.setChecked(true);
- mDrawerLayout.closeDrawers();
- return true;
-
- case R.id.nav_announcement:
-
- fragment = new AnnouncementFragment();
- ActivityUtils
- .addFragmentToActivity(
- getSupportFragmentManager(),
- fragment,
- R.id.frame_container);
-
- menuItem.setChecked(true);
- mDrawerLayout.closeDrawers();
- return true;
-
-
- case R.id.nav_usage:
-
- aboutDialog.setCanceledOnTouchOutside(true);
- aboutDialog.setTitle("Usage");
- aboutDialog.setContentView(R.layout.usage_layout);
- aboutDialog.show();
-
- menuItem.setChecked(true);
- mDrawerLayout.closeDrawers();
- return true;
-
- case R.id.nav_about:
-
- TableLayout about = (TableLayout) getLayoutInflater().inflate(R
- .layout.about, navigationView, false);
-
- aboutDialog.setCanceledOnTouchOutside(true);
- aboutDialog.setTitle("About Taverna Mobile");
- aboutDialog.setContentView(about);
- aboutDialog.show();
-
- menuItem.setChecked(true);
- mDrawerLayout.closeDrawers();
- return true;
-
- case R.id.os_licences:
-
- ActivityUtils
- .addFragmentToActivity(
- getSupportFragmentManager(),
- LicenceFragment.newInstance(),
- R.id.frame_container);
-
- menuItem.setChecked(true);
- mDrawerLayout.closeDrawers();
- return true;
-
- case R.id.nav_settings:
-
- startActivity(new Intent(getApplicationContext(),
- SettingsActivity.class));
- overridePendingTransition(android.R.anim.slide_in_left, android.R
- .anim.slide_out_right);
-
- menuItem.setChecked(true);
- mDrawerLayout.closeDrawers();
- return true;
-
- case R.id.nav_logout:
-
- finish();
- menuItem.setChecked(true);
- mDrawerLayout.closeDrawers();
- dataManager.getPreferencesHelper().setLoggedInFlag(false);
- return true;
-
- }
- return true;
- }
- });
- }
-
-
-
-
-
-
- public void restoreActionBar() {
- ActionBar actionBar = getSupportActionBar();
- //actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD);
- if (actionBar != null) {
- actionBar.setDisplayShowTitleEnabled(true);
- actionBar.setTitle(mTitle);
- }
- }
-
- private void setUpWorkflowDirectory(Context context) {
- SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
- if (Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
- File workflowDirectory = new File(Environment.getExternalStorageDirectory() + File
- .separator + APP_DIRECTORY_NAME);
- if (!workflowDirectory.exists()) {
- boolean state = workflowDirectory.mkdirs();
- if (state) {
- Toast.makeText(context, "Storage Ready", Toast.LENGTH_SHORT).show();
- sp.edit().putString(APP_DIRECTORY_NAME, workflowDirectory.getAbsolutePath())
- .apply();
- Toast.makeText(context, "Home dir: " + workflowDirectory.getAbsolutePath(),
- Toast.LENGTH_LONG).show();
- } else { //directory can't be created either because of restricted access or lack
- // of an external storage media.
- //we assume the lack of secondary storage so we have to switch to internal
- // storage
- // File dir = new File(Environment.getExternalStoragePublicDirectory
- // (Environment.))
- // Toast.makeText(context, "Storage Error. Directory not created",
- // Toast.LENGTH_SHORT).show();
- final Snackbar snackbar = Snackbar.make(
- mDrawerLayout,
- "Storage error. No workflows can be saved.",
- Snackbar.LENGTH_INDEFINITE);
- snackbar.setAction("OK", new View.OnClickListener() {
- @Override
- public void onClick(View view) {
- snackbar.dismiss();
- }
- });
-
- snackbar.show();
- }
-// workflowDirectory.list();
- } else {
- // Toast.makeText(context, "Directory exists. Home dir: "+workflowDirectory
- // .getAbsolutePath(), Toast.LENGTH_LONG).show();
- sp.edit().putString(APP_DIRECTORY_NAME, workflowDirectory.getAbsolutePath())
- .apply();
- /*else {
- File mainDir = new File(Environment.getExternalStorageDirectory() + File
- .separator + APP_DIRECTORY_NAME);
- if (mainDir.mkdirs())
- sp.edit().putString(APP_DIRECTORY_NAME, mainDir.getAbsolutePath()).commit();
- else
- Toast.makeText(context, "Workflow home not created. Permission issues", Toast
- .LENGTH_SHORT).show();
- }*/
- }
- } else { //use internal memory to save the data
- File home = context.getDir("Workflows", Context.MODE_PRIVATE);
- sp.edit().putString(APP_DIRECTORY_NAME, home.getAbsolutePath()).apply();
- // Toast.makeText(context, "Home dir: "+home.getAbsolutePath(), Toast
- // .LENGTH_LONG).show();
- }
- }
-
-
- @Override
- public boolean onCreateOptionsMenu(Menu menu) {
- getMenuInflater().inflate(R.menu.dashboard_main, menu);
- restoreActionBar();
- return true;
- }
-
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- switch (item.getItemId()) {
- case android.R.id.home:
- mDrawerLayout.openDrawer(GravityCompat.START);
- return true;
- }
- return super.onOptionsItemSelected(item);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/de2e1746/app/src/main/java/org/apache/taverna/mobile/ui/DashboardMainActivity.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/DashboardMainActivity.java b/app/src/main/java/org/apache/taverna/mobile/ui/DashboardMainActivity.java
new file mode 100644
index 0000000..193a48e
--- /dev/null
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/DashboardMainActivity.java
@@ -0,0 +1,241 @@
+/*
+ * 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.ui;
+
+import android.app.Dialog;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.design.widget.NavigationView;
+import android.support.v4.app.Fragment;
+import android.support.v4.view.GravityCompat;
+import android.support.v4.widget.DrawerLayout;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.widget.TableLayout;
+
+import org.apache.taverna.mobile.R;
+import org.apache.taverna.mobile.activities.SettingsActivity;
+import org.apache.taverna.mobile.data.DataManager;
+import org.apache.taverna.mobile.data.local.PreferencesHelper;
+import org.apache.taverna.mobile.ui.anouncements.AnnouncementFragment;
+import org.apache.taverna.mobile.ui.favouriteworkflow.FavouriteWorkflowsFragment;
+import org.apache.taverna.mobile.ui.licence.LicenceFragment;
+import org.apache.taverna.mobile.ui.login.LoginActivity;
+import org.apache.taverna.mobile.ui.myworkflows.MyWorkflowFragment;
+import org.apache.taverna.mobile.ui.workflow.WorkflowFragment;
+import org.apache.taverna.mobile.utils.ActivityUtils;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+public class DashboardMainActivity extends AppCompatActivity {
+
+ @BindView(R.id.nav_view)
+ NavigationView navigationView;
+
+ @BindView(R.id.drawer_layout)
+ DrawerLayout mDrawerLayout;
+
+ @BindView(R.id.toolbar)
+ Toolbar toolbar;
+
+
+ private Dialog aboutDialog;
+ private DataManager dataManager;
+ private Fragment fragment;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ setContentView(R.layout.activity_dashboard_main);
+
+ ButterKnife.bind(this);
+
+ if (navigationView != null) {
+ setupDrawerContent(navigationView);
+ }
+
+ aboutDialog = new Dialog(this);
+
+ setSupportActionBar(toolbar);
+
+ final ActionBar ab = getSupportActionBar();
+
+ if (ab != null) {
+ ab.setHomeAsUpIndicator(R.drawable.ic_menu);
+ ab.setDisplayHomeAsUpEnabled(true);
+ }
+
+
+ /**
+ * Setting the Fragment in FrameLayout
+ */
+ if (savedInstanceState == null) {
+
+ fragment = new WorkflowFragment();
+ ActivityUtils.addFragmentToActivity(getSupportFragmentManager(), fragment,
+ R.id.frame_container);
+
+ navigationView.setCheckedItem(R.id.nav_workflows);
+ }
+
+ dataManager = new DataManager(new PreferencesHelper(this));
+ }
+
+
+ /**
+ * @param navigationView Design Support NavigationView OnClick Listener Event
+ */
+ private void setupDrawerContent(final NavigationView navigationView) {
+ navigationView.setNavigationItemSelectedListener(
+ new NavigationView.OnNavigationItemSelectedListener() {
+
+ @Override
+ public boolean onNavigationItemSelected(MenuItem menuItem) {
+
+ switch (menuItem.getItemId()) {
+ case R.id.nav_workflows:
+
+ fragment = new WorkflowFragment();
+ ActivityUtils.addFragmentToActivity(getSupportFragmentManager(),
+ fragment, R.id.frame_container);
+
+ menuItem.setChecked(true);
+ mDrawerLayout.closeDrawers();
+ toolbar.setTitle(R.string.title_nav_all_workflows);
+
+ return true;
+
+ case R.id.nav_my_workflows:
+
+ fragment = new MyWorkflowFragment();
+ ActivityUtils.addFragmentToActivity(getSupportFragmentManager(),
+ fragment, R.id.frame_container);
+
+ menuItem.setChecked(true);
+ mDrawerLayout.closeDrawers();
+ toolbar.setTitle(R.string.title_nav_my_workflows);
+ return true;
+
+ case R.id.nav_favourite_workflow:
+
+ fragment = new FavouriteWorkflowsFragment();
+ ActivityUtils.addFragmentToActivity(getSupportFragmentManager(),
+ fragment, R.id.frame_container);
+
+ menuItem.setChecked(true);
+ mDrawerLayout.closeDrawers();
+ toolbar.setTitle(R.string.title_nav_favourite_workflows);
+ return true;
+
+ case R.id.nav_announcement:
+
+ fragment = new AnnouncementFragment();
+ ActivityUtils.addFragmentToActivity(getSupportFragmentManager(),
+ fragment, R.id.frame_container);
+
+ menuItem.setChecked(true);
+ mDrawerLayout.closeDrawers();
+ toolbar.setTitle(R.string.title_nav_announcement);
+ return true;
+
+
+ case R.id.nav_usage:
+
+ aboutDialog.setCanceledOnTouchOutside(true);
+ aboutDialog.setTitle(getString(R.string.title_nav_usage));
+ aboutDialog.setContentView(R.layout.usage_layout);
+ aboutDialog.show();
+ mDrawerLayout.closeDrawers();
+ return true;
+
+ case R.id.nav_about:
+
+ TableLayout about = (TableLayout) getLayoutInflater().inflate(R
+ .layout.about, navigationView, false);
+
+ aboutDialog.setCanceledOnTouchOutside(true);
+ aboutDialog.setTitle(getString(R.string.title_nav_usage));
+ aboutDialog.setContentView(about);
+ aboutDialog.show();
+ mDrawerLayout.closeDrawers();
+ return true;
+
+ case R.id.os_licences:
+
+ ActivityUtils.addFragmentToActivity(getSupportFragmentManager(),
+ LicenceFragment.newInstance(), R.id.frame_container);
+
+ menuItem.setChecked(true);
+ mDrawerLayout.closeDrawers();
+ toolbar.setTitle(R.string.title_nav_os_licences);
+ return true;
+
+ case R.id.nav_settings:
+
+ startActivity(new Intent(getApplicationContext(),
+ SettingsActivity.class));
+ overridePendingTransition(android.R.anim.slide_in_left, android.R
+ .anim.slide_out_right);
+
+ mDrawerLayout.closeDrawers();
+ return true;
+
+ case R.id.nav_logout:
+
+ finish();
+
+ mDrawerLayout.closeDrawers();
+ dataManager.getPreferencesHelper().setLoggedInFlag(false);
+
+ startActivity(new Intent(getApplicationContext(),
+ LoginActivity.class));
+
+ return true;
+
+ }
+ return true;
+ }
+ });
+ }
+
+
+ @Override
+ public boolean onCreateOptionsMenu(Menu menu) {
+ getMenuInflater().inflate(R.menu.dashboard_main, menu);
+
+ return true;
+ }
+
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ switch (item.getItemId()) {
+ case android.R.id.home:
+ mDrawerLayout.openDrawer(GravityCompat.START);
+ return true;
+ }
+ return super.onOptionsItemSelected(item);
+ }
+
+}
[4/4] incubator-taverna-mobile git commit: add all suggestion
Posted by sa...@apache.org.
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/03b5b4cb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/03b5b4cb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/03b5b4cb
Branch: refs/heads/master
Commit: 03b5b4cb1eb17a3eebdb84ec08e4f9bec708a72c
Parents: d44a996
Author: Sagar <ku...@gmail.com>
Authored: Tue Nov 1 01:36:11 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Tue Nov 1 01:36:11 2016 +0530
----------------------------------------------------------------------
app/src/main/AndroidManifest.xml | 14 +-
.../taverna/mobile/ui/DashboardActivity.java | 235 ++++++++++++++++++
.../mobile/ui/DashboardMainActivity.java | 241 -------------------
.../taverna/mobile/ui/FlashScreenActivity.java | 2 +-
.../taverna/mobile/ui/login/LoginFragment.java | 4 +-
app/src/main/res/menu/dashboard_main.xml | 2 +-
app/src/main/res/values/strings.xml | 7 +-
7 files changed, 250 insertions(+), 255 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/03b5b4cb/app/src/main/AndroidManifest.xml
----------------------------------------------------------------------
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4ba864c..e72b217 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=".ui.DashboardMainActivity"
+ android:name=".ui.DashboardActivity"
android:label="@string/title_activity_dashboard_main"
android:launchMode="singleTop">
<intent-filter>
@@ -61,29 +61,29 @@ limitations under the License.
<activity
android:name=".activities.SettingsActivity"
android:label="@string/title_activity_settings"
- android:parentActivityName=".ui.DashboardMainActivity">
+ android:parentActivityName=".ui.DashboardActivity">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
- android:value="org.apache.taverna.mobile.ui.DashboardMainActivity"/>
+ android:value="org.apache.taverna.mobile.ui.DashboardActivity"/>
</activity>
<activity
android:name=".ui.workflowdetail.WorkflowDetailActivity"
android:label="@string/title_activity_run_result"
- android:parentActivityName=".ui.DashboardMainActivity">
+ android:parentActivityName=".ui.DashboardActivity">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
- android:value="org.apache.taverna.mobile.ui.DashboardMainActivity"/>
+ android:value="org.apache.taverna.mobile.ui.DashboardActivity"/>
</activity>
<activity
android:name=".ui.favouriteworkflowdetail.FavouriteWorkflowDetailActivity"
android:label="@string/title_activity_run_result"
- android:parentActivityName=".ui.DashboardMainActivity">
+ android:parentActivityName=".ui.DashboardActivity">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
- android:value="org.apache.taverna.mobile.ui.DashboardMainActivity"/>
+ android:value="org.apache.taverna.mobile.ui.DashboardActivity"/>
</activity>
<activity android:name=".ui.imagezoom.ImageZoomActivity"
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/03b5b4cb/app/src/main/java/org/apache/taverna/mobile/ui/DashboardActivity.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/DashboardActivity.java b/app/src/main/java/org/apache/taverna/mobile/ui/DashboardActivity.java
new file mode 100644
index 0000000..a546498
--- /dev/null
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/DashboardActivity.java
@@ -0,0 +1,235 @@
+/*
+ * 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.ui;
+
+import android.app.Dialog;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.design.widget.NavigationView;
+import android.support.v4.app.Fragment;
+import android.support.v4.view.GravityCompat;
+import android.support.v4.widget.DrawerLayout;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.widget.TableLayout;
+
+import org.apache.taverna.mobile.R;
+import org.apache.taverna.mobile.activities.SettingsActivity;
+import org.apache.taverna.mobile.data.DataManager;
+import org.apache.taverna.mobile.data.local.PreferencesHelper;
+import org.apache.taverna.mobile.ui.anouncements.AnnouncementFragment;
+import org.apache.taverna.mobile.ui.favouriteworkflow.FavouriteWorkflowsFragment;
+import org.apache.taverna.mobile.ui.licence.LicenceFragment;
+import org.apache.taverna.mobile.ui.login.LoginActivity;
+import org.apache.taverna.mobile.ui.myworkflows.MyWorkflowFragment;
+import org.apache.taverna.mobile.ui.workflow.WorkflowFragment;
+import org.apache.taverna.mobile.utils.ActivityUtils;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+public class DashboardActivity extends AppCompatActivity {
+
+ @BindView(R.id.nav_view)
+ NavigationView navigationView;
+
+ @BindView(R.id.drawer_layout)
+ DrawerLayout mDrawerLayout;
+
+ @BindView(R.id.toolbar)
+ Toolbar toolbar;
+
+
+ private Dialog aboutDialog;
+ private DataManager dataManager;
+ private Fragment fragment;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ setContentView(R.layout.activity_dashboard_main);
+
+ ButterKnife.bind(this);
+
+ setupDrawerContent(navigationView);
+
+ aboutDialog = new Dialog(this);
+
+ setSupportActionBar(toolbar);
+ final ActionBar ab = getSupportActionBar();
+ if (ab != null) {
+ ab.setHomeAsUpIndicator(R.drawable.ic_menu);
+ ab.setDisplayHomeAsUpEnabled(true);
+ }
+
+
+ /**
+ * Setting the Fragment in FrameLayout
+ */
+ if (savedInstanceState == null) {
+
+ fragment = new WorkflowFragment();
+ ActivityUtils.addFragmentToActivity(getSupportFragmentManager(), fragment,
+ R.id.frame_container);
+
+ navigationView.setCheckedItem(R.id.nav_workflows);
+ }
+
+ dataManager = new DataManager(new PreferencesHelper(this));
+ }
+
+
+ /**
+ * @param navigationView Design Support NavigationView OnClick Listener Event
+ */
+ private void setupDrawerContent(final NavigationView navigationView) {
+ navigationView.setNavigationItemSelectedListener(
+ new NavigationView.OnNavigationItemSelectedListener() {
+
+ @Override
+ public boolean onNavigationItemSelected(MenuItem menuItem) {
+
+ switch (menuItem.getItemId()) {
+ case R.id.nav_workflows:
+
+ fragment = new WorkflowFragment();
+ ActivityUtils.addFragmentToActivity(getSupportFragmentManager(),
+ fragment, R.id.frame_container);
+
+ menuItem.setChecked(true);
+ mDrawerLayout.closeDrawers();
+ toolbar.setTitle(R.string.title_nav_all_workflows);
+
+ return true;
+
+ case R.id.nav_my_workflows:
+
+ fragment = new MyWorkflowFragment();
+ ActivityUtils.addFragmentToActivity(getSupportFragmentManager(),
+ fragment, R.id.frame_container);
+
+ menuItem.setChecked(true);
+ mDrawerLayout.closeDrawers();
+ toolbar.setTitle(R.string.title_nav_my_workflows);
+ return true;
+
+ case R.id.nav_favourite_workflow:
+
+ fragment = new FavouriteWorkflowsFragment();
+ ActivityUtils.addFragmentToActivity(getSupportFragmentManager(),
+ fragment, R.id.frame_container);
+
+ menuItem.setChecked(true);
+ mDrawerLayout.closeDrawers();
+ toolbar.setTitle(R.string.title_nav_favourite_workflows);
+ return true;
+
+ case R.id.nav_announcement:
+
+ fragment = new AnnouncementFragment();
+ ActivityUtils.addFragmentToActivity(getSupportFragmentManager(),
+ fragment, R.id.frame_container);
+
+ menuItem.setChecked(true);
+ mDrawerLayout.closeDrawers();
+ toolbar.setTitle(R.string.title_nav_announcement);
+ return true;
+
+
+ case R.id.nav_usage:
+
+ aboutDialog.setCanceledOnTouchOutside(true);
+ aboutDialog.setTitle(getString(R.string.title_nav_usage));
+ aboutDialog.setContentView(R.layout.usage_layout);
+ aboutDialog.show();
+ mDrawerLayout.closeDrawers();
+ return true;
+
+ case R.id.nav_about:
+
+ TableLayout about = (TableLayout) getLayoutInflater().inflate(R
+ .layout.about, navigationView, false);
+
+ aboutDialog.setCanceledOnTouchOutside(true);
+ aboutDialog.setTitle(getString(R.string.title_nav_usage));
+ aboutDialog.setContentView(about);
+ aboutDialog.show();
+ mDrawerLayout.closeDrawers();
+ return true;
+
+ case R.id.os_licences:
+
+ ActivityUtils.addFragmentToActivity(getSupportFragmentManager(),
+ LicenceFragment.newInstance(), R.id.frame_container);
+
+ menuItem.setChecked(true);
+ mDrawerLayout.closeDrawers();
+ toolbar.setTitle(R.string.title_nav_os_licences);
+ return true;
+
+ case R.id.nav_settings:
+
+ startActivity(new Intent(getApplicationContext(),
+ SettingsActivity.class));
+ overridePendingTransition(android.R.anim.slide_in_left, android.R
+ .anim.slide_out_right);
+
+ mDrawerLayout.closeDrawers();
+ return true;
+
+ case R.id.nav_logout:
+
+ mDrawerLayout.closeDrawers();
+ dataManager.getPreferencesHelper().setLoggedInFlag(false);
+
+ startActivity(new Intent(getApplicationContext(),
+ LoginActivity.class));
+ finish();
+ return true;
+
+ }
+ return true;
+ }
+ });
+ }
+
+
+ @Override
+ public boolean onCreateOptionsMenu(Menu menu) {
+ getMenuInflater().inflate(R.menu.dashboard_main, menu);
+
+ return true;
+ }
+
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ switch (item.getItemId()) {
+ case android.R.id.home:
+ mDrawerLayout.openDrawer(GravityCompat.START);
+ return true;
+ }
+ return super.onOptionsItemSelected(item);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/03b5b4cb/app/src/main/java/org/apache/taverna/mobile/ui/DashboardMainActivity.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/DashboardMainActivity.java b/app/src/main/java/org/apache/taverna/mobile/ui/DashboardMainActivity.java
deleted file mode 100644
index 193a48e..0000000
--- a/app/src/main/java/org/apache/taverna/mobile/ui/DashboardMainActivity.java
+++ /dev/null
@@ -1,241 +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.ui;
-
-import android.app.Dialog;
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.design.widget.NavigationView;
-import android.support.v4.app.Fragment;
-import android.support.v4.view.GravityCompat;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.widget.TableLayout;
-
-import org.apache.taverna.mobile.R;
-import org.apache.taverna.mobile.activities.SettingsActivity;
-import org.apache.taverna.mobile.data.DataManager;
-import org.apache.taverna.mobile.data.local.PreferencesHelper;
-import org.apache.taverna.mobile.ui.anouncements.AnnouncementFragment;
-import org.apache.taverna.mobile.ui.favouriteworkflow.FavouriteWorkflowsFragment;
-import org.apache.taverna.mobile.ui.licence.LicenceFragment;
-import org.apache.taverna.mobile.ui.login.LoginActivity;
-import org.apache.taverna.mobile.ui.myworkflows.MyWorkflowFragment;
-import org.apache.taverna.mobile.ui.workflow.WorkflowFragment;
-import org.apache.taverna.mobile.utils.ActivityUtils;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-public class DashboardMainActivity extends AppCompatActivity {
-
- @BindView(R.id.nav_view)
- NavigationView navigationView;
-
- @BindView(R.id.drawer_layout)
- DrawerLayout mDrawerLayout;
-
- @BindView(R.id.toolbar)
- Toolbar toolbar;
-
-
- private Dialog aboutDialog;
- private DataManager dataManager;
- private Fragment fragment;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
-
- setContentView(R.layout.activity_dashboard_main);
-
- ButterKnife.bind(this);
-
- if (navigationView != null) {
- setupDrawerContent(navigationView);
- }
-
- aboutDialog = new Dialog(this);
-
- setSupportActionBar(toolbar);
-
- final ActionBar ab = getSupportActionBar();
-
- if (ab != null) {
- ab.setHomeAsUpIndicator(R.drawable.ic_menu);
- ab.setDisplayHomeAsUpEnabled(true);
- }
-
-
- /**
- * Setting the Fragment in FrameLayout
- */
- if (savedInstanceState == null) {
-
- fragment = new WorkflowFragment();
- ActivityUtils.addFragmentToActivity(getSupportFragmentManager(), fragment,
- R.id.frame_container);
-
- navigationView.setCheckedItem(R.id.nav_workflows);
- }
-
- dataManager = new DataManager(new PreferencesHelper(this));
- }
-
-
- /**
- * @param navigationView Design Support NavigationView OnClick Listener Event
- */
- private void setupDrawerContent(final NavigationView navigationView) {
- navigationView.setNavigationItemSelectedListener(
- new NavigationView.OnNavigationItemSelectedListener() {
-
- @Override
- public boolean onNavigationItemSelected(MenuItem menuItem) {
-
- switch (menuItem.getItemId()) {
- case R.id.nav_workflows:
-
- fragment = new WorkflowFragment();
- ActivityUtils.addFragmentToActivity(getSupportFragmentManager(),
- fragment, R.id.frame_container);
-
- menuItem.setChecked(true);
- mDrawerLayout.closeDrawers();
- toolbar.setTitle(R.string.title_nav_all_workflows);
-
- return true;
-
- case R.id.nav_my_workflows:
-
- fragment = new MyWorkflowFragment();
- ActivityUtils.addFragmentToActivity(getSupportFragmentManager(),
- fragment, R.id.frame_container);
-
- menuItem.setChecked(true);
- mDrawerLayout.closeDrawers();
- toolbar.setTitle(R.string.title_nav_my_workflows);
- return true;
-
- case R.id.nav_favourite_workflow:
-
- fragment = new FavouriteWorkflowsFragment();
- ActivityUtils.addFragmentToActivity(getSupportFragmentManager(),
- fragment, R.id.frame_container);
-
- menuItem.setChecked(true);
- mDrawerLayout.closeDrawers();
- toolbar.setTitle(R.string.title_nav_favourite_workflows);
- return true;
-
- case R.id.nav_announcement:
-
- fragment = new AnnouncementFragment();
- ActivityUtils.addFragmentToActivity(getSupportFragmentManager(),
- fragment, R.id.frame_container);
-
- menuItem.setChecked(true);
- mDrawerLayout.closeDrawers();
- toolbar.setTitle(R.string.title_nav_announcement);
- return true;
-
-
- case R.id.nav_usage:
-
- aboutDialog.setCanceledOnTouchOutside(true);
- aboutDialog.setTitle(getString(R.string.title_nav_usage));
- aboutDialog.setContentView(R.layout.usage_layout);
- aboutDialog.show();
- mDrawerLayout.closeDrawers();
- return true;
-
- case R.id.nav_about:
-
- TableLayout about = (TableLayout) getLayoutInflater().inflate(R
- .layout.about, navigationView, false);
-
- aboutDialog.setCanceledOnTouchOutside(true);
- aboutDialog.setTitle(getString(R.string.title_nav_usage));
- aboutDialog.setContentView(about);
- aboutDialog.show();
- mDrawerLayout.closeDrawers();
- return true;
-
- case R.id.os_licences:
-
- ActivityUtils.addFragmentToActivity(getSupportFragmentManager(),
- LicenceFragment.newInstance(), R.id.frame_container);
-
- menuItem.setChecked(true);
- mDrawerLayout.closeDrawers();
- toolbar.setTitle(R.string.title_nav_os_licences);
- return true;
-
- case R.id.nav_settings:
-
- startActivity(new Intent(getApplicationContext(),
- SettingsActivity.class));
- overridePendingTransition(android.R.anim.slide_in_left, android.R
- .anim.slide_out_right);
-
- mDrawerLayout.closeDrawers();
- return true;
-
- case R.id.nav_logout:
-
- finish();
-
- mDrawerLayout.closeDrawers();
- dataManager.getPreferencesHelper().setLoggedInFlag(false);
-
- startActivity(new Intent(getApplicationContext(),
- LoginActivity.class));
-
- return true;
-
- }
- return true;
- }
- });
- }
-
-
- @Override
- public boolean onCreateOptionsMenu(Menu menu) {
- getMenuInflater().inflate(R.menu.dashboard_main, menu);
-
- return true;
- }
-
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- switch (item.getItemId()) {
- case android.R.id.home:
- mDrawerLayout.openDrawer(GravityCompat.START);
- return true;
- }
- return super.onOptionsItemSelected(item);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/03b5b4cb/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 9029900..74bef25 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
@@ -46,7 +46,7 @@ public class FlashScreenActivity extends AppCompatActivity {
startActivity(new Intent(FlashScreenActivity.this, LoginActivity.class));
(FlashScreenActivity.this).finish();
} else {
- startActivity(new Intent(FlashScreenActivity.this, DashboardMainActivity.class));
+ startActivity(new Intent(FlashScreenActivity.this, DashboardActivity.class));
(FlashScreenActivity.this).finish();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/03b5b4cb/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 957586f..33b7bb4 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.ui.DashboardMainActivity;
+import org.apache.taverna.mobile.ui.DashboardActivity;
import org.apache.taverna.mobile.data.DataManager;
import org.apache.taverna.mobile.data.local.PreferencesHelper;
import org.apache.taverna.mobile.utils.ConnectionInfo;
@@ -188,7 +188,7 @@ public class LoginFragment extends Fragment implements LoginMvpView, View.OnFocu
@Override
public void showDashboardActivity() {
- startActivity(new Intent(getActivity(), DashboardMainActivity.class));
+ startActivity(new Intent(getActivity(), DashboardActivity.class));
getActivity().finish();
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/03b5b4cb/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 acde62a..740b682 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.ui.DashboardMainActivity">
+ tools:context="org.apache.taverna.mobile.ui.DashboardActivity">
<item android:id="@+id/action_search"
android:title="@string/menu_search"
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/03b5b4cb/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 df67989..36fb07d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -15,7 +15,7 @@ limitations under the License.
<resources>
<string name="os_licence_version_text">Version:</string>
<string name="os_licence_licence_text">Licence:</string>
- <string name="title_nav_os_licences">Licence info</string>
+
<string name="app_name">Taverna Mobile</string>
<string name="hello_world">Empty</string>
<string name="action_settings">Settings</string>
@@ -162,7 +162,7 @@ limitations under the License.
<string name="login_button_description">Login Button</string>
<string name="err_login_email">Enter valid email</string>
<string name="err_login_password">Enter valid password</string>
- <string name="title_nav_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>
@@ -209,6 +209,7 @@ limitations under the License.
<string name="tiitle_nav_logout">Logout</string>
<string name="title_nav_usage">Usage</string>
<string name="title_nav_about">About</string>
-
+ <string name="title_nav_my_workflows">My Workflows</string>
+ <string name="title_nav_os_licences">Licence info</string>
<!-- Strings related to Settings -->
</resources>
[3/4] incubator-taverna-mobile git commit: remove hardcode sting and
order the navigation menu items
Posted by sa...@apache.org.
remove hardcode sting and order the navigation menu items
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/d44a9960
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/d44a9960
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/d44a9960
Branch: refs/heads/master
Commit: d44a9960db5e752926eb6ddf84c54160b8df244c
Parents: d4072b5
Author: Sagar <ku...@gmail.com>
Authored: Mon Oct 31 23:47:25 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Mon Oct 31 23:47:25 2016 +0530
----------------------------------------------------------------------
app/src/main/res/menu/drawer_view.xml | 30 +++++++++++++++++-------------
app/src/main/res/values/strings.xml | 16 ++++++++++++----
2 files changed, 29 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/d44a9960/app/src/main/res/menu/drawer_view.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/menu/drawer_view.xml b/app/src/main/res/menu/drawer_view.xml
index bfe9105..cc87881 100644
--- a/app/src/main/res/menu/drawer_view.xml
+++ b/app/src/main/res/menu/drawer_view.xml
@@ -21,39 +21,43 @@
<item
android:id="@+id/nav_workflows"
android:icon="@drawable/ic_dashboard_home_web"
- android:title="All Workflows"/>
+ android:title="@string/title_nav_all_workflows"/>
<item
android:id="@+id/nav_my_workflows"
android:icon="@drawable/ic_dashboard_home_web"
- android:title="@string/my_workflows"/>
+ android:title="@string/title_nav_my_workflows"/>
<item
android:id="@+id/nav_favourite_workflow"
android:icon="@drawable/ic_star_black_24dp"
- android:title="Favourite Workflows"/>
- <item
- android:id="@+id/nav_usage"
- android:icon="@drawable/ic_usage_web"
- android:title="Usage"/>
+ android:title="@string/title_nav_favourite_workflows"/>
+
<item
android:id="@+id/nav_announcement"
android:icon="@drawable/ic_announcement_black_24dp"
- android:title="Announcement"/>
+ android:title="@string/title_nav_all_workflows"/>
+ </group>
+ <item
+ android:id="@+id/nav_usage"
+ android:icon="@drawable/ic_usage_web"
+ android:title="@string/title_nav_usage"/>
<item
android:id="@+id/nav_about"
android:icon="@drawable/ic_about_web"
- android:title="About"/>
+ android:title="@string/title_nav_about"/>
+ <group android:checkableBehavior="single">
<item
android:id="@+id/os_licences"
android:icon="@drawable/ic_about_web"
- android:title="@string/os_licences"/>
+ android:title="@string/title_nav_os_licences"/>
+ </group>
<item
android:id="@+id/nav_settings"
android:icon="@drawable/ic_setting_workflows_web"
- android:title="Settings"/>
+ android:title="@string/title_nav_settings"/>
<item
android:id="@+id/nav_logout"
android:icon="@drawable/ic_logout_web"
- android:title="Logout"/>
- </group>
+ android:title="@string/tiitle_nav_logout"/>
+
</menu>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/d44a9960/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 be96d13..df67989 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -15,7 +15,7 @@ limitations under the License.
<resources>
<string name="os_licence_version_text">Version:</string>
<string name="os_licence_licence_text">Licence:</string>
- <string name="os_licences">Licence info</string>
+ <string name="title_nav_os_licences">Licence info</string>
<string name="app_name">Taverna Mobile</string>
<string name="hello_world">Empty</string>
<string name="action_settings">Settings</string>
@@ -40,12 +40,11 @@ limitations under the License.
<string name="failed_to_fetch_announcement">Failed to fetch announcement</string>
<string name="ok">OK</string>
- <string name="title_favorite">Favorites</string>
+
<string name="title_explore">Workflows</string>
<string name="title_usage">Usage</string>
<string name="title_about">About</string>
<string name="title_exit">Logout</string>
- <string name="title_openworkflow">Open Workflow</string>
<string name="menu_search">Search</string>
<string name="action_example">Example action</string>
@@ -163,7 +162,7 @@ limitations under the License.
<string name="login_button_description">Login Button</string>
<string name="err_login_email">Enter valid email</string>
<string name="err_login_password">Enter valid password</string>
- <string name="my_workflows">My Workflows</string>
+ <string name="title_nav_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>
@@ -202,5 +201,14 @@ limitations under the License.
<string name="pref_server_title">Configure Taverna Server </string>
<string name="pref_server_des">Configure a different Taverna Server for the app</string>
+ <!--Navigation drawer title info-->
+ <string name="title_nav_all_workflows">All Workflows</string>
+ <string name="title_nav_favourite_workflows">Favourite Workflows</string>
+ <string name="title_nav_announcement">Announcement</string>
+ <string name="title_nav_settings">Settings</string>
+ <string name="tiitle_nav_logout">Logout</string>
+ <string name="title_nav_usage">Usage</string>
+ <string name="title_nav_about">About</string>
+
<!-- Strings related to Settings -->
</resources>
[2/4] incubator-taverna-mobile git commit: refactor code
Posted by sa...@apache.org.
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 <ku...@gmail.com>
Authored: Mon Oct 31 23:45:30 2016 +0530
Committer: Sagar <ku...@gmail.com>
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"