empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix text color in username link sharing bottom sheet.

Browse source
This commit is contained in:
Greyson Parrelli 2023-11-09 23:18:32 -05:00
parent 0acefb4521
commit e5b617cd16
4 changed files with 8 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameLinkShareBottomSheet.kt
View file

@ -16,12 +16,9 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.SnackbarHostState
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
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.painter.Painter
@ -33,7 +30,6 @@ import androidx.compose.ui.unit.dp
import androidx.core.os.bundleOf
import androidx.fragment.app.FragmentManager
import androidx.fragment.app.setFragmentResult
import kotlinx.coroutines.CoroutineScope
import org.signal.core.ui.BottomSheets
import org.signal.core.ui.theme.SignalTheme
import org.thoughtcrime.securesms.R
@ -58,13 +54,8 @@ class UsernameLinkShareBottomSheet : ComposeBottomSheetDialogFragment() {
@Composable
override fun SheetContent() {
val scope = rememberCoroutineScope()
val snackbarHostState: SnackbarHostState = remember { SnackbarHostState() }
Content(
usernameLink = SignalStore.account().usernameLink?.toLink() ?: "",
scope = scope,
snackbarHostState = snackbarHostState,
dismissDialog = { didCopy ->
setFragmentResult(REQUEST_KEY, bundleOf(KEY_COPY to didCopy))
dismiss()
@ -76,12 +67,9 @@ class UsernameLinkShareBottomSheet : ComposeBottomSheetDialogFragment() {
@Composable
private fun Content(
usernameLink: String,
scope: CoroutineScope,
snackbarHostState: SnackbarHostState = remember { SnackbarHostState() },
dismissDialog: (Boolean) -> Unit = {}
) {
val context = LocalContext.current
val usernameCopiedString = stringResource(id = R.string.UsernameLinkSettings_username_copied_toast)
Column(horizontalAlignment = Alignment.CenterHorizontally) {
BottomSheets.Handle()
@ -95,6 +83,7 @@ private fun Content(
)
Text(
text = usernameLink,
color = MaterialTheme.colorScheme.onSurface,
modifier = Modifier
.padding(horizontal = 24.dp)
.border(
@ -148,6 +137,7 @@ private fun ButtonRow(icon: Painter, text: String, modifier: Modifier = Modifier
)
Text(
text = text,
color = MaterialTheme.colorScheme.onSurface,
modifier = Modifier
.padding(vertical = 16.dp)
)
@ -161,8 +151,7 @@ private fun ContentPreview() {
SignalTheme {
Surface {
Content(
usernameLink = "https://signal.me#eufzLWmFFUYAOqnVJ4Zlt0KqXf87r59FC1hZ3r7WipjKvgzMBg7DBlY5DB5hQTjsw0",
scope = rememberCoroutineScope()
usernameLink = "https://signal.me#eufzLWmFFUYAOqnVJ4Zlt0KqXf87r59FC1hZ3r7WipjKvgzMBg7DBlY5DB5hQTjsw0"
)
}
}

2
app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallLinkInfoSheet.kt
View file

@ -100,7 +100,7 @@ class CallLinkInfoSheet : ComposeBottomSheetDialogFragment() {
}
}
override fun isDarkTheme(): Boolean = true
override val forceDarkTheme = true
private val webRtcCallViewModel: WebRtcCallViewModel by activityViewModels()
private val callLinkDetailsViewModel: CallLinkDetailsViewModel by viewModels(factoryProducer = {

2
app/src/main/java/org/thoughtcrime/securesms/components/webrtc/requests/CallLinkIncomingRequestSheet.kt
View file

@ -66,7 +66,7 @@ class CallLinkIncomingRequestSheet : ComposeBottomSheetDialogFragment() {
}
}
override fun isDarkTheme(): Boolean = true
override val forceDarkTheme = true
private val recipientId: RecipientId by lazy {
requireArguments().getParcelableCompat(RECIPIENT_ID, RecipientId::class.java)!!

5
app/src/main/java/org/thoughtcrime/securesms/compose/ComposeBottomSheetDialogFragment.kt
View file

@ -8,6 +8,7 @@ import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.Surface
import androidx.compose.runtime.Composable
import androidx.compose.ui.platform.ComposeView
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.ViewCompositionStrategy
import androidx.compose.ui.unit.dp
import org.signal.core.ui.theme.SignalTheme
@ -16,14 +17,14 @@ import org.thoughtcrime.securesms.util.DynamicTheme
abstract class ComposeBottomSheetDialogFragment : FixedRoundedCornerBottomSheetDialogFragment() {
protected open fun isDarkTheme(): Boolean = DynamicTheme.isDarkTheme(requireContext())
protected open val forceDarkTheme = false
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
return ComposeView(requireContext()).apply {
setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
setContent {
SignalTheme(
isDarkMode = isDarkTheme()
isDarkMode = forceDarkTheme || DynamicTheme.isDarkTheme(LocalContext.current)
) {
Surface(shape = RoundedCornerShape(18.dp, 18.dp), color = SignalTheme.colors.colorSurface1) {
SheetContent()