diff --git a/app/build.gradle b/app/build.gradle index 8ef28fded..f43cd5a47 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -32,7 +32,7 @@ android { vectorDrawables.useSupportLibrary = true applicationId "code.name.monkey.retromusic" - versionCode 291 + versionCode 292 versionName '3.1.100' multiDexEnabled true diff --git a/app/src/main/assets/retro-changelog.html b/app/src/main/assets/retro-changelog.html index 1372c023f..6f7edf820 100644 --- a/app/src/main/assets/retro-changelog.html +++ b/app/src/main/assets/retro-changelog.html @@ -1 +1 @@ -

v3.1.100

v3.0.570

If you see entire app white or dark or black select same theme in settings to fix

FAQ's

*If you face any UI related issues you clear app data and cache, if its not working try to uninstall and install again.

\ No newline at end of file +

Subscribe to PewDiePie 👊

v3.1.100

v3.0.570

If you see entire app white or dark or black select same theme in settings to fix

FAQ's

*If you face any UI related issues you clear app data and cache, if its not working try to uninstall and install again.

\ No newline at end of file diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/artistimage/ArtistImageLoader.kt b/app/src/main/java/code/name/monkey/retromusic/glide/artistimage/ArtistImageLoader.kt index f8cde16f4..43e4882ac 100644 --- a/app/src/main/java/code/name/monkey/retromusic/glide/artistimage/ArtistImageLoader.kt +++ b/app/src/main/java/code/name/monkey/retromusic/glide/artistimage/ArtistImageLoader.kt @@ -38,9 +38,8 @@ class ArtistImageFetcher(private val context: Context, private val lastFMRestCli return InputStream::class.java } - override fun getDataSource(): DataSource { - return DataSource.REMOTE + return DataSource.MEMORY_CACHE } override fun loadData(priority: Priority, callback: DataFetcher.DataCallback) { diff --git a/app/src/main/java/code/name/monkey/retromusic/preferences/AlbumCoverStylePreferenceDialog.kt b/app/src/main/java/code/name/monkey/retromusic/preferences/AlbumCoverStylePreferenceDialog.kt index fc7df830b..cd93e16a2 100644 --- a/app/src/main/java/code/name/monkey/retromusic/preferences/AlbumCoverStylePreferenceDialog.kt +++ b/app/src/main/java/code/name/monkey/retromusic/preferences/AlbumCoverStylePreferenceDialog.kt @@ -41,8 +41,7 @@ class AlbumCoverStylePreference : DialogPreference { class AlbumCoverStylePreferenceDialog : PreferenceDialogFragmentCompat(), ViewPager.OnPageChangeListener { override fun onDialogClosed(positiveResult: Boolean) { - val nowPlayingScreen = AlbumCoverStyle.values()[viewPagerPosition] - PreferenceUtil.getInstance().albumCoverStyle = nowPlayingScreen + } private var viewPagerPosition: Int = 0 @@ -57,7 +56,10 @@ class AlbumCoverStylePreferenceDialog : PreferenceDialogFragmentCompat(), ViewPa return MaterialDialog(activity!!).show { title(R.string.pref_title_album_cover_style) - positiveButton(android.R.string.ok) + positiveButton(R.string.set) { + val nowPlayingScreen = AlbumCoverStyle.values()[viewPagerPosition] + PreferenceUtil.getInstance().albumCoverStyle = nowPlayingScreen + } negativeButton(android.R.string.cancel) customView(view = view, scrollable = false, noVerticalPadding = false) } diff --git a/app/src/main/java/code/name/monkey/retromusic/preferences/MaterialListPreference.kt b/app/src/main/java/code/name/monkey/retromusic/preferences/MaterialListPreference.kt index 9e906f16b..4d1d71e2a 100644 --- a/app/src/main/java/code/name/monkey/retromusic/preferences/MaterialListPreference.kt +++ b/app/src/main/java/code/name/monkey/retromusic/preferences/MaterialListPreference.kt @@ -52,7 +52,7 @@ class MaterialListPreferenceDialog : PreferenceDialogFragmentCompat() { return MaterialDialog(activity!!).show { title(text = materialListPreference.title.toString()) positiveButton(R.string.set) - listItemsSingleChoice(items = entries, initialSelection = position) { dialog, index, text -> + listItemsSingleChoice(items = entries, initialSelection = position) { _, index, _ -> materialListPreference.callChangeListener(entriesValues!![index]) materialListPreference.setCustomValue(entriesValues[index]) materialListPreference.summary = entries!![index] diff --git a/app/src/main/java/code/name/monkey/retromusic/preferences/NowPlayingScreenPreferenceDialog.kt b/app/src/main/java/code/name/monkey/retromusic/preferences/NowPlayingScreenPreferenceDialog.kt index 0cc22adcb..77f9ec435 100644 --- a/app/src/main/java/code/name/monkey/retromusic/preferences/NowPlayingScreenPreferenceDialog.kt +++ b/app/src/main/java/code/name/monkey/retromusic/preferences/NowPlayingScreenPreferenceDialog.kt @@ -56,14 +56,7 @@ class NowPlayingScreenPreferenceDialog : PreferenceDialogFragmentCompat(), ViewP } override fun onDialogClosed(positiveResult: Boolean) { - val nowPlayingScreen = NowPlayingScreen.values()[viewPagerPosition] - if (isNowPlayingThemes(nowPlayingScreen)) { - val result = getString(nowPlayingScreen.titleRes) + " theme is Pro version feature." - Toast.makeText(context, result, Toast.LENGTH_SHORT).show() - NavigationUtil.goToProVersion(activity!!) - } else { - PreferenceUtil.getInstance().nowPlayingScreen = nowPlayingScreen - } + } override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { @@ -78,7 +71,16 @@ class NowPlayingScreenPreferenceDialog : PreferenceDialogFragmentCompat(), ViewP return MaterialDialog(activity!!).show { title(R.string.pref_title_album_cover_style) - positiveButton(android.R.string.ok) + positiveButton(R.string.set) { + val nowPlayingScreen = NowPlayingScreen.values()[viewPagerPosition] + if (isNowPlayingThemes(nowPlayingScreen)) { + val result = getString(nowPlayingScreen.titleRes) + " theme is Pro version feature." + Toast.makeText(context, result, Toast.LENGTH_SHORT).show() + NavigationUtil.goToProVersion(activity!!) + } else { + PreferenceUtil.getInstance().nowPlayingScreen = nowPlayingScreen + } + } negativeButton(android.R.string.cancel) customView(view = view, scrollable = false, noVerticalPadding = false) } diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/SearchActivity.kt b/app/src/main/java/code/name/monkey/retromusic/ui/activities/SearchActivity.kt index c652c1ee8..6861748c9 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/SearchActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/SearchActivity.kt @@ -29,7 +29,7 @@ import java.util.* class SearchActivity : AbsMusicServiceActivity(), OnQueryTextListener, SearchContract.SearchView, TextWatcher { - private var searchPresenter: SearchPresenter? = null + private lateinit var searchPresenter: SearchPresenter private var searchAdapter: SearchAdapter? = null private var query: String? = null @@ -49,11 +49,6 @@ class SearchActivity : AbsMusicServiceActivity(), OnQueryTextListener, SearchCon setUpToolBar() setupSearchView() - if (savedInstanceState != null) { - query = savedInstanceState.getString(QUERY) - searchPresenter!!.search(query!!) - } - if (intent.getBooleanExtra("mic_search", false)) { startMicSearch() } @@ -76,7 +71,6 @@ class SearchActivity : AbsMusicServiceActivity(), OnQueryTextListener, SearchCon layoutManager = LinearLayoutManager(this@SearchActivity) adapter = searchAdapter } - } private fun setupSearchView() { @@ -86,13 +80,13 @@ class SearchActivity : AbsMusicServiceActivity(), OnQueryTextListener, SearchCon override fun onResume() { super.onResume() - searchPresenter!!.subscribe() - searchPresenter!!.search(query) + searchPresenter.subscribe() + searchPresenter.search(query) } override fun onDestroy() { super.onDestroy() - searchPresenter!!.unsubscribe() + searchPresenter.unsubscribe() } override fun onSaveInstanceState(outState: Bundle) { @@ -102,7 +96,7 @@ class SearchActivity : AbsMusicServiceActivity(), OnQueryTextListener, SearchCon override fun onRestoreInstanceState(savedInstanceState: Bundle) { super.onRestoreInstanceState(savedInstanceState) - searchPresenter!!.search(savedInstanceState.getString(QUERY, "")) + searchPresenter.search(savedInstanceState.getString(QUERY, "")) } private fun setUpToolBar() { @@ -113,12 +107,12 @@ class SearchActivity : AbsMusicServiceActivity(), OnQueryTextListener, SearchCon private fun search(query: String) { this.query = query.trim { it <= ' ' } voiceSearch.visibility = if (query.isNotEmpty()) View.GONE else View.VISIBLE - searchPresenter!!.search(query) + searchPresenter.search(query) } override fun onMediaStoreChanged() { super.onMediaStoreChanged() - searchPresenter!!.search(query!!) + searchPresenter.search(query!!) } override fun onQueryTextSubmit(query: String): Boolean { @@ -164,7 +158,7 @@ class SearchActivity : AbsMusicServiceActivity(), OnQueryTextListener, SearchCon .getStringArrayListExtra(RecognizerIntent.EXTRA_RESULTS) query = result[0] searchView.setText(query, BufferType.EDITABLE) - searchPresenter!!.search(query!!) + searchPresenter.search(query!!) } } } diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/WhatsNewActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/WhatsNewActivity.java index b9be63868..00ba10ad7 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/WhatsNewActivity.java +++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/WhatsNewActivity.java @@ -65,7 +65,7 @@ public class WhatsNewActivity extends AbsBaseActivity { setTitle(null); toolbar.setNavigationOnClickListener(v -> onBackPressed()); title.setTextColor(ThemeStore.Companion.textColorPrimary(this)); - +ToolbarContentTintHelper.colorBackButton(toolbar,ThemeStore.Companion.textColorSecondary(this)); try { // Load from phonograph-changelog.html in the assets folder diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/GenreAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/GenreAdapter.kt index d9f11dd96..b7f780ad6 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/GenreAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/GenreAdapter.kt @@ -42,7 +42,7 @@ class GenreAdapter(private val mActivity: Activity, dataSet: ArrayList, p } if (holder.separator != null) { - holder.separator!!.visibility = View.VISIBLE + holder.separator!!.visibility = View.GONE } } diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/SearchAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/SearchAdapter.kt index 81b2e312c..8b95dd62c 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/SearchAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/SearchAdapter.kt @@ -115,10 +115,8 @@ class SearchAdapter(private val activity: AppCompatActivity, private var dataSet override fun onClick(v: View?) { val item = dataSet!![adapterPosition] when (itemViewType) { - ALBUM -> NavigationUtil.goToAlbum(activity, - (item as Album).id, Pair.create(image, activity.resources.getString(R.string.transition_album_art))) - ARTIST -> NavigationUtil.goToArtist(activity, - (item as Artist).id, Pair.create(image, activity.resources.getString(R.string.transition_artist_image))) + ALBUM -> NavigationUtil.goToAlbum(activity, (item as Album).id, Pair.create(image, activity.resources.getString(R.string.transition_album_art))) + ARTIST -> NavigationUtil.goToArtist(activity, (item as Artist).id, Pair.create(image, activity.resources.getString(R.string.transition_artist_image))) SONG -> { val playList = ArrayList() playList.add(item as Song) diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/AlbumAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/AlbumAdapter.kt index 1bfe78330..4bd3e629d 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/AlbumAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/AlbumAdapter.kt @@ -91,7 +91,7 @@ open class AlbumAdapter(protected val activity: AppCompatActivity, } } else { if (holder.shortSeparator != null) { - holder.shortSeparator!!.visibility = View.VISIBLE + holder.shortSeparator!!.visibility = View.GONE } } diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/artist/ArtistAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/artist/ArtistAdapter.kt index ef26f13ed..605649ec9 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/artist/ArtistAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/artist/ArtistAdapter.kt @@ -52,7 +52,7 @@ class ArtistAdapter(val activity: AppCompatActivity, return createViewHolder(view) } - protected fun createViewHolder(view: View): ViewHolder { + private fun createViewHolder(view: View): ViewHolder { return ViewHolder(view) } @@ -69,7 +69,7 @@ class ArtistAdapter(val activity: AppCompatActivity, holder.text!!.visibility = View.GONE } if (holder.shortSeparator != null) { - holder.shortSeparator!!.visibility = View.VISIBLE + holder.shortSeparator!!.visibility = View.GONE } loadArtistImage(artist, holder) } diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/base/MediaEntryViewHolder.kt b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/base/MediaEntryViewHolder.kt index 9c6d66901..2749ab98d 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/base/MediaEntryViewHolder.kt +++ b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/base/MediaEntryViewHolder.kt @@ -1,5 +1,6 @@ package code.name.monkey.retromusic.ui.adapter.base +import android.graphics.Color import android.os.Build import android.view.View import android.view.ViewGroup @@ -10,8 +11,9 @@ import androidx.cardview.widget.CardView import androidx.recyclerview.widget.RecyclerView import code.name.monkey.appthemehelper.ThemeStore import code.name.monkey.retromusic.R +import com.google.android.material.card.MaterialCardView -open class MediaEntryViewHolder(w: View) : RecyclerView.ViewHolder(w), View.OnClickListener, View.OnLongClickListener { +open class MediaEntryViewHolder(view: View) : RecyclerView.ViewHolder(view), View.OnClickListener, View.OnLongClickListener { override fun onLongClick(v: View?): Boolean { return false } @@ -38,31 +40,33 @@ open class MediaEntryViewHolder(w: View) : RecyclerView.ViewHolder(w), View.OnCl var imageTextContainer: CardView? = null init { - title = w.findViewById(R.id.title) - text = w.findViewById(R.id.text) - image = w.findViewById(R.id.image) - imageContainer = w.findViewById(R.id.image_container) - imageTextContainer = w.findViewById(R.id.image_text_container) - imageContainerCard = w.findViewById(R.id.image_container_card) - imageText = w.findViewById(R.id.image_text) + title = view.findViewById(R.id.title) + text = view.findViewById(R.id.text) - menu = w.findViewById(R.id.menu) - dragView = w.findViewById(R.id.drag_view) + image = view.findViewById(R.id.image) + imageContainer = view.findViewById(R.id.image_container) + imageTextContainer = view.findViewById(R.id.image_text_container) + imageContainerCard = view.findViewById(R.id.image_container_card) - separator = w.findViewById(R.id.separator) - shortSeparator = w.findViewById(R.id.short_separator) - paletteColorContainer = w.findViewById(R.id.palette_color_container) + imageText = view.findViewById(R.id.image_text) - time = w.findViewById(R.id.time); - recyclerView = w.findViewById(R.id.recycler_view) + menu = view.findViewById(R.id.menu) + dragView = view.findViewById(R.id.drag_view) - mask = w.findViewById(R.id.mask) - playSongs = w.findViewById(R.id.playSongs) + separator = view.findViewById(R.id.separator) + shortSeparator = view.findViewById(R.id.short_separator) + paletteColorContainer = view.findViewById(R.id.palette_color_container) - w.setOnClickListener(this) - w.setOnLongClickListener(this) + time = view.findViewById(R.id.time); + recyclerView = view.findViewById(R.id.recycler_view) + + mask = view.findViewById(R.id.mask) + playSongs = view.findViewById(R.id.playSongs) + + view.setOnClickListener(this@MediaEntryViewHolder) + view.setOnLongClickListener(this) if (imageTextContainer != null) { imageTextContainer!!.setCardBackgroundColor(ThemeStore.primaryColor(itemView.context)) diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/playlist/PlaylistAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/playlist/PlaylistAdapter.kt index c61cec7a3..07dcdebd1 100755 --- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/playlist/PlaylistAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/playlist/PlaylistAdapter.kt @@ -92,7 +92,7 @@ class PlaylistAdapter(protected val activity: AppCompatActivity, dataSet: ArrayL } } else { if (holder.shortSeparator != null && dataSet[position] !is AbsSmartPlaylist) { - holder.shortSeparator!!.visibility = View.VISIBLE + holder.shortSeparator!!.visibility = View.GONE } } } diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/PlaylistSongAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/PlaylistSongAdapter.kt index 3f6a0a1cb..fcc6f1c85 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/PlaylistSongAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/PlaylistSongAdapter.kt @@ -49,7 +49,7 @@ open class PlaylistSongAdapter(activity: AppCompatActivity, dataSet: ArrayList - - - - - diff --git a/app/src/main/res/layout/activity_playlist_detail.xml b/app/src/main/res/layout/activity_playlist_detail.xml index 8579961c1..8b8d02bf8 100644 --- a/app/src/main/res/layout/activity_playlist_detail.xml +++ b/app/src/main/res/layout/activity_playlist_detail.xml @@ -55,11 +55,6 @@ - - diff --git a/app/src/main/res/layout/activity_pro_version.xml b/app/src/main/res/layout/activity_pro_version.xml index 33ff9fc78..56d797efa 100644 --- a/app/src/main/res/layout/activity_pro_version.xml +++ b/app/src/main/res/layout/activity_pro_version.xml @@ -48,11 +48,6 @@ - - diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml index 3853306ff..9796243a7 100755 --- a/app/src/main/res/layout/activity_search.xml +++ b/app/src/main/res/layout/activity_search.xml @@ -36,8 +36,7 @@ android:layout_height="wrap_content" android:layout_weight="1" app:cardCornerRadius="25dp" - app:cardElevation="0dp" - app:cardUseCompatPadding="true"> + app:cardElevation="0dp"> + android:padding="12dp"> + + + diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 3760ef42b..f48a9162b 100755 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -31,11 +31,6 @@ - - diff --git a/app/src/main/res/layout/card_credit.xml b/app/src/main/res/layout/card_credit.xml index 4977f2a3c..a47bf7892 100644 --- a/app/src/main/res/layout/card_credit.xml +++ b/app/src/main/res/layout/card_credit.xml @@ -1,6 +1,5 @@ @@ -9,21 +8,11 @@ style="@style/SubTitleTextAppearance" android:text="@string/credit_title" /> - - - - - - - + android:layout_height="wrap_content" /> - + android:orientation="vertical" + android:padding="8dp"> + + + + + + + + + + + + + + + + + android:paddingStart="12dp" + android:paddingTop="8dp" + android:paddingEnd="12dp" + android:paddingBottom="8dp" + tools:ignore="PrivateResource"> - + android:text="@string/version" /> - - - - - - - - - - - - - - - - - - - - - - + android:alpha="0.85" + android:text="0.0.0" /> - + \ No newline at end of file diff --git a/app/src/main/res/layout/card_retro_info.xml b/app/src/main/res/layout/card_retro_info.xml index a985b53c2..2aba0468e 100644 --- a/app/src/main/res/layout/card_retro_info.xml +++ b/app/src/main/res/layout/card_retro_info.xml @@ -10,271 +10,269 @@ style="@style/SubTitleTextAppearance" android:text="@string/support_development" /> - + android:orientation="vertical"> + + android:background="?attr/rectSelector" + android:clickable="true" + android:focusable="true" + android:minHeight="@dimen/md_listitem_height" + android:orientation="horizontal" + tools:ignore="PrivateResource"> + + android:orientation="vertical" + android:paddingStart="12dp" + android:paddingTop="8dp" + android:paddingEnd="12dp" + android:paddingBottom="8dp"> - - + android:fontFamily="@font/circular" + android:text="@string/git_hub" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:alpha="0.85" + android:text="@string/git_hub_summary" /> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/card_social.xml b/app/src/main/res/layout/card_social.xml index 6034c86bf..e535b1f18 100644 --- a/app/src/main/res/layout/card_social.xml +++ b/app/src/main/res/layout/card_social.xml @@ -10,268 +10,267 @@ style="@style/SubTitleTextAppearance" android:text="@string/social" /> - + android:orientation="vertical"> + + android:background="?attr/rectSelector" + android:clickable="true" + android:focusable="true" + android:minHeight="@dimen/md_listitem_height" + android:orientation="horizontal" + tools:ignore="PrivateResource"> + + android:orientation="vertical" + android:paddingStart="12dp" + android:paddingTop="8dp" + android:paddingEnd="12dp" + android:paddingBottom="8dp"> - - + android:text="@string/pinterest_page" + style="@style/TextAppearance.MaterialComponents.Subtitle1" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:alpha="0.85" + style="@style/TextAppearance.MaterialComponents.Body2" + android:text="@string/pinterest_page_summary" /> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_playlist.xml b/app/src/main/res/layout/dialog_playlist.xml index 982a01753..1aca058ea 100644 --- a/app/src/main/res/layout/dialog_playlist.xml +++ b/app/src/main/res/layout/dialog_playlist.xml @@ -48,8 +48,8 @@ android:layout_marginTop="8dp" android:layout_marginEnd="12dp" android:gravity="center_vertical" - android:paddingTop="12dp" - android:paddingBottom="12dp" + android:paddingTop="14dp" + android:paddingBottom="14dp" android:text="@string/create_action" app:backgroundTint="@color/md_pink_A400" /> @@ -59,11 +59,10 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="12dp" - android:layout_marginTop="8dp" android:layout_marginEnd="12dp" android:gravity="center_vertical" - android:paddingTop="12dp" - android:paddingBottom="12dp" + android:paddingTop="14dp" + android:paddingBottom="14dp" android:text="@android:string/cancel" app:strokeWidth="2dp" /> diff --git a/app/src/main/res/layout/item_list.xml b/app/src/main/res/layout/item_list.xml index 9f292d0da..48da06850 100755 --- a/app/src/main/res/layout/item_list.xml +++ b/app/src/main/res/layout/item_list.xml @@ -7,12 +7,14 @@ android:clickable="true" android:focusable="true" android:foreground="?rectSelector" - android:minHeight="72dp" + android:minHeight="64dp" tools:ignore="MissingPrefix"> + android:scaleType="centerCrop" /> @@ -65,11 +67,10 @@ @@ -78,7 +79,6 @@ android:id="@+id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginBottom="2dp" android:ellipsize="end" android:maxLines="1" android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1" diff --git a/app/src/main/res/layout/sliding_music_panel_layout.xml b/app/src/main/res/layout/sliding_music_panel_layout.xml index 837e67762..c4fc58f7c 100644 --- a/app/src/main/res/layout/sliding_music_panel_layout.xml +++ b/app/src/main/res/layout/sliding_music_panel_layout.xml @@ -2,8 +2,8 @@ + \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 7c6394e6a..93993fdf0 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -14,7 +14,6 @@ + +