Siklos/Metro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

v2.2.00

Browse source
This commit is contained in:
h4h13 2018-11-23 22:00:46 +05:30
parent 62b12da2ad
commit 05b41fa07a
42 changed files with 1046 additions and 874 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/code/name/monkey/retromusic/ui/activities/MainActivity.java
View file

@ -322,7 +322,6 @@ public class MainActivity extends AbsSlidingMusicPanelActivity implements Shared
public boolean onNavigationItemSelected(@NonNull MenuItem menuItem) {
PreferenceUtil.getInstance().setLastPage(menuItem.getItemId());
selectedFragment(menuItem.getItemId());
applyInsets();
return true;
}

30
app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsSlidingMusicPanelActivity.java
View file

@ -46,7 +46,6 @@ import code.name.monkey.retromusic.ui.fragments.player.normal.PlayerFragment;
import code.name.monkey.retromusic.ui.fragments.player.plain.PlainPlayerFragment;
import code.name.monkey.retromusic.ui.fragments.player.simple.SimplePlayerFragment;
import code.name.monkey.retromusic.util.PreferenceUtil;
import code.name.monkey.retromusic.util.RetroUtil;
import code.name.monkey.retromusic.util.ViewUtil;
import code.name.monkey.retromusic.views.BottomNavigationBarTinted;
import code.name.monkey.retromusic.views.FitSystemWindowsLayout;
@ -81,11 +80,9 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
@Override
protected void onCreate(Bundle savedInstanceState) {
setDrawUnderNavigationBar();
super.onCreate(savedInstanceState);
setContentView(createContentView());
ButterKnife.bind(this);
checkDisplayCutout();
choosFragmentForTheme();
setupSlidingUpPanel();
}
@ -120,12 +117,9 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
}
public void hideBottomBar(final boolean hide) {
//int heightOfBarWithTabs = getResources().getDimensionPixelSize(R.dimen.mini_player_height_expanded) + RetroUtil.getNavigationBarHeight(getResources());
int height = RetroUtil.checkNavigationBarHeight() ? getResources().getDimensionPixelSize(R.dimen.mini_player_height) : getResources().getDimensionPixelSize(R.dimen.mini_player_height);
int heightOfBar = getResources().getDimensionPixelSize(R.dimen.mini_player_height) + RetroUtil.getNavigationBarHeight(this);
int heightOfBarWithTabs =
getResources().getDimensionPixelSize(R.dimen.mini_player_height_expanded) +
RetroUtil.getNavigationBarHeight(this);
int heightOfBar = getResources().getDimensionPixelSize(R.dimen.mini_player_height);
int heightOfBarWithTabs = getResources().getDimensionPixelSize(R.dimen.mini_player_height_expanded);
if (hide) {
slidingUpPanelLayout.setPanelHeight(0);
collapsePanel();
@ -231,7 +225,6 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
slidingUpPanelLayout.addPanelSlideListener(this);
applyInsets();
}
protected void applyInsets() {
@ -297,8 +290,8 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
public void onPanelSlide(View panel, float slideOffset) {
bottomNavigationView.setTranslationY(slideOffset * 400);
setMiniPlayerAlphaProgress(slideOffset);
if (navigationBarColorAnimator != null) navigationBarColorAnimator.cancel();
super.setNavigationbarColor((int) argbEvaluator.evaluate(slideOffset, navigationbarColor, Color.TRANSPARENT));
//if (navigationBarColorAnimator != null) navigationBarColorAnimator.cancel();
//super.setNavigationbarColor((int) argbEvaluator.evaluate(slideOffset, navigationbarColor, Color.TRANSPARENT));
}
@Override
@ -323,6 +316,7 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
super.setNavigationbarColor(ThemeStore.primaryColor(this));
super.setLightNavigationBar(lightNavigationBar);
playerFragment.setMenuVisibility(false);
playerFragment.setUserVisibleHint(false);
playerFragment.onHide();
@ -330,15 +324,9 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
public void onPanelExpanded(View panel) {
int playerFragmentColor = playerFragment.getPaletteColor();
super.setTaskDescriptionColor(playerFragmentColor);
if (currentNowPlayingScreen == NowPlayingScreen.COLOR) {
super.setNavigationbarColor(playerFragmentColor);
} else {
super.setNavigationbarColor(Color.TRANSPARENT);
}
super.setLightStatusbar(lightStatusbar);
onPaletteColorChanged();
playerFragment.setMenuVisibility(true);
playerFragment.setUserVisibleHint(true);
playerFragment.onShow();
@ -441,11 +429,13 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
} else if (currentNowPlayingScreen == NowPlayingScreen.COLOR) {
super.setLightStatusbar(isColorLight);
super.setLightNavigationBar(isColorLight);
super.setNavigationbarColor(paletteColor);
} else if (currentNowPlayingScreen == NowPlayingScreen.BLUR || currentNowPlayingScreen == NowPlayingScreen.BLUR_CARD) {
super.setLightStatusbar(false);
super.setLightNavigationBar(true);
} else if (currentNowPlayingScreen == NowPlayingScreen.CARD || currentNowPlayingScreen == NowPlayingScreen.FULL) {
super.setNavigationbarColor(Color.TRANSPARENT);
super.setLightStatusbar(false);
super.setLightNavigationBar(ColorUtil.isColorLight(ThemeStore.primaryColor(this)));
} else if (currentNowPlayingScreen == NowPlayingScreen.FIT) {
super.setNavigationbarColor(Color.TRANSPARENT);
super.setLightStatusbar(false);

13
app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsPlayerFragment.java
View file

@ -34,8 +34,6 @@ import code.name.monkey.retromusic.util.MusicUtil;
import code.name.monkey.retromusic.util.NavigationUtil;
import code.name.monkey.retromusic.util.PreferenceUtil;
import code.name.monkey.retromusic.util.RetroUtil;
import code.name.monkey.retromusic.util.SystemUtils;
import code.name.monkey.retromusic.views.FitSystemWindowsLayout;
public abstract class AbsPlayerFragment extends AbsMusicServiceFragment implements Toolbar.OnMenuItemClickListener, PaletteColorHolder {
public static final String TAG = AbsPlayerFragment.class.getSimpleName();
@ -53,17 +51,6 @@ public abstract class AbsPlayerFragment extends AbsMusicServiceFragment implemen
}
}
protected void addSafeArea(View view) {
FitSystemWindowsLayout safeArea = view.findViewById(R.id.safeArea);
if (safeArea != null) {
//ViewGroup.MarginLayoutParams params = ((ViewGroup.MarginLayoutParams) safeArea.getLayoutParams());
//params.topMargin = RetroUtil.getStatusBarHeight();
//params.bottomMargin = RetroUtil.getNavigationBarHeight();
//if (PreferenceUtil.getInstance().getFullScreenMode()) safeArea.setFit(false);
//else safeArea.setFit(true);
}
}
@Override
public void onDetach() {
super.onDetach();

6
app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/home/BannerHomeFragment.java
View file

@ -70,9 +70,6 @@ public class BannerHomeFragment extends AbsMainActivityFragment implements MainA
@BindView(R.id.toolbar)
Toolbar toolbar;
/*@BindView(R.id.app_bar)
AppBarLayout appbar;
*/
@BindView(R.id.image)
@Nullable
ImageView imageView;
@ -80,9 +77,6 @@ public class BannerHomeFragment extends AbsMainActivityFragment implements MainA
@BindView(R.id.user_image)
CircularImageView userImage;
/* @BindView(R.id.collapsing_toolbar)
CollapsingToolbarLayout toolbarLayout;*/
@BindView(R.id.recycler_view)
RecyclerView recentArtistRV;

3
app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/full/FullPlayerFragment.java
View file

@ -42,14 +42,12 @@ public class FullPlayerFragment extends AbsPlayerFragment implements PlayerAlbum
@Nullable Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.fragment_full, container, false);
unbinder = ButterKnife.bind(this, view);
return view;
}
@Override
public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
setUpSubFragments();
setUpPlayerToolbar();
}
@ -64,7 +62,6 @@ public class FullPlayerFragment extends AbsPlayerFragment implements PlayerAlbum
playerAlbumCoverFragment.setCallbacks(this);
playerAlbumCoverFragment.removeSlideEffect();
}
}
@Override