From 99787ad5a9128ee8c75e098bedbbead90d5940db Mon Sep 17 00:00:00 2001 From: h4h13 Date: Fri, 11 Oct 2019 00:27:44 +0530 Subject: [PATCH] Adjust padding --- .../activities/PlayingQueueActivity.kt | 2 +- .../activities/PlaylistDetailActivity.kt | 7 ++- .../mainactivity/home/BannerHomeFragment.kt | 23 ++------ app/src/main/res/layout/abs_playlists.xml | 8 +-- .../res/layout/activity_playlist_detail.xml | 59 ++++++++++--------- app/src/main/res/layout/home_content.xml | 20 +++++-- app/src/main/res/values/dimens.xml | 1 + 7 files changed, 61 insertions(+), 59 deletions(-) diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/PlayingQueueActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/PlayingQueueActivity.kt index f5c1fecd..f0dc74ae 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/PlayingQueueActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/PlayingQueueActivity.kt @@ -75,7 +75,7 @@ class PlayingQueueActivity : AbsMusicServiceActivity() { this, MusicPlayerRemote.playingQueue, MusicPlayerRemote.position, - code.name.monkey.retromusic.R.layout.item_queue) + R.layout.item_queue) wrappedAdapter = recyclerViewDragDropManager!!.createWrappedAdapter(playingQueueAdapter!!) linearLayoutManager = LinearLayoutManager(this) diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/PlaylistDetailActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/PlaylistDetailActivity.kt index e2d9c8d4..be59d515 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/PlaylistDetailActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/PlaylistDetailActivity.kt @@ -65,7 +65,7 @@ class PlaylistDetailActivity : AbsSlidingMusicPanelActivity(), CabHolder, Playli finish() } - App.musicComponent?.inject(this) + App.musicComponent.inject(this) playlistSongsPresenter.attachView(this) @@ -82,7 +82,7 @@ class PlaylistDetailActivity : AbsSlidingMusicPanelActivity(), CabHolder, Playli recyclerView.layoutManager = LinearLayoutManager(this) if (playlist is AbsCustomPlaylist) { adapter = PlaylistSongAdapter(this, ArrayList(), R.layout.item_list, false, this) - recyclerView!!.adapter = adapter + recyclerView.adapter = adapter } else { recyclerViewDragDropManager = RecyclerViewDragDropManager() val animator = RefactoredDefaultItemAnimator() @@ -101,7 +101,7 @@ class PlaylistDetailActivity : AbsSlidingMusicPanelActivity(), CabHolder, Playli recyclerView.adapter = wrappedAdapter recyclerView.itemAnimator = animator - recyclerViewDragDropManager!!.attachRecyclerView(recyclerView!!) + recyclerViewDragDropManager?.attachRecyclerView(recyclerView) } adapter.registerAdapterDataObserver(object : RecyclerView.AdapterDataObserver() { override fun onChanged() { @@ -183,6 +183,7 @@ class PlaylistDetailActivity : AbsSlidingMusicPanelActivity(), CabHolder, Playli } private fun checkIsEmpty() { + empty.visibility = if (adapter.itemCount == 0) View.VISIBLE else View.GONE emptyText.visibility = if (adapter.itemCount == 0) View.VISIBLE else View.GONE } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/home/BannerHomeFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/home/BannerHomeFragment.kt index 7c4078aa..433282e6 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/home/BannerHomeFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/home/BannerHomeFragment.kt @@ -10,7 +10,6 @@ import androidx.appcompat.widget.Toolbar import androidx.core.content.ContextCompat import androidx.recyclerview.widget.LinearLayoutManager import code.name.monkey.appthemehelper.common.ATHToolbarActivity -import code.name.monkey.appthemehelper.util.ATHUtil import code.name.monkey.appthemehelper.util.ColorUtil import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper import code.name.monkey.retromusic.App @@ -31,7 +30,10 @@ import code.name.monkey.retromusic.model.smartplaylist.LastAddedPlaylist import code.name.monkey.retromusic.model.smartplaylist.MyTopTracksPlaylist import code.name.monkey.retromusic.mvp.presenter.HomePresenter import code.name.monkey.retromusic.mvp.presenter.HomeView -import code.name.monkey.retromusic.util.* +import code.name.monkey.retromusic.util.Compressor +import code.name.monkey.retromusic.util.NavigationUtil +import code.name.monkey.retromusic.util.PreferenceUtil +import code.name.monkey.retromusic.util.RetroColorUtil import com.bumptech.glide.Glide import com.bumptech.glide.load.engine.DiskCacheStrategy import io.reactivex.android.schedulers.AndroidSchedulers @@ -127,7 +129,6 @@ class BannerHomeFragment : AbsMainActivityFragment(), MainActivityFragmentCallba } setupToolbar() - checkPadding() userImage.setOnClickListener { val options = ActivityOptions.makeSceneTransitionAnimation(mainActivity, userImage, getString(R.string.transition_user_image)) @@ -147,11 +148,6 @@ class BannerHomeFragment : AbsMainActivityFragment(), MainActivityFragmentCallba } } - private fun checkPadding() { - val marginSpan = DensityUtil.dip2px(requireContext(), 52f) - (recyclerView.layoutParams as ViewGroup.MarginLayoutParams).bottomMargin = (marginSpan * 2.3f).toInt() - } - private fun toolbarColor(): Int { return if (PreferenceUtil.getInstance(requireContext()).isHomeBanner) { toolbarContainer.setBackgroundColor(Color.TRANSPARENT) @@ -194,17 +190,6 @@ class BannerHomeFragment : AbsMainActivityFragment(), MainActivityFragmentCallba emptyContainer.show() } - override fun onServiceConnected() { - super.onServiceConnected() - checkPadding() - } - - override fun onQueueChanged() { - super.onQueueChanged() - checkPadding() - } - - override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { super.onCreateOptionsMenu(menu, inflater) inflater.inflate(R.menu.menu_search, menu) diff --git a/app/src/main/res/layout/abs_playlists.xml b/app/src/main/res/layout/abs_playlists.xml index f50e617c..5431ecaf 100644 --- a/app/src/main/res/layout/abs_playlists.xml +++ b/app/src/main/res/layout/abs_playlists.xml @@ -62,7 +62,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:padding="16dp" + android:padding="@dimen/home_icon_padding" app:iconBackgroundColor="@color/md_blue_500" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -98,7 +98,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:padding="16dp" + android:padding="@dimen/home_icon_padding" app:iconBackgroundColor="@color/md_red_500" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -137,7 +137,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:padding="16dp" + android:padding="@dimen/home_icon_padding" app:iconBackgroundColor="@color/md_deep_purple_500" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -175,7 +175,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:padding="16dp" + android:padding="@dimen/home_icon_padding" app:iconBackgroundColor="@color/md_green_500" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/activity_playlist_detail.xml b/app/src/main/res/layout/activity_playlist_detail.xml index 9adf286d..a8933dab 100644 --- a/app/src/main/res/layout/activity_playlist_detail.xml +++ b/app/src/main/res/layout/activity_playlist_detail.xml @@ -22,45 +22,50 @@ android:id="@+id/appBarLayout" android:layout_width="match_parent" android:layout_height="wrap_content" - android:elevation="@dimen/card_elevation" - app:elevation="@dimen/card_elevation"> + app:liftOnScroll="true"> - + app:layout_scrollFlags="scroll|enterAlways"> - + android:layout_height="48dp" /> - + - - - - + - - + app:layout_behavior="@string/appbar_scrolling_view_behavior"> + + + + + + + + - + android:orientation="vertical"> + + + + + 10dp 4dp 8dp + 14dp