diff --git a/app/src/main/java/org/openlp/android2/OpenLP.java b/app/src/main/java/org/openlp/android2/OpenLP.java index 51ac9da..34b7a3a 100644 --- a/app/src/main/java/org/openlp/android2/OpenLP.java +++ b/app/src/main/java/org/openlp/android2/OpenLP.java @@ -43,6 +43,7 @@ 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.SearchFragment; import org.openlp.android2.fragments.ServiceListFragment; import org.openlp.android2.fragments.StageWebFragment; @@ -165,6 +166,24 @@ public class OpenLP extends ActionBarActivity toggerContainer(R.id.next_button, View.GONE); toggerContainer(R.id.prev_button, View.GONE); break; + case NavigationOptions.Search: + singleTab(); + fragmentManager.beginTransaction() + .replace(R.id.container, SearchFragment.newInstance()) + .commit(); + mTitle = getString(R.string.action_search); + toggerContainer(R.id.next_button, View.GONE); + toggerContainer(R.id.prev_button, View.GONE); + break; + default: + singleTab(); + fragmentManager.beginTransaction() + .replace(R.id.container, HomeFragment.newInstance()) + .commit(); + mTitle = getString(R.string.home); + toggerContainer(R.id.next_button, View.GONE); + toggerContainer(R.id.prev_button, View.GONE); + break; } } diff --git a/app/src/main/java/org/openlp/android2/common/NavigationOptions.java b/app/src/main/java/org/openlp/android2/common/NavigationOptions.java index 80f8dbf..cd8b159 100644 --- a/app/src/main/java/org/openlp/android2/common/NavigationOptions.java +++ b/app/src/main/java/org/openlp/android2/common/NavigationOptions.java @@ -24,4 +24,5 @@ public class NavigationOptions{ public final static int LiveList = 2; public final static int StageView = 3; public final static int LiveView = 4; + public final static int Search = 5; } 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 98b6aaf..2052e30 100644 --- a/app/src/main/java/org/openlp/android2/fragments/NavigationDrawerFragment.java +++ b/app/src/main/java/org/openlp/android2/fragments/NavigationDrawerFragment.java @@ -152,6 +152,11 @@ public class NavigationDrawerFragment extends Fragment { hm4.put("icon", Integer.toString(R.drawable.ic_ondemand_video_black)); aList.add(hm4); + HashMap hm5 = new HashMap(); + hm5.put("title", getString(R.string.action_search)); + hm5.put("icon", Integer.toString(R.drawable.ic_search_black)); + aList.add(hm5); + // Keys used in Hashmap String[] from = {"icon", "title"}; diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index df5a823..0d6bc72 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -29,14 +29,14 @@ Select the required display Display Desktop background Allow the selected item to scroll to the centre of the list - Show Live display + Live display Display Setting Display Black only Display Theme only Enable Custom Timeouts Enter Alert Text Allow displays to auto center - Home + Home Unauthorised Access, please enter valid username and password Live List Live View @@ -48,6 +48,10 @@ Previous Process Service List + Search Results + Send Live + Add to Service + Showing Results for \'%s\' Stage View Select display text size Change the Service text size