Merge remote-tracking branch 'origin/dev' into dev

daniebeler · Jan 29, 2025 · 0017cbc · 0017cbc
2 parents 400f13d + 8aefe70
commit 0017cbc
Show file tree

Hide file tree

Showing 53 changed files with 529 additions and 94 deletions.
diff --git a/app/src/main/java/com/daniebeler/pfpixelix/common/Destinations.kt b/app/src/main/java/com/daniebeler/pfpixelix/common/Destinations.kt
@@ -21,8 +21,8 @@ sealed class Destinations(
 
     data object NotificationsScreen : Destinations(
         route = "notifications_screen",
-        icon = R.drawable.heart_outline,
-        activeIcon = R.drawable.heart,
+        icon = R.drawable.notifications_outline,
+        activeIcon = R.drawable.notifications,
         label = R.string.alerts
     )
 

diff --git a/app/src/main/java/com/daniebeler/pfpixelix/ui/composables/CustomPost.kt b/app/src/main/java/com/daniebeler/pfpixelix/ui/composables/CustomPost.kt
@@ -20,13 +20,16 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.asImageBitmap
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
 import coil.compose.AsyncImage
 import com.bumptech.glide.integration.compose.ExperimentalGlideComposeApi
 import com.bumptech.glide.integration.compose.GlideImage
+import com.daniebeler.pfpixelix.R
 import com.daniebeler.pfpixelix.domain.model.Post
 import com.daniebeler.pfpixelix.utils.BlurHashDecoder
 import com.daniebeler.pfpixelix.utils.Navigate
@@ -138,7 +141,7 @@ fun CustomPost(
                             .align(Alignment.TopEnd)
                     ) {
                         Icon(
-                            imageVector = Icons.Filled.Collections,
+                            imageVector = ImageVector.vectorResource(R.drawable.stack),
                             tint = Color.White,
                             contentDescription = null,
                         )

diff --git a/app/src/main/java/com/daniebeler/pfpixelix/ui/composables/RowElement.kt b/app/src/main/java/com/daniebeler/pfpixelix/ui/composables/RowElement.kt
@@ -24,12 +24,14 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ImageBitmap
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 
 @Composable
 fun ButtonRowElement(
-    icon: ImageVector,
+    @DrawableRes
+    icon: Int,
     text: String,
     smallText: String = "",
     onClick: () -> Unit,
@@ -42,7 +44,7 @@ fun ButtonRowElement(
                 onClick()
             }) {
         Icon(
-            imageVector = icon,
+            imageVector = ImageVector.vectorResource(icon),
             contentDescription = "",
             Modifier.padding(start = 18.dp, top = 12.dp, bottom = 12.dp),
             tint = color
@@ -60,7 +62,7 @@ fun ButtonRowElement(
 }
 
 @Composable
-fun ButtonRowElement(
+fun ButtonRowElementWithRoundedImage(
     @DrawableRes icon: Int,
     text: String,
     smallText: String = "",
@@ -135,7 +137,10 @@ fun ButtonRowElement(
 
 @Composable
 fun SwitchRowItem(
-    icon: ImageVector, text: String, isChecked: Boolean, onCheckedChange: (checked: Boolean) -> Unit
+    @DrawableRes icon: Int,
+    text: String,
+    isChecked: Boolean,
+    onCheckedChange: (checked: Boolean) -> Unit
 ) {
     Row(
         modifier = Modifier
@@ -145,7 +150,7 @@ fun SwitchRowItem(
         verticalAlignment = Alignment.CenterVertically
     ) {
         Row {
-            Icon(imageVector = icon, contentDescription = null)
+            Icon(imageVector = ImageVector.vectorResource(icon), contentDescription = null)
             Spacer(modifier = Modifier.width(12.dp))
             Text(text = text)
         }

diff --git a/app/src/main/java/com/daniebeler/pfpixelix/ui/composables/ToTopButton.kt b/app/src/main/java/com/daniebeler/pfpixelix/ui/composables/ToTopButton.kt
@@ -11,14 +11,18 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.ArrowUpward
 import androidx.compose.material3.FloatingActionButton
 import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.unit.dp
+import com.daniebeler.pfpixelix.R
 import kotlinx.coroutines.launch
 
 @Composable
@@ -37,8 +41,9 @@ fun ToTopButton(listState: LazyListState) {
                 coroutineScope.launch {
                     listState.animateScrollToItem(0, 0)
                 }
-            }) {
-                Icon(Icons.Outlined.ArrowUpward, contentDescription = "")
+            },
+                containerColor = MaterialTheme.colorScheme.surfaceContainer) {
+                Icon(ImageVector.vectorResource(R.drawable.chevron_up_outline), contentDescription = "")
             }
         }
     }

diff --git a/app/src/main/java/com/daniebeler/pfpixelix/ui/composables/collection/CollectionComposable.kt b/app/src/main/java/com/daniebeler/pfpixelix/ui/composables/collection/CollectionComposable.kt
@@ -43,8 +43,10 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
@@ -110,7 +112,7 @@ fun CollectionComposable(
                 navController.popBackStack()
             }) {
                 Icon(
-                    imageVector = Icons.AutoMirrored.Rounded.ArrowBackIos, contentDescription = ""
+                    imageVector = ImageVector.vectorResource(R.drawable.chevron_back_outline), contentDescription = ""
                 )
             }
         }, actions = {
@@ -200,7 +202,7 @@ fun CollectionComposable(
                     modifier = Modifier.padding(bottom = 32.dp)
                 ) {
 
-                    ButtonRowElement(icon = Icons.Outlined.OpenInBrowser, text = stringResource(
+                    ButtonRowElement(icon = R.drawable.open_outline, text = stringResource(
                         R.string.open_in_browser
                     ), onClick = {
                         if (viewModel.collectionState.collection != null) {
@@ -210,7 +212,7 @@ fun CollectionComposable(
                         }
                     })
 
-                    ButtonRowElement(icon = Icons.Outlined.Share,
+                    ButtonRowElement(icon = R.drawable.share_social_outline,
                         text = stringResource(R.string.share_this_collection),
                         onClick = {
                             if (viewModel.collectionState.collection != null) {

diff --git a/.../main/java/com/daniebeler/pfpixelix/ui/composables/direct_messages/chat/ChatComposable.kt b/.../main/java/com/daniebeler/pfpixelix/ui/composables/direct_messages/chat/ChatComposable.kt
@@ -44,9 +44,11 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
@@ -113,7 +115,7 @@ fun ChatComposable(
                 navController.popBackStack()
             }) {
                 Icon(
-                    imageVector = Icons.AutoMirrored.Rounded.ArrowBackIos, contentDescription = ""
+                    imageVector = ImageVector.vectorResource(R.drawable.chevron_back_outline), contentDescription = ""
                 )
             }
         })

diff --git a/...iebeler/pfpixelix/ui/composables/direct_messages/conversations/ConversationsComposable.kt b/...iebeler/pfpixelix/ui/composables/direct_messages/conversations/ConversationsComposable.kt
@@ -22,9 +22,6 @@ import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.rounded.ArrowBackIos
-import androidx.compose.material.icons.filled.Add
-import androidx.compose.material.icons.outlined.Email
 import androidx.compose.material.icons.outlined.QuestionMark
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.CenterAlignedTopAppBar
@@ -49,7 +46,9 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.text.TextRange
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.TextFieldValue
@@ -83,7 +82,7 @@ fun ConversationsComposable(
         FloatingActionButton(onClick = {
             showNewChatDialog.value = true
         }) {
-            Icon(Icons.Default.Add, contentDescription = "Add")
+            Icon(ImageVector.vectorResource(R.drawable.add_outline), contentDescription = "Add")
         }
 
     }, topBar = {
@@ -95,7 +94,7 @@ fun ConversationsComposable(
                 navController.popBackStack()
             }) {
                 Icon(
-                    imageVector = Icons.AutoMirrored.Rounded.ArrowBackIos, contentDescription = ""
+                    imageVector = ImageVector.vectorResource(R.drawable.chevron_back_outline), contentDescription = ""
                 )
             }
         }, actions = {
@@ -147,7 +146,7 @@ fun ConversationsComposable(
             if (!viewModel.conversationsState.isLoading && viewModel.conversationsState.error.isEmpty() && viewModel.conversationsState.conversations.isEmpty()) {
                 FullscreenEmptyStateComposable(
                     EmptyState(
-                        icon = Icons.Outlined.Email, heading = stringResource(
+                        icon = ImageVector.vectorResource(R.drawable.mail_outline), heading = stringResource(
                             R.string.you_don_t_have_any_notifications
                         )
                     )

diff --git a/...c/main/java/com/daniebeler/pfpixelix/ui/composables/edit_profile/EditProfileComposable.kt b/...c/main/java/com/daniebeler/pfpixelix/ui/composables/edit_profile/EditProfileComposable.kt
@@ -43,9 +43,11 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
@@ -109,7 +111,7 @@ fun EditProfileComposable(
                         navController.popBackStack()
                     }) {
                         Icon(
-                            imageVector = Icons.AutoMirrored.Rounded.ArrowBackIos,
+                            imageVector = ImageVector.vectorResource(R.drawable.chevron_back_outline),
                             contentDescription = ""
                         )
                     }

diff --git a/app/src/main/java/com/daniebeler/pfpixelix/ui/composables/explore/ExploreComposable.kt b/app/src/main/java/com/daniebeler/pfpixelix/ui/composables/explore/ExploreComposable.kt
@@ -54,9 +54,11 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.semantics.isTraversalGroup
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.semantics.traversalIndex
@@ -106,7 +108,7 @@ fun ExploreComposable(
                     placeholder = { Text(stringResource(R.string.explore)) },
                     leadingIcon = {
                         if (!expanded) {
-                            Icon(Icons.Default.Search, contentDescription = null)
+                            Icon(ImageVector.vectorResource(R.drawable.search_outline), contentDescription = null)
                         } else {
                             Icon(Icons.Outlined.ArrowBackIosNew,
                                 contentDescription = null,

diff --git a/...rc/main/java/com/daniebeler/pfpixelix/ui/composables/followers/FollowersMainComposable.kt b/...rc/main/java/com/daniebeler/pfpixelix/ui/composables/followers/FollowersMainComposable.kt
@@ -30,8 +30,10 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.sp
 import androidx.hilt.navigation.compose.hiltViewModel
@@ -82,7 +84,7 @@ fun FollowersMainComposable(
                     navController.popBackStack()
                 }) {
                     Icon(
-                        imageVector = Icons.AutoMirrored.Rounded.ArrowBackIos, contentDescription = ""
+                        imageVector = ImageVector.vectorResource(R.drawable.chevron_back_outline), contentDescription = ""
                     )
                 }
             })

diff --git a/app/src/main/java/com/daniebeler/pfpixelix/ui/composables/mention/MentionComposable.kt b/app/src/main/java/com/daniebeler/pfpixelix/ui/composables/mention/MentionComposable.kt
@@ -34,8 +34,10 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.layout.Layout
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
@@ -89,7 +91,7 @@ fun MentionComposable(
                 navController.popBackStack()
             }) {
                 Icon(
-                    imageVector = Icons.AutoMirrored.Rounded.ArrowBackIos, contentDescription = ""
+                    imageVector = ImageVector.vectorResource(R.drawable.chevron_back_outline), contentDescription = ""
                 )
             }
         })

diff --git a/app/src/main/java/com/daniebeler/pfpixelix/ui/composables/newpost/NewPostComposable.kt b/app/src/main/java/com/daniebeler/pfpixelix/ui/composables/newpost/NewPostComposable.kt
@@ -52,8 +52,10 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.unit.dp
@@ -186,7 +188,7 @@ fun NewPostComposable(
                             viewModel.deleteMedia(image.id, image.imageUri)
                         }) {
                             Icon(
-                                imageVector = Icons.Outlined.Delete,
+                                imageVector = ImageVector.vectorResource(R.drawable.add_outline),
                                 contentDescription = "delete Image",
                                 tint = MaterialTheme.colorScheme.error
                             )
@@ -205,7 +207,7 @@ fun NewPostComposable(
                             }
                             .height(50.dp)
                             .width(50.dp),
-                        imageVector = Icons.Filled.Add,
+                        imageVector = ImageVector.vectorResource(R.drawable.add_outline),
                         contentDescription = null,
                     )
                 }

diff --git a/...ain/java/com/daniebeler/pfpixelix/ui/composables/notifications/NotificationsComposable.kt b/...ain/java/com/daniebeler/pfpixelix/ui/composables/notifications/NotificationsComposable.kt
@@ -40,8 +40,10 @@ import androidx.compose.material3.pulltorefresh.PullToRefreshBox
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
@@ -73,7 +75,7 @@ fun NotificationsComposable(
             IconButton(onClick = {
                 pinWidget(context)
             }) {
-                Icon(imageVector = Icons.Outlined.Widgets, contentDescription = "add widget")
+                Icon(imageVector = ImageVector.vectorResource(R.drawable.extension_puzzle_outline), contentDescription = "add widget")
             }
         })
     }) { paddingValues ->
@@ -195,7 +197,7 @@ fun NotificationsComposable(
             if (!viewModel.notificationsState.isLoading && viewModel.notificationsState.error.isEmpty() && viewModel.notificationsState.notifications.isEmpty()) {
                 FullscreenEmptyStateComposable(
                     EmptyState(
-                        icon = Icons.Outlined.Email, heading = stringResource(
+                        icon = ImageVector.vectorResource(R.drawable.mail_outline), heading = stringResource(
                             R.string.you_don_t_have_any_notifications
                         )
                     )

diff --git a/app/src/main/java/com/daniebeler/pfpixelix/ui/composables/post/PostComposable.kt b/app/src/main/java/com/daniebeler/pfpixelix/ui/composables/post/PostComposable.kt
@@ -285,8 +285,7 @@ fun PostComposable(
                     showBottomSheet = 2
                 }) {
                     Icon(
-                        imageVector = Icons.Outlined.MoreHoriz,
-                        modifier = Modifier.size(32.dp),
+                        imageVector = ImageVector.vectorResource(R.drawable.ellipsis_vertical),
                         contentDescription = ""
                     )
                 }