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

Ripple cover and color adjustment

Browse source
This commit is contained in:
h4h13 2019-12-10 23:06:20 +05:30
commit 8dc9083ff7
50 changed files with 485 additions and 675 deletions
Download patch file Download diff file Expand all files Collapse all files

19
app/src/main/res/drawable-v21/rect_selector.xml
View file

@ -1,19 +0,0 @@
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?attr/colorControlHighlight">
<item android:id="@android:id/mask">
<shape>
<corners android:radius="8dp" />
<solid android:color="@android:color/transparent" />
</shape>
</item>
<item>
<selector>
<item android:state_activated="true">
<shape>
<corners android:radius="8dp" />
<solid android:color="?android:attr/colorControlHighlight" />
</shape>
</item>
</selector>
</item>
</ripple>

15
app/src/main/res/drawable-v21/rect_selector_dark.xml
View file

@ -1,15 +0,0 @@
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/ripple_material_dark">
<item
android:id="@android:id/mask"
android:drawable="@android:color/white" />
<item>
<selector>
<item
android:drawable="@color/ripple_material_dark"
android:state_activated="true" />
</selector>
</item>
</ripple>

15
app/src/main/res/drawable-v21/rect_selector_strong_dark.xml
View file

@ -1,15 +0,0 @@
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/ate_control_normal_dark">
<item
android:id="@android:id/mask"
android:drawable="@android:color/white" />
<item>
<selector>
<item
android:drawable="@color/ate_control_normal_dark"
android:state_activated="true" />
</selector>
</item>
</ripple>

5
app/src/main/res/drawable-v21/round_selector_mask.xml
View file

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<solid android:color="@android:color/white" />
</shape>

38
app/src/main/res/drawable/rect_selector.xml
View file

@ -1,9 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@color/ripple_material_light" android:state_activated="true" android:state_pressed="true" />
<item android:drawable="@color/ripple_material_light" android:state_activated="true" />
<item android:drawable="@color/ripple_material_light" android:state_pressed="true" />
<item android:drawable="@android:color/transparent" />
</selector>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?attr/colorControlHighlight">
<item android:id="@android:id/mask">
<shape>
<corners android:radius="8dp" />
<solid android:color="@android:color/transparent" />
</shape>
</item>
<item>
<selector>
<item android:state_activated="true">
<shape>
<corners android:radius="8dp" />
<solid android:color="?android:attr/colorControlHighlight" />
</shape>
</item>
<item android:state_pressed="true">
<ripple android:color="?android:attr/colorControlHighlight">
<item>
<shape>
<corners android:radius="8dp" />
<solid android:color="?android:attr/colorControlHighlight" />
</shape>
</item>
</ripple>
</item>
</selector>
</item>
</ripple>

9
app/src/main/res/drawable/rect_selector_dark.xml
View file

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@color/ripple_material_dark" android:state_activated="true" android:state_pressed="true"/>
<item android:drawable="@color/ripple_material_dark" android:state_activated="true"/>
<item android:drawable="@color/ripple_material_dark" android:state_pressed="true"/>
<item android:drawable="@android:color/transparent"/>
</selector>

9
app/src/main/res/drawable/rect_selector_strong_dark.xml
View file

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@color/ate_control_normal_dark" android:state_activated="true" android:state_pressed="true"/>
<item android:drawable="@color/ate_control_normal_dark" android:state_activated="true"/>
<item android:drawable="@color/ate_control_normal_dark" android:state_pressed="true"/>
<item android:drawable="@android:color/transparent"/>
</selector>

BIN
app/src/main/res/drawable/retro.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 9.4 KiB

3
app/src/main/res/layout-land/activity_album.xml
View file

@ -119,7 +119,8 @@
android:paddingTop="4dp"
android:scrollHorizontally="true"
android:singleLine="true"
android:textAppearance="@style/TextViewHeadline6"
android:textAppearance="@style/TextViewSubtitle2"
android:textColor="?android:attr/textColorSecondary"
tools:ignore="MissingPrefix"
tools:text="Album details name" />

1
app/src/main/res/layout-land/activity_artist_details.xml
View file

@ -97,6 +97,7 @@
android:layout_height="wrap_content"
android:paddingTop="4dp"
android:textAppearance="@style/TextViewSubtitle2"
android:textColor="?android:attr/textColorSecondary"
tools:ignore="MissingPrefix"
tools:text="Title" />

1
app/src/main/res/layout-xlarge-land/activity_album.xml
View file

@ -128,6 +128,7 @@
android:layout_height="wrap_content"
android:paddingTop="4dp"
android:textAppearance="@style/TextViewHeadline6"
android:textColor="?android:attr/textColorSecondary"
tools:ignore="MissingPrefix"
tools:text="Album details" />

1
app/src/main/res/layout-xlarge-land/activity_artist_details.xml
View file

@ -106,6 +106,7 @@
android:scrollHorizontally="true"
android:singleLine="true"
android:textAppearance="@style/TextViewHeadline6"
android:textColor="?android:attr/textColorSecondary"
tools:ignore="MissingPrefix"
tools:text="Title" />

3
app/src/main/res/layout-xlarge/activity_album.xml
View file

@ -126,7 +126,7 @@
<com.google.android.material.textview.MaterialTextView
android:id="@+id/albumText"
style="@style/TextAppearance.MaterialComponents.Headline6"
style="@style/TextViewHeadline6"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
@ -134,6 +134,7 @@
android:focusable="true"
android:focusableInTouchMode="true"
android:freezesText="true"
android:textColor="?android:attr/textColorSecondary"
android:marqueeRepeatLimit="marquee_forever"
android:paddingTop="4dp"
android:scrollHorizontally="true"

1
app/src/main/res/layout-xlarge/activity_artist_details.xml
View file

@ -101,6 +101,7 @@
android:layout_height="wrap_content"
android:paddingTop="4dp"
android:textAppearance="@style/TextViewHeadline6"
android:textColor="?android:attr/textColorSecondary"
tools:ignore="MissingPrefix"
tools:text="Title" />

29
app/src/main/res/layout-xlarge/item_image.xml
View file

@ -6,29 +6,22 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<code.name.monkey.retromusic.views.WidthFitSquareLayout
<code.name.monkey.retromusic.views.WidthFitSquareCardView
android:layout_width="156dp"
android:layout_height="match_parent"
android:orientation="vertical">
android:layout_margin="8dp"
android:orientation="vertical"
app:cardCornerRadius="6dp"
app:cardElevation="4dp"
app:cardPreventCornerOverlap="true">
<com.google.android.material.card.MaterialCardView
android:id="@+id/imageContainerCard"
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/image"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="8dp"
app:cardCornerRadius="6dp"
app:cardElevation="4dp"
app:cardPreventCornerOverlap="true">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/image"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
tools:srcCompat="@tools:sample/backgrounds/scenic[17]" />
</com.google.android.material.card.MaterialCardView>
</code.name.monkey.retromusic.views.WidthFitSquareLayout>
android:scaleType="centerCrop"
tools:srcCompat="@tools:sample/backgrounds/scenic[17]" />
</code.name.monkey.retromusic.views.WidthFitSquareCardView>
<com.google.android.material.textview.MaterialTextView
android:id="@+id/title"

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

@ -114,6 +114,7 @@
android:layout_marginEnd="16dp"
android:singleLine="true"
android:textAppearance="@style/TextViewSubtitle2"
android:textColor="?android:attr/textColorSecondary"
app:layout_constrainedWidth="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/artistImage"

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

@ -98,6 +98,7 @@
android:layout_marginTop="4dp"
android:layout_marginEnd="16dp"
android:textAppearance="@style/TextViewSubtitle2"
android:textColor="?android:attr/textColorSecondary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/artistTitle"

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

@ -42,7 +42,7 @@
android:layout_gravity="fill_vertical"
app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
<WebView
<code.name.monkey.retromusic.views.LollipopFixedWebView
android:id="@+id/license"
android:layout_width="match_parent"
android:layout_height="match_parent" />

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

@ -10,7 +10,6 @@
android:id="@+id/status_bar"
android:layout_width="match_parent"
android:layout_height="0dp"
android:background="?attr/colorSurface"
tools:ignore="UnusedAttribute" />
<androidx.coordinatorlayout.widget.CoordinatorLayout

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

@ -4,21 +4,17 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/colorSurface"
android:foreground="?rectSelector"
android:gravity="center_vertical|start"
android:minHeight="@dimen/tab_height"
android:orientation="horizontal"
android:paddingStart="12dp"
android:paddingLeft="12dp"
android:paddingEnd="4dp"
android:paddingRight="4dp">
android:paddingEnd="4dp">
<com.google.android.material.textview.MaterialTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingEnd="8dp"
android:paddingRight="8dp"
android:textAllCaps="true"
android:textColor="#fff"
tools:ignore="RtlSymmetry,UnusedAttribute"

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

@ -27,7 +27,7 @@
android:gravity="center_vertical|left|end"
android:paddingLeft="8dp"
android:singleLine="true"
android:textColor="?colorOnSecondary"
android:textColor="?android:attr/textColorSecondary"
android:textSize="12sp"
tools:ignore="RtlHardcoded,RtlSymmetry"
tools:text="00:22" />
@ -41,7 +41,7 @@
android:gravity="center_vertical|right|end"
android:paddingRight="8dp"
android:singleLine="true"
android:textColor="?colorOnSecondary"
android:textColor="?android:attr/textColorSecondary"
android:textSize="12sp"
tools:ignore="RtlHardcoded,RtlSymmetry"
tools:text="00:22" />

36
app/src/main/res/layout/fragment_folder.xml
View file

@ -18,9 +18,9 @@
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:id="@+id/coordinatorLayout"
android:background="?attr/colorSurface"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:background="?attr/colorSurface">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appBarLayout"
@ -38,7 +38,6 @@
android:layout_marginTop="@dimen/toolbar_margin_vertical"
android:layout_marginEnd="@dimen/toolbar_margin_horizontal"
android:layout_marginBottom="@dimen/toolbar_margin_vertical"
app:cardBackgroundColor="?colorSurface"
app:cardCornerRadius="8dp"
app:cardUseCompatPadding="true"
app:layout_scrollFlags="scroll|enterAlways">
@ -56,7 +55,6 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="@dimen/toolbar_height"
android:background="?colorSurface"
app:contentInsetStart="0dp"
app:contentInsetStartWithNavigation="0dp"
app:popupTheme="?toolbarPopupTheme"
@ -77,7 +75,6 @@
android:layout_height="@dimen/tab_height"
android:paddingStart="60dp"
android:paddingEnd="8dp"
app:cardBackgroundColor="?colorSurface"
app:layout_collapseMode="pin" />
</LinearLayout>
</com.google.android.material.card.MaterialCardView>
@ -92,15 +89,34 @@
android:scrollbars="none"
app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" />
<com.google.android.material.textview.MaterialTextView
<LinearLayout
android:id="@android:id/empty"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:padding="24dp"
android:text="@string/empty"
android:textAppearance="@style/TextViewNormal"
android:textColor="?colorOnSecondary" />
android:gravity="center"
android:orientation="vertical"
android:visibility="gone"
tools:visibility="visible">
<com.google.android.material.textview.MaterialTextView
android:id="@+id/emptyEmoji"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:text="@string/empty_text_emoji"
android:textAppearance="@style/TextViewHeadline3" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/emptyText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/nothing_to_see"
android:textAppearance="@style/TextViewHeadline5"
android:textColor="?android:attr/textColorSecondary"
tools:visibility="visible" />
</LinearLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
</LinearLayout>

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

@ -17,7 +17,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/colorSurface"
android:background="?colorSurface"
android:orientation="vertical">
<FrameLayout

356
app/src/main/res/layout/fragment_main_settings.xml
View file

@ -89,355 +89,79 @@
</androidx.constraintlayout.widget.ConstraintLayout>
</com.google.android.material.card.MaterialCardView>
<LinearLayout
<code.name.monkey.retromusic.views.SettingListItemView
android:id="@+id/generalSettings"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?rectSelector"
android:gravity="center_vertical"
android:minHeight="72dp"
android:orientation="horizontal">
app:settingListItemIcon="@drawable/ic_theme_palette_white_24dp"
app:settingListItemIconColor="@color/md_blue_A400"
app:settingListItemText="@string/general_settings_summary"
app:settingListItemTitle="@string/general_settings_title" />
<code.name.monkey.retromusic.views.ColorIconsImageView
android:id="@+id/general_settings_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:padding="10dp"
app:iconBackgroundColor="@color/md_blue_A400"
app:srcCompat="@drawable/ic_theme_palette_white_24dp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:orientation="vertical">
<com.google.android.material.textview.MaterialTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="marquee"
android:fadingEdge="horizontal"
android:singleLine="true"
android:text="@string/general_settings_title"
android:textAppearance="@style/TextViewSubtitle1"
android:textStyle="bold" />
<com.google.android.material.textview.MaterialTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:maxLines="4"
android:text="@string/general_settings_summary" />
</LinearLayout>
</LinearLayout>
<LinearLayout
<code.name.monkey.retromusic.views.SettingListItemView
android:id="@+id/nowPlayingSettings"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?rectSelector"
android:gravity="center_vertical"
android:minHeight="72dp"
android:orientation="horizontal">
app:settingListItemIcon="@drawable/ic_play_circle_filled_white_24dp"
app:settingListItemIconColor="@color/md_red_A400"
app:settingListItemText="@string/now_playing_summary"
app:settingListItemTitle="@string/now_playing" />
<code.name.monkey.retromusic.views.ColorIconsImageView
android:id="@+id/now_playing_settings_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:padding="10dp"
app:iconBackgroundColor="@color/md_red_A400"
app:srcCompat="@drawable/ic_play_circle_filled_white_24dp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:orientation="vertical">
<com.google.android.material.textview.MaterialTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="marquee"
android:fadingEdge="horizontal"
android:singleLine="true"
android:text="@string/now_playing"
android:textAppearance="@style/TextViewSubtitle1"
android:textStyle="bold" />
<com.google.android.material.textview.MaterialTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:maxLines="4"
android:text="@string/now_playing_summary" />
</LinearLayout>
</LinearLayout>
<LinearLayout
<code.name.monkey.retromusic.views.SettingListItemView
android:id="@+id/audioSettings"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?rectSelector"
android:gravity="center_vertical"
android:minHeight="72dp"
android:orientation="horizontal">
app:settingListItemIcon="@drawable/ic_volume_up_white_24dp"
app:settingListItemIconColor="@color/md_deep_purple_A400"
app:settingListItemText="@string/audio_settings_summary"
app:settingListItemTitle="@string/pref_header_audio" />
<code.name.monkey.retromusic.views.ColorIconsImageView
android:id="@+id/audio_settings_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:padding="10dp"
app:iconBackgroundColor="@color/md_deep_purple_A400"
app:srcCompat="@drawable/ic_volume_up_white_24dp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:orientation="vertical">
<com.google.android.material.textview.MaterialTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="marquee"
android:fadingEdge="horizontal"
android:singleLine="true"
android:text="@string/pref_header_audio"
android:textAppearance="@style/TextViewSubtitle1"
android:textStyle="bold" />
<com.google.android.material.textview.MaterialTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:maxLines="4"
android:text="@string/audio_settings_summary" />
</LinearLayout>
</LinearLayout>
<LinearLayout
<code.name.monkey.retromusic.views.SettingListItemView
android:id="@+id/personalizeSettings"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?rectSelector"
android:gravity="center_vertical"
android:minHeight="72dp"
android:orientation="horizontal">
app:settingListItemIcon="@drawable/ic_hdr_strong_white_24dp"
app:settingListItemIconColor="@color/md_teal_A400"
app:settingListItemText="@string/personalize_settings_summary"
app:settingListItemTitle="@string/personalize" />
<code.name.monkey.retromusic.views.ColorIconsImageView
android:id="@+id/personalize_settings_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:padding="10dp"
app:iconBackgroundColor="@color/md_teal_A400"
app:srcCompat="@drawable/ic_hdr_strong_white_24dp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:orientation="vertical">
<com.google.android.material.textview.MaterialTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="marquee"
android:fadingEdge="horizontal"
android:singleLine="true"
android:text="@string/personalize"
android:textAppearance="@style/TextViewSubtitle1"
android:textStyle="bold" />
<com.google.android.material.textview.MaterialTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:maxLines="4"
android:text="@string/personalize_settings_summary" />
</LinearLayout>
</LinearLayout>
<LinearLayout
<code.name.monkey.retromusic.views.SettingListItemView
android:id="@+id/imageSettings"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?rectSelector"
android:gravity="center_vertical"
android:minHeight="72dp"
android:orientation="horizontal">
app:settingListItemIcon="@drawable/ic_image_white_24dp"
app:settingListItemIconColor="@color/md_deep_orange_A400"
app:settingListItemText="@string/image_settings_summary"
app:settingListItemTitle="@string/pref_header_images" />
<code.name.monkey.retromusic.views.ColorIconsImageView
android:id="@+id/image_settings_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:padding="10dp"
app:iconBackgroundColor="@color/md_deep_orange_A400"
app:srcCompat="@drawable/ic_image_white_24dp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:orientation="vertical">
<com.google.android.material.textview.MaterialTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="marquee"
android:fadingEdge="horizontal"
android:singleLine="true"
android:text="@string/pref_header_images"
android:textAppearance="@style/TextViewSubtitle1"
android:textStyle="bold" />
<com.google.android.material.textview.MaterialTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:maxLines="4"
android:text="@string/image_settings_summary" />
</LinearLayout>
</LinearLayout>
<LinearLayout
<code.name.monkey.retromusic.views.SettingListItemView
android:id="@+id/notificationSettings"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?rectSelector"
android:gravity="center_vertical"
android:minHeight="72dp"
android:orientation="horizontal">
app:settingListItemIcon="@drawable/ic_notifications_active_white_24dp"
app:settingListItemIconColor="@color/md_yellow_A400"
app:settingListItemText="@string/notification_settings_summary"
app:settingListItemTitle="@string/notification" />
<code.name.monkey.retromusic.views.ColorIconsImageView
android:id="@+id/notification_settings_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:padding="10dp"
app:iconBackgroundColor="@color/md_yellow_A400"
app:srcCompat="@drawable/ic_notifications_active_white_24dp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:orientation="vertical">
<com.google.android.material.textview.MaterialTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="marquee"
android:fadingEdge="horizontal"
android:singleLine="true"
android:text="@string/notification"
android:textAppearance="@style/TextViewSubtitle1"
android:textStyle="bold" />
<com.google.android.material.textview.MaterialTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:maxLines="4"
android:text="@string/notification_settings_summary" />
</LinearLayout>
</LinearLayout>
<LinearLayout
<code.name.monkey.retromusic.views.SettingListItemView
android:id="@+id/otherSettings"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?rectSelector"
android:gravity="center_vertical"
android:minHeight="72dp"
android:orientation="horizontal">
app:settingListItemIcon="@drawable/ic_notifications_active_white_24dp"
app:settingListItemIconColor="@color/md_indigo_A400"
app:settingListItemText="@string/other_settings_summary"
app:settingListItemTitle="@string/others" />
<code.name.monkey.retromusic.views.ColorIconsImageView
android:id="@+id/other_settings_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:padding="10dp"
app:iconBackgroundColor="@color/md_indigo_A400"
app:srcCompat="@drawable/ic_testing_white_24dp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="16dp"
android:gravity="center_vertical"
android:orientation="vertical">
<com.google.android.material.textview.MaterialTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="marquee"
android:fadingEdge="horizontal"
android:singleLine="true"
android:text="@string/others"
android:textAppearance="@style/TextViewSubtitle1"
android:textStyle="bold" />
<com.google.android.material.textview.MaterialTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:maxLines="4"
android:text="@string/other_settings_summary" />
</LinearLayout>
</LinearLayout>
<LinearLayout
<code.name.monkey.retromusic.views.SettingListItemView
android:id="@+id/aboutSettings"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?rectSelector"
android:gravity="center_vertical"
android:minHeight="72dp"
android:orientation="horizontal">
app:settingListItemIcon="@drawable/ic_info_outline_white_24dp"
app:settingListItemIconColor="@color/md_light_green_A400"
app:settingListItemText="@string/about_settings_summary"
app:settingListItemTitle="@string/action_about" />
<code.name.monkey.retromusic.views.ColorIconsImageView
android:id="@+id/about_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:padding="10dp"
app:iconBackgroundColor="@color/md_light_green_A400"
app:srcCompat="@drawable/ic_info_outline_white_24dp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="16dp"
android:gravity="center_vertical"
android:orientation="vertical">
<com.google.android.material.textview.MaterialTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="marquee"
android:fadingEdge="horizontal"
android:singleLine="true"
android:text="@string/action_about"
android:textAppearance="@style/TextViewSubtitle1"
android:textStyle="bold" />
<com.google.android.material.textview.MaterialTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:text="@string/about_settings_summary" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>

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

@ -8,7 +8,6 @@
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingStart="8dp"
android:paddingBottom="14dp"
android:paddingEnd="8dp" >
<androidx.appcompat.widget.AppCompatImageView

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

@ -55,6 +55,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:textColor="?android:attr/textColorSecondary"
app:layout_constrainedWidth="true"
app:layout_constraintBottom_toBottomOf="@+id/icon"
app:layout_constraintEnd_toEndOf="parent"

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

@ -50,13 +50,14 @@
android:gravity="center"
android:textAppearance="@style/TextViewHeadline5"
android:textStyle="bold"
tools:text="Name" />
tools:text="@tools:sample/full_names" />
<code.name.monkey.retromusic.views.BaselineGridTextView
android:id="@+id/text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="?android:attr/textColorSecondary"
app:lineHeightHint="24sp"
tools:text="role" />
tools:text="@tools:sample/lorem/random" />
</LinearLayout>
</LinearLayout>

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

@ -6,28 +6,23 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<code.name.monkey.retromusic.views.WidthFitSquareLayout
<code.name.monkey.retromusic.views.WidthFitSquareCardView
android:layout_width="136dp"
android:layout_height="wrap_content"
android:orientation="vertical">
android:layout_margin="8dp"
android:orientation="vertical"
app:cardCornerRadius="8dp"
app:cardPreventCornerOverlap="true">
<com.google.android.material.card.MaterialCardView
android:id="@+id/imageContainerCard"
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/image"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="8dp"
app:cardCornerRadius="8dp"
app:cardPreventCornerOverlap="true">
android:scaleType="centerCrop"
tools:srcCompat="@tools:sample/backgrounds/scenic[16]" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/image"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
tools:srcCompat="@tools:sample/backgrounds/scenic[16]" />
</com.google.android.material.card.MaterialCardView>
</code.name.monkey.retromusic.views.WidthFitSquareLayout>
</code.name.monkey.retromusic.views.WidthFitSquareCardView>
<com.google.android.material.textview.MaterialTextView
android:id="@+id/title"
@ -35,7 +30,8 @@
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
android:padding="10dp"
android:padding="8dp"
android:textAppearance="@style/TextViewNormal"
android:textColor="?android:attr/textColorSecondary"
tools:text="Song name" />
</LinearLayout>

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

@ -55,6 +55,7 @@
app:layout_constraintStart_toStartOf="@+id/guideline_front_margin"
app:layout_constraintTop_toBottomOf="@android:id/title"
app:lineHeightHint="24sp"
android:textColor="?android:attr/textColorSecondary"
tools:maxLines="2"
tools:text="@tools:sample/lorem/random" />

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

@ -50,6 +50,7 @@
android:id="@android:id/summary"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:textColor="?android:attr/textColorSecondary"
app:layout_constrainedWidth="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/guideline_front_margin"

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

@ -52,6 +52,7 @@
android:layout_height="wrap_content"
android:paddingStart="0dp"
android:paddingEnd="16dp"
android:textColor="?android:attr/textColorSecondary"
app:layout_constrainedWidth="true"
app:layout_constraintEnd_toStartOf="@android:id/checkbox"
app:layout_constraintStart_toStartOf="@+id/guideline_front_margin"

60
app/src/main/res/layout/list_setting_item_view.xml Normal file
View file

@ -0,0 +1,60 @@
<?xml version="1.0" encoding="utf-8"?><!--
~ 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.
-->
<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="wrap_content"
android:background="?rectSelector"
android:gravity="center_vertical"
android:layout_marginStart="4dp"
android:layout_marginEnd="4dp"
android:orientation="horizontal">
<code.name.monkey.retromusic.views.ColorIconsImageView
android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:padding="10dp"
app:iconBackgroundColor="@color/md_blue_A400"
app:srcCompat="@drawable/ic_theme_palette_white_24dp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="16dp"
android:orientation="vertical">
<com.google.android.material.textview.MaterialTextView
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="marquee"
android:fadingEdge="horizontal"
android:singleLine="true"
android:text="@string/general_settings_title"
android:textAppearance="@style/TextViewSubtitle1"
android:textStyle="bold" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:maxLines="4"
android:text="@string/general_settings_summary"
android:textColor="?android:attr/textColorSecondary" />
</LinearLayout>
</LinearLayout>

2
app/src/main/res/values-land/dimens.xml
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="toolbar_margin_horizontal">52dp</dimen>
<dimen name="toolbar_margin_horizontal">8dp</dimen>
</resources>

9
app/src/main/res/values-v27/styles_parents.xml
View file

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright (c) 2019 Hemanth Savarala.
~
~ Licensed under the GNU General Public License v3
@ -46,14 +45,16 @@
<item name="windowActionBarOverlay">true</item>
<item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
<item name="mcab_popup_theme">@style/ThemeOverlay.AppCompat.Dark</item>
<item name="roundSelector">@drawable/round_selector_dark</item>
<item name="rectSelector">@drawable/rect_selector_dark</item>
<item name="roundSelector">@drawable/round_selector</item>
<item name="rectSelector">@drawable/rect_selector</item>
<item name="android:actionOverflowButtonStyle">@style/Widget.ActionButton.Overflow</item>
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
<item name="windowActionBar">false</item>
<item name="materialAlertDialogTheme">@style/MaterialAlertDialogTheme</item>
<item name="materialButtonStyle">@style/MaterialButtonTheme</item>
<item name="android:windowLightNavigationBar">false</item>
<!--Manual setting colors-->
<item name="colorSurface">@color/darkColorSurface</item>
</style>
<style name="Theme.RetroMusic.Base.Light" parent="Theme.MaterialComponents.Light.NoActionBar">

4
app/src/main/res/values/colors.xml
View file

@ -20,13 +20,13 @@
<color name="darkColorOnPrimary">#ffffff</color>
<color name="darkColorSecondary">#202124</color>
<color name="darkColorBackground">#202124</color>
<color name="darkColorSurface">#17181a</color>
<color name="darkColorSurface">#202124</color>
<color name="blackColorPrimary">#000000</color>
<color name="blackColorOnPrimary">#ffffff</color>
<color name="blackColorSecondary">#000000</color>
<color name="blackColorBackground">#000000</color>
<color name="blackColorSurface">#17181a</color>
<color name="blackColorSurface">#000000</color>
<color name="transparent">#00000000</color>
<!-- card colors -->

22
app/src/main/res/values/list_setting_item_view.xml Normal file
View file

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?><!--
~ 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.
-->
<resources>
<declare-styleable name="SettingListItemView">
<attr name="settingListItemIcon" format="reference" />
<attr name="settingListItemIconColor" format="reference" />
<attr name="settingListItemTitle" format="string" />
<attr name="settingListItemText" format="string" />
</declare-styleable>
</resources>

1
app/src/main/res/values/strings.xml
View file

@ -813,4 +813,5 @@
<string name="pref_header_advanced">Advanced</string>
<string name="pref_header_blacklist">Blacklist</string>
<string name="no_playing_queue">No songs playing</string>
<string name="nothing_to_see">Nothing to see</string>
</resources>

6
app/src/main/res/values/styles_parents.xml
View file

@ -24,15 +24,15 @@
<item name="md_font_body">@font/circular</item>
<item name="md_font_button">@font/circular</item>
<item name="md_color_button_text">@color/md_white_1000</item>
<item name="md_background_color">@color/darkColorPrimary</item>
<item name="md_background_color">@color/darkColorSurface</item>
<item name="android:windowActionBarOverlay">true</item>
<item name="android:windowActivityTransitions">true</item>
<item name="android:fontFamily">@font/circular</item>
<item name="windowActionBarOverlay">true</item>
<item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
<item name="mcab_popup_theme">@style/ThemeOverlay.AppCompat.Dark</item>
<item name="roundSelector">@drawable/round_selector_dark</item>
<item name="rectSelector">@drawable/rect_selector_dark</item>
<item name="roundSelector">@drawable/round_selector</item>
<item name="rectSelector">@drawable/rect_selector</item>
<item name="android:actionOverflowButtonStyle">@style/Widget.ActionButton.Overflow</item>
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
<item name="windowActionBar">false</item>