diff --git a/app/app.iml b/app/app.iml
index b77b354..fa61479 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -66,14 +66,6 @@
-
-
-
-
-
-
-
-
@@ -82,10 +74,17 @@
+
+
+
+
+
+
+
+
-
diff --git a/app/src/main/java/org/openlp/android2/OpenLP.java b/app/src/main/java/org/openlp/android2/OpenLP.java
index a0818b8..222d328 100644
--- a/app/src/main/java/org/openlp/android2/OpenLP.java
+++ b/app/src/main/java/org/openlp/android2/OpenLP.java
@@ -35,6 +35,8 @@ import android.view.WindowManager;
import org.openlp.android2.activities.SettingsActivity;
import org.openlp.android2.common.NavigationOptions;
+import org.openlp.android2.common.OpenLPURLBuilder;
+import org.openlp.android2.common.StateHolder;
import org.openlp.android2.dialogs.AlertDisplayDialog;
import org.openlp.android2.dialogs.BlankDisplayDialog;
import org.openlp.android2.fragments.AboutFragment;
@@ -65,6 +67,8 @@ public class OpenLP extends ActionBarActivity
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
+ OpenLPURLBuilder.getInstance().setContext(this);
+ StateHolder.getInstance().setContext(this);
doPreferenceCheck();
diff --git a/app/src/main/java/org/openlp/android2/common/OpenLPURLBuilder.java b/app/src/main/java/org/openlp/android2/common/OpenLPURLBuilder.java
index 3ba6c87..8e9867e 100644
--- a/app/src/main/java/org/openlp/android2/common/OpenLPURLBuilder.java
+++ b/app/src/main/java/org/openlp/android2/common/OpenLPURLBuilder.java
@@ -30,7 +30,16 @@ public class OpenLPURLBuilder {
private final String LOG_TAG = OpenLPURLBuilder.class.getName();
private Context context;
- public OpenLPURLBuilder(Context context) {
+ private static OpenLPURLBuilder ourInstance = new OpenLPURLBuilder();
+
+ public static OpenLPURLBuilder getInstance() {
+ return ourInstance;
+ }
+
+ private OpenLPURLBuilder() {
+ }
+
+ public void setContext(Context context) {
this.context = context;
}
diff --git a/app/src/main/java/org/openlp/android2/common/RequestQueueService.java b/app/src/main/java/org/openlp/android2/common/RequestQueueService.java
index bdff433..8285389 100644
--- a/app/src/main/java/org/openlp/android2/common/RequestQueueService.java
+++ b/app/src/main/java/org/openlp/android2/common/RequestQueueService.java
@@ -39,12 +39,10 @@ public class RequestQueueService {
private RequestQueue mRequestQueue;
private ImageLoader mImageLoader;
private static Context mCtx;
- private OpenLPURLBuilder urlbuilder;
private RequestQueueService(Context context) {
mCtx = context;
mRequestQueue = getRequestQueue();
- urlbuilder = new OpenLPURLBuilder(context);
mImageLoader = new ImageLoader(mRequestQueue,
new ImageLoader.ImageCache() {
@@ -79,15 +77,15 @@ public class RequestQueueService {
}
public String getUrl(String url){
- return String.format("%s%s", urlbuilder.getBaseUrl(), url );
+ return String.format("%s%s", OpenLPURLBuilder.getInstance().getBaseUrl(), url );
}
public String getBasicAuth(){
- return urlbuilder.getBasicAuth();
+ return OpenLPURLBuilder.getInstance().getBasicAuth();
}
public int getConnectionTimeout(){
- return urlbuilder.getConnectionTimeout();
+ return OpenLPURLBuilder.getInstance().getConnectionTimeout();
}
public void addToRequestQueue(Request req) {
diff --git a/app/src/main/java/org/openlp/android2/common/StateHolder.java b/app/src/main/java/org/openlp/android2/common/StateHolder.java
index 0d4f8f6..ab26175 100644
--- a/app/src/main/java/org/openlp/android2/common/StateHolder.java
+++ b/app/src/main/java/org/openlp/android2/common/StateHolder.java
@@ -1,10 +1,13 @@
package org.openlp.android2.common;
+import android.content.Context;
+
/**
* Created by tim on 14/08/16.
*/
public class StateHolder {
private static StateHolder ourInstance = new StateHolder();
+ private static Context context;
public static StateHolder getInstance() {
return ourInstance;
@@ -12,4 +15,8 @@ public class StateHolder {
private StateHolder() {
}
+
+ public void setContext(Context context) {
+ this.context = context;
+ }
}
diff --git a/app/src/main/java/org/openlp/android2/fragments/SearchFragment.java b/app/src/main/java/org/openlp/android2/fragments/SearchFragment.java
index d712c8c..4537172 100644
--- a/app/src/main/java/org/openlp/android2/fragments/SearchFragment.java
+++ b/app/src/main/java/org/openlp/android2/fragments/SearchFragment.java
@@ -232,7 +232,7 @@ public class SearchFragment extends Fragment {
public void populateListDisplay(String json, boolean notInError) {
Log.i(LOG_TAG, "populateListDisplay - entry");
- ListView list = (ListView) getActivity().findViewById(R.id.searchlistView);
+ ListView list = (ListView) getActivity().findViewById(R.id.searchListView);
final ArrayList listitems = new ArrayList();
if (notInError) {
try {
diff --git a/app/src/main/java/org/openlp/android2/fragments/WebFragment.java b/app/src/main/java/org/openlp/android2/fragments/WebFragment.java
index 8857c5c..0c9d67e 100644
--- a/app/src/main/java/org/openlp/android2/fragments/WebFragment.java
+++ b/app/src/main/java/org/openlp/android2/fragments/WebFragment.java
@@ -26,6 +26,7 @@ import android.view.ViewGroup;
import android.webkit.WebView;
import android.webkit.WebViewClient;
import org.openlp.android2.R;
+import org.openlp.android2.common.OpenLPURLBuilder;
public class WebFragment extends Fragment {
@@ -55,7 +56,7 @@ public class WebFragment extends Fragment {
webview.setScrollBarStyle(WebView.SCROLLBARS_OUTSIDE_OVERLAY);
webview.setScrollbarFadingEnabled(true);
webview.setWebViewClient(new webClient());
- //webview.loadUrl(String.format("%s%s", httpClient.getBaseUrl(), curURL));
+ webview.loadUrl(String.format("%s%s", OpenLPURLBuilder.getInstance().getBaseUrl(), curURL));
}
return view;
}
diff --git a/app/src/main/res/drawable/customborder.xml b/app/src/main/res/drawable/custom_border.xml
similarity index 87%
rename from app/src/main/res/drawable/customborder.xml
rename to app/src/main/res/drawable/custom_border.xml
index e657938..f613773 100644
--- a/app/src/main/res/drawable/customborder.xml
+++ b/app/src/main/res/drawable/custom_border.xml
@@ -6,6 +6,6 @@
android:right="10dp"
android:top="10dp"
android:bottom="10dp"/>
-
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/searchlist.xml b/app/src/main/res/drawable/search_list.xml
similarity index 100%
rename from app/src/main/res/drawable/searchlist.xml
rename to app/src/main/res/drawable/search_list.xml
diff --git a/app/src/main/res/layout-xlarge/fragment_livelist_list.xml b/app/src/main/res/layout-xlarge/fragment_livelist_list.xml
index 115d451..161dae6 100644
--- a/app/src/main/res/layout-xlarge/fragment_livelist_list.xml
+++ b/app/src/main/res/layout-xlarge/fragment_livelist_list.xml
@@ -9,7 +9,7 @@
android:smoothScrollbar="true"
android:clickable="false"
android:longClickable="false"
- android:background="@drawable/customborder">
+ android:background="@drawable/custom_border">
+ android:background="@drawable/custom_border">
+ android:background="@drawable/search_list"/>
diff --git a/app/src/main/res/layout/fragment_service_list.xml b/app/src/main/res/layout/fragment_service_list.xml
index ad4e6fb..9b36e0e 100644
--- a/app/src/main/res/layout/fragment_service_list.xml
+++ b/app/src/main/res/layout/fragment_service_list.xml
@@ -9,7 +9,7 @@
android:smoothScrollbar="true"
android:clickable="false"
android:longClickable="false"
- android:background="@drawable/customborder">
+ android:background="@drawable/custom_border">