Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-26 19:56:02 +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

2
app/src/main/java/org/thoughtcrime/securesms/components/ContactFilterView.java
View File

@@ -40,7 +40,7 @@ public final class ContactFilterView extends FrameLayout {
}
public ContactFilterView(Context context, AttributeSet attrs) {
this(context, attrs, R.attr.toolbarStyle);
this(context, attrs, androidx.appcompat.R.attr.toolbarStyle);
}
public ContactFilterView(Context context, AttributeSet attrs, int defStyleAttr) {

5
app/src/main/java/org/thoughtcrime/securesms/components/FixedRoundedCornerBottomSheetDialogFragment.kt
View File

@@ -19,6 +19,7 @@ import org.thoughtcrime.securesms.R
import org.thoughtcrime.securesms.util.ThemeUtil
import org.thoughtcrime.securesms.util.ViewUtil
import org.thoughtcrime.securesms.util.WindowUtil
import com.google.android.material.R as MaterialR
/**
* Forces rounded corners on BottomSheet
@@ -59,8 +60,8 @@ abstract class FixedRoundedCornerBottomSheetDialogFragment : BottomSheetDialogFr
dialogBackground = MaterialShapeDrawable(shapeAppearanceModel)
val bottomSheetStyle = ThemeUtil.getThemedResourceId(ContextThemeWrapper(requireContext(), themeResId), R.attr.bottomSheetStyle)
backgroundColor = ThemeUtil.getThemedColor(ContextThemeWrapper(requireContext(), bottomSheetStyle), R.attr.backgroundTint)
val bottomSheetStyle = ThemeUtil.getThemedResourceId(ContextThemeWrapper(requireContext(), themeResId), MaterialR.attr.bottomSheetStyle)
backgroundColor = ThemeUtil.getThemedColor(ContextThemeWrapper(requireContext(), bottomSheetStyle), MaterialR.attr.backgroundTint)
dialogBackground.fillColor = ColorStateList.valueOf(backgroundColor)
dialog.behavior.addBottomSheetCallback(object : BottomSheetBehavior.BottomSheetCallback() {

2
app/src/main/java/org/thoughtcrime/securesms/components/SearchToolbar.java
View File

@@ -57,7 +57,7 @@ public class SearchToolbar extends LinearLayout {
this.searchItem = toolbar.getMenu().findItem(R.id.action_filter_search);
SearchView searchView = (SearchView) searchItem.getActionView();
EditText searchText = searchView.findViewById(R.id.search_src_text);
EditText searchText = searchView.findViewById(androidx.appcompat.R.id.search_src_text);
EditTextExtensionsKt.setIncognitoKeyboardEnabled(searchText, TextSecurePreferences.isIncognitoKeyboardEnabled(getContext()));

2
app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiEditText.java
View File

@@ -35,7 +35,7 @@ public class EmojiEditText extends AppCompatEditText {
}
public EmojiEditText(Context context, AttributeSet attrs) {
this(context, attrs, R.attr.editTextStyle);
this(context, attrs, androidx.appcompat.R.attr.editTextStyle);
}
public EmojiEditText(Context context, AttributeSet attrs, int defStyleAttr) {

2
app/src/main/java/org/thoughtcrime/securesms/components/segmentedprogressbar/SegmentedProgressBar.kt
View File

@@ -85,7 +85,7 @@ class SegmentedProgressBar : View, ViewPager.OnPageChangeListener, View.OnTouchL
var segmentBackgroundColor: Int = Color.WHITE
private set
var segmentSelectedBackgroundColor: Int =
context.getThemeColor(R.attr.colorAccent)
context.getThemeColor(androidx.appcompat.R.attr.colorAccent)
private set
var segmentStrokeColor: Int = Color.BLACK
private set

5
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/BackupsSettingsFragment.kt
View File

@@ -52,6 +52,7 @@ import java.math.BigDecimal
import java.util.Currency
import java.util.Locale
import kotlin.time.Duration.Companion.seconds
import org.signal.core.ui.R as CoreUiR
/**
* Top-level backups settings screen.
@@ -118,7 +119,7 @@ private fun BackupsSettingsContent(
text = stringResource(R.string.RemoteBackupsSettingsFragment__back_up_your_message_history),
color = MaterialTheme.colorScheme.onSurfaceVariant,
style = MaterialTheme.typography.bodyMedium,
modifier = Modifier.padding(horizontal = dimensionResource(R.dimen.core_ui__gutter), vertical = 16.dp)
modifier = Modifier.padding(horizontal = dimensionResource(CoreUiR.dimen.gutter), vertical = 16.dp)
)
}
@@ -326,7 +327,7 @@ private fun LoadingBackupsRow() {
modifier = Modifier
.fillMaxWidth()
.height(56.dp)
.padding(horizontal = dimensionResource(R.dimen.core_ui__gutter))
.padding(horizontal = dimensionResource(CoreUiR.dimen.gutter))
) {
CircularProgressIndicator()
}

7
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/RemoteBackupsSettingsFragment.kt
View File

@@ -105,6 +105,7 @@ import kotlin.time.Duration
import kotlin.time.Duration.Companion.days
import kotlin.time.Duration.Companion.milliseconds
import kotlin.time.Duration.Companion.seconds
import org.signal.core.ui.R as CoreUiR
/**
* Remote backups settings fragment.
@@ -272,7 +273,7 @@ class RemoteBackupsSettingsFragment : ComposeFragment() {
private inner class AuthListener : BiometricPrompt.AuthenticationCallback() {
override fun onAuthenticationFailed() {
Log.w(TAG, "onAuthenticationFailed")
Toast.makeText(requireContext(), R.string.authentication_required, Toast.LENGTH_SHORT).show()
Toast.makeText(requireContext(), androidx.media3.session.R.string.authentication_required, Toast.LENGTH_SHORT).show()
}
override fun onAuthenticationSucceeded(result: BiometricPrompt.AuthenticationResult) {
@@ -901,7 +902,7 @@ private fun InProgressBackupRow(
) {
Row(
modifier = Modifier
.padding(horizontal = dimensionResource(id = R.dimen.core_ui__gutter))
.padding(horizontal = dimensionResource(id = CoreUiR.dimen.gutter))
.padding(top = 16.dp, bottom = 14.dp)
) {
Column(
@@ -932,7 +933,7 @@ private fun LastBackupRow(
) {
Row(
modifier = Modifier
.padding(horizontal = dimensionResource(id = R.dimen.core_ui__gutter))
.padding(horizontal = dimensionResource(id = CoreUiR.dimen.gutter))
.padding(top = 16.dp, bottom = 14.dp)
) {
Column(

5
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/pnp/PhoneNumberPrivacySettingsFragment.kt
View File

@@ -34,6 +34,7 @@ import org.signal.core.ui.theme.SignalTheme
import org.thoughtcrime.securesms.R
import org.thoughtcrime.securesms.compose.ComposeFragment
import org.thoughtcrime.securesms.compose.StatusBarColorNestedScrollConnection
import org.signal.core.ui.R as CoreUiR
class PhoneNumberPrivacySettingsFragment : ComposeFragment() {
@@ -149,7 +150,7 @@ private fun Screen(
),
style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.onSurfaceVariant,
modifier = Modifier.padding(horizontal = dimensionResource(id = R.dimen.core_ui__gutter), vertical = 16.dp)
modifier = Modifier.padding(horizontal = dimensionResource(id = CoreUiR.dimen.gutter), vertical = 16.dp)
)
}
@@ -189,7 +190,7 @@ private fun Screen(
),
style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.onSurfaceVariant,
modifier = Modifier.padding(horizontal = dimensionResource(id = R.dimen.core_ui__gutter), vertical = 16.dp)
modifier = Modifier.padding(horizontal = dimensionResource(id = CoreUiR.dimen.gutter), vertical = 16.dp)
)
}
}

3
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/ideal/IdealTransferDetailsBankSelectionDialogFragment.kt
View File

@@ -30,6 +30,7 @@ import androidx.navigation.fragment.findNavController
import org.signal.core.ui.Scaffolds
import org.thoughtcrime.securesms.R
import org.thoughtcrime.securesms.compose.ComposeDialogFragment
import org.signal.core.ui.R as CoreUiR
/**
* Dialog fragment for selecting the bank for the iDEAL donation.
@@ -93,7 +94,7 @@ private fun BankSelectionContent(
.clickable { onBankSelected(it) }
.fillMaxWidth()
.defaultMinSize(minHeight = 56.dp)
.padding(horizontal = dimensionResource(id = R.dimen.core_ui__gutter), vertical = 8.dp)
.padding(horizontal = dimensionResource(id = CoreUiR.dimen.gutter), vertical = 8.dp)
) {
Image(
painter = painterResource(id = uiValues.icon),

14
app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNoteMediaNotificationProvider.kt
View File

@@ -36,6 +36,8 @@ import org.thoughtcrime.securesms.recipients.Recipient
import org.thoughtcrime.securesms.recipients.RecipientId
import org.thoughtcrime.securesms.util.AvatarUtil
import java.util.Arrays
import androidx.media3.session.R as Media3SessionR
import androidx.media3.ui.R as Media3UiR
/**
* This handles all of the notification and playback APIs for playing back a voice note.
@@ -192,9 +194,9 @@ class VoiceNoteMediaNotificationProvider(val context: Context) : MediaNotificati
commandButtons.add(
CommandButton.Builder()
.setPlayerCommand(Player.COMMAND_SEEK_TO_PREVIOUS_MEDIA_ITEM)
.setIconResId(R.drawable.exo_icon_rewind)
.setIconResId(Media3UiR.drawable.exo_icon_rewind)
.setDisplayName(
context.getString(R.string.media3_controls_seek_to_previous_description)
context.getString(Media3SessionR.string.media3_controls_seek_to_previous_description)
)
.setExtras(commandButtonExtras)
.build()
@@ -207,11 +209,11 @@ class VoiceNoteMediaNotificationProvider(val context: Context) : MediaNotificati
CommandButton.Builder()
.setPlayerCommand(Player.COMMAND_PLAY_PAUSE)
.setIconResId(
if (showPauseButton) R.drawable.exo_notification_pause else R.drawable.exo_notification_play
if (showPauseButton) Media3UiR.drawable.exo_notification_pause else Media3UiR.drawable.exo_notification_play
)
.setExtras(commandButtonExtras)
.setDisplayName(
if (showPauseButton) context.getString(R.string.media3_controls_pause_description) else context.getString(R.string.media3_controls_play_description)
if (showPauseButton) context.getString(Media3SessionR.string.media3_controls_pause_description) else context.getString(Media3SessionR.string.media3_controls_play_description)
)
.build()
)
@@ -221,9 +223,9 @@ class VoiceNoteMediaNotificationProvider(val context: Context) : MediaNotificati
commandButtons.add(
CommandButton.Builder()
.setPlayerCommand(Player.COMMAND_STOP)
.setIconResId(R.drawable.exo_notification_stop)
.setIconResId(Media3UiR.drawable.exo_notification_stop)
.setExtras(commandButtonExtras)
.setDisplayName(context.getString(R.string.media3_controls_seek_to_next_description))
.setDisplayName(context.getString(Media3SessionR.string.media3_controls_seek_to_next_description))
.build()
)
}

3
app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcAudioPicker31.kt
View File

@@ -17,6 +17,7 @@ import org.thoughtcrime.securesms.R
import org.thoughtcrime.securesms.dependencies.AppDependencies
import org.thoughtcrime.securesms.webrtc.audio.AudioDeviceMapping
import org.thoughtcrime.securesms.webrtc.audio.SignalAudioManager
import org.signal.core.ui.R as CoreUiR
/**
* This launches the bottom sheet on Android 12+ devices for selecting which audio device to use during a call.
@@ -81,7 +82,7 @@ class WebRtcAudioPicker31(private val audioOutputChangedListener: OnAudioOutputC
initialDeviceId = currentDeviceId,
onDeviceSelected = onAudioDeviceSelected,
modifier = Modifier.padding(
horizontal = dimensionResource(id = R.dimen.core_ui__gutter)
horizontal = dimensionResource(id = CoreUiR.dimen.gutter)
)
)
}

3
app/src/main/java/org/thoughtcrime/securesms/components/webrtc/requests/CallLinkIncomingRequestSheet.kt
View File

@@ -47,6 +47,7 @@ import org.thoughtcrime.securesms.recipients.Recipient
import org.thoughtcrime.securesms.recipients.RecipientId
import org.thoughtcrime.securesms.util.BottomSheetUtil
import org.thoughtcrime.securesms.util.viewModel
import org.signal.core.ui.R as CoreUiR
/**
* Displayed when the user presses the user avatar in the call link join request
@@ -153,7 +154,7 @@ private fun CallLinkIncomingRequestSheetContent(
text = state.groupsInCommon,
textAlign = TextAlign.Center,
style = MaterialTheme.typography.bodyMedium,
modifier = Modifier.padding(vertical = 6.dp, horizontal = dimensionResource(R.dimen.core_ui__gutter))
modifier = Modifier.padding(vertical = 6.dp, horizontal = dimensionResource(CoreUiR.dimen.gutter))
)
}
}

5
app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/CallAudioToggleButton.kt
View File

@@ -42,6 +42,7 @@ import org.thoughtcrime.securesms.components.webrtc.ToggleButtonOutputState
import org.thoughtcrime.securesms.components.webrtc.WebRtcAudioDevice
import org.thoughtcrime.securesms.components.webrtc.WebRtcAudioOutput
import org.thoughtcrime.securesms.components.webrtc.WebRtcAudioPicker31
import org.signal.core.ui.R as CoreUiR
private const val SHOW_PICKER_THRESHOLD = 3
@@ -221,13 +222,13 @@ private fun LegacyAudioPickerContent(
modifier = Modifier
.padding(8.dp)
.padding(
horizontal = dimensionResource(id = R.dimen.core_ui__gutter)
horizontal = dimensionResource(id = CoreUiR.dimen.gutter)
)
)
LazyColumn(
modifier = Modifier.padding(
horizontal = dimensionResource(id = R.dimen.core_ui__gutter)
horizontal = dimensionResource(id = CoreUiR.dimen.gutter)
)
) {
items(