tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove most ThemeStore uses for accent colors

Browse source
This commit is contained in:
dkanada 2021-06-12 13:48:48 +09:00
commit aa5f0c5619
20 changed files with 52 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/com/dkanada/gramophone/activities/AboutActivity.java
View file

@ -8,7 +8,7 @@ import android.view.View;
import androidx.annotation.NonNull;
import com.dkanada.gramophone.util.NavigationUtil;
import com.kabouzeid.appthemehelper.ThemeStore;
import com.dkanada.gramophone.util.PreferenceUtil;
import com.dkanada.gramophone.databinding.ActivityAboutBinding;
import com.dkanada.gramophone.databinding.CardAboutAppBinding;
import com.dkanada.gramophone.databinding.CardAuthorBinding;
@ -74,7 +74,7 @@ public class AboutActivity extends AbsBaseActivity implements View.OnClickListen
}
private void setUpToolbar() {
binding.toolbar.setBackgroundColor(ThemeStore.primaryColor(this));
binding.toolbar.setBackgroundColor(PreferenceUtil.getInstance(this).getPrimaryColor());
setSupportActionBar(binding.toolbar);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
}

3
app/src/main/java/com/dkanada/gramophone/activities/LoginActivity.java
View file

@ -13,7 +13,6 @@ import com.dkanada.gramophone.databinding.ActivityLoginBinding;
import com.dkanada.gramophone.activities.base.AbsBaseActivity;
import com.dkanada.gramophone.model.User;
import com.dkanada.gramophone.util.PreferenceUtil;
import com.kabouzeid.appthemehelper.ThemeStore;
import org.jellyfin.apiclient.interaction.Response;
import org.jellyfin.apiclient.model.system.SystemInfo;
@ -46,7 +45,7 @@ public class LoginActivity extends AbsBaseActivity implements View.OnClickListen
}
private void setUpViews() {
primaryColor = ThemeStore.primaryColor(this);
primaryColor = PreferenceUtil.getInstance(this).getPrimaryColor();
setUpToolbar();
setUpOnClickListeners();

3
app/src/main/java/com/dkanada/gramophone/activities/MainActivity.java
View file

@ -16,6 +16,7 @@ import androidx.drawerlayout.widget.DrawerLayout;
import com.dkanada.gramophone.activities.base.AbsMusicContentActivity;
import com.dkanada.gramophone.util.NavigationUtil;
import com.dkanada.gramophone.util.PreferenceUtil;
import com.kabouzeid.appthemehelper.ThemeStore;
import com.kabouzeid.appthemehelper.util.ATHUtil;
import com.kabouzeid.appthemehelper.util.NavigationViewUtil;
@ -131,7 +132,7 @@ public class MainActivity extends AbsMusicContentActivity {
}
private void setUpNavigationView() {
int accentColor = ThemeStore.accentColor(this);
int accentColor = PreferenceUtil.getInstance(this).getAccentColor();
NavigationViewUtil.setItemIconColors(binding.navigationView, ATHUtil.resolveColor(this, R.attr.iconColor, ThemeStore.textColorSecondary(this)), accentColor);
NavigationViewUtil.setItemTextColors(binding.navigationView, ThemeStore.textColorPrimary(this), accentColor);

4
app/src/main/java/com/dkanada/gramophone/activities/SearchActivity.java
View file

@ -20,9 +20,9 @@ import com.dkanada.gramophone.interfaces.MediaCallback;
import com.dkanada.gramophone.model.Album;
import com.dkanada.gramophone.model.Artist;
import com.dkanada.gramophone.model.Song;
import com.dkanada.gramophone.util.PreferenceUtil;
import com.dkanada.gramophone.util.QueryUtil;
import com.dkanada.gramophone.util.Util;
import com.kabouzeid.appthemehelper.ThemeStore;
import org.jellyfin.apiclient.model.querying.ItemQuery;
@ -99,7 +99,7 @@ public class SearchActivity extends AbsMusicContentActivity implements SearchVie
}
private void setUpToolBar() {
binding.toolbar.setBackgroundColor(ThemeStore.primaryColor(this));
binding.toolbar.setBackgroundColor(PreferenceUtil.getInstance(this).getPrimaryColor());
setSupportActionBar(binding.toolbar);
// noinspection ConstantConditions
getSupportActionBar().setDisplayHomeAsUpEnabled(true);

4
app/src/main/java/com/dkanada/gramophone/activities/SelectActivity.java
View file

@ -12,7 +12,7 @@ import com.dkanada.gramophone.activities.base.AbsBaseActivity;
import com.dkanada.gramophone.adapter.SelectAdapter;
import com.dkanada.gramophone.databinding.ActivitySelectBinding;
import com.dkanada.gramophone.model.User;
import com.kabouzeid.appthemehelper.ThemeStore;
import com.dkanada.gramophone.util.PreferenceUtil;
import java.util.List;
@ -41,7 +41,7 @@ public class SelectActivity extends AbsBaseActivity {
setNavigationBarColorAuto();
setTaskDescriptionColorAuto();
int primaryColor = ThemeStore.primaryColor(this);
int primaryColor = PreferenceUtil.getInstance(this).getPrimaryColor();
binding.add.setBackgroundColor(primaryColor);
binding.toolbar.setBackgroundColor(primaryColor);

3
app/src/main/java/com/dkanada/gramophone/activities/SettingsActivity.java
View file

@ -13,7 +13,6 @@ import androidx.preference.PreferenceManager;
import androidx.preference.TwoStatePreference;
import com.dkanada.gramophone.databinding.ActivitySettingsBinding;
import com.kabouzeid.appthemehelper.ThemeStore;
import com.dkanada.gramophone.R;
import com.dkanada.gramophone.views.shortcuts.DynamicShortcutManager;
import com.dkanada.gramophone.dialogs.preferences.CategoryPreferenceDialog;
@ -37,7 +36,7 @@ public class SettingsActivity extends AbsBaseActivity {
setNavigationBarColorAuto();
setTaskDescriptionColorAuto();
binding.toolbar.setBackgroundColor(ThemeStore.primaryColor(this));
binding.toolbar.setBackgroundColor(PreferenceUtil.getInstance(this).getPrimaryColor());
setSupportActionBar(binding.toolbar);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);

4
app/src/main/java/com/dkanada/gramophone/activities/base/AbsBaseActivity.java
View file

@ -20,8 +20,8 @@ import androidx.core.app.ActivityCompat;
import com.dkanada.gramophone.activities.MainActivity;
import com.dkanada.gramophone.util.NavigationUtil;
import com.dkanada.gramophone.R;
import com.dkanada.gramophone.util.PreferenceUtil;
import com.google.android.material.snackbar.Snackbar;
import com.kabouzeid.appthemehelper.ThemeStore;
import java.util.ArrayList;
import java.util.List;
@ -109,7 +109,7 @@ public abstract class AbsBaseActivity extends AbsThemeActivity {
private void showWarning() {
Snackbar.make(getPermissionWindow(), getPermissionMessage(), Snackbar.LENGTH_SHORT)
.setAction(R.string.ignore, view -> { })
.setActionTextColor(ThemeStore.accentColor(this))
.setActionTextColor(PreferenceUtil.getInstance(this).getAccentColor())
.show();
}

4
app/src/main/java/com/dkanada/gramophone/activities/base/AbsMusicPanelActivity.java
View file

@ -249,7 +249,7 @@ public abstract class AbsMusicPanelActivity extends AbsMusicServiceActivity impl
@Override
public void setNavigationBarColor(int color) {
this.navigationbarColor = color;
navigationbarColor = color;
if (navigationBarColorAnimator != null) {
navigationBarColorAnimator.cancel();
@ -286,7 +286,7 @@ public abstract class AbsMusicPanelActivity extends AbsMusicServiceActivity impl
@Override
public void setTaskDescriptionColor(@ColorInt int color) {
this.taskColor = color;
taskColor = color;
if (getPanelState() == null || getPanelState() == SlidingUpPanelLayout.PanelState.COLLAPSED) {
super.setTaskDescriptionColor(color);

31
app/src/main/java/com/dkanada/gramophone/activities/base/AbsThemeActivity.java
View file

@ -4,7 +4,6 @@ import android.os.Build;
import android.os.Bundle;
import android.view.View;
import androidx.annotation.ColorInt;
import androidx.appcompat.app.AppCompatActivity;
import com.dkanada.gramophone.util.NavigationUtil;
@ -25,10 +24,6 @@ public abstract class AbsThemeActivity extends AppCompatActivity {
setTheme(PreferenceUtil.getInstance(this).getTheme().style);
MaterialDialogsUtil.updateMaterialDialogsThemeSingleton(this);
if (!ThemeStore.coloredNavigationBar(this)) {
ThemeStore.editTheme(this).coloredNavigationBar(true).commit();
}
}
@Override
@ -59,19 +54,17 @@ public abstract class AbsThemeActivity extends AppCompatActivity {
}
public void setStatusBarColor(int color) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
final View statusBar = getWindow().getDecorView().getRootView().findViewById(R.id.status_bar);
if (statusBar != null) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
statusBar.setBackgroundColor(ColorUtil.darkenColor(color));
setLightStatusBarAuto(color);
} else {
statusBar.setBackgroundColor(color);
}
} else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
getWindow().setStatusBarColor(ColorUtil.darkenColor(color));
setLightStatusBarAuto(color);
}
View statusBar = getWindow().getDecorView().getRootView().findViewById(R.id.status_bar);
int dark = ColorUtil.darkenColor(color);
// KitKat through Lollipop will do this automatically
if (statusBar != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
statusBar.setBackgroundColor(dark);
getWindow().setStatusBarColor(getResources().getColor(android.R.color.transparent));
} else if (statusBar != null) {
statusBar.setBackgroundColor(color);
} else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
getWindow().setStatusBarColor(dark);
}
}
@ -80,7 +73,7 @@ public abstract class AbsThemeActivity extends AppCompatActivity {
setStatusBarColor(ThemeStore.primaryColor(this));
}
public void setTaskDescriptionColor(@ColorInt int color) {
public void setTaskDescriptionColor(int color) {
ATH.setTaskDescriptionColor(this, color);
}

3
app/src/main/java/com/dkanada/gramophone/activities/details/AlbumDetailActivity.java
View file

@ -31,7 +31,6 @@ import com.dkanada.gramophone.model.Artist;
import com.dkanada.gramophone.model.Song;
import com.dkanada.gramophone.util.MusicUtil;
import com.dkanada.gramophone.util.NavigationUtil;
import com.dkanada.gramophone.util.ThemeUtil;
import com.dkanada.gramophone.util.QueryUtil;
import org.jellyfin.apiclient.model.querying.ItemQuery;
@ -209,7 +208,7 @@ public class AlbumDetailActivity extends AbsMusicContentActivity implements Pale
cab = new MaterialCab(this, R.id.cab_stub)
.setMenu(menuRes)
.setCloseDrawableRes(R.drawable.ic_close_white_24dp)
.setBackgroundColor(ThemeUtil.shiftBackgroundColorForLightText(getPaletteColor()))
.setBackgroundColor(getPaletteColor())
.start(callback);
return cab;
}

3
app/src/main/java/com/dkanada/gramophone/activities/details/ArtistDetailActivity.java
View file

@ -32,7 +32,6 @@ import com.dkanada.gramophone.interfaces.PaletteColorHolder;
import com.dkanada.gramophone.model.Artist;
import com.dkanada.gramophone.model.Song;
import com.dkanada.gramophone.util.MusicUtil;
import com.dkanada.gramophone.util.ThemeUtil;
import com.dkanada.gramophone.util.PreferenceUtil;
import com.dkanada.gramophone.util.QueryUtil;
@ -237,7 +236,7 @@ public class ArtistDetailActivity extends AbsMusicContentActivity implements Pal
cab = new MaterialCab(this, R.id.cab_stub)
.setMenu(menuRes)
.setCloseDrawableRes(R.drawable.ic_close_white_24dp)
.setBackgroundColor(ThemeUtil.shiftBackgroundColorForLightText(getPaletteColor()))
.setBackgroundColor(getPaletteColor())
.start(callback);
return cab;
}

10
app/src/main/java/com/dkanada/gramophone/activities/details/GenreDetailActivity.java
View file

@ -14,16 +14,14 @@ import com.dkanada.gramophone.BuildConfig;
import com.dkanada.gramophone.activities.base.AbsMusicContentActivity;
import com.dkanada.gramophone.databinding.ActivityGenreDetailBinding;
import com.dkanada.gramophone.util.NavigationUtil;
import com.kabouzeid.appthemehelper.ThemeStore;
import com.dkanada.gramophone.util.PreferenceUtil;
import com.dkanada.gramophone.R;
import com.dkanada.gramophone.adapter.song.SongAdapter;
import com.dkanada.gramophone.helper.MusicPlayerRemote;
import com.dkanada.gramophone.interfaces.CabHolder;
import com.dkanada.gramophone.model.Genre;
import com.dkanada.gramophone.util.ThemeUtil;
import com.dkanada.gramophone.util.QueryUtil;
import com.dkanada.gramophone.util.ViewUtil;
import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView;
import org.jellyfin.apiclient.model.querying.ItemQuery;
@ -74,7 +72,7 @@ public class GenreDetailActivity extends AbsMusicContentActivity implements CabH
}
private void setUpRecyclerView() {
ViewUtil.setUpFastScrollRecyclerViewColor(this, binding.recyclerView, ThemeStore.accentColor(this));
ViewUtil.setUpFastScrollRecyclerViewColor(this, binding.recyclerView, PreferenceUtil.getInstance(this).getAccentColor());
binding.recyclerView.setLayoutManager(new LinearLayoutManager(this));
adapter = new SongAdapter(this, new ArrayList<>(), R.layout.item_list, false, this);
@ -90,7 +88,7 @@ public class GenreDetailActivity extends AbsMusicContentActivity implements CabH
}
private void setUpToolBar() {
binding.toolbar.setBackgroundColor(ThemeStore.primaryColor(this));
binding.toolbar.setBackgroundColor(PreferenceUtil.getInstance(this).getPrimaryColor());
setSupportActionBar(binding.toolbar);
binding.toolbar.setTitle(genre.name);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
@ -124,7 +122,7 @@ public class GenreDetailActivity extends AbsMusicContentActivity implements CabH
cab = new MaterialCab(this, R.id.cab_stub)
.setMenu(menu)
.setCloseDrawableRes(R.drawable.ic_close_white_24dp)
.setBackgroundColor(ThemeUtil.shiftBackgroundColorForLightText(ThemeStore.primaryColor(this)))
.setBackgroundColor(PreferenceUtil.getInstance(this).getPrimaryColor())
.start(callback);
return cab;

9
app/src/main/java/com/dkanada/gramophone/activities/details/PlaylistDetailActivity.java
View file

@ -16,11 +16,11 @@ import com.dkanada.gramophone.databinding.ActivityPlaylistDetailBinding;
import com.dkanada.gramophone.dialogs.DeletePlaylistDialog;
import com.dkanada.gramophone.dialogs.RenamePlaylistDialog;
import com.dkanada.gramophone.helper.menu.SongsMenuHelper;
import com.dkanada.gramophone.util.PreferenceUtil;
import com.h6ah4i.android.widget.advrecyclerview.animator.GeneralItemAnimator;
import com.h6ah4i.android.widget.advrecyclerview.animator.RefactoredDefaultItemAnimator;
import com.h6ah4i.android.widget.advrecyclerview.draggable.RecyclerViewDragDropManager;
import com.h6ah4i.android.widget.advrecyclerview.utils.WrapperAdapterUtils;
import com.kabouzeid.appthemehelper.ThemeStore;
import com.dkanada.gramophone.R;
import com.dkanada.gramophone.adapter.song.OrderablePlaylistSongAdapter;
import com.dkanada.gramophone.adapter.song.SongAdapter;
@ -29,7 +29,6 @@ import com.dkanada.gramophone.interfaces.CabHolder;
import com.dkanada.gramophone.model.Playlist;
import com.dkanada.gramophone.model.PlaylistSong;
import com.dkanada.gramophone.model.Song;
import com.dkanada.gramophone.util.ThemeUtil;
import com.dkanada.gramophone.util.PlaylistUtil;
import com.dkanada.gramophone.util.ViewUtil;
@ -85,7 +84,7 @@ public class PlaylistDetailActivity extends AbsMusicContentActivity implements C
}
private void setUpRecyclerView() {
ViewUtil.setUpFastScrollRecyclerViewColor(this, binding.recyclerView, ThemeStore.accentColor(this));
ViewUtil.setUpFastScrollRecyclerViewColor(this, binding.recyclerView, PreferenceUtil.getInstance(this).getAccentColor());
binding.recyclerView.setLayoutManager(new LinearLayoutManager(this));
recyclerViewDragDropManager = new RecyclerViewDragDropManager();
@ -115,7 +114,7 @@ public class PlaylistDetailActivity extends AbsMusicContentActivity implements C
private void setUpToolbar() {
binding.toolbar.setTitle(playlist.name);
binding.toolbar.setBackgroundColor(ThemeStore.primaryColor(this));
binding.toolbar.setBackgroundColor(PreferenceUtil.getInstance(this).getPrimaryColor());
setSupportActionBar(binding.toolbar);
// noinspection ConstantConditions
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
@ -149,7 +148,7 @@ public class PlaylistDetailActivity extends AbsMusicContentActivity implements C
cab = new MaterialCab(this, R.id.cab_stub)
.setMenu(menu)
.setCloseDrawableRes(R.drawable.ic_close_white_24dp)
.setBackgroundColor(ThemeUtil.shiftBackgroundColorForLightText(ThemeStore.primaryColor(this)))
.setBackgroundColor(PreferenceUtil.getInstance(this).getPrimaryColor())
.start(callback);
return cab;