From 8aefe701ac06e94606d1d521697a8c9ab950fe2f Mon Sep 17 00:00:00 2001 From: Daniel Hiebeler Date: Wed, 29 Jan 2025 01:53:56 +0100 Subject: [PATCH] Small design fixes --- .../pfpixelix/ui/composables/CustomPost.kt | 5 ++++- .../pfpixelix/ui/composables/ToTopButton.kt | 9 +++++++-- .../conversations/ConversationsComposable.kt | 3 --- .../composables/profile/CollectionsComposable.kt | 14 +++++++------- .../profile/own_profile/OwnProfileComposable.kt | 11 ----------- app/src/main/res/drawable/chevron_up_outline.xml | 15 +++++++++++++++ app/src/main/res/drawable/stack.xml | 15 +++++++++++++++ 7 files changed, 48 insertions(+), 24 deletions(-) create mode 100644 app/src/main/res/drawable/chevron_up_outline.xml create mode 100644 app/src/main/res/drawable/stack.xml 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 index c9769cb6..9993d8c1 100644 --- 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/ToTopButton.kt b/app/src/main/java/com/daniebeler/pfpixelix/ui/composables/ToTopButton.kt index eec9deba..ee72b26a 100644 --- 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,6 +11,7 @@ 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 @@ -18,7 +19,10 @@ 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/direct_messages/conversations/ConversationsComposable.kt b/app/src/main/java/com/daniebeler/pfpixelix/ui/composables/direct_messages/conversations/ConversationsComposable.kt index 3b341761..f4d02e2a 100644 --- a/app/src/main/java/com/daniebeler/pfpixelix/ui/composables/direct_messages/conversations/ConversationsComposable.kt +++ b/app/src/main/java/com/daniebeler/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 diff --git a/app/src/main/java/com/daniebeler/pfpixelix/ui/composables/profile/CollectionsComposable.kt b/app/src/main/java/com/daniebeler/pfpixelix/ui/composables/profile/CollectionsComposable.kt index 81a41d10..a908b602 100644 --- a/app/src/main/java/com/daniebeler/pfpixelix/ui/composables/profile/CollectionsComposable.kt +++ b/app/src/main/java/com/daniebeler/pfpixelix/ui/composables/profile/CollectionsComposable.kt @@ -30,8 +30,10 @@ import androidx.compose.runtime.remember 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.layout.ContentScale 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 @@ -51,14 +53,13 @@ fun CollectionsComposable( openUrl: (url: String) -> Unit ) { val lazyListState = rememberLazyListState() - var showAddCollectionDialog = remember { + val showAddCollectionDialog = remember { mutableStateOf(false) } if (addNewButton || collectionsState.collections.isNotEmpty()) { Column { - HorizontalDivider(Modifier.padding(12.dp)) - + Spacer(Modifier.height(12.dp)) Text( text = stringResource(R.string.collections), fontWeight = FontWeight.Bold, @@ -87,7 +88,7 @@ fun CollectionsComposable( ) Spacer(modifier = Modifier.height(8.dp)) - Text(text = it.title) + Text(text = it.title, fontSize = 14.sp) } } if (collectionsState.isLoading) { @@ -118,14 +119,14 @@ fun CollectionsComposable( contentAlignment = Alignment.Center ) { Icon( - imageVector = Icons.Outlined.Add, + imageVector = ImageVector.vectorResource(R.drawable.add_outline), contentDescription = "add collection", Modifier.size(32.dp) ) } Spacer(modifier = Modifier.height(8.dp)) - Text(text = stringResource(R.string.new_)) + Text(text = stringResource(R.string.new_), fontSize = 14.sp) } } } @@ -162,5 +163,4 @@ fun CollectionsComposable( } - } \ No newline at end of file diff --git a/app/src/main/java/com/daniebeler/pfpixelix/ui/composables/profile/own_profile/OwnProfileComposable.kt b/app/src/main/java/com/daniebeler/pfpixelix/ui/composables/profile/own_profile/OwnProfileComposable.kt index d1971d3c..f66cd5fe 100644 --- a/app/src/main/java/com/daniebeler/pfpixelix/ui/composables/profile/own_profile/OwnProfileComposable.kt +++ b/app/src/main/java/com/daniebeler/pfpixelix/ui/composables/profile/own_profile/OwnProfileComposable.kt @@ -96,16 +96,6 @@ fun OwnProfileComposable( ) } } - }, navigationIcon = { - IconButton(onClick = { - showBottomSheet = 2 - }) { - Icon( - imageVector = Icons.Outlined.SwitchAccount, - contentDescription = "account switch dropdown", - Modifier.size(24.dp) - ) - } }, actions = { if (viewModel.ownDomain.isNotEmpty()) { DomainSoftwareComposable( @@ -213,7 +203,6 @@ fun OwnProfileComposable( } } - //ToTopButton(listState = lazyGridState) InfiniteListHandler(lazyListState = lazyGridState) { viewModel.getPostsPaginated() diff --git a/app/src/main/res/drawable/chevron_up_outline.xml b/app/src/main/res/drawable/chevron_up_outline.xml new file mode 100644 index 00000000..d93040a5 --- /dev/null +++ b/app/src/main/res/drawable/chevron_up_outline.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/stack.xml b/app/src/main/res/drawable/stack.xml new file mode 100644 index 00000000..f26699a4 --- /dev/null +++ b/app/src/main/res/drawable/stack.xml @@ -0,0 +1,15 @@ + + + + + + +