Skip to content

Fix profile fields width by adding modifier support to BorderedTextField #1151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
EngrTaofeek merged 3 commits into from
May 6, 2025
Merged

Fix profile fields width by adding modifier support to BorderedTextField #1151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d8426b6
Fix BorderedTextField to support fillMaxWidth modifier
muhAzri May 3, 2025
44adfac
uncomment load properties for treetracker.keys.properties
muhAzri May 3, 2025
e9c4d2a
Fix BorderedTextField TextField Size To Fill Max Size Parent Size
muhAzri May 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,4 +283,4 @@ configurations.all {
}
}

apply plugin: 'com.google.gms.google-services'
apply plugin: 'com.google.gms.google-services'
10 changes: 5 additions & 5 deletions app/src/main/java/org/greenstand/android/TreeTracker/view/BorderedTextField.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import androidx.compose.foundation.BorderStroke
import androidx.compose.foundation.border
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.text.KeyboardActions
Expand All @@ -40,30 +41,29 @@ import org.greenstand.android.TreeTracker.theme.CustomTheme

@Composable
fun BorderedTextField(
modifier: Modifier = Modifier,
padding: PaddingValues = PaddingValues(0.dp),
value: String,

onValueChange: (String) -> Unit,
placeholder: @Composable (() -> Unit)? = null,
keyboardOptions: KeyboardOptions = KeyboardOptions.Default,
keyboardActions: KeyboardActions = KeyboardActions(),
onFocusChanged: ((FocusState) -> Unit) = {},
focusRequester: FocusRequester = FocusRequester.Default,
autofocusEnabled: Boolean = false
autofocusEnabled: Boolean = false,
) {
Box(
modifier = Modifier
modifier = modifier
.padding(padding)
.border(
BorderStroke(0.5.dp, SolidColor(Color.White)),
RoundedCornerShape(16.dp),
)
.padding(padding)

) {
TextField(
modifier = Modifier
.padding(8.dp)
.fillMaxSize()
.focusRequester(focusRequester)
.onFocusChanged(onFocusChanged),
value = value,
Expand Down
13 changes: 7 additions & 6 deletions app/src/main/java/org/greenstand/android/TreeTracker/view/ProfileField.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.material.MaterialTheme
import androidx.compose.material.OutlinedTextField
import androidx.compose.material.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
Expand All @@ -17,18 +15,21 @@ fun ProfileField(
label: String,
value: String,
editable: Boolean,
onValueChange: (String) -> Unit
onValueChange: (String) -> Unit,
) {
Column(modifier = Modifier.fillMaxWidth().padding(vertical = 6.dp)) {
Column(modifier = Modifier
.fillMaxWidth()
.padding(vertical = 6.dp)) {
Text(label, style = CustomTheme.typography.medium, color = CustomTheme.textColors.lightText)
if (editable) {
BorderedTextField(
padding = PaddingValues(top = 8.dp, ),
padding = PaddingValues(top = 8.dp),
value = value,
onValueChange = onValueChange,
modifier = Modifier.fillMaxWidth()
)
} else {
Text(value, style = CustomTheme.typography.large)
}
}
}
}