#448 Add ability to open to any tab

11 files changed, 41 insertions, 22 deletions

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 3087e7d2..67b8ad59 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -301,8 +301,6 @@
 	<string name="settings.track_summary">Zeige Titelnummer vor dem Titel</string>

 	<string name="settings.custom_sort">Sortiere nach Jahr</string>

 	<string name="settings.custom_sort_summary">Sortiere Alben nach Jahr, oder alphabetisch.</string>

-	<string name="settings.open_to_library">Bibliothek öffnen</string>

-	<string name="settings.open_to_library_summary">Direkt die Bibliothek anstatt der Startseite öffnen.</string>

     <string name="settings.network_title">Netzwerk</string>

     <string name="settings.max_bitrate_wifi">Max Audio Bitrate - Wi-Fi</string>

     <string name="settings.max_bitrate_mobile">Max Audio Bitrate - Mobil</string>

diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 38b457c3..76629139 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -401,8 +401,6 @@
 	<string name="settings.server_local_network_ssid" >SSID Red local</string>
 	<string name="settings.server_local_network_ssid_hint">SSID Actual: %s</string>
 	<string name="settings.cache_location_reset">No se puede escribir en la ubicación seleccionada para la caché. Si has actualizado recientemente el sistema operativo de tu dispositivo a KitKat 4.4, la manera en la que las apps escriben en la Tarjeta SD ha cambiado, por lo que sólo pueden escribir en una ubicación específica. La ubicación que utiliza DSub ha sido automáticamente cambiada por la ubicación correcta. Para eliminar todos los datos de la app anterior, tendrás que introducir la Tarjeta SD en el ordenador y eliminar la carpeta manualmente.</string>
-	<string name="settings.open_to_library">Acceder directamente a la biblioteca</string>
-	<string name="settings.open_to_library_summary">Acceder directamente a la pantalla de la biblioteca en lugar de abrir primero la pantalla principal.</string>
 	<string name="settings.override_system_language">Sobreescribir idioma del sistema</string>
 	<string name="settings.override_system_language_summary">Mostrar la aplicación en inglés aún teniendo disponible DSub en el idioma del sistema. Probablemente necesite borrar la aplicación de la memoria para efectuar los cambios.</string>
 	<string name="settings.drawer_items_title">Pestañas</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 4adaf141..0bcb2407 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -296,8 +296,6 @@
 	<string name="settings.track_summary">Afficher le n° de piste devant les titres</string>

 	<string name="settings.custom_sort">Trier par années</string>

 	<string name="settings.custom_sort_summary">Trier les albums par année, ou par ordre alphabétique</string>

-	<string name="settings.open_to_library">Ouvrir dans la bibliothèque</string>

-	<string name="settings.open_to_library_summary">Ouvrir directement la bibliothèque plutôt que l\'écran d\'accueil.</string>

     <string name="settings.network_title">Réseau</string>

     <string name="settings.max_bitrate_wifi">Débit audio max (Wifi)</string>

     <string name="settings.max_bitrate_mobile">Débit audio max (Mobile)</string>

diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 4b82ac85..90eed1cb 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -300,8 +300,6 @@
 	<string name="settings.track_summary">Dalsorszám megjelenítése a dal címe előtt, ha létezik.</string>

 	<string name="settings.custom_sort">Egyéni rendezés</string>

 	<string name="settings.custom_sort_summary">A kiszolgáló alapértelmezett rendezésének felülbírálása, rendezés a lemez sorszáma és a kiadás éve alapján.</string>

-	<string name="settings.open_to_library">Médiatár megnyitása</string>

-	<string name="settings.open_to_library_summary">A Médiatár megnyitása a Főoldal helyett.</string>

     <string name="settings.network_title">Hálózat</string>

     <string name="settings.max_bitrate_wifi">Max. audió bitráta - Wi-Fi</string>

     <string name="settings.max_bitrate_mobile">Max. audió bitráta - Mobilhálózat</string>

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 19758562..37b15d12 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -26,6 +26,26 @@
 		<item>Settings</item>
 	</string-array>
 
+	<string-array name="defaultDrawerItems">
+		<item>@string/button_bar.home</item>
+		<item>@string/button_bar.browse</item>
+		<item>@string/button_bar.playlists</item>
+		<item>@string/button_bar.podcasts</item>
+		<item>@string/button_bar.bookmarks</item>
+		<item>@string/button_bar.shares</item>
+		<item>@string/button_bar.chat</item>
+	</string-array>
+
+	<string-array name="defaultDrawerItemsDescriptions">
+		<item>Home</item>
+		<item>Artist</item>
+		<item>Playlist</item>
+		<item>Podcast</item>
+		<item>Bookmark</item>
+		<item>Share</item>
+		<item>Chat</item>
+	</string-array>
+
 	<array name="drawerItemIconsLight">
 		<item>@drawable/main_offline_light</item>
 		<item>@drawable/ic_menu_library_light</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 67d26e96..43c4650b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -302,8 +302,8 @@
 	<string name="settings.track_summary">Display Track # in front of songs if one exists</string>

 	<string name="settings.custom_sort">Sort By Year</string>

 	<string name="settings.custom_sort_summary">Sort albums by year, or by alphabetical</string>

-	<string name="settings.open_to_library">Open To Library</string>

-	<string name="settings.open_to_library_summary">Open directly to the library screen instead of opening to home.</string>

+	<string name="settings.open_to_tab">Open To Tab</string>

+	<string name="settings.open_to_tab_summary">Open directly to this tab</string>

     <string name="settings.network_title">Network</string>

     <string name="settings.max_bitrate_wifi">Max Audio bitrate - Wi-Fi</string>

     <string name="settings.max_bitrate_mobile">Max Audio bitrate - Mobile</string>

diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index 0f044476..8b53a6fa 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -56,11 +56,13 @@
 				android:key="customSortEnabled"
 				android:defaultValue="true"/>
 
-			<CheckBoxPreference
-				android:title="@string/settings.open_to_library"
-				android:summary="@string/settings.open_to_library_summary"
-				android:key="openToLibrary"
-				android:defaultValue="false"/>
+			<ListPreference
+				android:title="@string/settings.open_to_tab"
+				android:summary="@string/settings.open_to_tab_summary"
+				android:key="openToTab"
+				android:entryValues="@array/defaultDrawerItemsDescriptions"
+				android:entries="@array/defaultDrawerItems"
+				android:defaultValue="Home"/>
 
 			<CheckBoxPreference
 				android:title="@string/settings.override_system_language"
diff --git a/src/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java b/src/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java
index 74ef4894..d9686c98 100644
--- a/src/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java
+++ b/src/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java
@@ -114,10 +114,12 @@ public class SubsonicFragmentActivity extends SubsonicActivity {
 		if (findViewById(R.id.fragment_container) != null && savedInstanceState == null) {

 			String fragmentType = getIntent().getStringExtra(Constants.INTENT_EXTRA_FRAGMENT_TYPE);

 			boolean firstRun = false;

-			if(fragmentType == null && Util.isOpenToLibrary(this)) {

-				fragmentType = "Artist";

-				getIntent().putExtra(Constants.INTENT_EXTRA_FRAGMENT_TYPE, fragmentType);

-				firstRun = true;

+			if(fragmentType == null) {

+				fragmentType = Util.openToTab(this);

+				if(fragmentType != null) {

+					getIntent().putExtra(Constants.INTENT_EXTRA_FRAGMENT_TYPE, fragmentType);

+					firstRun = true;

+				}

 			}

 			currentFragment = getNewFragment(fragmentType);

 			

diff --git a/src/github/daneren2005/dsub/fragments/SettingsFragment.java b/src/github/daneren2005/dsub/fragments/SettingsFragment.java
index 8dfca3b7..8402e29a 100644
--- a/src/github/daneren2005/dsub/fragments/SettingsFragment.java
+++ b/src/github/daneren2005/dsub/fragments/SettingsFragment.java
@@ -88,6 +88,7 @@ public class SettingsFragment extends PreferenceCompatFragment implements Shared
 	private String internalSSID;
 	private String internalSSIDDisplay;
 	private EditTextPreference cacheSize;
+	private ListPreference openToTab;
 
 	private int serverCount = 3;
 	private SharedPreferences settings;
@@ -182,6 +183,7 @@ public class SettingsFragment extends PreferenceCompatFragment implements Shared
 		replayGainBump = this.findPreference(Constants.PREFERENCES_KEY_REPLAY_GAIN_BUMP);
 		replayGainUntagged = this.findPreference(Constants.PREFERENCES_KEY_REPLAY_GAIN_UNTAGGED);
 		cacheSize = (EditTextPreference) this.findPreference(Constants.PREFERENCES_KEY_CACHE_SIZE);
+		openToTab = (ListPreference) this.findPreference(Constants.PREFERENCES_KEY_OPEN_TO_TAB);
 
 		settings = Util.getPreferences(context);
 		serverCount = settings.getInt(Constants.PREFERENCES_KEY_SERVER_COUNT, 1);
@@ -308,6 +310,7 @@ public class SettingsFragment extends PreferenceCompatFragment implements Shared
 		pauseDisconnect.setSummary(pauseDisconnect.getEntry());
 		videoPlayer.setSummary(videoPlayer.getEntry());
 		syncInterval.setSummary(syncInterval.getEntry());
+		openToTab.setSummary(openToTab.getEntry());
 		try {
 			if(megabyteFromat == null) {
 				megabyteFromat = new DecimalFormat(getResources().getString(R.string.util_bytes_format_megabyte));
diff --git a/src/github/daneren2005/dsub/util/Constants.java b/src/github/daneren2005/dsub/util/Constants.java
index 50070d6f..7298c7b4 100644
--- a/src/github/daneren2005/dsub/util/Constants.java
+++ b/src/github/daneren2005/dsub/util/Constants.java
@@ -136,7 +136,7 @@ public final class Constants {
 	public static final String PREFERENCES_KEY_MENU_SHARED = "showShared";
 	public static final String PREFERENCES_KEY_SHARED_ENABLED = "sharedEnabled";
 	public static final String PREFERENCES_KEY_BROWSE_TAGS = "browseTags";
-	public static final String PREFERENCES_KEY_OPEN_TO_LIBRARY = "openToLibrary";
+	public static final String PREFERENCES_KEY_OPEN_TO_TAB = "openToTab";
 	public static final String PREFERENCES_KEY_OVERRIDE_SYSTEM_LANGUAGE = "overrideSystemLanguage";
 	public static final String PREFERENCES_KEY_PLAY_NOW_AFTER = "playNowAfter";
 	public static final String PREFERENCES_KEY_LARGE_ALBUM_ART = "largeAlbumArt";
diff --git a/src/github/daneren2005/dsub/util/Util.java b/src/github/daneren2005/dsub/util/Util.java
index c90548b9..01588bf2 100644
--- a/src/github/daneren2005/dsub/util/Util.java
+++ b/src/github/daneren2005/dsub/util/Util.java
@@ -414,9 +414,9 @@ public final class Util {
 		}
 	}
 
-	public static boolean isOpenToLibrary(Context context) {
+	public static String openToTab(Context context) {
 		SharedPreferences prefs = getPreferences(context);
-		return prefs.getBoolean(Constants.PREFERENCES_KEY_OPEN_TO_LIBRARY, false);
+		return prefs.getString(Constants.PREFERENCES_KEY_OPEN_TO_TAB, null);
 	}
 
 	public static String getVideoPlayerType(Context context) {