From 09122f4146871308b98451b450ac2e0a40a8a31f Mon Sep 17 00:00:00 2001 From: Stefan Niedermann Date: Wed, 10 Jun 2020 23:35:10 +0200 Subject: Fix #863 Crash when entering not-existing category --- .../it/niedermann/owncloud/notes/android/fragment/CategoryAdapter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/src/main') diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/CategoryAdapter.java b/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/CategoryAdapter.java index 886790d8..5872172a 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/CategoryAdapter.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/CategoryAdapter.java @@ -109,7 +109,7 @@ public class CategoryAdapter extends RecyclerView.Adapter 0) { boolean currentSearchStringIsInCategories = false; - for (NavigationItem category : categories.subList(1, categories.size())) { + for (NavigationItem category : categories) { if (currentSearchString.equals(category.label)) { currentSearchStringIsInCategories = true; break; -- cgit v1.2.3 From 7c278d323356b2df9878f33c12fbd75542f89036 Mon Sep 17 00:00:00 2001 From: Stefan Niedermann Date: Thu, 11 Jun 2020 09:26:21 +0200 Subject: Simplify translations fo formatting help --- .../formattinghelp/FormattingHelpActivity.java | 28 ++++++++++++++++------ app/src/main/res/values/strings.xml | 15 +++++++----- 2 files changed, 30 insertions(+), 13 deletions(-) (limited to 'app/src/main') diff --git a/app/src/main/java/it/niedermann/owncloud/notes/formattinghelp/FormattingHelpActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/formattinghelp/FormattingHelpActivity.java index a1078504..17c0f2e6 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/formattinghelp/FormattingHelpActivity.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/formattinghelp/FormattingHelpActivity.java @@ -130,11 +130,11 @@ 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 + 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 + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index fd222e89..beba2396 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -238,8 +238,8 @@ # %1$s ### %1$s --- - ` - \\` + `%1$s` + \\`%1$s\\` ``` \\`\\`\\` if (isAwesome){ @@ -253,13 +253,16 @@ - [x] %1$s - [ ] %1$s > %1$s + ~~ + ** + * Context based formatting 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. - 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`. + 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. Text - 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). + 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). Lists Sometimes you want numbered lists: @@ -278,9 +281,9 @@ Item 2 Structured documents - 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. + 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. This is a third-tier heading - You can use one `#` all the way up to `######` six for different heading sizes. + You can use one %1$s all the way up to %2$s six for different heading sizes. If you\'d like to quote someone, use the > character before the line: Coffee. The finest organic suspension ever devised… I beat the Borg with it. - Captain Janeway -- cgit v1.2.3 From b2de8df237d9c0bff46d319008478e67504aeaa1 Mon Sep 17 00:00:00 2001 From: Stefan Niedermann Date: Thu, 11 Jun 2020 09:29:47 +0200 Subject: Simplify translations fo formatting help --- .../owncloud/notes/formattinghelp/FormattingHelpActivity.java | 2 +- app/src/main/res/values/strings.xml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'app/src/main') diff --git a/app/src/main/java/it/niedermann/owncloud/notes/formattinghelp/FormattingHelpActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/formattinghelp/FormattingHelpActivity.java index 17c0f2e6..299a9b18 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/formattinghelp/FormattingHelpActivity.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/formattinghelp/FormattingHelpActivity.java @@ -136,7 +136,7 @@ public class FormattingHelpActivity extends BrandedActivity { 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; diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index beba2396..1b6898a9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -253,6 +253,7 @@ - [x] %1$s - [ ] %1$s > %1$s + > ~~ ** * @@ -284,7 +285,7 @@ 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. This is a third-tier heading You can use one %1$s all the way up to %2$s six for different heading sizes. - If you\'d like to quote someone, use the > character before the line: + If you\'d like to quote someone, use the %1$s character before the line: Coffee. The finest organic suspension ever devised… I beat the Borg with it. - Captain Janeway -- cgit v1.2.3 From 1a0c9b2319654e4b9909014100c2b54767f2376d Mon Sep 17 00:00:00 2001 From: p-bo Date: Fri, 12 Jun 2020 14:20:22 +0200 Subject: L18n - use quote more unerstandable around the globe See discussion issue #866 (used quote from scientist, because it is less conflicting than political or religion ones) --- app/src/main/res/values/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/src/main') diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1b6898a9..dedaf45f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -286,8 +286,8 @@ This is a third-tier heading You can use one %1$s all the way up to %2$s six for different heading sizes. If you\'d like to quote someone, use the %1$s character before the line: - Coffee. The finest organic suspension ever devised… I beat the Borg with it. - - Captain Janeway + Imagination is more important than knowledge. Knowledge is limited. Imagination encircles the world. + - Albert Einstein Code There are many different ways to style code with Markdown. If you have inline code blocks, wrap them in backticks: -- cgit v1.2.3