diff --git a/OpenLP.iml b/OpenLP2.iml similarity index 74% rename from OpenLP.iml rename to OpenLP2.iml index 0bb6048..2a02201 100644 --- a/OpenLP.iml +++ b/OpenLP2.iml @@ -1,5 +1,5 @@ - + @@ -7,7 +7,9 @@ - + + + diff --git a/app/app.iml b/app/app.iml index 781747d..13dcdc8 100644 --- a/app/app.iml +++ b/app/app.iml @@ -1,5 +1,5 @@ - + @@ -10,7 +10,7 @@ - + + + - diff --git a/app/build.gradle b/app/build.gradle index 9ee89fc..3a0608c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,25 +2,26 @@ apply plugin: 'com.android.application' android { compileSdkVersion 21 - buildToolsVersion "20.0.0" + buildToolsVersion "21.1.2" defaultConfig { applicationId "org.openlp.android2" - minSdkVersion 14 + minSdkVersion 15 targetSdkVersion 21 versionCode 2 versionName "2.0" } buildTypes { release { - runProguard false + minifyEnabled 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 fileTree(include: ['*.jar'], dir: 'libs') + compile 'com.android.support:appcompat-v7:21.0.3' + compile 'com.android.support:support-v4:21.0.3' compile 'com.loopj.android:android-async-http:1.4.6' } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index dd64640..8209cf4 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,9 +1,11 @@ - - + + + + + + + android:name=".activities.ConnectionActivity" + android:label="@string/title_activity_settings" + android:parentActivityName=".OpenLP" > + android:name="android.support.PARENT_ACTIVITY" + android:value="org.openlp.android2.OpenLP" /> diff --git a/app/src/main/java/org/openlp/android2/OpenLP.java b/app/src/main/java/org/openlp/android2/OpenLP.java index 38528aa..10afde4 100644 --- a/app/src/main/java/org/openlp/android2/OpenLP.java +++ b/app/src/main/java/org/openlp/android2/OpenLP.java @@ -1,42 +1,35 @@ -/****************************************************************************** - * 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; import android.app.Activity; -import android.app.ActionBar; -import android.app.FragmentManager; import android.content.Intent; +import android.support.v7.app.ActionBarActivity; +import android.app.ActionBar; +import android.app.Fragment; +import android.app.FragmentManager; + 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.common.NavigationOptions; import org.openlp.android2.dialogs.AlertDisplayDialog; import org.openlp.android2.dialogs.BlankDisplayDialog; -import org.openlp.android2.fragments.*; +import org.openlp.android2.fragments.AboutFragment; +import org.openlp.android2.fragments.HomeFragment; +import org.openlp.android2.fragments.LiveListFragment; +import org.openlp.android2.fragments.LiveWebFragment; +import org.openlp.android2.fragments.NavigationDrawerFragment; +import org.openlp.android2.fragments.ServiceListFragment; +import org.openlp.android2.fragments.StageWebFragment; -public class OpenLP extends Activity +public class OpenLP extends ActionBarActivity implements NavigationDrawerFragment.NavigationDrawerCallbacks { /** @@ -48,14 +41,16 @@ public class OpenLP extends Activity * Used to store the last screen title. For use in {@link #restoreActionBar()}. */ private CharSequence mTitle; + private boolean backArrowActive = false; + private Menu dropdownMenu; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_open_lp); + setContentView(R.layout.activity_main); mNavigationDrawerFragment = (NavigationDrawerFragment) - getFragmentManager().findFragmentById(R.id.navigation_drawer); + getSupportFragmentManager().findFragmentById(R.id.navigation_drawer); mTitle = getTitle(); // Set up the drawer. @@ -100,15 +95,39 @@ public class OpenLP extends Activity mTitle = getString(R.string.live_view); break; } + menuVisible(); } public void restoreActionBar() { - ActionBar actionBar = getActionBar(); - actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD); - actionBar.setDisplayShowTitleEnabled(true); - actionBar.setTitle(mTitle); + + try { + ActionBar actionBar = getActionBar(); + //actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD); + actionBar.setDisplayShowTitleEnabled(true); + actionBar.setTitle(mTitle); + } catch (Exception e) { + e.printStackTrace(); + } } + public void setMenuActive(){ + backArrowActive = true; + } + + public void menuVisible() { + if (dropdownMenu != null){ + MenuItem checkable = dropdownMenu.findItem(R.id.action_back); + if (checkable != null) { + if (backArrowActive) { + checkable.setVisible(true); + } else { + checkable.setVisible(false); + } + } + } + backArrowActive = false; + //restoreActionBar(); + } @Override public boolean onCreateOptionsMenu(Menu menu) { @@ -130,14 +149,13 @@ public class OpenLP extends Activity // as you specify a parent activity in AndroidManifest.xml. Intent intent; switch (item.getItemId()) { + case R.id.action_back: + onNavigationDrawerItemSelected(NavigationOptions.ServiceList); + return true; case R.id.action_preferences: intent = new Intent(this, SettingsActivity.class); startActivity(intent); return true; - case R.id.action_connections: - intent = new Intent(this, ConnectionActivity.class); - startActivity(intent); - return true; case R.id.action_refresh: if (this.mTitle.equals(getString(R.string.service_list))) { ServiceListFragment fragment = (ServiceListFragment) @@ -156,11 +174,51 @@ public class OpenLP extends Activity new AlertDisplayDialog().show(getFragmentManager(), "AlertDialog"); return true; case R.id.action_about: - getFragmentManager().beginTransaction() - .replace(R.id.container, AboutFragment.newInstance()) - .commit(); + getFragmentManager().beginTransaction().replace(R.id.container, + new AboutFragment()).commit(); default: 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_main, 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/SettingsActivity.java b/app/src/main/java/org/openlp/android2/activities/SettingsActivity.java index 9123250..5e25aad 100644 --- a/app/src/main/java/org/openlp/android2/activities/SettingsActivity.java +++ b/app/src/main/java/org/openlp/android2/activities/SettingsActivity.java @@ -20,7 +20,10 @@ *******************************************************************************/ package org.openlp.android2.activities; +import android.content.Intent; +import android.content.SharedPreferences; import android.os.Bundle; +import android.preference.Preference; import android.preference.PreferenceActivity; import android.preference.PreferenceFragment; import org.openlp.android2.R; @@ -32,9 +35,45 @@ public class SettingsActivity extends PreferenceActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - getFragmentManager().beginTransaction() - .replace(android.R.id.content, new SettingsFragment()) - .commit(); + //todo fix this code to work with fragments but not now! + //getFragmentManager().beginTransaction() + // .replace(android.R.id.content, new SettingsFragment()) + // .commit(); + + getPreferenceManager() + .setSharedPreferencesName(getString(R.string.keySharedPreferences)); + + addPreferencesFromResource(R.xml.pref_general); + final SharedPreferences sharedPreferences = getPreferenceManager() + .getSharedPreferences(); + + StringBuilder stringBuilder = new StringBuilder(); + stringBuilder.append(sharedPreferences.getString( + getString(R.string.keyHost), + getString(R.string.not_set))); + stringBuilder.append(":"); + + Boolean useSsl = sharedPreferences.getBoolean( + getString(R.string.key_ssl_use), false); + stringBuilder.append( + String.format("%s %s", + sharedPreferences.getString( + getString(R.string.keyPort), + getString(R.string.not_set)), useSsl ? "(SSL)" : "")); + + final Preference hostPreference = findPreference(getString(R.string.keyHost)); + hostPreference.setTitle( + getPreferenceManager().getSharedPreferences() + .getString( + getString(R.string.key_profile_selected_title), + getString(R.string.url) + ) + ); + hostPreference.setSummary(stringBuilder.toString()); + + Preference preference = findPreference(getString(R.string.keyHost)); + preference.setIntent(new Intent(this, ConnectionActivity.class)); + } diff --git a/app/src/main/java/org/openlp/android2/fragments/LiveListFragment.java b/app/src/main/java/org/openlp/android2/fragments/LiveListFragment.java index e64e690..73278f7 100644 --- a/app/src/main/java/org/openlp/android2/fragments/LiveListFragment.java +++ b/app/src/main/java/org/openlp/android2/fragments/LiveListFragment.java @@ -21,6 +21,9 @@ package org.openlp.android2.fragments; import android.content.Context; +import android.content.res.ColorStateList; +import android.graphics.Color; +import android.graphics.Typeface; import android.os.Bundle; import android.content.SharedPreferences; import android.text.Html; @@ -49,6 +52,8 @@ import java.util.List; public class LiveListFragment extends OpenLPFragment { + private int selected = 0; + private String LOG_TAG = LiveListFragment.class.getName(); public static LiveListFragment newInstance() { @@ -80,7 +85,7 @@ public class LiveListFragment extends OpenLPFragment { public void populateDisplay(String json) { Log.i(LOG_TAG, "populate_display - entry"); List> aList = new ArrayList>(); - int selected = 0; + selected = 0; try { JSONArray items = new JSONObject(json).getJSONObject("results").getJSONArray("slides"); @@ -90,11 +95,9 @@ public class LiveListFragment extends OpenLPFragment { HashMap hm = new HashMap(); hm.put("tag", item.getString("tag")); if (item.getString("selected").equals("true")) { - hm.put("liveListSelected", Html.fromHtml(item.getString("html")).toString()); selected = i; - } else { - hm.put("liveListNormal", Html.fromHtml(item.getString("html")).toString()); } + hm.put("liveListNormal", Html.fromHtml(item.getString("html")).toString()); aList.add(hm); } } catch (JSONException e) { @@ -121,12 +124,14 @@ public class LiveListFragment extends OpenLPFragment { R.layout.fragment_livelist, from, to){ public View getView(int position, View convertView, ViewGroup parent) { View view = super.getView(position, convertView, parent); - TextView text1 = (TextView) view.findViewById(R.id.liveListNormal); + TextView text1 = (TextView) view.findViewById(R.id.tag); text1.setTextSize(TypedValue.COMPLEX_UNIT_SP, size); - TextView text2 = (TextView) view.findViewById(R.id.liveListSelected); + TextView text2 = (TextView) view.findViewById(R.id.liveListNormal); text2.setTextSize(TypedValue.COMPLEX_UNIT_SP, size); - TextView text3 = (TextView) view.findViewById(R.id.tag); - text3.setTextSize(TypedValue.COMPLEX_UNIT_SP, size); + if (selected == position){ + text2.setTextColor(Color.parseColor("#000000")); + text2.setTypeface(null, Typeface.BOLD_ITALIC); + } return view; }; diff --git a/app/src/main/java/org/openlp/android2/fragments/NavigationDrawerFragment.java b/app/src/main/java/org/openlp/android2/fragments/NavigationDrawerFragment.java index d756e8b..0bb62ea 100644 --- a/app/src/main/java/org/openlp/android2/fragments/NavigationDrawerFragment.java +++ b/app/src/main/java/org/openlp/android2/fragments/NavigationDrawerFragment.java @@ -1,9 +1,9 @@ package org.openlp.android2.fragments; - +import android.support.v7.app.ActionBarActivity; import android.app.Activity; -import android.app.ActionBar; -import android.app.Fragment; +import android.support.v7.app.ActionBar; +import android.support.v4.app.Fragment; import android.support.v4.app.ActionBarDrawerToggle; import android.support.v4.view.GravityCompat; import android.support.v4.widget.DrawerLayout; @@ -17,7 +17,13 @@ import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; -import android.widget.*; +import android.widget.AdapterView; +import android.widget.ArrayAdapter; +import android.widget.ListAdapter; +import android.widget.ListView; +import android.widget.SimpleAdapter; +import android.widget.Toast; + import org.openlp.android2.R; import java.util.ArrayList; @@ -82,7 +88,7 @@ public class NavigationDrawerFragment extends Fragment { } @Override - public void onActivityCreated (Bundle savedInstanceState) { + 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); @@ -90,7 +96,7 @@ public class NavigationDrawerFragment extends Fragment { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { + Bundle savedInstanceState) { mDrawerListView = (ListView) inflater.inflate( R.layout.fragment_navigation_drawer, container, false); mDrawerListView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,17 +142,6 @@ public class NavigationDrawerFragment extends Fragment { R.layout.fragment_navigation_drawer_list, from, to); mDrawerListView.setAdapter(adapter); -// new ArrayAdapter( -// getActionBar().getThemedContext(), -// R.layout.fragment_navigation_drawer_list, -// R.id.drawer_text, -// new String[]{ -// getString(R.string.home), -// 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; } @@ -189,7 +184,7 @@ public class NavigationDrawerFragment extends Fragment { return; } - getActivity().invalidateOptionsMenu(); // calls onPrepareOptionsMenu() + getActivity().supportInvalidateOptionsMenu(); // calls onPrepareOptionsMenu() } @Override @@ -208,7 +203,7 @@ public class NavigationDrawerFragment extends Fragment { sp.edit().putBoolean(PREF_USER_LEARNED_DRAWER, true).apply(); } - getActivity().invalidateOptionsMenu(); // calls onPrepareOptionsMenu() + getActivity().supportInvalidateOptionsMenu(); // calls onPrepareOptionsMenu() } }; @@ -288,7 +283,7 @@ public class NavigationDrawerFragment extends Fragment { return true; } - if (item.getItemId() == R.id.action_alert) { + if (item.getItemId() == R.id.action_example) { Toast.makeText(getActivity(), "Example action.", Toast.LENGTH_SHORT).show(); return true; } @@ -308,7 +303,7 @@ public class NavigationDrawerFragment extends Fragment { } private ActionBar getActionBar() { - return getActivity().getActionBar(); + return ((ActionBarActivity) getActivity()).getSupportActionBar(); } /** diff --git a/app/src/main/java/org/openlp/android2/fragments/ServiceListFragment.java b/app/src/main/java/org/openlp/android2/fragments/ServiceListFragment.java index 28137d0..64a8ae8 100644 --- a/app/src/main/java/org/openlp/android2/fragments/ServiceListFragment.java +++ b/app/src/main/java/org/openlp/android2/fragments/ServiceListFragment.java @@ -82,8 +82,7 @@ public class ServiceListFragment extends OpenLPFragment { itemClicked(position); noScreenUpdate = true; isDoubleClick = true; - //((OpenLP) getActivity()).makeBackArrowVisible(true); - //((OpenLP) getActivity()).menuVisible(R.id.action_back); + ((OpenLP) getActivity()).setMenuActive(); ((OpenLP) getActivity()).onNavigationDrawerItemSelected(NavigationOptions.LiveList); ((OpenLP) getActivity()).restoreActionBar(); return false; 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 deleted file mode 100644 index 09e933e..0000000 --- a/app/src/main/java/org/openlp/android2/fragments/dummy/DummyContent.java +++ /dev/null @@ -1,55 +0,0 @@ -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/layout-xlarge/fragment_livelist_list.xml b/app/src/main/res/layout-xlarge/fragment_livelist_list.xml new file mode 100644 index 0000000..b463d11 --- /dev/null +++ b/app/src/main/res/layout-xlarge/fragment_livelist_list.xml @@ -0,0 +1,42 @@ + + + + + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml new file mode 100644 index 0000000..5af8fd7 --- /dev/null +++ b/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml index bb3f203..ce62439 100644 --- a/app/src/main/res/layout/fragment_about.xml +++ b/app/src/main/res/layout/fragment_about.xml @@ -5,4 +5,5 @@ android:background="#000000" android:gravity="center" android:linksClickable="true" - android:padding="32dp" /> \ No newline at end of file + android:padding="32dp" + android:textColor="#ffffffff" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_livelist_grid.xml b/app/src/main/res/layout/fragment_livelist_grid.xml index 5138355..313ec0e 100644 --- a/app/src/main/res/layout/fragment_livelist_grid.xml +++ b/app/src/main/res/layout/fragment_livelist_grid.xml @@ -11,10 +11,35 @@ android:layout_height="match_parent" android:numColumns="2" /> - + + + + diff --git a/app/src/main/res/layout/fragment_livelist_list.xml b/app/src/main/res/layout/fragment_livelist_list.xml index 3ca504a..b463d11 100644 --- a/app/src/main/res/layout/fragment_livelist_list.xml +++ b/app/src/main/res/layout/fragment_livelist_list.xml @@ -11,30 +11,32 @@ android:longClickable="false"> + android:layout_weight="1"/> + android:textStyle="normal" + android:layout_weight="1"/> + android:textStyle="bold|italic" + android:layout_weight="1"/> diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml new file mode 100644 index 0000000..ef0bd84 --- /dev/null +++ b/app/src/main/res/layout/fragment_main.xml @@ -0,0 +1,12 @@ + + + + + diff --git a/app/src/main/res/layout/fragment_navigation_drawer.xml b/app/src/main/res/layout/fragment_navigation_drawer.xml index 96a35e9..c05742d 100644 --- a/app/src/main/res/layout/fragment_navigation_drawer.xml +++ b/app/src/main/res/layout/fragment_navigation_drawer.xml @@ -1,12 +1,5 @@ + xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" + android:layout_height="match_parent" android:choiceMode="singleChoice" + android:divider="@android:color/transparent" android:dividerHeight="0dp" + android:background="#cccc" tools:context=".NavigationDrawerFragment" /> diff --git a/app/src/main/res/menu/global.xml b/app/src/main/res/menu/global.xml index f3b10b6..326a6a7 100644 --- a/app/src/main/res/menu/global.xml +++ b/app/src/main/res/menu/global.xml @@ -1,6 +1,5 @@ -

- + + diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml new file mode 100644 index 0000000..2157c83 --- /dev/null +++ b/app/src/main/res/menu/main.xml @@ -0,0 +1,8 @@ + + + + diff --git a/app/src/main/res/menu/open_l.xml b/app/src/main/res/menu/open_l.xml index fb946e5..0f81727 100644 --- a/app/src/main/res/menu/open_l.xml +++ b/app/src/main/res/menu/open_l.xml @@ -1,40 +1,37 @@ - + + app:showAsAction="always" /> + app:showAsAction="always" /> + app:showAsAction="always" /> + app:showAsAction="never|withText" /> + app:showAsAction="never|withText" /> - + app:showAsAction="never|withText" /> + app:showAsAction="never|withText" /> diff --git a/app/src/main/res/values-large/refs.xml b/app/src/main/res/values-large/refs.xml deleted file mode 100644 index 9304261..0000000 --- a/app/src/main/res/values-large/refs.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - @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 deleted file mode 100644 index 9304261..0000000 --- a/app/src/main/res/values-sw600dp/refs.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - @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 deleted file mode 100644 index dba3c41..0000000 --- a/app/src/main/res/values-v21/styles.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 37faa31..c2612cd 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,6 @@ + Version OpenLP is free church presentation software Find out more about visit the OpenLP website_ @@ -38,6 +39,7 @@ Connection timed out Select a value (milliseconds) Userid + Set Custom Timeout Check to modify timeout settings Select the required blank type Blank display to Desktop @@ -58,7 +60,8 @@ Process Service List Stage View - Text Size Type + Set Display Text Size + Select display text size Change the Service text size Server Hostname or IP diff --git a/app/src/main/res/values/strings_activity_settings.xml b/app/src/main/res/values/strings_activity_settings.xml index a5600f4..a003c08 100644 --- a/app/src/main/res/values/strings_activity_settings.xml +++ b/app/src/main/res/values/strings_activity_settings.xml @@ -1,5 +1,5 @@ - Settings + Settings @@ -7,7 +7,9 @@ General Enable social recommendations - Recommendations for people to contact based on your message history + Recommendations for people to contact + based on your message history + Display name John Smith diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index e84bc5e..766ab99 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,7 +1,7 @@ - diff --git a/app/src/main/res/xml/pref_general.xml b/app/src/main/res/xml/pref_general.xml index 2dbd328..fd7f041 100644 --- a/app/src/main/res/xml/pref_general.xml +++ b/app/src/main/res/xml/pref_general.xml @@ -1,24 +1,41 @@ - - + + + + - + + + - + - + android:key="@string/keyConnectionTimeout" + android:summary="@string/connection_timeout_summary" + android:title="@string/connection_timeout" /> + diff --git a/app/src/main/res/xml/pref_headers.xml b/app/src/main/res/xml/pref_headers.xml index 25c5510..e207104 100644 --- a/app/src/main/res/xml/pref_headers.xml +++ b/app/src/main/res/xml/pref_headers.xml @@ -3,15 +3,15 @@
diff --git a/build.gradle b/build.gradle index 9b8abe4..6356aab 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:0.12.2' + classpath 'com.android.tools.build:gradle:1.0.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle.properties b/gradle.properties index 5d08ba7..1d3591c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,8 @@ # Project-wide Gradle settings. # IDE (e.g. Android Studio) users: -# Settings specified in this file will override any Gradle settings -# configured through the IDE. +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. # For more details on how to configure your build environment visit # http://www.gradle.org/docs/current/userguide/build_environment.html diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1e61d1f..0c71e76 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ 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 +distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip