Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-21 17:29:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Enable nonTransitiveRClass.

Browse Source 
Resolves #13757
This commit is contained in:
Jameson Williams
2024-10-30 01:54:04 -05:00
committed by Greyson Parrelli
parent c35242c525
commit 769a92943e
55 changed files with 116 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/thoughtcrime/securesms/nicknames/NicknameActivity.kt
View File

@@ -12,7 +12,6 @@ import android.os.Bundle
import androidx.activity.compose.setContent
import androidx.activity.result.contract.ActivityResultContract
import androidx.compose.animation.AnimatedVisibility
import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
@@ -60,6 +59,7 @@ import org.thoughtcrime.securesms.avatar.AvatarImage
import org.thoughtcrime.securesms.recipients.RecipientId
import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme
import org.thoughtcrime.securesms.util.viewModel
import org.signal.core.ui.R as CoreUiR
/**
* Fragment allowing a user to set a custom nickname for the given recipient.
@@ -226,7 +226,7 @@ private fun NicknameContent(
Column(
modifier = Modifier
.padding(paddingValues)
.padding(horizontal = dimensionResource(id = R.dimen.core_ui__gutter))
.padding(horizontal = dimensionResource(id = CoreUiR.dimen.gutter))
) {
LazyColumn(modifier = Modifier.weight(1f)) {
item {
@@ -407,7 +407,6 @@ private fun ClearableTextFieldPreview() {
}
}
@OptIn(ExperimentalFoundationApi::class)
@Composable
private fun ClearableTextField(
value: String,

4
app/src/main/java/org/thoughtcrime/securesms/nicknames/ViewNoteSheet.kt
View File

@@ -41,6 +41,7 @@ import org.thoughtcrime.securesms.components.emoji.EmojiTextView
import org.thoughtcrime.securesms.compose.ComposeBottomSheetDialogFragment
import org.thoughtcrime.securesms.recipients.RecipientId
import org.thoughtcrime.securesms.util.viewModel
import org.signal.core.ui.R as CoreUiR
/**
* Allows user to view the full note for a given recipient.
@@ -117,7 +118,7 @@ private fun ViewNoteBottomSheetContent(
) {
Column(
horizontalAlignment = Alignment.CenterHorizontally,
modifier = Modifier.padding(horizontal = dimensionResource(id = R.dimen.core_ui__gutter))
modifier = Modifier.padding(horizontal = dimensionResource(id = CoreUiR.dimen.gutter))
) {
BottomSheets.Handle()
@@ -151,7 +152,6 @@ private fun ViewNoteBottomSheetContent(
factory = { context ->
val view = EmojiTextView(context)
@Suppress("DEPRECATION")
view.setTextAppearance(context, R.style.Signal_Text_BodyLarge)
view.movementMethod = LinkMovementMethodCompat.getInstance()