From be400d8f4f9289de26d70eafa001f16fc039e7e0 Mon Sep 17 00:00:00 2001 From: alansley Date: Tue, 6 Aug 2024 11:32:08 +1000 Subject: [PATCH] Removed commented out merge conflict marker --- .../conversation/start/newmessage/NewMessage.kt | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/start/newmessage/NewMessage.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/start/newmessage/NewMessage.kt index 510b03bfaf..d298c4e8e8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/start/newmessage/NewMessage.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/start/newmessage/NewMessage.kt @@ -107,22 +107,8 @@ private fun EnterAccountId( .fillMaxSize() .verticalScroll(rememberScrollState()) -//<<<<<<< HEAD -// BorderlessButtonWithIcon( -// text = stringResource(R.string.messageNewDescriptionMobile), -// modifier = Modifier -// .contentDescription(R.string.AccessibilityId_help_desk_link) -// .padding(horizontal = LocalDimensions.current.mediumSpacing) -// .fillMaxWidth(), -// style = LocalType.current.small, -// color = LocalColors.current.textSecondary, -// iconRes = R.drawable.ic_circle_question_mark, -// onClick = onHelp -// ) -// } -//======= // There is a known issue with the ime padding on android versions below 30 - /// So on these older versions we need to resort to some manual padding based on the visible height + // So on these older versions we need to resort to some manual padding based on the visible height // when the keyboard is up if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) { val keyboardHeight by keyboardHeight()