mirror of
https://github.com/vitorpamplona/amethyst.git
synced 2025-09-19 23:50:30 +02:00
Merge branch 'main' of https://github.com/vitorpamplona/amethyst
This commit is contained in:
@@ -22,6 +22,8 @@ package com.vitorpamplona.amethyst.ui.components
|
|||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
|
import android.util.Log
|
||||||
|
import android.widget.Toast
|
||||||
import androidx.compose.animation.AnimatedVisibility
|
import androidx.compose.animation.AnimatedVisibility
|
||||||
import androidx.compose.animation.AnimatedVisibilityScope
|
import androidx.compose.animation.AnimatedVisibilityScope
|
||||||
import androidx.compose.animation.fadeIn
|
import androidx.compose.animation.fadeIn
|
||||||
@@ -786,6 +788,7 @@ private suspend fun shareImageFile(
|
|||||||
videoUri: String,
|
videoUri: String,
|
||||||
mimeType: String?,
|
mimeType: String?,
|
||||||
) {
|
) {
|
||||||
|
try {
|
||||||
// Get sharable URI and file extension
|
// Get sharable URI and file extension
|
||||||
val (uri, fileExtension) = ShareHelper.getSharableUriFromUrl(context, videoUri)
|
val (uri, fileExtension) = ShareHelper.getSharableUriFromUrl(context, videoUri)
|
||||||
|
|
||||||
@@ -801,6 +804,10 @@ private suspend fun shareImageFile(
|
|||||||
}
|
}
|
||||||
|
|
||||||
context.startActivity(Intent.createChooser(shareIntent, null))
|
context.startActivity(Intent.createChooser(shareIntent, null))
|
||||||
|
} catch (e: Exception) {
|
||||||
|
Log.w("ZoomableContentView", "Failed to share image: $videoUri", e)
|
||||||
|
Toast.makeText(context, context.getString(R.string.unable_to_share_image), Toast.LENGTH_SHORT).show()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun verifyHash(content: MediaUrlContent): Boolean? {
|
private fun verifyHash(content: MediaUrlContent): Boolean? {
|
||||||
|
@@ -437,6 +437,7 @@
|
|||||||
<string name="no">Nie</string>
|
<string name="no">Nie</string>
|
||||||
<string name="follow_list_selection">Lista obserwowanych</string>
|
<string name="follow_list_selection">Lista obserwowanych</string>
|
||||||
<string name="follow_list_kind3follows">Obserwowane</string>
|
<string name="follow_list_kind3follows">Obserwowane</string>
|
||||||
|
<string name="follow_list_kind3follows_users_only">Wszyscy obserwujący</string>
|
||||||
<string name="follow_list_kind3follows_proxy">Obserwuje przez proxy</string>
|
<string name="follow_list_kind3follows_proxy">Obserwuje przez proxy</string>
|
||||||
<string name="follow_list_aroundme">W pobliżu</string>
|
<string name="follow_list_aroundme">W pobliżu</string>
|
||||||
<string name="follow_list_global">Wszystkie</string>
|
<string name="follow_list_global">Wszystkie</string>
|
||||||
|
@@ -440,6 +440,7 @@
|
|||||||
<string name="no">否</string>
|
<string name="no">否</string>
|
||||||
<string name="follow_list_selection">关注列表</string>
|
<string name="follow_list_selection">关注列表</string>
|
||||||
<string name="follow_list_kind3follows">所有关注</string>
|
<string name="follow_list_kind3follows">所有关注</string>
|
||||||
|
<string name="follow_list_kind3follows_users_only">所有用户关注</string>
|
||||||
<string name="follow_list_kind3follows_proxy">通过代理关注</string>
|
<string name="follow_list_kind3follows_proxy">通过代理关注</string>
|
||||||
<string name="follow_list_aroundme">周围的人</string>
|
<string name="follow_list_aroundme">周围的人</string>
|
||||||
<string name="follow_list_global">全球</string>
|
<string name="follow_list_global">全球</string>
|
||||||
|
@@ -1239,6 +1239,7 @@
|
|||||||
<string name="group_relay">Chat Relay</string>
|
<string name="group_relay">Chat Relay</string>
|
||||||
<string name="group_relay_explanation">The relay that all users of this chat connect to</string>
|
<string name="group_relay_explanation">The relay that all users of this chat connect to</string>
|
||||||
<string name="share_image">Share image…</string>
|
<string name="share_image">Share image…</string>
|
||||||
|
<string name="unable_to_share_image">Unable to share image, please try again later…</string>
|
||||||
|
|
||||||
<string name="search_by_hashtag">Search hashtag: #%1$s</string>
|
<string name="search_by_hashtag">Search hashtag: #%1$s</string>
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user