Siklos/Metro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Refactor

Browse source
This commit is contained in:
h4h13 2019-01-28 16:15:51 +05:30
parent 63c417cd61
commit a81536ab9a
96 changed files with 729 additions and 724 deletions
Download patch file Download diff file Expand all files Collapse all files

21
app/src/main/res/drawable/color_progress_seek.xml
View file

@ -1,26 +1,17 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@android:id/background">
<shape android:shape="rectangle">
<shape>
<corners android:radius="8dp" />
<solid android:color="@color/md_grey_200" />
<solid android:color="?android:colorButtonNormal" />
</shape>
</item>
<item android:id="@android:id/secondaryProgress">
<clip>
<shape android:shape="rectangle">
<corners android:radius="8dp" />
<solid android:color="@color/md_grey_200" />
</shape>
</clip>
</item>
<item android:id="@android:id/progress">
<clip>
<shape android:shape="rectangle">
<solid android:color="@color/md_green_A700" />
<scale android:scaleWidth="100%">
<shape>
<corners android:radius="8dp" />
<solid android:color="@color/md_red_400" />
</shape>
</clip>
</scale>
</item>
</layer-list>

2
app/src/main/res/drawable/ic_text_fields_black_24dp.xml
View file

@ -4,6 +4,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:fillColor="@color/md_white_1000"
android:pathData="M2.5,4v3h5v12h3L10.5,7h5L15.5,4h-13zM21.5,9h-9v3h3v7h3v-7h3L21.5,9z"/>
</vector>

12
app/src/main/res/drawable/ic_time_lapse_white_24dp.xml
View file

@ -1,4 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
</selector>
<path
android:fillColor="@color/md_white_1000"
android:pathData="M16.24 7.75c-1.17-1.17-2.7-1.76-4.24-1.76v6l-4.24 4.24c2.34 2.34 6.14 2.34 8.49 0 2.34-2.34 2.34-6.14-0.01-8.48zM12 1.99c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 18c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z" />
</vector>

BIN
app/src/main/res/drawable/promotional.webp
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Before After
Before After

9
app/src/main/res/layout-land/fragment_banner_home.xml
View file

@ -67,7 +67,10 @@
<TextView
android:id="@+id/bannerTitle"
style="@style/BigTitleTextAppearanceToolbar"
android:shadowColor="@color/md_black_1000"
android:shadowRadius="2"
android:text="@string/app_name"
android:textColor="@color/md_white_1000"
tools:ignore="MissingPrefix" />
<code.name.monkey.retromusic.views.CircularImageView
@ -108,7 +111,11 @@
<include layout="@layout/abs_playlists" />
<include layout="@layout/home_section_content" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:nestedScrollingEnabled="false" />
</LinearLayout>
</com.google.android.material.card.MaterialCardView>

6
app/src/main/res/layout-land/fragment_home.xml
View file

@ -68,7 +68,11 @@
<include layout="@layout/abs_playlists" />
<include layout="@layout/home_section_content" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:nestedScrollingEnabled="false" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

2
app/src/main/res/layout-land/pager_item.xml
View file

@ -10,7 +10,7 @@
<com.google.android.material.card.MaterialCardView
android:id="@+id/imageContainer"
android:layout_width="match_parent"
android:layout_height="256dp"
android:layout_height="156dp"
app:cardCornerRadius="12dp"
app:cardUseCompatPadding="true">

9
app/src/main/res/layout-xlarge-land/fragment_banner_home.xml
View file

@ -69,7 +69,10 @@
<TextView
android:id="@+id/bannerTitle"
style="@style/BigTitleTextAppearanceToolbar"
android:shadowColor="@color/md_black_1000"
android:shadowRadius="2"
android:text="@string/app_name"
android:textColor="@color/md_white_1000"
tools:ignore="MissingPrefix" />
<code.name.monkey.retromusic.views.CircularImageView
@ -108,7 +111,11 @@
<include layout="@layout/abs_playlists" />
<include layout="@layout/home_section_content" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:nestedScrollingEnabled="false" />
</LinearLayout>
</com.google.android.material.card.MaterialCardView>
</androidx.core.widget.NestedScrollView>

6
app/src/main/res/layout-xlarge-land/fragment_home.xml
View file

@ -70,7 +70,11 @@
<include layout="@layout/abs_playlists" />
<include layout="@layout/home_section_content" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:nestedScrollingEnabled="false" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>

5
app/src/main/res/layout-xlarge/abs_playlists.xml
View file

@ -5,9 +5,10 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<androidx.appcompat.widget.AppCompatTextView
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
style="@style/SubTitleTextAppearance"
android:text="@string/for_you" />
android:text="@string/for_you"
android:textStyle="bold" />
<LinearLayout
android:layout_width="match_parent"

25
app/src/main/res/layout-xlarge/activity_artist_content.xml
View file

@ -5,9 +5,9 @@
android:layout_height="match_parent"
android:orientation="vertical">
<androidx.appcompat.widget.AppCompatTextView
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
android:id="@+id/biographyTitle"
android:textStyle="bold"
style="@style/TextAppearance.MaterialComponents.Subtitle2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="24dp"
@ -15,12 +15,12 @@
android:paddingEnd="24dp"
android:paddingBottom="12dp"
android:text="@string/biography"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
android:textColor="?android:attr/textColorPrimary"
android:textStyle="bold"
android:visibility="gone"
tools:ignore="MissingPrefix" />
<androidx.appcompat.widget.AppCompatTextView
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
android:id="@+id/biographyText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -28,11 +28,12 @@
android:maxLines="4"
android:padding="16dp"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:visibility="gone" />
android:visibility="gone"
tools:visibility="visible" />
<androidx.appcompat.widget.AppCompatTextView
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
android:id="@+id/albumTitle"
android:textStyle="bold"
style="@style/TextAppearance.MaterialComponents.Subtitle2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="24dp"
@ -40,8 +41,8 @@
android:paddingEnd="24dp"
android:paddingBottom="12dp"
android:text="@string/albums"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
android:textColor="?android:attr/textColorPrimary" />
android:textColor="?android:attr/textColorPrimary"
android:textStyle="bold" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/albumRecyclerView"
@ -49,9 +50,9 @@
android:layout_height="wrap_content"
android:nestedScrollingEnabled="false" />
<androidx.appcompat.widget.AppCompatTextView
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
android:id="@+id/songTitle"
android:textStyle="bold"
style="@style/TextAppearance.MaterialComponents.Subtitle2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="24dp"
@ -59,8 +60,8 @@
android:paddingEnd="24dp"
android:paddingBottom="12dp"
android:text="@string/songs"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
android:textColor="?android:attr/textColorPrimary"
android:textStyle="bold"
tools:ignore="MissingPrefix" />
<androidx.recyclerview.widget.RecyclerView

9
app/src/main/res/layout-xlarge/fragment_banner_home.xml
View file

@ -77,7 +77,10 @@
<TextView
android:id="@+id/bannerTitle"
style="@style/BigTitleTextAppearanceToolbar"
android:shadowColor="@color/md_black_1000"
android:shadowRadius="2"
android:text="@string/app_name"
android:textColor="@color/md_white_1000"
tools:ignore="MissingPrefix" />
<code.name.monkey.retromusic.views.CircularImageView
@ -116,7 +119,11 @@
<include layout="@layout/abs_playlists" />
<include layout="@layout/home_section_content" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:nestedScrollingEnabled="false" />
</LinearLayout>
</com.google.android.material.card.MaterialCardView>
</androidx.core.widget.NestedScrollView>

6
app/src/main/res/layout-xlarge/fragment_home.xml
View file

@ -72,7 +72,11 @@
<include layout="@layout/abs_playlists" />
<include layout="@layout/home_section_content" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:nestedScrollingEnabled="false" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

6
app/src/main/res/layout-xlarge/fragment_mini_player.xml
View file

@ -80,14 +80,12 @@
</LinearLayout>
<me.zhanghai.android.materialprogressbar.MaterialProgressBar
<ProgressBar
android:id="@+id/progressBar"
style="@style/Widget.MaterialProgressBar.ProgressBar.Horizontal"
android:layout_width="match_parent"
android:layout_height="3dp"
android:progress="20"
app:mpb_progressStyle="horizontal"
app:mpb_showProgressBackground="false"
app:mpb_useIntrinsicPadding="false" />
android:progressDrawable="@drawable/color_progress_seek" />
</code.name.monkey.retromusic.views.FitSystemWindowsLayout>

1
app/src/main/res/layout/abs_playlists.xml
View file

@ -7,6 +7,7 @@
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
style="@style/SubTitleTextAppearance"
android:textStyle="bold"
android:text="@string/for_you" />
<LinearLayout

11
app/src/main/res/layout/activity_artist_content.xml
View file

@ -11,25 +11,26 @@
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.appcompat.widget.AppCompatTextView
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
android:id="@+id/biographyTitle"
style="@style/SubTitleTextAppearance"
android:text="@string/biography"
android:visibility="gone"
tools:visibility="visible" />
<androidx.appcompat.widget.AppCompatTextView
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
android:id="@+id/biographyText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="4"
android:lineSpacingExtra="5dp"
android:padding="16dp"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
style="@style/TextAppearance.MaterialComponents.Body1"
android:visibility="gone"
tools:visibility="visible" />
<androidx.appcompat.widget.AppCompatTextView
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
android:id="@+id/albumTitle"
style="@style/SubTitleTextAppearance"
android:text="@string/albums" />
@ -40,7 +41,7 @@
android:layout_height="wrap_content"
android:nestedScrollingEnabled="false" />
<androidx.appcompat.widget.AppCompatTextView
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
android:id="@+id/songTitle"
style="@style/SubTitleTextAppearance"
android:text="@string/songs" />

171
app/src/main/res/layout/activity_pro_version.xml
View file

@ -55,21 +55,168 @@
android:background="?dividerColor" />
</com.google.android.material.appbar.AppBarLayout>
<androidx.core.widget.NestedScrollView
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<include layout="@layout/activity_pro_version_content" />
</androidx.core.widget.NestedScrollView>
<LinearLayout
android:id="@+id/content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<code.name.monkey.retromusic.views.IconImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="16dp"
android:tint="@color/md_white_1000"
app:srcCompat="@drawable/ic_format_color_fill" />
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="16dp"
android:text="@string/base_color_theme"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
android:textColor="@color/md_white_1000" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<code.name.monkey.retromusic.views.IconImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="16dp"
android:tint="@color/md_white_1000"
app:srcCompat="@drawable/ic_theme_palette_white_24dp" />
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="16dp"
android:text="@string/now_playing_themes"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
android:textColor="@color/md_white_1000" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<code.name.monkey.retromusic.views.IconImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="16dp"
android:tint="@color/md_white_1000"
app:srcCompat="@drawable/ic_view_carousel_black_24dp" />
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="16dp"
android:text="@string/carousal_effect_on_now_playing_screen"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
android:textColor="@color/md_white_1000" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<code.name.monkey.retromusic.views.IconImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="16dp"
android:tint="@color/md_white_1000"
app:srcCompat="@drawable/ic_rounded_corner" />
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="16dp"
android:text="@string/window_corner_edges"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
android:textColor="@color/md_white_1000" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<code.name.monkey.retromusic.views.IconImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="16dp"
android:tint="@color/md_white_1000"
app:srcCompat="@drawable/ic_favorite_white_24dp" />
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="16dp"
android:text="@string/support_development"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
android:textColor="@color/md_white_1000" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/actions"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/content"
android:orientation="horizontal">
<com.google.android.material.button.MaterialButton
android:id="@+id/restoreButton"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:layout_weight="1"
android:paddingTop="14dp"
android:paddingBottom="14dp"
android:text="@string/restore"
android:textAllCaps="false"
app:strokeWidth="2dp" />
<com.google.android.material.button.MaterialButton
android:id="@+id/purchaseButton"
style="@style/Widget.MaterialComponents.Button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:layout_weight="1"
android:paddingTop="14dp"
android:paddingBottom="14dp"
android:text="@string/purchase"
android:textAllCaps="false" />
</LinearLayout>
</RelativeLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:gravity="center"
android:padding="16dp"
android:text="@string/purchase_summary" />
</RelativeLayout>

21
app/src/main/res/layout/dialog_delete.xml
View file

@ -1,35 +1,42 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
android:orientation="vertical"
android:paddingTop="8dp">
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
android:id="@+id/title"
android:id="@+id/dialogTitle"
style="@style/SubTitleTextAppearance"
android:text="@string/remove_song_from_playlist_title" />
android:text="@string/remove_song_from_playlist_title"
android:textStyle="bold" />
<com.google.android.material.button.MaterialButton
android:id="@+id/actionDelete"
style="@style/Widget.MaterialComponents.Button.TextButton"
style="@style/Widget.MaterialComponents.Button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:gravity="start|center_vertical"
android:paddingTop="14dp"
android:paddingBottom="14dp"
android:text="@string/remove_action"
android:textAllCaps="false" />
<com.google.android.material.button.MaterialButton
android:id="@+id/actionCancel"
style="@style/Widget.MaterialComponents.Button.TextButton"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:gravity="start|center_vertical"
android:paddingTop="14dp"
android:paddingBottom="14dp"
android:text="@android:string/cancel"
android:textAllCaps="false" />
android:textAllCaps="false"
app:strokeWidth="2dp" />
</LinearLayout>

45
app/src/main/res/layout/dialog_playlist.xml
View file

@ -39,28 +39,33 @@
android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
</com.google.android.material.textfield.TextInputLayout>
<LinearLayout
<com.google.android.material.button.MaterialButton
android:id="@+id/actionCreate"
style="@style/Widget.MaterialComponents.Button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="end"
android:padding="12dp">
android:layout_marginStart="12dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="12dp"
android:gravity="center_vertical"
android:paddingTop="12dp"
android:paddingBottom="12dp"
android:text="@string/create_action"
app:backgroundTint="@color/md_pink_A400" />
<com.google.android.material.button.MaterialButton
android:id="@+id/actionCancel"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="12dp"
android:gravity="center_vertical"
android:paddingTop="12dp"
android:paddingBottom="12dp"
android:text="@android:string/cancel"
app:strokeWidth="2dp" />
<com.google.android.material.button.MaterialButton
android:id="@+id/actionCancel"
style="@style/Widget.MaterialComponents.Button.TextButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@android:string/cancel"
app:strokeColor="@color/md_grey_700"
app:strokeWidth="1dp" />
<com.google.android.material.button.MaterialButton
android:id="@+id/actionCreate"
style="@style/Widget.MaterialComponents.Button.TextButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:text="@string/create_action"
app:backgroundTint="@color/md_pink_A400" />
</LinearLayout>
</LinearLayout>

34
app/src/main/res/layout/dialog_remove_from_playlist.xml
View file

@ -1,9 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="8dp"
android:orientation="vertical">
android:orientation="vertical"
android:paddingTop="8dp">
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
android:id="@+id/bannerTitle"
@ -11,20 +12,31 @@
android:padding="12dp"
android:text="@string/remove_song_from_playlist_title" />
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
android:id="@+id/actionRemove"
style="@style/TextAppearance.AppCompat.Subhead"
<com.google.android.material.button.MaterialButton
android:id="@+id/actionDelete"
style="@style/Widget.MaterialComponents.Button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="12dp"
android:text="@string/remove_action" />
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:gravity="start|center_vertical"
android:paddingTop="16dp"
android:paddingBottom="16dp"
android:text="@string/remove_action"
android:textAllCaps="false" />
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
<com.google.android.material.button.MaterialButton
android:id="@+id/actionCancel"
style="@style/TextAppearance.AppCompat.Subhead"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="12dp"
android:text="@android:string/cancel" />
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:gravity="start|center_vertical"
android:paddingTop="16dp"
android:paddingBottom="16dp"
android:text="@android:string/cancel"
android:textAllCaps="false"
app:strokeWidth="2dp" />
</LinearLayout>

48
app/src/main/res/layout/dialog_sleep_timer.xml
View file

@ -41,34 +41,34 @@
android:thumb="@drawable/switch_thumb_material"
tools:progress="20" />
<LinearLayout
<com.google.android.material.button.MaterialButton
android:id="@+id/actionSet"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="12dp"
android:gravity="end"
android:orientation="horizontal">
android:layout_marginStart="12dp"
android:layout_marginEnd="12dp"
android:gravity="center_vertical"
android:paddingTop="12dp"
android:paddingBottom="12dp"
android:text="@string/action_set"
android:textColor="@color/md_white_1000"
app:backgroundTint="@color/md_pink_A400" />
<com.google.android.material.button.MaterialButton
android:id="@+id/actionCancel"
style="@style/Widget.MaterialComponents.Button.TextButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@android:string/cancel"
app:strokeColor="@color/md_grey_700"
app:strokeWidth="1dp"
tools:visibility="visible" />
<com.google.android.material.button.MaterialButton
android:id="@+id/actionSet"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:gravity="center"
android:text="@string/action_set"
android:textColor="@color/md_white_1000"
app:backgroundTint="@color/md_pink_A400" />
<com.google.android.material.button.MaterialButton
android:id="@+id/actionCancel"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginEnd="12dp"
android:gravity="center_vertical"
android:paddingTop="12dp"
android:paddingBottom="12dp"
android:text="@android:string/cancel"
app:strokeWidth="2dp"
tools:visibility="visible" />
</LinearLayout>
</LinearLayout>
</FrameLayout>

9
app/src/main/res/layout/fragment_adaptive_player.xml
View file

@ -47,13 +47,10 @@
</FrameLayout>
<com.google.android.material.card.MaterialCardView
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
app:cardCornerRadius="8dp"
app:cardElevation="8dp"
app:cardUseCompatPadding="true">
android:layout_weight="1">
<fragment
android:id="@+id/playerAlbumCoverFragment"
@ -61,7 +58,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent" />
</com.google.android.material.card.MaterialCardView>
</FrameLayout>
<FrameLayout
android:layout_width="match_parent"

2
app/src/main/res/layout/fragment_album_cover.xml
View file

@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center">
<code.name.monkey.retromusic.views.WidthFitSquareLayout

4
app/src/main/res/layout/fragment_album_material_cover.xml
View file

@ -3,12 +3,14 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent" >
android:layout_height="match_parent"
android:layout_gravity="center">
<com.google.android.material.card.MaterialCardView
android:id="@+id/player_album_art_frame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_margin="16dp"
app:cardCornerRadius="8dp">

5
app/src/main/res/layout/fragment_banner_home.xml
View file

@ -60,10 +60,13 @@
app:layout_scrollFlags="scroll|enterAlways"
tools:ignore="UnusedAttribute">
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
<TextView
android:id="@+id/bannerTitle"
style="@style/BigTitleTextAppearanceToolbar"
android:shadowColor="@color/md_black_1000"
android:shadowRadius="2"
android:text="@string/app_name"
android:textColor="@color/md_white_1000"
tools:ignore="MissingPrefix" />
<code.name.monkey.retromusic.views.CircularImageView

53
app/src/main/res/layout/fragment_main_options.xml
View file

@ -62,6 +62,53 @@
app:srcCompat="@drawable/ic_settings_white_24dp" />
</LinearLayout>
<com.google.android.material.card.MaterialCardView
android:id="@+id/buyProContainer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:cardBackgroundColor="@color/md_grey_400"
app:cardCornerRadius="8dp"
app:cardUseCompatPadding="true"
app:contentPadding="8dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
<androidx.appcompat.widget.AppCompatTextView
android:textColor="@color/md_grey_200"
style="@style/TextAppearance.MaterialComponents.Overline"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="8dp"
android:paddingEnd="8dp"
android:text="Upgrade to premium" />
<TextView
style="@style/TextAppearance.MaterialComponents.Headline6"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="8dp"
android:paddingEnd="8dp"
android:textColor="@color/md_white_1000"
android:text="@string/buy_pro" />
</LinearLayout>
<ImageView
android:layout_width="48dp"
android:layout_height="48dp"
android:src="@drawable/promotional" />
</LinearLayout>
</com.google.android.material.card.MaterialCardView>
<code.name.monkey.retromusic.views.MaterialButtonTextColor
android:id="@+id/actionFolders"
style="@style/OptionButtonsStyle"
@ -104,10 +151,6 @@
android:text="@string/rate_app"
app:icon="@drawable/ic_star_white_24dp" />
<code.name.monkey.retromusic.views.MaterialButtonTextColor
android:id="@+id/actionBuyPro"
style="@style/OptionButtonsStyle"
android:text="@string/buy_pro"
app:icon="@drawable/ic_card_giftcard_white_24dp" />
</LinearLayout>

6
app/src/main/res/layout/fragment_mini_player.xml
View file

@ -83,13 +83,11 @@
</LinearLayout>
<me.zhanghai.android.materialprogressbar.MaterialProgressBar
<ProgressBar
android:id="@+id/progressBar"
style="@style/Widget.MaterialProgressBar.ProgressBar.Horizontal"
android:layout_width="match_parent"
android:layout_height="3dp"
android:progress="20"
android:progressDrawable="@drawable/color_progress_seek"
app:mpb_progressStyle="horizontal"
app:mpb_useIntrinsicPadding="false" />
android:progressDrawable="@drawable/color_progress_seek" />
</code.name.monkey.retromusic.views.FitSystemWindowsLayout>

1
app/src/main/res/layout/fragment_player_playback_controls.xml
View file

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
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"

2
app/src/main/res/layout/image.xml
View file

@ -2,7 +2,7 @@
<code.name.monkey.retromusic.views.WidthFitSquareLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/image_container"
android:layout_width="196dp"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">

5
app/src/main/res/layout/item_list.xml
View file

@ -38,8 +38,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
app:cardCornerRadius="6dp"
app:cardElevation="0dp">
app:cardCornerRadius="6dp">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/image"
@ -83,7 +82,7 @@
android:ellipsize="end"
android:maxLines="1"
android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1"
android:textSize="16sp" />
android:textSize="16sp" />
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
android:id="@+id/text"

28
app/src/main/res/layout/item_song.xml
View file

@ -13,18 +13,18 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="0"
android:paddingEnd="0dp"
android:paddingLeft="16dp">
android:paddingLeft="16dp"
android:paddingEnd="0dp">
<androidx.appcompat.widget.AppCompatTextView
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
android:id="@+id/image_text"
style="@style/TextAppearance.MaterialComponents.Subtitle2"
android:layout_width="36dp"
android:layout_height="match_parent"
android:fontFamily="sans-serif"
android:gravity="center"
android:maxLines="1"
android:minHeight="40dp"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
android:minHeight="40dp" />
</FrameLayout>
@ -33,37 +33,35 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginBottom="12dp"
android:layout_marginTop="12dp"
android:layout_weight="1.0"
android:orientation="vertical"
android:paddingEnd="16dp"
android:paddingStart="16dp">
android:paddingStart="16dp"
android:paddingEnd="0dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingEnd="0dp"
android:paddingStart="6dp">
android:paddingStart="6dp"
android:paddingEnd="0dp">
<androidx.appcompat.widget.AppCompatTextView
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
android:id="@+id/title"
style="@style/TextAppearance.MaterialComponents.Body1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:maxLines="1"
android:textColor="?android:attr/textColorPrimary"
tools:text="Song title" />
<androidx.appcompat.widget.AppCompatTextView
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
android:id="@+id/time"
style="@style/TextAppearance.MaterialComponents.Caption"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
android:padding="4dp"
android:textColor="?android:attr/textColorSecondary"
tools:text="22:00" />
</LinearLayout>
</FrameLayout>

2
app/src/main/res/values/styles.xml
View file

@ -129,6 +129,8 @@
<item name="iconTint">?iconColor</item>
<item name="rippleColor">?iconColor</item>
<item name="android:gravity">center_vertical</item>
<item name="android:paddingBottom">12dp</item>
<item name="android:paddingTop">12dp</item>
</style>
<style name="ErrorHandlingTheme" parent="Theme.MaterialComponents.Light.NoActionBar">