Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 681b60df authored by Fahim M. Choudhury's avatar Fahim M. Choudhury
Browse files

refactor: update error state UI with translation

parent 77bd71e4
Loading
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ class SearchResultsContentTest {
                refresh = LoadState.NotLoading(endOfPaginationReached = true)
            )
        )
        val noAppsText = composeRule.activity.getString(R.string.no_apps_found)
        val noAppsText = composeRule.activity.getString(R.string.search_empty_results_body)

        renderSearchResults(
            tabs = listOf(SearchTabType.OPEN_SOURCE),
@@ -224,7 +224,7 @@ class SearchResultsContentTest {

    @Test
    fun emptyResults_resetOnNewQuery_showsRefreshLoading() {
        val noAppsText = composeRule.activity.getString(R.string.no_apps_found)
        val noAppsText = composeRule.activity.getString(R.string.search_empty_results_body)
        val emptyPagingData = PagingData.empty<Application>(
            sourceLoadStates = loadStates(
                refresh = LoadState.NotLoading(endOfPaginationReached = true)
+4 −4
Original line number Diff line number Diff line
@@ -41,13 +41,13 @@ class SearchErrorStateTest {
        composeRule.setContent {
            AppTheme(darkTheme = false) {
                Surface(color = MaterialTheme.colorScheme.background) {
                    SearchErrorState(fullScreen = true)
                    SearchErrorState(errorTitleStringRes = R.string.search_error_title_opensource, fullScreen = true)
                }
            }
        }

        composeRule.onNodeWithText(
            composeRule.activity.getString(R.string.search_error)
            composeRule.activity.getString(R.string.search_error_message)
        ).assertIsDisplayed()
    }

@@ -56,13 +56,13 @@ class SearchErrorStateTest {
        composeRule.setContent {
            AppTheme(darkTheme = false) {
                Surface(color = MaterialTheme.colorScheme.background) {
                    SearchErrorState(fullScreen = false)
                    SearchErrorState(errorTitleStringRes = R.string.search_error_title_opensource, fullScreen = false)
                }
            }
        }

        composeRule.onNodeWithText(
            composeRule.activity.getString(R.string.search_error)
            composeRule.activity.getString(R.string.search_error_message)
        ).assertIsDisplayed()
    }
}
+1 −9
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import androidx.annotation.StringRes
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
@@ -52,20 +51,13 @@ fun SearchErrorState(
        modifier.fillMaxWidth()
    }

    val contentPadding = if (fullScreen) {
        PaddingValues(all = 24.dp)
    } else {
        PaddingValues(horizontal = 16.dp, vertical = 12.dp)
    }

    Box(
        modifier = containerModifier,
        contentAlignment = Alignment.Center
    ) {
        Column(
            modifier = Modifier
                .fillMaxWidth()
                .padding(contentPadding),
                .fillMaxWidth(),
            horizontalAlignment = Alignment.CenterHorizontally,
            verticalArrangement = Arrangement.spacedBy(12.dp),
        ) {
+9 −0
Original line number Diff line number Diff line
@@ -22,6 +22,14 @@
    <string name="menu_settings">Einstellungen</string>
    <string name="no_apps_found">Keine Apps gefunden …</string>
    <string name="search_error">Diese Seite oder Ressource ist wegen Wartungsarbeiten nicht verfügbar.</string>
    <string name="search_error_title_playstore">Apps vorübergehend nicht verfügbar</string>
    <string name="search_error_title_opensource">Open Source vorübergehend nicht verfügbar</string>
    <string name="search_error_title_pwa">Web Apps vorübergehend nicht verfügbar</string>
    <string name="search_error_message">Dieser Katalog ist derzeit nicht erreichbar. Andere Apps-Quellen können weiterhin funktionieren.</string>
    <string name="search_empty_results_title_playstore">Keine Ergebnisse in Apps</string>
    <string name="search_empty_results_title_open_source">Keine Ergebnisse in Open Source</string>
    <string name="search_empty_results_title_pwa">Keine Ergebnisse in Web Apps</string>
    <string name="search_empty_results_body">Andere Apps-Quellen können Ergebnisse liefern. Bitte prüfe die anderen Tabs/deine Einstellungen.</string>
    <string name="apps">Anwendungen</string>
    <string name="games">Spiele</string>
    <string name="category_icon">Kategorien-Symbol</string>
@@ -93,6 +101,7 @@
    <string name="updates">Aktualisierungen</string>
    <string name="manually_install_updates_notification_text">App-Aktualisierungen werden nicht automatisch installiert</string>
    <string name="updates_notification_unmetered_network_warning">Auf ein unlimitiertes Netzwerk warten</string>
    <string name="no_internet_title">Keine Verbindung</string>
    <string name="no_internet_message">Keine Verbindung möglich. Bitte überprüfe die Internetverbindung und versuche es erneut</string>
    <string name="menu_home">Start</string>
    <string name="search_hint">App-Suche</string>
+9 −0
Original line number Diff line number Diff line
@@ -38,6 +38,14 @@
    <string name="search_clear_button">Borrar búsqueda</string>
    <string name="no_apps_found">No se encontraron aplicaciones…</string>
    <string name="search_error">Esta página o recurso no está disponible por mantenimiento.</string>
    <string name="search_error_title_playstore">Apps temporalmente no disponibles</string>
    <string name="search_error_title_opensource">Open Source temporalmente no disponible</string>
    <string name="search_error_title_pwa">Web Apps temporalmente no disponibles</string>
    <string name="search_error_message">No podemos acceder a este catálogo ahora mismo. Otras fuentes de Apps pueden seguir funcionando.</string>
    <string name="search_empty_results_title_playstore">Sin resultados en Apps</string>
    <string name="search_empty_results_title_open_source">Sin resultados en Open Source</string>
    <string name="search_empty_results_title_pwa">Sin resultados en Web Apps</string>
    <string name="search_empty_results_body">Otras fuentes de Apps pueden ofrecer resultados, revisa las otras pestañas/tu configuración.</string>
    <string name="games">Juegos</string>
    <string name="open_source">Código abierto</string>
    <string name="pwa">PWA</string>
@@ -97,6 +105,7 @@
    <string name="downloads">Descargas</string>
    <string name="updates">Actualizaciones</string>
    <string name="manually_install_updates_notification_text">Las actualizaciones no se instalarán automáticamente</string>
    <string name="no_internet_title">Sin conexión</string>
    <string name="no_internet_message">¡No se pudo conectar! Chequea tu conexión a internet e inténtalo de nuevo</string>
    <string name="updates_notification_unmetered_network_warning">Esperando una red sin contador</string>
    <string name="menu_home">Inicio</string>
Loading