From cc32ec2e33cb813303caa4adcb8ff487da6b6bc0 Mon Sep 17 00:00:00 2001 From: Diego Beraldin Date: Wed, 22 Nov 2023 19:12:31 +0100 Subject: [PATCH] fix: bug reports RC9 (#154) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: remove trailing … from messages * chore: move quote action at first position in text toolbar * fix(posts): share original URL * chore: show timestamp in raw content dialog --- .../core/commonui/CustomTextToolbar.kt | 17 +++++++--- .../communitydetail/CommunityDetailScreen.kt | 2 ++ .../CommunityDetailViewModel.kt | 3 +- .../createcomment/CreateCommentScreen.kt | 2 ++ .../commonui/createpost/CreatePostScreen.kt | 3 +- .../core/commonui/modals/RawContentDialog.kt | 31 +++++++++++++++++++ .../commonui/postdetail/PostDetailScreen.kt | 2 ++ .../postdetail/PostDetailViewModel.kt | 3 +- .../commonui/saveditems/SavedItemsScreen.kt | 2 ++ .../saveditems/SavedItemsViewModel.kt | 3 +- .../commonui/userdetail/UserDetailScreen.kt | 2 ++ .../userdetail/UserDetailViewModel.kt | 3 +- .../domain/lemmy/data/PostModel.kt | 10 +----- .../domain/lemmy/repository/utils/Mappings.kt | 3 ++ .../feature/home/postlist/PostListScreen.kt | 1 + .../home/postlist/PostListViewModel.kt | 3 +- .../profile/logged/ProfileLoggedScreen.kt | 2 ++ .../profile/logged/ProfileLoggedViewModel.kt | 3 +- .../detail/MultiCommunityViewModel.kt | 3 +- .../commonMain/resources/MR/base/strings.xml | 16 +++++----- .../commonMain/resources/MR/bg/strings.xml | 8 ++--- .../commonMain/resources/MR/cs/strings.xml | 8 ++--- .../commonMain/resources/MR/da/strings.xml | 6 ++-- .../commonMain/resources/MR/de/strings.xml | 14 ++++----- .../commonMain/resources/MR/el/strings.xml | 16 +++++----- .../commonMain/resources/MR/es/strings.xml | 16 +++++----- .../commonMain/resources/MR/et/strings.xml | 12 +++---- .../commonMain/resources/MR/fi/strings.xml | 12 +++---- .../commonMain/resources/MR/fr/strings.xml | 14 ++++----- .../commonMain/resources/MR/ga/strings.xml | 12 +++---- .../commonMain/resources/MR/hr/strings.xml | 8 ++--- .../commonMain/resources/MR/hu/strings.xml | 6 ++-- .../commonMain/resources/MR/it/strings.xml | 16 +++++----- .../commonMain/resources/MR/lt/strings.xml | 8 ++--- .../commonMain/resources/MR/lv/strings.xml | 8 ++--- .../commonMain/resources/MR/nl/strings.xml | 16 +++++----- .../commonMain/resources/MR/no/strings.xml | 4 +-- .../commonMain/resources/MR/pl/strings.xml | 14 ++++----- .../commonMain/resources/MR/pt/strings.xml | 12 +++---- .../commonMain/resources/MR/ro/strings.xml | 16 +++++----- .../commonMain/resources/MR/se/strings.xml | 6 ++-- .../commonMain/resources/MR/sk/strings.xml | 8 ++--- .../commonMain/resources/MR/sl/strings.xml | 8 ++--- 43 files changed, 201 insertions(+), 161 deletions(-) diff --git a/core-commonui/src/androidMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/CustomTextToolbar.kt b/core-commonui/src/androidMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/CustomTextToolbar.kt index 7d444fd41..6ec133fa3 100644 --- a/core-commonui/src/androidMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/CustomTextToolbar.kt +++ b/core-commonui/src/androidMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/CustomTextToolbar.kt @@ -12,6 +12,7 @@ import com.github.diegoberaldin.raccoonforlemmy.resources.MR private const val ACTION_ID_COPY = 0 private const val ACTION_ID_SEARCH = 1 private const val ACTION_ID_QUOTE = 2 +private const val GROUP_ID = 0 class CustomTextToolbar( private val view: View, @@ -71,15 +72,23 @@ internal class CustomTextActionModeCallback( override fun onCreateActionMode(mode: ActionMode?, menu: Menu?): Boolean { menu?.apply { - val groupId = 0 add( - groupId, ACTION_ID_COPY, 0, android.R.string.copy + GROUP_ID, + ACTION_ID_QUOTE, + 0, // position + MR.strings.action_quote.resourceId ).setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM) add( - groupId, ACTION_ID_SEARCH, 1, MR.strings.post_action_share.resourceId + GROUP_ID, + ACTION_ID_COPY, + 1, // position + android.R.string.copy ).setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM) add( - groupId, ACTION_ID_QUOTE, 2, MR.strings.action_quote.resourceId + GROUP_ID, + ACTION_ID_SEARCH, + 2, // position + MR.strings.post_action_share.resourceId ).setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM) } return true diff --git a/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/communitydetail/CommunityDetailScreen.kt b/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/communitydetail/CommunityDetailScreen.kt index d715916e7..9f5351db7 100644 --- a/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/communitydetail/CommunityDetailScreen.kt +++ b/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/communitydetail/CommunityDetailScreen.kt @@ -754,6 +754,7 @@ class CommunityDetailScreen( is PostModel -> { RawContentDialog( title = content.title, + date = content.publishDate, url = content.url, text = content.text, onDismiss = { @@ -780,6 +781,7 @@ class CommunityDetailScreen( is CommentModel -> { RawContentDialog( text = content.text, + date = content.publishDate, onDismiss = { rawContent = null }, diff --git a/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/communitydetail/CommunityDetailViewModel.kt b/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/communitydetail/CommunityDetailViewModel.kt index 4c3a00e0d..bb6192186 100644 --- a/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/communitydetail/CommunityDetailViewModel.kt +++ b/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/communitydetail/CommunityDetailViewModel.kt @@ -15,7 +15,6 @@ import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.CommunityModel import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.PostModel import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.SortType import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.imageUrl -import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.shareUrl import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.toSortType import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.repository.CommunityRepository import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.repository.PostRepository @@ -525,7 +524,7 @@ class CommunityDetailViewModel( } private fun share(post: PostModel) { - val url = post.shareUrl + val url = post.originalUrl.orEmpty() if (url.isNotEmpty()) { shareHelper.share(url, "text/plain") } diff --git a/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/createcomment/CreateCommentScreen.kt b/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/createcomment/CreateCommentScreen.kt index 1c9a1d841..c1b9e3613 100644 --- a/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/createcomment/CreateCommentScreen.kt +++ b/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/createcomment/CreateCommentScreen.kt @@ -368,6 +368,7 @@ class CreateCommentScreen( is PostModel -> { RawContentDialog( title = content.title, + date = content.publishDate, url = content.url, text = content.text, onDismiss = { @@ -379,6 +380,7 @@ class CreateCommentScreen( is CommentModel -> { RawContentDialog( text = content.text, + date = content.publishDate, onDismiss = { rawContent = null }, diff --git a/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/createpost/CreatePostScreen.kt b/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/createpost/CreatePostScreen.kt index 2ce468579..918bf3bf2 100644 --- a/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/createpost/CreatePostScreen.kt +++ b/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/createpost/CreatePostScreen.kt @@ -72,7 +72,6 @@ import com.github.diegoberaldin.raccoonforlemmy.core.utils.compose.rememberCallb import com.github.diegoberaldin.raccoonforlemmy.core.utils.gallery.getGalleryHelper import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.CommunityModel import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.PostModel -import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.shareUrl import com.github.diegoberaldin.raccoonforlemmy.resources.MR import dev.icerock.moko.resources.compose.localized import dev.icerock.moko.resources.compose.stringResource @@ -102,7 +101,7 @@ class CreatePostScreen( crossPost != null -> buildString { append(crossPostText) append(" ") - append(crossPost.shareUrl) + append(crossPost.originalUrl) } editedPost != null -> { diff --git a/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/RawContentDialog.kt b/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/RawContentDialog.kt index 4b2064351..7a02bb292 100644 --- a/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/RawContentDialog.kt +++ b/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/RawContentDialog.kt @@ -3,16 +3,21 @@ package com.github.diegoberaldin.raccoonforlemmy.core.commonui.modals import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.text.selection.SelectionContainer +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Schedule import androidx.compose.material3.AlertDialog import androidx.compose.material3.Button import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -24,6 +29,7 @@ import androidx.compose.ui.platform.LocalClipboardManager import androidx.compose.ui.platform.LocalTextToolbar import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.unit.dp +import com.github.diegoberaldin.raccoonforlemmy.core.appearance.theme.IconSize import com.github.diegoberaldin.raccoonforlemmy.core.appearance.theme.Spacing import com.github.diegoberaldin.raccoonforlemmy.core.commonui.di.getCustomTextToolbar import com.github.diegoberaldin.raccoonforlemmy.core.utils.compose.rememberCallback @@ -35,6 +41,7 @@ import dev.icerock.moko.resources.compose.stringResource @OptIn(ExperimentalMaterial3Api::class) @Composable fun RawContentDialog( + date: String? = null, title: String? = null, url: String? = null, text: String? = null, @@ -161,6 +168,30 @@ fun RawContentDialog( } } } + + date?.takeIf { it.trim().isNotEmpty() }?.also { + item { + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(Spacing.xxs), + ) { + Icon( + modifier = Modifier.size(IconSize.m).padding(4.5.dp), + imageVector = Icons.Default.Schedule, + contentDescription = null, + tint = MaterialTheme.colorScheme.onBackground, + ) + Text( + modifier = Modifier.weight(1f), + text = it, + style = MaterialTheme.typography.bodyMedium.copy( + fontFamily = FontFamily.Monospace, + ), + color = MaterialTheme.colorScheme.onBackground, + ) + } + } + } } Button( onClick = { diff --git a/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/postdetail/PostDetailScreen.kt b/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/postdetail/PostDetailScreen.kt index 808f12ad5..293549c81 100644 --- a/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/postdetail/PostDetailScreen.kt +++ b/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/postdetail/PostDetailScreen.kt @@ -953,6 +953,7 @@ class PostDetailScreen( is PostModel -> { RawContentDialog( title = content.title, + date = content.publishDate, url = content.url, text = content.text, onDismiss = { @@ -979,6 +980,7 @@ class PostDetailScreen( is CommentModel -> { RawContentDialog( text = content.text, + date = content.publishDate, onDismiss = { rawContent = null }, diff --git a/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/postdetail/PostDetailViewModel.kt b/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/postdetail/PostDetailViewModel.kt index e960afa59..da19e7fc0 100644 --- a/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/postdetail/PostDetailViewModel.kt +++ b/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/postdetail/PostDetailViewModel.kt @@ -12,7 +12,6 @@ import com.github.diegoberaldin.raccoonforlemmy.domain.identity.repository.Ident import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.CommentModel import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.PostModel import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.SortType -import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.shareUrl import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.toSortType import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.repository.CommentRepository import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.repository.PostRepository @@ -622,7 +621,7 @@ class PostDetailViewModel( } private fun share(post: PostModel) { - val url = post.shareUrl + val url = post.originalUrl.orEmpty() if (url.isNotEmpty()) { shareHelper.share(url, "text/plain") } diff --git a/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/saveditems/SavedItemsScreen.kt b/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/saveditems/SavedItemsScreen.kt index b694ba036..e611deb6b 100644 --- a/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/saveditems/SavedItemsScreen.kt +++ b/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/saveditems/SavedItemsScreen.kt @@ -494,6 +494,7 @@ class SavedItemsScreen : Screen { is PostModel -> { RawContentDialog( title = content.title, + date = content.publishDate, url = content.url, text = content.text, onDismiss = { @@ -520,6 +521,7 @@ class SavedItemsScreen : Screen { is CommentModel -> { RawContentDialog( text = content.text, + date = content.publishDate, onDismiss = { rawContent = null }, diff --git a/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/saveditems/SavedItemsViewModel.kt b/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/saveditems/SavedItemsViewModel.kt index ce085fe2c..071f6eae7 100644 --- a/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/saveditems/SavedItemsViewModel.kt +++ b/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/saveditems/SavedItemsViewModel.kt @@ -12,7 +12,6 @@ import com.github.diegoberaldin.raccoonforlemmy.domain.identity.repository.Ident import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.CommentModel import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.PostModel import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.SortType -import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.shareUrl import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.repository.CommentRepository import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.repository.PostRepository import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.repository.SiteRepository @@ -515,7 +514,7 @@ class SavedItemsViewModel( } private fun share(post: PostModel) { - val url = post.shareUrl + val url = post.originalUrl.orEmpty() if (url.isNotEmpty()) { shareHelper.share(url, "text/plain") } diff --git a/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/userdetail/UserDetailScreen.kt b/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/userdetail/UserDetailScreen.kt index 1a8c2a11d..003946a80 100644 --- a/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/userdetail/UserDetailScreen.kt +++ b/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/userdetail/UserDetailScreen.kt @@ -846,6 +846,7 @@ class UserDetailScreen( is PostModel -> { RawContentDialog( title = content.title, + date = content.publishDate, url = content.url, text = content.text, onDismiss = { @@ -872,6 +873,7 @@ class UserDetailScreen( is CommentModel -> { RawContentDialog( text = content.text, + date = content.publishDate, onDismiss = { rawContent = null }, diff --git a/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/userdetail/UserDetailViewModel.kt b/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/userdetail/UserDetailViewModel.kt index 966281da6..9f5ae6ea5 100644 --- a/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/userdetail/UserDetailViewModel.kt +++ b/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/userdetail/UserDetailViewModel.kt @@ -15,7 +15,6 @@ import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.PostModel import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.SortType import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.UserModel import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.imageUrl -import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.shareUrl import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.toSortType import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.repository.CommentRepository import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.repository.PostRepository @@ -584,7 +583,7 @@ class UserDetailViewModel( } private fun share(post: PostModel) { - val url = post.shareUrl + val url = post.originalUrl.orEmpty() if (url.isNotEmpty()) { shareHelper.share(url, "text/plain") } diff --git a/domain-lemmy/data/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/domain/lemmy/data/PostModel.kt b/domain-lemmy/data/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/domain/lemmy/data/PostModel.kt index 2dc0db81b..daf9bb55a 100644 --- a/domain-lemmy/data/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/domain/lemmy/data/PostModel.kt +++ b/domain-lemmy/data/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/domain/lemmy/data/PostModel.kt @@ -5,6 +5,7 @@ import com.github.diegoberaldin.raccoonforlemmy.core.utils.looksLikeAnImage data class PostModel( val id: Int = 0, + val originalUrl: String? = null, val title: String = "", val text: String = "", val score: Int = 0, @@ -25,15 +26,6 @@ data class PostModel( val crossPosts: List = emptyList(), ) : JavaSerializable - -val PostModel.shareUrl: String - get() = buildString { - append("https://") - append(community?.host) - append("/post/") - append(id) - } - val PostModel.imageUrl: String get() = url?.takeIf { it.looksLikeAnImage }?.takeIf { it.isNotEmpty() } ?: run { thumbnailUrl diff --git a/domain-lemmy/repository/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/domain/lemmy/repository/utils/Mappings.kt b/domain-lemmy/repository/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/domain/lemmy/repository/utils/Mappings.kt index b64a8fbd0..a99b8fc96 100644 --- a/domain-lemmy/repository/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/domain/lemmy/repository/utils/Mappings.kt +++ b/domain-lemmy/repository/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/domain/lemmy/repository/utils/Mappings.kt @@ -99,6 +99,7 @@ internal fun PersonAggregates.toModel() = UserScoreModel( internal fun PostView.toModel() = PostModel( id = post.id, + originalUrl = post.apId, title = post.name, text = post.body.orEmpty(), score = counts.score, @@ -163,6 +164,7 @@ internal fun PersonMentionView.toModel() = PersonMentionModel( id = personMention.id, post = PostModel( id = post.id, + originalUrl = post.apId, title = post.name, text = post.body.orEmpty(), score = counts.score, @@ -201,6 +203,7 @@ internal fun CommentReplyView.toModel() = PersonMentionModel( id = commentReply.id, post = PostModel( id = post.id, + originalUrl = post.apId, title = post.name, text = post.body.orEmpty(), score = counts.score, diff --git a/feature-home/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/home/postlist/PostListScreen.kt b/feature-home/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/home/postlist/PostListScreen.kt index d6bbe3424..f63a83408 100644 --- a/feature-home/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/home/postlist/PostListScreen.kt +++ b/feature-home/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/home/postlist/PostListScreen.kt @@ -568,6 +568,7 @@ class PostListScreen : Screen { is PostModel -> { RawContentDialog( title = content.title, + date = content.publishDate, url = content.url, text = content.text, onDismiss = { diff --git a/feature-home/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/home/postlist/PostListViewModel.kt b/feature-home/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/home/postlist/PostListViewModel.kt index 4134ae029..d6e249b12 100644 --- a/feature-home/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/home/postlist/PostListViewModel.kt +++ b/feature-home/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/home/postlist/PostListViewModel.kt @@ -17,7 +17,6 @@ import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.ListingType import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.PostModel import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.SortType import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.imageUrl -import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.shareUrl import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.toListingType import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.toSortType import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.repository.PostRepository @@ -511,7 +510,7 @@ class PostListViewModel( } private fun share(post: PostModel) { - val url = post.shareUrl + val url = post.originalUrl.orEmpty() if (url.isNotEmpty()) { shareHelper.share(url, "text/plain") } diff --git a/feature-profile/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/profile/logged/ProfileLoggedScreen.kt b/feature-profile/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/profile/logged/ProfileLoggedScreen.kt index 50810b986..6dec3ce22 100644 --- a/feature-profile/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/profile/logged/ProfileLoggedScreen.kt +++ b/feature-profile/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/profile/logged/ProfileLoggedScreen.kt @@ -441,6 +441,7 @@ internal object ProfileLoggedScreen : Tab { is PostModel -> { RawContentDialog( title = content.title, + date = content.publishDate, url = content.url, text = content.text, onDismiss = { @@ -467,6 +468,7 @@ internal object ProfileLoggedScreen : Tab { is CommentModel -> { RawContentDialog( text = content.text, + date = content.publishDate, onDismiss = { rawContent = null }, diff --git a/feature-profile/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/profile/logged/ProfileLoggedViewModel.kt b/feature-profile/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/profile/logged/ProfileLoggedViewModel.kt index 35ef7fd8b..a52c7e8da 100644 --- a/feature-profile/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/profile/logged/ProfileLoggedViewModel.kt +++ b/feature-profile/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/profile/logged/ProfileLoggedViewModel.kt @@ -12,7 +12,6 @@ import com.github.diegoberaldin.raccoonforlemmy.domain.identity.repository.Ident import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.CommentModel import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.PostModel import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.SortType -import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.shareUrl import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.repository.CommentRepository import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.repository.PostRepository import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.repository.SiteRepository @@ -590,7 +589,7 @@ class ProfileLoggedViewModel( } private fun share(post: PostModel) { - val url = post.shareUrl + val url = post.originalUrl.orEmpty() if (url.isNotEmpty()) { shareHelper.share(url, "text/plain") } diff --git a/feature-search/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/search/multicommunity/detail/MultiCommunityViewModel.kt b/feature-search/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/search/multicommunity/detail/MultiCommunityViewModel.kt index 089177091..1f5f6ac52 100644 --- a/feature-search/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/search/multicommunity/detail/MultiCommunityViewModel.kt +++ b/feature-search/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/search/multicommunity/detail/MultiCommunityViewModel.kt @@ -14,7 +14,6 @@ import com.github.diegoberaldin.raccoonforlemmy.domain.identity.repository.Ident import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.PostModel import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.SortType import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.imageUrl -import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.shareUrl import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.toSortType import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.repository.PostRepository import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.repository.SiteRepository @@ -383,7 +382,7 @@ class MultiCommunityViewModel( } private fun share(post: PostModel) { - val url = post.shareUrl + val url = post.originalUrl.orEmpty() if (url.isNotEmpty()) { shareHelper.share(url, "text/plain") } diff --git a/resources/src/commonMain/resources/MR/base/strings.xml b/resources/src/commonMain/resources/MR/base/strings.xml index e11dd5b00..41714cf88 100755 --- a/resources/src/commonMain/resources/MR/base/strings.xml +++ b/resources/src/commonMain/resources/MR/base/strings.xml @@ -153,14 +153,14 @@ Profile Explore Settings - Cross-post… - Edit… + Cross-post + Edit Hide - Report… - View raw… - Share… + Report + View raw + Share also posted to: - Load more comments… + Load more comments h m s @@ -175,7 +175,7 @@ Posts k y - About this app… + About this app App version View full changelog Report a bug (GitHub) @@ -245,5 +245,5 @@ Zombie mode interval duration Zombie mode scroll amount Mark posts as read while scrolling - Quote… + Quote \ No newline at end of file diff --git a/resources/src/commonMain/resources/MR/bg/strings.xml b/resources/src/commonMain/resources/MR/bg/strings.xml index c27667685..2b75d7730 100644 --- a/resources/src/commonMain/resources/MR/bg/strings.xml +++ b/resources/src/commonMain/resources/MR/bg/strings.xml @@ -147,11 +147,11 @@ Профил Разглеждане Настройки - Кръстосана публикация... + Кръстосана публикация Редактирай Скриване Доклад - Преглед на RAW... + Преглед на RAW Сподели също така публикуван на: Зареждане на още коментари @@ -169,7 +169,7 @@ Публикации k yunit description in lists - Относно това приложение... + Относно това приложение Версия на приложението Преглед на пълния дневник на промените Подаване на сигнал за програмна грешка (GitHub) @@ -248,5 +248,5 @@ Маркирайте публикациите като прочетени при превъртате - цитат… + цитат \ No newline at end of file diff --git a/resources/src/commonMain/resources/MR/cs/strings.xml b/resources/src/commonMain/resources/MR/cs/strings.xml index c51dcd2c2..b449d0bbe 100644 --- a/resources/src/commonMain/resources/MR/cs/strings.xml +++ b/resources/src/commonMain/resources/MR/cs/strings.xml @@ -140,11 +140,11 @@ Profil Prozkoumat Nastavení - Cross-post… + Cross-post Upravit Skrýt Nahlásit - Zobrazit RAW... + Zobrazit RAW Sdílet také zveřejněno na: Načíst více komentářů @@ -162,7 +162,7 @@ Příspěvky k y - O této aplikaci… + O této aplikaci Verze aplikace Zhlédnout novinky ve verzi Nahlásit chybu (GitHub) @@ -234,5 +234,5 @@ Označte příspěvky jako přečtené při rolování - Citát… + Citát \ No newline at end of file diff --git a/resources/src/commonMain/resources/MR/da/strings.xml b/resources/src/commonMain/resources/MR/da/strings.xml index b9c33a345..c5b39bd9d 100644 --- a/resources/src/commonMain/resources/MR/da/strings.xml +++ b/resources/src/commonMain/resources/MR/da/strings.xml @@ -130,10 +130,10 @@ Se mere Indstillinger Tværposter. - Rediger… + Rediger Skjul Rapportér - Se RAW... + Se RAW Del også sendt til: Indlæs flere kommentarer @@ -223,5 +223,5 @@ Zombie-tilstand scroll beløb Marker indlæg som læst, mens du ruller - Citere… + Citere \ No newline at end of file diff --git a/resources/src/commonMain/resources/MR/de/strings.xml b/resources/src/commonMain/resources/MR/de/strings.xml index af54a3d09..5fdc12aef 100755 --- a/resources/src/commonMain/resources/MR/de/strings.xml +++ b/resources/src/commonMain/resources/MR/de/strings.xml @@ -132,13 +132,13 @@ Erkunden Einstellungen Cross-post - Bearbeiten… + Bearbeiten Verstecken - Bericht… - Roh ansehen… - Teilen… + Bericht + Roh ansehen + Teilen auch gepostet - Weitere Kommentare laden… + Weitere Kommentare laden h m s @@ -153,7 +153,7 @@ Beträge k y - Über diese App… + Über diese App App version Änderungsprotokoll anzeigen Melde einen technischen Fehler (GitHub) @@ -227,5 +227,5 @@ Markieren Sie Beiträge beim Scrollen als gelesen - Zitat… + Zitat \ No newline at end of file diff --git a/resources/src/commonMain/resources/MR/el/strings.xml b/resources/src/commonMain/resources/MR/el/strings.xml index 795a064d3..a020108da 100644 --- a/resources/src/commonMain/resources/MR/el/strings.xml +++ b/resources/src/commonMain/resources/MR/el/strings.xml @@ -131,14 +131,14 @@ Προφίλ Εξερεύνηση Ρυθμίσεις - Διασταύρωσε ανάρτηση… - Επεξεργασία… + Διασταύρωσε ανάρτηση + Επεξεργασία Απόκρυψε - Αναφόρησε… - Προβολή ακατέργαστου… - Κοινοποίησε… + Αναφόρησε + Προβολή ακατέργαστου + Κοινοποίησε επίσης αναρτήθηκε σε: - Φόρτωση περισσότερων σχολίων… + Φόρτωση περισσότερων σχολίων ώρ λ δ @@ -153,7 +153,7 @@ Αναρτήσεις χιλ χρ - Σχετικά με αυτήν την εφαρμογή... + Σχετικά με αυτήν την εφαρμογή Έκδοση εφαρμογής Προβολή πλήρους αρχείου αλλαγών Αναφορά σφάλματος (GitHub) @@ -231,5 +231,5 @@ Επισήμανση αναρτήσεων ως αναγνωσμένων κατά την κύλιση - Παράσου… + Παράσου \ No newline at end of file diff --git a/resources/src/commonMain/resources/MR/es/strings.xml b/resources/src/commonMain/resources/MR/es/strings.xml index 6e6f5351e..f5aa6518f 100755 --- a/resources/src/commonMain/resources/MR/es/strings.xml +++ b/resources/src/commonMain/resources/MR/es/strings.xml @@ -131,14 +131,14 @@ Perfil Descubre Ajustes - Publicación cruzada… - Modificar… + Publicación cruzada + Modificar Esconder - Crear informe… - Ver raw… - Compartir… + Crear informe + Ver raw + Compartir también publicado en: - Descarga más comentarios… + Descarga más comentarios h m s @@ -153,7 +153,7 @@ Publicaciones k a - Sobre esta app… + Sobre esta app Versión app Ver registro de cambios Reportar un error (GitHub) @@ -229,5 +229,5 @@ Marcar publicaciones como leídas al desplazarse - Citar… + Citar \ No newline at end of file diff --git a/resources/src/commonMain/resources/MR/et/strings.xml b/resources/src/commonMain/resources/MR/et/strings.xml index c9b143a65..5a4c2e6a5 100644 --- a/resources/src/commonMain/resources/MR/et/strings.xml +++ b/resources/src/commonMain/resources/MR/et/strings.xml @@ -149,14 +149,14 @@ Profiil Uuri Seaded - Ristpostitus… - Muuda… + Ristpostitus + Muuda Peida Aruanne - Kuva RAW... + Kuva RAW Jaga postitatud ka: - Laadi veel kommentaare... + Laadi veel kommentaare t k s @@ -171,7 +171,7 @@ Postid k y - Teave selle rakenduse kohta… + Teave selle rakenduse kohta Rakenduse versioon Vaata täielikku muudatuste logi Teata veast (GitHub) @@ -242,5 +242,5 @@ Zombirežiimi kerimise kogus Märkige postitused kerimise ajal loetuks - Tsiteeri… + Tsiteeri \ No newline at end of file diff --git a/resources/src/commonMain/resources/MR/fi/strings.xml b/resources/src/commonMain/resources/MR/fi/strings.xml index 7260d8b31..7020fce35 100644 --- a/resources/src/commonMain/resources/MR/fi/strings.xml +++ b/resources/src/commonMain/resources/MR/fi/strings.xml @@ -140,12 +140,12 @@ Profiili Tutki Asetukset - Cross-post… - Muokkaa… + Cross-post + Muokkaa Piilota Raportti - Näytä raakana... - Jaa... + Näytä raakana + Jaa julkaistu myös: Lataa lisää kommentteja h @@ -162,7 +162,7 @@ Viestit k k - Tietoja tästä sovelluksesta… + Tietoja tästä sovelluksesta Sovelluksen versio Näytä täydellinen muutosloki Ilmoita virheestä (GitHub) @@ -233,5 +233,5 @@ Zombitilan vieritysmäärä Merkitse viestit luetuiksi vieritettäessä - Lainata… + Lainata \ No newline at end of file diff --git a/resources/src/commonMain/resources/MR/fr/strings.xml b/resources/src/commonMain/resources/MR/fr/strings.xml index 03eddcfc5..64296a86e 100755 --- a/resources/src/commonMain/resources/MR/fr/strings.xml +++ b/resources/src/commonMain/resources/MR/fr/strings.xml @@ -131,14 +131,14 @@ Profil Explorer Réglages - Publication croisée… - Éditer… + Publication croisée + Éditer Cacher Signaler - Voir brut… - Partager… + Voir brut + Partager également publié dans: - Charger plus de commentaires… + Charger plus de commentaires h m s @@ -153,7 +153,7 @@ Publications k a - À propos de cette application… + À propos de cette application Version de l\'application Voir le journal des modifications Signaler un bug (GitHub) @@ -227,5 +227,5 @@ Marquer les messages comme lus lors du défilement - Citer… + Citer \ No newline at end of file diff --git a/resources/src/commonMain/resources/MR/ga/strings.xml b/resources/src/commonMain/resources/MR/ga/strings.xml index 3ebb528a4..33424b18c 100644 --- a/resources/src/commonMain/resources/MR/ga/strings.xml +++ b/resources/src/commonMain/resources/MR/ga/strings.xml @@ -157,14 +157,14 @@ Próifíl Cuardach Socruithe - Trasphost… - Eagar… + Trasphost + Eagar Folaigh Tuairiscigh - Féach RAW… + Féach RAW Roinn sa phost freisin chuig: - Lódáil tuilleadh tuairimí… + Lódáil tuilleadh tuairimí h m s @@ -180,7 +180,7 @@ Postálacha k y - Maidir leis an aip seo... + Maidir leis an aip seo Leagan feidhmchláir Féach ar an loga athraithe iomlán Tuairiscigh fabht (GitHub) @@ -255,5 +255,5 @@ Marcáil postálacha mar léite agus tú ag scrollú - Athfhriotail… + Athfhriotail \ No newline at end of file diff --git a/resources/src/commonMain/resources/MR/hr/strings.xml b/resources/src/commonMain/resources/MR/hr/strings.xml index 30b829d88..2885bb1c4 100644 --- a/resources/src/commonMain/resources/MR/hr/strings.xml +++ b/resources/src/commonMain/resources/MR/hr/strings.xml @@ -148,11 +148,11 @@ Istražite Postavke cross-post - Uredi… + Uredi Sakrij Izvještaj Prikaži neobrađeno - Dijeli… + Dijeli također objavljeno na: Učitaj više komentara h @@ -170,7 +170,7 @@ Objave k y - O ovoj aplikaciji… + O ovoj aplikaciji Inačica aplikacije Pogledajte cjelovitu evidenciju promjena Prijavite pogrešku (GitHub) @@ -245,5 +245,5 @@ Označite postove kao pročitane tijekom pomicanja - Citat… + Citat \ No newline at end of file diff --git a/resources/src/commonMain/resources/MR/hu/strings.xml b/resources/src/commonMain/resources/MR/hu/strings.xml index ef84715b0..60bf86b22 100644 --- a/resources/src/commonMain/resources/MR/hu/strings.xml +++ b/resources/src/commonMain/resources/MR/hu/strings.xml @@ -149,7 +149,7 @@ Szerkesztés elbújik Jelentés - Nyers megtekintése… + Nyers megtekintése Megosztás szintén közzétéve: További hozzászólások betöltése @@ -167,7 +167,7 @@ Bejegyzések k i - Az alkalmazásról... + Az alkalmazásról Alkalmazásverzió Tekintse meg a teljes Változások listáját Hiba bejelentése (GitHub) @@ -242,5 +242,5 @@ Bejegyzések megjelölése olvasottként görgetés közben - Idézet… + Idézet \ No newline at end of file diff --git a/resources/src/commonMain/resources/MR/it/strings.xml b/resources/src/commonMain/resources/MR/it/strings.xml index 19c113abb..8b7c2fd01 100755 --- a/resources/src/commonMain/resources/MR/it/strings.xml +++ b/resources/src/commonMain/resources/MR/it/strings.xml @@ -131,14 +131,14 @@ Profilo Esplora Impostazioni - Cross-post… - Modifica… + Cross-post + Modifica Nascondi - Segnala… - Vedi raw… - Condividi… + Segnala + Vedi raw + Condividi postato anche in: - Carica altri commenti… + Carica altri commenti h m s @@ -153,7 +153,7 @@ Post k a - Informazioni app… + Informazioni app Versione app Visualizza changelog Segnala un bug (GitHub) @@ -226,5 +226,5 @@ Ampiezza scroll modalità zombie Segna post come letti durante lo scroll - Cita… + Cita \ No newline at end of file diff --git a/resources/src/commonMain/resources/MR/lt/strings.xml b/resources/src/commonMain/resources/MR/lt/strings.xml index 793da087f..dbd1a73dc 100644 --- a/resources/src/commonMain/resources/MR/lt/strings.xml +++ b/resources/src/commonMain/resources/MR/lt/strings.xml @@ -149,11 +149,11 @@ Profilis Tyrinėti Nustatymai - Skersinis stulpas… + Skersinis stulpas Redaguoti Slėpti - Pranešti… - Peržiūrėti neapdorotą... + Pranešti + Peržiūrėti neapdorotą Dalis taip pat paskelbta: rodyti daugiau komentarų @@ -248,5 +248,5 @@ Slinkdami pažymėkite įrašus kaip skaitytus - Citata… + Citata \ No newline at end of file diff --git a/resources/src/commonMain/resources/MR/lv/strings.xml b/resources/src/commonMain/resources/MR/lv/strings.xml index 86b2beee4..a8cc78808 100644 --- a/resources/src/commonMain/resources/MR/lv/strings.xml +++ b/resources/src/commonMain/resources/MR/lv/strings.xml @@ -150,14 +150,14 @@ Profils Izpētiet Iestatījumi - Šķērsstabilitāte… + Šķērsstabilitāte Rediģēt Slēpt Ziņojums - Skatīt neapstrādātu... + Skatīt neapstrādātu Dalīties arī izlikts: - Ielādēt vairāk komentāru... + Ielādēt vairāk komentāru h m s @@ -247,5 +247,5 @@ Atzīmējiet ziņas kā izlasītas ritināšanas laikā - Citāts… + Citāts \ No newline at end of file diff --git a/resources/src/commonMain/resources/MR/nl/strings.xml b/resources/src/commonMain/resources/MR/nl/strings.xml index 5edc61e7d..eb06f50ed 100644 --- a/resources/src/commonMain/resources/MR/nl/strings.xml +++ b/resources/src/commonMain/resources/MR/nl/strings.xml @@ -139,14 +139,14 @@ Profiel Ontdekken Instellingen - Crosspost… - Bewerk… + Crosspost + Bewerk Verbergen - Verslag… - Toon raw… - Delen… + Verslag + Toon raw + Delen ook geplaatst op: - Meer reacties laden… + Meer reacties laden u m s @@ -161,7 +161,7 @@ Berichten k j - Over deze app… + Over deze app App-versie Bekijk het complete veranderingslogboek Een bug melden (GitHub) @@ -234,5 +234,5 @@ Markeer berichten als gelezen tijdens het scrollen - Citaat… + Citaat \ No newline at end of file diff --git a/resources/src/commonMain/resources/MR/no/strings.xml b/resources/src/commonMain/resources/MR/no/strings.xml index a8f7530ff..1da8cac3c 100644 --- a/resources/src/commonMain/resources/MR/no/strings.xml +++ b/resources/src/commonMain/resources/MR/no/strings.xml @@ -142,7 +142,7 @@ Profil Utforsk Innstillinger - Cross-post… + Cross-post Rediger Skjul Rapporter @@ -236,5 +236,5 @@ Zombie-modus rullebeløp Merk innlegg som lest mens du ruller - Sitat… + Sitat \ No newline at end of file diff --git a/resources/src/commonMain/resources/MR/pl/strings.xml b/resources/src/commonMain/resources/MR/pl/strings.xml index e52feecbc..472b20ac7 100644 --- a/resources/src/commonMain/resources/MR/pl/strings.xml +++ b/resources/src/commonMain/resources/MR/pl/strings.xml @@ -130,14 +130,14 @@ Profil Explore Ustawienia - Krzyżowy post… - Edytuj… + Krzyżowy post + Edytuj Ukrycie - Raportuj… - Widok surowy… - Udział… + Raportuj + Widok surowy + Udział opublikowane również na: - Załaduj więcej komentarzy… + Załaduj więcej komentarzy h m s @@ -225,5 +225,5 @@ Oznacz posty jako przeczytane podczas przewijania - Cytat… + Cytat \ No newline at end of file diff --git a/resources/src/commonMain/resources/MR/pt/strings.xml b/resources/src/commonMain/resources/MR/pt/strings.xml index 14296d27f..b067f487e 100755 --- a/resources/src/commonMain/resources/MR/pt/strings.xml +++ b/resources/src/commonMain/resources/MR/pt/strings.xml @@ -129,12 +129,12 @@ Perfil Explorar Configurações - Publicação cruzada… - Modificar… + Publicação cruzada + Modificar Esconder - Denunciar… + Denunciar Ver conteúdo bruto - Compartilhar… + Compartilhar publicado também em Carregar mais comentários h @@ -151,7 +151,7 @@ Publicações k y - Sobre esta app… + Sobre esta app Versão da app Ver o registro de alterações Relatar um bug (GitHub) @@ -224,5 +224,5 @@ Marcar postagens como lidas durante ao rolar - Citar… + Citar \ No newline at end of file diff --git a/resources/src/commonMain/resources/MR/ro/strings.xml b/resources/src/commonMain/resources/MR/ro/strings.xml index 2fbd0fbb8..a28d07ed4 100755 --- a/resources/src/commonMain/resources/MR/ro/strings.xml +++ b/resources/src/commonMain/resources/MR/ro/strings.xml @@ -130,14 +130,14 @@ Profil Exploră Setări - Postare încrucișată… - Editează… + Postare încrucișată + Editează Ascunde - Reportează… - Vizualizare brută… - Partajează… + Reportează + Vizualizare brută + Partajează postată și în: - Încărcă mai multe comentării… + Încărcă mai multe comentării h m s @@ -152,7 +152,7 @@ Postări k y - Despre această aplicație… + Despre această aplicație Versiunea aplicației Vizualizează jurnalul de modificări Raportează o eroare (email) @@ -224,5 +224,5 @@ Extensia de derulare modului zombie Marchează postările ca citite la derulare - Citează… + Citează \ No newline at end of file diff --git a/resources/src/commonMain/resources/MR/se/strings.xml b/resources/src/commonMain/resources/MR/se/strings.xml index cf8ab3ec4..e36849ff9 100644 --- a/resources/src/commonMain/resources/MR/se/strings.xml +++ b/resources/src/commonMain/resources/MR/se/strings.xml @@ -141,11 +141,11 @@ Profil Utforska företag Inställningar - Korspost... + Korspost Redigera Dölj Rapportera - Visa RAW... + Visa RAW Dela även postat till: Ladda fler kommentarer @@ -235,5 +235,5 @@ Zombieläge rullningsmängd Markera inlägg som lästa medan du rullar - Citat… + Citat \ No newline at end of file diff --git a/resources/src/commonMain/resources/MR/sk/strings.xml b/resources/src/commonMain/resources/MR/sk/strings.xml index 507fd2279..3679ea426 100644 --- a/resources/src/commonMain/resources/MR/sk/strings.xml +++ b/resources/src/commonMain/resources/MR/sk/strings.xml @@ -141,11 +141,11 @@ Profil Preskúmať Nastavenia - Cross-post… - Upraviť... + Cross-post + Upraviť Skryť Správa - Zobraziť raw... + Zobraziť raw Zdieľať tiež odoslané na: Načítať ďalšie komentáre @@ -236,5 +236,5 @@ Označte príspevky ako prečítané pri rolovaní - Citovať… + Citovať \ No newline at end of file diff --git a/resources/src/commonMain/resources/MR/sl/strings.xml b/resources/src/commonMain/resources/MR/sl/strings.xml index dd4e1e1bb..d592b2093 100644 --- a/resources/src/commonMain/resources/MR/sl/strings.xml +++ b/resources/src/commonMain/resources/MR/sl/strings.xml @@ -146,10 +146,10 @@ Raziščite Nastavitve Navzkrižni steber - Uredi… + Uredi Skrij Poročilo - Ogled surovega... + Ogled surovega Deli objavljeno tudi na: Naloži več komentarjev @@ -167,7 +167,7 @@ Objave k y - O tej aplikaciji… + O tej aplikaciji Različica aplikacije Ogled celotnega dnevnika sprememb Prijavite napako (GitHub) @@ -240,5 +240,5 @@ Količina drsenja v zombi načinu Med pomikanjem označi objave kot prebrane - Kvota… + Kvota \ No newline at end of file