nick/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

rename method to reflect new functionality

Browse Source
This commit is contained in:
davotoula
2026-01-20 22:42:48 +01:00
parent ac4a1de0cd
commit 80c946be44
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
amethyst/src/main/java/com/vitorpamplona/amethyst/service/playback/composable/controls/RenderControlButtons.kt
+3 -3
View File
@@ -30,7 +30,7 @@ import com.vitorpamplona.amethyst.service.playback.composable.MediaControllerSta
import com.vitorpamplona.amethyst.service.playback.composable.mediaitem.MediaItemData import com.vitorpamplona.amethyst.service.playback.composable.mediaitem.MediaItemData
import com.vitorpamplona.amethyst.service.playback.diskCache.isLiveStreaming import com.vitorpamplona.amethyst.service.playback.diskCache.isLiveStreaming
import com.vitorpamplona.amethyst.service.playback.pip.PipVideoActivity import com.vitorpamplona.amethyst.service.playback.pip.PipVideoActivity
import com.vitorpamplona.amethyst.ui.components.ShareImageAction import com.vitorpamplona.amethyst.ui.components.ShareMediaAction
import com.vitorpamplona.amethyst.ui.components.getActivity import com.vitorpamplona.amethyst.ui.components.getActivity
import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
import com.vitorpamplona.amethyst.ui.theme.Size110dp import com.vitorpamplona.amethyst.ui.theme.Size110dp
@@ -71,11 +71,11 @@ fun RenderControlButtons(
} }
AnimatedShareButton(controllerVisible, buttonPositionModifier.padding(end = Size165dp)) { popupExpanded, toggle -> AnimatedShareButton(controllerVisible, buttonPositionModifier.padding(end = Size165dp)) { popupExpanded, toggle ->
ShareImageAction(accountViewModel = accountViewModel, popupExpanded, mediaData.videoUri, mediaData.callbackUri, null, null, null, mediaData.mimeType, toggle) ShareMediaAction(accountViewModel = accountViewModel, popupExpanded, mediaData.videoUri, mediaData.callbackUri, null, null, null, mediaData.mimeType, toggle)
} }
} else { } else {
AnimatedShareButton(controllerVisible, buttonPositionModifier.padding(end = Size110dp)) { popupExpanded, toggle -> AnimatedShareButton(controllerVisible, buttonPositionModifier.padding(end = Size110dp)) { popupExpanded, toggle ->
ShareImageAction(accountViewModel = accountViewModel, popupExpanded, mediaData.videoUri, mediaData.callbackUri, null, null, null, mediaData.mimeType, toggle) ShareMediaAction(accountViewModel = accountViewModel, popupExpanded, mediaData.videoUri, mediaData.callbackUri, null, null, null, mediaData.mimeType, toggle)
} }
} }
} }
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/ZoomableContentDialog.kt
+1 -1
View File
@@ -234,7 +234,7 @@ private fun DialogContent(
contentDescription = stringRes(R.string.quick_action_share), contentDescription = stringRes(R.string.quick_action_share),
) )
ShareImageAction(accountViewModel = accountViewModel, popupExpanded = popupExpanded, myContent, onDismiss = { popupExpanded.value = false }) ShareMediaAction(accountViewModel = accountViewModel, popupExpanded = popupExpanded, myContent, onDismiss = { popupExpanded.value = false })
} }
if (myContent !is MediaUrlContent || !isLiveStreaming(myContent.url)) { if (myContent !is MediaUrlContent || !isLiveStreaming(myContent.url)) {
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/ZoomableContentView.kt
+4 -4
View File
@@ -684,14 +684,14 @@ fun DisplayBlurHash(
} }
@Composable @Composable
fun ShareImageAction( fun ShareMediaAction(
accountViewModel: AccountViewModel, accountViewModel: AccountViewModel,
popupExpanded: MutableState<Boolean>, popupExpanded: MutableState<Boolean>,
content: BaseMediaContent, content: BaseMediaContent,
onDismiss: () -> Unit, onDismiss: () -> Unit,
) { ) {
if (content is MediaUrlContent) { if (content is MediaUrlContent) {
ShareImageAction( ShareMediaAction(
accountViewModel = accountViewModel, accountViewModel = accountViewModel,
popupExpanded = popupExpanded, popupExpanded = popupExpanded,
videoUri = content.url, videoUri = content.url,
@@ -704,7 +704,7 @@ fun ShareImageAction(
content = content, content = content,
) )
} else if (content is MediaPreloadedContent) { } else if (content is MediaPreloadedContent) {
ShareImageAction( ShareMediaAction(
accountViewModel = accountViewModel, accountViewModel = accountViewModel,
popupExpanded = popupExpanded, popupExpanded = popupExpanded,
videoUri = content.localFile?.toUri().toString(), videoUri = content.localFile?.toUri().toString(),
@@ -721,7 +721,7 @@ fun ShareImageAction(
@OptIn(ExperimentalPermissionsApi::class) @OptIn(ExperimentalPermissionsApi::class)
@Composable @Composable
fun ShareImageAction( fun ShareMediaAction(
accountViewModel: AccountViewModel, accountViewModel: AccountViewModel,
popupExpanded: MutableState<Boolean>, popupExpanded: MutableState<Boolean>,
videoUri: String?, videoUri: String?,