Fix text input alignment/direction (#3489)

* Revert text alignment change

* Set text direction of input fields based on content
pull/3485/head
codokie 8 months ago committed by GitHub
parent 72aaf43db5
commit bce545944f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -54,6 +54,7 @@ import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.text.style.TextDirection
import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
@ -482,7 +483,9 @@ object FilterCondition {
contentDescription = null contentDescription = null
) )
}, },
textStyle = MaterialTheme.typography.bodyMedium, textStyle = MaterialTheme.typography.bodyMedium.copy(
textDirection = TextDirection.Content
),
colors = Constants.textFieldColors(), colors = Constants.textFieldColors(),
) )
} }

@ -21,6 +21,7 @@ import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.text.input.KeyboardType
import androidx.compose.ui.text.style.TextDirection
import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.Preview
import org.tasks.R import org.tasks.R
import org.tasks.compose.Constants.TextButton import org.tasks.compose.Constants.TextButton
@ -108,7 +109,9 @@ object ShareInvite {
contentDescription = label contentDescription = label
) )
}, },
textStyle = MaterialTheme.typography.bodyLarge, textStyle = MaterialTheme.typography.bodyLarge.copy(
textDirection = TextDirection.Content
),
colors = textFieldColors(), colors = textFieldColors(),
) )
} }

@ -92,7 +92,6 @@ fun EditTextView(
} }
setBackgroundColor(context.getColor(android.R.color.transparent)) setBackgroundColor(context.getColor(android.R.color.transparent))
textAlignment = View.TEXT_ALIGNMENT_VIEW_START
importantForAutofill = View.IMPORTANT_FOR_AUTOFILL_NO importantForAutofill = View.IMPORTANT_FOR_AUTOFILL_NO
freezesText = true freezesText = true
setHorizontallyScrolling(false) setHorizontallyScrolling(false)

@ -31,6 +31,7 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.text.input.ImeAction
import androidx.compose.ui.text.input.KeyboardCapitalization import androidx.compose.ui.text.input.KeyboardCapitalization
import androidx.compose.ui.text.style.TextDecoration import androidx.compose.ui.text.style.TextDecoration
import androidx.compose.ui.text.style.TextDirection
import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import org.tasks.compose.CheckBox import org.tasks.compose.CheckBox
@ -170,6 +171,7 @@ fun NewSubtaskRow(
.padding(top = 12.dp), .padding(top = 12.dp),
textStyle = MaterialTheme.typography.bodyLarge.copy( textStyle = MaterialTheme.typography.bodyLarge.copy(
textDecoration = if (subtask.isCompleted) TextDecoration.LineThrough else TextDecoration.None, textDecoration = if (subtask.isCompleted) TextDecoration.LineThrough else TextDecoration.None,
textDirection = TextDirection.Content,
color = MaterialTheme.colorScheme.onSurface, color = MaterialTheme.colorScheme.onSurface,
), ),
keyboardOptions = KeyboardOptions.Default.copy( keyboardOptions = KeyboardOptions.Default.copy(

@ -24,6 +24,7 @@ import androidx.compose.ui.platform.LocalSoftwareKeyboardController
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextDirection
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp import androidx.compose.ui.unit.sp
import kotlinx.coroutines.delay import kotlinx.coroutines.delay
@ -67,6 +68,7 @@ fun TitleInput(
BasicTextField( BasicTextField(
value = text, value = text,
textStyle = TextStyle( textStyle = TextStyle(
textDirection = TextDirection.Content,
fontSize = LocalTextStyle.current.fontSize, fontSize = LocalTextStyle.current.fontSize,
color = LocalContentColor.current color = LocalContentColor.current
), ),

@ -34,7 +34,9 @@ import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.vectorResource import androidx.compose.ui.res.vectorResource
import androidx.compose.ui.state.ToggleableState import androidx.compose.ui.state.ToggleableState
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.input.KeyboardCapitalization import androidx.compose.ui.text.input.KeyboardCapitalization
import androidx.compose.ui.text.style.TextDirection
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewModelScope
import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.AndroidEntryPoint
@ -191,6 +193,9 @@ internal fun SearchBar(
focusedIndicatorColor = Color.Transparent, focusedIndicatorColor = Color.Transparent,
unfocusedIndicatorColor = Color.Transparent unfocusedIndicatorColor = Color.Transparent
), ),
textStyle = TextStyle(
textDirection = TextDirection.Content
),
modifier = Modifier.padding(start = 6.dp), modifier = Modifier.padding(start = 6.dp),
keyboardOptions = KeyboardOptions( keyboardOptions = KeyboardOptions(
capitalization = KeyboardCapitalization.Words, capitalization = KeyboardCapitalization.Words,

@ -40,7 +40,6 @@
android:inputType="textCapSentences" android:inputType="textCapSentences"
android:nextFocusLeft="@id/commentField" android:nextFocusLeft="@id/commentField"
android:nextFocusUp="@id/commentField" android:nextFocusUp="@id/commentField"
android:textAlignment="viewStart"
android:textColor="?attr/colorOnBackground" android:textColor="?attr/colorOnBackground"
android:textColorHint="?attr/colorOnBackground" android:textColorHint="?attr/colorOnBackground"
android:textCursorDrawable="@null" android:textCursorDrawable="@null"

@ -22,6 +22,7 @@ import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.focus.focusProperties import androidx.compose.ui.focus.focusProperties
import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.text.input.ImeAction
import androidx.compose.ui.text.style.TextDirection
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
val SEARCH_BAR_HEIGHT = 56.dp val SEARCH_BAR_HEIGHT = 56.dp
@ -82,7 +83,9 @@ fun SearchBar(
} }
), ),
singleLine = true, singleLine = true,
textStyle = MaterialTheme.typography.bodyLarge, textStyle = MaterialTheme.typography.bodyLarge.copy(
textDirection = TextDirection.Content
),
colors = OutlinedTextFieldDefaults.colors( colors = OutlinedTextFieldDefaults.colors(
focusedBorderColor = MaterialTheme.colorScheme.onSurface, focusedBorderColor = MaterialTheme.colorScheme.onSurface,
unfocusedBorderColor = MaterialTheme.colorScheme.onSurface, unfocusedBorderColor = MaterialTheme.colorScheme.onSurface,

Loading…
Cancel
Save