TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-21 15:05:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed commented out merge conflict marker

Browse Source
This commit is contained in:
alansley 2024-08-06 11:32:08 +10:00
parent 5cbe289a8d
commit be400d8f4f
1 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/org/thoughtcrime/securesms/conversation/start/newmessage/NewMessage.kt
View File

@ -107,22 +107,8 @@ private fun EnterAccountId(
.fillMaxSize() .fillMaxSize()
.verticalScroll(rememberScrollState()) .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 // 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 // when the keyboard is up
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) { if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) {
val keyboardHeight by keyboardHeight() val keyboardHeight by keyboardHeight()