kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-24 05:04:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4386 from kiwix/Fixes#4385

Browse Source 
Fixed: The search placeholder was cut off in the `Romansh` language.
This commit is contained in:
Kelson 2025-08-15 21:53:48 +02:00 committed by GitHub
commit fe7ded693a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/androidTest/java/org/kiwix/kiwixmobile/note/NoteFragmentTest.kt
View File

@ -145,10 +145,7 @@ class NoteFragmentTest : BaseActivityTest() {
clickOnSavedNote(composeTestRule)
clickOnOpenNote(composeTestRule)
assertNoteSaved(composeTestRule)
// to close the note dialog.
pressBack()
// to close the notes fragment.
pressBack()
closeAddNoteDialog(composeTestRule)
}
// goto local library fragment to delete the ZIM file
@ -185,7 +182,7 @@ class NoteFragmentTest : BaseActivityTest() {
assertNoteDialogDisplayed(composeTestRule)
writeDemoNote(composeTestRule)
saveNote(composeTestRule)
pressBack()
closeAddNoteDialog(composeTestRule)
openNoteFragment(kiwixMainActivity as CoreMainActivity, composeTestRule)
assertToolbarExist(composeTestRule)
clickOnSavedNote(composeTestRule)
@ -204,7 +201,7 @@ class NoteFragmentTest : BaseActivityTest() {
assertNoteDialogDisplayed(composeTestRule)
writeDemoNote(composeTestRule)
saveNote(composeTestRule)
pressBack()
closeAddNoteDialog(composeTestRule)
openNoteFragment(kiwixMainActivity as CoreMainActivity, composeTestRule)
assertToolbarExist(composeTestRule)
clickOnSavedNote(composeTestRule)
@ -227,7 +224,7 @@ class NoteFragmentTest : BaseActivityTest() {
assertNoteDialogDisplayed(composeTestRule)
writeDemoNote(composeTestRule)
saveNote(composeTestRule)
pressBack()
closeAddNoteDialog(composeTestRule)
}
// Delete that note from "Note" screen.
deletePreviouslySavedNotes()

10
app/src/androidTest/java/org/kiwix/kiwixmobile/note/NoteRobot.kt
View File

@ -36,6 +36,7 @@ import androidx.test.espresso.web.webdriver.Locator
import com.adevinta.android.barista.interaction.BaristaSleepInteractions
import org.kiwix.kiwixmobile.BaseRobot
import org.kiwix.kiwixmobile.core.R
import org.kiwix.kiwixmobile.core.main.ADD_NOTE_DIALOG_CLOSE_IMAGE_BUTTON_TESTING_TAG
import org.kiwix.kiwixmobile.core.main.ADD_NOTE_TEXT_FILED_TESTING_TAG
import org.kiwix.kiwixmobile.core.main.CoreMainActivity
import org.kiwix.kiwixmobile.core.main.DELETE_MENU_BUTTON_TESTING_TAG
@ -180,6 +181,15 @@ class NoteRobot : BaseRobot() {
})
}
fun closeAddNoteDialog(composeTestRule: ComposeContentTestRule) {
testFlakyView({
composeTestRule.apply {
waitForIdle()
onNodeWithTag(ADD_NOTE_DIALOG_CLOSE_IMAGE_BUTTON_TESTING_TAG).performClick()
}
})
}
fun clickOnDeleteIcon(composeTestRule: ComposeContentTestRule) {
testFlakyView({
composeTestRule.waitForIdle()

5
core/src/main/java/org/kiwix/kiwixmobile/core/main/AddNoteDialog.kt
View File

@ -74,6 +74,8 @@ import javax.inject.Inject
* Notes are saved as text files at location: "{External Storage}/Kiwix/Notes/ZimFileName/ArticleUrl.txt"
*/
const val ADD_NOTE_DIALOG_CLOSE_IMAGE_BUTTON_TESTING_TAG = "addNoteDialogCloseImageButtonTestingTag"
class AddNoteDialog : DialogFragment() {
private lateinit var zimId: String
private var zimFileName: String? = null
@ -180,7 +182,8 @@ class AddNoteDialog : DialogFragment() {
onClick = {
exitAddNoteDialog()
closeKeyboard()
}
},
testingTag = ADD_NOTE_DIALOG_CLOSE_IMAGE_BUTTON_TESTING_TAG
)
},
noteText = noteText.value,

5
core/src/main/java/org/kiwix/kiwixmobile/core/ui/components/KiwixSearchView.kt
View File

@ -38,6 +38,7 @@ import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.input.ImeAction
import androidx.compose.ui.text.style.TextOverflow.Companion.Ellipsis
import org.kiwix.kiwixmobile.core.R
import org.kiwix.kiwixmobile.core.utils.ComposeDimens
@ -75,7 +76,9 @@ fun KiwixSearchView(
Text(
text = placeholder,
color = Color.LightGray,
fontSize = ComposeDimens.EIGHTEEN_SP
fontSize = ComposeDimens.EIGHTEEN_SP,
maxLines = ONE,
overflow = Ellipsis
)
},
colors = colors,