Fix refactor code

app/src/main/java/code/name/monkey/retromusic/RetroBottomSheetBehavior.java

@@ -10,16 +10,16 @@ import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
 
 
-public class CustomBottomSheetBehavior<V extends View> extends BottomSheetBehavior<V> {
+public class RetroBottomSheetBehavior<V extends View> extends BottomSheetBehavior<V> {
 
     private static final String TAG = "CustomBottomSheetBehavi";
 
     private boolean allowDragging = true;
 
-    public CustomBottomSheetBehavior() {
+    public RetroBottomSheetBehavior() {
     }
 
-    public CustomBottomSheetBehavior(Context context, AttributeSet attrs) {
+    public RetroBottomSheetBehavior(Context context, AttributeSet attrs) {
         super(context, attrs);
     }
 

app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.java

@@ -126,9 +126,7 @@ public class MainActivity extends AbsSlidingMusicPanelActivity
     private boolean blockRequestPermissions = false;
     private MaterialCab cab;
     private AppBarLayout mAppBarLayout;
-    private MaterialTextView mAppTitle;
     private Toolbar mToolbar;
-    private MaterialCardView mToolbarContainer;
     private AppUpdateManager appUpdateManager;
     InstallStateUpdatedListener listener = new InstallStateUpdatedListener() {
         @Override
@@ -178,8 +176,6 @@ public class MainActivity extends AbsSlidingMusicPanelActivity
             restoreCurrentFragment();
         }
 
-        mToolbarContainer = findViewById(R.id.toolbarContainer);
-        mAppTitle = findViewById(R.id.appTitle);
         mToolbar = findViewById(R.id.toolbar);
         mAppBarLayout = findViewById(R.id.appBarLayout);
 
@@ -284,12 +280,12 @@ public class MainActivity extends AbsSlidingMusicPanelActivity
     public boolean onCreateOptionsMenu(final Menu menu) {
         getMenuInflater().inflate(R.menu.menu_main, menu);
         if (isPlaylistPage()) {
-            menu.add(0, R.id.action_new_playlist, 0, R.string.new_playlist_title)
+            menu.add(0, R.id.action_new_playlist, 1, R.string.new_playlist_title)
                     .setIcon(R.drawable.ic_playlist_add_white_24dp)
                     .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
         }
         if (isHomePage()) {
-            menu.add(0, R.id.action_search, 0, getString(R.string.action_search))
+            menu.add(0, R.id.action_mic, 1, getString(R.string.action_search))
                     .setIcon(R.drawable.ic_mic_white_24dp)
                     .setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_IF_ROOM);
 
@@ -298,7 +294,7 @@ public class MainActivity extends AbsSlidingMusicPanelActivity
             menu.add(0, R.id.action_scan, 0, R.string.scan_media)
                     .setIcon(R.drawable.ic_scanner_white_24dp)
                     .setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_IF_ROOM);
-            menu.add(0, R.id.action_go_to_start_directory, 0, R.string.action_go_to_start_directory)
+            menu.add(0, R.id.action_go_to_start_directory, 1, R.string.action_go_to_start_directory)
                     .setIcon(R.drawable.ic_bookmark_music_white_24dp)
                     .setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_IF_ROOM);
         }
@@ -320,9 +316,12 @@ public class MainActivity extends AbsSlidingMusicPanelActivity
             menu.removeItem(R.id.action_grid_size);
             menu.removeItem(R.id.action_sort_order);
         }
-        menu.add(0, R.id.action_settings, 0, getString(R.string.action_settings))
+        menu.add(0, R.id.action_settings, 6, getString(R.string.action_settings))
                 .setIcon(R.drawable.ic_settings_white_24dp)
                 .setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+        menu.add(0, R.id.action_search, 0, getString(R.string.action_search))
+                .setIcon(R.drawable.ic_search_white_24dp)
+                .setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_ALWAYS);
         return super.onCreateOptionsMenu(menu);
     }
 
@@ -345,13 +344,17 @@ public class MainActivity extends AbsSlidingMusicPanelActivity
         int id = item.getItemId();
         switch (id) {
             case R.id.action_search:
-                ActivityOptions options = ActivityOptions.makeSceneTransitionAnimation(this, mToolbarContainer,
+
-                        getString(R.string.transition_toolbar));
+                NavigationUtil.goToSearch(this);
-                NavigationUtil.goToSearch(this, true, options);
                 break;
             case R.id.action_new_playlist:
                 CreatePlaylistDialog.create().show(getSupportFragmentManager(), "CREATE_PLAYLIST");
                 return true;
+            case R.id.action_mic:
+                ActivityOptions options = ActivityOptions.makeSceneTransitionAnimation(this, mToolbar,
+                        getString(R.string.transition_toolbar));
+                NavigationUtil.goToSearch(this, true, options);
+                return true;
             case R.id.action_settings:
                 NavigationUtil.goToSettings(this);
                 return true;
@@ -828,22 +831,12 @@ public class MainActivity extends AbsSlidingMusicPanelActivity
 
     private void setupToolbar() {
         setTitle(null);
-        mToolbar.setBackgroundColor(Color.TRANSPARENT);
+        mToolbar.setBackgroundColor(ATHUtil.INSTANCE.resolveColor(this, R.attr.colorSurface));
-        mToolbarContainer.setCardBackgroundColor(
-                ColorStateList.valueOf(ATHUtil.INSTANCE.resolveColor(this, R.attr.colorSurface)));
         setSupportActionBar(mToolbar);
         mToolbar.setOnClickListener(v -> {
             ActivityOptions options = ActivityOptions
-                    .makeSceneTransitionAnimation(this, mToolbarContainer, getString(R.string.transition_toolbar));
+                    .makeSceneTransitionAnimation(this, mToolbar, getString(R.string.transition_toolbar));
             NavigationUtil.goToSearch(this, options);
         });
-        new Handler().postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                TransitionManager.beginDelayedTransition(mToolbar);
-                mAppTitle.setVisibility(View.GONE);
-                setTitle(R.string.action_search);
-            }
-        }, 3000);
     }
 }

app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt

@@ -11,7 +11,7 @@ import androidx.annotation.LayoutRes
 import androidx.fragment.app.Fragment
 import code.name.monkey.appthemehelper.util.ATHUtil
 import code.name.monkey.appthemehelper.util.ColorUtil
-import code.name.monkey.retromusic.CustomBottomSheetBehavior
+import code.name.monkey.retromusic.RetroBottomSheetBehavior
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.extensions.hide
 import code.name.monkey.retromusic.extensions.show
@@ -49,7 +49,7 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(),
         val TAG: String = AbsSlidingMusicPanelActivity::class.java.simpleName
     }
 
-    private lateinit var bottomSheetBehavior: CustomBottomSheetBehavior<FrameLayout>
+    private lateinit var bottomSheetBehavior: RetroBottomSheetBehavior<FrameLayout>
     private var miniPlayerFragment: MiniPlayerFragment? = null
     private var playerFragment: AbsPlayerFragment? = null
     private var currentNowPlayingScreen: NowPlayingScreen? = null
@@ -98,7 +98,7 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(),
         updateTabs()
 
         bottomSheetBehavior =
-            BottomSheetBehavior.from(slidingPanel) as CustomBottomSheetBehavior
+            BottomSheetBehavior.from(slidingPanel) as RetroBottomSheetBehavior
 
         val themeColor = ATHUtil.resolveColor(this, android.R.attr.windowBackground, Color.GRAY)
         dimBackground.setBackgroundColor(ColorUtil.withAlpha(themeColor, 0.5f))

app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumCoverPagerAdapter.kt

@@ -69,20 +69,6 @@ class AlbumCoverPagerAdapter(
         private var colorReceiver: ColorReceiver? = null
         private var request: Int = 0
 
-        private val layout: Int
-            get() {
-                return when (PreferenceUtil.getInstance(requireContext()).albumCoverStyle) {
-                    AlbumCoverStyle.NORMAL -> R.layout.fragment_album_cover
-                    AlbumCoverStyle.FLAT -> R.layout.fragment_album_flat_cover
-                    AlbumCoverStyle.CIRCLE -> R.layout.fragment_album_circle_cover
-                    AlbumCoverStyle.CARD -> R.layout.fragment_album_card_cover
-                    AlbumCoverStyle.MATERIAL -> R.layout.fragment_album_material_cover
-                    AlbumCoverStyle.FULL -> R.layout.fragment_album_full_cover
-                    AlbumCoverStyle.FULL_CARD -> R.layout.fragment_album_full_card_cover
-                    else -> R.layout.fragment_album_cover
-                }
-            }
-
         override fun onCreate(savedInstanceState: Bundle?) {
             super.onCreate(savedInstanceState)
             if (arguments != null) {
@@ -111,8 +97,7 @@ class AlbumCoverPagerAdapter(
                 NowPlayingScreen.CLASSIC,
                 NowPlayingScreen.FULL -> R.layout.fragment_album_full_cover
                 else -> {
-                    if (PreferenceUtil.getInstance(requireContext())
+                    if (PreferenceUtil.getInstance(requireContext()).carouselEffect()
-                            .carouselEffect()
                     ) {
                         R.layout.fragment_album_carousel_cover
                     } else {

app/src/main/java/code/name/monkey/retromusic/fragments/player/PlayerAlbumCoverFragment.kt

@@ -53,29 +53,13 @@ class PlayerAlbumCoverFragment : AbsMusicServiceFragment(), ViewPager.OnPageChan
             viewPager.setPadding(40, 40, 40, 0)
             viewPager.pageMargin = 0
             viewPager.setPageTransformer(false, CarousalPagerTransformer(requireContext()))
-        }else{
+        } else {
             viewPager.offscreenPageLimit = 2
             viewPager.setPageTransformer(
                 true,
                 PreferenceUtil.getInstance(requireContext()).albumCoverTransform
             )
         }
-
-        /* if (PreferenceUtil.getInstance(requireContext()).carouselEffect() &&
-             !((nps == FULL) || (nps == ADAPTIVE) || (nps == FIT))
-         ) {
-             viewPager.clipToPadding = false
-             viewPager.setPadding(40, 40, 40, 0)
-             viewPager.pageMargin = 0
-             viewPager.setPageTransformer(false, CarousalPagerTransformer(requireContext()))
-         } else if () {
-         } else {
-             viewPager.offscreenPageLimit = 2
-             viewPager.setPageTransformer(
-                 true,
-                 PreferenceUtil.getInstance(requireContext()).albumCoverTransform
-             )
-         }*/
     }
 
     override fun onDestroyView() {

app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerFragment.kt

@@ -12,7 +12,7 @@ import androidx.core.view.ViewCompat
 import androidx.recyclerview.widget.LinearLayoutManager
 import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.appthemehelper.util.*
-import code.name.monkey.retromusic.CustomBottomSheetBehavior
+import code.name.monkey.retromusic.RetroBottomSheetBehavior
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.base.AbsSlidingMusicPanelActivity
 import code.name.monkey.retromusic.adapter.song.PlayingQueueAdapter
@@ -145,9 +145,9 @@ class ClassicPlayerFragment : AbsPlayerFragment(), View.OnLayoutChangeListener,
         progressViewUpdateHelper.stop()
     }
 
-    private fun getQueuePanel(): CustomBottomSheetBehavior<MaterialCardView> {
+    private fun getQueuePanel(): RetroBottomSheetBehavior<MaterialCardView> {
         playerQueueSheet as MaterialCardView
-        return CustomBottomSheetBehavior.from(playerQueueSheet) as CustomBottomSheetBehavior<MaterialCardView>
+        return RetroBottomSheetBehavior.from(playerQueueSheet) as RetroBottomSheetBehavior<MaterialCardView>
     }
 
     private fun setupPanel() {

app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorFragment.kt

@@ -20,6 +20,7 @@ import kotlinx.android.synthetic.main.fragment_color_player.*
 class ColorFragment : AbsPlayerFragment() {
 
     private var lastColor: Int = 0
+    private var navigationColor: Int = 0
     private lateinit var playbackControlsFragment: ColorPlaybackControlsFragment
     private var valueAnimator: ValueAnimator? = null
 
@@ -28,11 +29,12 @@ class ColorFragment : AbsPlayerFragment() {
     }
 
     override val paletteColor: Int
-        get() = lastColor
+        get() = navigationColor
 
     override fun onColorChanged(color: MediaNotificationProcessor) {
         playbackControlsFragment.setDark(color)
-        lastColor = color.backgroundColor
+        navigationColor = color.backgroundColor
+        lastColor = color.secondaryTextColor
         callbacks?.onPaletteColorChanged()
 
         ToolbarContentTintHelper.colorizeToolbar(

app/src/main/java/code/name/monkey/retromusic/util/NavigationUtil.java

@@ -131,6 +131,11 @@ public class NavigationUtil {
                 activityOptions.toBundle());
     }
 
+    public static void goToSearch(@NonNull Activity activity) {
+        ActivityCompat.startActivity(activity, new Intent(activity, SearchActivity.class),
+                null);
+    }
+
     public static void goToSearch(@NonNull Activity activity, boolean isMicOpen,
                                   @NonNull ActivityOptions activityOptions) {
         ActivityCompat.startActivity(activity, new Intent(activity, SearchActivity.class)

app/src/main/res/drawable/ic_expand_less_white_24dp.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M12,8l-6,6 1.41,1.41L12,10.83l4.59,4.58L18,14z"/>
+</vector>

app/src/main/res/layout-land/fragment_banner_home.xml

@@ -20,6 +20,7 @@
     android:layout_height="match_parent"
     android:layout_marginStart="@dimen/toolbar_margin_horizontal"
     android:layout_marginEnd="@dimen/toolbar_margin_horizontal"
+    android:overScrollMode="never"
     app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
 
     <LinearLayout

app/src/main/res/layout-land/fragment_home.xml

@@ -20,6 +20,7 @@
     android:layout_height="match_parent"
     android:layout_marginStart="@dimen/toolbar_margin_horizontal"
     android:layout_marginEnd="@dimen/toolbar_margin_horizontal"
+    android:overScrollMode="never"
     app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
 
     <androidx.constraintlayout.widget.ConstraintLayout

app/src/main/res/layout/activity_main_content.xml

@@ -26,51 +26,29 @@
             android:id="@+id/appBarLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@android:color/transparent"
-            android:elevation="0dp"
-            app:elevation="0dp"
             app:liftOnScroll="true">
 
-            <com.google.android.material.card.MaterialCardView
+            <FrameLayout
-                android:id="@+id/toolbarContainer"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
-                android:layout_marginEnd="12dp"
-                app:cardUseCompatPadding="true"
-                app:cardCornerRadius="8dp"
                 app:layout_scrollFlags="scroll|enterAlways">
 
-                <FrameLayout
+                <androidx.appcompat.widget.Toolbar
+                    android:id="@+id/toolbar"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
+                    android:layout_height="wrap_content"
+                    android:background="?attr/colorSurface"
+                    app:popupTheme="?attr/toolbarPopupTheme"
+                    app:title="@string/app_name"
+                    app:titleTextAppearance="@style/ToolbarTextAppearanceNormal.Library"
+                    app:titleTextColor="?attr/colorControlNormal"
+                    tools:ignore="UnusedAttribute" />
 
-                    <androidx.appcompat.widget.Toolbar
+                <ViewStub
-                        android:id="@+id/toolbar"
+                    android:id="@+id/cab_stub"
-                        android:layout_width="match_parent"
+                    android:layout_width="match_parent"
-                        android:layout_height="@dimen/toolbar_height"
+                    android:layout_height="@dimen/toolbar_height" />
-                        android:background="?attr/colorSurface"
+            </FrameLayout>
-                        app:popupTheme="?attr/toolbarPopupTheme"
-                        app:titleTextAppearance="@style/TextViewHeadline6"
-                        app:titleTextColor="?attr/colorControlNormal"
-                        tools:ignore="UnusedAttribute">
-
-                        <com.google.android.material.textview.MaterialTextView
-                            android:id="@+id/appTitle"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:gravity="center"
-                            android:text="@string/app_name"
-                            android:textAppearance="@style/TextViewHeadline6"
-                            android:textColor="?attr/colorControlNormal" />
-                    </androidx.appcompat.widget.Toolbar>
-
-                    <ViewStub
-                        android:id="@+id/cab_stub"
-                        android:layout_width="match_parent"
-                        android:layout_height="@dimen/toolbar_height" />
-                </FrameLayout>
-            </com.google.android.material.card.MaterialCardView>
         </com.google.android.material.appbar.AppBarLayout>
 
         <FrameLayout

app/src/main/res/layout/fragment_banner_home.xml

@@ -15,6 +15,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/container"
+    android:overScrollMode="never"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">

app/src/main/res/layout/fragment_clasic_player.xml

@@ -53,7 +53,7 @@
         android:orientation="vertical"
         app:behavior_hideable="false"
         app:cardCornerRadius="0dp"
-        app:layout_behavior="code.name.monkey.retromusic.CustomBottomSheetBehavior">
+        app:layout_behavior="code.name.monkey.retromusic.RetroBottomSheetBehavior">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -61,11 +61,17 @@
             android:background="?attr/colorSurface"
             android:orientation="vertical">
 
-            <include
+            <com.google.android.material.card.MaterialCardView
-                android:id="@+id/playerControlsContainer"
-                layout="@layout/fragment_classic_controls"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
+                android:layout_height="wrap_content"
+                app:cardCornerRadius="0dp">
+
+                <include
+                    android:id="@+id/playerControlsContainer"
+                    layout="@layout/fragment_classic_controls"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+            </com.google.android.material.card.MaterialCardView>
 
             <LinearLayout
                 android:layout_width="match_parent"

app/src/main/res/layout/fragment_home.xml

@@ -17,6 +17,7 @@
     android:id="@+id/container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:overScrollMode="never"
     app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
 
     <androidx.constraintlayout.widget.ConstraintLayout

app/src/main/res/layout/sliding_music_panel_layout.xml

@@ -26,7 +26,7 @@
         android:background="?attr/colorSurface"
         app:behavior_hideable="false"
         app:behavior_peekHeight="0dp"
-        app:layout_behavior="code.name.monkey.retromusic.CustomBottomSheetBehavior">
+        app:layout_behavior="code.name.monkey.retromusic.RetroBottomSheetBehavior">
 
         <FrameLayout
             android:id="@+id/playerFragmentContainer"

app/src/main/res/menu/menu_main.xml

@@ -22,6 +22,7 @@
         android:id="@+id/action_grid_size"
         android:icon="@drawable/ic_grid_size_white_24dp"
         android:title="@string/action_grid_size"
+        android:orderInCategory="2"
         app:showAsAction="ifRoom">
         <menu>
             <group
@@ -58,6 +59,7 @@
         android:id="@+id/action_layout_type"
         android:icon="@drawable/ic_dashboard_white_24dp"
         android:title="@string/grid_style_label"
+        android:orderInCategory="6"
         app:showAsAction="ifRoom">
         <menu>
             <group
@@ -85,6 +87,7 @@
         </menu>
     </item>
     <item
+        android:orderInCategory="5"
         android:id="@+id/action_sort_order"
         android:icon="@drawable/ic_sort_white_24dp"
         android:title="@string/action_sort_order"

app/src/main/res/values/ids.xml

@@ -2,6 +2,7 @@
 <resources>
     <item name="action_new_playlist" type="id" />
     <item name="action_settings" type="id" />
+    <item name="action_mic" type="id" />
     <item name="action_search" type="id" />
     <item name="action_show_lyrics" type="id" />
     <item name="action_genre" type="id" />

app/src/main/res/values/styles.xml

@@ -58,6 +58,11 @@
         <item name="android:textSize">20sp</item>
         <item name="android:letterSpacing">0.0125</item>
         <item name="android:textColor">?android:attr/textColorPrimary</item>
+        <item name="android:fontFamily">@font/circular</item>
+    </style>
+
+    <style name="ToolbarTextAppearanceNormal.Library" parent="ToolbarTextAppearanceNormal">
+        <item name="android:textSize">24sp</item>
     </style>
 
     <style name="BigTitleTextAppearanceToolbar">

app/src/main/res/xml/pref_now_playing_screen.xml

@@ -66,7 +66,7 @@
         <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
             android:layout="@layout/list_item_view_switch"
             app:defaultValue="false"
-            app:icon="@drawable/ic_volume_up_white_24dp"
+            app:icon="@drawable/ic_expand_less_white_24dp"
             app:key="expand_now_playing_panel"
             app:summary="@string/pref_summary_expand_now_playing_panel"
             app:title="@string/pref_title_expand_now_playing_panel" />