diff --git a/app/src/main/java/org/kiwix/kiwixmobile/language/composables/LanguageItemRow.kt b/app/src/main/java/org/kiwix/kiwixmobile/language/composables/LanguageItemRow.kt index 2343cc8c5..3a41bfbf8 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/language/composables/LanguageItemRow.kt +++ b/app/src/main/java/org/kiwix/kiwixmobile/language/composables/LanguageItemRow.kt @@ -36,7 +36,6 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.semantics.contentDescription import androidx.compose.ui.semantics.semantics import androidx.compose.ui.semantics.testTag -import androidx.compose.ui.unit.dp import org.kiwix.kiwixmobile.core.R import org.kiwix.kiwixmobile.core.utils.ComposeDimens import org.kiwix.kiwixmobile.language.composables.LanguageListItem.LanguageItem @@ -54,7 +53,7 @@ fun LanguageItemRow( Row( modifier = modifier .fillMaxWidth() - .height(64.dp) + .height(ComposeDimens.SIXTY_FOUR_DP) .semantics { contentDescription = context.getString(R.string.select_language_content_description) } @@ -65,7 +64,7 @@ fun LanguageItemRow( ) { Checkbox( modifier = Modifier - .padding(16.dp) + .padding(ComposeDimens.SIXTEEN_DP) .semantics { testTag = "$LANGUAGE_ITEM_CHECKBOX_TESTING_TAG${language.language}" }, diff --git a/app/src/main/java/org/kiwix/kiwixmobile/language/composables/LanguageList.kt b/app/src/main/java/org/kiwix/kiwixmobile/language/composables/LanguageList.kt index ad147832e..b4b3c861a 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/language/composables/LanguageList.kt +++ b/app/src/main/java/org/kiwix/kiwixmobile/language/composables/LanguageList.kt @@ -31,8 +31,8 @@ import androidx.compose.runtime.snapshotFlow import androidx.compose.ui.Modifier import androidx.compose.ui.semantics.contentDescription import androidx.compose.ui.semantics.semantics -import androidx.compose.ui.unit.dp import org.kiwix.kiwixmobile.core.R +import org.kiwix.kiwixmobile.core.utils.ComposeDimens import org.kiwix.kiwixmobile.language.composables.LanguageListItem.HeaderItem import org.kiwix.kiwixmobile.language.composables.LanguageListItem.LanguageItem import org.kiwix.kiwixmobile.language.viewmodel.State @@ -79,7 +79,7 @@ fun LanguageList( modifier = Modifier .animateItem() .fillMaxWidth() - .height(64.dp) + .height(ComposeDimens.SIXTY_FOUR_DP) .semantics { contentDescription = context.getString(R.string.select_language_content_description) diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/ui/components/KiwixSearchView.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/ui/components/KiwixSearchView.kt index 561913183..b5140ec26 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/ui/components/KiwixSearchView.kt +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/ui/components/KiwixSearchView.kt @@ -23,6 +23,7 @@ import androidx.compose.material3.IconButton import androidx.compose.material3.Text import androidx.compose.material3.TextField import androidx.compose.material3.TextFieldDefaults +import androidx.compose.material3.minimumInteractiveComponentSize import androidx.compose.runtime.Composable import androidx.compose.runtime.SideEffect import androidx.compose.ui.Modifier @@ -58,6 +59,7 @@ fun KiwixSearchView( TextField( modifier = modifier .testTag(testTag) + .minimumInteractiveComponentSize() .focusRequester(focusRequester), singleLine = true, value = value, @@ -81,7 +83,7 @@ fun KiwixSearchView( Icon( painter = painterResource(R.drawable.ic_clear_white_24dp), tint = Color.White, - contentDescription = null + contentDescription = stringResource(R.string.searchview_description_clear) ) } } diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/utils/ComposeDimens.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/utils/ComposeDimens.kt index 00ea72ca4..8016750a2 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/utils/ComposeDimens.kt +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/utils/ComposeDimens.kt @@ -52,6 +52,7 @@ object ComposeDimens { val FOUR_DP = 4.dp val TWO_DP = 2.dp val SEVENTY_DP = 70.dp + val SIXTY_FOUR_DP = 64.dp // Font Sizes val TWENTY_FOUR_SP = 24.sp diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml index d695ed7bf..73d6694c8 100644 --- a/core/src/main/res/values/strings.xml +++ b/core/src/main/res/values/strings.xml @@ -405,4 +405,5 @@ Resuming Downloading Failed + Clear query