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 2017/06/03 05:42:29 UTC
[1/6] incubator-taverna-mobile git commit: redesign setting's
activity to fragment
Repository: incubator-taverna-mobile
Updated Branches:
refs/heads/master c0c85c780 -> d477c3b87
redesign setting's activity to fragment
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/16acb553
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/16acb553
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/16acb553
Branch: refs/heads/master
Commit: 16acb55349a19e290565193f58a7f92261db7307
Parents: c0fb573
Author: Sagar <ku...@gmail.com>
Authored: Sat May 27 11:39:16 2017 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Sat May 27 11:39:16 2017 +0530
----------------------------------------------------------------------
app/build.gradle | 2 +
.../mobile/activities/SettingsActivity.java | 239 -------------------
.../mobile/data/local/PreferencesHelper.java | 79 +++---
.../taverna/mobile/ui/DashboardActivity.java | 10 +-
.../taverna/mobile/ui/SettingFragment.java | 50 ++++
.../main/res/mipmap-hdpi/ic_user_profiles.png | Bin 0 -> 832 bytes
app/src/main/res/mipmap-hdpi/icuserprofiles.png | Bin 832 -> 0 bytes
.../main/res/mipmap-mdpi/ic_user_profiles.png | Bin 0 -> 576 bytes
app/src/main/res/mipmap-mdpi/icuserprofiles.png | Bin 576 -> 0 bytes
.../main/res/mipmap-xhdpi/ic_user_profiles.png | Bin 0 -> 1134 bytes
.../main/res/mipmap-xhdpi/icuserprofiles.png | Bin 1134 -> 0 bytes
.../main/res/mipmap-xxhdpi/ic_user_profiles.png | Bin 0 -> 1737 bytes
.../main/res/mipmap-xxhdpi/icuserprofiles.png | Bin 1737 -> 0 bytes
.../res/mipmap-xxxhdpi/ic_user_profiles.png | Bin 0 -> 2427 bytes
.../main/res/mipmap-xxxhdpi/icuserprofiles.png | Bin 2427 -> 0 bytes
app/src/main/res/values/strings.xml | 22 +-
app/src/main/res/values/styles.xml | 1 +
app/src/main/res/xml/pref_general.xml | 37 ++-
18 files changed, 130 insertions(+), 310 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/16acb553/app/build.gradle
----------------------------------------------------------------------
diff --git a/app/build.gradle b/app/build.gradle
index 8989dd6..55f45fe 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -62,6 +62,8 @@ dependencies {
compile 'com.android.support:support-v4:23.3.0'
compile 'com.android.support:design:23.3.0'
+ compile 'com.android.support:preference-v7:23.3.0'
+ compile 'com.android.support:preference-v14:23.3.0'
compile 'com.squareup.retrofit2:retrofit:2.0.2'
compile "com.squareup.retrofit2:adapter-rxjava:2.0.2"
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/16acb553/app/src/main/java/org/apache/taverna/mobile/activities/SettingsActivity.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/activities/SettingsActivity.java b/app/src/main/java/org/apache/taverna/mobile/activities/SettingsActivity.java
deleted file mode 100644
index 598ea0a..0000000
--- a/app/src/main/java/org/apache/taverna/mobile/activities/SettingsActivity.java
+++ /dev/null
@@ -1,239 +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.activities;
-
-
-import android.annotation.TargetApi;
-import android.content.Context;
-import android.content.res.Configuration;
-import android.os.Build;
-import android.os.Bundle;
-import android.preference.ListPreference;
-import android.preference.Preference;
-import android.preference.PreferenceActivity;
-import android.preference.PreferenceFragment;
-import android.preference.PreferenceManager;
-import android.support.v4.app.NavUtils;
-import android.view.MenuItem;
-
-import org.apache.taverna.mobile.R;
-import org.apache.taverna.mobile.TavernaApplication;
-import org.apache.taverna.mobile.data.local.PreferencesHelper;
-
-import java.util.List;
-
-/**
- * A {@link PreferenceActivity} that presents a set of application settings. On
- * handset devices, settings are presented as a single list. On tablets,
- * settings are split by category, with category headers shown to the left of
- * the list of settings.
- * <p/>
- * See <a href="http://developer.android.com/design/patterns/settings.html">
- * Android Design: Settings</a> for design guidelines and the <a
- * href="http://developer.android.com/guide/topics/ui/settings.html">Settings
- * API Guide</a> for more information on developing a Settings UI.
- */
-public class SettingsActivity extends PreferenceActivity {
- /**
- * A preference value change listener that updates the preference's summary
- * to reflect its new value.
- */
- private static Preference.OnPreferenceChangeListener sBindPreferenceSummaryToValueListener =
- new Preference.OnPreferenceChangeListener() {
- @Override
- public boolean onPreferenceChange(Preference preference, Object value) {
- String stringValue = value.toString();
-
- if (preference instanceof ListPreference) {
- // For list preferences, look up the correct display value in
- // the preference's 'entries' list.
- ListPreference listPreference = (ListPreference) preference;
- int index = listPreference.findIndexOfValue(stringValue);
-
- // Set the summary to reflect the new value.
- preference.setSummary(
- index >= 0
- ? listPreference.getEntries()[index]
- : null);
-
- } else {
- // For all other preferences, set the summary to the value's
- // simple string representation.
- if (preference.getKey().equals(PreferencesHelper.PREF_KEY_PLAYER_URL)) {
-
- new PreferencesHelper(TavernaApplication.getContext())
- .setUserPlayerLoggedInFlag(false);
- }
- preference.setSummary(stringValue);
- }
- return true;
- }
- };
-
- /**
- * Helper method to determine if the device has an extra-large screen. For
- * example, 10" tablets are extra-large.
- */
- private static boolean isXLargeTablet(Context context) {
- return (context.getResources().getConfiguration().screenLayout
- & Configuration.SCREENLAYOUT_SIZE_MASK) >= Configuration.SCREENLAYOUT_SIZE_XLARGE;
- }
-
- /**
- * Determines whether the simplified settings UI should be shown. This is
- * true if the device doesn't have newer APIs like {@link PreferenceFragment},
- * or the device doesn't have an extra-large screen. In these cases, a single-pane
- * "simplified" settings UI should be shown.
- */
- private static boolean isSimplePreferences(Context context) {
- return Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB
- || !isXLargeTablet(context);
- }
-
- /**
- * Binds a preference's summary to its value. More specifically, when the
- * preference's value is changed, its summary (line of text below the
- * preference title) is updated to reflect the value. The summary is also
- * immediately updated upon calling this method. The exact display format is
- * dependent on the type of preference.
- *
- * @see #sBindPreferenceSummaryToValueListener
- */
- private static void bindPreferenceSummaryToValue(Preference preference) {
- // Set the listener to watch for value changes.
- preference.setOnPreferenceChangeListener(sBindPreferenceSummaryToValueListener);
-
- // Trigger the listener immediately with the preference's
- // current value.
- sBindPreferenceSummaryToValueListener.onPreferenceChange(preference,
- PreferenceManager
- .getDefaultSharedPreferences(preference.getContext())
- .getString(preference.getKey(), ""));
- }
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- // setupActionBar();
- }
-
- /**
- * Set up the {@link android.app.ActionBar}, if the API is available.
- */
- /* @NonNull
- @TargetApi(Build.VERSION_CODES.HONEYCOMB)
- private void setupActionBar() {
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
- // Show the Up button in the action bar.
- getActionBar().setDisplayHomeAsUpEnabled(true);
- }
- }
-*/
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- int id = item.getItemId();
- if (id == android.R.id.home) {
- // This ID represents the Home or Up button. In the case of this
- // activity, the Up button is shown. Use NavUtils to allow users
- // to navigate up one level in the application structure. For
- // more details, see the Navigation pattern on Android Design:
- //
- // http://developer.android.com/design/patterns/navigation.html#up-vs-back
- //
- // TODO: If Settings has multiple levels, Up should navigate up
- // that hierarchy.
- NavUtils.navigateUpFromSameTask(this);
- return true;
- }
- return super.onOptionsItemSelected(item);
- }
-
- @Override
- protected void onPostCreate(Bundle savedInstanceState) {
- super.onPostCreate(savedInstanceState);
-
- setupSimplePreferencesScreen();
- }
-
- /**
- * Shows the simplified settings UI if the device configuration if the
- * device configuration dictates that a simplified, single-pane UI should be
- * shown.
- * Note that this is only valid for older Honeycomb and below API levels which
- * the app does not target.
- */
- private void setupSimplePreferencesScreen() {
- //TODO remove this since the app does not need to support old API levels
- if (!isSimplePreferences(this)) {
- return;
- }
-
- // In the simplified UI, fragments are not used at all and we instead
- // use the older PreferenceActivity APIs.
-
- // Add 'general' preferences.
- addPreferencesFromResource(R.xml.pref_general);
-
- // Bind the summaries of EditText/List/Dialog/Ringtone preferences to
- // their values. When their values change, their summaries are updated
- // to reflect the new value, per the Android Design guidelines.
- //bindPreferenceSummaryToValue(findPreference("pref_server_url"));
- bindPreferenceSummaryToValue(findPreference("pref_player_url"));
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean onIsMultiPane() {
- return isXLargeTablet(this) && !isSimplePreferences(this);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- @TargetApi(Build.VERSION_CODES.HONEYCOMB)
- public void onBuildHeaders(List<Header> target) {
- if (!isSimplePreferences(this)) {
- loadHeadersFromResource(R.xml.pref_headers, target);
- }
- }
-
- /**
- * This fragment shows general preferences only. It is used when the
- * activity is showing a two-pane settings UI.
- */
- @TargetApi(Build.VERSION_CODES.HONEYCOMB)
- public static class GeneralPreferenceFragment extends PreferenceFragment {
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- addPreferencesFromResource(R.xml.pref_general);
-
- // Bind the summaries of EditText/List/Dialog/Ringtone preferences
- // to their values. When their values change, their summaries are
- // updated to reflect the new value, per the Android Design
- // guidelines.
- bindPreferenceSummaryToValue(findPreference("pref_server_url"));
- bindPreferenceSummaryToValue(findPreference("pref_player_url"));
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/16acb553/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java b/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java
index 8ec19c8..1082d33 100644
--- a/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java
@@ -19,22 +19,21 @@
package org.apache.taverna.mobile.data.local;
+import org.apache.taverna.mobile.R;
+import org.apache.taverna.mobile.data.model.User;
+
import android.content.Context;
import android.content.SharedPreferences;
import android.preference.PreferenceManager;
-import org.apache.taverna.mobile.data.model.User;
-
import rx.Observable;
import rx.functions.Func0;
public class PreferencesHelper {
- public static final String PREF_FILE_NAME = "taverna_app_pref_file";
+ public static final String PREF_KEY_PLAYER_LOGGED_IN = "pref_player_logged_in";
- private static final String PREF_KEY_PLAYER_LOGGED_IN = "pref_player_logged_in";
-
- private static final String PREF_KEY_LOGGED_IN = "pref_logged_in";
+ public static final String PREF_KEY_PLAYER_URL = "pref_key_player_url";
private static final String PREF_KEY_USER_ID = "pref_user_id";
@@ -53,8 +52,7 @@ public class PreferencesHelper {
private static final String PREF_KEY_USER_WEBSITE = "pref_user_website";
private static final String PREF_KEY_PLAYER_CREDENTIAL = "pref_player_credential";
-
- public static final String PREF_KEY_PLAYER_URL = "pref_player_url";
+ private static final String PREF_KEY_LOGGED_IN = "pref_key_logged_in";
public static final String PLAYER_DEFAULT_URL = "http://139.59.28.12:3000/";
@@ -62,99 +60,98 @@ public class PreferencesHelper {
public static final String PREF_KEY_PLAYER_USER_PASSWORD = "pref_password";
- private final SharedPreferences mPref;
-
private final SharedPreferences sharedPref;
+ private Context mContext;
public PreferencesHelper(Context context) {
- mPref = context.getSharedPreferences(PREF_FILE_NAME, Context.MODE_PRIVATE);
sharedPref = PreferenceManager.getDefaultSharedPreferences(context);
+ mContext = context;
}
public void clear() {
- mPref.edit().clear().apply();
+ sharedPref.edit().clear().apply();
}
public boolean isLoggedInFlag() {
- return mPref.getBoolean(PREF_KEY_LOGGED_IN, false);
+ return sharedPref.getBoolean(mContext.getString(R.string.pref_key_logged_in), false);
}
public void setLoggedInFlag(Boolean flag) {
- mPref.edit().putBoolean(PREF_KEY_LOGGED_IN, flag).apply();
+ sharedPref.edit().putBoolean(mContext.getString(R.string.pref_key_logged_in), flag).apply();
}
public String getUserWebsite() {
- return mPref.getString(PREF_KEY_USER_WEBSITE, null);
+ return sharedPref.getString(PREF_KEY_USER_WEBSITE, null);
}
private void setUserWebsite(String website) {
- mPref.edit().putString(PREF_KEY_USER_WEBSITE, website).apply();
+ sharedPref.edit().putString(PREF_KEY_USER_WEBSITE, website).apply();
}
public String getUserCountry() {
- return mPref.getString(PREF_KEY_USER_COUNTRY, null);
+ return sharedPref.getString(PREF_KEY_USER_COUNTRY, null);
}
private void setUserCountry(String country) {
- mPref.edit().putString(PREF_KEY_USER_COUNTRY, country).apply();
+ sharedPref.edit().putString(PREF_KEY_USER_COUNTRY, country).apply();
}
public String getUserCity() {
- return mPref.getString(PREF_KEY_USER_CITY, null);
+ return sharedPref.getString(PREF_KEY_USER_CITY, null);
}
private void setUserCity(String city) {
- mPref.edit().putString(PREF_KEY_USER_CITY, city).apply();
+ sharedPref.edit().putString(PREF_KEY_USER_CITY, city).apply();
}
public String getUserID() {
- return mPref.getString(PREF_KEY_USER_ID, null);
+ return sharedPref.getString(PREF_KEY_USER_ID, null);
}
private void setUserID(String userID) {
- mPref.edit().putString(PREF_KEY_USER_ID, userID).apply();
+ sharedPref.edit().putString(PREF_KEY_USER_ID, userID).apply();
}
public String getUserName() {
- return mPref.getString(PREF_KEY_USER_NAME, null);
+ return sharedPref.getString(PREF_KEY_USER_NAME, null);
}
private void setUserName(String userName) {
- mPref.edit().putString(PREF_KEY_USER_NAME, userName).apply();
+ sharedPref.edit().putString(PREF_KEY_USER_NAME, userName).apply();
}
public String getUserDescription() {
- return mPref.getString(PREF_KEY_USER_DESCRIPTION, null);
+ return sharedPref.getString(PREF_KEY_USER_DESCRIPTION, null);
}
private void setUserDescription(String userDescription) {
- mPref.edit().putString(PREF_KEY_USER_DESCRIPTION, userDescription).apply();
+ sharedPref.edit().putString(PREF_KEY_USER_DESCRIPTION, userDescription).apply();
}
public String getPlayerUserEmail() {
- return sharedPref.getString(PREF_KEY_PLAYER_USER_EMAIL, null);
+ return sharedPref.getString(mContext.getString(R.string.pref_key_player_user), "");
}
public String getPlayerUserPassword() {
- return sharedPref.getString(PREF_KEY_PLAYER_USER_PASSWORD, null);
+ return sharedPref.getString(mContext.getString(R.string.pref_key_player_password), "");
}
public String getUserEmail() {
- return mPref.getString(PREF_KEY_USER_EMAIL, null);
+ return sharedPref.getString(PREF_KEY_USER_EMAIL, null);
}
private void setUserEmail(String userEmail) {
- mPref.edit().putString(PREF_KEY_USER_EMAIL, userEmail).apply();
+ sharedPref.edit().putString(PREF_KEY_USER_EMAIL, userEmail).apply();
}
public String getUserAvatar() {
- return mPref.getString(PREF_KEY_USER_AVATAR, null);
+ return sharedPref.getString(PREF_KEY_USER_AVATAR, null);
}
private void setUserAvatar(String userAvatar) {
- mPref.edit().putString(PREF_KEY_USER_AVATAR, userAvatar).apply();
+ sharedPref.edit().putString(PREF_KEY_USER_AVATAR, userAvatar).apply();
}
public Observable<User> saveUserDetail(final User user) {
@@ -193,24 +190,24 @@ public class PreferencesHelper {
}
public boolean isUserPlayerLoggedInFlag() {
- return mPref.getBoolean(PREF_KEY_PLAYER_LOGGED_IN, false);
- }
-
- public void setUserPlayerLoggedInFlagAndCredential(Boolean flag, String credential) {
- mPref.edit().putBoolean(PREF_KEY_PLAYER_LOGGED_IN, flag).apply();
- mPref.edit().putString(PREF_KEY_PLAYER_CREDENTIAL, credential).apply();
+ return sharedPref.getBoolean(PREF_KEY_PLAYER_LOGGED_IN, false);
}
public void setUserPlayerLoggedInFlag(Boolean flag) {
- mPref.edit().putBoolean(PREF_KEY_PLAYER_LOGGED_IN, flag).apply();
+ sharedPref.edit().putBoolean(PREF_KEY_PLAYER_LOGGED_IN, flag).apply();
}
+ public void setUserPlayerLoggedInFlagAndCredential(Boolean flag, String credential) {
+ sharedPref.edit().putBoolean(PREF_KEY_PLAYER_LOGGED_IN, flag).apply();
+ sharedPref.edit().putString(PREF_KEY_PLAYER_CREDENTIAL, credential).apply();
+ }
+
public String getUserPlayerCredential() {
- return mPref.getString(PREF_KEY_PLAYER_CREDENTIAL, " ");
+ return sharedPref.getString(PREF_KEY_PLAYER_CREDENTIAL, "");
}
public String getPlayerURL() {
- return sharedPref.getString(PREF_KEY_PLAYER_URL, PLAYER_DEFAULT_URL);
+ return sharedPref.getString(mContext.getString(R.string.pref_key_player_url), PLAYER_DEFAULT_URL);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/16acb553/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
index 456116c..67ce6d8 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/DashboardActivity.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/DashboardActivity.java
@@ -64,6 +64,7 @@ public class DashboardActivity extends AppCompatActivity {
private Dialog dialog;
private DataManager dataManager;
private Fragment fragment;
+ private MenuItem item;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -201,12 +202,12 @@ public class DashboardActivity extends AppCompatActivity {
case R.id.nav_settings:
- startActivity(new Intent(getApplicationContext(),
- SettingsActivity.class));
- overridePendingTransition(android.R.anim.slide_in_left, android.R
- .anim.slide_out_right);
+ ActivityUtils.addFragmentToActivity(getSupportFragmentManager(),
+ new SettingFragment(), R.id.frame_container);
+ menuItem.setChecked(true);
mDrawerLayout.closeDrawers();
+ toolbar.setTitle(R.string.title_nav_settings);
return true;
case R.id.nav_logout:
@@ -229,7 +230,6 @@ public class DashboardActivity extends AppCompatActivity {
@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.dashboard_main, menu);
-
return true;
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/16acb553/app/src/main/java/org/apache/taverna/mobile/ui/SettingFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/SettingFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/SettingFragment.java
new file mode 100644
index 0000000..6e7fd73
--- /dev/null
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/SettingFragment.java
@@ -0,0 +1,50 @@
+package org.apache.taverna.mobile.ui;
+
+import org.apache.taverna.mobile.R;
+import org.apache.taverna.mobile.data.local.PreferencesHelper;
+
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.support.v7.preference.PreferenceFragmentCompat;
+import android.view.Menu;
+import android.view.MenuItem;
+
+
+public class SettingFragment extends PreferenceFragmentCompat implements SharedPreferences
+ .OnSharedPreferenceChangeListener {
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ }
+
+ @Override
+ public void onCreatePreferences(Bundle bundle, String s) {
+ addPreferencesFromResource(R.xml.pref_general);
+ }
+
+ @Override
+ public void onResume() {
+ super.onResume();
+ getPreferenceManager().getSharedPreferences().registerOnSharedPreferenceChangeListener(
+ this);
+ }
+
+ @Override
+ public void onPause() {
+ getPreferenceManager().getSharedPreferences().unregisterOnSharedPreferenceChangeListener(
+ this);
+ super.onPause();
+ }
+
+ @Override
+ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+ if (key.equals(getString(R.string.pref_key_player_password)) || key.equals(getString(R
+ .string.pref_key_player_user))) {
+ getPreferenceManager().getSharedPreferences().edit().putBoolean(PreferencesHelper
+ .PREF_KEY_PLAYER_LOGGED_IN, false).apply();
+ }
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/16acb553/app/src/main/res/mipmap-hdpi/ic_user_profiles.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/mipmap-hdpi/ic_user_profiles.png b/app/src/main/res/mipmap-hdpi/ic_user_profiles.png
new file mode 100644
index 0000000..72d9ce8
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_user_profiles.png differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/16acb553/app/src/main/res/mipmap-hdpi/icuserprofiles.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/mipmap-hdpi/icuserprofiles.png b/app/src/main/res/mipmap-hdpi/icuserprofiles.png
deleted file mode 100644
index 72d9ce8..0000000
Binary files a/app/src/main/res/mipmap-hdpi/icuserprofiles.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/16acb553/app/src/main/res/mipmap-mdpi/ic_user_profiles.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/mipmap-mdpi/ic_user_profiles.png b/app/src/main/res/mipmap-mdpi/ic_user_profiles.png
new file mode 100644
index 0000000..ab14d6a
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_user_profiles.png differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/16acb553/app/src/main/res/mipmap-mdpi/icuserprofiles.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/mipmap-mdpi/icuserprofiles.png b/app/src/main/res/mipmap-mdpi/icuserprofiles.png
deleted file mode 100644
index ab14d6a..0000000
Binary files a/app/src/main/res/mipmap-mdpi/icuserprofiles.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/16acb553/app/src/main/res/mipmap-xhdpi/ic_user_profiles.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/mipmap-xhdpi/ic_user_profiles.png b/app/src/main/res/mipmap-xhdpi/ic_user_profiles.png
new file mode 100644
index 0000000..bc0243e
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_user_profiles.png differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/16acb553/app/src/main/res/mipmap-xhdpi/icuserprofiles.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/mipmap-xhdpi/icuserprofiles.png b/app/src/main/res/mipmap-xhdpi/icuserprofiles.png
deleted file mode 100644
index bc0243e..0000000
Binary files a/app/src/main/res/mipmap-xhdpi/icuserprofiles.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/16acb553/app/src/main/res/mipmap-xxhdpi/ic_user_profiles.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_user_profiles.png b/app/src/main/res/mipmap-xxhdpi/ic_user_profiles.png
new file mode 100644
index 0000000..489f28f
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_user_profiles.png differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/16acb553/app/src/main/res/mipmap-xxhdpi/icuserprofiles.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/mipmap-xxhdpi/icuserprofiles.png b/app/src/main/res/mipmap-xxhdpi/icuserprofiles.png
deleted file mode 100644
index 489f28f..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/icuserprofiles.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/16acb553/app/src/main/res/mipmap-xxxhdpi/ic_user_profiles.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_user_profiles.png b/app/src/main/res/mipmap-xxxhdpi/ic_user_profiles.png
new file mode 100644
index 0000000..0129e26
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_user_profiles.png differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/16acb553/app/src/main/res/mipmap-xxxhdpi/icuserprofiles.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/mipmap-xxxhdpi/icuserprofiles.png b/app/src/main/res/mipmap-xxxhdpi/icuserprofiles.png
deleted file mode 100644
index 0129e26..0000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/icuserprofiles.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/16acb553/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 3b1a0e5..d972000 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -108,14 +108,15 @@ limitations under the License.
<string name="about3">Originally developed during Google Summer of Code 2015 for the<a
href="http://taverna.incubator.apache.org">Apache Taverna project</a>.
</string>
- <string name="playerconfig">Configure Player Account</string>
- <string name="playerconfig_summary">Username used to login to Taverna player portal</string>
- <string name="playeruser">Username/email</string>
- <string name="playerpass">Password</string>
+ <string name="pref_category_title_player_config">Configure Player Account</string>
+ <string name="pref_summary_player_user">Username used to login to Taverna player portal</string>
+ <string name="pref_title_player_user">Username/email</string>
+ <string name="pref_title_player_pass">Password</string>
+ <string name="pref_title_myexperiment_user">Username/email</string>
<string name="servererr">Server error. Please try again later</string>
<string name="auth_err">Invalid login credentials</string>
- <string name="myexperimenttitle">Configure MyExperiment Account</string>
- <string name="myexperimentsummary">Username used to login to MyExperiment</string>
+ <string name="pref_category_title_myexperiment">Configure MyExperiment Account</string>
+ <string name="pref_summary_myexperiment_user">Username used to login to MyExperiment</string>
<string name="title_activity_run_result">Workflow Run Result</string>
<string name="runstarted">Run Started</string>
<string name="run_finishtime">Run finish Time</string>
@@ -190,6 +191,7 @@ limitations under the License.
<string name="pref_header_general">General</string>
<!-- Login status info-->
+ <string name="pref_key_logged_in">pref_logged_in</string>
<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 -->
@@ -214,4 +216,12 @@ limitations under the License.
<string name="title_nav_os_licences">Licence info</string>
<!-- Strings related to message -->
<string name="msg_no_workflow_found">No matching criteria workflow found</string>
+
+ <string name="pref_key_player_url">pref_player_url</string>
+ <string name="pref_key_player_user">pref_key_player_user</string>
+ <string name="pref_key_player_password">pref_key_player_password</string>
+ <string name="pref_summary_player_pass">Taverna Player Password</string>
+ <string name="pref_key_myexperiment_user">pref_myexperimentuser</string>
+ <string name="pref_key_myexperiment_pass">pref_myexperimentpass</string>
+ <string name="pref_summary_myexperiment_pass">Myexperiment password</string>
</resources>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/16acb553/app/src/main/res/values/styles.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 34328de..61989a8 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -22,6 +22,7 @@ limitations under the License.
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
<item name="android:windowBackground">@color/window_background</item>
+ <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
</style>
<style name="Widget.CardContent" parent="android:Widget">
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/16acb553/app/src/main/res/xml/pref_general.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/xml/pref_general.xml b/app/src/main/res/xml/pref_general.xml
index 03cef22..b356731 100644
--- a/app/src/main/res/xml/pref_general.xml
+++ b/app/src/main/res/xml/pref_general.xml
@@ -25,7 +25,7 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<CheckBoxPreference
- android:key="pref_logged_in"
+ android:key="@string/pref_key_logged_in"
android:title="@string/pref_remainLogged_in"
android:summary="@string/pref_login_description"
android:defaultValue="true" />
@@ -33,7 +33,7 @@
<!-- NOTE: EditTextPreference accepts EditText attributes. -->
<!-- NOTE: EditTextPreference's summary should be set to its value by the activity code. -->
<EditTextPreference
- android:key="pref_player_url"
+ android:key="@string/pref_key_player_url"
android:title="@string/pref_player_title"
android:summary="@string/pref_player_des"
android:defaultValue="@string/pref_player_default"
@@ -54,22 +54,22 @@
android:maxLines="1" /> -->
<PreferenceCategory
android:icon="@drawable/gear_icon"
- android:title="@string/playerconfig">
+ android:title="@string/pref_category_title_player_config">
<EditTextPreference
- android:key="pref_user"
- android:title="@string/playeruser"
- android:icon="@mipmap/icuserprofiles"
- android:summary="@string/playerconfig_summary"
+ android:key="@string/pref_key_player_user"
+ android:title="@string/pref_title_player_user"
+ android:icon="@mipmap/ic_user_profiles"
+ android:summary="@string/pref_summary_player_user"
android:defaultValue="default"
android:selectAllOnFocus="true"
android:inputType="textEmailAddress|textPersonName"
android:singleLine="true"
android:maxLines="1" />
<EditTextPreference
- android:key="pref_password"
- android:title="@string/playerpass"
+ android:key="pref_key_player_password"
+ android:title="@string/pref_title_player_pass"
android:icon="@android:drawable/ic_secure"
- android:summary="Taverna Player Password"
+ android:summary="@string/pref_summary_player_pass"
android:defaultValue="default"
android:selectAllOnFocus="true"
android:inputType="textPassword"
@@ -78,23 +78,22 @@
</PreferenceCategory>
<PreferenceCategory
android:icon="@drawable/gear_icon"
- android:summary="@string/myexperimentsummary"
- android:title="@string/myexperimenttitle">
+ android:title="@string/pref_category_title_myexperiment">
<EditTextPreference
- android:key="myexperimentuser"
- android:title="@string/playeruser"
- android:icon="@mipmap/icuserprofiles"
- android:summary="@string/myexperimentsummary"
+ android:key="@string/pref_key_myexperiment_user"
+ android:title="@string/pref_title_myexperiment_user"
+ android:icon="@mipmap/ic_user_profiles"
+ android:summary="@string/pref_summary_myexperiment_user"
android:defaultValue="default"
android:selectAllOnFocus="true"
android:inputType="textEmailAddress|textPersonName"
android:singleLine="true"
android:maxLines="1" />
<EditTextPreference
- android:key="myexperimentpass"
- android:title="@string/playerpass"
+ android:key="@string/pref_key_myexperiment_pass"
+ android:title="@string/pref_title_player_pass"
android:icon="@android:drawable/ic_secure"
- android:summary="Myexperiment password"
+ android:summary="@string/pref_summary_myexperiment_pass"
android:defaultValue="default"
android:selectAllOnFocus="true"
android:inputType="textPassword"
[3/6] incubator-taverna-mobile git commit: search visibility fix
Posted by sa...@apache.org.
search visibility fix
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/e86b400c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/e86b400c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/e86b400c
Branch: refs/heads/master
Commit: e86b400c688c7261b2ebebf39f11c8614da93d78
Parents: a25a0a4
Author: Sagar <ku...@gmail.com>
Authored: Sat May 27 11:50:35 2017 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Sat May 27 11:50:35 2017 +0530
----------------------------------------------------------------------
.../taverna/mobile/ui/DashboardActivity.java | 21 ++++++++++----------
.../taverna/mobile/ui/SettingFragment.java | 8 +++++++-
.../ui/anouncements/AnnouncementFragment.java | 11 +++++++++-
.../ui/myworkflows/MyWorkflowFragment.java | 10 ++++++++++
4 files changed, 37 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/e86b400c/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
index 67ce6d8..ffabd9f 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/DashboardActivity.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/DashboardActivity.java
@@ -19,6 +19,16 @@
package org.apache.taverna.mobile.ui;
+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.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 android.app.Dialog;
import android.content.Intent;
import android.os.Bundle;
@@ -35,17 +45,6 @@ import android.view.MenuItem;
import android.webkit.WebView;
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.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;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/e86b400c/app/src/main/java/org/apache/taverna/mobile/ui/SettingFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/SettingFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/SettingFragment.java
index 6e7fd73..fa59f25 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/SettingFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/SettingFragment.java
@@ -16,7 +16,7 @@ public class SettingFragment extends PreferenceFragmentCompat implements SharedP
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
-
+ setHasOptionsMenu(true);
}
@Override
@@ -47,4 +47,10 @@ public class SettingFragment extends PreferenceFragmentCompat implements SharedP
}
}
+ @Override
+ public void onPrepareOptionsMenu(Menu menu) {
+ super.onPrepareOptionsMenu(menu);
+ MenuItem item=menu.findItem(R.id.action_search);
+ item.setVisible(false);
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/e86b400c/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementFragment.java
index 4b33f52..d574a50 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementFragment.java
@@ -29,6 +29,8 @@ import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.util.Log;
import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.webkit.WebView;
@@ -103,7 +105,7 @@ public class AnnouncementFragment extends Fragment implements RecyclerItemClickL
mAnnouncements = new Announcements();
dataManager = new DataManager();
mAnnouncementPresenter = new AnnouncementPresenter(dataManager);
-
+ setHasOptionsMenu(true);
}
@@ -258,4 +260,11 @@ public class AnnouncementFragment extends Fragment implements RecyclerItemClickL
dialog.dismiss();
}
}
+
+ @Override
+ public void onPrepareOptionsMenu(Menu menu) {
+ super.onPrepareOptionsMenu(menu);
+ MenuItem item=menu.findItem(R.id.action_search);
+ item.setVisible(false);
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/e86b400c/app/src/main/java/org/apache/taverna/mobile/ui/myworkflows/MyWorkflowFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/myworkflows/MyWorkflowFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/myworkflows/MyWorkflowFragment.java
index 6f3316b..8773815 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/myworkflows/MyWorkflowFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/myworkflows/MyWorkflowFragment.java
@@ -27,6 +27,8 @@ import android.support.v7.widget.DefaultItemAnimator;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ProgressBar;
@@ -84,6 +86,7 @@ public class MyWorkflowFragment extends Fragment implements MyWorkflowMvpView,
mWorkflowPresenter = new MyWorkflowPresenter(dataManager);
+ setHasOptionsMenu(true);
}
@Override
@@ -200,4 +203,11 @@ public class MyWorkflowFragment extends Fragment implements MyWorkflowMvpView,
public void onItemLongPress(View childView, int position) {
}
+
+ @Override
+ public void onPrepareOptionsMenu(Menu menu) {
+ super.onPrepareOptionsMenu(menu);
+ MenuItem item=menu.findItem(R.id.action_search);
+ item.setVisible(false);
+ }
}
[6/6] incubator-taverna-mobile git commit: This Close #42
Posted by sa...@apache.org.
This Close #42
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/d477c3b8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/d477c3b8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/d477c3b8
Branch: refs/heads/master
Commit: d477c3b878dc7c9eadef2e0f0dd64dac32b28c36
Parents: c0c85c7 f61e8c2
Author: Sagar <ku...@gmail.com>
Authored: Sat Jun 3 11:11:26 2017 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Sat Jun 3 11:11:26 2017 +0530
----------------------------------------------------------------------
app/build.gradle | 2 +
.../mobile/activities/SettingsActivity.java | 239 -------------------
.../mobile/data/local/PreferencesHelper.java | 80 +++----
.../taverna/mobile/ui/DashboardActivity.java | 31 ++-
.../taverna/mobile/ui/SettingFragment.java | 56 +++++
.../ui/anouncements/AnnouncementFragment.java | 31 ++-
.../ui/myworkflows/MyWorkflowFragment.java | 30 ++-
app/src/main/res/menu/drawer_view.xml | 4 +-
.../main/res/mipmap-hdpi/ic_user_profiles.png | Bin 0 -> 832 bytes
app/src/main/res/mipmap-hdpi/icuserprofiles.png | Bin 832 -> 0 bytes
.../main/res/mipmap-mdpi/ic_user_profiles.png | Bin 0 -> 576 bytes
app/src/main/res/mipmap-mdpi/icuserprofiles.png | Bin 576 -> 0 bytes
.../main/res/mipmap-xhdpi/ic_user_profiles.png | Bin 0 -> 1134 bytes
.../main/res/mipmap-xhdpi/icuserprofiles.png | Bin 1134 -> 0 bytes
.../main/res/mipmap-xxhdpi/ic_user_profiles.png | Bin 0 -> 1737 bytes
.../main/res/mipmap-xxhdpi/icuserprofiles.png | Bin 1737 -> 0 bytes
.../res/mipmap-xxxhdpi/ic_user_profiles.png | Bin 0 -> 2427 bytes
.../main/res/mipmap-xxxhdpi/icuserprofiles.png | Bin 2427 -> 0 bytes
app/src/main/res/values/strings.xml | 22 +-
app/src/main/res/values/styles.xml | 1 +
app/src/main/res/xml/pref_general.xml | 37 ++-
21 files changed, 189 insertions(+), 344 deletions(-)
----------------------------------------------------------------------
[5/6] incubator-taverna-mobile git commit: fix checkstyle error
Posted by sa...@apache.org.
fix checkstyle error
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/f61e8c2e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/f61e8c2e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/f61e8c2e
Branch: refs/heads/master
Commit: f61e8c2ea70d9cc0d9531244a17321c5ef96bdf5
Parents: c36f4c7
Author: Sagar <ku...@gmail.com>
Authored: Sat May 27 12:00:53 2017 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Sat May 27 12:00:53 2017 +0530
----------------------------------------------------------------------
.../mobile/data/local/PreferencesHelper.java | 3 ++-
.../taverna/mobile/ui/SettingFragment.java | 2 +-
.../ui/anouncements/AnnouncementFragment.java | 22 ++++++++++----------
.../ui/myworkflows/MyWorkflowFragment.java | 22 ++++++++++----------
4 files changed, 25 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/f61e8c2e/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java b/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java
index 1082d33..c38137b 100644
--- a/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java
@@ -208,6 +208,7 @@ public class PreferencesHelper {
}
public String getPlayerURL() {
- return sharedPref.getString(mContext.getString(R.string.pref_key_player_url), PLAYER_DEFAULT_URL);
+ return sharedPref.getString(mContext.getString(R.string.pref_key_player_url),
+ PLAYER_DEFAULT_URL);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/f61e8c2e/app/src/main/java/org/apache/taverna/mobile/ui/SettingFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/SettingFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/SettingFragment.java
index fa59f25..22f8641 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/SettingFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/SettingFragment.java
@@ -50,7 +50,7 @@ public class SettingFragment extends PreferenceFragmentCompat implements SharedP
@Override
public void onPrepareOptionsMenu(Menu menu) {
super.onPrepareOptionsMenu(menu);
- MenuItem item=menu.findItem(R.id.action_search);
+ MenuItem item = menu.findItem(R.id.action_search);
item.setVisible(false);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/f61e8c2e/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementFragment.java
index d574a50..7b0e853 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementFragment.java
@@ -18,6 +18,16 @@
*/
package org.apache.taverna.mobile.ui.anouncements;
+import org.apache.taverna.mobile.R;
+import org.apache.taverna.mobile.data.DataManager;
+import org.apache.taverna.mobile.data.model.Announcements;
+import org.apache.taverna.mobile.data.model.DetailAnnouncement;
+import org.apache.taverna.mobile.ui.adapter.AnnouncementAdapter;
+import org.apache.taverna.mobile.ui.adapter.EndlessRecyclerOnScrollListener;
+import org.apache.taverna.mobile.ui.adapter.RecyclerItemClickListner;
+import org.apache.taverna.mobile.utils.ConnectionInfo;
+import org.apache.taverna.mobile.utils.ScrollChildSwipeRefreshLayout;
+
import android.app.ProgressDialog;
import android.os.Bundle;
import android.support.design.widget.Snackbar;
@@ -38,16 +48,6 @@ import android.widget.Button;
import android.widget.ProgressBar;
import android.widget.TextView;
-import org.apache.taverna.mobile.R;
-import org.apache.taverna.mobile.data.DataManager;
-import org.apache.taverna.mobile.data.model.Announcements;
-import org.apache.taverna.mobile.data.model.DetailAnnouncement;
-import org.apache.taverna.mobile.ui.adapter.AnnouncementAdapter;
-import org.apache.taverna.mobile.ui.adapter.EndlessRecyclerOnScrollListener;
-import org.apache.taverna.mobile.ui.adapter.RecyclerItemClickListner;
-import org.apache.taverna.mobile.utils.ConnectionInfo;
-import org.apache.taverna.mobile.utils.ScrollChildSwipeRefreshLayout;
-
import butterknife.BindView;
import butterknife.ButterKnife;
@@ -264,7 +264,7 @@ public class AnnouncementFragment extends Fragment implements RecyclerItemClickL
@Override
public void onPrepareOptionsMenu(Menu menu) {
super.onPrepareOptionsMenu(menu);
- MenuItem item=menu.findItem(R.id.action_search);
+ MenuItem item = menu.findItem(R.id.action_search);
item.setVisible(false);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/f61e8c2e/app/src/main/java/org/apache/taverna/mobile/ui/myworkflows/MyWorkflowFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/myworkflows/MyWorkflowFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/myworkflows/MyWorkflowFragment.java
index 8773815..c574225 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/myworkflows/MyWorkflowFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/myworkflows/MyWorkflowFragment.java
@@ -18,6 +18,16 @@
*/
package org.apache.taverna.mobile.ui.myworkflows;
+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.data.model.Workflow;
+import org.apache.taverna.mobile.ui.adapter.RecyclerItemClickListner;
+import org.apache.taverna.mobile.ui.adapter.WorkflowAdapter;
+import org.apache.taverna.mobile.ui.workflowdetail.WorkflowDetailActivity;
+import org.apache.taverna.mobile.utils.ConnectionInfo;
+import org.apache.taverna.mobile.utils.ScrollChildSwipeRefreshLayout;
+
import android.content.Intent;
import android.os.Bundle;
import android.support.design.widget.Snackbar;
@@ -34,16 +44,6 @@ import android.view.ViewGroup;
import android.widget.ProgressBar;
import android.widget.TextView;
-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.data.model.Workflow;
-import org.apache.taverna.mobile.ui.adapter.RecyclerItemClickListner;
-import org.apache.taverna.mobile.ui.adapter.WorkflowAdapter;
-import org.apache.taverna.mobile.ui.workflowdetail.WorkflowDetailActivity;
-import org.apache.taverna.mobile.utils.ConnectionInfo;
-import org.apache.taverna.mobile.utils.ScrollChildSwipeRefreshLayout;
-
import java.util.ArrayList;
import java.util.List;
@@ -207,7 +207,7 @@ public class MyWorkflowFragment extends Fragment implements MyWorkflowMvpView,
@Override
public void onPrepareOptionsMenu(Menu menu) {
super.onPrepareOptionsMenu(menu);
- MenuItem item=menu.findItem(R.id.action_search);
+ MenuItem item = menu.findItem(R.id.action_search);
item.setVisible(false);
}
}
[4/6] incubator-taverna-mobile git commit: fix UI for drawer
Posted by sa...@apache.org.
fix UI for drawer
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/c36f4c70
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/c36f4c70
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/c36f4c70
Branch: refs/heads/master
Commit: c36f4c705febcbd6bf53880f7ab168e21b06c66b
Parents: e86b400
Author: Sagar <ku...@gmail.com>
Authored: Sat May 27 11:50:56 2017 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Sat May 27 11:50:56 2017 +0530
----------------------------------------------------------------------
app/src/main/res/menu/drawer_view.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/c36f4c70/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 1fcc2b7..1b921c0 100644
--- a/app/src/main/res/menu/drawer_view.xml
+++ b/app/src/main/res/menu/drawer_view.xml
@@ -44,16 +44,16 @@
android:id="@+id/nav_about"
android:icon="@drawable/ic_about_web"
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/title_nav_os_licences"/>
- </group>
+ <group android:checkableBehavior="single">
<item
android:id="@+id/nav_settings"
android:icon="@drawable/ic_setting_workflows_web"
android:title="@string/title_nav_settings"/>
+ </group>
<item
android:id="@+id/nav_logout"
android:icon="@drawable/ic_logout_web"
[2/6] incubator-taverna-mobile git commit: Merge branch 'master' into
setting
Posted by sa...@apache.org.
Merge branch 'master' into setting
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/a25a0a4e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/a25a0a4e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/a25a0a4e
Branch: refs/heads/master
Commit: a25a0a4e92076c92919a536b91a4a623af13703e
Parents: 16acb55 904f51c
Author: Sagar <ku...@gmail.com>
Authored: Sat May 27 11:40:05 2017 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Sat May 27 11:40:05 2017 +0530
----------------------------------------------------------------------
app/build.gradle | 5 +++++
app/src/main/assets/licences.html | 16 ++++++++++++++++
.../apache/taverna/mobile/TavernaApplication.java | 6 ++++++
3 files changed, 27 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/a25a0a4e/app/build.gradle
----------------------------------------------------------------------