Merge branch 'master' into ServerRemoved

4 files changed, 26 insertions, 6 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4df24257..9ea192b1 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"

           package="github.daneren2005.dsub"

           android:installLocation="internalOnly"

-          android:versionCode="126"

-          android:versionName="4.7.8">

+          android:versionCode="127"

+          android:versionName="4.8">

 

     <uses-permission android:name="android.permission.INTERNET"/>

     <uses-permission android:name="android.permission.READ_PHONE_STATE"/>

diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index e3197bee..6982d67a 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -103,6 +103,7 @@
 	<string name="menu.add_user">Felhasználó hozzáadása</string>

 	<string name="menu.rescan">Médiatár frissítése a kiszolgálón</string>

 	<string name="menu.rate">Értékelés</string>

+	<string name="menu.top_tracks">Last.fm legjobb dalok</string>

 

     <string name="playlist.label">Lejátszási listák</string>

 	<string name="playlist.update_info">Szerkesztés</string>

diff --git a/res/xml/changelog.xml b/res/xml/changelog.xml
index 2893d10c..19832409 100644
--- a/res/xml/changelog.xml
+++ b/res/xml/changelog.xml
@@ -1,5 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
+	<release version="4.8" versioncode="127" releasedate="10/8/2014">
+		<change>ReplayGain: read tags to normalize sound</change>
+		<change>ReplayGain: choose smart tag reading or specify track/album tags</change>
+		<change>Scrobbling: implemented according to Last.FM standard</change>
+		<change>Scrobbling: scrobble if more then 4 minutes or 50% in</change>
+		<change>Scrobbling: do not scrobble if less then 30 seconds</change>
+		<change>Madsonic: view artists Top Tracks from Last.FM (Madsonic 5.1+)</change>
+		<change>Settings: changed a few to be seek bars</change>
+		<change>Tasker: fix issue with not always starting</change>
+		<change>Artist view: add recursive cache/delete menu options</change>
+		<change>SSID Settings: added copy current button</change>
+		<change>Conditionally remove Cache/Delete Cache from context menus</change>
+		<change>Added transition animations</change>
+		<change>Fix crash when casting on GB</change>
+		<change>Fix widget showing blank on restart</change>
+		<change>Fix Show all media</change>
+		<change>Various bug fixes</change>
+	</release>
 	<release version="4.7.8" versioncode="126" releasedate="9/17/2014">
 		<change>Rating: show rating directly on albums</change>
 		<change>Albums: rate/star from album's screen</change>
diff --git a/src/github/daneren2005/dsub/activity/SubsonicActivity.java b/src/github/daneren2005/dsub/activity/SubsonicActivity.java
index 6d1a9330..c3f8e4a7 100644
--- a/src/github/daneren2005/dsub/activity/SubsonicActivity.java
+++ b/src/github/daneren2005/dsub/activity/SubsonicActivity.java
@@ -584,6 +584,7 @@ public class SubsonicActivity extends ActionBarActivity implements OnItemSelecte
 			}

 			

 			// Add fragment to the right container

+			trans.setCustomAnimations(R.anim.enter_from_right, R.anim.exit_to_left, R.anim.enter_from_left, R.anim.exit_to_right);

 			trans.add(R.id.fragment_second_container, fragment, tag + "");

 			

 			// Commit it all

@@ -611,12 +612,12 @@ public class SubsonicActivity extends ActionBarActivity implements OnItemSelecte
 			FragmentTransaction trans = getSupportFragmentManager().beginTransaction();

 			

 			// Remove old right fragment

-			// trans.setCustomAnimations(R.anim.enter_from_left, R.anim.exit_to_right, R.anim.enter_from_right, R.anim.exit_to_left);

+			trans.setCustomAnimations(R.anim.enter_from_left, R.anim.exit_to_right, R.anim.enter_from_right, R.anim.exit_to_left);

 			trans.remove(oldFrag);

 

 			// Only switch places if there is a backstack, otherwise primary container is correct

 			if(backStack.size() > 0) {

-				// trans.setCustomAnimations(0, 0, 0, 0);

+				trans.setCustomAnimations(0, 0, 0, 0);

 				// Add current left fragment to right side

 				trans.remove(currentFragment);

 

@@ -632,7 +633,7 @@ public class SubsonicActivity extends ActionBarActivity implements OnItemSelecte
 				newLeftFragment.setSecondaryFragment(true);

 				trans.show(newLeftFragment);

 			} else {

-				// secondaryContainer.startAnimation(AnimationUtils.loadAnimation(this, R.anim.exit_to_right));

+				secondaryContainer.startAnimation(AnimationUtils.loadAnimation(this, R.anim.exit_to_right));

 				secondaryContainer.setVisibility(View.GONE);

 			}

 			

@@ -655,7 +656,7 @@ public class SubsonicActivity extends ActionBarActivity implements OnItemSelecte
 	}

 	

 	protected void recreateSpinner() {

-		if(currentFragment.getTitle() == null) {

+		if(currentFragment == null || currentFragment.getTitle() == null) {

 			return;

 		}