This commit is contained in:
h4h13 2018-11-13 09:00:08 +05:30
parent a531a1e723
commit ca4e9e7ef0
194 changed files with 1286 additions and 2256 deletions

View file

@ -14,6 +14,7 @@
android:id="@+id/collapsing_toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:contentScrim="@android:color/transparent"
app:layout_scrollFlags="scroll|exitUntilCollapsed"
app:titleEnabled="false">
@ -39,8 +40,8 @@
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
style="@style/Toolbar48" />
style="@style/Toolbar48"
app:layout_collapseMode="pin" />
</com.google.android.material.appbar.CollapsingToolbarLayout>
</com.google.android.material.appbar.AppBarLayout>
@ -86,7 +87,6 @@
android:layout_height="wrap_content"
android:maxLines="2"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:transitionName="@string/transition_album_name"
tools:ignore="MissingPrefix" />
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
@ -103,7 +103,6 @@
android:scrollHorizontally="true"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
android:transitionName="@string/transition_album_text"
tools:ignore="MissingPrefix"
tools:text="Title" />
@ -112,25 +111,18 @@
<include layout="@layout/activity_album_content" />
<Space
android:layout_width="match_parent"
android:layout_height="72dp" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
<com.google.android.material.button.MaterialButton
<code.name.monkey.retromusic.views.CollapsingFAB
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" />
android:layout_gravity="end|bottom"
android:layout_margin="10dp"
app:showTitle="true"
app:shuffleBackgroundColor="@color/md_black_1000" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>

View file

@ -12,7 +12,7 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:nestedScrollingEnabled="false" />
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
@ -24,7 +24,11 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/more_recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:nestedScrollingEnabled="false"
android:visibility="gone" />
<Space
android:layout_width="match_parent"
android:layout_height="72dp" />
</LinearLayout>

View file

@ -45,4 +45,7 @@
android:layout_height="wrap_content"
android:nestedScrollingEnabled="false" />
<Space
android:layout_width="match_parent"
android:layout_height="72dp" />
</LinearLayout>

View file

@ -37,7 +37,6 @@
android:layout_height="72dp"
android:background="@drawable/shadow_down_strong" />
</code.name.monkey.retromusic.views.WidthFitSquareLayout>
<androidx.appcompat.widget.Toolbar
@ -96,24 +95,16 @@
<include layout="@layout/activity_artist_content" />
<Space
android:layout_width="match_parent"
android:layout_height="72dp" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
<com.google.android.material.button.MaterialButton
<code.name.monkey.retromusic.views.CollapsingFAB
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" />
android:layout_gravity="end|bottom"
android:layout_margin="10dp"
app:showTitle="true"
app:shuffleBackgroundColor="@color/md_black_1000" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>

View file

@ -63,6 +63,7 @@
android:background="?dividerColor" />
</com.google.android.material.appbar.AppBarLayout>
<com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
android:id="@+id/recycler_view"
android:layout_width="match_parent"
@ -71,6 +72,7 @@
android:scrollbars="none"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
<TextView
android:id="@android:id/empty"
android:layout_width="wrap_content"
@ -82,14 +84,14 @@
android:textSize="@dimen/empty_text_size"
android:visibility="gone" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
<code.name.monkey.retromusic.views.CollapsingFAB
android:id="@+id/action_shuffle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="16dp"
android:src="@drawable/ic_shuffle_white_24dp"
app:layout_behavior="code.name.monkey.retromusic.misc.ScrollAwareFABBehavior" />
app:showTitle="true" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>
</LinearLayout>

View file

@ -143,22 +143,6 @@
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<EditText
android:id="@+id/composer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center_vertical"
android:hint="@string/composer"
android:inputType="text|textCapWords"
android:maxLines="1"
android:textAppearance="@style/TextAppearance.AppCompat.Title" />
</com.google.android.material.textfield.TextInputLayout>
<LinearLayout
android:layout_width="match_parent"

View file

@ -14,7 +14,8 @@
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
style="@style/Toolbar48">
style="@style/Toolbar48"
app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp">
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
android:id="@+id/title"

View file

@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<com.google.android.material.card.MaterialCardView 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/container"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:cardCornerRadius="26dp"
app:cardUseCompatPadding="true"
tools:backgroundTint="@color/md_red_400">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="14dp"
app:srcCompat="@drawable/ic_shuffle_white_24dp"
app:tint="@color/md_black_1000" />
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
android:id="@+id/shuffle_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:text="@string/action_shuffle_all"
android:textColor="@color/md_black_1000" />
</LinearLayout>
</com.google.android.material.card.MaterialCardView>

View file

@ -61,7 +61,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/action_create"
style="@style/Widget.MaterialComponents.Button"
style="@style/Widget.MaterialComponents.Button.TextButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"

View file

@ -15,8 +15,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="end"
android:paddingStart="0dp"
android:paddingEnd="12dp">
android:padding="12dp">
<com.google.android.material.button.MaterialButton
android:id="@+id/action_cancel"

View file

@ -4,8 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/transparent"
android:padding="12dp">
android:background="@android:color/transparent">
<LinearLayout
android:layout_width="match_parent"
@ -14,23 +13,20 @@
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
android:id="@+id/title"
fontPath="@string/circular_std_black"
style="@style/SubTitleTextAppearance"
android:padding="12dp"
android:text="@string/action_sleep_timer" />
<View
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:padding="6dp"
android:text="@string/action_sleep_timer"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="?android:attr/textColorPrimary"
tools:ignore="MissingPrefix" />
android:layout_height="1dp"
android:background="?dividerColor" />
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
android:id="@+id/timer_display"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="6dp"
android:paddingTop="8dp"
android:paddingEnd="6dp"
android:padding="12dp"
android:textAppearance="?android:textAppearanceLarge" />
@ -49,6 +45,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="12dp"
android:gravity="end"
android:orientation="horizontal">

View file

@ -1,98 +1,37 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
<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/coordinator_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:orientation="vertical">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/app_bar"
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:elevation="0dp"
android:focusable="true"
app:elevation="0dp"
tools:ignore="UnusedAttribute">
android:layout_height="wrap_content">
<!--<com.google.android.material.appbar.CollapsingToolbarLayout
android:id="@+id/collapsing_toolbar"
android:layout_width="match_parent"
android:layout_height="196dp"
app:contentScrim="?attr/colorPrimary"
app:layout_scrollFlags="scroll|exitUntilCollapsed"
app:statusBarScrim="?attr/colorPrimary"
app:titleEnabled="false">
<include layout="@layout/status_bar" />
</FrameLayout>
<ImageView
android:id="@+id/image"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
app:layout_collapseMode="parallax"
tools:ignore="ContentDescription" />
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_collapseMode="pin">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:elevation="0dp"
tools:ignore="UnusedAttribute">
<include layout="@layout/status_bar" />
</FrameLayout>
<androidx.appcompat.widget.Toolbar
android:id="@+id/home_toolbar"
style="@style/Toolbar"
tools:ignore="UnusedAttribute">
<TextView
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:text="@string/app_name"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
tools:ignore="MissingPrefix" />
<code.name.monkey.retromusic.views.CircularImageView
android:id="@+id/user_image"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_gravity="end"
android:layout_marginEnd="16dp"
app:civ_border="false" />
</androidx.appcompat.widget.Toolbar>
</LinearLayout>
</com.google.android.material.appbar.CollapsingToolbarLayout>-->
<com.google.android.material.appbar.CollapsingToolbarLayout
android:id="@+id/collapsing_toolbar"
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/app_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_scrollFlags="scroll|enterAlways"
app:titleEnabled="false">
android:elevation="0dp"
android:focusable="true"
app:elevation="0dp"
tools:ignore="UnusedAttribute">
<LinearLayout
<com.google.android.material.appbar.CollapsingToolbarLayout
android:id="@+id/collapsing_toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<include layout="@layout/status_bar" />
</FrameLayout>
app:layout_scrollFlags="scroll|enterAlways"
app:titleEnabled="false">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
@ -113,47 +52,47 @@
android:layout_marginEnd="16dp"
app:civ_border="false" />
</androidx.appcompat.widget.Toolbar>
</LinearLayout>
</com.google.android.material.appbar.CollapsingToolbarLayout>
</com.google.android.material.appbar.AppBarLayout>
</com.google.android.material.appbar.CollapsingToolbarLayout>
</com.google.android.material.appbar.AppBarLayout>
<androidx.core.widget.NestedScrollView
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/bg_circular_top_corners"
app:behavior_overlapTop="24dp"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<LinearLayout
android:id="@+id/content_container"
<androidx.core.widget.NestedScrollView
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:descendantFocusability="blocksDescendants"
android:focusable="true"
android:focusableInTouchMode="true"
android:orientation="vertical">
android:background="@drawable/bg_circular_top_corners"
app:behavior_overlapTop="24dp"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<com.google.android.material.card.MaterialCardView
android:id="@+id/image_container"
<LinearLayout
android:id="@+id/content_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="4dp"
app:cardCornerRadius="8dp"
app:cardUseCompatPadding="true">
android:layout_height="match_parent"
android:descendantFocusability="blocksDescendants"
android:focusable="true"
android:focusableInTouchMode="true"
android:orientation="vertical">
<ImageView
android:id="@+id/image"
<com.google.android.material.card.MaterialCardView
android:id="@+id/image_container"
android:layout_width="match_parent"
android:layout_height="196dp"
android:scaleType="centerCrop"
app:layout_collapseMode="parallax"
tools:ignore="ContentDescription" />
</com.google.android.material.card.MaterialCardView>
android:layout_height="wrap_content"
android:layout_margin="4dp"
app:cardCornerRadius="8dp"
app:cardUseCompatPadding="true">
<include layout="@layout/abs_playlists" />
<ImageView
android:id="@+id/image"
android:layout_width="match_parent"
android:layout_height="196dp"
android:scaleType="centerCrop"
app:layout_collapseMode="parallax"
tools:ignore="ContentDescription" />
</com.google.android.material.card.MaterialCardView>
<include layout="@layout/home_section_content" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
<include layout="@layout/abs_playlists" />
<include layout="@layout/home_section_content" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
</LinearLayout>

View file

@ -6,6 +6,13 @@
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>
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:id="@+id/coordinator_layout"
android:layout_width="match_parent"
@ -27,38 +34,25 @@
app:layout_scrollFlags="scroll|enterAlways"
app:titleEnabled="false">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
style="@style/Toolbar48"
app:layout_collapseMode="pin"
tools:ignore="UnusedAttribute">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/title"
style="@style/BigTitleTextAppearance"
android:text="@string/app_name" />
<include layout="@layout/status_bar" />
</FrameLayout>
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
style="@style/Toolbar48"
app:layout_collapseMode="pin"
tools:ignore="UnusedAttribute">
<TextView
android:id="@+id/title"
style="@style/BigTitleTextAppearance"
android:text="@string/app_name" />
<code.name.monkey.retromusic.views.CircularImageView
android:id="@+id/user_image"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_gravity="end"
android:layout_marginEnd="16dp"
app:civ_border="false" />
</androidx.appcompat.widget.Toolbar>
</LinearLayout>
<code.name.monkey.retromusic.views.CircularImageView
android:id="@+id/user_image"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_gravity="end"
android:layout_marginEnd="16dp"
app:civ_border="false" />
</androidx.appcompat.widget.Toolbar>
</com.google.android.material.appbar.CollapsingToolbarLayout>
</com.google.android.material.appbar.AppBarLayout>

View file

@ -41,7 +41,7 @@
android:layout_height="wrap_content"
app:layout_collapseMode="pin">
<androidx.appcompat.widget.Toolbar
<code.name.monkey.retromusic.views.TintIconColorToolbar
android:id="@+id/toolbar"
style="@style/Toolbar48"
tools:ignore="UnusedAttribute">
@ -57,7 +57,7 @@
android:textAppearance="@style/TextAppearance.AppCompat.Large"
tools:ignore="MissingPrefix" />
</androidx.appcompat.widget.Toolbar>
</code.name.monkey.retromusic.views.TintIconColorToolbar>
<ViewStub
android:id="@+id/cab_stub"

View file

@ -7,7 +7,6 @@
android:background="@android:color/transparent"
android:clickable="true"
android:focusable="false"
android:transitionName="@string/transition_mini_player"
tools:ignore="UnusedAttribute">
<LinearLayout

View file

@ -26,11 +26,18 @@
app:cardCornerRadius="8dp"
app:cardUseCompatPadding="true">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/image_1"
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop" />
android:id="@+id/image_1" android:layout_height="match_parent"
android:background="@color/md_red_400"
android:padding="8dp"
android:text="New music mix"
android:textAppearance="@style/TextAppearance.MaterialComponents.Headline4"
app:autoSizeMaxTextSize="128sp"
app:autoSizeMinTextSize="24sp"
app:autoSizeStepGranularity="1sp"
app:autoSizeTextType="uniform" />
</com.google.android.material.card.MaterialCardView>
</code.name.monkey.retromusic.views.WidthFitSquareLayout>
</FrameLayout>

View file

@ -0,0 +1,60 @@
<?xml version="1.0" encoding="utf-8"?>
<com.google.android.material.card.MaterialCardView 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="wrap_content"
android:orientation="vertical"
app:cardCornerRadius="8dp"
app:cardUseCompatPadding="true"
tools:backgroundTint="@color/md_red_400">
<code.name.monkey.retromusic.views.WidthFitSquareLayout
android:id="@+id/image_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/image"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:transitionName="@string/transition_album_art"
tools:ignore="ContentDescription" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<Space
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1" />
<View
android:id="@+id/mask"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/shadow_up_home" />
</LinearLayout>
</code.name.monkey.retromusic.views.WidthFitSquareLayout>
<TextView
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|center"
android:gravity="center"
android:maxLines="2"
android:paddingStart="8dp"
android:paddingEnd="8dp"
android:paddingBottom="8dp"
android:textColor="@color/md_white_1000"
tools:text="@string/appbar_scrolling_view_behavior" />
</com.google.android.material.card.MaterialCardView>

View file

@ -41,8 +41,8 @@
android:paddingStart="8dp"
android:paddingTop="6dp"
android:paddingEnd="8dp"
android:textSize="13sp"
android:paddingBottom="4dp"
android:textSize="13sp"
tools:ignore="MissingPrefix"
tools:text="My top tracks" />

View file

@ -25,11 +25,6 @@
android:background="@drawable/bg_circular_top_corners"
android:orientation="vertical">
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="?dividerColor" />
<FrameLayout
android:id="@+id/mini_player_container"
android:layout_width="match_parent"
@ -44,7 +39,7 @@
tools:layout="@layout/fragment_mini_player" />
</FrameLayout>
<com.google.android.material.bottomnavigation.BottomNavigationView
<code.name.monkey.retromusic.views.BottomNavigationBarTinted
android:id="@+id/bottom_navigation"
android:layout_width="match_parent"
android:layout_height="56dp"
@ -56,7 +51,7 @@
app:itemTextColor="@drawable/bottom_navigation_item_colors"
app:labelVisibilityMode="labeled"
app:menu="@menu/bottom_navigation_main" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>