third-party-mirrors/ultrasonic
1
0
Fork 0
mirror of https://gitlab.com/ultrasonic/ultrasonic.git synced 2025-04-14 16:37:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fixTextOverlap' into 'develop'

Browse Source 
Fix Text overlap in some layouts

See merge request ultrasonic/ultrasonic!854
This commit is contained in:
birdbird 2022-10-28 09:49:34 +00:00
commit af98b19050
6 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/NowPlayingFragment.kt
View File

@ -67,7 +67,7 @@ class NowPlayingFragment : Fragment() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
playButton = view.findViewById(R.id.now_playing_control_play)
nowPlayingAlbumArtImage = view.findViewById(R.id.now_playing_image)
nowPlayingTrack = view.findViewById(R.id.now_playing_trackname)
nowPlayingTrack = view.findViewById(R.id.now_playing_title)
nowPlayingArtist = view.findViewById(R.id.now_playing_artist)
rxBusSubscription = RxBus.playerStateObservable.subscribe { update() }
}

2
ultrasonic/src/main/res/layout/list_layout_track.xml
View File

@ -6,6 +6,6 @@
<include layout="@layout/list_parts_empty_view" />
<include layout="@layout/list_parts_recycler" />
<include layout="@layout/album_buttons" />
<include layout="@layout/track_buttons" />
</LinearLayout>

14
ultrasonic/src/main/res/layout/media_buttons.xml
View File

@ -12,15 +12,16 @@
a:id="@+id/button_shuffle"
style="@style/Widget.Material3.Button.IconButton"
a:layout_width="0dip"
a:layout_height="26dp"
a:layout_height="48dp"
a:layout_gravity="center"
a:layout_weight="1"
a:adjustViewBounds="true"
a:contentDescription="@string/buttons.shuffle"
a:focusable="true"
a:scaleType="fitCenter"
a:contentDescription="@string/buttons.shuffle"
app:icon="@drawable/media_shuffle"
app:iconGravity="textTop" />
app:iconGravity="textTop"
app:iconSize="20dp" />
<org.moire.ultrasonic.view.AutoRepeatButton
a:id="@+id/button_previous"
@ -100,14 +101,15 @@
a:id="@+id/button_repeat"
style="@style/Widget.Material3.Button.IconButton"
a:layout_width="0dip"
a:layout_height="26dp"
a:layout_height="48dp"
a:layout_gravity="center"
a:layout_weight="1"
a:adjustViewBounds="true"
a:contentDescription="@string/buttons.repeat"
a:focusable="true"
a:scaleType="fitCenter"
a:contentDescription="@string/buttons.repeat"
app:icon="@drawable/media_repeat_off"
app:iconGravity="textTop" />
app:iconGravity="textTop"
app:iconSize="20dp" />
</LinearLayout>

8
ultrasonic/src/main/res/layout/now_playing.xml
View File

@ -27,13 +27,15 @@
a:paddingStart="11.0dip">
<TextView
a:id="@+id/now_playing_trackname"
a:id="@+id/now_playing_title"
a:layout_width="wrap_content"
a:layout_height="wrap_content"
a:layout_gravity="start"
a:ellipsize="marquee"
a:singleLine="true"
a:textAppearance="@style/TextAppearance.Material3.TitleMedium" />
a:textAppearance="@style/TextAppearance.Material3.TitleLarge"
a:textSize="20sp"
tools:text="Title" />
<TextView
a:id="@+id/now_playing_artist"
@ -43,6 +45,7 @@
a:ellipsize="end"
a:scrollHorizontally="true"
a:singleLine="true"
tools:text="Artist"
a:textAppearance="@style/TextAppearance.Material3.BodyMedium" />
</LinearLayout>
@ -52,7 +55,6 @@
a:layout_width="48dp"
a:layout_height="48dp"
a:layout_gravity="center|end"
a:layout_marginTop="2dip"
a:layout_marginEnd="16dip"
a:layout_weight="0.0"
a:contentDescription="@string/buttons.play"

26
ultrasonic/src/main/res/layout/player_media_info.xml
View File

@ -25,36 +25,42 @@
<TextView
a:id="@+id/current_playing_artist"
a:layout_width="wrap_content"
a:layout_width="0dp"
a:layout_height="wrap_content"
a:ellipsize="marquee"
a:layout_marginEnd="10dp"
a:ellipsize="end"
a:gravity="left"
a:singleLine="true"
a:textAppearance="@style/TextAppearance.Material3.BodyMedium"
app:layout_constraintEnd_toStartOf="@+id/current_playing_track"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/current_playing_song"
tools:text="Artist" />
<TextView
a:id="@+id/current_playing_album"
a:layout_width="wrap_content"
a:layout_width="0dp"
a:layout_height="wrap_content"
a:ellipsize="start"
a:gravity="right"
a:layout_marginEnd="10dp"
a:ellipsize="end"
a:gravity="start|left"
a:singleLine="true"
a:textAppearance="@style/TextAppearance.Material3.BodyMedium"
app:layout_constraintEnd_toStartOf="@+id/current_total_duration"
app:layout_constraintStart_toStartOf="@+id/current_playing_artist"
app:layout_constraintTop_toBottomOf="@+id/current_playing_artist"
tools:text="Album" />
<TextView
a:id="@+id/current_playing_genre"
a:layout_width="wrap_content"
a:layout_width="0dp"
a:layout_height="wrap_content"
a:ellipsize="start"
a:gravity="right"
a:layout_marginEnd="10dp"
a:ellipsize="end"
a:gravity="left"
a:singleLine="true"
a:textAppearance="@style/TextAppearance.Material3.BodyMedium"
app:layout_constraintEnd_toStartOf="@+id/current_playing_bitrate_format"
app:layout_constraintStart_toStartOf="@+id/current_playing_album"
app:layout_constraintTop_toBottomOf="@+id/current_playing_album"
tools:text="Genre" />
@ -62,14 +68,14 @@
<TextView
a:id="@+id/current_playing_track"
a:layout_width="wrap_content"
a:layout_width="0dp"
a:layout_height="wrap_content"
a:ellipsize="start"
a:gravity="right"
a:text="0 / 0"
a:textAppearance="@style/TextAppearance.Material3.BodyMedium"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/current_playing_song"
app:layout_constraintTop_toTopOf="@id/current_playing_artist"
tools:ignore="HardcodedText" />
<TextView

0
ultrasonic/src/main/res/layout/album_buttons.xml → ultrasonic/src/main/res/layout/track_buttons.xml
View File