diff --git a/app/src/main/java/org/openlp/android2/activities/SettingsActivity.java b/app/src/main/java/org/openlp/android2/activities/SettingsActivity.java index 6547948..9123250 100644 --- a/app/src/main/java/org/openlp/android2/activities/SettingsActivity.java +++ b/app/src/main/java/org/openlp/android2/activities/SettingsActivity.java @@ -42,7 +42,7 @@ public class SettingsActivity extends PreferenceActivity { @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - + getPreferenceManager().setSharedPreferencesName(getString(R.string.keySharedPreferences)); // Load the preferences from an XML resource addPreferencesFromResource(R.xml.pref_general); } 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 bd17b20..2313b0d 100644 --- a/app/src/main/java/org/openlp/android2/fragments/NavigationDrawerFragment.java +++ b/app/src/main/java/org/openlp/android2/fragments/NavigationDrawerFragment.java @@ -4,6 +4,7 @@ package org.openlp.android2.fragments; import android.app.Activity; import android.app.ActionBar; import android.app.Fragment; +import android.content.res.Resources; import android.support.v4.app.ActionBarDrawerToggle; import android.support.v4.view.GravityCompat; import android.support.v4.widget.DrawerLayout; @@ -11,16 +12,14 @@ import android.content.SharedPreferences; import android.content.res.Configuration; import android.os.Bundle; import android.preference.PreferenceManager; +import android.util.TypedValue; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; -import android.widget.AdapterView; -import android.widget.ArrayAdapter; -import android.widget.ListView; -import android.widget.Toast; +import android.widget.*; import org.openlp.android2.R; /** @@ -100,7 +99,7 @@ public class NavigationDrawerFragment extends Fragment { }); mDrawerListView.setAdapter(new ArrayAdapter( getActionBar().getThemedContext(), - android.R.layout.simple_list_item_activated_1, + R.layout.fragment_navigation_drawer_list, android.R.id.text1, new String[]{ getString(R.string.service_list), 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 a7d02a3..6ac890f 100644 --- a/app/src/main/java/org/openlp/android2/fragments/ServiceListFragment.java +++ b/app/src/main/java/org/openlp/android2/fragments/ServiceListFragment.java @@ -193,8 +193,6 @@ public class ServiceListFragment extends OpenLPFragment { return view; } - - ; }; setListAdapter(adapter); Log.i(LOG_TAG, "populate_display - exit"); diff --git a/app/src/main/res/layout/fragment_navigation_drawer.xml b/app/src/main/res/layout/fragment_navigation_drawer.xml index 5250946..25e67cf 100644 --- a/app/src/main/res/layout/fragment_navigation_drawer.xml +++ b/app/src/main/res/layout/fragment_navigation_drawer.xml @@ -3,7 +3,12 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:choiceMode="singleChoice" - android:divider="@android:color/transparent" - android:dividerHeight="0dp" - android:background="#cccc" - tools:context=".NavigationDrawerFragment" /> + android:divider="@android:color/darker_gray" + android:dividerHeight="2dp" + android:background="#c8ffffff" + android:textStyle="bold" + android:textAppearance="?android:attr/textAppearanceSmall" + tools:context=".NavigationDrawerFragment" + android:drawSelectorOnTop="false" + android:paddingLeft="20dp" + android:paddingStart="20dp"/> diff --git a/app/src/main/res/layout/fragment_navigation_drawer_list.xml b/app/src/main/res/layout/fragment_navigation_drawer_list.xml new file mode 100644 index 0000000..cb646bb --- /dev/null +++ b/app/src/main/res/layout/fragment_navigation_drawer_list.xml @@ -0,0 +1,20 @@ + + + \ No newline at end of file