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

merge branch 'master' into buffering-indicator

Browse source
This commit is contained in:
dkanada 2021-03-06 16:25:18 +09:00
commit 87ce6b995b
17 changed files with 87 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/res/layout/activity_album_detail.xml
View file

@ -52,7 +52,7 @@
android:scaleType="centerCrop"
android:src="@drawable/default_album_art"
android:transitionName="@string/transition_album_image"
tools:ignore="ContentDescription,UnusedAttribute" />
tools:ignore="ContentDescription" />
<LinearLayout
android:layout_width="match_parent"
@ -77,7 +77,7 @@
android:layout_marginEnd="8dp"
android:layout_marginStart="0dp"
app:srcCompat="@drawable/ic_person_white_24dp"
tools:ignore="ContentDescription,UnusedAttribute" />
tools:ignore="ContentDescription" />
<TextView
android:ellipsize="end"
@ -105,7 +105,7 @@
android:layout_marginEnd="8dp"
android:layout_marginStart="0dp"
app:srcCompat="@drawable/ic_music_note_white_24dp"
tools:ignore="ContentDescription,UnusedAttribute" />
tools:ignore="ContentDescription" />
<TextView
android:id="@+id/song_count_text"
@ -131,7 +131,7 @@
android:layout_marginEnd="8dp"
android:layout_marginStart="0dp"
app:srcCompat="@drawable/ic_timer_white_24dp"
tools:ignore="ContentDescription,UnusedAttribute" />
tools:ignore="ContentDescription" />
<TextView
android:id="@+id/duration_text"
@ -157,7 +157,7 @@
android:layout_marginEnd="8dp"
android:layout_marginStart="0dp"
app:srcCompat="@drawable/ic_event_white_24dp"
tools:ignore="ContentDescription,UnusedAttribute" />
tools:ignore="ContentDescription" />
<TextView
android:id="@+id/album_year_text"

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

@ -53,7 +53,7 @@
android:scaleType="centerCrop"
android:src="@drawable/default_artist_image"
android:transitionName="@string/transition_artist_image"
tools:ignore="ContentDescription,UnusedAttribute" />
tools:ignore="ContentDescription" />
<LinearLayout
android:layout_width="match_parent"
@ -78,7 +78,7 @@
android:layout_marginEnd="8dp"
android:layout_marginStart="0dp"
app:srcCompat="@drawable/ic_album_white_24dp"
tools:ignore="ContentDescription,UnusedAttribute" />
tools:ignore="ContentDescription" />
<TextView
android:id="@+id/album_count_text"
@ -104,7 +104,7 @@
android:layout_marginEnd="8dp"
android:layout_marginStart="0dp"
app:srcCompat="@drawable/ic_music_note_white_24dp"
tools:ignore="ContentDescription,UnusedAttribute" />
tools:ignore="ContentDescription" />
<TextView
android:id="@+id/song_count_text"
@ -130,7 +130,7 @@
android:layout_marginEnd="8dp"
android:layout_marginStart="0dp"
app:srcCompat="@drawable/ic_timer_white_24dp"
tools:ignore="ContentDescription,UnusedAttribute" />
tools:ignore="ContentDescription" />
<TextView
android:id="@+id/duration_text"

9
app/src/main/res/layout/card_about_app.xml
View file

@ -43,6 +43,7 @@
android:layout_height="wrap_content"
android:background="?attr/rectSelector"
android:clickable="true"
android:focusable="true"
android:gravity="center_vertical"
android:minHeight="@dimen/md_listitem_height"
android:orientation="horizontal"
@ -54,7 +55,7 @@
android:layout_width="24dp"
android:layout_height="24dp"
app:srcCompat="@drawable/ic_info_outline_white_24dp"
tools:ignore="ContentDescription,UnusedAttribute" />
tools:ignore="ContentDescription" />
<LinearLayout
android:layout_width="match_parent"
@ -74,9 +75,8 @@
android:id="@+id/app_version"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0.0.0"
android:textAppearance="@style/TextAppearance.AppCompat.Caption"
tools:ignore="HardcodedText" />
tools:text="1.0.0" />
</LinearLayout>
@ -88,6 +88,7 @@
android:layout_height="wrap_content"
android:background="?attr/rectSelector"
android:clickable="true"
android:focusable="true"
android:gravity="center_vertical"
android:minHeight="@dimen/md_listitem_height"
android:orientation="horizontal"
@ -99,7 +100,7 @@
android:layout_width="24dp"
android:layout_height="24dp"
app:srcCompat="@drawable/ic_github_circle_white_24dp"
tools:ignore="ContentDescription,UnusedAttribute" />
tools:ignore="ContentDescription" />
<TextView
android:layout_width="wrap_content"

12
app/src/main/res/layout/card_author.xml
View file

@ -31,6 +31,7 @@
android:layout_height="wrap_content"
android:background="?attr/rectSelector"
android:clickable="true"
android:focusable="true"
android:gravity="center_vertical"
android:minHeight="@dimen/md_listitem_height"
android:orientation="horizontal"
@ -42,7 +43,7 @@
android:layout_width="24dp"
android:layout_height="24dp"
app:srcCompat="@drawable/ic_person_white_24dp"
tools:ignore="ContentDescription,UnusedAttribute" />
tools:ignore="ContentDescription" />
<LinearLayout
android:layout_width="match_parent"
@ -75,6 +76,7 @@
android:layout_height="wrap_content"
android:background="?attr/rectSelector"
android:clickable="true"
android:focusable="true"
android:visibility="gone"
android:gravity="center_vertical"
android:minHeight="@dimen/md_listitem_height"
@ -87,7 +89,7 @@
android:layout_width="24dp"
android:layout_height="24dp"
app:srcCompat="@drawable/ic_email_white_24dp"
tools:ignore="ContentDescription,UnusedAttribute" />
tools:ignore="ContentDescription" />
<TextView
android:layout_width="wrap_content"
@ -106,6 +108,7 @@
android:layout_height="wrap_content"
android:background="?attr/rectSelector"
android:clickable="true"
android:focusable="true"
android:visibility="gone"
android:gravity="center_vertical"
android:minHeight="@dimen/md_listitem_height"
@ -118,7 +121,7 @@
android:layout_width="24dp"
android:layout_height="24dp"
app:srcCompat="@drawable/ic_twitter_white_24dp"
tools:ignore="ContentDescription,UnusedAttribute" />
tools:ignore="ContentDescription" />
<TextView
android:layout_width="wrap_content"
@ -137,6 +140,7 @@
android:layout_height="wrap_content"
android:background="?attr/rectSelector"
android:clickable="true"
android:focusable="true"
android:gravity="center_vertical"
android:minHeight="@dimen/md_listitem_height"
android:orientation="horizontal"
@ -148,7 +152,7 @@
android:layout_width="24dp"
android:layout_height="24dp"
app:srcCompat="@drawable/ic_open_in_browser_white_24dp"
tools:ignore="ContentDescription,UnusedAttribute" />
tools:ignore="ContentDescription" />
<TextView
android:layout_width="wrap_content"

12
app/src/main/res/layout/card_support_development.xml
View file

@ -32,6 +32,7 @@
android:layout_height="wrap_content"
android:background="?attr/rectSelector"
android:clickable="true"
android:focusable="true"
android:gravity="center_vertical"
android:minHeight="@dimen/md_listitem_height"
android:orientation="horizontal"
@ -43,7 +44,7 @@
android:layout_width="24dp"
android:layout_height="24dp"
app:srcCompat="@drawable/ic_bug_report_white_24dp"
tools:ignore="ContentDescription,UnusedAttribute" />
tools:ignore="ContentDescription" />
<LinearLayout
android:layout_width="match_parent"
@ -75,6 +76,7 @@
android:layout_height="wrap_content"
android:background="?attr/rectSelector"
android:clickable="true"
android:focusable="true"
android:visibility="gone"
android:gravity="center_vertical"
android:minHeight="@dimen/md_listitem_height"
@ -87,7 +89,7 @@
android:layout_width="24dp"
android:layout_height="24dp"
app:srcCompat="@drawable/ic_flag_white_24dp"
tools:ignore="ContentDescription,UnusedAttribute" />
tools:ignore="ContentDescription" />
<LinearLayout
android:layout_width="match_parent"
@ -119,6 +121,7 @@
android:layout_height="wrap_content"
android:background="?attr/rectSelector"
android:clickable="true"
android:focusable="true"
android:visibility="gone"
android:gravity="center_vertical"
android:minHeight="@dimen/md_listitem_height"
@ -131,7 +134,7 @@
android:layout_width="24dp"
android:layout_height="24dp"
app:srcCompat="@drawable/ic_star_white_24dp"
tools:ignore="ContentDescription,UnusedAttribute" />
tools:ignore="ContentDescription" />
<LinearLayout
android:layout_width="match_parent"
@ -163,6 +166,7 @@
android:layout_height="wrap_content"
android:background="?attr/rectSelector"
android:clickable="true"
android:focusable="true"
android:visibility="gone"
android:gravity="center_vertical"
android:minHeight="@dimen/md_listitem_height"
@ -175,7 +179,7 @@
android:layout_width="24dp"
android:layout_height="24dp"
app:srcCompat="@drawable/ic_card_giftcard_white_24dp"
tools:ignore="ContentDescription,UnusedAttribute" />
tools:ignore="ContentDescription" />
<LinearLayout
android:layout_width="match_parent"

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

@ -1,10 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
tools:ignore="NewApi,RtlSymmetry">
android:orientation="vertical">
<TextView
android:id="@+id/file_path"

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

@ -13,6 +13,6 @@
android:layout_height="match_parent"
android:scaleType="centerCrop"
app:srcCompat="@drawable/default_album_art"
tools:ignore="ContentDescription,UnusedAttribute" />
tools:ignore="ContentDescription" />
</FrameLayout>

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

@ -31,8 +31,8 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:fontFamily="sans-serif-medium"
android:gravity="center_vertical|left|end"
android:paddingLeft="8dp"
android:gravity="center_vertical|start"
android:paddingStart="8dp"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="?android:textColorSecondary"
@ -47,8 +47,8 @@
android:layout_height="match_parent"
android:layout_alignParentEnd="true"
android:fontFamily="sans-serif-medium"
android:gravity="center_vertical|right|end"
android:paddingRight="8dp"
android:gravity="center_vertical|end"
android:paddingEnd="8dp"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="?android:textColorSecondary"
@ -72,7 +72,7 @@
android:layout_width="match_parent"
android:layout_height="@dimen/fab_media_controller_container_height"
android:layoutDirection="ltr"
tools:ignore="ContentDescription,UnusedAttribute">
tools:ignore="ContentDescription">
<ImageButton
android:id="@+id/player_prev_button"
@ -84,8 +84,7 @@
android:background="?attr/roundSelector"
android:padding="22dp"
android:scaleType="fitCenter"
app:srcCompat="@drawable/ic_skip_previous_white_24dp"
tools:ignore="MissingPrefix" />
app:srcCompat="@drawable/ic_skip_previous_white_24dp" />
<ImageButton
android:id="@+id/player_next_button"
@ -97,8 +96,7 @@
android:background="?attr/roundSelector"
android:padding="22dp"
android:scaleType="fitCenter"
app:srcCompat="@drawable/ic_skip_next_white_24dp"
tools:ignore="MissingPrefix" />
app:srcCompat="@drawable/ic_skip_next_white_24dp" />
<ImageButton
android:id="@+id/player_repeat_button"
@ -110,8 +108,7 @@
android:background="?attr/roundSelector"
android:padding="22dp"
android:scaleType="fitCenter"
app:srcCompat="@drawable/ic_repeat_white_24dp"
tools:ignore="MissingPrefix" />
app:srcCompat="@drawable/ic_repeat_white_24dp" />
<ImageButton
android:id="@+id/player_shuffle_button"
@ -123,8 +120,7 @@
android:background="?attr/roundSelector"
android:padding="22dp"
android:scaleType="fitCenter"
app:srcCompat="@drawable/ic_shuffle_white_24dp"
tools:ignore="MissingPrefix" />
app:srcCompat="@drawable/ic_shuffle_white_24dp" />
<Space
android:id="@+id/dummy_fab"

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

@ -18,13 +18,13 @@
android:layout_height="match_parent"
android:layout_alignParentStart="true"
android:fontFamily="sans-serif-medium"
android:gravity="center_vertical|left|end"
android:paddingLeft="8dp"
android:gravity="center_vertical|start"
android:paddingStart="8dp"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="@color/ate_primary_text_dark"
android:textSize="12sp"
tools:ignore="RtlHardcoded,RtlSymmetry"
tools:ignore="RtlSymmetry"
tools:text="0:00" />
<TextView
@ -33,22 +33,21 @@
android:layout_height="match_parent"
android:layout_alignParentEnd="true"
android:fontFamily="sans-serif-medium"
android:gravity="center_vertical|right|end"
android:paddingRight="8dp"
android:gravity="center_vertical|end"
android:paddingEnd="8dp"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="@color/ate_primary_text_dark"
android:textSize="12sp"
tools:ignore="RtlHardcoded,RtlSymmetry"
tools:text="3:14" />
tools:ignore="RtlSymmetry"
tools:text="4:00" />
<SeekBar
android:id="@+id/player_progress_slider"
style="@style/MusicProgressSlider"
android:layout_height="match_parent"
android:layout_toStartOf="@id/player_song_total_time"
android:layout_toEndOf="@id/player_song_current_progress"
tools:ignore="RtlHardcoded,UnusedAttribute" />
android:layout_toEndOf="@id/player_song_current_progress" />
</RelativeLayout>
@ -57,7 +56,7 @@
android:layout_width="match_parent"
android:layout_height="@dimen/media_controller_container_height"
android:layoutDirection="ltr"
tools:ignore="ContentDescription,UnusedAttribute">
tools:ignore="ContentDescription">
<ImageButton
android:id="@+id/player_prev_button"
@ -69,8 +68,7 @@
android:background="?attr/roundSelector"
android:padding="22dp"
android:scaleType="fitCenter"
app:srcCompat="@drawable/ic_skip_previous_white_24dp"
tools:ignore="MissingPrefix" />
app:srcCompat="@drawable/ic_skip_previous_white_24dp" />
<ImageButton
android:id="@+id/player_next_button"
@ -82,8 +80,7 @@
android:background="?attr/roundSelector"
android:padding="22dp"
android:scaleType="fitCenter"
app:srcCompat="@drawable/ic_skip_next_white_24dp"
tools:ignore="MissingPrefix" />
app:srcCompat="@drawable/ic_skip_next_white_24dp" />
<ImageButton
android:id="@+id/player_repeat_button"
@ -95,8 +92,7 @@
android:background="?attr/roundSelector"
android:padding="22dp"
android:scaleType="fitCenter"
app:srcCompat="@drawable/ic_repeat_white_24dp"
tools:ignore="MissingPrefix" />
app:srcCompat="@drawable/ic_repeat_white_24dp" />
<ImageButton
android:id="@+id/player_shuffle_button"
@ -108,8 +104,7 @@
android:background="?attr/roundSelector"
android:padding="22dp"
android:scaleType="fitCenter"
app:srcCompat="@drawable/ic_shuffle_white_24dp"
tools:ignore="MissingPrefix" />
app:srcCompat="@drawable/ic_shuffle_white_24dp" />
<ImageButton
android:id="@+id/player_play_pause__button"
@ -119,7 +114,6 @@
android:background="?attr/roundSelector"
android:padding="22dp"
android:scaleType="fitCenter"
tools:ignore="MissingPrefix"
tools:src="@drawable/ic_pause_white_24dp" />
</RelativeLayout>

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

@ -12,7 +12,7 @@
android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical"
tools:ignore="UnusedAttribute,UselessParent">
tools:ignore="UselessParent">
<com.dkanada.gramophone.views.WidthFitSquareLayout
android:id="@+id/image_container"

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

@ -17,7 +17,7 @@
android:layout_width="104dp"
android:layout_height="104dp"
android:scaleType="centerCrop"
tools:ignore="ContentDescription,UnusedAttribute" />
tools:ignore="ContentDescription" />
<LinearLayout
android:layout_width="match_parent"

3
app/src/main/res/menu/menu_main.xml
View file

@ -21,8 +21,7 @@
<menu>
<group
android:id="@+id/group_grid_size"
android:checkableBehavior="single"
tools:ignore="HardcodedText">
android:checkableBehavior="single">
<item
android:id="@+id/action_grid_size_1"
android:title="@string/grid_size_1" />