Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: conversation options divider [WPB-3985] #2840

Merged
merged 3 commits into from
Apr 2, 2024
Merged

fix: conversation options divider [WPB-3985] #2840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8361bc7
fix: conversation options divider
Garzas Mar 29, 2024
20d3a34
changed color to outline
Garzas Mar 29, 2024
1f45643
detekt fix
Garzas Mar 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/src/main/kotlin/com/wire/android/ui/common/divider/WireDivider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

package com.wire.android.ui.common.divider

import androidx.compose.material3.Divider
import androidx.compose.material3.HorizontalDivider
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
Expand All @@ -27,5 +27,5 @@ import com.wire.android.ui.common.colorsScheme

@Composable
fun WireDivider(color: Color = colorsScheme().divider, modifier: Modifier = Modifier) {
Divider(color = color, thickness = Dp.Hairline, modifier = modifier)
HorizontalDivider(color = color, thickness = Dp.Hairline, modifier = modifier)
}
9 changes: 7 additions & 2 deletions ...kotlin/com/wire/android/ui/home/conversations/details/options/GroupConversationOptions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ import com.wire.android.ui.common.WireDialog
import com.wire.android.ui.common.WireDialogButtonProperties
import com.wire.android.ui.common.WireDialogButtonType
import com.wire.android.ui.common.collectAsStateLifecycleAware
import com.wire.android.ui.common.colorsScheme
import com.wire.android.ui.common.divider.WireDivider
import com.wire.android.ui.home.conversations.details.GroupConversationDetailsViewModel
import com.wire.android.ui.home.conversations.selfdeletion.SelfDeletionMapper.toSelfDeletionDuration
import com.wire.android.ui.home.conversationslist.common.FolderHeader
Expand Down Expand Up @@ -114,6 +116,8 @@ fun GroupConversationSettings(
)
}

item { WireDivider(color = colorsScheme().outline) }

item {
ServicesOption(
isSwitchEnabledAndVisible = state.isUpdatingServicesAllowed,
Expand Down Expand Up @@ -148,6 +152,7 @@ fun GroupConversationSettings(
)
}
}
item { WireDivider(color = colorsScheme().outline) }
item {
ReadReceiptOption(
isSwitchEnabled = state.isUpdatingReadReceiptAllowed,
Expand Down Expand Up @@ -361,7 +366,7 @@ fun PreviewGuestAdminTeamGroupConversationOptions() = WireTheme {
@PreviewMultipleThemes
@Composable
fun PreviewExternalMemberAdminTeamGroupConversationOptions() = WireTheme {
GroupConversationSettings(
GroupConversationSettings(
GroupConversationOptionsState(
conversationId = ConversationId("someValue", "someDomain"),
groupName = "Team Group Conversation",
Expand All @@ -382,7 +387,7 @@ GroupConversationSettings(
@PreviewMultipleThemes
@Composable
fun PreviewMemberTeamGroupConversationOptions() = WireTheme {
GroupConversationSettings(
GroupConversationSettings(
GroupConversationOptionsState(
conversationId = ConversationId("someValue", "someDomain"),
groupName = "Normal Group Conversation",
Expand Down
12 changes: 2 additions & 10 deletions ...re/android/ui/home/conversations/details/participants/GroupConversationParticipantList.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,11 @@ package com.wire.android.ui.home.conversations.details.participants

import android.content.Context
import androidx.compose.foundation.lazy.LazyListScope
import androidx.compose.material3.Divider
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.remember
import androidx.compose.ui.unit.Dp
import com.wire.android.R
import com.wire.android.model.Clickable
import com.wire.android.ui.common.divider.WireDivider
import com.wire.android.ui.home.conversations.details.participants.model.UIParticipant
import com.wire.android.ui.theme.wireColorScheme
import com.wire.android.util.extension.folderWithElements

fun LazyListScope.participantsFoldersWithElements(
Expand Down Expand Up @@ -62,10 +59,5 @@ fun LazyListScope.folderWithElements(
showRightArrow = showRightArrow
)
},
divider = {
Divider(
color = MaterialTheme.wireColorScheme.background,
thickness = Dp.Hairline
)
}
divider = { WireDivider() }
)
8 changes: 2 additions & 6 deletions ...main/kotlin/com/wire/android/ui/home/conversations/messagedetails/MessageDetailsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.setValue
import androidx.compose.ui.ExperimentalComposeUiApi
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalFocusManager
Expand Down Expand Up @@ -101,10 +100,7 @@ fun MessageDetailsScreen(
)
}

@OptIn(
ExperimentalComposeUiApi::class,
ExperimentalFoundationApi::class
)
@OptIn(ExperimentalFoundationApi::class)
@Composable
private fun MessageDetailsScreenContent(
messageDetailsState: MessageDetailsState,
Expand Down Expand Up @@ -154,7 +150,7 @@ private fun MessageDetailsScreenContent(
.fillMaxWidth()
.padding(internalPadding)
) { pageIndex ->
when (MessageDetailsTab.values()[pageIndex]) {
when (MessageDetailsTab.entries[pageIndex]) {
MessageDetailsTab.REACTIONS -> MessageDetailsReactions(
reactionsData = messageDetailsState.reactionsData,
lazyListState = lazyListStates[pageIndex],
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/kotlin/com/wire/android/ui/sharing/ImportMediaScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.foundation.pager.HorizontalPager
import androidx.compose.foundation.pager.rememberPagerState
import androidx.compose.material3.Divider
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.SnackbarHostState
import androidx.compose.material3.Text
Expand Down Expand Up @@ -405,7 +405,7 @@ private fun ImportMediaContent(
}
}
}
Divider(
HorizontalDivider(
color = colorsScheme().outline,
thickness = 1.dp,
modifier = Modifier.padding(top = dimensions().spacing12x)
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/kotlin/com/wire/android/ui/userprofile/service/ServiceDetailsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.wrapContentSize
import androidx.compose.material3.Divider
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
Expand All @@ -47,9 +47,9 @@ import com.wire.android.ui.common.button.WirePrimaryButton
import com.wire.android.ui.common.colorsScheme
import com.wire.android.ui.common.dimensions
import com.wire.android.ui.common.scaffold.WireScaffold
import com.wire.android.ui.common.snackbar.LocalSnackbarHostState
import com.wire.android.ui.common.topappbar.WireCenterAlignedTopAppBar
import com.wire.android.ui.home.conversationslist.model.Membership
import com.wire.android.ui.common.snackbar.LocalSnackbarHostState
import com.wire.android.ui.theme.wireColorScheme
import com.wire.android.ui.theme.wireDimensions
import com.wire.android.ui.theme.wireTypography
Expand Down Expand Up @@ -190,7 +190,7 @@ private fun ServiceDetailsAddOrRemoveButton(
color = MaterialTheme.wireColorScheme.background,
shadowElevation = MaterialTheme.wireDimensions.bottomNavigationShadowElevation
) {
Divider(color = colorsScheme().outline)
HorizontalDivider(color = colorsScheme().outline)
Row(
horizontalArrangement = Arrangement.Center,
verticalAlignment = Alignment.CenterVertically
Expand Down
Loading