tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

reduce dependence on deprecated theming library

Browse source
This commit is contained in:
dkanada 2021-05-12 01:06:51 +09:00
commit ec2162b4b7
23 changed files with 80 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/src/main/res/layout/app_widget_album.xml
View file

@ -34,9 +34,9 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@drawable/widget_selector_dark"
tools:ignore="ContentDescription"
android:contentDescription="@string/action_previous"
tools:src="@drawable/ic_skip_previous_white_24dp"
tools:tint="@color/ate_primary_text_dark" />
tools:tint="?android:textColorPrimary" />
<ImageButton
android:id="@+id/button_toggle_play_pause"
@ -44,9 +44,9 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@drawable/widget_selector_dark"
tools:ignore="ContentDescription"
android:contentDescription="@string/action_play_pause"
tools:src="@drawable/ic_play_arrow_white_24dp"
tools:tint="@color/ate_primary_text_dark" />
tools:tint="?android:textColorPrimary" />
<ImageButton
android:id="@+id/button_next"
@ -54,9 +54,9 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@drawable/widget_selector_dark"
tools:ignore="ContentDescription"
android:contentDescription="@string/action_next"
tools:src="@drawable/ic_skip_next_white_24dp"
tools:tint="@color/ate_primary_text_dark" />
tools:tint="?android:textColorPrimary" />
</LinearLayout>
@ -85,7 +85,7 @@
android:gravity="center"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Headline"
android:textColor="@color/ate_primary_text_dark"
android:textColor="@color/overlay_text"
tools:text="Title" />
<TextView
@ -96,7 +96,7 @@
android:gravity="center"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
android:textColor="@color/ate_secondary_text_dark"
android:textColor="@color/overlay_text"
tools:text="Text" />
</LinearLayout>

16
app/src/main/res/layout/app_widget_card.xml
View file

@ -36,7 +36,7 @@
android:gravity="center_vertical"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@color/ate_primary_text_light"
android:textColor="?android:textColorPrimary"
tools:text="Title" />
<TextView
@ -47,7 +47,7 @@
android:gravity="center_vertical"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Caption"
android:textColor="@color/ate_secondary_text_light"
android:textColor="?android:textColorSecondary"
tools:text="Text" />
</LinearLayout>
@ -69,9 +69,9 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@drawable/widget_selector_light"
tools:ignore="ContentDescription"
android:contentDescription="@string/action_previous"
tools:src="@drawable/ic_skip_previous_white_24dp"
tools:tint="@color/ate_secondary_text_light" />
tools:tint="?android:textColorPrimary" />
<ImageButton
android:id="@+id/button_toggle_play_pause"
@ -79,9 +79,9 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@drawable/widget_selector_light"
tools:ignore="ContentDescription"
android:contentDescription="@string/action_play_pause"
tools:src="@drawable/ic_play_arrow_white_24dp"
tools:tint="@color/ate_secondary_text_light" />
tools:tint="?android:textColorPrimary" />
<ImageButton
android:id="@+id/button_next"
@ -89,9 +89,9 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@drawable/widget_selector_light"
tools:ignore="ContentDescription"
android:contentDescription="@string/action_next"
tools:src="@drawable/ic_skip_next_white_24dp"
tools:tint="@color/ate_secondary_text_light" />
tools:tint="?android:textColorPrimary" />
</LinearLayout>

17
app/src/main/res/layout/app_widget_classic.xml
View file

@ -5,8 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/card"
android:orientation="horizontal"
tools:ignore="ContentDescription">
android:orientation="horizontal">
<ImageView
android:id="@+id/image"
@ -14,6 +13,7 @@
android:layout_height="match_parent"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
tools:ignore="ContentDescription"
tools:src="@drawable/default_album_art" />
<RelativeLayout
@ -37,8 +37,9 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@drawable/widget_selector_light"
android:contentDescription="@string/action_previous"
tools:src="@drawable/ic_skip_previous_white_24dp"
tools:tint="@color/ate_secondary_text_light" />
tools:tint="?android:textColorPrimary" />
<ImageButton
android:id="@+id/button_toggle_play_pause"
@ -46,8 +47,9 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@drawable/widget_selector_light"
android:contentDescription="@string/action_play_pause"
tools:src="@drawable/ic_play_arrow_white_24dp"
tools:tint="@color/ate_secondary_text_light" />
tools:tint="?android:textColorPrimary" />
<ImageButton
android:id="@+id/button_next"
@ -55,8 +57,9 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@drawable/widget_selector_light"
android:contentDescription="@string/action_next"
tools:src="@drawable/ic_skip_next_white_24dp"
tools:tint="@color/ate_secondary_text_light" />
tools:tint="?android:textColorPrimary" />
</LinearLayout>
@ -77,7 +80,7 @@
android:gravity="center"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
android:textColor="@color/ate_primary_text_light"
android:textColor="?android:textColorPrimary"
tools:text="Title" />
<TextView
@ -87,7 +90,7 @@
android:gravity="center"
android:maxLines="2"
android:textAppearance="@style/TextAppearance.AppCompat.Caption"
android:textColor="@color/ate_secondary_text_light"
android:textColor="?android:textColorSecondary"
tools:text="Text" />
</LinearLayout>

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

@ -10,7 +10,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="@dimen/progress_container_height"
android:background="@color/twenty_percent_black_overlay">
android:background="@color/overlay_light">
<me.zhanghai.android.materialprogressbar.MaterialProgressBar
android:id="@+id/player_buffering_indicator"

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

@ -17,7 +17,7 @@
<com.dkanada.gramophone.views.StatusBarView
android:layout_width="match_parent"
android:layout_height="@dimen/status_bar_padding"
android:background="@color/twenty_percent_black_overlay" />
android:background="@color/overlay_light" />
</FrameLayout>
@ -60,7 +60,7 @@
android:id="@+id/toolbar_container"
android:layout_width="match_parent"
android:layout_height="@dimen/toolbar_scrim_height"
android:background="@drawable/toolbar_gradient">
android:background="@drawable/gradient_toolbar">
<androidx.appcompat.widget.Toolbar
android:id="@+id/player_toolbar"
@ -106,7 +106,7 @@
android:layout_width="match_parent"
android:layout_height="4dp"
android:layout_marginBottom="4dp"
android:background="@drawable/shadow_down" />
android:background="@drawable/gradient_shadow" />
<include
android:id="@+id/current_song"

8
app/src/main/res/layout/fragment_flat_player_playback_controls.xml
View file

@ -5,12 +5,12 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
tools:background="@color/md_amber_500">
tools:background="@android:color/darker_gray">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="@dimen/progress_container_height"
android:background="@color/twenty_percent_black_overlay">
android:background="@color/overlay_light">
<me.zhanghai.android.materialprogressbar.MaterialProgressBar
android:id="@+id/player_buffering_indicator"
@ -34,7 +34,7 @@
android:paddingStart="8dp"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="@color/ate_primary_text_dark"
android:textColor="?android:textColorPrimary"
android:textSize="12sp"
app:layout_constraintStart_toStartOf="parent"
tools:ignore="RtlSymmetry"
@ -49,7 +49,7 @@
android:paddingEnd="8dp"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="@color/ate_primary_text_dark"
android:textColor="?android:textColorPrimary"
android:textSize="12sp"
app:layout_constraintEnd_toEndOf="parent"
tools:ignore="RtlSymmetry"

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

@ -17,7 +17,7 @@
android:layout_gravity="center"
android:padding="72dp"
android:scaleType="fitXY"
android:tint="@color/md_pink_A400"
android:tint="@color/color_favorite"
android:tintMode="src_in"
android:visibility="invisible"
app:srcCompat="@drawable/ic_favorite_white_24dp"

17
app/src/main/res/layout/navigation_drawer_header.xml
View file

@ -1,5 +1,4 @@
<androidx.percentlayout.widget.PercentFrameLayout 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/header"
android:layout_width="match_parent"
@ -8,27 +7,25 @@
android:focusable="true"
android:foreground="?rectSelectorStrong">
<!--suppress AndroidDomInspection-->
<ImageView
android:id="@+id/image"
android:layout_width="match_parent"
android:layout_height="180dp"
android:scaleType="centerCrop"
android:src="@drawable/default_album_art"
android:transitionName="@string/transition_album_image"
app:layout_aspectRatio="178%"
app:layout_widthPercent="100%"
tools:ignore="ContentDescription,UnusedAttribute" />
<View
android:layout_width="match_parent"
android:layout_height="112dp"
android:layout_height="180dp"
android:layout_gravity="bottom"
android:background="@drawable/shadow_up" />
android:background="@drawable/gradient_navigation" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="56dp"
android:layout_gravity="bottom"
android:layout_marginBottom="8dp"
android:paddingVertical="8dp"
android:gravity="center_vertical"
android:orientation="vertical">
@ -41,7 +38,7 @@
android:fontFamily="sans-serif-medium"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
android:textColor="@color/ate_primary_text_dark"
android:textColor="?android:textColorPrimary"
android:textSize="14sp" />
<TextView
@ -53,7 +50,7 @@
android:fontFamily="sans-serif"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@color/ate_secondary_text_dark"
android:textColor="?android:textColorSecondary"
android:textSize="14sp" />
</LinearLayout>

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

@ -25,6 +25,6 @@
android:layout_height="match_parent"
android:layout_alignBottom="@id/status_bar"
android:layout_alignTop="@id/status_bar"
android:background="@drawable/toolbar_gradient" />
android:background="@drawable/gradient_toolbar" />
</RelativeLayout>