diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/UserInfoActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/UserInfoActivity.kt
index 7b7d33311..739bd7713 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/UserInfoActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/UserInfoActivity.kt
@@ -30,13 +30,7 @@ import com.afollestad.materialdialogs.LayoutMode
import com.afollestad.materialdialogs.MaterialDialog
import com.afollestad.materialdialogs.bottomsheets.BottomSheet
import com.afollestad.materialdialogs.list.listItems
-import kotlinx.android.synthetic.main.activity_user_info.bannerImage
-import kotlinx.android.synthetic.main.activity_user_info.bannerSelect
-import kotlinx.android.synthetic.main.activity_user_info.name
-import kotlinx.android.synthetic.main.activity_user_info.nameContainer
-import kotlinx.android.synthetic.main.activity_user_info.next
-import kotlinx.android.synthetic.main.activity_user_info.toolbar
-import kotlinx.android.synthetic.main.activity_user_info.userImage
+import kotlinx.android.synthetic.main.activity_user_info.*
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
@@ -142,7 +136,10 @@ class UserInfoActivity : AbsBaseActivity() {
pickImageIntent.putExtra("aspectY", 9)
pickImageIntent.putExtra("scale", true)
//intent.setAction(Intent.ACTION_GET_CONTENT);
- startActivityForResult(Intent.createChooser(pickImageIntent, "Select Picture"), PICK_BANNER_REQUEST)
+ startActivityForResult(
+ Intent.createChooser(pickImageIntent, "Select Picture"),
+ PICK_BANNER_REQUEST
+ )
}
private fun pickNewPhoto() {
@@ -154,7 +151,10 @@ class UserInfoActivity : AbsBaseActivity() {
pickImageIntent.putExtra("aspectX", 1)
pickImageIntent.putExtra("aspectY", 1)
pickImageIntent.putExtra("scale", true)
- startActivityForResult(Intent.createChooser(pickImageIntent, "Select Picture"), PICK_IMAGE_REQUEST)
+ startActivityForResult(
+ Intent.createChooser(pickImageIntent, "Select Picture"),
+ PICK_IMAGE_REQUEST
+ )
}
public override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt
index 7329a9118..8ab5d13bf 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt
@@ -219,7 +219,7 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(), AbsPlay
bottomNavigationView.elevation = DensityUtil.dip2px(this, 10f).toFloat()
} else {
if (MusicPlayerRemote.playingQueue.isNotEmpty()) {
- slidingPanel.cardElevation = DensityUtil.dip2px(this, 10f).toFloat()
+ slidingPanel.elevation = DensityUtil.dip2px(this, 10f).toFloat()
bottomNavigationView.elevation = DensityUtil.dip2px(this, 10f).toFloat()
bottomSheetBehavior.isHideable = false
bottomSheetBehavior.peekHeight =
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsLibraryPagerRecyclerViewFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsLibraryPagerRecyclerViewFragment.kt
index b3e676ad0..2ef27d5f5 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsLibraryPagerRecyclerViewFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsLibraryPagerRecyclerViewFragment.kt
@@ -13,11 +13,7 @@ import code.name.monkey.retromusic.util.DensityUtil
import code.name.monkey.retromusic.util.ThemedFastScroller.create
import code.name.monkey.retromusic.views.ScrollingViewOnApplyWindowInsetsListener
import com.google.android.material.appbar.AppBarLayout
-import kotlinx.android.synthetic.main.fragment_main_activity_recycler_view.container
-import kotlinx.android.synthetic.main.fragment_main_activity_recycler_view.empty
-import kotlinx.android.synthetic.main.fragment_main_activity_recycler_view.emptyEmoji
-import kotlinx.android.synthetic.main.fragment_main_activity_recycler_view.emptyText
-import kotlinx.android.synthetic.main.fragment_main_activity_recycler_view.recyclerView
+import kotlinx.android.synthetic.main.fragment_main_activity_recycler_view.*
import me.zhanghai.android.fastscroll.FastScroller
import me.zhanghai.android.fastscroll.FastScrollerBuilder
@@ -42,7 +38,6 @@ abstract class AbsLibraryPagerRecyclerViewFragment,
}
private fun setUpRecyclerView() {
-
recyclerView.layoutManager = layoutManager
recyclerView.adapter = adapter
val fastScroller = create(recyclerView)
@@ -52,7 +47,7 @@ abstract class AbsLibraryPagerRecyclerViewFragment,
fastScroller
)
)
- //OverScrollDecoratorHelper.setUpOverScroll(recyclerView, OverScrollDecoratorHelper.ORIENTATION_VERTICAL)
+ checkForPadding()
}
protected open fun createFastScroller(recyclerView: RecyclerView): FastScroller {
diff --git a/app/src/main/res/layout-land/fragment_banner_home.xml b/app/src/main/res/layout-land/fragment_banner_home.xml
index 3227e823e..b25f86603 100644
--- a/app/src/main/res/layout-land/fragment_banner_home.xml
+++ b/app/src/main/res/layout-land/fragment_banner_home.xml
@@ -12,14 +12,14 @@
~ See the GNU General Public License for more details.
-->
-
-
-
+ app:retroCornerSize="36dp"
+ app:strokeWidth="2dp"
+ app:srcCompat="@drawable/ic_person_flat"
+ app:strokeColor="?attr/colorSurface" />
@@ -88,17 +88,16 @@
app:layout_constraintStart_toStartOf="@+id/imageContainer"
app:layout_constraintTop_toBottomOf="@id/imageContainer">
-
+ app:retroCornerSize="36dp"
+ app:srcCompat="@drawable/ic_person_flat"
+ app:strokeColor="?attr/colorSurface"
+ app:strokeWidth="2dp" />
-
@@ -59,9 +59,9 @@
android:id="@+id/userImage"
android:layout_width="42dp"
android:layout_height="42dp"
- android:layout_marginBottom="8dp"
android:layout_marginStart="16dp"
- app:civ_border="false"
+ android:layout_marginBottom="8dp"
+ android:scaleType="centerCrop"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:retroCornerSize="21dp"
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 339dc2812..15f817ab2 100755
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -24,16 +24,16 @@
android:layout_height="wrap_content">
-
+ app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
-
+