antebudimir/tempus
1
0
Fork 0
mirror of https://github.com/antebudimir/tempus.git synced 2026-01-02 02:13:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix rounded ripple around icon button

Browse source
This commit is contained in:
CappielloAntonio 2021-04-15 09:39:13 +02:00
parent 6b0e4929c1
commit d29c7c67c3
3 changed files with 54 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/res/layout/bottom_sheet_song_dialog.xml
View file

@ -13,7 +13,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="12dp" android:paddingTop="12dp"
android:paddingStart="20dp" android:paddingStart="20dp"
android:paddingEnd="20dp"> android:paddingEnd="20dp"
android:clipChildren="false">
<!-- Header --> <!-- Header -->
<androidx.cardview.widget.CardView <androidx.cardview.widget.CardView
@ -43,15 +44,13 @@
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:background="@drawable/button_favorite_selector" android:background="@drawable/button_favorite_selector"
android:foreground="?android:attr/selectableItemBackgroundBorderless"
android:checked="false" android:checked="false"
android:gravity="center_vertical" android:gravity="center_vertical"
android:paddingStart="8dp"
android:paddingTop="4dp"
android:paddingEnd="20dp"
android:text="" android:text=""
android:textOff="" android:textOff=""
android:textOn="" android:textOn=""
app:layout_constraintBottom_toBottomOf="parent" android:layout_marginTop="8dp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
@ -62,7 +61,7 @@
android:ellipsize="end" android:ellipsize="end"
android:fontFamily="@font/open_sans_font_family" android:fontFamily="@font/open_sans_font_family"
android:maxLines="1" android:maxLines="1"
android:paddingTop="8dp" android:layout_marginTop="8dp"
android:paddingStart="12dp" android:paddingStart="12dp"
android:paddingEnd="12dp" android:paddingEnd="12dp"
android:text="@string/label_placeholder" android:text="@string/label_placeholder"

68
app/src/main/res/layout/player_body_bottom_sheet.xml
View file

@ -6,7 +6,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent"
android:clipChildren="false">
<TextView <TextView
android:id="@+id/collapse_bottom_sheet_button" android:id="@+id/collapse_bottom_sheet_button"
@ -78,43 +79,36 @@
android:textSize="12sp" /> android:textSize="12sp" />
</LinearLayout> </LinearLayout>
<TextView
<LinearLayout android:id="@+id/player_song_title_label"
android:id="@+id/head_title_favorite_linear_layout" android:layout_width="0dp"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintLeft_toLeftOf="parent" android:layout_marginTop="12dp"
app:layout_constraintTop_toBottomOf="@+id/player_big_timer" android:paddingStart="24dp"
android:paddingEnd="24dp"
android:text="@string/label_placeholder"
android:textColor="@color/titleTextColor"
android:textSize="22sp"
android:textStyle="bold"
app:layout_constraintEnd_toStartOf="@+id/button_favorite"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/player_big_timer" />
<ToggleButton
android:id="@+id/button_favorite"
android:layout_width="26dp"
android:layout_height="26dp"
android:background="@drawable/button_favorite_selector"
android:foreground="?android:attr/selectableItemBackgroundBorderless"
android:checked="false"
android:gravity="center_vertical"
android:layout_marginTop="16dp"
android:layout_marginEnd="24dp"
android:text=""
android:textOff=""
android:textOn=""
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
android:orientation="horizontal"> app:layout_constraintTop_toBottomOf="@+id/player_big_timer"/>
<TextView
android:id="@+id/player_song_title_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginTop="12dp"
android:paddingStart="24dp"
android:text="@string/label_placeholder"
android:textColor="@color/titleTextColor"
android:textSize="22sp"
android:textStyle="bold" />
<ToggleButton
android:id="@+id/button_favorite"
android:layout_width="26dp"
android:layout_height="26dp"
android:background="@drawable/button_favorite_selector"
android:checked="false"
android:gravity="center_vertical"
android:layout_marginTop="12dp"
android:layout_marginEnd="24dp"
android:text=""
android:textOff=""
android:textOn=""
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/player_big_progress_bar" />
</LinearLayout>
<TextView <TextView
android:id="@+id/player_artist_name_label" android:id="@+id/player_artist_name_label"
@ -127,7 +121,7 @@
android:textColor="@color/subtitleTextColor" android:textColor="@color/subtitleTextColor"
android:textSize="14sp" android:textSize="14sp"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/head_title_favorite_linear_layout" /> app:layout_constraintTop_toBottomOf="@+id/player_song_title_label" />
<View style="@style/Divider" <View style="@style/Divider"
android:id="@+id/player_divider" android:id="@+id/player_divider"

21
app/src/main/res/layout/player_header_bottom_sheet.xml
View file

@ -5,7 +5,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/bottom_sheet_peek_height" android:layout_height="@dimen/bottom_sheet_peek_height"
android:elevation="2dp" android:elevation="2dp"
android:background="@color/almostCardColor"> android:background="@color/almostCardColor"
android:clipChildren="false">
<androidx.cardview.widget.CardView <androidx.cardview.widget.CardView
xmlns:card_view="http://schemas.android.com/apk/res-auto" xmlns:card_view="http://schemas.android.com/apk/res-auto"
@ -58,11 +59,12 @@
<ToggleButton <ToggleButton
android:id="@+id/player_header_button" android:id="@+id/player_header_button"
android:layout_width="32dp" android:layout_width="28dp"
android:layout_height="32dp" android:layout_height="28dp"
android:layout_marginStart="12dp" android:layout_marginStart="12dp"
android:layout_marginEnd="12dp" android:layout_marginEnd="12dp"
android:background="@drawable/button_play_pause_selector" android:background="@drawable/button_play_pause_selector"
android:foreground="?android:attr/selectableItemBackgroundBorderless"
android:checked="true" android:checked="true"
android:text="" android:text=""
android:textOff="" android:textOff=""
@ -71,4 +73,17 @@
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<SeekBar
android:id="@+id/player_header_seek_bar"
android:layout_width="match_parent"
android:layout_height="2dp"
android:progressBackgroundTint="@color/colorAccentLight"
android:clickable="false"
android:thumb="@android:color/transparent"
android:paddingStart="0dp"
android:paddingEnd="0dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>