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:52:03 +09:00
commit 846ddf9279
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -44,7 +44,6 @@
android:id="@+id/player_song_total_time" android:id="@+id/player_song_total_time"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_alignParentEnd="true"
android:fontFamily="sans-serif-medium" android:fontFamily="sans-serif-medium"
android:gravity="center_vertical|end" android:gravity="center_vertical|end"
android:paddingEnd="8dp" android:paddingEnd="8dp"

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

@ -7,7 +7,7 @@
android:orientation="vertical" android:orientation="vertical"
tools:background="@color/md_amber_500"> tools:background="@color/md_amber_500">
<RelativeLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/progress_container_height" android:layout_height="@dimen/progress_container_height"
android:background="@color/twenty_percent_black_overlay"> android:background="@color/twenty_percent_black_overlay">
@ -16,7 +16,6 @@
android:id="@+id/player_song_current_progress" android:id="@+id/player_song_current_progress"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_alignParentStart="true"
android:fontFamily="sans-serif-medium" android:fontFamily="sans-serif-medium"
android:gravity="center_vertical|start" android:gravity="center_vertical|start"
android:paddingStart="8dp" android:paddingStart="8dp"
@ -24,6 +23,7 @@
android:textAppearance="@style/TextAppearance.AppCompat.Title" android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="@color/ate_primary_text_dark" android:textColor="@color/ate_primary_text_dark"
android:textSize="12sp" android:textSize="12sp"
app:layout_constraintStart_toStartOf="parent"
tools:ignore="RtlSymmetry" tools:ignore="RtlSymmetry"
tools:text="0:00" /> tools:text="0:00" />
@ -31,7 +31,6 @@
android:id="@+id/player_song_total_time" android:id="@+id/player_song_total_time"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_alignParentEnd="true"
android:fontFamily="sans-serif-medium" android:fontFamily="sans-serif-medium"
android:gravity="center_vertical|end" android:gravity="center_vertical|end"
android:paddingEnd="8dp" android:paddingEnd="8dp"
@ -39,17 +38,19 @@
android:textAppearance="@style/TextAppearance.AppCompat.Title" android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="@color/ate_primary_text_dark" android:textColor="@color/ate_primary_text_dark"
android:textSize="12sp" android:textSize="12sp"
app:layout_constraintEnd_toEndOf="parent"
tools:ignore="RtlSymmetry" tools:ignore="RtlSymmetry"
tools:text="4:00" /> tools:text="4:00" />
<SeekBar <SeekBar
android:id="@+id/player_progress_slider" android:id="@+id/player_progress_slider"
style="@style/MusicProgressSlider" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_toStartOf="@id/player_song_total_time" app:layout_constraintStart_toEndOf="@id/player_song_current_progress"
android:layout_toEndOf="@id/player_song_current_progress" /> app:layout_constraintEnd_toStartOf="@id/player_song_total_time"
style="@style/MusicProgressSlider" />
</RelativeLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<RelativeLayout <RelativeLayout
android:id="@+id/player_media_controller_container" android:id="@+id/player_media_controller_container"