From 4cc513b06b2632d9a2c7ed91e300d4d4813d50ec Mon Sep 17 00:00:00 2001 From: dkanada Date: Wed, 29 Apr 2020 16:19:11 +0900 Subject: [PATCH] rename some files and fix default theme --- .../adapter/CategoryInfoAdapter.java | 3 +-- .../gramophone/glide/CustomPaletteTarget.java | 4 ++-- .../glide/palette/BitmapPaletteTranscoder.java | 4 ++-- .../{util => helper}/SwipeAndDragHelper.java | 10 ++-------- .../notification/PlayingNotificationImpl.java | 4 ++-- .../ui/activities/AlbumDetailActivity.java | 4 ++-- .../ui/activities/ArtistDetailActivity.java | 4 ++-- .../ui/activities/GenreDetailActivity.java | 4 ++-- .../ui/activities/PlaylistDetailActivity.java | 4 ++-- .../mainactivity/library/LibraryFragment.java | 4 ++-- .../gramophone/util/PreferenceUtil.java | 3 ++- ...PhonographColorUtil.java => ThemeUtil.java} | 2 +- app/src/main/res/values/colors.xml | 1 - app/src/main/res/values/ids.xml | 2 ++ app/src/main/res/values/values.xml | 2 ++ app/src/main/res/xml/app_widget_card_info.xml | 18 +++++++++--------- 16 files changed, 35 insertions(+), 38 deletions(-) rename app/src/main/java/com/kabouzeid/gramophone/{util => helper}/SwipeAndDragHelper.java (79%) rename app/src/main/java/com/kabouzeid/gramophone/util/{PhonographColorUtil.java => ThemeUtil.java} (98%) diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/CategoryInfoAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/CategoryInfoAdapter.java index baeb9593..3554829b 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/adapter/CategoryInfoAdapter.java +++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/CategoryInfoAdapter.java @@ -14,9 +14,8 @@ import android.widget.Toast; import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.model.CategoryInfo; -import com.kabouzeid.gramophone.util.SwipeAndDragHelper; +import com.kabouzeid.gramophone.helper.SwipeAndDragHelper; -import java.util.ArrayList; import java.util.List; public class CategoryInfoAdapter extends RecyclerView.Adapter implements SwipeAndDragHelper.ActionCompletionContract { diff --git a/app/src/main/java/com/kabouzeid/gramophone/glide/CustomPaletteTarget.java b/app/src/main/java/com/kabouzeid/gramophone/glide/CustomPaletteTarget.java index d8127398..a5146428 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/glide/CustomPaletteTarget.java +++ b/app/src/main/java/com/kabouzeid/gramophone/glide/CustomPaletteTarget.java @@ -8,7 +8,7 @@ import com.kabouzeid.appthemehelper.util.ATHUtil; import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.glide.palette.BitmapPaletteTarget; import com.kabouzeid.gramophone.glide.palette.BitmapPaletteWrapper; -import com.kabouzeid.gramophone.util.PhonographColorUtil; +import com.kabouzeid.gramophone.util.ThemeUtil; public abstract class CustomPaletteTarget extends BitmapPaletteTarget { public CustomPaletteTarget(ImageView view) { @@ -24,7 +24,7 @@ public abstract class CustomPaletteTarget extends BitmapPaletteTarget { @Override public void onResourceReady(BitmapPaletteWrapper resource, GlideAnimation glideAnimation) { super.onResourceReady(resource, glideAnimation); - onColorReady(PhonographColorUtil.getColor(resource.getPalette(), getDefaultFooterColor())); + onColorReady(ThemeUtil.getColor(resource.getPalette(), getDefaultFooterColor())); } protected int getDefaultFooterColor() { diff --git a/app/src/main/java/com/kabouzeid/gramophone/glide/palette/BitmapPaletteTranscoder.java b/app/src/main/java/com/kabouzeid/gramophone/glide/palette/BitmapPaletteTranscoder.java index da05fec6..987aae46 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/glide/palette/BitmapPaletteTranscoder.java +++ b/app/src/main/java/com/kabouzeid/gramophone/glide/palette/BitmapPaletteTranscoder.java @@ -7,7 +7,7 @@ import com.bumptech.glide.Glide; import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool; import com.bumptech.glide.load.resource.transcode.ResourceTranscoder; -import com.kabouzeid.gramophone.util.PhonographColorUtil; +import com.kabouzeid.gramophone.util.ThemeUtil; public class BitmapPaletteTranscoder implements ResourceTranscoder { private final BitmapPool bitmapPool; @@ -23,7 +23,7 @@ public class BitmapPaletteTranscoder implements ResourceTranscoder transcode(Resource bitmapResource) { Bitmap bitmap = bitmapResource.get(); - BitmapPaletteWrapper bitmapPaletteWrapper = new BitmapPaletteWrapper(bitmap, PhonographColorUtil.generatePalette(bitmap)); + BitmapPaletteWrapper bitmapPaletteWrapper = new BitmapPaletteWrapper(bitmap, ThemeUtil.generatePalette(bitmap)); return new BitmapPaletteResource(bitmapPaletteWrapper, bitmapPool); } diff --git a/app/src/main/java/com/kabouzeid/gramophone/util/SwipeAndDragHelper.java b/app/src/main/java/com/kabouzeid/gramophone/helper/SwipeAndDragHelper.java similarity index 79% rename from app/src/main/java/com/kabouzeid/gramophone/util/SwipeAndDragHelper.java rename to app/src/main/java/com/kabouzeid/gramophone/helper/SwipeAndDragHelper.java index b4bcd727..e795bdf3 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/util/SwipeAndDragHelper.java +++ b/app/src/main/java/com/kabouzeid/gramophone/helper/SwipeAndDragHelper.java @@ -1,4 +1,4 @@ -package com.kabouzeid.gramophone.util; +package com.kabouzeid.gramophone.helper; import android.graphics.Canvas; import androidx.recyclerview.widget.RecyclerView; @@ -34,13 +34,7 @@ public class SwipeAndDragHelper extends ItemTouchHelper.Callback { } @Override - public void onChildDraw(Canvas c, - RecyclerView recyclerView, - RecyclerView.ViewHolder viewHolder, - float dX, - float dY, - int actionState, - boolean isCurrentlyActive) { + public void onChildDraw(Canvas c, RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, float dX, float dY, int actionState, boolean isCurrentlyActive) { if (actionState == ItemTouchHelper.ACTION_STATE_SWIPE) { float alpha = 1 - (Math.abs(dX) / recyclerView.getWidth()); viewHolder.itemView.setAlpha(alpha); diff --git a/app/src/main/java/com/kabouzeid/gramophone/service/notification/PlayingNotificationImpl.java b/app/src/main/java/com/kabouzeid/gramophone/service/notification/PlayingNotificationImpl.java index 92b95100..01ef2714 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/service/notification/PlayingNotificationImpl.java +++ b/app/src/main/java/com/kabouzeid/gramophone/service/notification/PlayingNotificationImpl.java @@ -27,7 +27,7 @@ import com.kabouzeid.gramophone.model.Song; import com.kabouzeid.gramophone.service.MusicService; import com.kabouzeid.gramophone.ui.activities.MainActivity; import com.kabouzeid.gramophone.util.ImageUtil; -import com.kabouzeid.gramophone.util.PhonographColorUtil; +import com.kabouzeid.gramophone.util.ThemeUtil; import com.kabouzeid.gramophone.util.PreferenceUtil; public class PlayingNotificationImpl extends PlayingNotification { @@ -93,7 +93,7 @@ public class PlayingNotificationImpl extends PlayingNotification { .into(new SimpleTarget(bigNotificationImageSize, bigNotificationImageSize) { @Override public void onResourceReady(BitmapPaletteWrapper resource, GlideAnimation glideAnimation) { - update(resource.getBitmap(), PhonographColorUtil.getColor(resource.getPalette(), Color.TRANSPARENT)); + update(resource.getBitmap(), ThemeUtil.getColor(resource.getPalette(), Color.TRANSPARENT)); } @Override diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java index 20d6fbcc..81d6fc9c 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java @@ -34,7 +34,7 @@ import com.kabouzeid.gramophone.model.Song; import com.kabouzeid.gramophone.ui.activities.base.AbsSlidingMusicPanelActivity; import com.kabouzeid.gramophone.util.MusicUtil; import com.kabouzeid.gramophone.util.NavigationUtil; -import com.kabouzeid.gramophone.util.PhonographColorUtil; +import com.kabouzeid.gramophone.util.ThemeUtil; import com.kabouzeid.gramophone.util.QueryUtil; import org.jellyfin.apiclient.model.querying.ItemQuery; @@ -265,7 +265,7 @@ public class AlbumDetailActivity extends AbsSlidingMusicPanelActivity implements cab = new MaterialCab(this, R.id.cab_stub) .setMenu(menuRes) .setCloseDrawableRes(R.drawable.ic_close_white_24dp) - .setBackgroundColor(PhonographColorUtil.shiftBackgroundColorForLightText(getPaletteColor())) + .setBackgroundColor(ThemeUtil.shiftBackgroundColorForLightText(getPaletteColor())) .start(new MaterialCab.Callback() { @Override public boolean onCabCreated(MaterialCab materialCab, Menu menu) { diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java index 58b100a7..f4a9a356 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java @@ -41,7 +41,7 @@ import com.kabouzeid.gramophone.model.Artist; import com.kabouzeid.gramophone.model.Song; import com.kabouzeid.gramophone.ui.activities.base.AbsSlidingMusicPanelActivity; import com.kabouzeid.gramophone.util.MusicUtil; -import com.kabouzeid.gramophone.util.PhonographColorUtil; +import com.kabouzeid.gramophone.util.ThemeUtil; import com.kabouzeid.gramophone.util.PreferenceUtil; import com.kabouzeid.gramophone.util.QueryUtil; @@ -290,7 +290,7 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement cab = new MaterialCab(this, R.id.cab_stub) .setMenu(menuRes) .setCloseDrawableRes(R.drawable.ic_close_white_24dp) - .setBackgroundColor(PhonographColorUtil.shiftBackgroundColorForLightText(getPaletteColor())) + .setBackgroundColor(ThemeUtil.shiftBackgroundColorForLightText(getPaletteColor())) .start(new MaterialCab.Callback() { @Override public boolean onCabCreated(MaterialCab materialCab, Menu menu) { diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/GenreDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/GenreDetailActivity.java index 44fdb82f..b2a62c5b 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/GenreDetailActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/GenreDetailActivity.java @@ -21,7 +21,7 @@ import com.kabouzeid.gramophone.interfaces.MediaCallback; import com.kabouzeid.gramophone.model.Genre; import com.kabouzeid.gramophone.model.Song; import com.kabouzeid.gramophone.ui.activities.base.AbsSlidingMusicPanelActivity; -import com.kabouzeid.gramophone.util.PhonographColorUtil; +import com.kabouzeid.gramophone.util.ThemeUtil; import com.kabouzeid.gramophone.util.QueryUtil; import com.kabouzeid.gramophone.util.ViewUtil; import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView; @@ -134,7 +134,7 @@ public class GenreDetailActivity extends AbsSlidingMusicPanelActivity implements cab = new MaterialCab(this, R.id.cab_stub) .setMenu(menu) .setCloseDrawableRes(R.drawable.ic_close_white_24dp) - .setBackgroundColor(PhonographColorUtil.shiftBackgroundColorForLightText(ThemeStore.primaryColor(this))) + .setBackgroundColor(ThemeUtil.shiftBackgroundColorForLightText(ThemeStore.primaryColor(this))) .start(callback); return cab; diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java index 6514ef50..16aa9147 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java @@ -35,7 +35,7 @@ import com.kabouzeid.gramophone.model.Playlist; import com.kabouzeid.gramophone.model.Song; import com.kabouzeid.gramophone.model.playlist.AbsSmartPlaylist; import com.kabouzeid.gramophone.ui.activities.base.AbsSlidingMusicPanelActivity; -import com.kabouzeid.gramophone.util.PhonographColorUtil; +import com.kabouzeid.gramophone.util.ThemeUtil; import com.kabouzeid.gramophone.util.PlaylistsUtil; import com.kabouzeid.gramophone.util.ViewUtil; import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView; @@ -165,7 +165,7 @@ public class PlaylistDetailActivity extends AbsSlidingMusicPanelActivity impleme cab = new MaterialCab(this, R.id.cab_stub) .setMenu(menu) .setCloseDrawableRes(R.drawable.ic_close_white_24dp) - .setBackgroundColor(PhonographColorUtil.shiftBackgroundColorForLightText(ThemeStore.primaryColor(this))) + .setBackgroundColor(ThemeUtil.shiftBackgroundColorForLightText(ThemeStore.primaryColor(this))) .start(callback); return cab; } diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/LibraryFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/LibraryFragment.java index 2b330647..e1ae80e5 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/LibraryFragment.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/LibraryFragment.java @@ -40,7 +40,7 @@ import com.kabouzeid.gramophone.ui.fragments.mainactivity.library.pager.AlbumsFr import com.kabouzeid.gramophone.ui.fragments.mainactivity.library.pager.ArtistsFragment; import com.kabouzeid.gramophone.ui.fragments.mainactivity.library.pager.PlaylistsFragment; import com.kabouzeid.gramophone.ui.fragments.mainactivity.library.pager.SongsFragment; -import com.kabouzeid.gramophone.util.PhonographColorUtil; +import com.kabouzeid.gramophone.util.ThemeUtil; import com.kabouzeid.gramophone.util.PreferenceUtil; import com.kabouzeid.gramophone.util.Util; @@ -163,7 +163,7 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde cab = new MaterialCab(getMainActivity(), R.id.cab_stub) .setMenu(menuRes) .setCloseDrawableRes(R.drawable.ic_close_white_24dp) - .setBackgroundColor(PhonographColorUtil.shiftBackgroundColorForLightText(ThemeStore.primaryColor(getActivity()))) + .setBackgroundColor(ThemeUtil.shiftBackgroundColorForLightText(ThemeStore.primaryColor(getActivity()))) .start(callback); return cab; } diff --git a/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtil.java b/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtil.java index 2d01a530..100986bd 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtil.java +++ b/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtil.java @@ -78,6 +78,7 @@ public final class PreferenceUtil { if (sInstance == null) { sInstance = new PreferenceUtil(context.getApplicationContext()); } + return sInstance; } @@ -91,7 +92,7 @@ public final class PreferenceUtil { @StyleRes public int getGeneralTheme() { - return getThemeResFromPrefValue(mPreferences.getString(GENERAL_THEME, "light")); + return getThemeResFromPrefValue(mPreferences.getString(GENERAL_THEME, "dark")); } @StyleRes diff --git a/app/src/main/java/com/kabouzeid/gramophone/util/PhonographColorUtil.java b/app/src/main/java/com/kabouzeid/gramophone/util/ThemeUtil.java similarity index 98% rename from app/src/main/java/com/kabouzeid/gramophone/util/PhonographColorUtil.java rename to app/src/main/java/com/kabouzeid/gramophone/util/ThemeUtil.java index 8c172238..5141c6f1 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/util/PhonographColorUtil.java +++ b/app/src/main/java/com/kabouzeid/gramophone/util/ThemeUtil.java @@ -10,7 +10,7 @@ import com.kabouzeid.appthemehelper.util.ColorUtil; import java.util.Collections; import java.util.Comparator; -public class PhonographColorUtil { +public class ThemeUtil { @Nullable public static Palette generatePalette(Bitmap bitmap) { diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index be8a7a97..630e0278 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,7 +1,6 @@ - #E0E0E0 #34000000 diff --git a/app/src/main/res/values/ids.xml b/app/src/main/res/values/ids.xml index 5c5bcbfc..ed1d4b0c 100644 --- a/app/src/main/res/values/ids.xml +++ b/app/src/main/res/values/ids.xml @@ -1,5 +1,6 @@ + @@ -15,4 +16,5 @@ + \ No newline at end of file diff --git a/app/src/main/res/values/values.xml b/app/src/main/res/values/values.xml index d9b10840..875a1931 100644 --- a/app/src/main/res/values/values.xml +++ b/app/src/main/res/values/values.xml @@ -1,7 +1,9 @@ + album_art_transition artist_image_transition fab_transition mini_player_transition + \ No newline at end of file diff --git a/app/src/main/res/xml/app_widget_card_info.xml b/app/src/main/res/xml/app_widget_card_info.xml index c8ac2711..212ef4eb 100644 --- a/app/src/main/res/xml/app_widget_card_info.xml +++ b/app/src/main/res/xml/app_widget_card_info.xml @@ -1,11 +1,11 @@ + xmlns:tools="http://schemas.android.com/tools" + android:initialLayout="@layout/app_widget_card" + android:minHeight="@dimen/app_widget_card_min_height" + android:minWidth="@dimen/app_widget_card_min_width" + android:resizeMode="horizontal|vertical" + android:updatePeriodMillis="0" + android:widgetCategory="keyguard|home_screen" + tools:ignore="UnusedAttribute" + android:previewImage="@drawable/app_widget_card"/>