diff --git a/app/src/main/java/org/openlp/android2/OpenLP.java b/app/src/main/java/org/openlp/android2/OpenLP.java
index 222d328..e09a0cb 100644
--- a/app/src/main/java/org/openlp/android2/OpenLP.java
+++ b/app/src/main/java/org/openlp/android2/OpenLP.java
@@ -144,7 +144,7 @@ public class OpenLP extends ActionBarActivity
.replace(R.id.container_left, ServiceListFragment.newInstance(), "servicelist")
.commit();
fragmentManager.beginTransaction()
- .replace(R.id.container_right, LiveListFragment.newInstance())
+ .replace(R.id.container_right, LiveListFragment.newInstance(), "livelist")
.commit();
mTitle = getString(R.string.live_list);
toggerContainer(R.id.next_button, View.VISIBLE);
diff --git a/app/src/main/java/org/openlp/android2/common/JsonHelpers.java b/app/src/main/java/org/openlp/android2/common/JsonHelpers.java
index d06ffc7..bcc6a2f 100644
--- a/app/src/main/java/org/openlp/android2/common/JsonHelpers.java
+++ b/app/src/main/java/org/openlp/android2/common/JsonHelpers.java
@@ -18,6 +18,8 @@
*******************************************************************************/
package org.openlp.android2.common;
+import android.util.Log;
+
import org.json.JSONException;
import org.json.JSONObject;
import org.json.JSONStringer;
@@ -37,6 +39,7 @@ public class JsonHelpers {
responseJSON = new JSONStringer().object().key("request").value(jo)
.endObject().toString();
responseJSON = URLEncoder.encode(responseJSON, "UTF-8");
+ Log.d(LOG_TAG, String.format("createRequestJSON: %s : %s : %s", key, value, responseJSON));
return responseJSON;
} catch (JSONException e) {
throw new JSONHandlerException(e);
diff --git a/app/src/main/java/org/openlp/android2/dialogs/SearchSelectionDialog.java b/app/src/main/java/org/openlp/android2/dialogs/SearchSelectionDialog.java
index 76810bc..35d71fe 100644
--- a/app/src/main/java/org/openlp/android2/dialogs/SearchSelectionDialog.java
+++ b/app/src/main/java/org/openlp/android2/dialogs/SearchSelectionDialog.java
@@ -56,6 +56,8 @@ public class SearchSelectionDialog extends OpenLPDialog {
plugin = getArguments().getString("plugin");
text = getArguments().getString("text");
+ Log.d(LOG_TAG, String.format("onCreateDialog %s : %s : %s", key, plugin, text));
+
context = getActivity();
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
@@ -121,7 +123,7 @@ public class SearchSelectionDialog extends OpenLPDialog {
public void createService() {
try {
- String request = JsonHelpers.createRequestJSON("id", key);
+ String request = JsonHelpers.createRequestJSON("id", text);
String url = String.format(Api.SEARCH_PLUGIN_ADD, plugin.toLowerCase());
triggerTextRequest(String.format("%s%s", url, request));
Log.d(LOG_TAG, String.format("Setting list data. apiBase(%s), text(%s)", Api.SEARCH_PLUGIN_ADD, text));
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 441f155..61b3e93 100644
--- a/app/src/main/java/org/openlp/android2/fragments/LiveListFragment.java
+++ b/app/src/main/java/org/openlp/android2/fragments/LiveListFragment.java
@@ -128,10 +128,9 @@ public class LiveListFragment extends OpenLPFragment {
text1.setTextSize(TypedValue.COMPLEX_UNIT_SP, size);
TextView text2 = (TextView) view.findViewById(R.id.liveListNormal);
text2.setTextSize(TypedValue.COMPLEX_UNIT_SP, size);
- Log.i(LOG_TAG, "aaa " + selected +" "+ position);
-
if (selected == position) {
text2.setTypeface(null, Typeface.BOLD_ITALIC);
+ line.setBackgroundColor(0xffffff);
} else{
text2.setTypeface(null, Typeface.NORMAL);
line.setBackgroundColor(0xffffff);
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 42db064..1be47b0 100644
--- a/app/src/main/java/org/openlp/android2/fragments/ServiceListFragment.java
+++ b/app/src/main/java/org/openlp/android2/fragments/ServiceListFragment.java
@@ -163,11 +163,10 @@ public class ServiceListFragment extends OpenLPFragment {
TextView line = (TextView) view.findViewById(R.id.servicelistLine);
TextView text1 = (TextView) view.findViewById(R.id.serviceListText);
text1.setTextSize(TypedValue.COMPLEX_UNIT_SP, size);
- Log.i(LOG_TAG, "bbb " + selected +" "+ position);
-
if (selected == position) {
text1.setTextColor(Color.parseColor("#000000"));
text1.setTypeface(null, Typeface.BOLD_ITALIC);
+ line.setBackgroundColor(0xffffff);
} else{
text1.setTypeface(null, Typeface.NORMAL);
line.setBackgroundColor(0xffffff);
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 5bfe684..f0eff4c 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -4,7 +4,7 @@
android:id="@+id/drawer_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
- tools:context=".MainActivity">
+ tools:context=".OpenLP">
diff --git a/app/src/main/res/layout/fragment_item_grid.xml b/app/src/main/res/layout/fragment_item_grid.xml
deleted file mode 100644
index 9452736..0000000
--- a/app/src/main/res/layout/fragment_item_grid.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/layout/fragment_livelist_grid.xml b/app/src/main/res/layout/fragment_livelist_grid.xml
deleted file mode 100644
index 313ec0e..0000000
--- a/app/src/main/res/layout/fragment_livelist_grid.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/values-large/refs.xml b/app/src/main/res/values-large/refs.xml
index d6935a5..04ab57e 100644
--- a/app/src/main/res/values-large/refs.xml
+++ b/app/src/main/res/values-large/refs.xml
@@ -7,6 +7,5 @@
For more on layout aliases, see:
http://developer.android.com/training/multiscreen/screensizes.html#TaskUseAliasFilters
-->
- - @layout/fragment_item_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
index d6935a5..2ec568f 100644
--- a/app/src/main/res/values-sw600dp/refs.xml
+++ b/app/src/main/res/values-sw600dp/refs.xml
@@ -7,6 +7,4 @@
For more on layout aliases, see:
http://developer.android.com/training/multiscreen/screensizes.html#TaskUseAliasFilters
-->
- - @layout/fragment_item_grid
-
\ No newline at end of file