From d76013d616663fd16b67ec4d72429aa31344cfa1 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sun, 20 Sep 2015 22:02:37 +0100 Subject: [PATCH] Next version --- OpenLP2.iml | 2 +- app/app.iml | 28 +++++---- app/build.gradle | 12 +++- .../org/openlp/android2/ApplicationTest.java | 13 ----- .../main/java/org/openlp/android2/OpenLP.java | 5 +- .../android2/common/OpenLPHttpClient.java | 6 +- .../android2/dialogs/BlankDisplayDialog.java | 55 ++++++++++-------- .../android2/fragments/LiveListFragment.java | 2 +- .../fragments/ServiceListFragment.java | 1 + app/src/main/res/drawable-hdpi/ic_drawer.png | Bin 0 -> 2829 bytes .../main/res/drawable-hdpi/ic_menu_white.png | Bin 95 -> 114 bytes app/src/main/res/drawable-mdpi/ic_drawer.png | Bin 0 -> 2820 bytes .../main/res/drawable-mdpi/ic_menu_white.png | Bin 93 -> 84 bytes app/src/main/res/drawable-xhdpi/ic_drawer.png | Bin 0 -> 2836 bytes .../main/res/drawable-xhdpi/ic_menu_white.png | Bin 99 -> 92 bytes .../main/res/drawable-xxhdpi/ic_drawer.png | Bin 0 -> 202 bytes .../res/drawable-xxhdpi/ic_menu_white.png | Bin 110 -> 108 bytes app/src/main/res/drawable/customborder.xml | 5 +- .../main/res/layout/blank_display_dialog.xml | 10 ++-- app/src/main/res/values-en-rGB/strings.xml | 8 +-- app/src/main/res/values-en_rZA/strings.xml | 53 ----------------- app/src/main/res/values-ko_rKR/strings.xml | 9 --- app/src/main/res/values-pt_rBR/strings.xml | 25 -------- app/src/main/res/values-ta_rLK/strings.xml | 24 -------- app/src/main/res/values-th_rTH/strings.xml | 24 -------- app/src/main/res/values-vi_rVN/strings.xml | 2 - app/src/main/res/values-zh_rCN/strings.xml | 24 -------- app/src/main/res/values-zh_rTW/strings.xml | 53 ----------------- app/src/main/res/values/strings.xml | 10 ++-- build.gradle | 2 +- 30 files changed, 85 insertions(+), 288 deletions(-) delete mode 100644 app/src/androidTest/java/org/openlp/android2/ApplicationTest.java create mode 100644 app/src/main/res/drawable-hdpi/ic_drawer.png create mode 100644 app/src/main/res/drawable-mdpi/ic_drawer.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_drawer.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_drawer.png delete mode 100644 app/src/main/res/values-en_rZA/strings.xml delete mode 100644 app/src/main/res/values-ko_rKR/strings.xml delete mode 100644 app/src/main/res/values-pt_rBR/strings.xml delete mode 100644 app/src/main/res/values-ta_rLK/strings.xml delete mode 100644 app/src/main/res/values-th_rTH/strings.xml delete mode 100644 app/src/main/res/values-vi_rVN/strings.xml delete mode 100644 app/src/main/res/values-zh_rCN/strings.xml delete mode 100644 app/src/main/res/values-zh_rTW/strings.xml diff --git a/OpenLP2.iml b/OpenLP2.iml index 09e9d22..ebb3cb4 100644 --- a/OpenLP2.iml +++ b/OpenLP2.iml @@ -8,7 +8,7 @@ - + diff --git a/app/app.iml b/app/app.iml index 81a46eb..ff6ebba 100644 --- a/app/app.iml +++ b/app/app.iml @@ -12,10 +12,12 @@ - + - + @@ -35,12 +37,12 @@ - - - - - - + + + + + + @@ -69,6 +71,8 @@ + + diff --git a/app/build.gradle b/app/build.gradle index 4a611f9..87b1738 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,7 +10,7 @@ android { applicationId "org.openlp.android2" minSdkVersion 15 targetSdkVersion 22 - versionCode 2 + versionCode 3 versionName "2.0" } android { @@ -24,6 +24,8 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + testOptions { + unitTests.returnDefaultValues = true } dependencies { @@ -31,4 +33,12 @@ dependencies { compile 'com.android.support:appcompat-v7:22.2.0' compile 'com.android.support:support-v4:22.2.0' compile 'com.loopj.android:android-async-http:1.4.6' + testCompile 'junit:junit:4.12' + testCompile 'org.easytesting:fest:1.0.16' + testCompile 'com.squareup:fest-android:1.0.8' + testCompile('org.robolectric:robolectric:3.0-rc2') { + exclude group: 'commons-logging', module: 'commons-logging' + exclude group: 'org.apache.httpcomponents', module: 'httpclient' + } } +} \ No newline at end of file diff --git a/app/src/androidTest/java/org/openlp/android2/ApplicationTest.java b/app/src/androidTest/java/org/openlp/android2/ApplicationTest.java deleted file mode 100644 index 308a5e6..0000000 --- a/app/src/androidTest/java/org/openlp/android2/ApplicationTest.java +++ /dev/null @@ -1,13 +0,0 @@ -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/java/org/openlp/android2/OpenLP.java b/app/src/main/java/org/openlp/android2/OpenLP.java index 98de6ce..9b435ae 100644 --- a/app/src/main/java/org/openlp/android2/OpenLP.java +++ b/app/src/main/java/org/openlp/android2/OpenLP.java @@ -31,6 +31,7 @@ import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.support.v4.widget.DrawerLayout; +import android.view.WindowManager; import org.openlp.android2.activities.SettingsActivity; import org.openlp.android2.common.NavigationOptions; @@ -74,13 +75,15 @@ public class OpenLP extends ActionBarActivity mNavigationDrawerFragment.setUp( R.id.navigation_drawer, (DrawerLayout) findViewById(R.id.drawer_layout)); + + getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); } /** * Check the preferences have been set at startup and if not redirect them to be set. * */ - private void doPreferenceCheck() { + protected void doPreferenceCheck() { SharedPreferences sharedPrefs = PreferenceManager .getDefaultSharedPreferences(this); if (sharedPrefs.getString(getString(R.string.key_host), "NONE").equals("NONE") diff --git a/app/src/main/java/org/openlp/android2/common/OpenLPHttpClient.java b/app/src/main/java/org/openlp/android2/common/OpenLPHttpClient.java index 5b26711..5a5d566 100644 --- a/app/src/main/java/org/openlp/android2/common/OpenLPHttpClient.java +++ b/app/src/main/java/org/openlp/android2/common/OpenLPHttpClient.java @@ -62,9 +62,9 @@ public class OpenLPHttpClient { if (sharedPrefs.getBoolean(context.getString(R.string.key_enable_custom_timeout), false)) { Log.d(LOG_TAG, "Overriding Connection and Socket timeouts"); - connectionTimeout = sharedPrefs.getInt(context.getString(R.string.key_connection_timeout), - context.getResources().getInteger(R.integer.connectionTimeoutDefaultValue) - ); + connectionTimeout = Integer.parseInt(sharedPrefs.getString(context.getString(R.string.key_connection_timeout), + String.valueOf(context.getResources().getInteger(R.integer.connectionTimeoutDefaultValue)) + )); } client.setTimeout(connectionTimeout); if (useSSL){ diff --git a/app/src/main/java/org/openlp/android2/dialogs/BlankDisplayDialog.java b/app/src/main/java/org/openlp/android2/dialogs/BlankDisplayDialog.java index a44feef..833e264 100644 --- a/app/src/main/java/org/openlp/android2/dialogs/BlankDisplayDialog.java +++ b/app/src/main/java/org/openlp/android2/dialogs/BlankDisplayDialog.java @@ -27,6 +27,8 @@ import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; import android.widget.Button; +import android.widget.RadioButton; + import org.json.JSONException; import org.json.JSONObject; import org.openlp.android2.R; @@ -38,10 +40,10 @@ import org.openlp.android2.common.OpenLPHttpClient; public class BlankDisplayDialog extends OpenLPDialog { private final String LOG_TAG = BlankDisplayDialog.class.getName(); public AlertDialog dialog; - Button desktop; - Button screen; - Button theme; - Button reset; + RadioButton desktop; + RadioButton screen; + RadioButton theme; + RadioButton reset; /** * The system calls this only when creating the layout in a dialog. @@ -65,28 +67,28 @@ public class BlankDisplayDialog extends OpenLPDialog { View view = inflater.inflate(R.layout.blank_display_dialog, null); builder.setView(view); - reset = (Button) view.findViewById(R.id.buttonReset); + reset = (RadioButton) view.findViewById(R.id.buttonReset); reset.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { triggerTextRequest(Api.DISPLAY_SHOW); } }); - screen = (Button) view.findViewById(R.id.buttonScreen); + screen = (RadioButton) view.findViewById(R.id.buttonScreen); screen.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { triggerTextRequest(Api.DISPLAY_BLANK); } }); - theme = (Button) view.findViewById(R.id.buttonTheme); + theme = (RadioButton) view.findViewById(R.id.buttonTheme); theme.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { triggerTextRequest(Api.DISPLAY_THEME); } }); - desktop = (Button) view.findViewById(R.id.buttonDesktop); + desktop = (RadioButton) view.findViewById(R.id.buttonDesktop); desktop.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -122,21 +124,22 @@ public class BlankDisplayDialog extends OpenLPDialog { } public void populateDisplay(String json) { - Log.d(LOG_TAG, "populateDisplay"); + Log.d(LOG_TAG, "populateDisplay : " + json ); + reset_display(); try { JSONObject item = new JSONObject(json).getJSONObject("results"); - if (item.getString("theme").equals("false") & - item.getString("display").equals("false") & - item.getString("blank").equals("false")) { - screen.setEnabled(true); - theme.setEnabled(true); - desktop.setEnabled(true); - reset.setEnabled(false); + if (item.getString("theme").equals("true")){ + theme.setChecked(true); } else { - screen.setEnabled(false); - theme.setEnabled(false); - desktop.setEnabled(false); - reset.setEnabled(true); + if (item.getString("blank").equals("true")){ + screen.setChecked(true); + } else{ + if (item.getString("display").equals("true")){ + desktop.setChecked(true); + } else{ + reset.setChecked(true); + } + } } } catch (JSONException e) { Log.e(LOG_TAG, "Exception with Json = " + json); @@ -146,9 +149,13 @@ public class BlankDisplayDialog extends OpenLPDialog { public void errorDisplay(int statusCode, String responseString) { Log.d(LOG_TAG, String.format("URL Error status code %d text %s", statusCode, responseString)); - screen.setEnabled(false); - theme.setEnabled(false); - desktop.setEnabled(false); - reset.setEnabled(false); + reset_display(); + } + + private void reset_display(){ + screen.setChecked(false); + theme.setChecked(false); + desktop.setChecked(false); + reset.setChecked(false); } } 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 b575069..20e9eff 100644 --- a/app/src/main/java/org/openlp/android2/fragments/LiveListFragment.java +++ b/app/src/main/java/org/openlp/android2/fragments/LiveListFragment.java @@ -139,7 +139,7 @@ public class LiveListFragment extends OpenLPFragment { } }; setListAdapter(adapter); - getListView().setSelection(selected - 1); + //getListView().setSelection(selected - 1); Log.i(LOG_TAG, "populate_display - exit"); } 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 ef5f729..2766905 100644 --- a/app/src/main/java/org/openlp/android2/fragments/ServiceListFragment.java +++ b/app/src/main/java/org/openlp/android2/fragments/ServiceListFragment.java @@ -171,6 +171,7 @@ public class ServiceListFragment extends OpenLPFragment { } }; setListAdapter(adapter); + //getListView().setSelection(selected - 1); Log.i(LOG_TAG, "populate_display - exit"); } 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 0000000000000000000000000000000000000000..c59f601ca31dae344d0dc95912713ce54a8fbefe GIT binary patch literal 2829 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 Lu6{1-oD!M<_Shd1 literal 95 zcmeAS@N?(olHy`uVBq!ia0vp^9w5vJBp7O^^}Pa8OeH~n!3+##lh0ZJc@my3jv*C{ q$r6(m{IloyqulIjBT;%afQ4bba7p3K1NRd_Iz3(eT-G@yGywqarWs)X 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 0000000000000000000000000000000000000000..1ed2c56ee4239ff2987568d4fdae10166650b120 GIT binary patch literal 2820 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 literal 99 zcmeAS@N?(olHy`uVBq!ia0vp^2_Vb}Bp6OT_L>T$m`Z~Df*BafCZDwc@?<<+978G? ulNE$}nEw3__|P~_=F`CpiJrED8Vn3(8rL-!S-MJqbbGq`xvXio#t-TVJM=pEGT)onF!&ZOd;8}O149hcq!N%?hK6(oZAK7-f#HS|n9?%@Qw{w* cAUc7wfPvd9>y+w~O{pNhr>mdKI;Vst074Kf@&Et; literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_menu_white.png b/app/src/main/res/drawable-xxhdpi/ic_menu_white.png index 48ae2184da76287debf658c6a4f47a8344aeebf2..59aca7ceb1c7dde8652f4932b4714ed30d8db224 100644 GIT binary patch literal 108 zcmeAS@N?(olHy`uVBq!ia0vp^W+2SL0wmRZ7KH&RV^0^ykch)?uWS@#U|?Z!T>5$r zp9@P`ndpa!-3$pK>^-vmPyhX7nV_9}#qEL{kZ4Gk%Kx(^b literal 110 zcmeAS@N?(olHy`uVBq!ia0vp^6F`^|NHCnYy)O!+m`Z~Df*BafCZDwc^3*+D978G? zlO?PYM0%Kh|Mz%s{)4a*e^1lJDaL0GW}K4rwOpJa!oZ-Sc56++-ly|H26?*rxvX - + - + + \ No newline at end of file diff --git a/app/src/main/res/layout/blank_display_dialog.xml b/app/src/main/res/layout/blank_display_dialog.xml index add5099..654dbf5 100644 --- a/app/src/main/res/layout/blank_display_dialog.xml +++ b/app/src/main/res/layout/blank_display_dialog.xml @@ -6,7 +6,6 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:weightSum="1"> - -