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

Commit f1118418 authored by Stefan Niedermann's avatar Stefan Niedermann
Browse files

Merge branch 'master' into gridview

parents 4bb5f751 1a0c9b23
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -27,9 +27,9 @@ An android client for [Nextcloud Notes App](https://github.com/nextcloud/notes/)

## :eyes: Screenshots

| Navi | List View | Edit Mode |
| List View | Edit Mode | Preview |
| :--: | :--: | :--: |
| ![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) |
| ![Screenshot of list view](/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png) | ![Screenshot of edit mode](/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png) | ![Screenshot of preview](/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png) |

## :rocket: Features
  * Multiple accounts
+4 −4
Original line number Diff line number Diff line
@@ -11,10 +11,10 @@ android {

    defaultConfig {
        applicationId "it.niedermann.owncloud.notes"
        minSdkVersion 16
        minSdkVersion 17
        targetSdkVersion 29
        versionCode 2014000
        versionName "2.14.0"
        versionCode 2014001
        versionName "2.14.1"
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
    }

@@ -68,7 +68,7 @@ dependencies {

    // Android X
    implementation "androidx.appcompat:appcompat:1.1.0"
    implementation "androidx.fragment:fragment:1.2.4"
    implementation "androidx.fragment:fragment:1.2.5"
    implementation "androidx.preference:preference:1.1.1"
    implementation "androidx.recyclerview:recyclerview:1.1.0"
    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.0.0'
+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ public class CategoryAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
        this.categories.add(0, clearItem);
        if (currentSearchString != null && currentSearchString.trim().length() > 0) {
            boolean currentSearchStringIsInCategories = false;
            for (NavigationItem category : categories.subList(1, categories.size())) {
            for (NavigationItem category : categories) {
                if (currentSearchString.equals(category.label)) {
                    currentSearchStringIsInCategories = true;
                    break;
+22 −8
Original line number Diff line number Diff line
@@ -130,13 +130,13 @@ public class FormattingHelpActivity extends BrandedActivity {
                getString(R.string.formatting_help_checkbox_checked, getString(R.string.formatting_help_checkboxes_body_2)) + lineBreak +
                getString(R.string.formatting_help_checkbox_unchecked, getString(R.string.formatting_help_checkboxes_body_3)) + lineBreak;

        final String structuredDocuments = getString(R.string.formatting_help_structured_documents_body_1) + lineBreak +
        final String structuredDocuments = getString(R.string.formatting_help_structured_documents_body_1, "`#`", "`##`") + lineBreak +
                lineBreak +
                getString(R.string.formatting_help_title_level_3, getString(R.string.formatting_help_structured_documents_body_2)) + lineBreak +
                lineBreak +
                getString(R.string.formatting_help_structured_documents_body_3) + lineBreak +
                getString(R.string.formatting_help_structured_documents_body_3, "`#`", "`######`") + lineBreak +
                lineBreak +
                getString(R.string.formatting_help_structured_documents_body_4) + lineBreak +
                getString(R.string.formatting_help_structured_documents_body_4, getString(R.string.formatting_help_quote_keyword)) + lineBreak +
                lineBreak +
                getString(R.string.formatting_help_quote, getString(R.string.formatting_help_structured_documents_body_5)) + lineBreak +
                getString(R.string.formatting_help_quote, getString(R.string.formatting_help_structured_documents_body_6)) + lineBreak;
@@ -148,16 +148,30 @@ public class FormattingHelpActivity extends BrandedActivity {
        return getString(R.string.formatting_help_title, getString(R.string.formatting_help_cbf_title)) + lineBreak +
                lineBreak +
                getString(R.string.formatting_help_cbf_body_1) + lineBreak +
                getString(R.string.formatting_help_cbf_body_2) + lineBreak +
                getString(R.string.formatting_help_cbf_body_2,
                        getString(R.string.formatting_help_codefence_inline, getString(android.R.string.cut)),
                        getString(R.string.formatting_help_codefence_inline, getString(android.R.string.copy)),
                        getString(R.string.formatting_help_codefence_inline, getString(android.R.string.selectAll)),
                        getString(R.string.formatting_help_codefence_inline, getString(R.string.simple_link)),
                        getString(R.string.formatting_help_codefence_inline, getString(R.string.simple_checkbox))
                ) + lineBreak +
                lineBreak +
                divider + lineBreak +
                lineBreak +
                getString(R.string.formatting_help_title, getString(R.string.formatting_help_text_title)) + lineBreak +
                lineBreak +
                getString(R.string.formatting_help_text_body) + lineBreak +
                getString(R.string.formatting_help_text_body,
                        getString(R.string.formatting_help_bold),
                        getString(R.string.formatting_help_italic),
                        getString(R.string.formatting_help_strike_through)
                ) + lineBreak +
                lineBreak +
                codefence + lineBreak +
                getString(R.string.formatting_help_text_body) + lineBreak +
                getString(R.string.formatting_help_text_body,
                        getString(R.string.formatting_help_bold),
                        getString(R.string.formatting_help_italic),
                        getString(R.string.formatting_help_strike_through)
                ) + lineBreak +
                codefence + lineBreak +
                lineBreak +
                divider + lineBreak +
@@ -196,8 +210,8 @@ public class FormattingHelpActivity extends BrandedActivity {
                lineBreak +
                getString(R.string.formatting_help_code_body_1) + lineBreak +
                lineBreak +
                getString(R.string.formatting_help_codefence_inline_escaped) + getString(R.string.formatting_help_code_javascript_inline) + getString(R.string.formatting_help_codefence_inline_escaped) + lineBreak +
                getString(R.string.formatting_help_codefence_inline) + getString(R.string.formatting_help_code_javascript_inline) + getString(R.string.formatting_help_codefence_inline) + lineBreak +
                getString(R.string.formatting_help_codefence_inline_escaped, getString(R.string.formatting_help_code_javascript_inline)) + lineBreak +
                getString(R.string.formatting_help_codefence_inline, getString(R.string.formatting_help_code_javascript_inline)) + lineBreak +
                lineBreak +
                getString(R.string.formatting_help_code_body_2) + lineBreak +
                lineBreak +
+13 −9
Original line number Diff line number Diff line
@@ -240,8 +240,8 @@
    <string name="formatting_help_title" translatable="false"># %1$s</string>
    <string name="formatting_help_title_level_3" translatable="false">### %1$s</string>
    <string name="formatting_help_divider" translateable="false">---</string>
    <string name="formatting_help_codefence_inline" translateable="false">`</string>
    <string name="formatting_help_codefence_inline_escaped" translateable="false">\\`</string>
    <string name="formatting_help_codefence_inline" translateable="false">`%1$s`</string>
    <string name="formatting_help_codefence_inline_escaped" translateable="false">\\`%1$s\\`</string>
    <string name="formatting_help_codefence" translateable="false">```</string>
    <string name="formatting_help_codefence_escaped" translatable="false">\\`\\`\\`</string>
    <string name="formatting_help_javascript_1" translatable="false">if (isAwesome){</string>
@@ -255,13 +255,17 @@
    <string name="formatting_help_checkbox_checked" translatable="false">- [x] %1$s</string>
    <string name="formatting_help_checkbox_unchecked" translatable="false">- [ ] %1$s</string>
    <string name="formatting_help_quote" translatable="false">&gt; %1$s</string>
    <string name="formatting_help_quote_keyword" translatable="false">&gt;</string>
    <string name="formatting_help_strike_through" translatable="false">~~</string>
    <string name="formatting_help_bold" translatable="false">**</string>
    <string name="formatting_help_italic" translatable="false">*</string>

    <string name="formatting_help_cbf_title">Context based formatting</string>
    <string name="formatting_help_cbf_body_1">A major design goal of the Notes app is to provide a distraction free tool. Though you will be able to format your texts with Markdown. For various of the below mentioned examples, you can use shortcuts so you can format your notes without typing in the codes below.</string>
    <string name="formatting_help_cbf_body_2">Just select a range of text or tap on your cursor at any position and you will get a popup menu which contains next to the default entries `Cut`, `Copy`, `Select all` entries like `Link` or `Checkbox`.</string>
    <string name="formatting_help_cbf_body_2">Just select a range of text or tap on your cursor at any position and you will get a popup menu which contains next to the default entries %1$s, %2$s, %3$s entries like %4$s or %5$s.</string>

    <string name="formatting_help_text_title">Text</string>
    <string name="formatting_help_text_body">It\'s very easy to make some words **bold** and other words *italic* with Markdown. You can ~~strike~~ some words through and even [link to Nextcloud](https://nextcloud.com).</string>
    <string name="formatting_help_text_body">It\'s very easy to make some words %1$sbold%1$s and other words %2$sitalic%2$s with Markdown. You can %3$sstrike%3$s some words through and even [link to Nextcloud](https://nextcloud.com).</string>

    <string name="formatting_help_lists_title">Lists</string>
    <string name="formatting_help_lists_body_1">Sometimes you want numbered lists:</string>
@@ -280,12 +284,12 @@
    <string name="formatting_help_checkboxes_body_3">Item 2</string>

    <string name="formatting_help_structured_documents_title">Structured documents</string>
    <string name="formatting_help_structured_documents_body_1">Sometimes it\'s useful to have different levels of headings to structure your documents. Start lines with a `#` to create headings. Multiple `##` in a row denote smaller heading sizes.</string>
    <string name="formatting_help_structured_documents_body_1">Sometimes it\'s useful to have different levels of headings to structure your documents. Start lines with a %1$s to create headings. Multiple %2$s in a row denote smaller heading sizes.</string>
    <string name="formatting_help_structured_documents_body_2">This is a third-tier heading</string>
    <string name="formatting_help_structured_documents_body_3">You can use one `#` all the way up to `######` six for different heading sizes.</string>
    <string name="formatting_help_structured_documents_body_4">If you\'d like to quote someone, use the > character before the line:</string>
    <string name="formatting_help_structured_documents_body_5">Coffee. The finest organic suspension ever devised I beat the Borg with it.</string>
    <string name="formatting_help_structured_documents_body_6">- Captain Janeway</string>
    <string name="formatting_help_structured_documents_body_3">You can use one %1$s all the way up to %2$s six for different heading sizes.</string>
    <string name="formatting_help_structured_documents_body_4">If you\'d like to quote someone, use the %1$s character before the line:</string>
    <string name="formatting_help_structured_documents_body_5">Imagination is more important than knowledge. Knowledge is limited. Imagination encircles the world.</string>
    <string name="formatting_help_structured_documents_body_6">- Albert Einstein</string>

    <string name="formatting_help_code_title">Code</string>
    <string name="formatting_help_code_body_1">There are many different ways to style code with Markdown. If you have inline code blocks, wrap them in backticks:</string>
Loading