mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-27 03:49:04 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix issue with play / pause button alignment

Browse source
This commit is contained in:
Benoit Marty 2021-07-09 18:05:41 +02:00
parent 7a1c6b78d4
commit 9dea519d0c
8 changed files with 31 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
vector/src/main/java/im/vector/app/features/home/room/detail/composer/VoiceMessageRecorderView.kt
View file

@ -359,12 +359,12 @@ class VoiceMessageRecorderView @JvmOverloads constructor(
this.amplitudeList = state.amplitudeList
}
is VoiceMessagePlaybackTracker.Listener.State.Playing -> {
views.voicePlaybackControlButton.setImageResource(R.drawable.ic_voice_pause)
views.voicePlaybackControlButton.setImageResource(R.drawable.ic_play_pause_pause)
val formattedTimerText = DateUtils.formatElapsedTime((state.playbackTime / 1000).toLong())
views.voicePlaybackTime.setText(formattedTimerText)
}
is VoiceMessagePlaybackTracker.Listener.State.Idle -> {
views.voicePlaybackControlButton.setImageResource(R.drawable.ic_voice_play)
views.voicePlaybackControlButton.setImageResource(R.drawable.ic_play_pause_play)
}
}
}

4
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceItem.kt
View file

@ -92,7 +92,7 @@ abstract class MessageVoiceItem : AbsMessageItem<MessageVoiceItem.Holder>() {
}
private fun handleIdleState(holder: Holder, state: VoiceMessagePlaybackTracker.Listener.State.Idle) {
holder.voicePlaybackControlButton.setImageResource(R.drawable.ic_voice_play)
holder.voicePlaybackControlButton.setImageResource(R.drawable.ic_play_pause_play)
if (state.playbackTime > 0) {
holder.voicePlaybackTime.text = formatPlaybackTime(state.playbackTime)
} else {
@ -101,7 +101,7 @@ abstract class MessageVoiceItem : AbsMessageItem<MessageVoiceItem.Holder>() {
}
private fun handlePlayingState(holder: Holder, state: VoiceMessagePlaybackTracker.Listener.State.Playing) {
holder.voicePlaybackControlButton.setImageResource(R.drawable.ic_voice_pause)
holder.voicePlaybackControlButton.setImageResource(R.drawable.ic_play_pause_pause)
if (state.playbackTime > 0) {
holder.voicePlaybackTime.text = formatPlaybackTime(state.playbackTime)
} else {

12
vector/src/main/res/drawable/ic_play_pause_pause.xml Normal file
View file

@ -0,0 +1,12 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="16dp"
android:height="16dp"
android:viewportWidth="16"
android:viewportHeight="16">
<path
android:fillColor="#F00"
android:pathData="M3,3C3,2.4477 3.4477,2 4,2H5C5.5523,2 6,2.4477 6,3V13C6,13.5523 5.5523,14 5,14H4C3.4477,14 3,13.5523 3,13V3Z" />
<path
android:fillColor="#F00"
android:pathData="M10,3C10,2.4477 10.4477,2 11,2H12C12.5523,2 13,2.4477 13,3V13C13,13.5523 12.5523,14 12,14H11C10.4477,14 10,13.5523 10,13V3Z" />
</vector>

9
vector/src/main/res/drawable/ic_play_pause_play.xml Normal file
View file

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="16dp"
android:height="16dp"
android:viewportWidth="16"
android:viewportHeight="16">
<path
android:fillColor="#F00"
android:pathData="M3,14.2104V1.7896C3,1.0072 3.8578,0.5279 4.5241,0.9379L14.6161,7.1483C15.2506,7.5388 15.2506,8.4612 14.6161,8.8517L4.5241,15.0621C3.8578,15.4721 3,14.9928 3,14.2104Z" />
</vector>

12
vector/src/main/res/drawable/ic_voice_pause.xml
View file

@ -1,12 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="10dp"
android:height="12dp"
android:viewportWidth="10"
android:viewportHeight="12">
<path
android:pathData="M1,0L2,0A1,1 0,0 1,3 1L3,11A1,1 0,0 1,2 12L1,12A1,1 0,0 1,0 11L0,1A1,1 0,0 1,1 0z"
android:fillColor="#737D8C"/>
<path
android:pathData="M8,0L9,0A1,1 0,0 1,10 1L10,11A1,1 0,0 1,9 12L8,12A1,1 0,0 1,7 11L7,1A1,1 0,0 1,8 0z"
android:fillColor="#737D8C"/>
</vector>

9
vector/src/main/res/drawable/ic_voice_play.xml
View file

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="13dp"
android:height="16dp"
android:viewportWidth="13"
android:viewportHeight="16">
<path
android:pathData="M0,14.2104V1.7896C0,1.0072 0.8578,0.5279 1.5241,0.9379L11.6161,7.1483C12.2506,7.5388 12.2506,8.4612 11.6161,8.8517L1.5241,15.0621C0.8578,15.4721 0,14.9928 0,14.2104Z"
android:fillColor="#737D8C"/>
</vector>

7
vector/src/main/res/layout/item_timeline_event_voice_stub.xml
View file

@ -27,12 +27,11 @@
android:layout_height="32dp"
android:background="@drawable/bg_voice_play_pause_button"
android:backgroundTint="?vctr_voice_message_play_pause_button_background"
android:paddingStart="3dp"
android:paddingEnd="0dp"
android:src="@drawable/ic_voice_play"
android:src="@drawable/ic_play_pause_play"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
app:tint="?vctr_content_secondary" />
<TextView
android:id="@+id/voicePlaybackTime"

7
vector/src/main/res/layout/view_voice_message_recorder.xml
View file

@ -174,13 +174,12 @@
android:background="@drawable/bg_voice_play_pause_button"
android:backgroundTint="?vctr_voice_message_play_pause_button_background"
android:contentDescription="@string/a11y_play_voice_message"
android:paddingStart="3dp"
android:paddingEnd="0dp"
android:src="@drawable/ic_voice_play"
android:src="@drawable/ic_play_pause_play"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
app:tint="?vctr_content_secondary" />
<TextView
android:id="@+id/voicePlaybackTime"