mirror of
https://github.com/signalapp/Signal-Android.git
synced 2026-02-25 04:06:14 +00:00
Fix backtrack symbol to change from ic_arrow_left_24 to symbol_arrow_start_24.
This commit is contained in:
@@ -77,7 +77,7 @@ class EditCallLinkNameDialogFragment : ComposeDialogFragment() {
|
||||
Scaffolds.Settings(
|
||||
title = stringResource(id = R.string.EditCallLinkNameDialogFragment__edit_call_name),
|
||||
onNavigationClick = this::dismiss,
|
||||
navigationIconPainter = painterResource(id = R.drawable.ic_arrow_left_24),
|
||||
navigationIconPainter = painterResource(id = R.drawable.symbol_arrow_start_24),
|
||||
navigationContentDescription = stringResource(id = R.string.Material3SearchToolbar__close)
|
||||
) { paddingValues ->
|
||||
val focusRequester = remember { FocusRequester() }
|
||||
|
||||
@@ -283,7 +283,7 @@ private fun CallLinkDetails(
|
||||
YouAreAlreadyInACallSnackbar(showAlreadyInACall)
|
||||
},
|
||||
onNavigationClick = callback::onNavigationClicked,
|
||||
navigationIconPainter = painterResource(id = R.drawable.ic_arrow_left_24)
|
||||
navigationIconPainter = painterResource(id = R.drawable.symbol_arrow_start_24)
|
||||
) { paddingValues ->
|
||||
if (state.callLink == null) {
|
||||
return@Settings
|
||||
|
||||
@@ -50,7 +50,7 @@ public class SearchToolbar extends LinearLayout {
|
||||
|
||||
Toolbar toolbar = findViewById(R.id.toolbar);
|
||||
|
||||
Drawable drawable = ContextCompat.getDrawable(getContext(), R.drawable.ic_arrow_left_24);
|
||||
Drawable drawable = ContextCompat.getDrawable(getContext(), R.drawable.symbol_arrow_start_24);
|
||||
toolbar.setNavigationIcon(drawable);
|
||||
toolbar.setCollapseIcon(drawable);
|
||||
toolbar.inflateMenu(R.menu.conversation_list_search);
|
||||
|
||||
@@ -93,7 +93,7 @@ class ExportAccountDataFragment : ComposeFragment() {
|
||||
Scaffolds.Settings(
|
||||
title = stringResource(id = R.string.AccountSettingsFragment__request_account_data),
|
||||
onNavigationClick = onNavigationClick,
|
||||
navigationIconPainter = painterResource(id = R.drawable.ic_arrow_left_24),
|
||||
navigationIconPainter = painterResource(id = R.drawable.symbol_arrow_start_24),
|
||||
navigationContentDescription = stringResource(id = R.string.Material3SearchToolbar__close)
|
||||
) { contentPadding ->
|
||||
Surface(
|
||||
|
||||
@@ -72,7 +72,7 @@ class AppIconSelectionFragment : ComposeFragment() {
|
||||
onNavigationClick = {
|
||||
findNavController().popBackStack()
|
||||
},
|
||||
navigationIconPainter = painterResource(id = R.drawable.ic_arrow_left_24),
|
||||
navigationIconPainter = painterResource(id = R.drawable.symbol_arrow_start_24),
|
||||
navigationContentDescription = stringResource(id = R.string.Material3SearchToolbar__close)
|
||||
) { contentPadding: PaddingValues ->
|
||||
IconSelectionScreen(appIconUtility.currentAppIcon, ::updateAppIcon, ::openLearnMore, Modifier.padding(contentPadding))
|
||||
|
||||
@@ -43,7 +43,7 @@ class AppIconTutorialFragment : ComposeFragment() {
|
||||
onNavigationClick = {
|
||||
findNavController().popBackStack()
|
||||
},
|
||||
navigationIconPainter = painterResource(id = R.drawable.ic_arrow_left_24),
|
||||
navigationIconPainter = painterResource(id = R.drawable.symbol_arrow_start_24),
|
||||
navigationContentDescription = stringResource(id = R.string.Material3SearchToolbar__close)
|
||||
) { contentPadding: PaddingValues ->
|
||||
TutorialScreen(Modifier.padding(contentPadding))
|
||||
|
||||
@@ -79,7 +79,7 @@ class ChatFoldersFragment : ComposeFragment() {
|
||||
Scaffolds.Settings(
|
||||
title = stringResource(id = R.string.ChatsSettingsFragment__chat_folders),
|
||||
onNavigationClick = { requireActivity().onNavigateUp() },
|
||||
navigationIconPainter = painterResource(id = R.drawable.ic_arrow_left_24),
|
||||
navigationIconPainter = painterResource(id = R.drawable.symbol_arrow_start_24),
|
||||
navigationContentDescription = stringResource(id = R.string.Material3SearchToolbar__close)
|
||||
) { contentPadding: PaddingValues ->
|
||||
FoldersScreen(
|
||||
|
||||
@@ -119,7 +119,7 @@ class CreateFoldersFragment : ComposeFragment() {
|
||||
requireActivity().onNavigateUp()
|
||||
}
|
||||
},
|
||||
navigationIconPainter = painterResource(id = R.drawable.ic_arrow_left_24),
|
||||
navigationIconPainter = painterResource(id = R.drawable.symbol_arrow_start_24),
|
||||
navigationContentDescription = stringResource(id = R.string.Material3SearchToolbar__close)
|
||||
) { contentPadding: PaddingValues ->
|
||||
CreateFolderScreen(
|
||||
|
||||
@@ -42,7 +42,7 @@ class HelpSettingsFragment : ComposeFragment() {
|
||||
Scaffolds.Settings(
|
||||
title = stringResource(R.string.preferences__help),
|
||||
onNavigationClick = { navController.popBackStack() },
|
||||
navigationIconPainter = painterResource(id = R.drawable.ic_arrow_left_24),
|
||||
navigationIconPainter = painterResource(id = R.drawable.symbol_arrow_start_24),
|
||||
navigationContentDescription = stringResource(id = R.string.Material3SearchToolbar__close)
|
||||
) { contentPadding ->
|
||||
LazyColumn(
|
||||
|
||||
@@ -46,7 +46,7 @@ class LicenseFragment : ComposeFragment() {
|
||||
Scaffolds.Settings(
|
||||
title = stringResource(id = R.string.HelpSettingsFragment__licenses),
|
||||
onNavigationClick = findNavController()::popBackStack,
|
||||
navigationIconPainter = painterResource(id = R.drawable.ic_arrow_left_24),
|
||||
navigationIconPainter = painterResource(id = R.drawable.symbol_arrow_start_24),
|
||||
navigationContentDescription = stringResource(id = R.string.Material3SearchToolbar__close)
|
||||
) {
|
||||
LicenseScreen(licenseTextLines = textState.value, modifier = Modifier.padding(it))
|
||||
|
||||
@@ -104,7 +104,7 @@ private fun Screen(
|
||||
Scaffolds.Settings(
|
||||
title = stringResource(id = R.string.preferences_app_protection__phone_number),
|
||||
onNavigationClick = onNavigationClick,
|
||||
navigationIconPainter = painterResource(id = R.drawable.ic_arrow_left_24),
|
||||
navigationIconPainter = painterResource(id = R.drawable.symbol_arrow_start_24),
|
||||
navigationContentDescription = stringResource(id = R.string.Material3SearchToolbar__close),
|
||||
snackbarHost = {
|
||||
SnackbarHost(snackbarHostState)
|
||||
|
||||
@@ -112,7 +112,7 @@ class ScreenLockSettingsFragment : ComposeFragment() {
|
||||
Scaffolds.Settings(
|
||||
title = stringResource(id = R.string.preferences_app_protection__screen_lock),
|
||||
onNavigationClick = { navController.popBackStack() },
|
||||
navigationIconPainter = painterResource(id = R.drawable.ic_arrow_left_24),
|
||||
navigationIconPainter = painterResource(id = R.drawable.symbol_arrow_start_24),
|
||||
navigationContentDescription = stringResource(id = R.string.Material3SearchToolbar__close)
|
||||
) { contentPadding: PaddingValues ->
|
||||
ScreenLockScreen(
|
||||
|
||||
@@ -273,7 +273,7 @@ private fun ManageStorageSettingsScreen(
|
||||
Scaffolds.Settings(
|
||||
title = stringResource(id = R.string.preferences__storage),
|
||||
onNavigationClick = onNavigationClick,
|
||||
navigationIconPainter = painterResource(id = R.drawable.ic_arrow_left_24)
|
||||
navigationIconPainter = painterResource(id = R.drawable.symbol_arrow_start_24)
|
||||
) { contentPadding ->
|
||||
Column(
|
||||
modifier = Modifier
|
||||
@@ -378,7 +378,7 @@ private fun SetKeepMessagesScreen(
|
||||
Scaffolds.Settings(
|
||||
title = stringResource(id = R.string.preferences__keep_messages),
|
||||
onNavigationClick = onNavigationClick,
|
||||
navigationIconPainter = painterResource(id = R.drawable.ic_arrow_left_24)
|
||||
navigationIconPainter = painterResource(id = R.drawable.symbol_arrow_start_24)
|
||||
) { contentPadding ->
|
||||
Column(
|
||||
modifier = Modifier
|
||||
@@ -418,7 +418,7 @@ private fun SetChatLengthLimitScreen(
|
||||
Scaffolds.Settings(
|
||||
title = stringResource(id = R.string.preferences__conversation_length_limit),
|
||||
onNavigationClick = onNavigationClick,
|
||||
navigationIconPainter = painterResource(id = R.drawable.ic_arrow_left_24)
|
||||
navigationIconPainter = painterResource(id = R.drawable.symbol_arrow_start_24)
|
||||
) { contentPadding ->
|
||||
Column(
|
||||
modifier = Modifier
|
||||
|
||||
@@ -1384,7 +1384,7 @@ class ConversationFragment :
|
||||
|
||||
private fun presentNavigationIconForNormal() {
|
||||
if (!resources.getWindowSizeClass().isSplitPane()) {
|
||||
binding.toolbar.setNavigationIcon(R.drawable.ic_arrow_left_24)
|
||||
binding.toolbar.setNavigationIcon(R.drawable.symbol_arrow_start_24)
|
||||
binding.toolbar.setNavigationContentDescription(R.string.ConversationFragment__content_description_back_button)
|
||||
binding.toolbar.setNavigationOnClickListener {
|
||||
binding.root.hideKeyboard(composeText)
|
||||
|
||||
@@ -89,7 +89,7 @@ public class AddMembersActivity extends PushContactSelectionActivity implements
|
||||
|
||||
@Override
|
||||
protected void initializeToolbar() {
|
||||
getToolbar().setNavigationIcon(R.drawable.ic_arrow_left_24);
|
||||
getToolbar().setNavigationIcon(R.drawable.symbol_arrow_start_24);
|
||||
getToolbar().setNavigationOnClickListener(v -> {
|
||||
setResult(RESULT_CANCELED);
|
||||
finish();
|
||||
|
||||
@@ -110,9 +110,9 @@ class KeyboardPageSearchView @JvmOverloads constructor(
|
||||
fun showRequested(): Boolean = state == State.SHOW_REQUESTED
|
||||
|
||||
fun enableBackNavigation(enable: Boolean = true) {
|
||||
navButton.setImageResource(if (enable) R.drawable.ic_arrow_left_24 else R.drawable.ic_search_24)
|
||||
navButton.setImageResource(if (enable) R.drawable.symbol_arrow_start_24 else R.drawable.ic_search_24)
|
||||
if (enable) {
|
||||
navButton.setImageResource(R.drawable.ic_arrow_left_24)
|
||||
navButton.setImageResource(R.drawable.symbol_arrow_start_24)
|
||||
navButton.setOnClickListener { callbacks?.onNavigationClicked() }
|
||||
} else {
|
||||
navButton.setImageResource(R.drawable.ic_search_24)
|
||||
|
||||
@@ -83,7 +83,7 @@ class EditDeviceNameFragment : ComposeFragment() {
|
||||
Scaffolds.Settings(
|
||||
title = stringResource(id = R.string.EditDeviceNameFragment__edit),
|
||||
onNavigationClick = { navController.popBackStack() },
|
||||
navigationIconPainter = painterResource(id = R.drawable.ic_arrow_left_24),
|
||||
navigationIconPainter = painterResource(id = R.drawable.symbol_arrow_start_24),
|
||||
navigationContentDescription = stringResource(id = R.string.Material3SearchToolbar__close)
|
||||
) { contentPadding: PaddingValues ->
|
||||
EditNameScreen(
|
||||
|
||||
@@ -197,7 +197,7 @@ class LinkDeviceFragment : ComposeFragment() {
|
||||
Scaffolds.Settings(
|
||||
title = stringResource(id = R.string.preferences__linked_devices),
|
||||
onNavigationClick = { navController.popOrFinish() },
|
||||
navigationIconPainter = painterResource(id = R.drawable.ic_arrow_left_24),
|
||||
navigationIconPainter = painterResource(id = R.drawable.symbol_arrow_start_24),
|
||||
navigationContentDescription = stringResource(id = R.string.Material3SearchToolbar__close)
|
||||
) { contentPadding: PaddingValues ->
|
||||
DeviceListScreen(
|
||||
|
||||
@@ -102,7 +102,7 @@ public final class WallpaperCropActivity extends BaseActivity {
|
||||
Toolbar toolbar = findViewById(R.id.toolbar);
|
||||
setSupportActionBar(toolbar);
|
||||
ActionBar supportActionBar = Objects.requireNonNull(getSupportActionBar());
|
||||
supportActionBar.setHomeAsUpIndicator(ContextCompat.getDrawable(this, R.drawable.ic_arrow_left_24));
|
||||
supportActionBar.setHomeAsUpIndicator(ContextCompat.getDrawable(this, R.drawable.symbol_arrow_start_24));
|
||||
supportActionBar.setDisplayHomeAsUpEnabled(true);
|
||||
|
||||
blur.setOnCheckedChangeListener((v, checked) -> viewModel.setBlur(checked));
|
||||
|
||||
Reference in New Issue
Block a user