commit 3ae99b2a48a3c7efafb14b3d7743a994466c65af Author: Tim Bentley Date: Fri Nov 14 16:34:14 2014 +0000 Base version and config diff --git a/.bzrignore b/.bzrignore new file mode 100644 index 0000000..b15719c --- /dev/null +++ b/.bzrignore @@ -0,0 +1,9 @@ +.gradle +/local.properties +/.idea/workspace.xml +/.idea/libraries +.DS_Store +/build +/app/build +/.idea +/.bzr diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..afbdab3 --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +.gradle +/local.properties +/.idea/workspace.xml +/.idea/libraries +.DS_Store +/build diff --git a/OpenLP.iml b/OpenLP.iml new file mode 100644 index 0000000..0bb6048 --- /dev/null +++ b/OpenLP.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build diff --git a/app/app.iml b/app/app.iml new file mode 100644 index 0000000..781747d --- /dev/null +++ b/app/app.iml @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000..9ee89fc --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,26 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 21 + buildToolsVersion "20.0.0" + + defaultConfig { + applicationId "org.openlp.android2" + minSdkVersion 14 + targetSdkVersion 21 + versionCode 2 + versionName "2.0" + } + buildTypes { + release { + runProguard false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } +} + +dependencies { + compile fileTree(dir: 'libs', include: ['*.jar']) + compile 'com.android.support:support-v4:21.0.0' + compile 'com.loopj.android:android-async-http:1.4.6' +} diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..015b793 --- /dev/null +++ b/app/proguard-rules.pro @@ -0,0 +1,17 @@ +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in /home/tim/android-sdk/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the proguardFiles +# directive in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} diff --git a/app/src/androidTest/java/org/openlp/android2/ApplicationTest.java b/app/src/androidTest/java/org/openlp/android2/ApplicationTest.java new file mode 100644 index 0000000..308a5e6 --- /dev/null +++ b/app/src/androidTest/java/org/openlp/android2/ApplicationTest.java @@ -0,0 +1,13 @@ +package org.openlp.android2; + +import android.app.Application; +import android.test.ApplicationTestCase; + +/** + * Testing Fundamentals + */ +public class ApplicationTest extends ApplicationTestCase { + public ApplicationTest() { + super(Application.class); + } +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..7a071c1 --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/java/org/openlp/android2/OpenLP.java b/app/src/main/java/org/openlp/android2/OpenLP.java new file mode 100644 index 0000000..0b799f2 --- /dev/null +++ b/app/src/main/java/org/openlp/android2/OpenLP.java @@ -0,0 +1,180 @@ +package org.openlp.android2; + +import android.app.Activity; + +import android.app.ActionBar; +import android.app.Fragment; +import android.app.FragmentManager; +import android.content.Intent; +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.Menu; +import android.view.MenuItem; +import android.view.View; +import android.view.ViewGroup; +import android.support.v4.widget.DrawerLayout; +import org.openlp.android2.activities.ConnectionActivity; +import org.openlp.android2.activities.SettingsActivity; +import org.openlp.android2.fragments.LiveListFragment; +import org.openlp.android2.fragments.NavigationDrawerFragment; +import org.openlp.android2.fragments.ServicelistFragment; + + +public class OpenLP extends Activity + implements NavigationDrawerFragment.NavigationDrawerCallbacks { + + /** + * Fragment managing the behaviors, interactions and presentation of the navigation drawer. + */ + private NavigationDrawerFragment mNavigationDrawerFragment; + + /** + * Used to store the last screen title. For use in {@link #restoreActionBar()}. + */ + private CharSequence mTitle; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_open_lp); + + mNavigationDrawerFragment = (NavigationDrawerFragment) + getFragmentManager().findFragmentById(R.id.navigation_drawer); + mTitle = getTitle(); + + // Set up the drawer. + mNavigationDrawerFragment.setUp( + R.id.navigation_drawer, + (DrawerLayout) findViewById(R.id.drawer_layout)); + } + + @Override + public void onNavigationDrawerItemSelected(int position) { + // update the main content by replacing fragments + FragmentManager fragmentManager = getFragmentManager(); + switch (position) { + case 0: + fragmentManager.beginTransaction() + .replace(R.id.container, ServicelistFragment.newInstance()) + .commit(); + mTitle = getString(R.string.service_list); + break; + case 1: + fragmentManager.beginTransaction() + .replace(R.id.container, LiveListFragment.newInstance()) + .commit(); + mTitle = getString(R.string.live_list); + break; + case 2: + fragmentManager.beginTransaction() + .replace(R.id.container, PlaceholderFragment.newInstance(position + 1)) + .commit(); + mTitle = getString(R.string.stage_view); + break; + case 3: + fragmentManager.beginTransaction() + .replace(R.id.container, PlaceholderFragment.newInstance(position + 1)) + .commit(); + mTitle = getString(R.string.live_view); + break; + } + } + + public void onSectionAttached(int number) { + switch (number) { + case 1: + mTitle = getString(R.string.service_list); + break; + case 2: + mTitle = getString(R.string.live_list); + break; + case 3: + mTitle = getString(R.string.stage_view); + break; + case 4: + mTitle = getString(R.string.live_view); + break; + } + } + + public void restoreActionBar() { + ActionBar actionBar = getActionBar(); + actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD); + actionBar.setDisplayShowTitleEnabled(true); + actionBar.setTitle(mTitle); + } + + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + if (!mNavigationDrawerFragment.isDrawerOpen()) { + // Only show items in the action bar relevant to this screen + // if the drawer is not showing. Otherwise, let the drawer + // decide what to show in the action bar. + getMenuInflater().inflate(R.menu.open_l, menu); + restoreActionBar(); + return true; + } + return super.onCreateOptionsMenu(menu); + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + // Handle action bar item clicks here. The action bar will + // automatically handle clicks on the Home/Up button, so long + // as you specify a parent activity in AndroidManifest.xml. + int id = item.getItemId(); + if (id == R.id.action_preferences) { + Intent intent = new Intent(this, SettingsActivity.class); + startActivity(intent); + return true; + } + if (id == R.id.action_connections) { + Intent intent = new Intent(this, ConnectionActivity.class); + startActivity(intent); + return true; + } + return super.onOptionsItemSelected(item); + } + + /** + * A placeholder fragment containing a simple view. + */ + public static class PlaceholderFragment extends Fragment { + /** + * The fragment argument representing the section number for this + * fragment. + */ + private static final String ARG_SECTION_NUMBER = "section_number"; + + /** + * Returns a new instance of this fragment for the given section + * number. + */ + public static PlaceholderFragment newInstance(int sectionNumber) { + PlaceholderFragment fragment = new PlaceholderFragment(); + Bundle args = new Bundle(); + args.putInt(ARG_SECTION_NUMBER, sectionNumber); + fragment.setArguments(args); + return fragment; + } + + public PlaceholderFragment() { + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + View rootView = inflater.inflate(R.layout.fragment_service_list, container, false); + return rootView; + } + + @Override + public void onAttach(Activity activity) { + super.onAttach(activity); + ((OpenLP) activity).onSectionAttached( + getArguments().getInt(ARG_SECTION_NUMBER)); + } + } + +} diff --git a/app/src/main/java/org/openlp/android2/activities/ConnectionActivity.java b/app/src/main/java/org/openlp/android2/activities/ConnectionActivity.java new file mode 100644 index 0000000..600f5bf --- /dev/null +++ b/app/src/main/java/org/openlp/android2/activities/ConnectionActivity.java @@ -0,0 +1,429 @@ +/****************************************************************************** + * OpenLP - Open Source Lyrics Projection * + * --------------------------------------------------------------------------- * + * Copyright (c) 2011-2014 Raoul Snyman * + * Portions copyright (c) 2011-2014 Tim Bentley, Johan Mynhardt * + * * + * --------------------------------------------------------------------------- * + * This program is free software; you can redistribute it and/or modify it * + * under the terms of the GNU General Public License as published by the Free * + * Software Foundation; version 2 of the License. * + * * + * This program is distributed in the hope that it will be useful, but WITHOUT * + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for * + * more details. * + * * + * You should have received a copy of the GNU General Public License along * + * with this program; if not, write to the Free Software Foundation, Inc., 59 * + * Temple Place, Suite 330, Boston, MA 02111-1307 USA * + *******************************************************************************/ +package org.openlp.android2.activities; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeMap; + +import android.content.Intent; +import android.content.SharedPreferences; +import android.os.Bundle; +import android.preference.*; +import android.text.InputType; +import android.util.Log; +import android.widget.Toast; +import org.openlp.android2.R; + +public class ConnectionActivity extends PreferenceActivity { + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + getFragmentManager().beginTransaction() + .replace(android.R.id.content, new ConnectionFragment()) + .commit(); + } + + public static class ConnectionFragment extends PreferenceFragment { + private final String KEY_PREFERENCE_DISPLAY = "preferenceDisplay"; + private final String KEY_SERVER_ID = "keyServerId"; + private final String PREFERENCE_DISPLAY_SERVER = "displayServer"; + private final String LOG_TAG = ConnectionFragment.class.getName(); + + private PreferenceScreen preferenceScreen = null; + private boolean resume = true; + + private static String getHostConfigTitleKey(int id) { + return HostConfig.KEY_PREFIX + id + ".title"; + } + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + addPreferencesFromResource(R.xml.empty_preferences); + getPreferenceManager() + .setSharedPreferencesName(getString(R.string.keySharedPreferences)); + preferenceScreen = getPreferenceScreen() == null + ? getPreferenceManager().createPreferenceScreen(getActivity()) + : getPreferenceScreen(); + preferenceScreen.removeAll(); + String preferenceDisplay = getActivity().getIntent().getStringExtra(KEY_PREFERENCE_DISPLAY); + if (preferenceDisplay != null + && preferenceDisplay.equalsIgnoreCase(PREFERENCE_DISPLAY_SERVER)) { + constructServerView(getActivity().getIntent().getIntExtra(KEY_SERVER_ID, 1)); + } else { + resume = false; + constructOverviewScreen(); + } + } + + private void constructOverviewScreen() { + getPreferenceScreen().removeAll(); + Log.i(LOG_TAG, "constructOverviewScreen"); + Preference configPref = new Preference(getActivity()); + configPref.setTitle(getString(R.string.connection_available_configurations)); + configPref.setSummary(getString(R.string.connection_add_by_menu)); + configPref.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() { + @Override + public boolean onPreferenceClick(Preference preference) { + int nextId = getNextPrefId( + getHostConfigMap( + getPreferenceManager() + .getSharedPreferences().getAll() + ) + ); + Preference newPreference = simpleClickablePreferenceFromHostConfig( + new HostConfig( + getString(R.string.connection_profile_server), + nextId)); + newPreference.setTitle(getString(R.string.connection_profile_new_server)); + newPreference.setSummary(getString(R.string.connection_profile_not_saved)); + preferenceScreen.addPreference(newPreference); + return true; + } + }); + preferenceScreen.addPreference(configPref); + List hostConfigs = getHostConfigs(); + if (!hostConfigs.isEmpty()) { + for (final HostConfig config : getHostConfigs()) { + preferenceScreen.addPreference( + simpleClickablePreferenceFromHostConfig(config)); + } + } + } + + private void constructServerView(int hostId) { + HostConfig hostConfig = hostConfigFromPreferencesForHostId( + hostId, + getHostConfigMap( + getPreferenceManager() + .getSharedPreferences() + .getAll() + ) + ); + addPreferenceCategory(preferenceScreen, hostConfig); + } + + private Preference simpleClickablePreferenceFromHostConfig(final HostConfig config) { + final Preference serverConfig = new Preference(getActivity()); + serverConfig.setTitle(config.title.getSummary()); + + Boolean useSsl = getPreferenceManager() + .getSharedPreferences() + .getBoolean(config.useSsl.getKey(), false); + + serverConfig.setSummary(String.format( + "%s:%s %s", + config.hostAddress.getText(), + config.hostPort.getText(), + useSsl ? "(SSL)" : "") + ); + serverConfig.setOnPreferenceClickListener( + new Preference.OnPreferenceClickListener() { + @Override + public boolean onPreferenceClick(Preference preference) { + Intent serverConfigIntent = new Intent( + getActivity(), + ConnectionActivity.class + ); + serverConfigIntent.putExtra(KEY_PREFERENCE_DISPLAY, + PREFERENCE_DISPLAY_SERVER); + serverConfigIntent.putExtra(KEY_SERVER_ID, config.id); + startActivity(serverConfigIntent); + return true; + } + }); + return serverConfig; + } + + private List getHostConfigs() { + return hostConfigsFromPreferences( + getHostConfigMap( + getPreferenceManager() + .getSharedPreferences() + .getAll() + ) + ); + } + + private Map getHostConfigMap(Map preferences) { + Map configMap = new TreeMap(); + + List sortedKeys = new ArrayList(preferences.keySet()); + Collections.sort(sortedKeys); + for (String key : sortedKeys) { + if (key.startsWith(HostConfig.KEY_PREFIX)) { + configMap.put(key, preferences.get(key)); + } + } + return configMap; + } + + private List hostConfigsFromPreferences(Map preferences) { + List hostIds = getHostIds(preferences); + List hostConfigs = new ArrayList(); + for (Integer id : hostIds) { + hostConfigs.add(hostConfigFromPreferencesForHostId(id, preferences)); + } + return hostConfigs; + } + + private HostConfig hostConfigFromPreferencesForHostId(int hostId, Map preferences) { + Object titleValue = preferences.get(getHostConfigTitleKey(hostId)); + String hostTitle = titleValue == null ? getString(R.string.connection_profile_server) : titleValue.toString(); + HostConfig hostConfig = new HostConfig( + hostTitle, hostId + ); + Object hostValueObject = preferences.get(hostConfig.hostAddress.getKey()); + String hostValue = hostValueObject == null + ? getString(R.string.hostDefaultValue) : hostValueObject.toString(); + hostConfig.hostAddress.setText(hostValue); + hostConfig.hostAddress.setSummary(hostValue); + + Object portValueObject = preferences.get(hostConfig.hostPort.getKey()); + String portValue = portValueObject == null + ? getString(R.string.portDefaultValue) : portValueObject.toString(); + hostConfig.hostPort.setText(portValue); + hostConfig.hostPort.setSummary(portValue); + + Object useridValueObject = preferences.get(hostConfig.userid.getKey()); + String useridValue = useridValueObject == null + ? getString(R.string.useridDefaultValue) : useridValueObject.toString(); + hostConfig.userid.setText(useridValue); + hostConfig.userid.setSummary(useridValue); + + Object passwordValueObject = preferences.get(hostConfig.password.getKey()); + String passwordValue = passwordValueObject == null + ? getString(R.string.passwordDefaultValue) : passwordValueObject.toString(); + hostConfig.password.setText(passwordValue); + hostConfig.password.setSummary(passwordValue); + return hostConfig; + } + + private int getNextPrefId(Map preferences) { + int max = 0; + for (String key : preferences.keySet()) { + int prefValue = Integer.valueOf(key.split("\\.")[2]); + max = prefValue > max ? prefValue : max; + } + return max + 1; + } + + private List getHostIds(Map preferences) { + Set hashSet = new HashSet(); + for (String key : preferences.keySet()) { + hashSet.add(Integer.valueOf(key.split("\\.")[2])); + } + List hostIds = new ArrayList(hashSet); + Collections.sort(hostIds); + Log.i(LOG_TAG, "Got HostIds: " + hostIds); + return hostIds; + } + + private boolean addPreferenceCategory(PreferenceScreen preferenceScreen, HostConfig hostConfig) { + PreferenceCategory preferenceCategory = new PreferenceCategory(getActivity()); + preferenceCategory.setTitle(hostConfig.title.getSummary()); + preferenceCategory.setKey("key.preference.category"); + preferenceScreen.addPreference(preferenceCategory); + preferenceCategory.addPreference(hostConfig.title); + preferenceCategory.addPreference(hostConfig.hostAddress); + preferenceCategory.addPreference(hostConfig.hostPort); + preferenceCategory.addPreference(hostConfig.useSsl); + preferenceCategory.addPreference(hostConfig.userid); + preferenceCategory.addPreference(hostConfig.password); + preferenceCategory.addPreference(hostConfig.remove); + preferenceCategory.addPreference(hostConfig.activate); + return true; + } + + @Override + public void onResume() { + super.onResume(); + if (resume) { + Log.i(LOG_TAG, "Resuming..."); + } else { + constructOverviewScreen(); + Log.i(LOG_TAG, "Not resuming..."); + } + } + + private class HostConfig { + static final String KEY_PREFIX = "host.config."; + final int id; + final EditTextPreference title; + final EditTextPreference hostAddress; + final EditTextPreference hostPort; + final CheckBoxPreference useSsl; + final EditTextPreference userid; + final EditTextPreference password; + final Preference remove; + final Preference activate; + Preference.OnPreferenceChangeListener onPreferenceChangeListener = + new Preference.OnPreferenceChangeListener() { + @Override + public boolean onPreferenceChange(Preference preference, Object o) { + preference.setSummary("" + o); + if (preference.getKey().endsWith(".title")) { + preferenceScreen + .findPreference("key.preference.category") + .setTitle("" + o); + } + return true; + } + }; + + HostConfig(String sTitle, int id) { + this.id = id; + title = new EditTextPreference(getActivity()); + title.setSummary(getString(R.string.url)); + title.getEditText().setHint(getString(R.string.url)); + title.setTitle(getString(R.string.connection_profile_title)); + title.setKey(KEY_PREFIX + id + ".title"); + title.setDefaultValue(getString(R.string.url)); + title.setSummary(sTitle); + title.setDialogTitle(getString(R.string.connection_profile_title)); + title.setOnPreferenceChangeListener(onPreferenceChangeListener); + + hostAddress = new EditTextPreference(getActivity()); + hostAddress.setTitle(getString(R.string.urlHint)); + hostAddress.setKey(KEY_PREFIX + id + ".address"); + hostAddress.getEditText().setHint(R.string.urlHint); + hostAddress.setSummary(getString(R.string.urlHint)); + hostAddress.setDialogTitle(getString(R.string.urlHint)); + hostAddress.getEditText().setInputType(InputType.TYPE_TEXT_VARIATION_URI); + hostAddress.setOnPreferenceChangeListener(onPreferenceChangeListener); + + hostPort = new EditTextPreference(getActivity()); + hostPort.setTitle(getString(R.string.port)); + hostPort.setKey(KEY_PREFIX + id + ".port"); + hostPort.setSummary(getString(R.string.port)); + hostPort.setDialogTitle(getString(R.string.port)); + hostPort.getEditText().setInputType(InputType.TYPE_CLASS_NUMBER); + hostPort.setDefaultValue(getString(R.string.portDefaultValue)); + hostPort.setOnPreferenceChangeListener(onPreferenceChangeListener); + + useSsl = new CheckBoxPreference(getActivity()); + useSsl.setTitle(getString(R.string.connection_profile_ssl_use)); + useSsl.setSummary(getString(R.string.connection_profile_ssl_summary)); + useSsl.setKey(KEY_PREFIX + id + ".usessl"); + + userid = new EditTextPreference(getActivity()); + userid.setSummary(getString(R.string.connection_userid)); + userid.getEditText().setHint(getString(R.string.connection_userid)); + userid.setTitle(getString(R.string.connection_userid)); + userid.setKey(KEY_PREFIX + id + ".userid"); + userid.setDefaultValue(getString(R.string.useridDefaultValue)); + userid.setSummary(getString(R.string.useridDefaultValue)); + userid.setDialogTitle(getString(R.string.connection_userid)); + userid.setOnPreferenceChangeListener(onPreferenceChangeListener); + + password = new EditTextPreference(getActivity()); + password.setSummary(getString(R.string.connection_password)); + password.getEditText().setHint(getString(R.string.connection_password)); + password.setTitle(getString(R.string.connection_password)); + password.setKey(KEY_PREFIX + id + ".password"); + password.setDefaultValue(getString(R.string.passwordDefaultValue)); + password.setSummary(getString(R.string.passwordDefaultValue)); + password.setDialogTitle(getString(R.string.connection_password)); + password.setOnPreferenceChangeListener(onPreferenceChangeListener); + + remove = new Preference(getActivity()); + remove.setTitle(getString(R.string.connection_profile_remove)); + remove.setSummary(getString(R.string.connection_profile_remove_summary)); + remove.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() { + @Override + public boolean onPreferenceClick(Preference preference) { + SharedPreferences prefs = getPreferenceManager().getSharedPreferences(); + SharedPreferences.Editor editor = prefs.edit(); + editor.remove(hostAddress.getKey()); + editor.remove(hostPort.getKey()); + editor.remove(title.getKey()); + editor.remove(useSsl.getKey()); + editor.remove(userid.getKey()); + editor.remove(password.getKey()); + editor.commit(); + getActivity().onBackPressed(); + return false; + } + }); + + activate = new Preference(getActivity()); + activate.setTitle(getString(R.string.connection_profile_activate)); + activate.setSummary(getString(R.string.connection_profile_summary_activate)); + activate.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() { + @Override + public boolean onPreferenceClick(Preference preference) { + SharedPreferences preferences = getPreferenceManager().getSharedPreferences(); + SharedPreferences.Editor editor = preferences.edit(); + String host = preferences.getString(hostAddress.getKey(), + getString(R.string.hostDefaultValue)); + editor.putString(getString(R.string.keyHost), host); + String port = preferences.getString(hostPort.getKey(), + getString(R.string.portDefaultValue)); + editor.putString(getString(R.string.keyPort), port); + Boolean bUseSsl = preferences.getBoolean(useSsl.getKey(), false); + editor.putBoolean(getString(R.string.key_ssl_use), bUseSsl); + String suserid = preferences.getString(userid.getKey(), getString(R.string.useridDefaultValue)); + editor.putString(getString(R.string.key_userid), suserid); + String spassword = preferences.getString(password.getKey(), + getString(R.string.passwordDefaultValue)); + editor.putString(getString(R.string.key_password), spassword); + + editor.putString( + getString(R.string.key_profile_selected_title), + preferences.getString( + title.getKey(), + getString(R.string.url))); + + editor.commit(); + Toast.makeText(getActivity(), + String.format( + "%s: %s\n[%s:%s] %s", + getString(R.string.connection_profile_active_toast), + HostConfig.this.title.getText(), + host, + port, + useSsl.isChecked() ? "(SSL)" : "" + ), + Toast.LENGTH_LONG).show(); + return false; + } + }); + } + + @Override + public String toString() { + return "HostConfig{" + + "id=" + id + + ", title='" + title + '\'' + + ", hostAddress=" + hostAddress.getKey() + + ", hostPort=" + hostPort.getKey() + + '}'; + } + } + } +} + diff --git a/app/src/main/java/org/openlp/android2/activities/SettingsActivity.java b/app/src/main/java/org/openlp/android2/activities/SettingsActivity.java new file mode 100644 index 0000000..6547948 --- /dev/null +++ b/app/src/main/java/org/openlp/android2/activities/SettingsActivity.java @@ -0,0 +1,51 @@ +/****************************************************************************** + * OpenLP - Open Source Lyrics Projection * + * --------------------------------------------------------------------------- * + * Copyright (c) 2011-2014 Raoul Snyman * + * Portions copyright (c) 2011-2014 Tim Bentley, Johan Mynhardt * + * * + * --------------------------------------------------------------------------- * + * This program is free software; you can redistribute it and/or modify it * + * under the terms of the GNU General Public License as published by the Free * + * Software Foundation; version 2 of the License. * + * * + * This program is distributed in the hope that it will be useful, but WITHOUT * + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for * + * more details. * + * * + * You should have received a copy of the GNU General Public License along * + * with this program; if not, write to the Free Software Foundation, Inc., 59 * + * Temple Place, Suite 330, Boston, MA 02111-1307 USA * + *******************************************************************************/ +package org.openlp.android2.activities; + +import android.os.Bundle; +import android.preference.PreferenceActivity; +import android.preference.PreferenceFragment; +import org.openlp.android2.R; + + +public class SettingsActivity extends PreferenceActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + getFragmentManager().beginTransaction() + .replace(android.R.id.content, new SettingsFragment()) + .commit(); + + } + + public static class SettingsFragment extends PreferenceFragment { + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + // Load the preferences from an XML resource + addPreferencesFromResource(R.xml.pref_general); + } + } + +} diff --git a/app/src/main/java/org/openlp/android2/fragments/LiveListFragment.java b/app/src/main/java/org/openlp/android2/fragments/LiveListFragment.java new file mode 100644 index 0000000..2fc1d05 --- /dev/null +++ b/app/src/main/java/org/openlp/android2/fragments/LiveListFragment.java @@ -0,0 +1,152 @@ +package org.openlp.android2.fragments; + +import android.app.Activity; +import android.os.Bundle; +import android.app.Fragment; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.AbsListView; +import android.widget.AdapterView; +import android.widget.ArrayAdapter; +import android.widget.ListAdapter; +import android.widget.TextView; +import org.openlp.android2.R; + +import org.openlp.android2.fragments.dummy.DummyContent; + +/** + * A fragment representing a list of Items. + *

+ * Large screen devices (such as tablets) are supported by replacing the ListView + * with a GridView. + *

+ * Activities containing this fragment MUST implement the {@link Callbacks} + * interface. + */ +public class LiveListFragment extends Fragment implements AbsListView.OnItemClickListener { + + // TODO: Rename parameter arguments, choose names that match + // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER + private static final String ARG_PARAM1 = "param1"; + private static final String ARG_PARAM2 = "param2"; + + // TODO: Rename and change types of parameters + private String mParam1; + private String mParam2; + + private OnFragmentInteractionListener mListener; + + /** + * The fragment's ListView/GridView. + */ + private AbsListView mListView; + + /** + * The Adapter which will be used to populate the ListView/GridView with + * Views. + */ + private ListAdapter mAdapter; + + // TODO: Rename and change types of parameters + public static LiveListFragment newInstance() { + LiveListFragment fragment = new LiveListFragment(); + Bundle args = new Bundle(); + //args.putString(ARG_PARAM1, param1); + //args.putString(ARG_PARAM2, param2); + //fragment.setArguments(args); + return fragment; + } + + /** + * Mandatory empty constructor for the fragment manager to instantiate the + * fragment (e.g. upon screen orientation changes). + */ + public LiveListFragment() { + } + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + if (getArguments() != null) { + mParam1 = getArguments().getString(ARG_PARAM1); + mParam2 = getArguments().getString(ARG_PARAM2); + } + + // TODO: Change Adapter to display your content + mAdapter = new ArrayAdapter(getActivity(), + android.R.layout.simple_list_item_1, android.R.id.text1, DummyContent.ITEMS); + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + View view = inflater.inflate(R.layout.fragment_livelist, container, false); + + // Set the adapter + mListView = (AbsListView) view.findViewById(android.R.id.list); + ((AdapterView) mListView).setAdapter(mAdapter); + + // Set OnItemClickListener so we can be notified on item clicks + mListView.setOnItemClickListener(this); + + return view; + } + + @Override + public void onAttach(Activity activity) { + super.onAttach(activity); + //try { + // mListener = (OnFragmentInteractionListener) activity; + //} catch (ClassCastException e) { + // throw new ClassCastException(activity.toString() + // + " must implement OnFragmentInteractionListener"); + //} + } + + @Override + public void onDetach() { + super.onDetach(); + mListener = null; + } + + + @Override + public void onItemClick(AdapterView parent, View view, int position, long id) { + if (null != mListener) { + // Notify the active callbacks interface (the activity, if the + // fragment is attached to one) that an item has been selected. + mListener.onFragmentInteraction(DummyContent.ITEMS.get(position).id); + } + } + + /** + * The default content for this Fragment has a TextView that is shown when + * the list is empty. If you would like to change the text, call this method + * to supply the text it should use. + */ + public void setEmptyText(CharSequence emptyText) { + View emptyView = mListView.getEmptyView(); + + if (emptyText instanceof TextView) { + ((TextView) emptyView).setText(emptyText); + } + } + + /** + * This interface must be implemented by activities that contain this + * fragment to allow an interaction in this fragment to be communicated + * to the activity and potentially other fragments contained in that + * activity. + *

+ * See the Android Training lesson Communicating with Other Fragments for more information. + */ + public interface OnFragmentInteractionListener { + // TODO: Update argument type and name + public void onFragmentInteraction(String id); + } + +} diff --git a/app/src/main/java/org/openlp/android2/fragments/NavigationDrawerFragment.java b/app/src/main/java/org/openlp/android2/fragments/NavigationDrawerFragment.java new file mode 100644 index 0000000..bd17b20 --- /dev/null +++ b/app/src/main/java/org/openlp/android2/fragments/NavigationDrawerFragment.java @@ -0,0 +1,284 @@ +package org.openlp.android2.fragments; + + +import android.app.Activity; +import android.app.ActionBar; +import android.app.Fragment; +import android.support.v4.app.ActionBarDrawerToggle; +import android.support.v4.view.GravityCompat; +import android.support.v4.widget.DrawerLayout; +import android.content.SharedPreferences; +import android.content.res.Configuration; +import android.os.Bundle; +import android.preference.PreferenceManager; +import android.view.LayoutInflater; +import android.view.Menu; +import android.view.MenuInflater; +import android.view.MenuItem; +import android.view.View; +import android.view.ViewGroup; +import android.widget.AdapterView; +import android.widget.ArrayAdapter; +import android.widget.ListView; +import android.widget.Toast; +import org.openlp.android2.R; + +/** + * Fragment used for managing interactions for and presentation of a navigation drawer. + * See the + * design guidelines for a complete explanation of the behaviors implemented here. + */ +public class NavigationDrawerFragment extends Fragment { + + /** + * Remember the position of the selected item. + */ + private static final String STATE_SELECTED_POSITION = "selected_navigation_drawer_position"; + + /** + * Per the design guidelines, you should show the drawer on launch until the user manually + * expands it. This shared preference tracks this. + */ + private static final String PREF_USER_LEARNED_DRAWER = "navigation_drawer_learned"; + + /** + * A pointer to the current callbacks instance (the Activity). + */ + private NavigationDrawerCallbacks mCallbacks; + + /** + * Helper component that ties the action bar to the navigation drawer. + */ + private ActionBarDrawerToggle mDrawerToggle; + + private DrawerLayout mDrawerLayout; + private ListView mDrawerListView; + private View mFragmentContainerView; + + private int mCurrentSelectedPosition = 0; + private boolean mFromSavedInstanceState; + private boolean mUserLearnedDrawer; + + public NavigationDrawerFragment() { + } + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + // Read in the flag indicating whether or not the user has demonstrated awareness of the + // drawer. See PREF_USER_LEARNED_DRAWER for details. + SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getActivity()); + mUserLearnedDrawer = sp.getBoolean(PREF_USER_LEARNED_DRAWER, false); + + if (savedInstanceState != null) { + mCurrentSelectedPosition = savedInstanceState.getInt(STATE_SELECTED_POSITION); + mFromSavedInstanceState = true; + } + + // Select either the default item (0) or the last selected item. + selectItem(mCurrentSelectedPosition); + } + + @Override + public void onActivityCreated (Bundle savedInstanceState) { + super.onActivityCreated(savedInstanceState); + // Indicate that this fragment would like to influence the set of actions in the action bar. + setHasOptionsMenu(true); + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + mDrawerListView = (ListView) inflater.inflate( + R.layout.fragment_navigation_drawer, container, false); + mDrawerListView.setOnItemClickListener(new AdapterView.OnItemClickListener() { + @Override + public void onItemClick(AdapterView parent, View view, int position, long id) { + selectItem(position); + } + }); + mDrawerListView.setAdapter(new ArrayAdapter( + getActionBar().getThemedContext(), + android.R.layout.simple_list_item_activated_1, + android.R.id.text1, + new String[]{ + getString(R.string.service_list), + getString(R.string.live_list), + getString(R.string.stage_view), + getString(R.string.live_view), + })); + mDrawerListView.setItemChecked(mCurrentSelectedPosition, true); + return mDrawerListView; + } + + public boolean isDrawerOpen() { + return mDrawerLayout != null && mDrawerLayout.isDrawerOpen(mFragmentContainerView); + } + + /** + * Users of this fragment must call this method to set up the navigation drawer interactions. + * + * @param fragmentId The android:id of this fragment in its activity's layout. + * @param drawerLayout The DrawerLayout containing this fragment's UI. + */ + public void setUp(int fragmentId, DrawerLayout drawerLayout) { + mFragmentContainerView = getActivity().findViewById(fragmentId); + mDrawerLayout = drawerLayout; + + // set a custom shadow that overlays the main content when the drawer opens + mDrawerLayout.setDrawerShadow(R.drawable.drawer_shadow, GravityCompat.START); + // set up the drawer's list view with items and click listener + + ActionBar actionBar = getActionBar(); + actionBar.setDisplayHomeAsUpEnabled(true); + actionBar.setHomeButtonEnabled(true); + + // ActionBarDrawerToggle ties together the the proper interactions + // between the navigation drawer and the action bar app icon. + mDrawerToggle = new ActionBarDrawerToggle( + getActivity(), /* host Activity */ + mDrawerLayout, /* DrawerLayout object */ + R.drawable.ic_drawer, /* nav drawer image to replace 'Up' caret */ + R.string.navigation_drawer_open, /* "open drawer" description for accessibility */ + R.string.navigation_drawer_close /* "close drawer" description for accessibility */ + ) { + @Override + public void onDrawerClosed(View drawerView) { + super.onDrawerClosed(drawerView); + if (!isAdded()) { + return; + } + + getActivity().invalidateOptionsMenu(); // calls onPrepareOptionsMenu() + } + + @Override + public void onDrawerOpened(View drawerView) { + super.onDrawerOpened(drawerView); + if (!isAdded()) { + return; + } + + if (!mUserLearnedDrawer) { + // The user manually opened the drawer; store this flag to prevent auto-showing + // the navigation drawer automatically in the future. + mUserLearnedDrawer = true; + SharedPreferences sp = PreferenceManager + .getDefaultSharedPreferences(getActivity()); + sp.edit().putBoolean(PREF_USER_LEARNED_DRAWER, true).apply(); + } + + getActivity().invalidateOptionsMenu(); // calls onPrepareOptionsMenu() + } + }; + + // If the user hasn't 'learned' about the drawer, open it to introduce them to the drawer, + // per the navigation drawer design guidelines. + if (!mUserLearnedDrawer && !mFromSavedInstanceState) { + mDrawerLayout.openDrawer(mFragmentContainerView); + } + + // Defer code dependent on restoration of previous instance state. + mDrawerLayout.post(new Runnable() { + @Override + public void run() { + mDrawerToggle.syncState(); + } + }); + + mDrawerLayout.setDrawerListener(mDrawerToggle); + } + + private void selectItem(int position) { + mCurrentSelectedPosition = position; + if (mDrawerListView != null) { + mDrawerListView.setItemChecked(position, true); + } + if (mDrawerLayout != null) { + mDrawerLayout.closeDrawer(mFragmentContainerView); + } + if (mCallbacks != null) { + mCallbacks.onNavigationDrawerItemSelected(position); + } + } + + @Override + public void onAttach(Activity activity) { + super.onAttach(activity); + try { + mCallbacks = (NavigationDrawerCallbacks) activity; + } catch (ClassCastException e) { + throw new ClassCastException("Activity must implement NavigationDrawerCallbacks."); + } + } + + @Override + public void onDetach() { + super.onDetach(); + mCallbacks = null; + } + + @Override + public void onSaveInstanceState(Bundle outState) { + super.onSaveInstanceState(outState); + outState.putInt(STATE_SELECTED_POSITION, mCurrentSelectedPosition); + } + + @Override + public void onConfigurationChanged(Configuration newConfig) { + super.onConfigurationChanged(newConfig); + // Forward the new configuration the drawer toggle component. + mDrawerToggle.onConfigurationChanged(newConfig); + } + + @Override + public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { + // If the drawer is open, show the global app actions in the action bar. See also + // showGlobalContextActionBar, which controls the top-left area of the action bar. + if (mDrawerLayout != null && isDrawerOpen()) { + inflater.inflate(R.menu.global, menu); + showGlobalContextActionBar(); + } + super.onCreateOptionsMenu(menu, inflater); + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + if (mDrawerToggle.onOptionsItemSelected(item)) { + return true; + } + + if (item.getItemId() == R.id.action_alert) { + Toast.makeText(getActivity(), "Example action.", Toast.LENGTH_SHORT).show(); + return true; + } + + return super.onOptionsItemSelected(item); + } + + /** + * Per the navigation drawer design guidelines, updates the action bar to show the global app + * 'context', rather than just what's in the current screen. + */ + private void showGlobalContextActionBar() { + ActionBar actionBar = getActionBar(); + actionBar.setDisplayShowTitleEnabled(true); + actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD); + actionBar.setTitle(R.string.app_name); + } + + private ActionBar getActionBar() { + return getActivity().getActionBar(); + } + + /** + * Callbacks interface that all activities using this fragment must implement. + */ + public static interface NavigationDrawerCallbacks { + /** + * Called when an item in the navigation drawer is selected. + */ + void onNavigationDrawerItemSelected(int position); + } +} diff --git a/app/src/main/java/org/openlp/android2/fragments/ServicelistFragment.java b/app/src/main/java/org/openlp/android2/fragments/ServicelistFragment.java new file mode 100644 index 0000000..f7099a4 --- /dev/null +++ b/app/src/main/java/org/openlp/android2/fragments/ServicelistFragment.java @@ -0,0 +1,152 @@ +package org.openlp.android2.fragments; + +import android.app.Activity; +import android.os.Bundle; +import android.app.Fragment; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.AbsListView; +import android.widget.AdapterView; +import android.widget.ArrayAdapter; +import android.widget.ListAdapter; +import android.widget.TextView; +import org.openlp.android2.R; + +import org.openlp.android2.fragments.dummy.DummyContent; + +/** + * A fragment representing a list of Items. + *

+ * Large screen devices (such as tablets) are supported by replacing the ListView + * with a GridView. + *

+ * Activities containing this fragment MUST implement the {@link Callbacks} + * interface. + */ +public class ServicelistFragment extends Fragment implements AbsListView.OnItemClickListener { + + // TODO: Rename parameter arguments, choose names that match + // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER + private static final String ARG_PARAM1 = "param1"; + private static final String ARG_PARAM2 = "param2"; + + // TODO: Rename and change types of parameters + private String mParam1; + private String mParam2; + + private OnFragmentInteractionListener mListener; + + /** + * The fragment's ListView/GridView. + */ + private AbsListView mListView; + + /** + * The Adapter which will be used to populate the ListView/GridView with + * Views. + */ + private ListAdapter mAdapter; + + // TODO: Rename and change types of parameters + public static ServicelistFragment newInstance() { + ServicelistFragment fragment = new ServicelistFragment(); + Bundle args = new Bundle(); + //args.putString(ARG_PARAM1, param1); + //args.putString(ARG_PARAM2, param2); + fragment.setArguments(args); + return fragment; + } + + /** + * Mandatory empty constructor for the fragment manager to instantiate the + * fragment (e.g. upon screen orientation changes). + */ + public ServicelistFragment() { + } + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + if (getArguments() != null) { + mParam1 = getArguments().getString(ARG_PARAM1); + mParam2 = getArguments().getString(ARG_PARAM2); + } + + // TODO: Change Adapter to display your content + mAdapter = new ArrayAdapter(getActivity(), + android.R.layout.simple_list_item_1, android.R.id.text1, DummyContent.ITEMS); + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + View view = inflater.inflate(R.layout.fragment_servicelist, container, false); + + // Set the adapter + mListView = (AbsListView) view.findViewById(android.R.id.list); + ((AdapterView) mListView).setAdapter(mAdapter); + + // Set OnItemClickListener so we can be notified on item clicks + mListView.setOnItemClickListener(this); + + return view; + } + + @Override + public void onAttach(Activity activity) { + super.onAttach(activity); + //try { + // mListener = (OnFragmentInteractionListener) activity; + //} catch (ClassCastException e) { + // throw new ClassCastException(activity.toString() + // + " must implement OnFragmentInteractionListener"); + // } + } + + @Override + public void onDetach() { + super.onDetach(); + mListener = null; + } + + + @Override + public void onItemClick(AdapterView parent, View view, int position, long id) { + if (null != mListener) { + // Notify the active callbacks interface (the activity, if the + // fragment is attached to one) that an item has been selected. + mListener.onFragmentInteraction(DummyContent.ITEMS.get(position).id); + } + } + + /** + * The default content for this Fragment has a TextView that is shown when + * the list is empty. If you would like to change the text, call this method + * to supply the text it should use. + */ + public void setEmptyText(CharSequence emptyText) { + View emptyView = mListView.getEmptyView(); + + if (emptyText instanceof TextView) { + ((TextView) emptyView).setText(emptyText); + } + } + + /** + * This interface must be implemented by activities that contain this + * fragment to allow an interaction in this fragment to be communicated + * to the activity and potentially other fragments contained in that + * activity. + *

+ * See the Android Training lesson Communicating with Other Fragments for more information. + */ + public interface OnFragmentInteractionListener { + // TODO: Update argument type and name + public void onFragmentInteraction(String id); + } + +} diff --git a/app/src/main/java/org/openlp/android2/fragments/dummy/DummyContent.java b/app/src/main/java/org/openlp/android2/fragments/dummy/DummyContent.java new file mode 100644 index 0000000..09e933e --- /dev/null +++ b/app/src/main/java/org/openlp/android2/fragments/dummy/DummyContent.java @@ -0,0 +1,55 @@ +package org.openlp.android2.fragments.dummy; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Helper class for providing sample content for user interfaces created by + * Android template wizards. + *

+ * TODO: Replace all uses of this class before publishing your app. + */ +public class DummyContent { + + /** + * An array of sample (dummy) items. + */ + public static List ITEMS = new ArrayList(); + + /** + * A map of sample (dummy) items, by ID. + */ + public static Map ITEM_MAP = new HashMap(); + + static { + // Add 3 sample items. + addItem(new DummyItem("1", "Item 1")); + addItem(new DummyItem("2", "Item 2")); + addItem(new DummyItem("3", "Item 3")); + } + + private static void addItem(DummyItem item) { + ITEMS.add(item); + ITEM_MAP.put(item.id, item); + } + + /** + * A dummy item representing a piece of content. + */ + public static class DummyItem { + public String id; + public String content; + + public DummyItem(String id, String content) { + this.id = id; + this.content = content; + } + + @Override + public String toString() { + return content; + } + } +} diff --git a/app/src/main/res/drawable-hdpi/drawer_shadow.9.png b/app/src/main/res/drawable-hdpi/drawer_shadow.9.png new file mode 100644 index 0000000..236bff5 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/drawer_shadow.9.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_alarm_off.png b/app/src/main/res/drawable-hdpi/ic_alarm_off.png new file mode 100644 index 0000000..b2ee3d2 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_alarm_off.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_arrow_back.png b/app/src/main/res/drawable-hdpi/ic_arrow_back.png new file mode 100644 index 0000000..5fa4948 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_arrow_back.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_drawer.png b/app/src/main/res/drawable-hdpi/ic_drawer.png new file mode 100644 index 0000000..c59f601 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_drawer.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_edit.png b/app/src/main/res/drawable-hdpi/ic_edit.png new file mode 100644 index 0000000..730416c Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_edit.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_image.png b/app/src/main/res/drawable-hdpi/ic_image.png new file mode 100644 index 0000000..8fbe40d Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_image.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_launcher.png b/app/src/main/res/drawable-hdpi/ic_launcher.png new file mode 100644 index 0000000..96a442e Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_local_movies.png b/app/src/main/res/drawable-hdpi/ic_local_movies.png new file mode 100644 index 0000000..d0ad003 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_local_movies.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_my_library_add.png b/app/src/main/res/drawable-hdpi/ic_my_library_add.png new file mode 100644 index 0000000..4d23e97 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_my_library_add.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_my_library_music.png b/app/src/main/res/drawable-hdpi/ic_my_library_music.png new file mode 100644 index 0000000..69091e5 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_my_library_music.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_refresh.png b/app/src/main/res/drawable-hdpi/ic_refresh.png new file mode 100644 index 0000000..cd16fdd Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_refresh.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_search.png b/app/src/main/res/drawable-hdpi/ic_search.png new file mode 100644 index 0000000..a2fc5b2 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_search.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_settings_display.png b/app/src/main/res/drawable-hdpi/ic_settings_display.png new file mode 100644 index 0000000..ea8efc7 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_settings_display.png differ diff --git a/app/src/main/res/drawable-mdpi/drawer_shadow.9.png b/app/src/main/res/drawable-mdpi/drawer_shadow.9.png new file mode 100644 index 0000000..ffe3a28 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/drawer_shadow.9.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_alarm_off.png b/app/src/main/res/drawable-mdpi/ic_alarm_off.png new file mode 100644 index 0000000..b15af77 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_alarm_off.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_arrow_back.png b/app/src/main/res/drawable-mdpi/ic_arrow_back.png new file mode 100644 index 0000000..4e875e8 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_arrow_back.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_drawer.png b/app/src/main/res/drawable-mdpi/ic_drawer.png new file mode 100644 index 0000000..1ed2c56 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_drawer.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_edit.png b/app/src/main/res/drawable-mdpi/ic_edit.png new file mode 100644 index 0000000..558f0ea Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_edit.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_image.png b/app/src/main/res/drawable-mdpi/ic_image.png new file mode 100644 index 0000000..a3e3148 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_image.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_launcher.png b/app/src/main/res/drawable-mdpi/ic_launcher.png new file mode 100644 index 0000000..359047d Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_local_movies.png b/app/src/main/res/drawable-mdpi/ic_local_movies.png new file mode 100644 index 0000000..5acd0a0 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_local_movies.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_my_library_add.png b/app/src/main/res/drawable-mdpi/ic_my_library_add.png new file mode 100644 index 0000000..fb849c7 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_my_library_add.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_my_library_music.png b/app/src/main/res/drawable-mdpi/ic_my_library_music.png new file mode 100644 index 0000000..8b92f07 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_my_library_music.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_refresh.png b/app/src/main/res/drawable-mdpi/ic_refresh.png new file mode 100644 index 0000000..54d4716 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_refresh.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_search.png b/app/src/main/res/drawable-mdpi/ic_search.png new file mode 100644 index 0000000..9ad0bfe Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_search.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_settings_display.png b/app/src/main/res/drawable-mdpi/ic_settings_display.png new file mode 100644 index 0000000..6cb312b Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_settings_display.png differ diff --git a/app/src/main/res/drawable-xhdpi/drawer_shadow.9.png b/app/src/main/res/drawable-xhdpi/drawer_shadow.9.png new file mode 100644 index 0000000..fabe9d9 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/drawer_shadow.9.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_alarm_off.png b/app/src/main/res/drawable-xhdpi/ic_alarm_off.png new file mode 100644 index 0000000..ca6dc28 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_alarm_off.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_arrow_back.png b/app/src/main/res/drawable-xhdpi/ic_arrow_back.png new file mode 100644 index 0000000..870bf2d Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_arrow_back.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_drawer.png b/app/src/main/res/drawable-xhdpi/ic_drawer.png new file mode 100644 index 0000000..a5fa74d Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_drawer.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_edit.png b/app/src/main/res/drawable-xhdpi/ic_edit.png new file mode 100644 index 0000000..b402540 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_edit.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_image.png b/app/src/main/res/drawable-xhdpi/ic_image.png new file mode 100644 index 0000000..ff74932 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_image.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_launcher.png b/app/src/main/res/drawable-xhdpi/ic_launcher.png new file mode 100644 index 0000000..71c6d76 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_local_movies.png b/app/src/main/res/drawable-xhdpi/ic_local_movies.png new file mode 100644 index 0000000..aee9d8a Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_local_movies.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_my_library_add.png b/app/src/main/res/drawable-xhdpi/ic_my_library_add.png new file mode 100644 index 0000000..e4e14ad Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_my_library_add.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_my_library_music.png b/app/src/main/res/drawable-xhdpi/ic_my_library_music.png new file mode 100644 index 0000000..1166900 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_my_library_music.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_refresh.png b/app/src/main/res/drawable-xhdpi/ic_refresh.png new file mode 100644 index 0000000..fe4285f Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_refresh.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_search.png b/app/src/main/res/drawable-xhdpi/ic_search.png new file mode 100644 index 0000000..c572197 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_search.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_settings_display.png b/app/src/main/res/drawable-xhdpi/ic_settings_display.png new file mode 100644 index 0000000..26a95e4 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_settings_display.png differ diff --git a/app/src/main/res/drawable-xxhdpi/drawer_shadow.9.png b/app/src/main/res/drawable-xxhdpi/drawer_shadow.9.png new file mode 100644 index 0000000..b91e9d7 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/drawer_shadow.9.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_alarm_off.png b/app/src/main/res/drawable-xxhdpi/ic_alarm_off.png new file mode 100644 index 0000000..0f1e200 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_alarm_off.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_arrow_back.png b/app/src/main/res/drawable-xxhdpi/ic_arrow_back.png new file mode 100644 index 0000000..4057cc5 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_arrow_back.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_drawer.png b/app/src/main/res/drawable-xxhdpi/ic_drawer.png new file mode 100644 index 0000000..9c4685d Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_drawer.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_edit.png b/app/src/main/res/drawable-xxhdpi/ic_edit.png new file mode 100644 index 0000000..34ec709 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_edit.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_image.png b/app/src/main/res/drawable-xxhdpi/ic_image.png new file mode 100644 index 0000000..d120024 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_image.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_launcher.png b/app/src/main/res/drawable-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..4df1894 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_local_movies.png b/app/src/main/res/drawable-xxhdpi/ic_local_movies.png new file mode 100644 index 0000000..268a551 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_local_movies.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_my_library_add.png b/app/src/main/res/drawable-xxhdpi/ic_my_library_add.png new file mode 100644 index 0000000..efdcf08 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_my_library_add.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_my_library_music.png b/app/src/main/res/drawable-xxhdpi/ic_my_library_music.png new file mode 100644 index 0000000..d11ac14 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_my_library_music.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_refresh.png b/app/src/main/res/drawable-xxhdpi/ic_refresh.png new file mode 100644 index 0000000..72128fe Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_refresh.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_search.png b/app/src/main/res/drawable-xxhdpi/ic_search.png new file mode 100644 index 0000000..0bbeab1 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_search.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_settings_display.png b/app/src/main/res/drawable-xxhdpi/ic_settings_display.png new file mode 100644 index 0000000..bdf9957 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_settings_display.png differ diff --git a/app/src/main/res/layout/activity_open_lp.xml b/app/src/main/res/layout/activity_open_lp.xml new file mode 100644 index 0000000..075dbc4 --- /dev/null +++ b/app/src/main/res/layout/activity_open_lp.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_livelist_grid.xml b/app/src/main/res/layout/fragment_livelist_grid.xml new file mode 100644 index 0000000..5138355 --- /dev/null +++ b/app/src/main/res/layout/fragment_livelist_grid.xml @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/app/src/main/res/layout/fragment_livelist_list.xml b/app/src/main/res/layout/fragment_livelist_list.xml new file mode 100644 index 0000000..145d4c2 --- /dev/null +++ b/app/src/main/res/layout/fragment_livelist_list.xml @@ -0,0 +1,19 @@ + + + + + + + + diff --git a/app/src/main/res/layout/fragment_navigation_drawer.xml b/app/src/main/res/layout/fragment_navigation_drawer.xml new file mode 100644 index 0000000..5250946 --- /dev/null +++ b/app/src/main/res/layout/fragment_navigation_drawer.xml @@ -0,0 +1,9 @@ + diff --git a/app/src/main/res/layout/fragment_service_list.xml b/app/src/main/res/layout/fragment_service_list.xml new file mode 100644 index 0000000..1c8b4f7 --- /dev/null +++ b/app/src/main/res/layout/fragment_service_list.xml @@ -0,0 +1,16 @@ + + + + + diff --git a/app/src/main/res/layout/fragment_servicelist_grid.xml b/app/src/main/res/layout/fragment_servicelist_grid.xml new file mode 100644 index 0000000..bf17efc --- /dev/null +++ b/app/src/main/res/layout/fragment_servicelist_grid.xml @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/app/src/main/res/layout/fragment_servicelist_list.xml b/app/src/main/res/layout/fragment_servicelist_list.xml new file mode 100644 index 0000000..9f4b615 --- /dev/null +++ b/app/src/main/res/layout/fragment_servicelist_list.xml @@ -0,0 +1,19 @@ + + + + + + + + diff --git a/app/src/main/res/menu/global.xml b/app/src/main/res/menu/global.xml new file mode 100644 index 0000000..f3b10b6 --- /dev/null +++ b/app/src/main/res/menu/global.xml @@ -0,0 +1,6 @@ +

+ + diff --git a/app/src/main/res/menu/open_l.xml b/app/src/main/res/menu/open_l.xml new file mode 100644 index 0000000..1f15f4c --- /dev/null +++ b/app/src/main/res/menu/open_l.xml @@ -0,0 +1,34 @@ + + + + + + + + + diff --git a/app/src/main/res/values-large/refs.xml b/app/src/main/res/values-large/refs.xml new file mode 100644 index 0000000..9304261 --- /dev/null +++ b/app/src/main/res/values-large/refs.xml @@ -0,0 +1,14 @@ + + + + + @layout/fragment_servicelist_grid + @layout/fragment_livelist_grid + + \ No newline at end of file diff --git a/app/src/main/res/values-sw600dp/refs.xml b/app/src/main/res/values-sw600dp/refs.xml new file mode 100644 index 0000000..9304261 --- /dev/null +++ b/app/src/main/res/values-sw600dp/refs.xml @@ -0,0 +1,14 @@ + + + + + @layout/fragment_servicelist_grid + @layout/fragment_livelist_grid + + \ No newline at end of file diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml new file mode 100644 index 0000000..dba3c41 --- /dev/null +++ b/app/src/main/res/values-v21/styles.xml @@ -0,0 +1,5 @@ + + + + diff --git a/app/src/main/res/values-w820dp/dimens.xml b/app/src/main/res/values-w820dp/dimens.xml new file mode 100644 index 0000000..63fc816 --- /dev/null +++ b/app/src/main/res/values-w820dp/dimens.xml @@ -0,0 +1,6 @@ + + + 64dp + diff --git a/app/src/main/res/values/backgroundTimeouts.xml b/app/src/main/res/values/backgroundTimeouts.xml new file mode 100644 index 0000000..90af49f --- /dev/null +++ b/app/src/main/res/values/backgroundTimeouts.xml @@ -0,0 +1,22 @@ + + + @string/none + 1 + 2 + 5 + 10 + 15 + 20 + 30 + + + 0 + 1000 + 2000 + 5000 + 10000 + 15000 + 20000 + 30000 + + diff --git a/app/src/main/res/values/defaultValues.xml b/app/src/main/res/values/defaultValues.xml new file mode 100644 index 0000000..d34652e --- /dev/null +++ b/app/src/main/res/values/defaultValues.xml @@ -0,0 +1,14 @@ + + + 192.168.1.1 + 4316 + 4317 + userid + password + + + 3000 + 3000 + 5000 + 14 + diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml new file mode 100644 index 0000000..074e7a0 --- /dev/null +++ b/app/src/main/res/values/dimens.xml @@ -0,0 +1,9 @@ + + + 16dp + 16dp + + + 240dp + diff --git a/app/src/main/res/values/httpClientTimeoutValues.xml b/app/src/main/res/values/httpClientTimeoutValues.xml new file mode 100644 index 0000000..874fdce --- /dev/null +++ b/app/src/main/res/values/httpClientTimeoutValues.xml @@ -0,0 +1,16 @@ + + + 3000 + 4000 + 5000 + 8000 + 10000 + + + 3000 + 4000 + 5000 + 8000 + 10000 + + \ No newline at end of file diff --git a/app/src/main/res/values/keyStrings.xml b/app/src/main/res/values/keyStrings.xml new file mode 100644 index 0000000..f7913c3 --- /dev/null +++ b/app/src/main/res/values/keyStrings.xml @@ -0,0 +1,15 @@ + + enableCustomTimeout + backgroundService + connectionTimeout + blankType + textSize + socketTimeout + keyHost + keyPort + key.userid + key.password + keySharedPreferences + ssl.use + key.profile.selected.title + diff --git a/app/src/main/res/values/refs.xml b/app/src/main/res/values/refs.xml new file mode 100644 index 0000000..0038228 --- /dev/null +++ b/app/src/main/res/values/refs.xml @@ -0,0 +1,14 @@ + + + + + @layout/fragment_servicelist_list + @layout/fragment_livelist_list + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..83bb2ae --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,57 @@ + + + Version + OpenLP is free church presentation software + Find out more about visit the OpenLP website. + Copyright + Portions copyright + License + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + Settings + OpenLP + Alert + Back + Service List + Live List + Stage View + LiveView + Open navigation drawer + Close navigation drawer + Toggle Display + Search + Refresh + Preferences + Connections + About + Text Size Type + Change the Service text size + Connection Timeout + Connection timed out + Select a value (milliseconds) + Enable Custom Timeouts + Check to modify timeout settings + Socket Timeout + Select a value (milliseconds) + None + Active Profile - Tap to manage + Server + Hostname or IP + Not set + List of available profiles + Tap to add a new profile + Tap to edit properties + New Server + Server + Profile Title + Port + Use HTTPS + Specify whether HTTPS should be used + Userid + Password + Remove + Remove this configuration + Tap to set active + Save and Activate + Active Profile + diff --git a/app/src/main/res/values/strings_activity_settings.xml b/app/src/main/res/values/strings_activity_settings.xml new file mode 100644 index 0000000..a5600f4 --- /dev/null +++ b/app/src/main/res/values/strings_activity_settings.xml @@ -0,0 +1,59 @@ + + Settings + + + + + General + + Enable social recommendations + Recommendations for people to contact based on your message history + + Display name + John Smith + + Add friends to messages + + Always + When possible + Never + + + 1 + 0 + -1 + + + + Data & sync + + Sync frequency + + 15 minutes + 30 minutes + 1 hour + 3 hours + 6 hours + Never + + + 15 + 30 + 60 + 180 + 360 + -1 + + + System sync settings + + + Notifications + + New message notifications + + Ringtone + Silent + + Vibrate + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml new file mode 100644 index 0000000..ff6c9d2 --- /dev/null +++ b/app/src/main/res/values/styles.xml @@ -0,0 +1,8 @@ + + + + + + diff --git a/app/src/main/res/values/textSize.xml b/app/src/main/res/values/textSize.xml new file mode 100644 index 0000000..94b52ac --- /dev/null +++ b/app/src/main/res/values/textSize.xml @@ -0,0 +1,22 @@ + + + 6 + 8 + 10 + 12 + 14 + 16 + 18 + 20 + + + 6 + 8 + 10 + 12 + 14 + 16 + 18 + 20 + + \ No newline at end of file diff --git a/app/src/main/res/xml/empty_preferences.xml b/app/src/main/res/xml/empty_preferences.xml new file mode 100755 index 0000000..0896172 --- /dev/null +++ b/app/src/main/res/xml/empty_preferences.xml @@ -0,0 +1,6 @@ + + + + diff --git a/app/src/main/res/xml/pref_data_sync.xml b/app/src/main/res/xml/pref_data_sync.xml new file mode 100644 index 0000000..ffda831 --- /dev/null +++ b/app/src/main/res/xml/pref_data_sync.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + diff --git a/app/src/main/res/xml/pref_general.xml b/app/src/main/res/xml/pref_general.xml new file mode 100644 index 0000000..c17e9bc --- /dev/null +++ b/app/src/main/res/xml/pref_general.xml @@ -0,0 +1,32 @@ + + + + + + + + + diff --git a/app/src/main/res/xml/pref_headers.xml b/app/src/main/res/xml/pref_headers.xml new file mode 100644 index 0000000..25c5510 --- /dev/null +++ b/app/src/main/res/xml/pref_headers.xml @@ -0,0 +1,17 @@ + + + + +
+ +
+ +
+ + diff --git a/app/src/main/res/xml/pref_notification.xml b/app/src/main/res/xml/pref_notification.xml new file mode 100644 index 0000000..b4b8cae --- /dev/null +++ b/app/src/main/res/xml/pref_notification.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..9b8abe4 --- /dev/null +++ b/build.gradle @@ -0,0 +1,19 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. + +buildscript { + repositories { + jcenter() + } + dependencies { + classpath 'com.android.tools.build:gradle:0.12.2' + + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle files + } +} + +allprojects { + repositories { + jcenter() + } +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..5d08ba7 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,18 @@ +# Project-wide Gradle settings. + +# IDE (e.g. Android Studio) users: +# Settings specified in this file will override any Gradle settings +# configured through the IDE. + +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html + +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +# Default value: -Xmx10248m -XX:MaxPermSize=256m +# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 + +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..8c0fb64 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..1e61d1f --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Wed Apr 10 15:27:10 PDT 2013 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..91a7e26 --- /dev/null +++ b/gradlew @@ -0,0 +1,164 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# For Cygwin, ensure paths are in UNIX format before anything is touched. +if $cygwin ; then + [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` +fi + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >&- +APP_HOME="`pwd -P`" +cd "$SAVED" >&- + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..aec9973 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..e7b4def --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +include ':app'