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 <[email protected]> Authored: Tue Nov 1 01:36:11 2016 +0530 Committer: Sagar <[email protected]> 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>
