diff --git a/app/build.gradle b/app/build.gradle index e6223b822..687e4db48 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,12 +4,12 @@ apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-kapt' android { - compileSdkVersion 28 + compileSdkVersion 29 defaultConfig { minSdkVersion 21 - targetSdkVersion 28 + targetSdkVersion 29 - renderscriptTargetApi 28 //must match target sdk and build tools + renderscriptTargetApi 29 //must match target sdk and build tools vectorDrawables.useSupportLibrary = true applicationId "code.name.monkey.retromusic" @@ -67,6 +67,7 @@ android { sourceCompatibility '1.8' targetCompatibility '1.8' } + buildToolsVersion = '29.0.1' configurations.all { resolutionStrategy.force 'com.google.code.findbugs:jsr305:1.3.9' @@ -100,14 +101,14 @@ dependencies { implementation 'androidx.multidex:multidex:2.0.1' implementation 'androidx.fragment:fragment:1.2.0-alpha02' implementation 'androidx.appcompat:appcompat:1.1.0-rc01' - implementation 'androidx.recyclerview:recyclerview:1.1.0-beta02' + implementation 'androidx.recyclerview:recyclerview:1.1.0-beta03' implementation "androidx.gridlayout:gridlayout:1.0.0" implementation "androidx.cardview:cardview:1.0.0" implementation "androidx.palette:palette:1.0.0" implementation 'androidx.annotation:annotation:1.1.0' implementation 'androidx.preference:preference:1.1.0-rc01' implementation 'androidx.palette:palette-ktx:1.0.0' - implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta2' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' implementation 'com.google.android.material:material:1.1.0-alpha09' @@ -141,11 +142,11 @@ dependencies { implementation 'com.github.ksoichiro:android-observablescrollview:1.6.0' implementation 'com.github.kabouzeid:RecyclerView-FastScroll:1.0.16-kmod' - implementation 'com.github.kabouzeid:AndroidSlidingUpPanel:3.3.0-kmod3' + implementation 'com.github.kabouzeid:AndroidSlidingUpPanel:3.3.3-kmod' implementation 'com.github.AdrienPoupa:jaudiotagger:2.2.3' implementation 'com.anjlab.android.iab.v3:library:1.1.0' - implementation 'com.r0adkll:slidableactivity:2.0.6' + implementation 'com.r0adkll:slidableactivity:2.1.0' implementation 'com.heinrichreimersoftware:material-intro:1.6' implementation project(':appthemehelper') diff --git a/app/src/main/assets/retro-changelog.html b/app/src/main/assets/retro-changelog.html index 74cea1053..5b402e342 100644 --- a/app/src/main/assets/retro-changelog.html +++ b/app/src/main/assets/retro-changelog.html @@ -1 +1 @@ -

v3.3.200

v.3.3.100

v3.3.000

v3.2.240

v3.2.220

v3.2.203

v3.2.135

v3.2.125

v3.2.120

v3.2.105

v3.2.100

v3.2.000

v3.1.900

v3.1.850

v3.1.800

v3.1.700

v3.1.400

v3.1.300

v3.1.240

v3.1.200

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 +

v3.3.200

v.3.3.100

v3.3.000

v3.2.240

v3.2.220

v3.2.203

v3.2.135

v3.2.125

v3.2.120

v3.2.105

v3.2.100

v3.2.000

v3.1.900

v3.1.850

v3.1.800

v3.1.700

v3.1.400

v3.1.300

v3.1.240

v3.1.200

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/activities/LockScreenActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/LockScreenActivity.kt index 667142a98..7b1c44424 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/LockScreenActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/LockScreenActivity.kt @@ -9,12 +9,12 @@ import android.view.WindowManager import androidx.core.view.ViewCompat import code.name.monkey.appthemehelper.ThemeStore import code.name.monkey.retromusic.R +import code.name.monkey.retromusic.activities.base.AbsMusicServiceActivity +import code.name.monkey.retromusic.fragments.player.lockscreen.LockScreenPlayerControlsFragment import code.name.monkey.retromusic.glide.GlideApp import code.name.monkey.retromusic.glide.RetroGlideExtension import code.name.monkey.retromusic.glide.RetroMusicColoredTarget import code.name.monkey.retromusic.helper.MusicPlayerRemote -import code.name.monkey.retromusic.activities.base.AbsMusicServiceActivity -import code.name.monkey.retromusic.fragments.player.lockscreen.LockScreenPlayerControlsFragment import com.r0adkll.slidr.Slidr import com.r0adkll.slidr.model.SlidrConfig import com.r0adkll.slidr.model.SlidrListener @@ -57,11 +57,13 @@ class LockScreenActivity : AbsMusicServiceActivity() { } - override fun onSlideClosed() { + override fun onSlideClosed(): Boolean { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { val keyguardManager = getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager keyguardManager.requestDismissKeyguard(this@LockScreenActivity, null) } + finish() + return true } }) .position(SlidrPosition.BOTTOM) diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt index 96cb287df..ed25ec1a0 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt @@ -48,11 +48,7 @@ class MainActivity : AbsSlidingMusicPanelActivity(), SharedPreferences.OnSharedP } override fun createContentView(): View { - @SuppressLint("InflateParams") - val contentView = layoutInflater.inflate(R.layout.activity_main_drawer_layout, null) - val drawerContent = contentView.findViewById(R.id.drawer_content_container) - drawerContent.addView(wrapSlidingMusicPanel(R.layout.activity_main_content)) - return contentView + return wrapSlidingMusicPanel(R.layout.activity_main_content) } override fun onCreate( diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/WhatsNewActivity.java b/app/src/main/java/code/name/monkey/retromusic/activities/WhatsNewActivity.java index 38ead6d82..114e538df 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/WhatsNewActivity.java +++ b/app/src/main/java/code/name/monkey/retromusic/activities/WhatsNewActivity.java @@ -3,6 +3,7 @@ package code.name.monkey.retromusic.activities; import android.content.Context; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; +import android.graphics.Color; import android.os.Bundle; import android.webkit.WebView; @@ -18,13 +19,14 @@ import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; import code.name.monkey.appthemehelper.ThemeStore; -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.R; import code.name.monkey.retromusic.activities.base.AbsBaseActivity; import code.name.monkey.retromusic.util.PreferenceUtil; +import static code.name.monkey.appthemehelper.util.ATHUtil.INSTANCE; + public class WhatsNewActivity extends AbsBaseActivity { WebView webView; Toolbar toolbar; @@ -41,8 +43,8 @@ public class WhatsNewActivity extends AbsBaseActivity { } } - private static String colorToHex(int color) { - return Integer.toHexString(color).substring(2); + private static String colorToCSS(int color) { + return String.format("rgb(%d, %d, %d)", Color.red(color), Color.green(color), Color.blue(color)); // on API 29, WebView doesn't load with hex colors } @Override @@ -75,14 +77,16 @@ public class WhatsNewActivity extends AbsBaseActivity { in.close(); // Inject color values for WebView body background and links - final String backgroundColor = colorToHex(ThemeStore.Companion.primaryColor(this)); - final String contentColor = ATHUtil.INSTANCE.isWindowBackgroundDark(this) ? "#ffffff" : "#000000"; - webView.loadData(buf.toString() - .replace("{style-placeholder}", - String.format("body { background-color: %s; color: %s; }", backgroundColor, contentColor)) - .replace("{link-color}", colorToHex(ThemeStore.Companion.accentColor(this))) - .replace("{link-color-active}", colorToHex(ColorUtil.INSTANCE.lightenColor(ThemeStore.Companion.accentColor(this)))) - , "text/html", "UTF-8"); + final boolean isDark = INSTANCE.isWindowBackgroundDark(this); + final String backgroundColor = colorToCSS(INSTANCE.resolveColor(this, R.attr.md_background_color, Color.parseColor(isDark ? "#424242" : "#ffffff"))); + final String contentColor = colorToCSS(Color.parseColor(isDark ? "#ffffff" : "#000000")); + final String changeLog = buf.toString() + .replace("{style-placeholder}", + String.format("body { background-color: %s; color: %s; }", backgroundColor, contentColor)) + .replace("{link-color}", colorToCSS(ThemeStore.Companion.accentColor(this))) + .replace("{link-color-active}", colorToCSS(ColorUtil.INSTANCE.lightenColor(ThemeStore.Companion.accentColor(this)))); + + webView.loadData(changeLog, "text/html", "UTF-8"); } catch (Throwable e) { webView.loadData("

Unable to load

" + e.getLocalizedMessage() + "

", "text/html", "UTF-8"); } diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/SearchAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/SearchAdapter.kt index 44c2e0dc5..b359575d4 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/SearchAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/SearchAdapter.kt @@ -82,12 +82,6 @@ class SearchAdapter(private val activity: AppCompatActivity, private var dataSet init { itemView.setOnLongClickListener(null) - if (itemViewType != HEADER) { - if (separator != null) { - separator!!.visibility = View.GONE - } - } - if (menu != null) { if (itemViewType == SONG) { menu!!.visibility = View.VISIBLE diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumAdapter.kt index ab204ef3d..46617d3aa 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumAdapter.kt @@ -84,16 +84,6 @@ open class AlbumAdapter(protected val activity: AppCompatActivity, val isChecked = isChecked(album) holder.itemView.isActivated = isChecked - if (holder.adapterPosition == itemCount - 1) { - if (holder.shortSeparator != null) { - holder.shortSeparator!!.visibility = View.GONE - } - } else { - if (holder.shortSeparator != null) { - holder.shortSeparator!!.visibility = View.GONE - } - } - if (holder.title != null) { holder.title!!.text = getAlbumTitle(album) } diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt index 7d5adf9f4..8a064fb36 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt @@ -68,9 +68,7 @@ class ArtistAdapter(val activity: AppCompatActivity, if (holder.text != null) { holder.text!!.visibility = View.GONE } - if (holder.shortSeparator != null) { - holder.shortSeparator!!.visibility = View.GONE - } + loadArtistImage(artist, holder) } diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/base/MediaEntryViewHolder.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/base/MediaEntryViewHolder.kt index 49adc9b8f..09780904b 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/base/MediaEntryViewHolder.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/base/MediaEntryViewHolder.kt @@ -27,8 +27,6 @@ open class MediaEntryViewHolder(view: View) : RecyclerView.ViewHolder(view), Vie var imageContainer: ViewGroup? = null var imageContainerCard: CardView? = null var menu: View? = null - var separator: View? = null - var shortSeparator: View? = null var dragView: View? = null var paletteColorContainer: View? = null var time: TextView? = null @@ -53,8 +51,6 @@ open class MediaEntryViewHolder(view: View) : RecyclerView.ViewHolder(view), Vie menu = view.findViewById(R.id.menu) dragView = view.findViewById(R.id.drag_view) - separator = view.findViewById(R.id.separator) - shortSeparator = view.findViewById(R.id.short_separator) paletteColorContainer = view.findViewById(R.id.palette_color_container) time = view.findViewById(R.id.time); diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/playlist/PlaylistAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/playlist/PlaylistAdapter.kt index 21b19f1b1..72ab249c0 100755 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/playlist/PlaylistAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/playlist/PlaylistAdapter.kt @@ -84,15 +84,6 @@ class PlaylistAdapter(protected val activity: AppCompatActivity, dataSet: ArrayL if (holder.image != null) { holder.image!!.setImageDrawable(getIconRes(playlist)) } - if (holder.adapterPosition == itemCount - 1) { - if (holder.shortSeparator != null) { - holder.shortSeparator!!.visibility = View.GONE - } - } else { - if (holder.shortSeparator != null && dataSet[position] !is AbsSmartPlaylist) { - holder.shortSeparator!!.visibility = View.GONE - } - } } private fun getIconRes(playlist: Playlist): Drawable { diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/song/SongAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/song/SongAdapter.kt index 3ebef4346..2b1eafce1 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/song/SongAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/song/SongAdapter.kt @@ -78,16 +78,6 @@ open class SongAdapter @JvmOverloads constructor(protected val activity: AppComp val isChecked = isChecked(song) holder.itemView.isActivated = isChecked - if (holder.adapterPosition == itemCount - 1) { - if (holder.shortSeparator != null) { - holder.shortSeparator!!.visibility = View.GONE - } - } else { - if (holder.shortSeparator != null) { - holder.shortSeparator!!.visibility = View.GONE - } - } - if (holder.title != null) { holder.title!!.text = getSongTitle(song) } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.kt index ec0feb9e0..703c99742 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.kt @@ -110,7 +110,7 @@ abstract class AbsLibraryPagerRecyclerViewCustomGridSizeFragment diff --git a/app/src/main/java/code/name/monkey/retromusic/views/FitSystemWindowsLayout.java b/app/src/main/java/code/name/monkey/retromusic/views/FitSystemWindowsLayout.java deleted file mode 100644 index 4c45ad357..000000000 --- a/app/src/main/java/code/name/monkey/retromusic/views/FitSystemWindowsLayout.java +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Copyright (c) 2019 Hemanth Savarala. - * - * Licensed under the GNU General Public License v3 - * - * This is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by - * the Free Software Foundation either version 3 of the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - */ - -package code.name.monkey.retromusic.views; - -import android.annotation.TargetApi; -import android.content.Context; -import android.graphics.Rect; -import android.os.Build; -import android.util.AttributeSet; -import android.view.WindowInsets; -import android.widget.FrameLayout; - -public class FitSystemWindowsLayout extends FrameLayout { - private boolean mFit = false; - - public FitSystemWindowsLayout(final Context context) { - super(context); - } - - public FitSystemWindowsLayout(final Context context, final AttributeSet attrs) { - super(context, attrs); - } - - public FitSystemWindowsLayout(final Context context, final AttributeSet attrs, final int defStyleAttr) { - super(context, attrs, defStyleAttr); - } - - public boolean isFit() { - return mFit; - } - - public void setFit(final boolean fit) { - if (mFit == fit) { - return; - } - - mFit = fit; - requestApplyInsets(); - } - - @SuppressWarnings("deprecation") - @Override - protected boolean fitSystemWindows(final Rect insets) { - if (mFit) { - setPadding( - insets.left, - insets.top, - insets.right, - insets.bottom - ); - return true; - } else { - setPadding(0, 0, 0, 0); - return false; - } - } - - @TargetApi(Build.VERSION_CODES.KITKAT_WATCH) - @Override - public WindowInsets onApplyWindowInsets(final WindowInsets insets) { - if (mFit) { - setPadding( - insets.getSystemWindowInsetLeft(), - insets.getSystemWindowInsetTop(), - insets.getSystemWindowInsetRight(), - insets.getSystemWindowInsetBottom() - ); - return insets.consumeSystemWindowInsets(); - } else { - setPadding(0, 0, 0, 0); - return insets; - } - } -} \ No newline at end of file diff --git a/app/src/main/java/code/name/monkey/retromusic/views/RetroChip.kt b/app/src/main/java/code/name/monkey/retromusic/views/RetroChip.kt index 5b92fb71a..c9229e035 100644 --- a/app/src/main/java/code/name/monkey/retromusic/views/RetroChip.kt +++ b/app/src/main/java/code/name/monkey/retromusic/views/RetroChip.kt @@ -32,5 +32,6 @@ class RetroChip @JvmOverloads constructor( chipIcon?.setTintList(ColorStateList.valueOf(iconColor)) setTextColor(iconColor) chipStrokeColor = ColorStateList.valueOf(dividerColor) + } } diff --git a/app/src/main/res/layout-land/activity_album.xml b/app/src/main/res/layout-land/activity_album.xml index 7a0cd2645..8d0a47c51 100644 --- a/app/src/main/res/layout-land/activity_album.xml +++ b/app/src/main/res/layout-land/activity_album.xml @@ -24,7 +24,7 @@ android:scaleType="centerCrop" android:transitionName="@string/transition_album_art" /> - diff --git a/app/src/main/res/layout-land/activity_album_tag_editor.xml b/app/src/main/res/layout-land/activity_album_tag_editor.xml index 021b5a078..787aead9e 100644 --- a/app/src/main/res/layout-land/activity_album_tag_editor.xml +++ b/app/src/main/res/layout-land/activity_album_tag_editor.xml @@ -17,7 +17,7 @@ - - diff --git a/app/src/main/res/layout-land/activity_settings.xml b/app/src/main/res/layout-land/activity_settings.xml index 111b42666..8f92c5f89 100644 --- a/app/src/main/res/layout-land/activity_settings.xml +++ b/app/src/main/res/layout-land/activity_settings.xml @@ -31,7 +31,7 @@ app:elevation="0dp"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout-land/pager_item.xml b/app/src/main/res/layout-land/pager_item.xml index 01ba6aa41..fbd1776fb 100644 --- a/app/src/main/res/layout-land/pager_item.xml +++ b/app/src/main/res/layout-land/pager_item.xml @@ -42,20 +42,20 @@ android:paddingTop="6dp" android:paddingEnd="8dp" android:paddingBottom="4dp" - android:textSize="13sp" + android:textAppearance="@style/TextViewNormal" tools:ignore="MissingPrefix" tools:text="My top tracks" /> \ No newline at end of file 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 bf0fd9e2f..2f15f2823 100644 --- a/app/src/main/res/layout-xlarge-land/activity_album.xml +++ b/app/src/main/res/layout-xlarge-land/activity_album.xml @@ -34,7 +34,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_horizontal" /> - 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 74b2edde1..78dd226a8 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 @@ -31,7 +31,7 @@ android:layout_height="wrap_content" app:layout_collapseMode="parallax" /> - diff --git a/app/src/main/res/layout-xlarge-land/fragment_banner_home.xml b/app/src/main/res/layout-xlarge-land/fragment_banner_home.xml index 8c09d6cf1..9ae0815a0 100644 --- a/app/src/main/res/layout-xlarge-land/fragment_banner_home.xml +++ b/app/src/main/res/layout-xlarge-land/fragment_banner_home.xml @@ -82,12 +82,12 @@ app:cardUseCompatPadding="true" app:layout_scrollFlags="scroll|enterAlways"> - diff --git a/app/src/main/res/layout-xlarge-land/fragment_blur.xml b/app/src/main/res/layout-xlarge-land/fragment_blur.xml index d1e6a8eff..f40379135 100644 --- a/app/src/main/res/layout-xlarge-land/fragment_blur.xml +++ b/app/src/main/res/layout-xlarge-land/fragment_blur.xml @@ -30,7 +30,7 @@ android:id="@+id/playerContent" android:layout_width="400dp" android:layout_height="0dp" - android:layout_above="@id/toolbar_container" + android:layout_above="@id/playerToolbar" android:layout_gravity="center_horizontal" android:layout_marginStart="8dp" android:layout_marginTop="8dp" @@ -69,7 +69,7 @@ - - diff --git a/app/src/main/res/layout-xlarge-land/fragment_player.xml b/app/src/main/res/layout-xlarge-land/fragment_player.xml index 2d3191858..cfed47084 100644 --- a/app/src/main/res/layout-xlarge-land/fragment_player.xml +++ b/app/src/main/res/layout-xlarge-land/fragment_player.xml @@ -14,56 +14,51 @@ - + android:layout_height="match_parent" + android:orientation="vertical"> - - - - - - + - + tools:layout="@layout/fragment_player_album_cover" /> + - + + + + + - - - - - + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" /> + + \ No newline at end of file diff --git a/app/src/main/res/layout-xlarge-land/pager_item.xml b/app/src/main/res/layout-xlarge-land/pager_item.xml index 1ba4404b6..c41e79a43 100644 --- a/app/src/main/res/layout-xlarge-land/pager_item.xml +++ b/app/src/main/res/layout-xlarge-land/pager_item.xml @@ -42,20 +42,20 @@ android:paddingTop="6dp" android:paddingEnd="8dp" android:paddingBottom="4dp" - android:textSize="13sp" + android:textAppearance="@style/TextViewNormal" tools:ignore="MissingPrefix" tools:text="My top tracks" /> \ No newline at end of file diff --git a/app/src/main/res/layout-xlarge/abs_playlists.xml b/app/src/main/res/layout-xlarge/abs_playlists.xml index 1a499e09e..e0e25cd83 100644 --- a/app/src/main/res/layout-xlarge/abs_playlists.xml +++ b/app/src/main/res/layout-xlarge/abs_playlists.xml @@ -69,7 +69,7 @@ app:iconBackgroundColor="@color/md_blue_A700" app:srcCompat="@drawable/ic_access_time_white_24dp" /> - - - - - - - diff --git a/app/src/main/res/layout-xlarge/activity_album.xml b/app/src/main/res/layout-xlarge/activity_album.xml index ba996d851..f3b25c080 100644 --- a/app/src/main/res/layout-xlarge/activity_album.xml +++ b/app/src/main/res/layout-xlarge/activity_album.xml @@ -33,7 +33,7 @@ android:layout_width="320dp" android:layout_height="wrap_content" /> - - - + + tools:visibility="visible" /> - diff --git a/app/src/main/res/layout-xlarge/activity_user_info.xml b/app/src/main/res/layout-xlarge/activity_user_info.xml index 80bda0bac..251fe764e 100644 --- a/app/src/main/res/layout-xlarge/activity_user_info.xml +++ b/app/src/main/res/layout-xlarge/activity_user_info.xml @@ -12,7 +12,7 @@ android:elevation="0dp" app:elevation="0dp"> - - diff --git a/app/src/main/res/layout-xlarge/fragment_blur.xml b/app/src/main/res/layout-xlarge/fragment_blur.xml index cd248814e..afead1489 100644 --- a/app/src/main/res/layout-xlarge/fragment_blur.xml +++ b/app/src/main/res/layout-xlarge/fragment_blur.xml @@ -25,65 +25,59 @@ android:layout_height="match_parent" android:background="@drawable/shadow_up" /> - + android:layout_height="match_parent" + android:layout_gravity="center_horizontal" + android:layout_marginStart="64dp" + android:layout_marginEnd="64dp" + android:orientation="vertical"> - + + + + + + + + + + + android:layout_weight="1" + tools:background="@color/md_white_1000"> - - - - - - - - - - - + tools:layout="@layout/fragment_player_playback_controls" /> + - - + - - - - - - + + + \ No newline at end of file diff --git a/app/src/main/res/layout-xlarge/fragment_home.xml b/app/src/main/res/layout-xlarge/fragment_home.xml index 68302b9f9..fa45260b6 100644 --- a/app/src/main/res/layout-xlarge/fragment_home.xml +++ b/app/src/main/res/layout-xlarge/fragment_home.xml @@ -55,12 +55,12 @@ app:strokeColor="?dividerColor" app:strokeWidth="1dp"> - diff --git a/app/src/main/res/layout-xlarge/fragment_mini_player.xml b/app/src/main/res/layout-xlarge/fragment_mini_player.xml index 016955784..3814de1dc 100644 --- a/app/src/main/res/layout-xlarge/fragment_mini_player.xml +++ b/app/src/main/res/layout-xlarge/fragment_mini_player.xml @@ -1,5 +1,5 @@ - - + android:singleLine="true" + android:textAppearance="@style/TextViewNormal" /> - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout-xlarge/fragment_player.xml b/app/src/main/res/layout-xlarge/fragment_player.xml index c919d1ef7..070456943 100644 --- a/app/src/main/res/layout-xlarge/fragment_player.xml +++ b/app/src/main/res/layout-xlarge/fragment_player.xml @@ -14,62 +14,57 @@ - + android:layout_height="match_parent" + android:layout_gravity="center_horizontal" + android:gravity="center_horizontal" + android:orientation="vertical"> - + android:layout_height="wrap_content"> - + + - - + - - - - - - - - - - - + tools:layout="@layout/fragment_player_album_cover" /> + - - - - + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout-xlarge/item_artist.xml b/app/src/main/res/layout-xlarge/item_artist.xml index dd22af176..c8ff5c613 100644 --- a/app/src/main/res/layout-xlarge/item_artist.xml +++ b/app/src/main/res/layout-xlarge/item_artist.xml @@ -1,7 +1,6 @@ + app:civ_border="false" /> - + android:paddingTop="12dp" + android:textAppearance="@style/TextViewNormal" /> \ No newline at end of file diff --git a/app/src/main/res/layout-xlarge/item_image.xml b/app/src/main/res/layout-xlarge/item_image.xml index f67298ebd..823266768 100644 --- a/app/src/main/res/layout-xlarge/item_image.xml +++ b/app/src/main/res/layout-xlarge/item_image.xml @@ -1,40 +1,39 @@ + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="vertical"> + android:layout_width="156dp" + android:layout_height="match_parent" + android:orientation="vertical"> + android:id="@+id/image_container_card" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_margin="8dp" + app:cardCornerRadius="6dp" + app:cardElevation="4dp" + app:cardPreventCornerOverlap="true"> + android:id="@+id/image" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:scaleType="centerCrop" /> - + \ No newline at end of file diff --git a/app/src/main/res/layout-xlarge/pager_item.xml b/app/src/main/res/layout-xlarge/pager_item.xml index a325b400a..7e0c2bbf3 100644 --- a/app/src/main/res/layout-xlarge/pager_item.xml +++ b/app/src/main/res/layout-xlarge/pager_item.xml @@ -42,20 +42,20 @@ android:paddingTop="6dp" android:paddingEnd="8dp" android:paddingBottom="4dp" - android:textSize="13sp" + android:textAppearance="@style/TextViewNormal" tools:ignore="MissingPrefix" tools:text="My top tracks" /> \ No newline at end of file diff --git a/app/src/main/res/layout/abs_playlists.xml b/app/src/main/res/layout/abs_playlists.xml index b2d1ad0ee..b727069ba 100644 --- a/app/src/main/res/layout/abs_playlists.xml +++ b/app/src/main/res/layout/abs_playlists.xml @@ -43,41 +43,14 @@ - - - - - - - - - + android:text="@string/history" /> @@ -125,7 +97,7 @@ app:iconBackgroundColor="@color/md_red_500" app:srcCompat="@drawable/ic_library_add_white_24dp" /> - - - - - @@ -87,15 +87,14 @@ diff --git a/app/src/main/res/layout/activity_album_content.xml b/app/src/main/res/layout/activity_album_content.xml index 8d17a7be4..505acccea 100644 --- a/app/src/main/res/layout/activity_album_content.xml +++ b/app/src/main/res/layout/activity_album_content.xml @@ -6,44 +6,52 @@ android:layout_height="match_parent" android:orientation="vertical"> - - + - - - + - diff --git a/app/src/main/res/layout/activity_bug_report.xml b/app/src/main/res/layout/activity_bug_report.xml index cb83b507f..7cef9a3cc 100644 --- a/app/src/main/res/layout/activity_bug_report.xml +++ b/app/src/main/res/layout/activity_bug_report.xml @@ -11,7 +11,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_license.xml b/app/src/main/res/layout/activity_license.xml index 009a879b9..a7a235e1b 100644 --- a/app/src/main/res/layout/activity_license.xml +++ b/app/src/main/res/layout/activity_license.xml @@ -21,7 +21,7 @@ app:titleEnabled="false"> - + android:scaleType="centerCrop" + tools:srcCompat="@tools:sample/backgrounds/scenic[0]" /> + diff --git a/app/src/main/res/layout/activity_lyrics.xml b/app/src/main/res/layout/activity_lyrics.xml index 1d7f87a2f..7dd7526df 100644 --- a/app/src/main/res/layout/activity_lyrics.xml +++ b/app/src/main/res/layout/activity_lyrics.xml @@ -17,7 +17,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_playing_queue.xml b/app/src/main/res/layout/activity_playing_queue.xml index 972d5be0b..d3f83b997 100755 --- a/app/src/main/res/layout/activity_playing_queue.xml +++ b/app/src/main/res/layout/activity_playing_queue.xml @@ -21,7 +21,7 @@ app:titleEnabled="false"> - - diff --git a/app/src/main/res/layout/activity_playlist_detail.xml b/app/src/main/res/layout/activity_playlist_detail.xml index f24260763..27a729fd3 100644 --- a/app/src/main/res/layout/activity_playlist_detail.xml +++ b/app/src/main/res/layout/activity_playlist_detail.xml @@ -41,9 +41,10 @@ android:layout_width="match_parent" android:layout_height="48dp" /> - @@ -74,13 +75,13 @@ android:layout_height="96dp" app:srcCompat="@drawable/ic_disc_full_black_24dp" /> - diff --git a/app/src/main/res/layout/activity_pro_version.xml b/app/src/main/res/layout/activity_pro_version.xml index 128e54ad5..43acd450d 100644 --- a/app/src/main/res/layout/activity_pro_version.xml +++ b/app/src/main/res/layout/activity_pro_version.xml @@ -35,7 +35,7 @@ app:titleEnabled="false"> - + android:padding="12dp" + android:textAppearance="@style/TextViewSubtitle1"> @@ -71,7 +72,7 @@ android:layout_height="wrap_content" app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"> - @@ -101,5 +101,6 @@ android:layout_gravity="bottom|end" android:layout_margin="16dp" android:text="@string/keyboard" + android:textAppearance="@style/TextViewHeadline6" app:icon="@drawable/ic_keyboard_white_24dp" /> diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 7bfae0ed5..8787b87ed 100755 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -20,12 +20,12 @@ app:elevation="0dp"> - + tools:title="@string/action_settings" /> diff --git a/app/src/main/res/layout/activity_song_tag_editor.xml b/app/src/main/res/layout/activity_song_tag_editor.xml index 7fd581472..ae09b7c8a 100755 --- a/app/src/main/res/layout/activity_song_tag_editor.xml +++ b/app/src/main/res/layout/activity_song_tag_editor.xml @@ -32,7 +32,7 @@ android:visibility="gone" /> - - - + android:textAppearance="@style/TextViewOverline" /> + android:textAppearance="@style/TextViewOverline" /> - + android:textAppearance="@style/TextViewOverline" /> + android:textAppearance="@style/TextViewSubtitle1" /> + android:text="@string/changelog_summary" + android:textAppearance="@style/TextViewBody2" /> - + android:textAppearance="@style/TextViewSubtitle1" /> + android:text="@string/pref_summary_open_source_licences" + android:textAppearance="@style/TextViewBody2" /> - + android:textAppearance="@style/TextViewSubtitle1" /> + android:text="0.0.0" + android:textAppearance="@style/TextViewBody2" /> - + android:textAppearance="@style/TextViewBody1" /> \ 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 9b66680e6..7907d84ca 100644 --- a/app/src/main/res/layout/card_retro_info.xml +++ b/app/src/main/res/layout/card_retro_info.xml @@ -17,7 +17,7 @@ + android:textAppearance="@style/TextViewOverline" /> - + android:textAppearance="@style/TextViewSubtitle1" /> + android:text="@string/git_hub_summary" + android:textAppearance="@style/TextViewBody2" /> @@ -93,20 +91,18 @@ android:paddingEnd="12dp" android:paddingBottom="8dp"> - + android:textAppearance="@style/TextViewSubtitle1" /> + android:text="@string/translate_community" + android:textAppearance="@style/TextViewBody2" /> @@ -140,14 +136,13 @@ + android:textAppearance="@style/TextViewSubtitle1" /> + android:textAppearance="@style/TextViewSubtitle1" /> + android:textAppearance="@style/TextViewSubtitle1" /> + android:textAppearance="@style/TextViewSubtitle1" + android:textColor="@color/md_white_1000" /> @@ -317,12 +309,11 @@ android:paddingBottom="8dp"> + android:textAppearance="@style/TextViewSubtitle1" + android:textColor="@color/md_white_1000" /> diff --git a/app/src/main/res/layout/card_social.xml b/app/src/main/res/layout/card_social.xml index 1e5d5057d..672df774b 100644 --- a/app/src/main/res/layout/card_social.xml +++ b/app/src/main/res/layout/card_social.xml @@ -17,7 +17,7 @@ + android:textAppearance="@style/TextViewOverline" /> + android:textAppearance="@style/TextViewSubtitle1" /> + android:text="@string/pinterest_page_summary" + android:textAppearance="@style/TextViewBody2" /> @@ -92,18 +91,17 @@ + android:textAppearance="@style/TextViewSubtitle1" /> + android:text="@string/instagram_page_summary" + android:textAppearance="@style/TextViewBody2" /> @@ -135,18 +133,17 @@ android:paddingBottom="8dp"> + android:textAppearance="@style/TextViewSubtitle1" /> + android:text="@string/twitter_page_summary" + android:textAppearance="@style/TextViewBody2" /> @@ -178,18 +175,17 @@ android:paddingBottom="8dp"> + android:textAppearance="@style/TextViewSubtitle1" /> + android:text="@string/telegram_group_summary" + android:textAppearance="@style/TextViewBody2" /> diff --git a/app/src/main/res/layout/collapsing_floating_action_button.xml b/app/src/main/res/layout/collapsing_floating_action_button.xml deleted file mode 100644 index f86a77bb5..000000000 --- a/app/src/main/res/layout/collapsing_floating_action_button.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_add_to_playlist.xml b/app/src/main/res/layout/dialog_add_to_playlist.xml index 44cc61e7d..5b21fe2d4 100644 --- a/app/src/main/res/layout/dialog_add_to_playlist.xml +++ b/app/src/main/res/layout/dialog_add_to_playlist.xml @@ -14,12 +14,12 @@ + android:text="@string/add_playlist_title" + android:textAppearance="@style/TextViewHeadline6" /> \ 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 684785fc8..5810be9c4 100644 --- a/app/src/main/res/layout/dialog_playlist.xml +++ b/app/src/main/res/layout/dialog_playlist.xml @@ -21,6 +21,7 @@ android:background="@null" android:hint="@string/playlist_name_empty" android:inputType="textPersonName|textCapWords|text" - android:padding="16dp" /> + android:padding="16dp" + android:textAppearance="@style/TextViewNormal" /> \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_sleep_timer.xml b/app/src/main/res/layout/dialog_sleep_timer.xml index a8ec4cfa5..ca4834797 100644 --- a/app/src/main/res/layout/dialog_sleep_timer.xml +++ b/app/src/main/res/layout/dialog_sleep_timer.xml @@ -7,10 +7,10 @@ + android:layout_gravity="center" + android:textAppearance="@style/TextViewHeadline6" /> - + android:text="@string/finish_last_song" + android:textAppearance="@style/TextViewSubtitle1" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_adaptive_player.xml b/app/src/main/res/layout/fragment_adaptive_player.xml index 7b82382fe..e5bb5cf67 100644 --- a/app/src/main/res/layout/fragment_adaptive_player.xml +++ b/app/src/main/res/layout/fragment_adaptive_player.xml @@ -9,107 +9,101 @@ - - + + + + + + + + + + + + + + android:layout_weight="1"> - - - - - - - - - - + android:layout_height="match_parent" /> + android:alpha="0" + android:clipToPadding="false" + android:elevation="20dp" + android:padding="16dp" + android:visibility="gone" + tools:visibility="visible"> - + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:shadowColor="@color/md_black_1000" + android:shadowRadius="4" + android:textAlignment="center" + android:textColor="@color/md_white_1000" + android:textSize="22sp" + android:visibility="gone" /> - - - - - - - + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:shadowColor="@color/md_black_1000" + android:shadowRadius="4" + android:textAlignment="center" + android:textColor="@color/md_white_1000" + android:textSize="22sp" /> - + + + + + android:layout_height="match_parent" + tools:layout="@layout/fragment_adaptive_player_playback_controls" /> + + - - - - - - \ No newline at end of file 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 9576a3352..6136217ce 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,11 +24,10 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_alignParentLeft="true" - android:fontFamily="sans-serif-medium" android:gravity="center_vertical|left|end" android:paddingLeft="8dp" android:singleLine="true" - android:textAppearance="@style/TextAppearance.MaterialComponents.Overline" + android:textAppearance="@style/TextViewOverline" android:textColor="?android:textColorSecondary" android:textSize="12sp" tools:ignore="RtlHardcoded,RtlSymmetry" /> @@ -42,7 +41,7 @@ android:gravity="center_vertical|right|end" android:paddingRight="8dp" android:singleLine="true" - android:textAppearance="@style/TextAppearance.MaterialComponents.Overline" + android:textAppearance="@style/TextViewOverline" android:textColor="?android:textColorSecondary" android:textSize="12sp" tools:ignore="RtlHardcoded,RtlSymmetry" /> diff --git a/app/src/main/res/layout/fragment_banner_home.xml b/app/src/main/res/layout/fragment_banner_home.xml index fcae2a127..3d2433512 100644 --- a/app/src/main/res/layout/fragment_banner_home.xml +++ b/app/src/main/res/layout/fragment_banner_home.xml @@ -77,12 +77,12 @@ app:layout_scrollFlags="scroll|enterAlways" app:strokeColor="?dividerColor"> - diff --git a/app/src/main/res/layout/fragment_blur.xml b/app/src/main/res/layout/fragment_blur.xml index 70c7a1885..e06fa1f69 100644 --- a/app/src/main/res/layout/fragment_blur.xml +++ b/app/src/main/res/layout/fragment_blur.xml @@ -23,61 +23,55 @@ android:layout_width="match_parent" android:layout_height="wrap_content" /> - + android:layout_height="match_parent" + android:orientation="vertical"> - + + + + + + + + + + + + android:layout_weight="1" + tools:background="@color/md_white_1000"> - + android:layout_height="match_parent" /> + - - + - - - - - - - - - - - - - - - - - + + + \ No newline at end of file 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 981b56d2c..5a3b76be3 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 @@ -55,7 +55,7 @@ android:gravity="center_vertical|right|end" android:paddingRight="8dp" android:singleLine="true" - android:textAppearance="@style/TextAppearance.MaterialComponents.Overline" + android:textAppearance="@style/TextViewOverline" android:textColor="?android:textColorSecondary" android:textSize="12sp" tools:ignore="RtlHardcoded,RtlSymmetry" /> @@ -69,7 +69,7 @@ android:gravity="center_vertical|left|end" android:paddingLeft="8dp" android:singleLine="true" - android:textAppearance="@style/TextAppearance.MaterialComponents.Overline" + android:textAppearance="@style/TextViewOverline" android:textColor="?android:textColorSecondary" android:textSize="12sp" tools:ignore="RtlHardcoded,RtlSymmetry" /> @@ -86,7 +86,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/progressContainer"> - - diff --git a/app/src/main/res/layout/fragment_card_blur_player.xml b/app/src/main/res/layout/fragment_card_blur_player.xml index 3ba425f4a..465676f65 100644 --- a/app/src/main/res/layout/fragment_card_blur_player.xml +++ b/app/src/main/res/layout/fragment_card_blur_player.xml @@ -21,73 +21,69 @@ - - + android:layout_height="wrap_content" + android:orientation="vertical"> - + android:layout_height="wrap_content"> - - - - - - - - - - - - - - - - + + + android:layout_weight="0"> + + + + + + android:layout_height="wrap_content" /> + + + + + + - + + \ No newline at end of file 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 fc97ba9b9..9a2906e2b 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 @@ -15,39 +15,6 @@ android:orientation="vertical" tools:ignore="MissingPrefix"> - - - - - - - - diff --git a/app/src/main/res/layout/fragment_card_player.xml b/app/src/main/res/layout/fragment_card_player.xml index b632b9091..f6a5e308e 100644 --- a/app/src/main/res/layout/fragment_card_player.xml +++ b/app/src/main/res/layout/fragment_card_player.xml @@ -8,7 +8,6 @@ android:clickable="true" android:focusable="true"> - - - + android:layout_height="match_parent" + android:orientation="vertical"> - + + + + + + + + + + + + android:layout_weight="1" /> + + + android:layout_height="match_parent"> - - - - - - - - - - - - - - - - - - - - + android:layout_height="match_parent" + tools:layout="@layout/fragment_card_player_playback_controls" /> + + + \ No newline at end of file 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 3e981d0a9..22a7e49c2 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 @@ -22,7 +22,7 @@ android:gravity="center_vertical|left|end" android:paddingLeft="8dp" android:singleLine="true" - android:textAppearance="@style/TextAppearance.MaterialComponents.Overline" + android:textAppearance="@style/TextViewOverline" android:textSize="12sp" tools:ignore="RtlHardcoded,RtlSymmetry" /> @@ -34,7 +34,7 @@ android:gravity="center_vertical|right|end" android:paddingRight="8dp" android:singleLine="true" - android:textAppearance="@style/TextAppearance.MaterialComponents.Overline" + android:textAppearance="@style/TextViewOverline" android:textSize="12sp" tools:ignore="RtlHardcoded,RtlSymmetry" /> @@ -99,16 +99,16 @@ android:layout_marginBottom="2dp" android:ellipsize="end" android:maxLines="1" - android:textSize="16sp" /> + android:textAppearance="@style/TextViewSubtitle1" /> + android:maxLines="1" + android:textAppearance="@style/TextViewBody1" /> diff --git a/app/src/main/res/layout/fragment_classic_player.xml b/app/src/main/res/layout/fragment_classic_player.xml index c6063e83a..a4388008a 100644 --- a/app/src/main/res/layout/fragment_classic_player.xml +++ b/app/src/main/res/layout/fragment_classic_player.xml @@ -73,7 +73,7 @@ android:layout_width="match_parent" android:layout_height="@dimen/status_bar_padding" /> - @@ -35,7 +35,7 @@ android:gravity="center_vertical|right|end" android:paddingRight="8dp" android:singleLine="true" - android:textAppearance="@style/TextAppearance.MaterialComponents.Overline" + android:textAppearance="@style/TextViewOverline" android:textColor="?android:textColorSecondary" android:textSize="12sp" tools:ignore="RtlHardcoded,RtlSymmetry" /> diff --git a/app/src/main/res/layout/fragment_color_player.xml b/app/src/main/res/layout/fragment_color_player.xml index 2f88b830c..28a6cca9f 100644 --- a/app/src/main/res/layout/fragment_color_player.xml +++ b/app/src/main/res/layout/fragment_color_player.xml @@ -15,110 +15,104 @@ - + android:layout_height="match_parent" + android:orientation="vertical"> - + android:layout_height="wrap_content"> - + + - - + - - - + android:layout_gravity="center_horizontal"> - - - - - - - - - - - - - - - - - - - + android:scaleType="centerCrop" + tools:ignore="ContentDescription,UnusedAttribute" /> - + + + + + + + + + + + + + + + + android:layout_height="match_parent" + tools:layout="@layout/fragment_player_playback_controls" /> + + + - + - - - + + \ No newline at end of file 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 b085b452b..7b8f6a486 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 @@ -18,7 +18,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> - - @@ -71,9 +69,8 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/progressContainer"> - - + android:paddingEnd="24dp" + android:textAppearance="@style/TextViewBody2" /> - - @@ -33,7 +33,7 @@ android:gravity="center_vertical|right|end" android:paddingRight="8dp" android:singleLine="true" - android:textAppearance="@style/TextAppearance.MaterialComponents.Overline" + android:textAppearance="@style/TextViewOverline" android:textSize="12sp" tools:ignore="RtlHardcoded,RtlSymmetry" /> @@ -55,7 +55,7 @@ android:orientation="vertical" android:padding="8dp"> - - + android:textAppearance="@style/TextViewNormal" /> diff --git a/app/src/main/res/layout/fragment_flat_player.xml b/app/src/main/res/layout/fragment_flat_player.xml index 9ee1a7ed5..cacc58738 100644 --- a/app/src/main/res/layout/fragment_flat_player.xml +++ b/app/src/main/res/layout/fragment_flat_player.xml @@ -15,60 +15,54 @@ - + android:layout_height="match_parent" + android:orientation="vertical"> - + android:layout_height="wrap_content"> - + + - - + - + + + + + + tools:layout="@layout/fragment_player_album_cover" /> + - - - - + - - - - - - - - - - + android:layout_height="match_parent" + tools:layout="@layout/fragment_flat_player_playback_controls" /> + + \ No newline at end of file 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 aa78f89ba..ba829819e 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 @@ -18,7 +18,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> - - @@ -71,7 +71,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/progressContainer"> - - - - + android:textAppearance="@style/TextViewNormal" /> diff --git a/app/src/main/res/layout/fragment_full.xml b/app/src/main/res/layout/fragment_full.xml index c27982a18..7ebb3a179 100644 --- a/app/src/main/res/layout/fragment_full.xml +++ b/app/src/main/res/layout/fragment_full.xml @@ -19,28 +19,23 @@ android:layout_height="match_parent" android:background="#90000000" /> - - + + - - + tools:layout="@layout/fragment_full_player_controls" /> - - + - - + + - - - - - diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml index a910a0659..d9447c853 100644 --- a/app/src/main/res/layout/fragment_library.xml +++ b/app/src/main/res/layout/fragment_library.xml @@ -39,8 +39,7 @@ android:id="@+id/appBarLayout" android:layout_width="match_parent" android:layout_height="wrap_content" - android:elevation="0dp" - app:elevation="0dp"> + app:liftOnScroll="true"> - @@ -42,7 +42,7 @@ android:gravity="center_vertical|right|end" android:paddingRight="8dp" android:singleLine="true" - android:textAppearance="@style/TextAppearance.MaterialComponents.Overline" + android:textAppearance="@style/TextViewOverline" android:textColor="?android:textColorSecondary" android:textSize="12sp" tools:ignore="RtlHardcoded,RtlSymmetry" /> diff --git a/app/src/main/res/layout/fragment_lyrics.xml b/app/src/main/res/layout/fragment_lyrics.xml index fcb904f1f..9e6ee215f 100644 --- a/app/src/main/res/layout/fragment_lyrics.xml +++ b/app/src/main/res/layout/fragment_lyrics.xml @@ -6,16 +6,16 @@ android:fadingEdge="vertical" app:layout_behavior="@string/appbar_scrolling_view_behavior"> - + android:textAppearance="@style/TextViewBody1" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_main_activity_recycler_view.xml b/app/src/main/res/layout/fragment_main_activity_recycler_view.xml index 11ce06a0e..eedfff892 100644 --- a/app/src/main/res/layout/fragment_main_activity_recycler_view.xml +++ b/app/src/main/res/layout/fragment_main_activity_recycler_view.xml @@ -28,13 +28,13 @@ android:layout_height="96dp" app:srcCompat="@drawable/ic_music_note_off_white_24dp" /> - diff --git a/app/src/main/res/layout/fragment_main_settings.xml b/app/src/main/res/layout/fragment_main_settings.xml index c3faac566..4039b3294 100644 --- a/app/src/main/res/layout/fragment_main_settings.xml +++ b/app/src/main/res/layout/fragment_main_settings.xml @@ -11,7 +11,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - tools:background="@color/md_black_1000"> + tools:background="@color/md_grey_500"> + android:text="@string/upgrade_to_premium" + android:textAppearance="@style/TextViewOverline" /> - @@ -75,10 +75,10 @@ android:layout_height="72dp" android:layout_gravity="center_vertical" android:layout_marginEnd="16dp" - app:srcCompat="@drawable/promotional" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toTopOf="@id/titleContainer" /> + app:layout_constraintTop_toTopOf="@id/titleContainer" + app:srcCompat="@drawable/promotional" /> + android:textAppearance="@style/TextViewSubtitle1" /> @@ -174,8 +174,7 @@ android:fadingEdge="horizontal" android:singleLine="true" android:text="@string/now_playing" - android:textSize="@dimen/ate_default_textsize_subheading" - app:fontFamily="@font/circular_std_medium" /> + android:textAppearance="@style/TextViewSubtitle1" /> + android:textAppearance="@style/TextViewNormal" /> @@ -219,8 +218,7 @@ android:fadingEdge="horizontal" android:singleLine="true" android:text="@string/pref_header_audio" - android:textSize="@dimen/ate_default_textsize_subheading" - app:fontFamily="@font/circular_std_medium" /> + android:textAppearance="@style/TextViewSubtitle1" /> + android:textAppearance="@style/TextViewNormal" /> @@ -264,8 +262,7 @@ android:fadingEdge="horizontal" android:singleLine="true" android:text="@string/personalize" - android:textSize="@dimen/ate_default_textsize_subheading" - app:fontFamily="@font/circular_std_medium" /> + android:textAppearance="@style/TextViewSubtitle1" /> + android:textAppearance="@style/TextViewNormal" /> @@ -308,8 +305,7 @@ android:fadingEdge="horizontal" android:singleLine="true" android:text="@string/pref_header_images" - android:textSize="@dimen/ate_default_textsize_subheading" - app:fontFamily="@font/circular_std_medium" /> + android:textAppearance="@style/TextViewSubtitle1" /> + android:textAppearance="@style/TextViewNormal" /> @@ -352,8 +348,7 @@ android:fadingEdge="horizontal" android:singleLine="true" android:text="@string/notification" - android:textSize="@dimen/ate_default_textsize_subheading" - app:fontFamily="@font/circular_std_medium" /> + android:textAppearance="@style/TextViewSubtitle1" /> + android:textAppearance="@style/TextViewNormal" /> @@ -398,8 +393,7 @@ android:fadingEdge="horizontal" android:singleLine="true" android:text="@string/others" - android:textSize="@dimen/ate_default_textsize_subheading" - app:fontFamily="@font/circular_std_medium" /> + android:textAppearance="@style/TextViewSubtitle1" /> + android:textAppearance="@style/TextViewNormal" /> @@ -444,16 +438,14 @@ android:fadingEdge="horizontal" android:singleLine="true" android:text="@string/action_about" - android:textSize="@dimen/ate_default_textsize_subheading" - app:fontFamily="@font/circular_std_medium" /> + android:textAppearance="@style/TextViewSubtitle1" /> + android:textAppearance="@style/TextViewNormal" /> diff --git a/app/src/main/res/layout/fragment_material.xml b/app/src/main/res/layout/fragment_material.xml index 0c1f1ba10..adeed01a3 100644 --- a/app/src/main/res/layout/fragment_material.xml +++ b/app/src/main/res/layout/fragment_material.xml @@ -9,60 +9,54 @@ - + android:layout_height="match_parent" + android:orientation="vertical"> - + android:layout_height="wrap_content"> - + + - - + - - - - - - + tools:layout="@layout/fragment_album_cover" /> + - - + - + android:layout_height="match_parent" + tools:layout="@layout/fragment_material_playback_controls" /> + - - - - + + + + + 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 5aa6a99a9..f52465a84 100644 --- a/app/src/main/res/layout/fragment_material_playback_controls.xml +++ b/app/src/main/res/layout/fragment_material_playback_controls.xml @@ -28,7 +28,7 @@ android:gravity="center_vertical|left|end" android:paddingLeft="8dp" android:singleLine="true" - android:textAppearance="@style/TextAppearance.MaterialComponents.Overline" + android:textAppearance="@style/TextViewOverline" android:textColor="?android:textColorSecondary" android:textSize="12sp" tools:ignore="RtlHardcoded,RtlSymmetry" /> @@ -42,7 +42,7 @@ android:gravity="center_vertical|right|end" android:paddingRight="8dp" android:singleLine="true" - android:textAppearance="@style/TextAppearance.MaterialComponents.Overline" + android:textAppearance="@style/TextViewOverline" android:textColor="?android:textColorSecondary" android:textSize="12sp" tools:ignore="RtlHardcoded,RtlSymmetry" /> diff --git a/app/src/main/res/layout/fragment_mini_player.xml b/app/src/main/res/layout/fragment_mini_player.xml index c3ebd5db8..9220735c2 100644 --- a/app/src/main/res/layout/fragment_mini_player.xml +++ b/app/src/main/res/layout/fragment_mini_player.xml @@ -1,5 +1,5 @@ - - + android:singleLine="true" + android:textAppearance="@style/TextViewNormal" /> - \ No newline at end of file + android:progress="20" /> + \ No newline at end of file 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 2835d2960..25587710e 100644 --- a/app/src/main/res/layout/fragment_plain_controls_fragment.xml +++ b/app/src/main/res/layout/fragment_plain_controls_fragment.xml @@ -26,7 +26,7 @@ android:gravity="center_vertical|left|end" android:paddingLeft="8dp" android:singleLine="true" - android:textAppearance="@style/TextAppearance.MaterialComponents.Overline" + android:textAppearance="@style/TextViewOverline" android:textColor="?android:textColorSecondary" android:textSize="12sp" tools:ignore="RtlHardcoded,RtlSymmetry" /> @@ -40,7 +40,7 @@ android:gravity="center_vertical|right|end" android:paddingRight="8dp" android:singleLine="true" - android:textAppearance="@style/TextAppearance.MaterialComponents.Overline" + android:textAppearance="@style/TextViewOverline" android:textColor="?android:textColorSecondary" android:textSize="12sp" tools:ignore="RtlHardcoded,RtlSymmetry" /> diff --git a/app/src/main/res/layout/fragment_plain_player.xml b/app/src/main/res/layout/fragment_plain_player.xml index 9725f6d3c..bc236a16c 100644 --- a/app/src/main/res/layout/fragment_plain_player.xml +++ b/app/src/main/res/layout/fragment_plain_player.xml @@ -9,92 +9,87 @@ - + android:layout_height="match_parent" + android:orientation="vertical"> + + + + + + android:layout_height="wrap_content" + android:layout_weight="0" + android:orientation="vertical" + android:paddingStart="16dp" + android:paddingEnd="16dp"> - - - - - - + android:ellipsize="marquee" + android:focusable="true" + android:focusableInTouchMode="true" + android:freezesText="true" + android:marqueeRepeatLimit="marquee_forever" + android:scrollHorizontally="true" + android:singleLine="true" + android:textSize="22sp" + android:textStyle="bold" + tools:ignore="MissingPrefix" + tools:text="Title" /> - - - - - - + android:layout_height="wrap_content" + android:ellipsize="end" + android:maxLines="1" + tools:text="Text" /> + - - + - + + + + + + tools:layout="@layout/fragment_plain_controls_fragment" /> + - - + - + + + - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_player.xml b/app/src/main/res/layout/fragment_player.xml index bebbaf54b..cd8d3f0e7 100644 --- a/app/src/main/res/layout/fragment_player.xml +++ b/app/src/main/res/layout/fragment_player.xml @@ -15,62 +15,57 @@ - + android:layout_height="match_parent" + android:orientation="vertical"> - + android:layout_height="wrap_content"> - + + + + + + android:layout_height="match_parent" + tools:layout="@layout/fragment_album_cover" /> + - - + - + android:layout_height="match_parent" + tools:layout="@layout/fragment_player_playback_controls" /> + - - + - + + + - - - - - - - - - \ No newline at end of file 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 9e1c4f5a6..b87364b1f 100755 --- a/app/src/main/res/layout/fragment_player_playback_controls.xml +++ b/app/src/main/res/layout/fragment_player_playback_controls.xml @@ -9,7 +9,6 @@ android:orientation="vertical" tools:ignore="MissingPrefix"> - @@ -57,7 +56,7 @@ android:gravity="center_vertical|left|end" android:paddingLeft="8dp" android:singleLine="true" - android:textAppearance="@style/TextAppearance.MaterialComponents.Overline" + android:textAppearance="@style/TextViewOverline" android:textColor="?android:textColorSecondary" android:textSize="12sp" tools:ignore="RtlHardcoded,RtlSymmetry" /> 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 a4dcd69d0..c2f98c3fb 100644 --- a/app/src/main/res/layout/fragment_simple_controls_fragment.xml +++ b/app/src/main/res/layout/fragment_simple_controls_fragment.xml @@ -73,7 +73,7 @@ android:gravity="center" android:paddingStart="16dp" android:paddingEnd="16dp" - android:textAppearance="@style/TextAppearance.MaterialComponents.Overline" + android:textAppearance="@style/TextViewOverline" android:textColor="?android:attr/textColorSecondary" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/fragment_simple_player.xml b/app/src/main/res/layout/fragment_simple_player.xml index 8751abfbd..eb84c9332 100644 --- a/app/src/main/res/layout/fragment_simple_player.xml +++ b/app/src/main/res/layout/fragment_simple_player.xml @@ -10,59 +10,53 @@ - + android:layout_height="match_parent" + android:orientation="vertical"> - + android:layout_height="wrap_content"> - + + - - + - - - - - - - - - - - + tools:layout="@layout/fragment_player_album_cover" /> + - - - - + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_simple_slide_large_image.xml b/app/src/main/res/layout/fragment_simple_slide_large_image.xml index 14c7d8eb3..c14846439 100644 --- a/app/src/main/res/layout/fragment_simple_slide_large_image.xml +++ b/app/src/main/res/layout/fragment_simple_slide_large_image.xml @@ -33,24 +33,24 @@ app:layout_parallaxFactor="0.75" tools:ignore="ContentDescription" /> - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_slide_player.xml b/app/src/main/res/layout/fragment_slide_player.xml deleted file mode 100644 index 9f482a3f1..000000000 --- a/app/src/main/res/layout/fragment_slide_player.xml +++ /dev/null @@ -1,327 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_tiny_controls_fragment.xml b/app/src/main/res/layout/fragment_tiny_controls_fragment.xml index 01633c597..0b9a7af98 100644 --- a/app/src/main/res/layout/fragment_tiny_controls_fragment.xml +++ b/app/src/main/res/layout/fragment_tiny_controls_fragment.xml @@ -8,7 +8,6 @@ android:gravity="end" android:orientation="vertical"> - + android:progressDrawable="@drawable/progress_drawable_vertical" + android:secondaryProgress="100" /> - + android:layout_height="match_parent" + android:orientation="vertical"> - + android:layout_height="wrap_content"> - + + - - + - + - + android:ellipsize="end" + android:freezesText="true" + android:singleLine="true" + android:textStyle="bold" + app:textAllCaps="true" + tools:ignore="MissingPrefix" + tools:text="Song title" /> - + - + - + - + tools:layout="@layout/fragment_tiny_controls_fragment" /> - + - + + + - - - + - + android:padding="16dp" + android:textAppearance="@style/TextAppearance.AppCompat.Display3" + android:textStyle="bold" + tools:ignore="MissingPrefix" /> - + + + - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/home_content.xml b/app/src/main/res/layout/home_content.xml index eefead3da..250e3af36 100644 --- a/app/src/main/res/layout/home_content.xml +++ b/app/src/main/res/layout/home_content.xml @@ -41,20 +41,20 @@ android:layout_gravity="center" android:gravity="center_horizontal" android:orientation="vertical" - tools:visibility="visible" - android:visibility="gone"> + android:visibility="gone" + tools:visibility="visible"> - + android:textAppearance="@style/TextViewNormal" /> \ No newline at end of file diff --git a/app/src/main/res/layout/home_section_content.xml b/app/src/main/res/layout/home_section_content.xml deleted file mode 100644 index 82e44dd2e..000000000 --- a/app/src/main/res/layout/home_section_content.xml +++ /dev/null @@ -1,160 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/image.xml b/app/src/main/res/layout/image.xml index 375c45f91..5430e8b08 100644 --- a/app/src/main/res/layout/image.xml +++ b/app/src/main/res/layout/image.xml @@ -16,11 +16,11 @@ - \ No newline at end of file diff --git a/app/src/main/res/layout/item_album_card.xml b/app/src/main/res/layout/item_album_card.xml index 33a63619b..99c375a5a 100644 --- a/app/src/main/res/layout/item_album_card.xml +++ b/app/src/main/res/layout/item_album_card.xml @@ -30,7 +30,7 @@ android:paddingTop="6dp" android:paddingEnd="8dp" android:paddingBottom="4dp" - android:textSize="12sp" + android:textAppearance="@style/TextViewNormal" tools:ignore="MissingPrefix" tools:text="My top tracks" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_artist.xml b/app/src/main/res/layout/item_artist.xml index be93171dd..a0357a462 100644 --- a/app/src/main/res/layout/item_artist.xml +++ b/app/src/main/res/layout/item_artist.xml @@ -18,12 +18,13 @@ app:civ_border="false" /> - + android:paddingTop="12dp" + android:textAppearance="@style/TextViewNormal" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_artist_square.xml b/app/src/main/res/layout/item_artist_square.xml index dfca1722f..1d8824572 100644 --- a/app/src/main/res/layout/item_artist_square.xml +++ b/app/src/main/res/layout/item_artist_square.xml @@ -8,8 +8,7 @@ app:cardElevation="4dp" app:cardUseCompatPadding="true"> - @@ -31,8 +30,8 @@ android:layout_height="wrap_content" android:ellipsize="end" android:maxLines="1" + android:textAppearance="@style/TextViewNormal" android:padding="8dp" - android:textSize="13sp" tools:text="@string/home" /> diff --git a/app/src/main/res/layout/item_card.xml b/app/src/main/res/layout/item_card.xml index 56e74d9e9..5baa37aac 100644 --- a/app/src/main/res/layout/item_card.xml +++ b/app/src/main/res/layout/item_card.xml @@ -21,7 +21,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - - + android:textAppearance="@style/TextViewSubtitle1" + android:textStyle="bold" /> - + android:textAppearance="@style/TextViewBody2" /> diff --git a/app/src/main/res/layout/item_card_color.xml b/app/src/main/res/layout/item_card_color.xml index 39eab6a68..e7db55958 100644 --- a/app/src/main/res/layout/item_card_color.xml +++ b/app/src/main/res/layout/item_card_color.xml @@ -21,7 +21,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - + android:singleLine="true" + android:textAppearance="@style/TextViewSubtitle1" + android:textStyle="bold" /> + android:textAppearance="@style/TextViewBody2" /> diff --git a/app/src/main/res/layout/item_color.xml b/app/src/main/res/layout/item_color.xml deleted file mode 100644 index 530485c9f..000000000 --- a/app/src/main/res/layout/item_color.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/item_contributor.xml b/app/src/main/res/layout/item_contributor.xml index 2634ade0e..e1376a099 100644 --- a/app/src/main/res/layout/item_contributor.xml +++ b/app/src/main/res/layout/item_contributor.xml @@ -31,16 +31,15 @@ + android:layout_height="wrap_content" + android:textAppearance="@style/TextViewSubtitle1" /> + android:alpha="0.85" + android:textAppearance="@style/TextViewBody2" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_donation_option.xml b/app/src/main/res/layout/item_donation_option.xml index 94902e67e..836e6b787 100644 --- a/app/src/main/res/layout/item_donation_option.xml +++ b/app/src/main/res/layout/item_donation_option.xml @@ -19,12 +19,12 @@ android:gravity="center" android:orientation="vertical"> - @@ -41,20 +41,19 @@ - - diff --git a/app/src/main/res/layout/item_grid.xml b/app/src/main/res/layout/item_grid.xml index 1c6fba4a5..880d9977c 100644 --- a/app/src/main/res/layout/item_grid.xml +++ b/app/src/main/res/layout/item_grid.xml @@ -26,7 +26,7 @@ app:cardElevation="4dp" app:cardUseCompatPadding="true"> - - + android:textAppearance="@style/TextViewSubtitle1" + android:textStyle="bold" /> - + android:textAppearance="@style/TextViewBody2" /> diff --git a/app/src/main/res/layout/item_grid_circle.xml b/app/src/main/res/layout/item_grid_circle.xml index 22e106c91..3547989a2 100644 --- a/app/src/main/res/layout/item_grid_circle.xml +++ b/app/src/main/res/layout/item_grid_circle.xml @@ -42,26 +42,21 @@ android:paddingEnd="4dp" android:paddingBottom="8dp"> - + android:textAppearance="@style/TextViewSubtitle1" + android:textStyle="bold" /> - - + android:textAppearance="@style/TextViewBody2" /> diff --git a/app/src/main/res/layout/item_image.xml b/app/src/main/res/layout/item_image.xml index 4396c9275..c32ad956f 100644 --- a/app/src/main/res/layout/item_image.xml +++ b/app/src/main/res/layout/item_image.xml @@ -27,12 +27,12 @@ - + android:textAppearance="@style/TextViewNormal" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_image_gradient.xml b/app/src/main/res/layout/item_image_gradient.xml index a105f40e0..28647bb2c 100644 --- a/app/src/main/res/layout/item_image_gradient.xml +++ b/app/src/main/res/layout/item_image_gradient.xml @@ -43,7 +43,7 @@ - diff --git a/app/src/main/res/layout/item_list.xml b/app/src/main/res/layout/item_list.xml index 867d4377f..003c4b832 100755 --- a/app/src/main/res/layout/item_list.xml +++ b/app/src/main/res/layout/item_list.xml @@ -48,16 +48,17 @@ android:layout_height="40dp" android:layout_gravity="center_vertical" android:gravity="center_vertical" - android:scaleType="centerCrop" /> + android:scaleType="centerCrop" /> - @@ -81,6 +82,7 @@ android:layout_height="wrap_content" android:ellipsize="end" android:maxLines="1" + android:textAppearance="@style/TextViewHeadline6" android:textSize="16sp" /> + android:maxLines="1" + android:textAppearance="@style/TextViewNormal" /> - - - - \ No newline at end of file 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 1047979e2..6d597319c 100644 --- a/app/src/main/res/layout/item_list_no_image.xml +++ b/app/src/main/res/layout/item_list_no_image.xml @@ -30,21 +30,19 @@ android:paddingEnd="16dp" android:paddingRight="16dp"> - + android:textAppearance="@style/TextViewSubtitle1" /> - diff --git a/app/src/main/res/layout/item_list_quick_actions.xml b/app/src/main/res/layout/item_list_quick_actions.xml index bd1a81b24..c78e9d18c 100644 --- a/app/src/main/res/layout/item_list_quick_actions.xml +++ b/app/src/main/res/layout/item_list_quick_actions.xml @@ -31,6 +31,7 @@ android:padding="10dp" android:text="@string/action_play_all" android:textAllCaps="false" + android:textAppearance="@style/TextViewNormal" app:cornerRadius="6dp" app:icon="@drawable/ic_play_arrow_white_24dp" app:iconGravity="textStart" @@ -46,6 +47,7 @@ android:padding="10dp" android:text="@string/shuffle" android:textAllCaps="false" + android:textAppearance="@style/TextViewNormal" app:cornerRadius="6dp" app:icon="@drawable/ic_shuffle_white_24dp" app:iconGravity="textStart" diff --git a/app/src/main/res/layout/item_list_single_row.xml b/app/src/main/res/layout/item_list_single_row.xml deleted file mode 100644 index 3e86e5af1..000000000 --- a/app/src/main/res/layout/item_list_single_row.xml +++ /dev/null @@ -1,95 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_option_menu.xml b/app/src/main/res/layout/item_option_menu.xml index eee36b355..f8f520cb7 100644 --- a/app/src/main/res/layout/item_option_menu.xml +++ b/app/src/main/res/layout/item_option_menu.xml @@ -32,11 +32,12 @@ android:padding="14dp" app:srcCompat="@drawable/ic_folder_white_24dp" /> - \ No newline at end of file diff --git a/app/src/main/res/layout/item_playlist.xml b/app/src/main/res/layout/item_playlist.xml deleted file mode 100644 index 151c87b92..000000000 --- a/app/src/main/res/layout/item_playlist.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_queue.xml b/app/src/main/res/layout/item_queue.xml index d52494574..af47be0ba 100644 --- a/app/src/main/res/layout/item_queue.xml +++ b/app/src/main/res/layout/item_queue.xml @@ -20,8 +20,8 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_gravity="center_vertical|start" - android:visibility="gone" android:padding="8dp" + android:visibility="gone" app:srcCompat="@drawable/ic_drag_vertical_white_24dp" tools:ignore="ContentDescription" tools:visibility="visible" /> @@ -32,16 +32,16 @@ android:layout_height="match_parent" android:layout_weight="0"> - @@ -60,25 +60,23 @@ android:paddingStart="16dp" android:paddingEnd="16dp"> - + android:textAppearance="@style/TextViewHeadline6" + android:textSize="16sp" /> - + android:textAppearance="@style/TextViewNormal" /> - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_song.xml b/app/src/main/res/layout/item_song.xml index 105eb96a8..1c611841c 100755 --- a/app/src/main/res/layout/item_song.xml +++ b/app/src/main/res/layout/item_song.xml @@ -18,13 +18,13 @@ + android:minHeight="40dp" + android:textAppearance="@style/TextViewNormal" /> @@ -48,11 +48,11 @@ @@ -70,7 +72,6 @@ style="@style/OverFlowButton" android:layout_margin="0dp" android:layout_weight="0" - android:background="@null" android:rotation="90" tools:visibility="visible" /> \ No newline at end of file diff --git a/app/src/main/res/layout/metal_section_recycler_view.xml b/app/src/main/res/layout/metal_section_recycler_view.xml index e4340502e..de53a8eea 100644 --- a/app/src/main/res/layout/metal_section_recycler_view.xml +++ b/app/src/main/res/layout/metal_section_recycler_view.xml @@ -9,10 +9,11 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/pager_item.xml b/app/src/main/res/layout/pager_item.xml index 551849627..8ae66004a 100644 --- a/app/src/main/res/layout/pager_item.xml +++ b/app/src/main/res/layout/pager_item.xml @@ -42,7 +42,7 @@ android:paddingTop="6dp" android:paddingEnd="8dp" android:paddingBottom="4dp" - android:textSize="13sp" + android:textAppearance="@style/TextViewNormal" tools:ignore="MissingPrefix" tools:text="My top tracks" /> @@ -54,7 +54,7 @@ android:maxLines="1" android:paddingStart="8dp" android:paddingEnd="8dp" - android:textSize="14sp" + android:textAppearance="@style/TextViewSubtitle1" android:textStyle="bold" tools:ignore="MissingPrefix" tools:text="My top tracks" /> diff --git a/app/src/main/res/layout/player_time.xml b/app/src/main/res/layout/player_time.xml index 6faeefb00..d0240587c 100644 --- a/app/src/main/res/layout/player_time.xml +++ b/app/src/main/res/layout/player_time.xml @@ -10,28 +10,26 @@ tools:showIn="@layout/fragment_player_playback_controls"> - - \ No newline at end of file diff --git a/app/src/main/res/layout/preference_dialog_library_categories.xml b/app/src/main/res/layout/preference_dialog_library_categories.xml index 1b758214e..1f47ad6c4 100644 --- a/app/src/main/res/layout/preference_dialog_library_categories.xml +++ b/app/src/main/res/layout/preference_dialog_library_categories.xml @@ -1,5 +1,4 @@ - -