diff --git a/app/src/main/kotlin/net/primal/android/core/compose/AvatarThumbnailListItemImage.kt b/app/src/main/kotlin/net/primal/android/core/compose/AvatarThumbnailListItemImage.kt index 7b017a3d9..443309d16 100644 --- a/app/src/main/kotlin/net/primal/android/core/compose/AvatarThumbnailListItemImage.kt +++ b/app/src/main/kotlin/net/primal/android/core/compose/AvatarThumbnailListItemImage.kt @@ -19,11 +19,11 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import coil.compose.SubcomposeAsyncImage +import net.primal.android.R import net.primal.android.attachments.domain.CdnImage import net.primal.android.core.compose.icons.PrimalIcons import net.primal.android.core.compose.icons.primaliconpack.AvatarDefault import net.primal.android.theme.AppTheme -import net.primal.android.R @Composable fun AvatarThumbnail( diff --git a/app/src/main/kotlin/net/primal/android/core/compose/DemoSecondaryScreen.kt b/app/src/main/kotlin/net/primal/android/core/compose/DemoSecondaryScreen.kt deleted file mode 100644 index d54e35937..000000000 --- a/app/src/main/kotlin/net/primal/android/core/compose/DemoSecondaryScreen.kt +++ /dev/null @@ -1,50 +0,0 @@ -package net.primal.android.core.compose - -import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.foundation.layout.padding -import androidx.compose.material3.ExperimentalMaterial3Api -import androidx.compose.material3.Scaffold -import androidx.compose.material3.Text -import androidx.compose.runtime.Composable -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.text.style.TextAlign -import androidx.compose.ui.unit.dp -import net.primal.android.core.compose.icons.PrimalIcons -import net.primal.android.core.compose.icons.primaliconpack.ArrowBack -import net.primal.android.R -import androidx.compose.ui.res.stringResource - -@OptIn(ExperimentalMaterial3Api::class) -@Composable -fun DemoSecondaryScreen( - title: String, - description: String, - onClose: () -> Unit, -) { - Scaffold( - topBar = { - PrimalTopAppBar( - navigationIcon = PrimalIcons.ArrowBack, - onNavigationIconClick = onClose, - title = title, - navigationIconContentDescription = stringResource(id = R.string.accessibility_back_button), - ) - }, - content = { paddingValues -> - Box( - modifier = Modifier - .padding(paddingValues) - .fillMaxSize(), - contentAlignment = Alignment.Center, - ) { - Text( - modifier = Modifier.padding(horizontal = 48.dp), - textAlign = TextAlign.Center, - text = description, - ) - } - }, - ) -} diff --git a/app/src/main/kotlin/net/primal/android/core/compose/feed/note/NoteStatsRow.kt b/app/src/main/kotlin/net/primal/android/core/compose/feed/note/NoteStatsRow.kt index 868531c0c..d52564602 100644 --- a/app/src/main/kotlin/net/primal/android/core/compose/feed/note/NoteStatsRow.kt +++ b/app/src/main/kotlin/net/primal/android/core/compose/feed/note/NoteStatsRow.kt @@ -25,6 +25,7 @@ import androidx.compose.ui.text.PlaceholderVerticalAlign import androidx.compose.ui.text.buildAnnotatedString import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.sp +import net.primal.android.R import net.primal.android.core.compose.feed.model.FeedPostAction import net.primal.android.core.compose.feed.model.FeedPostStatsUi import net.primal.android.core.compose.icons.PrimalIcons @@ -37,7 +38,6 @@ import net.primal.android.core.compose.icons.primaliconpack.FeedRepostsFilled import net.primal.android.core.compose.icons.primaliconpack.FeedZaps import net.primal.android.core.compose.icons.primaliconpack.FeedZapsFilled import net.primal.android.theme.AppTheme -import net.primal.android.R @Composable fun FeedNoteStatsRow( diff --git a/app/src/main/kotlin/net/primal/android/drawer/PrimalDrawer.kt b/app/src/main/kotlin/net/primal/android/drawer/PrimalDrawer.kt index 0813451c8..2e1009ba6 100644 --- a/app/src/main/kotlin/net/primal/android/drawer/PrimalDrawer.kt +++ b/app/src/main/kotlin/net/primal/android/drawer/PrimalDrawer.kt @@ -162,7 +162,10 @@ private fun DrawerHeader(userAccount: UserAccount?) { onClick = { }, ) { - Icon(imageVector = PrimalIcons.QrCode, contentDescription = stringResource(id = R.string.accessibility_qr_code)) + Icon( + imageVector = PrimalIcons.QrCode, + contentDescription = stringResource(id = R.string.accessibility_qr_code), + ) } Text( @@ -264,7 +267,10 @@ private fun DrawerFooter(onThemeSwitch: () -> Unit) { IconButton( onClick = onThemeSwitch, ) { - Icon(imageVector = iconVector, contentDescription = stringResource(id = R.string.accessibility_toggle_between_dark_and_light_mode)) + Icon( + imageVector = iconVector, + contentDescription = stringResource(id = R.string.accessibility_toggle_between_dark_and_light_mode), + ) } } } diff --git a/app/src/main/kotlin/net/primal/android/editor/ui/NoteAttachmentPreview.kt b/app/src/main/kotlin/net/primal/android/editor/ui/NoteAttachmentPreview.kt index b6d5c2ba5..560837053 100644 --- a/app/src/main/kotlin/net/primal/android/editor/ui/NoteAttachmentPreview.kt +++ b/app/src/main/kotlin/net/primal/android/editor/ui/NoteAttachmentPreview.kt @@ -15,10 +15,10 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import coil.compose.SubcomposeAsyncImage import java.util.UUID +import net.primal.android.R import net.primal.android.core.compose.PrimalLoadingSpinner import net.primal.android.editor.domain.NoteAttachment import net.primal.android.theme.AppTheme -import net.primal.android.R @Composable fun NoteAttachmentPreview( diff --git a/app/src/main/kotlin/net/primal/android/explore/search/ui/SearchScreen.kt b/app/src/main/kotlin/net/primal/android/explore/search/ui/SearchScreen.kt index ae5065750..2391abe27 100644 --- a/app/src/main/kotlin/net/primal/android/explore/search/ui/SearchScreen.kt +++ b/app/src/main/kotlin/net/primal/android/explore/search/ui/SearchScreen.kt @@ -89,7 +89,7 @@ fun SearchScreen( icon = PrimalIcons.ArrowBack, onClick = onClose, appBarIconContentDescription = stringResource(id = R.string.accessibility_back_button), - ) + ) }, title = { SearchTextField( diff --git a/app/src/main/kotlin/net/primal/android/messages/chat/ChatScreen.kt b/app/src/main/kotlin/net/primal/android/messages/chat/ChatScreen.kt index e60fa4a48..540caada3 100644 --- a/app/src/main/kotlin/net/primal/android/messages/chat/ChatScreen.kt +++ b/app/src/main/kotlin/net/primal/android/messages/chat/ChatScreen.kt @@ -471,8 +471,11 @@ private fun MessageOutlinedTextField( AppBarIcon( modifier = Modifier.padding(bottom = 4.dp, start = 8.dp), icon = if (sending) Icons.Outlined.HourglassBottom else Icons.Outlined.ArrowUpward, - appBarIconContentDescription = if (sending) stringResource(id = R.string.accessibility_message_being_sent) else stringResource( - id = R.string.accessibility_send_message), + appBarIconContentDescription = if (sending) { + stringResource(id = R.string.accessibility_message_being_sent) + } else { + stringResource(id = R.string.accessibility_send_message) + }, enabledBackgroundColor = AppTheme.colorScheme.primary, tint = Color.White, enabled = sendEnabled, diff --git a/app/src/main/kotlin/net/primal/android/notifications/list/NotificationsScreen.kt b/app/src/main/kotlin/net/primal/android/notifications/list/NotificationsScreen.kt index e83a3d129..dc07c44c8 100644 --- a/app/src/main/kotlin/net/primal/android/notifications/list/NotificationsScreen.kt +++ b/app/src/main/kotlin/net/primal/android/notifications/list/NotificationsScreen.kt @@ -176,7 +176,9 @@ fun NotificationsScreen( AppBarIcon( icon = PrimalIcons.Settings, onClick = onNotificationSettings, - appBarIconContentDescription = stringResource(id = R.string.accessibility_notification_settings), + appBarIconContentDescription = stringResource( + id = R.string.accessibility_notification_settings, + ), ) }, ) diff --git a/app/src/main/kotlin/net/primal/android/profile/follows/ProfileFollowsScreen.kt b/app/src/main/kotlin/net/primal/android/profile/follows/ProfileFollowsScreen.kt index 3a43ed3fe..866d560a0 100644 --- a/app/src/main/kotlin/net/primal/android/profile/follows/ProfileFollowsScreen.kt +++ b/app/src/main/kotlin/net/primal/android/profile/follows/ProfileFollowsScreen.kt @@ -80,7 +80,7 @@ private fun ProfileFollowsScreen( navigationIcon = PrimalIcons.ArrowBack, onNavigationIconClick = onClose, navigationIconContentDescription = stringResource(id = R.string.accessibility_back_button), - ) + ) }, content = { paddingValues -> FollowsLazyColumn( diff --git a/app/src/main/kotlin/net/primal/android/wallet/dashboard/ui/WalletActions.kt b/app/src/main/kotlin/net/primal/android/wallet/dashboard/ui/WalletActions.kt index 7f067f399..4377f52df 100644 --- a/app/src/main/kotlin/net/primal/android/wallet/dashboard/ui/WalletActions.kt +++ b/app/src/main/kotlin/net/primal/android/wallet/dashboard/ui/WalletActions.kt @@ -1,6 +1,5 @@ package net.primal.android.wallet.dashboard.ui -import android.accounts.AuthenticatorDescription import androidx.annotation.StringRes import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column