From bed8a7a9ad3d0147291ee9e70ebe97b1d5323f58 Mon Sep 17 00:00:00 2001 From: h4h13 Date: Mon, 30 Dec 2019 10:23:51 +0530 Subject: [PATCH] Removed font onum --- .../retromusic/appwidgets/AppWidgetBig.kt | 344 +++++++++--------- .../retromusic/helper/MusicPlayerRemote.kt | 6 +- .../retromusic/service/MusicService.java | 4 +- .../main/res/layout-land/activity_album.xml | 2 - .../layout-land/activity_artist_details.xml | 2 - .../res/layout-xlarge-land/activity_album.xml | 2 - .../activity_artist_details.xml | 2 - .../fragment_player_playback_controls.xml | 8 +- .../main/res/layout-xlarge/activity_album.xml | 2 - .../layout-xlarge/activity_artist_details.xml | 2 - app/src/main/res/layout/activity_album.xml | 2 - .../res/layout/activity_artist_details.xml | 2 - ...ment_adaptive_player_playback_controls.xml | 4 - ...fragment_blur_player_playback_controls.xml | 4 - ...ent_card_blur_player_playback_controls.xml | 4 - ...fragment_card_player_playback_controls.xml | 216 ++++++----- ...ragment_color_player_playback_controls.xml | 8 +- .../layout/fragment_fit_playback_controls.xml | 8 +- ...fragment_flat_player_playback_controls.xml | 8 +- .../layout/fragment_full_player_controls.xml | 4 +- ...fragment_lock_screen_playback_controls.xml | 8 +- .../fragment_material_playback_controls.xml | 8 +- .../layout/fragment_peak_control_player.xml | 8 +- .../fragment_plain_controls_fragment.xml | 8 +- .../fragment_player_playback_controls.xml | 8 +- .../fragment_simple_controls_fragment.xml | 4 +- .../main/res/layout/fragment_tiny_player.xml | 4 +- app/src/main/res/layout/item_list.xml | 6 +- .../main/res/layout/item_list_no_image.xml | 4 +- app/src/main/res/layout/item_queue.xml | 6 +- app/src/main/res/layout/item_song.xml | 8 +- .../res/layout/list_item_view_seekbar.xml | 4 +- 32 files changed, 341 insertions(+), 369 deletions(-) diff --git a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetBig.kt b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetBig.kt index f7e51128..3a152aad 100644 --- a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetBig.kt +++ b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetBig.kt @@ -15,7 +15,9 @@ package code.name.monkey.retromusic.appwidgets import android.app.PendingIntent -import android.content.* +import android.content.ComponentName +import android.content.Context +import android.content.Intent import android.graphics.Bitmap import android.graphics.drawable.Drawable import android.text.TextUtils @@ -31,201 +33,201 @@ import code.name.monkey.retromusic.service.MusicService.* import code.name.monkey.retromusic.util.RetroUtil import com.bumptech.glide.Glide import com.bumptech.glide.request.animation.GlideAnimation -import com.bumptech.glide.request.target.* +import com.bumptech.glide.request.target.SimpleTarget import com.bumptech.glide.request.target.Target class AppWidgetBig : BaseAppWidget() { - private var target: Target? = null // for cancellation + private var target: Target? = null // for cancellation - /** - * Initialize given widgets to default state, where we launch Music on default click and hide - * actions if service not running. - */ - override fun defaultAppWidget(context: Context, appWidgetIds: IntArray) { - val appWidgetView = RemoteViews( - context.packageName, code.name.monkey.retromusic.R.layout.app_widget_big - ) + /** + * Initialize given widgets to default state, where we launch Music on default click and hide + * actions if service not running. + */ + override fun defaultAppWidget(context: Context, appWidgetIds: IntArray) { + val appWidgetView = RemoteViews( + context.packageName, code.name.monkey.retromusic.R.layout.app_widget_big + ) - appWidgetView.setViewVisibility( - code.name.monkey.retromusic.R.id.media_titles, - View.INVISIBLE - ) - appWidgetView.setImageViewResource(R.id.image, R.drawable.default_album_art) - appWidgetView.setImageViewBitmap( - R.id.button_next, BaseAppWidget.createBitmap( - RetroUtil.getTintedVectorDrawable( - context, - code.name.monkey.retromusic.R.drawable.ic_skip_next_white_24dp, - MaterialValueHelper.getPrimaryTextColor(context, false) - )!!, 1f - ) - ) - appWidgetView.setImageViewBitmap( - R.id.button_prev, BaseAppWidget.Companion.createBitmap( - RetroUtil.getTintedVectorDrawable( - context, - code.name.monkey.retromusic.R.drawable.ic_skip_previous_white_24dp, - MaterialValueHelper.getPrimaryTextColor(context, false) - )!!, 1f - ) - ) - appWidgetView.setImageViewBitmap( - R.id.button_toggle_play_pause, BaseAppWidget.Companion.createBitmap( - RetroUtil.getTintedVectorDrawable( - context, - code.name.monkey.retromusic.R.drawable.ic_play_arrow_white_32dp, - MaterialValueHelper.getPrimaryTextColor(context, false) - )!!, 1f - ) - ) + appWidgetView.setViewVisibility( + code.name.monkey.retromusic.R.id.media_titles, + View.INVISIBLE + ) + appWidgetView.setImageViewResource(R.id.image, R.drawable.default_album_art) + appWidgetView.setImageViewBitmap( + R.id.button_next, BaseAppWidget.createBitmap( + RetroUtil.getTintedVectorDrawable( + context, + code.name.monkey.retromusic.R.drawable.ic_skip_next_white_24dp, + MaterialValueHelper.getPrimaryTextColor(context, false) + )!!, 1f + ) + ) + appWidgetView.setImageViewBitmap( + R.id.button_prev, BaseAppWidget.Companion.createBitmap( + RetroUtil.getTintedVectorDrawable( + context, + code.name.monkey.retromusic.R.drawable.ic_skip_previous_white_24dp, + MaterialValueHelper.getPrimaryTextColor(context, false) + )!!, 1f + ) + ) + appWidgetView.setImageViewBitmap( + R.id.button_toggle_play_pause, BaseAppWidget.Companion.createBitmap( + RetroUtil.getTintedVectorDrawable( + context, + code.name.monkey.retromusic.R.drawable.ic_play_arrow_white_32dp, + MaterialValueHelper.getPrimaryTextColor(context, false) + )!!, 1f + ) + ) - linkButtons(context, appWidgetView) - pushUpdate(context, appWidgetIds, appWidgetView) - } + linkButtons(context, appWidgetView) + pushUpdate(context, appWidgetIds, appWidgetView) + } - /** - * Update all active widget instances by pushing changes - */ - override fun performUpdate(service: MusicService, appWidgetIds: IntArray?) { - val appWidgetView = RemoteViews( - service.packageName, code.name.monkey.retromusic.R.layout.app_widget_big - ) + /** + * Update all active widget instances by pushing changes + */ + override fun performUpdate(service: MusicService, appWidgetIds: IntArray?) { + val appWidgetView = RemoteViews( + service.packageName, code.name.monkey.retromusic.R.layout.app_widget_big + ) - val isPlaying = service.isPlaying - val song = service.currentSong + val isPlaying = service.isPlaying + val song = service.currentSong - // Set the titles and artwork - if (TextUtils.isEmpty(song.title) && TextUtils.isEmpty(song.artistName)) { - appWidgetView.setViewVisibility( - code.name.monkey.retromusic.R.id.media_titles, - View.INVISIBLE - ) - } else { - appWidgetView.setViewVisibility( - code.name.monkey.retromusic.R.id.media_titles, - View.VISIBLE - ) - appWidgetView.setTextViewText(code.name.monkey.retromusic.R.id.title, song.title) - appWidgetView.setTextViewText( - code.name.monkey.retromusic.R.id.text, - getSongArtistAndAlbum(song) - ) - } + // Set the titles and artwork + if (TextUtils.isEmpty(song.title) && TextUtils.isEmpty(song.artistName)) { + appWidgetView.setViewVisibility( + code.name.monkey.retromusic.R.id.media_titles, + View.INVISIBLE + ) + } else { + appWidgetView.setViewVisibility( + code.name.monkey.retromusic.R.id.media_titles, + View.VISIBLE + ) + appWidgetView.setTextViewText(code.name.monkey.retromusic.R.id.title, song.title) + appWidgetView.setTextViewText( + code.name.monkey.retromusic.R.id.text, + getSongArtistAndAlbum(song) + ) + } - // Set correct drawable for pause state - val playPauseRes = if (isPlaying) code.name.monkey.retromusic.R.drawable.ic_pause_white_24dp else code.name.monkey.retromusic.R.drawable.ic_play_arrow_white_32dp - appWidgetView.setImageViewBitmap( - R.id.button_toggle_play_pause, BaseAppWidget.createBitmap( - RetroUtil.getTintedVectorDrawable( - service, - playPauseRes, - MaterialValueHelper.getPrimaryTextColor(service, false) - )!!, 1f - ) - ) + // Set correct drawable for pause state + val playPauseRes = if (isPlaying) code.name.monkey.retromusic.R.drawable.ic_pause_white_24dp else code.name.monkey.retromusic.R.drawable.ic_play_arrow_white_32dp + appWidgetView.setImageViewBitmap( + R.id.button_toggle_play_pause, BaseAppWidget.createBitmap( + RetroUtil.getTintedVectorDrawable( + service, + playPauseRes, + MaterialValueHelper.getPrimaryTextColor(service, false) + )!!, 1f + ) + ) - // Set prev/next button drawables - appWidgetView.setImageViewBitmap( - R.id.button_next, BaseAppWidget.Companion.createBitmap( - RetroUtil.getTintedVectorDrawable( - service, - code.name.monkey.retromusic.R.drawable.ic_skip_next_white_24dp, - MaterialValueHelper.getPrimaryTextColor(service, false) - )!!, 1f - ) - ) - appWidgetView.setImageViewBitmap( - R.id.button_prev, BaseAppWidget.Companion.createBitmap( - RetroUtil.getTintedVectorDrawable( - service, - code.name.monkey.retromusic.R.drawable.ic_skip_previous_white_24dp, - MaterialValueHelper.getPrimaryTextColor(service, false) - )!!, 1f - ) - ) + // Set prev/next button drawables + appWidgetView.setImageViewBitmap( + R.id.button_next, BaseAppWidget.Companion.createBitmap( + RetroUtil.getTintedVectorDrawable( + service, + code.name.monkey.retromusic.R.drawable.ic_skip_next_white_24dp, + MaterialValueHelper.getPrimaryTextColor(service, false) + )!!, 1f + ) + ) + appWidgetView.setImageViewBitmap( + R.id.button_prev, BaseAppWidget.Companion.createBitmap( + RetroUtil.getTintedVectorDrawable( + service, + code.name.monkey.retromusic.R.drawable.ic_skip_previous_white_24dp, + MaterialValueHelper.getPrimaryTextColor(service, false) + )!!, 1f + ) + ) - // Link actions buttons to intents - linkButtons(service, appWidgetView) + // Link actions buttons to intents + linkButtons(service, appWidgetView) - // Load the album cover async and push the update on completion - val p = RetroUtil.getScreenSize(service) - val widgetImageSize = Math.min(p.x, p.y) - val appContext = service.applicationContext - service.runOnUiThread { - if (target != null) { - Glide.clear(target) - } - target = SongGlideRequest.Builder.from(Glide.with(appContext), song) - .checkIgnoreMediaStore(appContext).asBitmap().build() - .into(object : SimpleTarget(widgetImageSize, widgetImageSize) { - override fun onResourceReady( - resource: Bitmap, - glideAnimation: GlideAnimation - ) { - update(resource) - } + // Load the album cover async and push the update on completion + val p = RetroUtil.getScreenSize(service) + val widgetImageSize = Math.min(p.x, p.y) + val appContext = service.applicationContext + service.runOnUiThread { + if (target != null) { + Glide.clear(target) + } + target = SongGlideRequest.Builder.from(Glide.with(appContext), song) + .checkIgnoreMediaStore(appContext).asBitmap().build() + .into(object : SimpleTarget(widgetImageSize, widgetImageSize) { + override fun onResourceReady( + resource: Bitmap, + glideAnimation: GlideAnimation + ) { + update(resource) + } - override fun onLoadFailed(e: Exception?, errorDrawable: Drawable?) { - super.onLoadFailed(e, errorDrawable) - update(null) - } + override fun onLoadFailed(e: Exception?, errorDrawable: Drawable?) { + super.onLoadFailed(e, errorDrawable) + update(null) + } - private fun update(bitmap: Bitmap?) { - if (bitmap == null) { - appWidgetView.setImageViewResource( - R.id.image, - R.drawable.default_album_art - ) - } else { - appWidgetView.setImageViewBitmap(R.id.image, bitmap) - } - pushUpdate(appContext, appWidgetIds, appWidgetView) - } - }); - } - } + private fun update(bitmap: Bitmap?) { + if (bitmap == null) { + appWidgetView.setImageViewResource( + R.id.image, + R.drawable.default_album_art + ) + } else { + appWidgetView.setImageViewBitmap(R.id.image, bitmap) + } + pushUpdate(appContext, appWidgetIds, appWidgetView) + } + }); + } + } - /** - * Link up various button actions using [PendingIntent]. - */ - private fun linkButtons(context: Context, views: RemoteViews) { - val action = Intent(context, MainActivity::class.java).putExtra("expand", true) - var pendingIntent: PendingIntent + /** + * Link up various button actions using [PendingIntent]. + */ + private fun linkButtons(context: Context, views: RemoteViews) { + val action = Intent(context, MainActivity::class.java).putExtra("expand", true) + var pendingIntent: PendingIntent - val serviceName = ComponentName(context, MusicService::class.java) + val serviceName = ComponentName(context, MusicService::class.java) - // Home - action.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP - pendingIntent = PendingIntent.getActivity(context, 0, action, 0) - views.setOnClickPendingIntent(R.id.clickable_area, pendingIntent) + // Home + action.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP + pendingIntent = PendingIntent.getActivity(context, 0, action, 0) + views.setOnClickPendingIntent(R.id.clickable_area, pendingIntent) - // Previous track - pendingIntent = buildPendingIntent(context, ACTION_REWIND, serviceName) - views.setOnClickPendingIntent(R.id.button_prev, pendingIntent) + // Previous track + pendingIntent = buildPendingIntent(context, ACTION_REWIND, serviceName) + views.setOnClickPendingIntent(R.id.button_prev, pendingIntent) - // Play and pause - pendingIntent = buildPendingIntent(context, ACTION_TOGGLE_PAUSE, serviceName) - views.setOnClickPendingIntent(R.id.button_toggle_play_pause, pendingIntent) + // Play and pause + pendingIntent = buildPendingIntent(context, ACTION_TOGGLE_PAUSE, serviceName) + views.setOnClickPendingIntent(R.id.button_toggle_play_pause, pendingIntent) - // Next track - pendingIntent = buildPendingIntent(context, ACTION_SKIP, serviceName) - views.setOnClickPendingIntent(R.id.button_next, pendingIntent) + // Next track + pendingIntent = buildPendingIntent(context, ACTION_SKIP, serviceName) + views.setOnClickPendingIntent(R.id.button_next, pendingIntent) - } + } - companion object { + companion object { - const val NAME: String = "app_widget_big" - private var mInstance: AppWidgetBig? = null + const val NAME: String = "app_widget_big" + private var mInstance: AppWidgetBig? = null - val instance: AppWidgetBig - @Synchronized get() { - if (mInstance == null) { - mInstance = AppWidgetBig() - } - return mInstance!! - } + val instance: AppWidgetBig + @Synchronized get() { + if (mInstance == null) { + mInstance = AppWidgetBig() + } + return mInstance!! + } - } + } } diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/MusicPlayerRemote.kt b/app/src/main/java/code/name/monkey/retromusic/helper/MusicPlayerRemote.kt index 2e23081d..6166e6db 100644 --- a/app/src/main/java/code/name/monkey/retromusic/helper/MusicPlayerRemote.kt +++ b/app/src/main/java/code/name/monkey/retromusic/helper/MusicPlayerRemote.kt @@ -69,7 +69,7 @@ object MusicPlayerRemote { val playingQueue: ArrayList get() = if (musicService != null) { - musicService!!.playingQueue + musicService?.playingQueue as ArrayList } else ArrayList() val songProgressMillis: Int @@ -153,11 +153,13 @@ object MusicPlayerRemote { } return null } + fun getQueueDurationSongs(): Int { return if (musicService != null) { - musicService!!.playingQueue.size + musicService!!.playingQueue!!.size } else -1 } + /** * Async */ diff --git a/app/src/main/java/code/name/monkey/retromusic/service/MusicService.java b/app/src/main/java/code/name/monkey/retromusic/service/MusicService.java index 67fbb1da..36d35161 100644 --- a/app/src/main/java/code/name/monkey/retromusic/service/MusicService.java +++ b/app/src/main/java/code/name/monkey/retromusic/service/MusicService.java @@ -747,12 +747,12 @@ public class MusicService extends Service implements uiThreadHandler.post(runnable); } - @Nullable + @NonNull public Song getCurrentSong() { return getSongAt(getPosition()); } - @Nullable + @NonNull public Song getSongAt(int position) { if (position >= 0 && getPlayingQueue() != null && position < getPlayingQueue().size()) { return getPlayingQueue().get(position); diff --git a/app/src/main/res/layout-land/activity_album.xml b/app/src/main/res/layout-land/activity_album.xml index c450afa4..c5f02d86 100644 --- a/app/src/main/res/layout-land/activity_album.xml +++ b/app/src/main/res/layout-land/activity_album.xml @@ -111,8 +111,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:ellipsize="end" - android:fontFamily="sans-serif" - android:fontFeatureSettings="onum" android:paddingTop="4dp" android:singleLine="true" android:textAppearance="@style/TextViewSubtitle2" diff --git a/app/src/main/res/layout-land/activity_artist_details.xml b/app/src/main/res/layout-land/activity_artist_details.xml index 1b7bf2eb..daf0276e 100644 --- a/app/src/main/res/layout-land/activity_artist_details.xml +++ b/app/src/main/res/layout-land/activity_artist_details.xml @@ -96,8 +96,6 @@ android:id="@+id/text" android:layout_width="match_parent" android:layout_height="wrap_content" - android:fontFamily="sans-serif" - android:fontFeatureSettings="onum" android:paddingTop="4dp" android:textAppearance="@style/TextViewSubtitle2" android:textColor="?android:attr/textColorSecondary" diff --git a/app/src/main/res/layout-xlarge-land/activity_album.xml b/app/src/main/res/layout-xlarge-land/activity_album.xml index b8764e5a..d31547b4 100644 --- a/app/src/main/res/layout-xlarge-land/activity_album.xml +++ b/app/src/main/res/layout-xlarge-land/activity_album.xml @@ -126,8 +126,6 @@ android:id="@+id/albumText" android:layout_width="match_parent" android:layout_height="wrap_content" - android:fontFamily="sans-serif" - android:fontFeatureSettings="onum" android:paddingTop="4dp" android:textAppearance="@style/TextViewHeadline6" android:textColor="?android:attr/textColorSecondary" diff --git a/app/src/main/res/layout-xlarge-land/activity_artist_details.xml b/app/src/main/res/layout-xlarge-land/activity_artist_details.xml index 8808c29d..6def3774 100644 --- a/app/src/main/res/layout-xlarge-land/activity_artist_details.xml +++ b/app/src/main/res/layout-xlarge-land/activity_artist_details.xml @@ -98,8 +98,6 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:ellipsize="end" - android:fontFamily="sans-serif" - android:fontFeatureSettings="onum" android:paddingTop="4dp" android:singleLine="true" android:textAppearance="@style/TextViewHeadline6" diff --git a/app/src/main/res/layout-xlarge-land/fragment_player_playback_controls.xml b/app/src/main/res/layout-xlarge-land/fragment_player_playback_controls.xml index 94645264..8709690e 100755 --- a/app/src/main/res/layout-xlarge-land/fragment_player_playback_controls.xml +++ b/app/src/main/res/layout-xlarge-land/fragment_player_playback_controls.xml @@ -130,8 +130,8 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_alignParentRight="true" - android:fontFamily="sans-serif" - android:fontFeatureSettings="onum" + + android:gravity="center_vertical|right|end" android:paddingRight="8dp" android:singleLine="true" @@ -145,8 +145,8 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_alignParentLeft="true" - android:fontFamily="sans-serif" - android:fontFeatureSettings="onum" + + android:gravity="center_vertical|left|end" android:paddingLeft="8dp" android:singleLine="true" diff --git a/app/src/main/res/layout-xlarge/activity_album.xml b/app/src/main/res/layout-xlarge/activity_album.xml index 5df4d4c4..23ecc5ea 100644 --- a/app/src/main/res/layout-xlarge/activity_album.xml +++ b/app/src/main/res/layout-xlarge/activity_album.xml @@ -132,8 +132,6 @@ android:layout_gravity="center" android:ellipsize="marquee" android:focusable="true" - android:fontFamily="sans-serif" - android:fontFeatureSettings="onum" android:focusableInTouchMode="true" android:freezesText="true" android:textColor="?android:attr/textColorSecondary" diff --git a/app/src/main/res/layout-xlarge/activity_artist_details.xml b/app/src/main/res/layout-xlarge/activity_artist_details.xml index b6bfa923..26b373bb 100644 --- a/app/src/main/res/layout-xlarge/activity_artist_details.xml +++ b/app/src/main/res/layout-xlarge/activity_artist_details.xml @@ -100,8 +100,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingTop="4dp" - android:fontFamily="sans-serif" - android:fontFeatureSettings="onum" android:textAppearance="@style/TextViewHeadline6" android:textColor="?android:attr/textColorSecondary" tools:ignore="MissingPrefix" diff --git a/app/src/main/res/layout/activity_album.xml b/app/src/main/res/layout/activity_album.xml index edf00d2e..e30dd78e 100755 --- a/app/src/main/res/layout/activity_album.xml +++ b/app/src/main/res/layout/activity_album.xml @@ -112,8 +112,6 @@ android:layout_marginStart="16dp" android:layout_marginTop="4dp" android:layout_marginEnd="16dp" - android:fontFamily="sans-serif" - android:fontFeatureSettings="onum" android:singleLine="true" android:textAppearance="@style/TextViewSubtitle2" android:textColor="?android:attr/textColorSecondary" diff --git a/app/src/main/res/layout/activity_artist_details.xml b/app/src/main/res/layout/activity_artist_details.xml index e1677055..d25f0b8f 100755 --- a/app/src/main/res/layout/activity_artist_details.xml +++ b/app/src/main/res/layout/activity_artist_details.xml @@ -96,8 +96,6 @@ android:layout_height="wrap_content" android:layout_marginStart="16dp" android:layout_marginTop="4dp" - android:fontFamily="sans-serif" - android:fontFeatureSettings="onum" android:layout_marginEnd="16dp" android:textAppearance="@style/TextViewSubtitle2" android:textColor="?android:attr/textColorSecondary" diff --git a/app/src/main/res/layout/fragment_adaptive_player_playback_controls.xml b/app/src/main/res/layout/fragment_adaptive_player_playback_controls.xml index cda1e808..b40225b9 100644 --- a/app/src/main/res/layout/fragment_adaptive_player_playback_controls.xml +++ b/app/src/main/res/layout/fragment_adaptive_player_playback_controls.xml @@ -24,8 +24,6 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_alignParentLeft="true" - android:fontFamily="sans-serif" - android:fontFeatureSettings="onum" android:gravity="center_vertical|left|end" android:paddingLeft="8dp" android:singleLine="true" @@ -39,8 +37,6 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_alignParentRight="true" - android:fontFamily="sans-serif" - android:fontFeatureSettings="onum" android:gravity="center_vertical|right|end" android:paddingRight="8dp" android:singleLine="true" diff --git a/app/src/main/res/layout/fragment_blur_player_playback_controls.xml b/app/src/main/res/layout/fragment_blur_player_playback_controls.xml index d1a03bed..91ecd9b9 100644 --- a/app/src/main/res/layout/fragment_blur_player_playback_controls.xml +++ b/app/src/main/res/layout/fragment_blur_player_playback_controls.xml @@ -51,8 +51,6 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_alignParentRight="true" - android:fontFamily="sans-serif" - android:fontFeatureSettings="onum" android:gravity="center_vertical|right|end" android:paddingRight="8dp" android:singleLine="true" @@ -66,8 +64,6 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_alignParentLeft="true" - android:fontFamily="sans-serif" - android:fontFeatureSettings="onum" android:gravity="center_vertical|left|end" android:paddingLeft="8dp" android:singleLine="true" diff --git a/app/src/main/res/layout/fragment_card_blur_player_playback_controls.xml b/app/src/main/res/layout/fragment_card_blur_player_playback_controls.xml index 1e8d2c81..f0e7af1f 100644 --- a/app/src/main/res/layout/fragment_card_blur_player_playback_controls.xml +++ b/app/src/main/res/layout/fragment_card_blur_player_playback_controls.xml @@ -38,8 +38,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="1" - android:fontFamily="sans-serif" - android:fontFeatureSettings="onum" android:paddingStart="8dp" android:paddingEnd="8dp" android:textAppearance="@style/TextViewOverline" @@ -52,8 +50,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="0" - android:fontFamily="sans-serif" - android:fontFeatureSettings="onum" android:paddingStart="8dp" android:paddingEnd="8dp" android:textAppearance="@style/TextViewOverline" diff --git a/app/src/main/res/layout/fragment_card_player_playback_controls.xml b/app/src/main/res/layout/fragment_card_player_playback_controls.xml index 135d0b0a..2e709cd5 100644 --- a/app/src/main/res/layout/fragment_card_player_playback_controls.xml +++ b/app/src/main/res/layout/fragment_card_player_playback_controls.xml @@ -1,126 +1,122 @@ + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/playback_controls" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:clickable="true" + android:focusable="true" + android:orientation="vertical" + tools:ignore="MissingPrefix"> - + - + - + - + - + - + - + - + - + - + - + - - - + + + diff --git a/app/src/main/res/layout/fragment_color_player_playback_controls.xml b/app/src/main/res/layout/fragment_color_player_playback_controls.xml index 2ec368fa..2a0aa277 100644 --- a/app/src/main/res/layout/fragment_color_player_playback_controls.xml +++ b/app/src/main/res/layout/fragment_color_player_playback_controls.xml @@ -23,8 +23,8 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_alignParentLeft="true" - android:fontFamily="sans-serif" - android:fontFeatureSettings="onum" + + android:gravity="center_vertical|left|end" android:paddingLeft="8dp" android:singleLine="true" @@ -37,8 +37,8 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_alignParentRight="true" - android:fontFamily="sans-serif" - android:fontFeatureSettings="onum" + + android:gravity="center_vertical|right|end" android:paddingRight="8dp" android:singleLine="true" diff --git a/app/src/main/res/layout/fragment_fit_playback_controls.xml b/app/src/main/res/layout/fragment_fit_playback_controls.xml index 9ad41af7..2d4b38d9 100644 --- a/app/src/main/res/layout/fragment_fit_playback_controls.xml +++ b/app/src/main/res/layout/fragment_fit_playback_controls.xml @@ -18,8 +18,8 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_alignParentLeft="true" - android:fontFamily="sans-serif" - android:fontFeatureSettings="onum" + + android:gravity="center_vertical|left|end" android:paddingLeft="8dp" android:singleLine="true" @@ -33,8 +33,8 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_alignParentRight="true" - android:fontFamily="sans-serif" - android:fontFeatureSettings="onum" + + android:gravity="center_vertical|right|end" android:paddingRight="8dp" android:singleLine="true" diff --git a/app/src/main/res/layout/fragment_flat_player_playback_controls.xml b/app/src/main/res/layout/fragment_flat_player_playback_controls.xml index 795f9168..f39d5a6b 100644 --- a/app/src/main/res/layout/fragment_flat_player_playback_controls.xml +++ b/app/src/main/res/layout/fragment_flat_player_playback_controls.xml @@ -23,8 +23,8 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_alignParentLeft="true" - android:fontFamily="sans-serif" - android:fontFeatureSettings="onum" + + android:gravity="center_vertical|left|end" android:paddingLeft="8dp" android:singleLine="true" @@ -38,8 +38,8 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_alignParentRight="true" - android:fontFamily="sans-serif" - android:fontFeatureSettings="onum" + + android:gravity="center_vertical|right|end" android:paddingRight="8dp" android:singleLine="true" diff --git a/app/src/main/res/layout/fragment_full_player_controls.xml b/app/src/main/res/layout/fragment_full_player_controls.xml index bd8d7019..d80447f5 100644 --- a/app/src/main/res/layout/fragment_full_player_controls.xml +++ b/app/src/main/res/layout/fragment_full_player_controls.xml @@ -88,7 +88,7 @@ android:layout_height="match_parent" android:layout_alignParentLeft="true" android:fontFamily="sans-serif-medium" - android:fontFeatureSettings="onum" + android:gravity="center_vertical|left|end" android:paddingLeft="8dp" android:singleLine="true" @@ -103,7 +103,7 @@ android:layout_height="match_parent" android:layout_alignParentRight="true" android:fontFamily="sans-serif-medium" - android:fontFeatureSettings="onum" + android:gravity="center_vertical|right|end" android:paddingRight="8dp" android:singleLine="true" diff --git a/app/src/main/res/layout/fragment_lock_screen_playback_controls.xml b/app/src/main/res/layout/fragment_lock_screen_playback_controls.xml index fdb37b2d..87a6f717 100644 --- a/app/src/main/res/layout/fragment_lock_screen_playback_controls.xml +++ b/app/src/main/res/layout/fragment_lock_screen_playback_controls.xml @@ -24,8 +24,8 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_alignParentLeft="true" - android:fontFamily="sans-serif" - android:fontFeatureSettings="onum" + + android:gravity="center_vertical|left|end" android:paddingLeft="8dp" android:singleLine="true" @@ -39,8 +39,8 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_alignParentRight="true" - android:fontFamily="sans-serif" - android:fontFeatureSettings="onum" + + android:gravity="center_vertical|right|end" android:paddingRight="8dp" android:singleLine="true" diff --git a/app/src/main/res/layout/fragment_material_playback_controls.xml b/app/src/main/res/layout/fragment_material_playback_controls.xml index c3ff8736..6c0291e1 100644 --- a/app/src/main/res/layout/fragment_material_playback_controls.xml +++ b/app/src/main/res/layout/fragment_material_playback_controls.xml @@ -24,8 +24,8 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_alignParentLeft="true" - android:fontFamily="sans-serif" - android:fontFeatureSettings="onum" + + android:gravity="center_vertical|left|end" android:paddingLeft="8dp" android:singleLine="true" @@ -39,8 +39,8 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_alignParentRight="true" - android:fontFamily="sans-serif" - android:fontFeatureSettings="onum" + + android:gravity="center_vertical|right|end" android:paddingRight="8dp" android:singleLine="true" diff --git a/app/src/main/res/layout/fragment_peak_control_player.xml b/app/src/main/res/layout/fragment_peak_control_player.xml index a7031823..96de132d 100644 --- a/app/src/main/res/layout/fragment_peak_control_player.xml +++ b/app/src/main/res/layout/fragment_peak_control_player.xml @@ -35,8 +35,8 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_alignParentLeft="true" - android:fontFamily="sans-serif" - android:fontFeatureSettings="onum" + + android:gravity="center_vertical|left|end" android:paddingLeft="8dp" android:singleLine="true" @@ -50,8 +50,8 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_alignParentRight="true" - android:fontFamily="sans-serif" - android:fontFeatureSettings="onum" + + android:gravity="center_vertical|right|end" android:paddingRight="8dp" android:singleLine="true" diff --git a/app/src/main/res/layout/fragment_plain_controls_fragment.xml b/app/src/main/res/layout/fragment_plain_controls_fragment.xml index 8ee3b903..779ed823 100644 --- a/app/src/main/res/layout/fragment_plain_controls_fragment.xml +++ b/app/src/main/res/layout/fragment_plain_controls_fragment.xml @@ -22,8 +22,8 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_alignParentLeft="true" - android:fontFamily="sans-serif" - android:fontFeatureSettings="onum" + + android:gravity="center_vertical|left|end" android:paddingLeft="8dp" android:singleLine="true" @@ -37,8 +37,8 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_alignParentRight="true" - android:fontFamily="sans-serif" - android:fontFeatureSettings="onum" + + android:gravity="center_vertical|right|end" android:paddingRight="8dp" android:singleLine="true" diff --git a/app/src/main/res/layout/fragment_player_playback_controls.xml b/app/src/main/res/layout/fragment_player_playback_controls.xml index f31095ba..525003fd 100755 --- a/app/src/main/res/layout/fragment_player_playback_controls.xml +++ b/app/src/main/res/layout/fragment_player_playback_controls.xml @@ -38,8 +38,8 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_alignParentRight="true" - android:fontFamily="sans-serif" - android:fontFeatureSettings="onum" + + android:gravity="center_vertical|right|end" android:paddingRight="8dp" android:singleLine="true" @@ -53,8 +53,8 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_alignParentLeft="true" - android:fontFamily="sans-serif" - android:fontFeatureSettings="onum" + + android:gravity="center_vertical|left|end" android:paddingLeft="8dp" android:singleLine="true" diff --git a/app/src/main/res/layout/fragment_simple_controls_fragment.xml b/app/src/main/res/layout/fragment_simple_controls_fragment.xml index 04f38a23..740b3eae 100644 --- a/app/src/main/res/layout/fragment_simple_controls_fragment.xml +++ b/app/src/main/res/layout/fragment_simple_controls_fragment.xml @@ -58,8 +58,8 @@ android:layout_height="wrap_content" android:gravity="center" android:paddingStart="16dp" - android:fontFamily="sans-serif" - android:fontFeatureSettings="onum" + + android:paddingEnd="16dp" android:textAppearance="@style/TextViewSubtitle2" app:layout_constraintBottom_toTopOf="@+id/playerMediaControllerContainer" diff --git a/app/src/main/res/layout/fragment_tiny_player.xml b/app/src/main/res/layout/fragment_tiny_player.xml index f1d1357a..26866597 100644 --- a/app/src/main/res/layout/fragment_tiny_player.xml +++ b/app/src/main/res/layout/fragment_tiny_player.xml @@ -51,8 +51,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="end" - android:fontFamily="sans-serif" - android:fontFeatureSettings="onum" + + android:padding="16dp" android:textAppearance="@style/TextViewHeadline3" android:textStyle="bold" diff --git a/app/src/main/res/layout/item_list.xml b/app/src/main/res/layout/item_list.xml index f94ef6c1..fac56119 100755 --- a/app/src/main/res/layout/item_list.xml +++ b/app/src/main/res/layout/item_list.xml @@ -55,7 +55,7 @@ android:id="@+id/imageText" android:layout_width="wrap_content" android:layout_height="match_parent" - android:fontFeatureSettings="onum" + android:gravity="center" android:maxLines="1" android:minHeight="40dp" @@ -92,8 +92,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:ellipsize="end" - android:fontFamily="sans-serif" - android:fontFeatureSettings="onum" + + android:maxLines="1" android:textColor="?android:attr/textColorSecondary" tools:text="Song artist name " /> diff --git a/app/src/main/res/layout/item_list_no_image.xml b/app/src/main/res/layout/item_list_no_image.xml index b7f4fdf4..b1191939 100644 --- a/app/src/main/res/layout/item_list_no_image.xml +++ b/app/src/main/res/layout/item_list_no_image.xml @@ -38,8 +38,8 @@ android:id="@+id/text" android:layout_width="0dp" android:layout_height="wrap_content" - android:fontFamily="sans-serif" - android:fontFeatureSettings="onum" + + android:singleLine="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/item_queue.xml b/app/src/main/res/layout/item_queue.xml index 6f52b728..cd1712f5 100644 --- a/app/src/main/res/layout/item_queue.xml +++ b/app/src/main/res/layout/item_queue.xml @@ -43,7 +43,7 @@ android:id="@+id/imageText" android:layout_width="wrap_content" android:layout_height="match_parent" - android:fontFeatureSettings="onum" + android:gravity="center" android:maxLines="1" android:minWidth="36dp" @@ -78,8 +78,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:ellipsize="end" - android:fontFamily="sans-serif" - android:fontFeatureSettings="onum" + + android:maxLines="1" tools:text="Song details" /> diff --git a/app/src/main/res/layout/item_song.xml b/app/src/main/res/layout/item_song.xml index 7db826ed..ff9e065f 100755 --- a/app/src/main/res/layout/item_song.xml +++ b/app/src/main/res/layout/item_song.xml @@ -24,8 +24,8 @@ android:id="@+id/imageText" android:layout_width="40dp" android:layout_height="match_parent" - android:fontFamily="sans-serif" - android:fontFeatureSettings="onum" + + android:gravity="center" android:maxLines="1" android:minHeight="40dp" @@ -54,8 +54,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="0" - android:fontFamily="sans-serif" - android:fontFeatureSettings="onum" + + android:padding="8dp" android:textColor="?android:attr/textColorSecondary" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/list_item_view_seekbar.xml b/app/src/main/res/layout/list_item_view_seekbar.xml index 9cdebdfb..dfaef53a 100644 --- a/app/src/main/res/layout/list_item_view_seekbar.xml +++ b/app/src/main/res/layout/list_item_view_seekbar.xml @@ -89,8 +89,8 @@ android:layout_height="wrap_content" android:layout_marginStart="8dp" android:layout_marginEnd="16dp" - android:fontFamily="sans-serif" - android:fontFeatureSettings="onum" + + android:textAppearance="@style/TextViewSubtitle1" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent"