nyancrimew/PlayerAndroid
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix font in widgets

Browse source
This commit is contained in:
h4h13 2019-09-02 20:33:11 +05:30
parent 8f2c09918c
commit a9b63530f9
6 changed files with 114 additions and 109 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -10,7 +10,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:scaleType="centerCrop" android:scaleType="centerCrop"
tools:ignore="ContentDescription"/> tools:ignore="ContentDescription" />
<LinearLayout <LinearLayout
android:id="@+id/media_actions" android:id="@+id/media_actions"
@ -27,33 +27,33 @@
android:layout_width="72dp" android:layout_width="72dp"
android:layout_height="72dp" android:layout_height="72dp"
android:layout_weight="1" android:layout_weight="1"
android:padding="22dp"
android:background="@drawable/widget_selector_dark" android:background="@drawable/widget_selector_dark"
android:padding="22dp"
tools:ignore="ContentDescription" tools:ignore="ContentDescription"
tools:src="@drawable/ic_skip_previous_white_24dp" tools:src="@drawable/ic_skip_previous_white_24dp"
tools:tint="@color/ate_primary_text_dark"/> tools:tint="@color/ate_primary_text_dark" />
<ImageButton <ImageButton
android:id="@+id/button_toggle_play_pause" android:id="@+id/button_toggle_play_pause"
android:layout_width="72dp" android:layout_width="72dp"
android:layout_height="72dp" android:layout_height="72dp"
android:layout_weight="1" android:layout_weight="1"
android:padding="22dp"
android:background="@drawable/widget_selector_dark" android:background="@drawable/widget_selector_dark"
android:padding="22dp"
tools:ignore="ContentDescription" tools:ignore="ContentDescription"
tools:src="@drawable/ic_play_arrow_white_32dp" tools:src="@drawable/ic_play_arrow_white_32dp"
tools:tint="@color/ate_primary_text_dark"/> tools:tint="@color/ate_primary_text_dark" />
<ImageButton <ImageButton
android:id="@+id/button_next" android:id="@+id/button_next"
android:layout_width="72dp" android:layout_width="72dp"
android:layout_height="72dp" android:layout_height="72dp"
android:layout_weight="1" android:layout_weight="1"
android:padding="22dp"
android:background="@drawable/widget_selector_dark" android:background="@drawable/widget_selector_dark"
android:padding="22dp"
tools:ignore="ContentDescription" tools:ignore="ContentDescription"
tools:src="@drawable/ic_skip_next_white_24dp" tools:src="@drawable/ic_skip_next_white_24dp"
tools:tint="@color/ate_primary_text_dark"/> tools:tint="@color/ate_primary_text_dark" />
</LinearLayout> </LinearLayout>
@ -63,16 +63,16 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_above="@id/media_actions" android:layout_above="@id/media_actions"
android:layout_alignParentTop="true"/> android:layout_alignParentTop="true" />
<LinearLayout <LinearLayout
android:id="@+id/media_titles" android:id="@+id/media_titles"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:padding="16dp"
android:background="@drawable/shadow_down_strong" android:background="@drawable/shadow_down_strong"
android:orientation="vertical"> android:orientation="vertical"
android:padding="16dp">
<TextView <TextView
android:id="@+id/title" android:id="@+id/title"
@ -81,9 +81,9 @@
android:layout_weight="1" android:layout_weight="1"
android:gravity="center_vertical" android:gravity="center_vertical"
android:singleLine="true" android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Headline" android:textAppearance="@style/TextViewHeadline6"
android:textColor="@color/ate_primary_text_dark" android:textColor="@color/ate_primary_text_dark"
tools:text="Title"/> tools:text="Title" />
<TextView <TextView
android:id="@+id/text" android:id="@+id/text"
@ -92,9 +92,9 @@
android:layout_weight="1" android:layout_weight="1"
android:gravity="center_vertical" android:gravity="center_vertical"
android:singleLine="true" android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead" android:textAppearance="@style/TextViewSubtitle1"
android:textColor="@color/ate_secondary_text_dark" android:textColor="@color/ate_secondary_text_dark"
tools:text="Text"/> tools:text="Text" />
</LinearLayout> </LinearLayout>

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

@ -34,7 +34,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:gravity="center_vertical"
android:singleLine="true" android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Body1" android:textAppearance="@style/TextViewBody1"
android:textColor="@color/ate_primary_text_light" android:textColor="@color/ate_primary_text_light"
tools:text="Title" /> tools:text="Title" />
@ -50,7 +50,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:gravity="center_vertical"
android:singleLine="true" android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Body1" android:textAppearance="@style/TextViewBody2"
android:textColor="@color/ate_secondary_text_light" android:textColor="@color/ate_secondary_text_light"
tools:text="Album" /> tools:text="Album" />

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

@ -27,8 +27,8 @@
android:layoutDirection="ltr" android:layoutDirection="ltr"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingStart="8dp" android:paddingStart="8dp"
android:paddingBottom="8dp" android:paddingEnd="8dp"
android:paddingEnd="8dp"> android:paddingBottom="8dp">
<ImageButton <ImageButton
android:id="@+id/button_prev" android:id="@+id/button_prev"
@ -76,6 +76,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:gravity="center_vertical"
android:singleLine="true" android:singleLine="true"
android:textAppearance="@style/TextViewNormal"
android:textColor="@color/ate_primary_text_dark" android:textColor="@color/ate_primary_text_dark"
tools:text="Title" /> tools:text="Title" />
@ -85,7 +86,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:gravity="center_vertical"
android:singleLine="true" android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Caption" android:textAppearance="@style/TextViewCaption"
android:textColor="@color/ate_secondary_text_dark" android:textColor="@color/ate_secondary_text_dark"
tools:text="Text" /> tools:text="Text" />

22
app/src/main/res/layout/app_widget_small.xml
View file

@ -13,7 +13,7 @@
android:layout_width="@dimen/app_widget_small_image_size" android:layout_width="@dimen/app_widget_small_image_size"
android:layout_height="@dimen/app_widget_small_image_size" android:layout_height="@dimen/app_widget_small_image_size"
android:scaleType="centerInside" android:scaleType="centerInside"
tools:ignore="ContentDescription"/> tools:ignore="ContentDescription" />
<LinearLayout <LinearLayout
android:id="@+id/media_actions" android:id="@+id/media_actions"
@ -31,7 +31,7 @@
android:background="@drawable/widget_selector" android:background="@drawable/widget_selector"
tools:ignore="ContentDescription" tools:ignore="ContentDescription"
tools:src="@drawable/ic_skip_previous_white_24dp" tools:src="@drawable/ic_skip_previous_white_24dp"
tools:tint="@color/ate_secondary_text_dark"/> tools:tint="@color/ate_secondary_text_dark" />
<ImageButton <ImageButton
android:id="@+id/button_toggle_play_pause" android:id="@+id/button_toggle_play_pause"
@ -41,7 +41,7 @@
android:background="@drawable/widget_selector" android:background="@drawable/widget_selector"
tools:ignore="ContentDescription" tools:ignore="ContentDescription"
tools:src="@drawable/ic_play_arrow_white_32dp" tools:src="@drawable/ic_play_arrow_white_32dp"
tools:tint="@color/ate_secondary_text_dark"/> tools:tint="@color/ate_secondary_text_dark" />
<ImageButton <ImageButton
android:id="@+id/button_next" android:id="@+id/button_next"
@ -51,7 +51,7 @@
android:background="@drawable/widget_selector" android:background="@drawable/widget_selector"
tools:ignore="ContentDescription" tools:ignore="ContentDescription"
tools:src="@drawable/ic_skip_next_white_24dp" tools:src="@drawable/ic_skip_next_white_24dp"
tools:tint="@color/ate_secondary_text_dark"/> tools:tint="@color/ate_secondary_text_dark" />
</LinearLayout> </LinearLayout>
@ -62,7 +62,7 @@
android:layout_columnSpan="2" android:layout_columnSpan="2"
android:layout_gravity="fill_horizontal" android:layout_gravity="fill_horizontal"
android:background="@color/md_white_1000" android:background="@color/md_white_1000"
tools:ignore="Orientation"/> tools:ignore="Orientation" />
<LinearLayout <LinearLayout
android:id="@+id/media_titles" android:id="@+id/media_titles"
@ -80,9 +80,9 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:gravity="center_vertical"
android:singleLine="true" android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Body2" android:textAppearance="@style/TextViewBody2"
android:textColor="@color/ate_primary_text_dark" android:textColor="@color/ate_primary_text_dark"
tools:text="Title"/> tools:text="Title" />
<TextView <TextView
android:id="@+id/text_separator" android:id="@+id/text_separator"
@ -92,10 +92,10 @@
android:paddingLeft="4dp" android:paddingLeft="4dp"
android:paddingRight="4dp" android:paddingRight="4dp"
android:singleLine="true" android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Body1" android:textAppearance="@style/TextViewBody1"
android:textColor="@color/ate_secondary_text_dark" android:textColor="@color/ate_secondary_text_dark"
tools:ignore="HardcodedText" tools:ignore="HardcodedText"
tools:text="•"/> tools:text="•" />
<TextView <TextView
android:id="@+id/text" android:id="@+id/text"
@ -103,9 +103,9 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:gravity="center_vertical"
android:singleLine="true" android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Body1" android:textAppearance="@style/TextViewBody1"
android:textColor="@color/ate_secondary_text_dark" android:textColor="@color/ate_secondary_text_dark"
tools:text="Text"/> tools:text="Text" />
</LinearLayout> </LinearLayout>

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

@ -29,7 +29,7 @@
android:shadowColor="@color/md_black_1000" android:shadowColor="@color/md_black_1000"
android:shadowRadius="8" android:shadowRadius="8"
android:text="@string/normal_lyrics" android:text="@string/normal_lyrics"
android:textAppearance="@style/TextAppearance.MaterialComponents.Headline6" android:textAppearance="@style/TextViewHeadline6"
android:textColor="@color/md_white_1000" /> android:textColor="@color/md_white_1000" />
<TextView <TextView
@ -43,7 +43,7 @@
android:shadowColor="@color/md_grey_800" android:shadowColor="@color/md_grey_800"
android:shadowRadius="6" android:shadowRadius="6"
android:text="@string/normal_lyrics" android:text="@string/normal_lyrics"
android:textAppearance="@style/TextAppearance.MaterialComponents.Body2" android:textAppearance="@style/TextViewBody2"
android:textColor="@color/md_white_1000" /> android:textColor="@color/md_white_1000" />
</LinearLayout> </LinearLayout>

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

@ -172,6 +172,10 @@
<item name="android:fontFamily">@font/circular</item> <item name="android:fontFamily">@font/circular</item>
</style> </style>
<style name="TextViewCaption" parent="TextAppearance.MaterialComponents.Caption">
<item name="android:fontFamily">@font/circular</item>
</style>
<style name="TextViewHeadline6" parent="TextAppearance.MaterialComponents.Headline6"> <style name="TextViewHeadline6" parent="TextAppearance.MaterialComponents.Headline6">
<item name="android:fontFamily">@font/circular</item> <item name="android:fontFamily">@font/circular</item>
</style> </style>