Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added missing underline to download label in chat + removed file icon orange while pressed

Browse source
This commit is contained in:
Sylvain Berfini 2021-05-20 16:20:40 +02:00
parent d07ff2ebfd
commit 7d6b72e40f
6 changed files with 8 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/java/org/linphone/activities/main/chat/data/ChatMessageContentData.kt
View file

@ -20,6 +20,10 @@
package org.linphone.activities.main.chat.data package org.linphone.activities.main.chat.data
import android.graphics.Bitmap import android.graphics.Bitmap
import android.text.Spannable
import android.text.SpannableString
import android.text.Spanned
import android.text.style.UnderlineSpan
import androidx.lifecycle.MutableLiveData import androidx.lifecycle.MutableLiveData
import kotlinx.coroutines.* import kotlinx.coroutines.*
import org.linphone.R import org.linphone.R
@ -51,7 +55,7 @@ class ChatMessageContentData(
val downloadEnabled = MutableLiveData<Boolean>() val downloadEnabled = MutableLiveData<Boolean>()
val downloadProgress = MutableLiveData<Int>() val downloadProgress = MutableLiveData<Int>()
val downloadProgressString = MutableLiveData<String>() val downloadProgressString = MutableLiveData<String>()
val downloadLabel = MutableLiveData<String>() val downloadLabel = MutableLiveData<Spannable>()
val isAlone: Boolean val isAlone: Boolean
get() { get() {
@ -99,7 +103,9 @@ class ChatMessageContentData(
content.name content.name
} }
fileSize.value = AppUtils.bytesToDisplayableSize(content.fileSize.toLong()) fileSize.value = AppUtils.bytesToDisplayableSize(content.fileSize.toLong())
downloadLabel.value = "${AppUtils.getString(R.string.chat_message_download_file)} (${fileSize.value})" var spannable = SpannableString("${AppUtils.getString(R.string.chat_message_download_file)} (${fileSize.value})")
spannable.setSpan(UnderlineSpan(), 0, spannable.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
downloadLabel.value = spannable
if (content.isFile || (content.isFileTransfer && chatMessage.isOutgoing)) { if (content.isFile || (content.isFileTransfer && chatMessage.isOutgoing)) {
val path = if (content.isFileEncrypted) content.plainFilePath else content.filePath ?: "" val path = if (content.isFileEncrypted) content.plainFilePath else content.filePath ?: ""

4
app/src/main/res/drawable/file.xml
View file

@ -1,9 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true">
<bitmap android:src="@drawable/file_default"
android:tint="?attr/drawableTintOverColor"/>
</item>
<item android:state_enabled="false"> <item android:state_enabled="false">
<bitmap android:src="@drawable/file_default" <bitmap android:src="@drawable/file_default"
android:tint="?attr/drawableTintDisabledColor"/> android:tint="?attr/drawableTintDisabledColor"/>

4
app/src/main/res/drawable/file_audio.xml
View file

@ -1,9 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true">
<bitmap android:src="@drawable/file_audio_default"
android:tint="?attr/drawableTintOverColor"/>
</item>
<item android:state_enabled="false"> <item android:state_enabled="false">
<bitmap android:src="@drawable/file_audio_default" <bitmap android:src="@drawable/file_audio_default"
android:tint="?attr/drawableTintDisabledColor"/> android:tint="?attr/drawableTintDisabledColor"/>

4
app/src/main/res/drawable/file_pdf.xml
View file

@ -1,9 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true">
<bitmap android:src="@drawable/file_pdf_default"
android:tint="?attr/drawableTintOverColor"/>
</item>
<item android:state_enabled="false"> <item android:state_enabled="false">
<bitmap android:src="@drawable/file_pdf_default" <bitmap android:src="@drawable/file_pdf_default"
android:tint="?attr/drawableTintDisabledColor"/> android:tint="?attr/drawableTintDisabledColor"/>

4
app/src/main/res/drawable/file_picture.xml
View file

@ -1,9 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true">
<bitmap android:src="@drawable/file_picture_default"
android:tint="?attr/drawableTintOverColor"/>
</item>
<item android:state_enabled="false"> <item android:state_enabled="false">
<bitmap android:src="@drawable/file_picture_default" <bitmap android:src="@drawable/file_picture_default"
android:tint="?attr/drawableTintDisabledColor"/> android:tint="?attr/drawableTintDisabledColor"/>

4
app/src/main/res/drawable/file_video.xml
View file

@ -1,9 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true">
<bitmap android:src="@drawable/file_video_default"
android:tint="?attr/drawableTintOverColor"/>
</item>
<item android:state_enabled="false"> <item android:state_enabled="false">
<bitmap android:src="@drawable/file_video_default" <bitmap android:src="@drawable/file_video_default"
android:tint="?attr/drawableTintDisabledColor"/> android:tint="?attr/drawableTintDisabledColor"/>