antebudimir/tempus
1
0
Fork 0
mirror of https://github.com/antebudimir/tempus.git synced 2025-12-31 09:33:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Space optimization and adding toggles for repeating and shuffling

Browse source
This commit is contained in:
CappielloAntonio 2022-01-04 09:35:35 +01:00
parent c1a0601106
commit 4bcca0e5ad
7 changed files with 45 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.idea/misc.xml generated
View file

@ -48,6 +48,7 @@
<entry key="app/src/main/res/drawable/ic_playlist_add.xml" value="0.28703703703703703" /> <entry key="app/src/main/res/drawable/ic_playlist_add.xml" value="0.28703703703703703" />
<entry key="app/src/main/res/drawable/ic_queue_music.xml" value="0.28703703703703703" /> <entry key="app/src/main/res/drawable/ic_queue_music.xml" value="0.28703703703703703" />
<entry key="app/src/main/res/drawable/ic_radio.xml" value="0.28703703703703703" /> <entry key="app/src/main/res/drawable/ic_radio.xml" value="0.28703703703703703" />
<entry key="app/src/main/res/drawable/ic_rating.xml" value="0.28703703703703703" />
<entry key="app/src/main/res/drawable/ic_refresh.xml" value="0.18958333333333333" /> <entry key="app/src/main/res/drawable/ic_refresh.xml" value="0.18958333333333333" />
<entry key="app/src/main/res/drawable/ic_repeat.xml" value="0.28703703703703703" /> <entry key="app/src/main/res/drawable/ic_repeat.xml" value="0.28703703703703703" />
<entry key="app/src/main/res/drawable/ic_search.xml" value="0.27685185185185185" /> <entry key="app/src/main/res/drawable/ic_search.xml" value="0.27685185185185185" />
@ -99,7 +100,7 @@
<entry key="app/src/main/res/layout/fragment_settings.xml" value="0.3229166666666667" /> <entry key="app/src/main/res/layout/fragment_settings.xml" value="0.3229166666666667" />
<entry key="app/src/main/res/layout/fragment_song_list_page.xml" value="0.225" /> <entry key="app/src/main/res/layout/fragment_song_list_page.xml" value="0.225" />
<entry key="app/src/main/res/layout/inner_fragment_player_controller.xml" value="0.3229166666666667" /> <entry key="app/src/main/res/layout/inner_fragment_player_controller.xml" value="0.3229166666666667" />
<entry key="app/src/main/res/layout/inner_fragment_player_controller_layout.xml" value="0.5160462130937099" /> <entry key="app/src/main/res/layout/inner_fragment_player_controller_layout.xml" value="0.48638132295719844" />
<entry key="app/src/main/res/layout/inner_fragment_player_cover.xml" value="0.3229166666666667" /> <entry key="app/src/main/res/layout/inner_fragment_player_cover.xml" value="0.3229166666666667" />
<entry key="app/src/main/res/layout/inner_fragment_player_lyrics.xml" value="0.3229166666666667" /> <entry key="app/src/main/res/layout/inner_fragment_player_lyrics.xml" value="0.3229166666666667" />
<entry key="app/src/main/res/layout/inner_fragment_player_queue.xml" value="0.3229166666666667" /> <entry key="app/src/main/res/layout/inner_fragment_player_queue.xml" value="0.3229166666666667" />

3
app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerControllerFragment.java
View file

@ -156,6 +156,9 @@ public class PlayerControllerFragment extends Fragment {
private void setMetadata(MediaMetadata mediaMetadata) { private void setMetadata(MediaMetadata mediaMetadata) {
playerSongTitleLabel.setText(MusicUtil.getReadableString(String.valueOf(mediaMetadata.title))); playerSongTitleLabel.setText(MusicUtil.getReadableString(String.valueOf(mediaMetadata.title)));
playerArtistNameLabel.setText(MusicUtil.getReadableString(String.valueOf(mediaMetadata.artist))); playerArtistNameLabel.setText(MusicUtil.getReadableString(String.valueOf(mediaMetadata.artist)));
playerSongTitleLabel.setSelected(true);
playerArtistNameLabel.setSelected(true);
} }
private void initCoverLyricsSlideView() { private void initCoverLyricsSlideView() {

9
app/src/main/res/drawable/ic_grade.xml
View file

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@color/titleTextColor"
android:pathData="M12,7.13l0.97,2.29 0.47,1.11 1.2,0.1 2.47,0.21 -1.88,1.63 -0.91,0.79 0.27,1.18 0.56,2.41 -2.12,-1.28 -1.03,-0.64 -1.03,0.62 -2.12,1.28 0.56,-2.41 0.27,-1.18 -0.91,-0.79 -1.88,-1.63 2.47,-0.21 1.2,-0.1 0.47,-1.11 0.97,-2.27M12,2L9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2z"/>
</vector>

9
app/src/main/res/drawable/ic_rating.xml Normal file
View file

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@color/titleTextColor"
android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2L9.19,8.63L2,9.24l5.46,4.73L5.82,21L12,17.27z"/>
</vector>

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

@ -6,4 +6,6 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
app:controller_layout_id="@layout/inner_fragment_player_controller_layout" app:controller_layout_id="@layout/inner_fragment_player_controller_layout"
app:repeat_toggle_modes="all|one"
app:show_shuffle_button="true"
app:show_timeout="0"/> app:show_timeout="0"/>

51
app/src/main/res/layout/inner_fragment_player_controller_layout.xml
View file

@ -51,7 +51,6 @@
android:id="@+id/player_song_cover_view_pager" android:id="@+id/player_song_cover_view_pager"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_marginBottom="12dp"
app:layout_constraintBottom_toTopOf="@id/guideline" app:layout_constraintBottom_toTopOf="@id/guideline"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@ -69,23 +68,25 @@
android:layout_width="26dp" android:layout_width="26dp"
android:layout_height="26dp" android:layout_height="26dp"
android:layout_marginStart="24dp" android:layout_marginStart="24dp"
android:layout_marginTop="8dp"
android:background="?attr/selectableItemBackgroundBorderless" android:background="?attr/selectableItemBackgroundBorderless"
android:scaleType="fitCenter" android:scaleType="fitCenter"
app:layout_constraintBottom_toBottomOf="@+id/player_song_title_label" app:layout_constraintBottom_toBottomOf="@+id/player_song_title_label"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/player_song_title_label" app:layout_constraintTop_toTopOf="@+id/player_song_title_label"
app:srcCompat="@drawable/ic_grade" /> app:srcCompat="@drawable/ic_rating" />
<TextView <TextView
android:id="@+id/player_song_title_label" android:id="@+id/player_song_title_label"
style="@style/TitleTextView" style="@style/TitleTextView"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="12dp"
android:layout_weight="1" android:layout_weight="1"
android:paddingStart="24dp" android:ellipsize="marquee"
android:paddingEnd="24dp" android:marqueeRepeatLimit="marquee_forever"
android:paddingStart="8dp"
android:paddingEnd="8dp"
android:singleLine="true"
android:text="@string/label_placeholder" android:text="@string/label_placeholder"
android:textAlignment="center" android:textAlignment="center"
app:layout_constraintEnd_toStartOf="@+id/button_favorite" app:layout_constraintEnd_toStartOf="@+id/button_favorite"
@ -96,7 +97,6 @@
android:id="@+id/button_favorite" android:id="@+id/button_favorite"
android:layout_width="26dp" android:layout_width="26dp"
android:layout_height="26dp" android:layout_height="26dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="24dp" android:layout_marginEnd="24dp"
android:background="@drawable/button_favorite_selector" android:background="@drawable/button_favorite_selector"
android:checked="false" android:checked="false"
@ -114,8 +114,11 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="12dp" android:layout_marginBottom="12dp"
android:ellipsize="marquee"
android:marqueeRepeatLimit="marquee_forever"
android:paddingStart="24dp" android:paddingStart="24dp"
android:paddingEnd="24dp" android:paddingEnd="24dp"
android:singleLine="true"
android:text="@string/label_placeholder" android:text="@string/label_placeholder"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@ -133,15 +136,16 @@
android:textColor="@color/titleTextColor" android:textColor="@color/titleTextColor"
android:textSize="12sp" android:textSize="12sp"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/exo_progress" /> app:layout_constraintTop_toTopOf="@+id/exo_progress"
app:layout_constraintBottom_toBottomOf="@+id/exo_progress"/>
<androidx.media3.ui.DefaultTimeBar <androidx.media3.ui.DefaultTimeBar
android:id="@id/exo_progress" android:id="@id/exo_progress"
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="20dp" android:layout_marginStart="4dp"
android:layout_marginTop="16dp" android:layout_marginTop="12dp"
android:layout_marginEnd="20dp" android:layout_marginEnd="4dp"
app:bar_height="2dp" app:bar_height="2dp"
app:buffered_color="@color/seekBarBufferedColor" app:buffered_color="@color/seekBarBufferedColor"
app:layout_constraintEnd_toStartOf="@+id/exo_duration" app:layout_constraintEnd_toStartOf="@+id/exo_duration"
@ -164,21 +168,22 @@
android:textColor="@color/titleTextColor" android:textColor="@color/titleTextColor"
android:textSize="12sp" android:textSize="12sp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/exo_progress" /> app:layout_constraintTop_toTopOf="@+id/exo_progress"
app:layout_constraintBottom_toBottomOf="@+id/exo_progress" />
<View <View
android:id="@+id/player_play_pause_placeholder_view" android:id="@+id/player_play_pause_placeholder_view"
android:layout_width="70dp" android:layout_width="70dp"
android:layout_height="70dp" android:layout_height="70dp"
android:layout_marginTop="4dp" android:layout_marginTop="12dp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/exo_duration" /> app:layout_constraintTop_toBottomOf="@+id/exo_progress" />
<ImageButton <ImageButton
android:id="@+id/exo_shuffle" android:id="@+id/exo_shuffle"
android:layout_width="36dp" android:layout_width="32dp"
android:layout_height="36dp" android:layout_height="32dp"
android:layout_marginStart="24dp" android:layout_marginStart="24dp"
android:background="?attr/selectableItemBackgroundBorderless" android:background="?attr/selectableItemBackgroundBorderless"
android:scaleType="fitCenter" android:scaleType="fitCenter"
@ -205,26 +210,26 @@
style="@style/ExoMediaButton.Play" style="@style/ExoMediaButton.Play"
android:layout_width="70dp" android:layout_width="70dp"
android:layout_height="70dp" android:layout_height="70dp"
android:layout_marginTop="4dp" android:layout_marginTop="12dp"
android:background="?attr/selectableItemBackgroundBorderless" android:background="?attr/selectableItemBackgroundBorderless"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:src="@drawable/ic_play_circle" android:src="@drawable/ic_play_circle"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/exo_duration" /> app:layout_constraintTop_toBottomOf="@+id/exo_progress" />
<ImageButton <ImageButton
android:id="@id/exo_pause" android:id="@id/exo_pause"
style="@style/ExoMediaButton.Pause" style="@style/ExoMediaButton.Pause"
android:layout_width="70dp" android:layout_width="70dp"
android:layout_height="70dp" android:layout_height="70dp"
android:layout_marginTop="4dp" android:layout_marginTop="12dp"
android:background="?attr/selectableItemBackgroundBorderless" android:background="?attr/selectableItemBackgroundBorderless"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:src="@drawable/ic_pause_circle" android:src="@drawable/ic_pause_circle"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/exo_duration" /> app:layout_constraintTop_toBottomOf="@+id/exo_progress" />
<ImageButton <ImageButton
android:id="@+id/exo_next" android:id="@+id/exo_next"
@ -240,8 +245,8 @@
<ImageButton <ImageButton
android:id="@+id/exo_repeat_toggle" android:id="@+id/exo_repeat_toggle"
android:layout_width="36dp" android:layout_width="32dp"
android:layout_height="36dp" android:layout_height="32dp"
android:layout_marginEnd="24dp" android:layout_marginEnd="24dp"
android:background="?attr/selectableItemBackgroundBorderless" android:background="?attr/selectableItemBackgroundBorderless"
android:scaleType="fitCenter" android:scaleType="fitCenter"

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

@ -8,7 +8,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:clipToPadding="false" android:clipToPadding="false"
android:orientation="vertical" android:orientation="vertical"
android:paddingTop="4dp" android:paddingTop="8dp"
android:paddingBottom="@dimen/global_padding_bottom" /> android:paddingBottom="@dimen/global_padding_bottom" />
</com.cappielloantonio.play.helper.recyclerview.NestedScrollableHost> </com.cappielloantonio.play.helper.recyclerview.NestedScrollableHost>