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

Commit 547cb838 authored by stefan-niedermann's avatar stefan-niedermann
Browse files

Merge remote-tracking branch 'origin/master' into synchronize-on-wifi-only

parents 8fc33376 3d86ba1b

README.md

+4 −3
Original line number Diff line number Diff line
@@ -15,8 +15,9 @@ An android client for [Nextcloud Notes App](https://github.com/nextcloud/notes/) 


## :eyes: Screenshots



![Screenshot of list view](/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png)

![Screenshot of edit view](/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png)

| Navi | List View | Edit Mode |

| :--: | :--: | :--: |

| ![Screenshot of categories in sidebar](/fastlane/metadata/android/en-US/images/phoneScreenshots/5.png) | ![Screenshot of list view](/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png) | ![Screenshot of edit view](/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png) |



## :rocket: Features

* List, create, edit, share, search and delete notes
@@ -26,10 +27,10 @@ An android client for [Nextcloud Notes App](https://github.com/nextcloud/notes/) 
* In-note search ([#106](https://github.com/stefan-niedermann/nextcloud-notes/issues/106))

* Render MarkDown (using [RxMarkdown](https://github.com/yydcdut/RxMarkdown))

* Translated in many languages on [Transifex](https://www.transifex.com/nextcloud/nextcloud/android-notes/)

* Context based formatting ([#363](https://github.com/stefan-niedermann/nextcloud-notes/issues/363))



## :checkered_flag: Planned features

* Toggle checkboxes in view mode ([#451](https://github.com/stefan-niedermann/nextcloud-notes/issues/451))

* Context based formatting ([#363](https://github.com/stefan-niedermann/nextcloud-notes/issues/363))

* Trashbin ([#238](https://github.com/stefan-niedermann/nextcloud-notes/issues/238))



## :family: Join the team

app/build.gradle

+2 −2
Original line number Diff line number Diff line
@@ -13,8 +13,8 @@ android { 
        applicationId "it.niedermann.owncloud.notes"

        minSdkVersion 14

        targetSdkVersion 28

        versionCode 38

        versionName "0.22.4"

        versionCode 40

        versionName "0.24.0"

    }

    buildTypes {

        release {

app/src/main/java/it/niedermann/owncloud/notes/util/StyleCallback.java

+14 −3
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ package it.niedermann.owncloud.notes.util; 


import android.graphics.Typeface;

import android.text.SpannableStringBuilder;

import android.text.TextUtils;

import android.text.style.StyleSpan;

import android.util.SparseIntArray;

import android.view.ActionMode;
@@ -80,12 +81,22 @@ public class StyleCallback implements ActionMode.Callback { 
                editText.setSelection(end + markdown.length() * 2);

                break;

            case R.id.link:

                boolean textToFormatIsLink = TextUtils.indexOf(editText.getText().subSequence(start, end), "http") == 0;

                if(textToFormatIsLink) {

                    ssb.insert(end, ")");

                    ssb.insert(start, "[](");

                } else {

                    ssb.insert(end, "]()");

                    ssb.insert(start, "[");

                }

                end++;

                ssb.setSpan(new StyleSpan(Typeface.NORMAL), start, end, 1);

                editText.setText(ssb);

                if(textToFormatIsLink) {

                    editText.setSelection(start + 1);

                } else {

                    editText.setSelection(end + 2); // after <end>](

                }

                return true;

        }

        return false;

app/src/main/res/values-b+en+001/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
    <string name="label_favorites">Favourites</string>

    <string name="action_create">New note</string>

    <string name="action_settings">Settings</string>

    <string name="action_trashbin">Deleted notes</string>

    <string name="action_search">Search</string>

    <string name="action_create_save">Save</string>

    <string name="simple_cancel">Cancel</string>
@@ -38,6 +39,8 @@ 
    <string name="listview_updated_this_month">This month</string>

    <string name="listview_updated_earlier">Earlier</string>



    <!-- Settings -->

    <string name="settings_server_settings">Account</string>

    <string name="settings_url">Server address</string>

    <string name="settings_url_check_description">Shows whether the address can be pinged.</string>

    <string name="settings_url_warn_http">WARNING: \"http\" is unsafe. Please use \"https\".</string>
@@ -49,6 +52,7 @@ 
    <string name="settings_submitting">Connecting &#8230;</string>

    <string name="settings_note_mode">Display mode for Notes</string>

    <string name="settings_theme_title">Theme</string>

    <string name="settings_cert_category">Manage certificates</string>

    <string name="settings_cert_trust_system">Trust system certificates</string>

    <string name="settings_cert_trust_system_on">System and user-added CAs will be trusted (recommended)</string>

    <string name="settings_cert_trust_system_off">System and user-added CAs won\'t be trusted</string>

app/src/main/res/values-ca/strings.xml

+70 −44
Original line number Diff line number Diff line
@@ -2,89 +2,115 @@ 
<resources>



    <string name="app_name">Notes</string>

    <string name="no_notes">No hi ha notes encara</string>

    <string name="action_create">Nova nota</string>

    <string name="no_notes">Encara no hi ha notes</string>

    <string name="label_all_notes">Totes les notes</string>

    <string name="label_favorites">Preferits</string>

    <string name="action_create">Crea una nota</string>

    <string name="action_settings">Paràmetres</string>

    <string name="action_create_save">Guardar</string>

    <string name="simple_cancel">Cancel·lar</string>

    <string name="simple_edit">Editar</string>

    <string name="action_edit_save">Guardar</string>

    <string name="action_edit_saving">Guardant &#8230;</string>

    <string name="action_edit_saved">Guardat</string>

    <string name="action_edit_cancel">Cancel·lar</string>

    <string name="simple_about">Sobre</string>

    <string name="action_trashbin">Notes eliminades</string>

    <string name="action_search">Cerca</string>

    <string name="action_create_save">Desa</string>

    <string name="simple_cancel">Cancel·la</string>

    <string name="simple_edit">Edita</string>

    <string name="action_edit_save">Desa</string>

    <string name="action_edit_saving">S\'està desant &#8230;</string>

    <string name="action_edit_saved">S\'ha desat</string>

    <string name="simple_about">Quant a</string>

    <string name="action_select_note">Selecciona una nota</string>

    <string name="action_note_deleted">S\\\'ha esborrat la nota</string>

    <string name="action_note_restored">S\\\'ha restaurat la nota</string>

    <string name="action_undo">Des-fes</string>

    <string name="menu_delete">Esborrar</string>

    <string name="menu_copy">Copiar</string>

    <string name="menu_edit">Editar</string>

    <string name="menu_cancel">Cancel·lar</string>

    <string name="action_note_deleted">S\'ha eliminat la nota</string>

    <string name="action_note_restored">S\'ha restaurat la nota</string>

    <string name="action_undo">Desfés</string>

    <string name="action_recent">Recents</string>

    <string name="action_uncategorized">Sense categoria</string>

    <string name="menu_delete">Elimina</string>

    <string name="menu_change_category">Categoria</string>

    <string name="menu_favorite">Preferit</string>

    <string name="menu_preview">Previsuatlització</string>

    <string name="menu_share">Compartir</string>

    <string name="menu_about">Sobre</string>

    <string name="menu_share">Comparteix</string>

    <string name="menu_about">Quant a</string>



    <string name="copy">Copiar</string>

    <string name="change_category_title">Tria una categoria</string>



    <string name="listview_updated_today">Avui</string>

    <string name="listview_updated_yesterday">Ahir</string>

    <string name="listview_updated_this_week">Aquesta setmana</string>

    <string name="listview_updated_this_month">Aquest mes</string>

    <string name="listview_updated_earlier">Aviat</string>



    <!-- Settings -->

    <string name="settings_server_settings">Compte</string>

    <string name="settings_url">Adreça del servidor</string>

    <string name="settings_url_check_description">Mostra si es pot fer ping a l\\\'adreça</string>

    <string name="settings_url_warn_http">ATENCIÓ: \"http\" és insegur. Si us plau utilitzeu \"https\".</string>

    <string name="settings_username">Nom d\\\'usuari</string>

    <string name="settings_username">Nom d\'usuari</string>

    <string name="settings_password">Contrasenya</string>

    <string name="settings_password_check_description">Mostar si les credencials son correctes</string>

    <string name="settings_password_check_description">Mostra si les credencials són correctes.</string>

    <string name="settings_submit">Connecta</string>

    <string name="settings_submitting">Conectant &#8230;</string>

    <string name="settings_notification">Habilitar per a mostrar una notificació permanent per a crear noves notes ràpidament</string>

    <string name="settings_submitting">S\'està connectant &#8230;</string>

    <string name="settings_note_mode">Mode de visualització de les notes</string>

    <string name="settings_theme_title">Tema</string>

    <string name="settings_cert_category">Gestiona els certificats</string>

    <!-- Network -->

    <string name="network_connecting">Connectant</string>

    <string name="network_connected">Connectant</string>

    <string name="network_disconnected">No hi ha connexió disponible</string>

    <string name="network_connecting">S\'està connectant</string>

    <string name="network_connected">S\'ha connectat</string>

    <string name="network_disconnected">No hi ha cap connexió disponible</string>



    <!-- Error -->

    <string name="error_sync">Error en la sincronització: %1$s</string>

    <string name="error_sync">Ha fallat la sincronització: %1$s</string>

    <string name="error_invalid_login">Inici de sessió invàlid: %1$s</string>

    <string name="error_io">S\\\'ha trencat la connecció amb el servidor</string>

    <string name="error_json">L\'aplicació Notes està activada al servidor?</string>

    <string name="error_io">S\'ha trencat la connexió amb el servidor</string>

    <string name="error_no_network">No hi ha connexió a la xarxa</string>

    <string name="error_server">L\\\'URL/Server conté errors</string>

    <string name="error_url_malformed">Adreça del servidor incorrecta</string>

    <string name="error_username_password_invalid">Usuari o contrasenya erroni</string>

    <string name="error_server">L\'URL o el servidor contenen errors</string>

    <string name="error_url_malformed">L\'adreça del servidor és incorrecta</string>

    <string name="error_username_password_invalid">El nom d\'usuari o la contrasenya són incorrectes</string>



    <!-- Snackbar Actions -->

    <string name="snackbar_settings">Paràmetres</string>



    <!-- About -->

    <string name="about_version_title">Versió</string>

    <string name="about_version">Actualment esteu utilitzant la versió &lt;strong>%1$s&lt;/strong></string>

    <string name="about_maintainer_title">Manteniment</string>

    <string name="about_developers_title">Desenvolupadors</string>

    <string name="about_translators_title">Traductors</string>

    <string name="about_testers_title">Provadors</string>

    <string name="about_developers_title">Desenvolupament</string>

    <string name="about_translators_title">Traducció</string>

    <string name="about_translators_transifex">Comunitat del Nextcloud a &lt;a href=\"%1$s\">Transifex&lt;/a></string>

    <string name="about_testers_title">Verificació</string>

    <string name="about_source_title">Codi font</string>

    <string name="about_source">Aquest projecte està hostatjat a Github: &lt;a href=\"%1$s\">%1$s&lt;/a></string>

    <string name="about_issues_title">Problemes</string>

    <string name="about_translate_title">Tradueix</string>

    <string name="about_translate">Uneix-te a l\'equip Nextcloud a Transifex i ajuda\'ns a traduïr aquesta aplicacio: &lt;a href=\"%1$s\">%1$s&lt;/a></string>

    <string name="about_app_license_title">Llicència de l\\\'aplicació</string>

    <string name="about_app_license_title">Llicència de l\'aplicació</string>

    <string name="about_app_license">Aquesta aplicació està llicenciada sota GNU GENERAL PUBLIC LICENSE v3+</string>

    <string name="about_app_license_button">Veure llicència</string>

    <string name="about_app_license_button">Mostra la llicència</string>

    <string name="about_icons_disclaimer_title">Icones</string>

    <string name="about_credits_tab_title">Crèdits</string>

    <string name="about_contribution_tab_title">Contribució</string>

    <string name="about_license_tab_title">Llicència</string>



    <string name="widget_all_notes_title">Totes les notes</string>

    <!-- Widgets -->

    <string name="widget_note_list_title">Llista de notes</string>

    <string name="widget_note_list_placeholder">No hi ha notes</string>

    <string name="widget_single_note_title">Una nota</string>

    <string name="widget_single_note_placeholder_tv">No s\'ha trobat la nota</string>

    <string name="widget_create_note">Crea una nota</string>

    <string name="widget_not_logged_in">Inicieu sessió a Notes abans de fer servir aquest widget</string>

    <string name="widget_entry_fav_contentDescription">La icona de l\'estrella serveix per marcar un element com a preferit</string>

    <string name="widget_app_launcher_contentDescription">Executa l\'aplicació</string>



    <string name="activity_select_single_note">Tria una nota</string>



    <!-- Shortcuts -->

    <string name="shortcut_create_long">Crea una nota nova</string>



    <string name="pref_value_theme_light">Clar</string>

    <string name="pref_value_theme_dark">Fosc</string>



    <!-- Array: note modes -->

    <string-array name="noteMode_entries">

        <item>Recorda la darrera selecció</item>

    </string-array>



    <!-- Plurals -->

    <plurals name="ab_selected">

        <item quantity="one">%d escollit</item>

        <item quantity="other">%d escollits</item>

        <item quantity="one">%d seleccionada</item>

        <item quantity="other">%d seleccionades</item>

    </plurals>

</resources>