mirror of
https://github.com/nextcloud/talk-android
synced 2025-07-09 05:50:15 +01:00
Merge pull request #4972 from nextcloud/issue-4941-support-heic
Allows .HEIC files to be opened in app
This commit is contained in:
commit
2585439ddc
@ -462,7 +462,8 @@ class ConversationInfoActivity :
|
||||
binding.notificationSettingsView.importantConversationSwitch,
|
||||
binding.guestAccessView.allowGuestsSwitch,
|
||||
binding.guestAccessView.passwordProtectionSwitch,
|
||||
binding.recordingConsentView.recordingConsentForConversationSwitch
|
||||
binding.recordingConsentView.recordingConsentForConversationSwitch,
|
||||
binding.lockConversationSwitch
|
||||
).forEach(viewThemeUtils.talk::colorSwitch)
|
||||
}
|
||||
}
|
||||
|
@ -36,6 +36,7 @@ import com.nextcloud.talk.utils.Mimetype.AUDIO_MPEG
|
||||
import com.nextcloud.talk.utils.Mimetype.AUDIO_OGG
|
||||
import com.nextcloud.talk.utils.Mimetype.AUDIO_WAV
|
||||
import com.nextcloud.talk.utils.Mimetype.IMAGE_GIF
|
||||
import com.nextcloud.talk.utils.Mimetype.IMAGE_HEIC
|
||||
import com.nextcloud.talk.utils.Mimetype.IMAGE_JPEG
|
||||
import com.nextcloud.talk.utils.Mimetype.IMAGE_PNG
|
||||
import com.nextcloud.talk.utils.Mimetype.TEXT_MARKDOWN
|
||||
@ -155,7 +156,8 @@ class FileViewerUtils(private val context: Context, private val user: User) {
|
||||
-> openMediaView(filename, mimetype)
|
||||
IMAGE_PNG,
|
||||
IMAGE_JPEG,
|
||||
IMAGE_GIF
|
||||
IMAGE_GIF,
|
||||
IMAGE_HEIC
|
||||
-> openImageView(filename, mimetype)
|
||||
TEXT_MARKDOWN,
|
||||
TEXT_PLAIN
|
||||
@ -248,6 +250,7 @@ class FileViewerUtils(private val context: Context, private val user: User) {
|
||||
return when (mimetype) {
|
||||
IMAGE_PNG,
|
||||
IMAGE_JPEG,
|
||||
IMAGE_HEIC,
|
||||
IMAGE_GIF,
|
||||
AUDIO_MPEG,
|
||||
AUDIO_WAV,
|
||||
|
@ -22,6 +22,7 @@ object Mimetype {
|
||||
const val IMAGE_JPEG = "image/jpeg"
|
||||
const val IMAGE_JPG = "image/jpg"
|
||||
const val IMAGE_GIF = "image/gif"
|
||||
const val IMAGE_HEIC = "image/heic"
|
||||
|
||||
const val VIDEO_MP4 = "video/mp4"
|
||||
const val VIDEO_QUICKTIME = "video/quicktime"
|
||||
|
Loading…
Reference in New Issue
Block a user