This commit is contained in:
h4h13 2018-11-05 19:23:07 +05:30
parent 3d7ba2afc6
commit 08e00b89c5
341 changed files with 7612 additions and 6811 deletions

View file

@ -47,8 +47,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="fill_vertical"
android:layout_marginEnd="128dp"
android:layout_marginStart="128dp"
android:layout_marginEnd="128dp"
android:fillViewport="true"
android:overScrollMode="never"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
@ -64,9 +64,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingEnd="28dp"
android:paddingStart="28dp"
android:paddingTop="16dp">
android:paddingTop="16dp"
android:paddingEnd="28dp">
<code.name.monkey.retromusic.views.WidthFitSquareLayout
android:layout_width="228dp"
@ -88,16 +88,17 @@
android:orientation="vertical"
android:padding="16dp">
<androidx.appcompat.widget.AppCompatTextView
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
android:id="@+id/title"
fontPath="@string/circular_std_black"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:maxLines="2"
android:textAppearance="@style/TextAppearance.AppCompat.Display2"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:transitionName="@string/transition_album_name"
tools:ignore="MissingPrefix" />
<androidx.appcompat.widget.AppCompatTextView
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
android:id="@+id/text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -107,9 +108,11 @@
android:focusableInTouchMode="true"
android:freezesText="true"
android:marqueeRepeatLimit="marquee_forever"
android:paddingTop="4dp"
android:scrollHorizontally="true"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
android:transitionName="@string/transition_album_text"
tools:ignore="MissingPrefix"
tools:text="Title" />
@ -118,61 +121,26 @@
</LinearLayout>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/song_title"
fontPath="@string/circular_std_black"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="12dp"
android:paddingEnd="24dp"
android:paddingStart="24dp"
android:paddingTop="12dp"
android:text="@string/songs"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
android:textColor="?android:attr/textColorPrimary"
tools:ignore="MissingPrefix" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
android:fadeScrollbars="true"
android:requiresFadingEdge="vertical"
android:scrollbarStyle="outsideOverlay"
android:scrollbars="vertical" />
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
android:id="@+id/more_title"
fontPath="@string/circular_std_black"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="12dp"
android:paddingEnd="16dp"
android:paddingStart="16dp"
android:paddingTop="12dp"
android:text="@string/songs"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
android:visibility="gone"
tools:ignore="MissingPrefix" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/more_recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:nestedScrollingEnabled="false"
android:visibility="gone" />
<include layout="@layout/activity_album_content" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
<com.google.android.material.floatingactionbutton.FloatingActionButton
<com.google.android.material.button.MaterialButton
android:id="@+id/action_shuffle_all"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="16dp"
app:srcCompat="@drawable/ic_shuffle_white_24dp" />
android:text="@string/shuffle"
android:textAllCaps="false"
app:backgroundTint="@color/md_red_500"
app:cornerRadius="25dp"
app:icon="@drawable/ic_shuffle_white_24dp"
app:iconGravity="start"
app:iconPadding="12dp"
app:layout_dodgeInsetEdges="all" />
<View
android:layout_width="match_parent"

View file

@ -42,11 +42,12 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="fill_vertical"
android:layout_marginEnd="128dp"
android:layout_marginStart="128dp"
android:layout_marginEnd="128dp"
android:fillViewport="true"
android:overScrollMode="never"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:background="@color/md_red_500">
<LinearLayout
android:id="@+id/content"
@ -55,119 +56,43 @@
android:background="@drawable/bg_bottom_sheet_dialog_fragment"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal"
android:orientation="vertical"
android:padding="24dp">
<LinearLayout
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
android:id="@+id/title"
fontPath="@string/circular_std_black"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
android:maxLines="2"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
tools:ignore="MissingPrefix"
tools:text="Title" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/title"
fontPath="@string/circular_std_black"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:maxLines="2"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
tools:ignore="MissingPrefix" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:ellipsize="marquee"
android:focusable="true"
android:focusableInTouchMode="true"
android:freezesText="true"
android:marqueeRepeatLimit="marquee_forever"
android:scrollHorizontally="true"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
tools:ignore="MissingPrefix"
tools:text="Title" />
</LinearLayout>
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/action_shuffle_all"
android:layout_width="wrap_content"
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
android:id="@+id/text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:layout_weight="0"
app:srcCompat="@drawable/ic_shuffle_white_24dp" />
android:layout_gravity="center"
android:ellipsize="marquee"
android:focusable="true"
android:focusableInTouchMode="true"
android:freezesText="true"
android:marqueeRepeatLimit="marquee_forever"
android:scrollHorizontally="true"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
tools:ignore="MissingPrefix"
tools:text="Title" />
</LinearLayout>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/biography_title"
fontPath="@string/circular_std_black"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="12dp"
android:paddingEnd="24dp"
android:paddingStart="24dp"
android:paddingTop="12dp"
android:text="@string/biography"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
android:textColor="?android:attr/textColorPrimary"
android:visibility="gone"
tools:ignore="MissingPrefix" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/biography"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="4"
android:padding="16dp"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:visibility="gone" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/album_title"
fontPath="@string/circular_std_black"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="12dp"
android:paddingEnd="24dp"
android:paddingStart="24dp"
android:paddingTop="12dp"
android:text="@string/albums"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
android:textColor="?android:attr/textColorPrimary" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/album_recycler_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:nestedScrollingEnabled="false" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/song_title"
fontPath="@string/circular_std_black"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="12dp"
android:paddingEnd="24dp"
android:paddingStart="24dp"
android:paddingTop="12dp"
android:text="@string/songs"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
android:textColor="?android:attr/textColorPrimary"
tools:ignore="MissingPrefix" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:nestedScrollingEnabled="false" />
<include layout="@layout/activity_artist_content" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
@ -176,4 +101,18 @@
android:layout_height="72dp"
android:background="@drawable/shadow_down_strong" />
<com.google.android.material.button.MaterialButton
android:id="@+id/action_shuffle_all"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="16dp"
android:text="@string/shuffle"
android:textAllCaps="false"
app:backgroundTint="@color/md_red_500"
app:cornerRadius="25dp"
app:icon="@drawable/ic_shuffle_white_24dp"
app:iconGravity="start"
app:iconPadding="12dp"
app:layout_dodgeInsetEdges="all" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>

View file

@ -11,8 +11,7 @@
android:id="@+id/gradient_background"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
/>
android:scaleType="centerCrop" />
<View
android:id="@+id/mask"

View file

@ -1,117 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout 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:layout_width="match_parent"
android:layout_height="match_parent"
android:clickable="true"
android:focusable="true">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/gradient_background"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop" />
<View
android:id="@+id/mask"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/shadow_up_strong" />
<include layout="@layout/shadow_statusbar_toolbar" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<include layout="@layout/status_bar" />
</FrameLayout>
<FrameLayout
android:id="@+id/toolbar_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0">
<androidx.appcompat.widget.Toolbar
android:id="@+id/player_toolbar"
style="@style/Toolbar48"
android:navigationIcon="@drawable/ic_close_white_24dp"
app:navigationIcon="@drawable/ic_close_white_24dp"
app:titleMarginStart="0dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:ellipsize="marquee"
android:focusable="true"
android:focusableInTouchMode="true"
android:freezesText="true"
android:gravity="center"
android:marqueeRepeatLimit="marquee_forever"
android:scrollHorizontally="true"
android:singleLine="true" />
<TextView
android:id="@+id/text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:alpha="0.5"
android:gravity="center_horizontal"
android:maxLines="1"
android:textSize="12sp"
tools:text="@string/action_share" />
</LinearLayout>
</androidx.appcompat.widget.Toolbar>
</FrameLayout>
<FrameLayout
android:id="@+id/album_cover_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginEnd="196dp"
android:layout_marginStart="196dp"
android:layout_weight="1">
<fragment
android:id="@+id/player_album_cover_fragment"
android:name="code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</FrameLayout>
</LinearLayout>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:layout_marginEnd="196dp"
android:layout_marginStart="196dp">
<fragment
android:id="@+id/playback_controls_fragment"
android:name="code.name.monkey.retromusic.ui.fragments.player.cardblur.CardBlurPlaybackControlsFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:layout="@layout/fragment_card_blur_player_playback_controls" />
</FrameLayout>
</FrameLayout>

View file

@ -14,56 +14,57 @@
<include layout="@layout/shadow_statusbar_toolbar" />
<FrameLayout
android:id="@+id/toolbar_container"
<code.name.monkey.retromusic.views.FitSystemWindowsLayout
android:id="@+id/safeArea"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_gravity="bottom">
android:layout_height="match_parent">
<androidx.appcompat.widget.Toolbar
android:id="@+id/player_toolbar"
android:layout_width="match_parent"
android:layout_height="48dp"
app:navigationIcon="@drawable/ic_close_white_24dp" />
</FrameLayout>
<LinearLayout
android:id="@+id/container"
android:layout_width="400dp"
android:layout_height="match_parent"
android:layout_above="@id/toolbar_container"
android:layout_centerHorizontal="true"
android:layout_gravity="center_horizontal"
android:orientation="vertical">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<include layout="@layout/status_bar" />
</FrameLayout>
<code.name.monkey.retromusic.views.WidthFitSquareLayout
android:id="@+id/album_cover_container"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0">
android:orientation="vertical">
<fragment
android:id="@+id/player_album_cover_fragment"
android:name="code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment"
android:layout_width="match_parent"
<LinearLayout
android:id="@+id/container"
android:layout_width="400dp"
android:layout_height="match_parent"
tools:layout="@layout/fragment_player_album_cover" />
</code.name.monkey.retromusic.views.WidthFitSquareLayout>
android:layout_gravity="center_horizontal"
android:layout_weight="1"
android:orientation="vertical">
<fragment
android:id="@+id/playback_controls_fragment"
android:name="code.name.monkey.retromusic.ui.fragments.player.normal.PlayerPlaybackControlsFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
tools:layout="@layout/fragment_player_playback_controls" />
</LinearLayout>
<code.name.monkey.retromusic.views.WidthFitSquareLayout
android:id="@+id/album_cover_container"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<fragment
android:id="@+id/player_album_cover_fragment"
android:name="code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:layout="@layout/fragment_player_album_cover" />
</code.name.monkey.retromusic.views.WidthFitSquareLayout>
<fragment
android:id="@+id/playback_controls_fragment"
android:name="code.name.monkey.retromusic.ui.fragments.player.normal.PlayerPlaybackControlsFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:layout="@layout/fragment_player_playback_controls" />
</LinearLayout>
<FrameLayout
android:id="@+id/toolbar_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0">
<androidx.appcompat.widget.Toolbar
android:id="@+id/player_toolbar"
android:layout_width="match_parent"
android:layout_height="48dp"
app:navigationIcon="@drawable/ic_close_white_24dp" />
</FrameLayout>
</LinearLayout>
</code.name.monkey.retromusic.views.FitSystemWindowsLayout>
</RelativeLayout>