From fafca46f90b761e7e6e54e4c525a8599acde0136 Mon Sep 17 00:00:00 2001
From: Stefan Niedermann <info@niedermann.it>
Date: Fri, 16 Oct 2020 17:54:20 +0200
Subject: Introduce LoginActivity

---
 app/src/main/res/values/colors.xml  | 1 +
 app/src/main/res/values/strings.xml | 2 ++
 2 files changed, 3 insertions(+)

(limited to 'app/src/main/res/values')

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 39559c4c..8efeb927 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -18,6 +18,7 @@
     <color name="fg_default_selection">#333333</color>
     <color name="fg_default_low">#666666</color>
     <color name="fg_default_high">#cccccc</color>
+    <color name="fg_secondary">#999999</color>
     <color name="fg_contrast">#ffffff</color>
 
     <color name="icon_color_default">#757575</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9c48717a..60a3809d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -6,6 +6,7 @@
     <string name="label_all_notes">All notes</string>
     <string name="label_favorites">Favorites</string>
     <string name="action_create">New note</string>
+    <string name="welcome_text">Welcome to %1$s</string>
     <string name="action_settings">Settings</string>
     <string name="action_trashbin">Deleted notes</string>
     <string name="action_search">Search</string>
@@ -314,4 +315,5 @@
     <string name="error_action_open_deck_info">Open App info</string>
     <string name="error_action_open_network">Network settings</string>
     <string name="no_other_accounts">You don\'t have configured any other accounts yet.</string>
+    <string name="choose_account">Choose account</string>
 </resources>
-- 
cgit v1.2.3


From 970036d747d7a4e1b2305c9b09f9ea4b87a07893 Mon Sep 17 00:00:00 2001
From: Stefan Niedermann <info@niedermann.it>
Date: Sat, 20 Mar 2021 11:27:16 +0100
Subject: Fix #1099 Wording for app lock / device credentials

---
 app/src/main/res/values/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/src/main/res/values')

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 45ba55a1..04d77472 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -42,7 +42,8 @@
     <string name="settings_font_title">Monospace font</string>
     <string name="settings_font_size">Font size</string>
     <string name="settings_wifi_only">Sync only on Wi-Fi</string>
-    <string name="settings_lock">Password protection</string>
+    <string name="settings_lock">App lock (Beta)</string>
+    <string name="settings_lock_summary">Device credentials</string>
     <string name="settings_background_sync">Background synchronization</string>
 
     <string name="error_sync">Synchronization failed: %1$s</string>
@@ -143,7 +144,6 @@
     <string name="add_category">Add %1$s</string>
     <string name="simple_checkbox">Checkbox</string>
     <string name="unlock_notes">Unlock notes</string>
-    <string name="simple_beta">Beta</string>
     <string name="error_dialog_title">Oh no - What now? 🙁</string>
     <string name="error_dialog_tip_token_mismatch_retry">Please try to force close the app and restart it again. There might have been an incorrect connection to the Nextcloud app.</string>
     <string name="error_dialog_tip_token_mismatch_clear_storage">If the issue persists, try to clear the storage of both apps: Nextcloud and Nextcloud Notes to solve this issue.</string>
-- 
cgit v1.2.3


From d5f787a85259944c5871233996988ac16fdc6aaf Mon Sep 17 00:00:00 2001
From: Stefan Niedermann <info@niedermann.it>
Date: Sat, 20 Mar 2021 11:36:20 +0100
Subject: Fix build (#1099)

---
 app/src/main/res/values/strings.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app/src/main/res/values')

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 04d77472..db3c73ac 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -144,6 +144,7 @@
     <string name="add_category">Add %1$s</string>
     <string name="simple_checkbox">Checkbox</string>
     <string name="unlock_notes">Unlock notes</string>
+    <string name="simple_beta">Beta</string>
     <string name="error_dialog_title">Oh no - What now? 🙁</string>
     <string name="error_dialog_tip_token_mismatch_retry">Please try to force close the app and restart it again. There might have been an incorrect connection to the Nextcloud app.</string>
     <string name="error_dialog_tip_token_mismatch_clear_storage">If the issue persists, try to clear the storage of both apps: Nextcloud and Nextcloud Notes to solve this issue.</string>
-- 
cgit v1.2.3


From f261eeb1bd7a4ad76ac5a4d13308c1124cab23b2 Mon Sep 17 00:00:00 2001
From: Stefan Niedermann <info@niedermann.it>
Date: Sat, 20 Mar 2021 11:45:12 +0100
Subject: Prepare #1089 Move line spacing to variable

---
 app/src/main/res/values/dimens.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'app/src/main/res/values')

diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 08db34b0..17b56355 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -28,6 +28,8 @@
     <dimen name="note_font_size_medium">18sp</dimen>
     <dimen name="note_font_size_large">22sp</dimen>
 
+    <item format="float" name="note_line_spacing" type="dimen">1</item>
+
     <!-- Widgets -->
     <dimen name="widget_outer_radius">@dimen/spacer_1x</dimen>
     <dimen name="widget_inner_radius">@dimen/spacer_1hx</dimen>
-- 
cgit v1.2.3


From 855862d658a3adb5114d910f63e99a2825347ca5 Mon Sep 17 00:00:00 2001
From: Stefan Niedermann <info@niedermann.it>
Date: Sat, 20 Mar 2021 20:15:56 +0100
Subject: =?UTF-8?q?Mark=20grid=20view=20no=20longer=20as=20=F0=9F=86=95=20?=
 =?UTF-8?q?in=20settings=20description?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/src/main/res/values')

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index db3c73ac..93a60a97 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -169,7 +169,7 @@
     <string name="change_note_title">Change note title</string>
     <string name="menu_edit_title">Edit title</string>
     <string name="settings_branding">Branding</string>
-    <string name="settings_gridview">Grid view 🆕</string>
+    <string name="settings_gridview">Grid view</string>
     <string name="simple_security">Security</string>
     <string name="simple_appearance">Appearance</string>
     <string name="simple_synchronization">Synchronization</string>
-- 
cgit v1.2.3


From 2583dc2ba055306fa2f27a5e5f29cd999fc8e42f Mon Sep 17 00:00:00 2001
From: Stefan Niedermann <info@niedermann.it>
Date: Mon, 22 Mar 2021 12:53:31 +0100
Subject: Fix #1089 Set line spacing to 115%

---
 app/src/main/res/values/dimens.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/src/main/res/values')

diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 17b56355..ec75a88d 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -28,7 +28,7 @@
     <dimen name="note_font_size_medium">18sp</dimen>
     <dimen name="note_font_size_large">22sp</dimen>
 
-    <item format="float" name="note_line_spacing" type="dimen">1</item>
+    <item format="float" name="note_line_spacing" type="dimen">1.15</item>
 
     <!-- Widgets -->
     <dimen name="widget_outer_radius">@dimen/spacer_1x</dimen>
-- 
cgit v1.2.3


From 9c425e291a1f01fc6eb779939eb0e49ee29c6077 Mon Sep 17 00:00:00 2001
From: Stefan Niedermann <info@niedermann.it>
Date: Thu, 1 Apr 2021 14:27:37 +0200
Subject: Fix #1098 Prevent screen capture

---
 app/src/main/res/values/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'app/src/main/res/values')

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 93a60a97..960fb693 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -45,6 +45,7 @@
     <string name="settings_lock">App lock (Beta)</string>
     <string name="settings_lock_summary">Device credentials</string>
     <string name="settings_background_sync">Background synchronization</string>
+    <string name="settings_prevent_screen_capture">Prevent screen capture</string>
 
     <string name="error_sync">Synchronization failed: %1$s</string>
     <string name="error_synchronization">Synchronization failed</string>
@@ -103,6 +104,7 @@
     <string name="pref_key_font_size" translatable="false">fontSize</string>
     <string name="pref_key_wifi_only" translatable="false">wifiOnly</string>
     <string name="pref_key_lock" translatable="false">lock</string>
+    <string name="pref_key_prevent_screen_capture" translatable="false">preventScreenCapture</string>
     <string name="pref_category_security" translatable="false">security</string>
     <string name="pref_key_last_note_mode" translatable="false">lastNoteMode</string>
     <string name="pref_key_background_sync" translatable="false">backgroundSync</string>
-- 
cgit v1.2.3


From b316c7549a888ddd6f367d869e1d11cbb56c924b Mon Sep 17 00:00:00 2001
From: Stefan Niedermann <info@niedermann.it>
Date: Thu, 1 Apr 2021 14:41:04 +0200
Subject: Remove beta hint from grid view

---
 app/src/main/res/values/strings.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'app/src/main/res/values')

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 960fb693..e607c780 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -146,7 +146,6 @@
     <string name="add_category">Add %1$s</string>
     <string name="simple_checkbox">Checkbox</string>
     <string name="unlock_notes">Unlock notes</string>
-    <string name="simple_beta">Beta</string>
     <string name="error_dialog_title">Oh no - What now? 🙁</string>
     <string name="error_dialog_tip_token_mismatch_retry">Please try to force close the app and restart it again. There might have been an incorrect connection to the Nextcloud app.</string>
     <string name="error_dialog_tip_token_mismatch_clear_storage">If the issue persists, try to clear the storage of both apps: Nextcloud and Nextcloud Notes to solve this issue.</string>
-- 
cgit v1.2.3


From c3debd3da5394375c156ac9ebf73547154b8feba Mon Sep 17 00:00:00 2001
From: Stefan Niedermann <info@niedermann.it>
Date: Thu, 1 Apr 2021 14:52:37 +0200
Subject: Remove branding toggle

---
 app/src/main/res/values/strings.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'app/src/main/res/values')

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e607c780..9835feee 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -99,7 +99,6 @@
     <string name="pref_key_note_mode" translatable="false">noteMode</string>
     <string name="pref_key_theme" translatable="false">darkTheme</string>
     <string name="pref_key_font" translatable="false">font</string>
-    <string name="pref_key_branding" translatable="false">branding</string>
     <string name="pref_key_gridview" translatable="false">gridview</string>
     <string name="pref_key_font_size" translatable="false">fontSize</string>
     <string name="pref_key_wifi_only" translatable="false">wifiOnly</string>
-- 
cgit v1.2.3


From 37a1682d3bc4c044c30869c42608e7359891f278 Mon Sep 17 00:00:00 2001
From: Stefan Niedermann <info@niedermann.it>
Date: Thu, 1 Apr 2021 14:59:25 +0200
Subject: Put appearance and behavior settings into one category

---
 app/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/src/main/res/values')

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9835feee..4271a2a5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -171,7 +171,7 @@
     <string name="settings_branding">Branding</string>
     <string name="settings_gridview">Grid view</string>
     <string name="simple_security">Security</string>
-    <string name="simple_appearance">Appearance</string>
+    <string name="appearance_and_behavior">Appearance and behavior</string>
     <string name="simple_synchronization">Synchronization</string>
     <string name="simple_behavior">Behavior</string>
     <string name="manage_accounts">Manage accounts</string>
-- 
cgit v1.2.3