openlp
/
android
mirror of https://gitlab.com/openlp/android.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Blank displays works and SSL

This commit is contained in:
Tim Bentley 2014-11-15 15:43:52 +00:00
parent 3ae99b2a48
commit e856bea4e5
8 changed files with 94 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/AndroidManifest.xml
View File

@ -1,7 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.openlp.android2" >
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.WRITE_SETTINGS"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<application
android:allowBackup="true"
android:icon="@drawable/ic_launcher"

33
app/src/main/java/org/openlp/android2/OpenLP.java
View File

@ -1,3 +1,23 @@
/******************************************************************************
* 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;
@ -15,6 +35,7 @@ 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.dialogs.BlankDisplayDialog;
import org.openlp.android2.fragments.LiveListFragment;
import org.openlp.android2.fragments.NavigationDrawerFragment;
import org.openlp.android2.fragments.ServicelistFragment;
@ -134,6 +155,10 @@ public class OpenLP extends Activity
startActivity(intent);
return true;
}
if (id == R.id.action_alert) {
new BlankDisplayDialog().show(getFragmentManager(), "BlankDialog");
return true;
}
return super.onOptionsItemSelected(item);
}
@ -147,6 +172,9 @@ public class OpenLP extends Activity
*/
private static final String ARG_SECTION_NUMBER = "section_number";
public PlaceholderFragment() {
}
/**
* Returns a new instance of this fragment for the given section
* number.
@ -159,12 +187,9 @@ public class OpenLP extends Activity
return fragment;
}
public PlaceholderFragment() {
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
Bundle savedInstanceState) {
View rootView = inflater.inflate(R.layout.fragment_service_list, container, false);
return rootView;
}

29
app/src/main/java/org/openlp/android2/fragments/LiveListFragment.java
View File

@ -1,3 +1,23 @@
/******************************************************************************
* 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.fragments;
import android.app.Activity;
@ -15,15 +35,6 @@ import org.openlp.android2.R;
import org.openlp.android2.fragments.dummy.DummyContent;
/**
* A fragment representing a list of Items.
* <p />
* Large screen devices (such as tablets) are supported by replacing the ListView
* with a GridView.
* <p />
* 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

20
app/src/main/java/org/openlp/android2/fragments/ServicelistFragment.java
View File

@ -1,3 +1,23 @@
/******************************************************************************
* 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.fragments;
import android.app.Activity;

2
app/src/main/res/values/defaultValues.xml
View File

@ -7,8 +7,6 @@
<string name="passwordDefaultValue">password</string>
<!-- INTEGER -->
<integer name="socketTimeoutDefaultValue">3000</integer>
<integer name="connectionTimeoutDefaultValue">3000</integer>
<string name="backgroundRefreshDefaultValue">5000</string>
<integer name="textSizeDefaultValue">14</integer>
</resources>

14
app/src/main/res/values/httpClientTimeoutValues.xml
View File

@ -6,11 +6,11 @@
<item>8000</item>
<item>10000</item>
</string-array>
<string-array name="socketValues">
<item>3000</item>
<item>4000</item>
<item>5000</item>
<item>8000</item>
<item>10000</item>
</string-array>
<string-array name="socketValues">
<item>3000</item>
<item>4000</item>
<item>5000</item>
<item>8000</item>
<item>10000</item>
</string-array>
</resources>

22
app/src/main/res/values/strings.xml
View File

@ -28,23 +28,21 @@
<string name="textSizeSummary">Change the Service text size</string>
<string name="connectionTimeout">Connection Timeout</string>
<string name="connectionTimedout">Connection timed out</string>
<string name="connectionTimeoutSummary">Select a value (milliseconds)</string>
<string name="connectionTimeoutSummary">Select a value (milliseconds)</string>
<string name="enableCustomTimeouts">Enable Custom Timeouts</string>
<string name="customTimeoutsSummary">Check to modify timeout settings</string>
<string name="socketTimeout">Socket Timeout</string>
<string name="socketTimeoutSummary">Select a value (milliseconds)</string>
<string name="none">None</string>
<string name="connection.profile.active">Active Profile - Tap to manage</string>
<string name="connection.profile.active">Active Profile - Tap to manage</string>
<string name="url">Server</string>
<string name="urlHint">Hostname or IP</string>
<string name="notSet">Not set</string>
<string name="notSet">Not set</string>
<string name="cancel">Cancel</string>
<string name="connection.available.configurations">List of available profiles</string>
<string name="connection.add.by.menu">Tap to add a new profile</string>
<string name="connection.profile.not.saved">Tap to edit properties</string>
<string name="connection.profile.new.server">New Server</string>
<string name="connection.profile.server">Server</string>
<string name="connection.profile.title">Profile Title</string>
<string name="port">Port</string>
<string name="connection.profile.ssl.use">Use HTTPS</string>
<string name="connection.profile.ssl.summary">Specify whether HTTPS should be used</string>
<string name="connection.userid">Userid</string>
@ -53,5 +51,15 @@
<string name="connection.profile.remove.summary">Remove this configuration</string>
<string name="connection.profile.summary.activate">Tap to set active</string>
<string name="connection.profile.activate">Save and Activate</string>
<string name="connection.profile.active.toast">Active Profile</string>
<string name="connection.profile.active.toast">Active Profile</string>
<string name="display.Reset">Reset Display</string>
<string name="display.Screen">Blank display to Blank</string>
<string name="display.Theme">Blank display to Theme</string>
<string name="display.Desktop">Blank display to Desktop</string>
<string name="displayBlankSummary">Select the required blank type</string>
<string name="enterAlertText">Enter Alert Text</string>
<string name="httpreturn.unauthorised">Unauthorised Access, please enter valid userid and password</string>
<string name="process">Process</string>
<string name="unable">Unable to load page - check network settings</string>
<string name="port">Port</string>
</resources>

8
app/src/main/res/xml/pref_general.xml
View File

@ -19,14 +19,6 @@
android:entries="@array/socketValueEntries"
android:entryValues="@array/socketValues"
android:defaultValue="@integer/connectionTimeoutDefaultValue"/>
<ListPreference
android:title="@string/socketTimeout"
android:key="@string/keySocketTimeout"
android:summary="@string/socketTimeoutSummary"
android:dependency="@string/keyEnableCustomTimeout"
android:entries="@array/socketValueEntries"
android:entryValues="@array/socketValues"
android:defaultValue="@integer/socketTimeoutDefaultValue"/>
</PreferenceCategory>
</PreferenceScreen>