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

Commit 1c050866 authored by narinder Rana's avatar narinder Rana
Browse files

Merge branch 'okSMS_v3.9.4' into '38_ui_improvements'

# Conflicts:
#   presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt
parents 0a4658e0 d84cd8ce
Loading
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ class MainActivity : QkThemedActivity(), MainView {
                scheduled.clicks().map { NavItem.SCHEDULED },
                blocking.clicks().map { NavItem.BLOCKING },
                settings.clicks().map { NavItem.SETTINGS },
                plus.clicks().map { NavItem.PLUS },

                help.clicks().map { NavItem.HELP },
                invite.clicks().map { NavItem.INVITE }))
    }
+1 −1
Original line number Diff line number Diff line
@@ -52,4 +52,4 @@ interface MainView : QkView<MainState> {

}

enum class NavItem { BACK, INBOX, ARCHIVED, BACKUP, SCHEDULED, BLOCKING, SETTINGS, PLUS, HELP, INVITE }
 No newline at end of file
enum class NavItem { BACK, INBOX, ARCHIVED, BACKUP, SCHEDULED, BLOCKING, SETTINGS,  HELP, INVITE }
 No newline at end of file
+1 −1
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ class MainViewModel @Inject constructor(
                        NavItem.SCHEDULED -> navigator.showScheduled()
                        NavItem.BLOCKING -> navigator.showBlockedConversations()
                        NavItem.SETTINGS -> navigator.showSettings()
                        NavItem.PLUS -> navigator.showQksmsPlusActivity("main_menu")

                        NavItem.HELP -> navigator.showSupport()
                        NavItem.INVITE -> navigator.showInvite()
                        else -> Unit
+0 −14
Original line number Diff line number Diff line
@@ -166,20 +166,6 @@

        </LinearLayout>

        <LinearLayout
            android:id="@+id/plus"
            style="@style/DrawerRow">

            <ImageView
                style="@style/DrawerIcon"
                android:src="@drawable/ic_star_black_24dp"
                android:tint="?android:attr/textColorSecondary" />

            <com.moez.QKSMS.common.widget.QkTextView
                style="@style/DrawerText"
                android:text="@string/drawer_plus" />

        </LinearLayout>

        <LinearLayout
            android:id="@+id/help"
+12 −12
Original line number Diff line number Diff line
@@ -16,15 +16,14 @@
  ~
  ~ You should have received a copy of the GNU General Public License
  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
  -->
<resources>
  --><resources>
    <string name="shortcut_compose_long_label">Nueva conversación</string>
    <string name="shortcut_compose_short_label">Redactar</string>
    <string name="shortcut_compose_disabled_message">Acceso directo deshabilitado</string>
    <string name="title_archived">Archivados</string>
    <string name="title_settings">Configuración</string>
    <string name="title_notification_prefs">Notificaciones</string>
    <string name="title_conversations">Buscar mensaje&#8230;</string>
    <string name="title_conversations">Buscar mensaje</string>
    <string name="title_compose">Escriba un nombre o número</string>
    <string name="setup_skip">Omitir</string>
    <string name="setup_next">Continuar</string>
@@ -92,7 +91,7 @@
    <string name="compose_scheduled_for">Programado para</string>
    <string name="compose_scheduled_future">El tiempo seleccionado debe de ser en el futuro!</string>
    <string name="compose_scheduled_toast">Añadido a los mensajes programados</string>
    <string name="compose_hint">Escribir mensaje&#8230;</string>
    <string name="compose_hint">Escribir mensaje</string>
    <string name="compose_menu_copy">Copiar texto</string>
    <string name="compose_menu_forward">Reenviar</string>
    <string name="compose_menu_delete">Eliminar</string>
@@ -120,7 +119,7 @@
    <string name="compose_sim_changed_toast">SIM %1$d (%2$s) seleccionada</string>
    <string name="compose_sim_cd">%s seleccionado, cambia la tarjeta SIM</string>
    <string name="compose_send_cd">Enviar mensaje</string>
    <string name="message_status_sending">Enviando&#8230;</string>
    <string name="message_status_sending">Enviando</string>
    <string name="message_status_delivered">Entregado %s</string>
    <string name="message_status_failed">No se pudo enviar. Pulse para volver a intentarlo</string>
    <string name="info_title">Detalles</string>
@@ -138,12 +137,12 @@
    <string name="backup_backing_up">Respaldando mensajes</string>
    <string name="backup_restoring">Restaurar desde copia de seguridad</string>
    <string name="backup_last">Última copia de seguridad</string>
    <string name="backup_loading">Cargando&#8230;</string>
    <string name="backup_loading">Cargando</string>
    <string name="backup_never">Nunca</string>
    <string name="backup_restore_title">Restaurar</string>
    <string name="backup_restore_summary">Seleccione una copia de seguridad</string>
    <string name="backup_restore_error_backup">Copia de seguridad en progreso&#8230;</string>
    <string name="backup_restore_error_restore">Restauración en progreso&#8230;</string>
    <string name="backup_restore_error_backup">Copia de seguridad en progreso</string>
    <string name="backup_restore_error_restore">Restauración en progreso</string>
    <string name="backup_restore_confirm_title">Restaurar desde copia de seguridad</string>
    <string name="backup_restore_confirm_message">¿Está seguro de que desea restaurar sus mensajes desde esta copia de seguridad?</string>
    <string name="backup_restore_stop_title">Detener restauración</string>
@@ -156,10 +155,10 @@
    </plurals>
    <string name="backup_disclaimer">Actualmente, sólo los SMS son soportados por la copia de seguridad y restauración. ¡El soporte para MMS y las copias de seguridad programadas se realizarán pronto!</string>
    <string name="backup_now">Copiar ahora</string>
    <string name="backup_progress_parsing">Analizando copia de seguridad&#8230;</string>
    <string name="backup_progress_parsing">Analizando copia de seguridad</string>
    <string name="backup_progress_running">%d/%d mensajes</string>
    <string name="backup_progress_saving">Guardando copia de seguridad&#8230;</string>
    <string name="backup_progress_syncing">Sincronizando mensajes&#8230;</string>
    <string name="backup_progress_saving">Guardando copia de seguridad</string>
    <string name="backup_progress_syncing">Sincronizando mensajes</string>
    <string name="backup_progress_finished">¡Terminado!</string>
    <string name="backup_notification_channel_name">Copiar y restaurar</string>
    <string name="scheduled_title">Programado</string>
@@ -315,7 +314,7 @@
    <string name="qksms_plus_respond_summary">Responder automáticamente a mensajes entrantes con una respuesta preestablecida</string>
    <string name="qksms_plus_more_title">Más</string>
    <string name="qksms_plus_more_summary">QKSMS está bajo desarollo activo, y sus compras incluirán todas las características futuras de QKSMS+!</string>
    <string name="widget_loading">Cargando&#8230;</string>
    <string name="widget_loading">Cargando</string>
    <string name="widget_more">Ver más conversaciones</string>
    <string name="qkreply_menu_read">Marcar como leído</string>
    <string name="qkreply_menu_call">Llamar</string>
@@ -396,4 +395,5 @@
        <item>JAJAJA</item>
        <item>Está bien</item>
    </string-array>
    <string name="app_name">Mensajes</string>
</resources>