From 7f66ca1245a6e2ec424b7255b4975da9d83be7c7 Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Thu, 10 Sep 2015 17:56:37 -0700
Subject: Fix some theme issues with uncolored status bars

---
 .../github/daneren2005/dsub/activity/SubsonicActivity.java |  3 +++
 .../github/daneren2005/dsub/adapter/SectionAdapter.java    | 14 +++++---------
 .../daneren2005/dsub/fragments/SubsonicFragment.java       |  6 ++++++
 3 files changed, 14 insertions(+), 9 deletions(-)

(limited to 'app/src/main/java')

diff --git a/app/src/main/java/github/daneren2005/dsub/activity/SubsonicActivity.java b/app/src/main/java/github/daneren2005/dsub/activity/SubsonicActivity.java
index ab68a59a..f1dd21e9 100644
--- a/app/src/main/java/github/daneren2005/dsub/activity/SubsonicActivity.java
+++ b/app/src/main/java/github/daneren2005/dsub/activity/SubsonicActivity.java
@@ -191,6 +191,9 @@ public class SubsonicActivity extends AppCompatActivity implements OnItemSelecte
 	protected void createCustomActionBarView() {
 		View customActionbar = getLayoutInflater().inflate(R.layout.actionbar_spinner, null);
 		actionBarSpinner = (Spinner)customActionbar.findViewById(R.id.spinner);
+		if(Util.getThemeRes(this) == R.style.Theme_DSub_Light_No_Actionbar) {
+			actionBarSpinner.setBackgroundResource(R.drawable.abc_spinner_mtrl_am_alpha);
+		}
 		spinnerAdapter = new ArrayAdapter(this, android.R.layout.simple_spinner_item);
 		spinnerAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
 		actionBarSpinner.setOnItemSelectedListener(this);
diff --git a/app/src/main/java/github/daneren2005/dsub/adapter/SectionAdapter.java b/app/src/main/java/github/daneren2005/dsub/adapter/SectionAdapter.java
index d8107158..38bd483d 100644
--- a/app/src/main/java/github/daneren2005/dsub/adapter/SectionAdapter.java
+++ b/app/src/main/java/github/daneren2005/dsub/adapter/SectionAdapter.java
@@ -19,12 +19,11 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.os.Build;
+import android.support.v7.view.ActionMode;
 import android.support.v7.widget.PopupMenu;
 import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.util.TypedValue;
-import android.view.ActionMode;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -33,7 +32,6 @@ import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
 
-import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -398,9 +396,7 @@ public abstract class SectionAdapter<T> extends RecyclerView.Adapter<UpdateViewH
 		final UpdateView<T> updateView = holder.getUpdateView();
 		if (context instanceof SubsonicFragmentActivity && currentActionMode == null) {
 			final SubsonicFragmentActivity fragmentActivity = (SubsonicFragmentActivity) context;
-			Toolbar toolbar = fragmentActivity.getActiveToolbar();
-
-			toolbar.startActionMode(new ActionMode.Callback() {
+			fragmentActivity.startSupportActionMode(new ActionMode.Callback() {
 				@Override
 				public boolean onCreateActionMode(ActionMode mode, Menu menu) {
 					currentActionMode = mode;
@@ -413,7 +409,7 @@ public abstract class SectionAdapter<T> extends RecyclerView.Adapter<UpdateViewH
 					setChecked(updateView, true);
 
 					mode.setTitle(context.getResources().getString(R.string.select_album_n_selected, selected.size()));
-					if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && Util.getPreferences(context).getBoolean(Constants.PREFERENCES_KEY_COLOR_ACTION_BAR, true)) {
+					if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && Util.getPreferences(context).getBoolean(Constants.PREFERENCES_KEY_COLOR_ACTION_BAR, true)) {
 						TypedValue typedValue = new TypedValue();
 						Resources.Theme theme = context.getTheme();
 						theme.resolveAttribute(R.attr.colorPrimaryDark, typedValue, true);
@@ -446,12 +442,12 @@ public abstract class SectionAdapter<T> extends RecyclerView.Adapter<UpdateViewH
 				public void onDestroyActionMode(ActionMode mode) {
 					currentActionMode = null;
 					selected.clear();
-					for(UpdateView<T> updateView: selectedViews) {
+					for (UpdateView<T> updateView : selectedViews) {
 						updateView.setChecked(false);
 					}
 					selectedViews.clear();
 
-					if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+					if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && Util.getPreferences(context).getBoolean(Constants.PREFERENCES_KEY_COLOR_ACTION_BAR, true)) {
 						Window window = ((SubsonicFragmentActivity) context).getWindow();
 						window.addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
 					}
diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/SubsonicFragment.java b/app/src/main/java/github/daneren2005/dsub/fragments/SubsonicFragment.java
index e7d44e6d..6215bb4d 100644
--- a/app/src/main/java/github/daneren2005/dsub/fragments/SubsonicFragment.java
+++ b/app/src/main/java/github/daneren2005/dsub/fragments/SubsonicFragment.java
@@ -1222,6 +1222,12 @@ public class SubsonicFragment extends Fragment implements SwipeRefreshLayout.OnR
 
 		List<Integer> headers = new ArrayList<>();
 		List<String> details = new ArrayList<>();
+
+		if(!song.isDirectory()) {
+			headers.add(R.string.details_title);
+			details.add(song.getTitle());
+		}
+
 		if(song instanceof PodcastEpisode) {
 			headers.add(R.string.details_podcast);
 			details.add(song.getArtist());
-- 
cgit v1.2.3