diff --git a/AndroidManifest-gradle.xml b/AndroidManifest-gradle.xml index 268d7b6fb9e50bf26e46ee1be6dead4670a10208..6cdcc8ae1933bfe43b51b6e139c6f345f661751a 100644 --- a/AndroidManifest-gradle.xml +++ b/AndroidManifest-gradle.xml @@ -96,10 +96,11 @@ + android:label="@string/menu_settings" + android:theme="@style/Eleven.Theme"/> - + diff --git a/res/drawable/recent_icon.xml b/res/drawable/recent_icon.xml index 3ce486befd440493830e1df8a6a5d2a75deaf622..7605ba75c4b24af93dc519e651e7eb5932320dc6 100644 --- a/res/drawable/recent_icon.xml +++ b/res/drawable/recent_icon.xml @@ -6,7 +6,7 @@ android:viewportHeight="24"> diff --git a/res/drawable/top_tracks_icon.xml b/res/drawable/top_tracks_icon.xml index b8436005d9f85f420227eb8934c8b5a768a75c1e..327d4ac22b2d02de088804e1a2d7269ceb097cfd 100644 --- a/res/drawable/top_tracks_icon.xml +++ b/res/drawable/top_tracks_icon.xml @@ -8,7 +8,7 @@ diff --git a/res/layout/activity_base.xml b/res/layout/activity_base.xml index 0ef057596d3ade91a022ac303d9140138f3a3353..6b2ac8e948284ccaae099cad5d6bb5d72fced362 100644 --- a/res/layout/activity_base.xml +++ b/res/layout/activity_base.xml @@ -60,7 +60,7 @@ app:directOffset="true" app:dragView="@+id/secondPanelDragArea" app:fadeColor="@color/transparent" - app:panelHeight="@dimen/sliding_panel_indicator_height" + app:panelHeight="@dimen/sliding_panel_indicator_height_upper" app:shadowHeight="@dimen/sliding_panel_shadow_height"> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index c6bda7c401afcfd004d8118b2b1f89cf492cbe66..4a8a22f45b3e0679ea08fce8a6f3b6c5289d532c 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -168,7 +168,8 @@ 8.0dip - 60.0dip + 25.0dip + 20.0dip 0.0dip diff --git a/src/org/lineageos/eleven/ui/activities/HomeActivity.java b/src/org/lineageos/eleven/ui/activities/HomeActivity.java index 39d02fa925d01c4a511669f9c9eb62009e2a2ea4..e6461e85275d90bf999ef65c062c5587cc660abb 100644 --- a/src/org/lineageos/eleven/ui/activities/HomeActivity.java +++ b/src/org/lineageos/eleven/ui/activities/HomeActivity.java @@ -24,7 +24,6 @@ import android.content.pm.PackageManager; import android.graphics.Bitmap; import android.graphics.Color; import android.net.Uri; -import android.os.AsyncTask; import android.os.Bundle; import android.os.Handler; import android.provider.MediaStore; @@ -55,7 +54,6 @@ import org.lineageos.eleven.ui.fragments.profile.TopTracksFragment; import org.lineageos.eleven.utils.ElevenUtils; import org.lineageos.eleven.utils.MusicUtils; import org.lineageos.eleven.utils.NavUtils; -import org.lineageos.eleven.utils.colors.BitmapWithColors; import java.util.ArrayList; @@ -213,24 +211,25 @@ public class HomeActivity extends SlidingPanelActivity implements private void updateStatusBarColor() { if (mBrowsePanelActive || MusicUtils.getCurrentAlbumId() < 0) { updateStatusBarColor(Color.TRANSPARENT); - } else { - new AsyncTask() { - @Override - protected BitmapWithColors doInBackground(Void... params) { - ImageFetcher imageFetcher = ImageFetcher.getInstance(HomeActivity.this); - return imageFetcher.getArtwork( - MusicUtils.getAlbumName(), MusicUtils.getCurrentAlbumId(), - MusicUtils.getArtistName(), true); - } - @Override - protected void onPostExecute(BitmapWithColors bmc) { - updateVisualizerColor(bmc != null - ? bmc.getContrastingColor() : Color.TRANSPARENT); - updateStatusBarColor(bmc != null - ? bmc.getVibrantDarkColor() : Color.TRANSPARENT); - } - }.execute(); } +// else { +// new AsyncTask() { +// @Override +// protected BitmapWithColors doInBackground(Void... params) { +// ImageFetcher imageFetcher = ImageFetcher.getInstance(HomeActivity.this); +// return imageFetcher.getArtwork( +// MusicUtils.getAlbumName(), MusicUtils.getCurrentAlbumId(), +// MusicUtils.getArtistName(), true); +// } +// @Override +// protected void onPostExecute(BitmapWithColors bmc) { +// updateVisualizerColor(bmc != null +// ? bmc.getContrastingColor() : Color.TRANSPARENT); +// updateStatusBarColor(bmc != null +// ? bmc.getVibrantDarkColor() : Color.TRANSPARENT); +// } +// }.execute(); +// } } private void updateVisualizerColor(int color) { diff --git a/src/org/lineageos/eleven/ui/activities/SettingsActivity.java b/src/org/lineageos/eleven/ui/activities/SettingsActivity.java index 6852725f37020043c8e9623b7009f99bcf112fb5..731db61f1adff07d32e86b27f4d503920cdc6302 100644 --- a/src/org/lineageos/eleven/ui/activities/SettingsActivity.java +++ b/src/org/lineageos/eleven/ui/activities/SettingsActivity.java @@ -23,8 +23,6 @@ import android.app.AlertDialog; import android.content.ComponentName; import android.content.ServiceConnection; import android.content.SharedPreferences; -import android.graphics.drawable.ColorDrawable; -import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.IBinder; import android.os.RemoteException; @@ -32,7 +30,6 @@ import android.view.MenuItem; import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; -import androidx.core.content.ContextCompat; import androidx.preference.Preference; import androidx.preference.PreferenceFragmentCompat; @@ -50,6 +47,7 @@ public class SettingsActivity extends AppCompatActivity { setContentView(R.layout.activity_settings); final Toolbar toolbar = findViewById(R.id.toolbar); + toolbar.setTitleTextColor(getResources().getColor(R.color.main_action_bar_text_color)); setSupportActionBar(toolbar); getSupportActionBar().setDisplayHomeAsUpEnabled(true); } diff --git a/src/org/lineageos/eleven/ui/fragments/ArtistDetailFragment.java b/src/org/lineageos/eleven/ui/fragments/ArtistDetailFragment.java index e5a0deefdda09ab4482d12c7b87bcdfbb069c30e..798f58290cd239c901ccbd9b1b24a1364ffa6d36 100644 --- a/src/org/lineageos/eleven/ui/fragments/ArtistDetailFragment.java +++ b/src/org/lineageos/eleven/ui/fragments/ArtistDetailFragment.java @@ -23,6 +23,7 @@ import android.view.ViewTreeObserver; import android.widget.ImageView; import android.widget.ListView; +import androidx.core.content.ContextCompat; import androidx.loader.app.LoaderManager; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -98,9 +99,9 @@ public class ArtistDetailFragment extends FadingBarFragment implements IChildFra LoaderManager lm = getLoaderManager(); lm.initLoader(ALBUM_LOADER_ID, arguments, mAlbumAdapter); lm.initLoader(SONG_LOADER_ID, arguments, mSongAdapter); - if (getContainingActivity().getActionBar() != null) - getContainingActivity().getActionBar().setBackgroundDrawable(new ColorDrawable(getResources().getColor(R.color.primary_dark))); - + if (getContainingActivity().getSupportActionBar() != null) + getContainingActivity().getSupportActionBar().setBackgroundDrawable( + new ColorDrawable(ContextCompat.getColor(getContainingActivity(),R.color.primary_dark))); } @Override // DetailFragment diff --git a/src/org/lineageos/eleven/ui/fragments/QueueFragment.java b/src/org/lineageos/eleven/ui/fragments/QueueFragment.java index cc91b23d7917bbc59804cc71e59691e2fd3d2a06..3447d647ca6dfaf47488b529da99054b4616339f 100644 --- a/src/org/lineageos/eleven/ui/fragments/QueueFragment.java +++ b/src/org/lineageos/eleven/ui/fragments/QueueFragment.java @@ -32,7 +32,9 @@ import android.view.View; import android.view.ViewGroup; import android.widget.AdapterView; import android.widget.AdapterView.OnItemClickListener; +import android.widget.FrameLayout; +import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import androidx.loader.app.LoaderManager; import androidx.loader.content.Loader; @@ -110,6 +112,7 @@ public class QueueFragment extends Fragment implements LoaderManager.LoaderCallb * This holds the loading progress bar as well as the no results message */ private LoadingEmptyContainer mLoadingEmptyContainer; + private FrameLayout layout; /** * Empty constructor as per the {@link Fragment} documentation @@ -240,6 +243,8 @@ public class QueueFragment extends Fragment implements LoaderManager.LoaderCallb // Setup the container strings setupNoResultsContainer(mLoadingEmptyContainer.getNoResultsContainer()); mListView.setEmptyView(mLoadingEmptyContainer); + layout = (FrameLayout)mRootView.findViewById(R.id.list_base_container); + layout.setBackgroundColor(ContextCompat.getColor(getActivity(),R.color.primary)); return mRootView; } diff --git a/src/org/lineageos/eleven/utils/MusicUtils.java b/src/org/lineageos/eleven/utils/MusicUtils.java index f4a5d03a77ae552ddcb392713cacbbab5788dec9..f4bd5ec0932e24ed06cf751a28152b027f7dcbc5 100644 --- a/src/org/lineageos/eleven/utils/MusicUtils.java +++ b/src/org/lineageos/eleven/utils/MusicUtils.java @@ -76,7 +76,6 @@ import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Set; -import java.util.WeakHashMap; /** * A collection of helpers directly related to music or Eleven's service. diff --git a/src/org/lineageos/eleven/utils/PopupMenuHelper.java b/src/org/lineageos/eleven/utils/PopupMenuHelper.java index 26396fbdd68c6ec8d0e98173317a1ee0b132192a..ca4ecfe43910a9465eed9cef0cbe7e7aba0d6279 100644 --- a/src/org/lineageos/eleven/utils/PopupMenuHelper.java +++ b/src/org/lineageos/eleven/utils/PopupMenuHelper.java @@ -18,8 +18,6 @@ package org.lineageos.eleven.utils; import android.annotation.SuppressLint; import android.app.Activity; import android.app.AlertDialog; -import android.content.DialogInterface; -import android.util.Log; import android.view.Gravity; import android.view.Menu; import android.view.MenuItem; diff --git a/src/org/lineageos/eleven/widgets/PlayPauseButton.java b/src/org/lineageos/eleven/widgets/PlayPauseButton.java index 2a1fc080acd72233d188464eaadb38b3a9668b8b..8edaf7f90f26fd93485ea24ac426663f759614f8 100644 --- a/src/org/lineageos/eleven/widgets/PlayPauseButton.java +++ b/src/org/lineageos/eleven/widgets/PlayPauseButton.java @@ -26,8 +26,6 @@ import android.view.View; import android.view.ViewAnimationUtils; import android.view.View.OnClickListener; import android.view.View.OnLongClickListener; -import android.view.ViewAnimationUtils; -import android.widget.ImageButton; import androidx.appcompat.widget.AppCompatImageButton;