diff --git a/app/src/main/java/org/openlp/android2/OpenLP.java b/app/src/main/java/org/openlp/android2/OpenLP.java index 71b05a3..023db12 100644 --- a/app/src/main/java/org/openlp/android2/OpenLP.java +++ b/app/src/main/java/org/openlp/android2/OpenLP.java @@ -130,7 +130,6 @@ public class OpenLP extends Activity // as you specify a parent activity in AndroidManifest.xml. Intent intent; switch (item.getItemId()) { - case R.id.action_preferences: intent = new Intent(this, SettingsActivity.class); startActivity(intent); @@ -140,9 +139,13 @@ public class OpenLP extends Activity startActivity(intent); return true; case R.id.action_refresh: - if (mTitle.equals(R.string.service_list)){ + if (this.mTitle.equals(getString(R.string.service_list))) { ServiceListFragment fragment = (ServiceListFragment) - getFragmentManager().findFragmentByTag("ServiceListFragment"); + getFragmentManager().findFragmentById(R.id.container); + fragment.refreshDisplay(); + } else if (this.mTitle.equals(getString(R.string.live_list)) ) { + LiveListFragment fragment = (LiveListFragment) + getFragmentManager().findFragmentById(R.id.container); fragment.refreshDisplay(); } return true; 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 ad52826..e64e690 100644 --- a/app/src/main/java/org/openlp/android2/fragments/LiveListFragment.java +++ b/app/src/main/java/org/openlp/android2/fragments/LiveListFragment.java @@ -90,10 +90,10 @@ public class LiveListFragment extends OpenLPFragment { HashMap hm = new HashMap(); hm.put("tag", item.getString("tag")); if (item.getString("selected").equals("true")) { - hm.put("liveListNormal", Html.fromHtml(item.getString("html")).toString()); + hm.put("liveListSelected", Html.fromHtml(item.getString("html")).toString()); selected = i; } else { - hm.put("liveListSelected", Html.fromHtml(item.getString("html")).toString()); + hm.put("liveListNormal", Html.fromHtml(item.getString("html")).toString()); } aList.add(hm); } diff --git a/app/src/main/res/drawable-xxhdpi/ic_dvr.png b/app/src/main/res/drawable-xxhdpi/ic_dvr.png index b0ee734..b2d0a0f 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_dvr.png and b/app/src/main/res/drawable-xxhdpi/ic_dvr.png differ diff --git a/app/src/main/res/layout/fragment_livelist_list.xml b/app/src/main/res/layout/fragment_livelist_list.xml index 4b075e3..3ca504a 100644 --- a/app/src/main/res/layout/fragment_livelist_list.xml +++ b/app/src/main/res/layout/fragment_livelist_list.xml @@ -2,7 +2,7 @@ + android:textStyle="normal"/> + android:textStyle="bold|italic"/> diff --git a/app/src/main/res/layout/fragment_navigation_drawer.xml b/app/src/main/res/layout/fragment_navigation_drawer.xml index 25e67cf..c1b86f3 100644 --- a/app/src/main/res/layout/fragment_navigation_drawer.xml +++ b/app/src/main/res/layout/fragment_navigation_drawer.xml @@ -5,9 +5,9 @@ android:choiceMode="singleChoice" android:divider="@android:color/darker_gray" android:dividerHeight="2dp" - android:background="#c8ffffff" android:textStyle="bold" - android:textAppearance="?android:attr/textAppearanceSmall" + android:textColor="#000000" + android:textAppearance="?android:attr/textAppearanceSmallInverse" tools:context=".NavigationDrawerFragment" android:drawSelectorOnTop="false" android:paddingLeft="20dp" diff --git a/app/src/main/res/layout/fragment_service_list.xml b/app/src/main/res/layout/fragment_service_list.xml index f098ba6..3a4eaf4 100644 --- a/app/src/main/res/layout/fragment_service_list.xml +++ b/app/src/main/res/layout/fragment_service_list.xml @@ -2,6 +2,7 @@