From ee61be83613125fb0b8f02780b78c357620af909 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Wed, 26 May 2021 20:09:10 +0300 Subject: [PATCH 01/37] Fix a couple camel case issues in strings * This should finally cover all strings --- app/src/main/res/values/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 55706352..4abfc615 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -28,7 +28,7 @@ Last backup: %1$s Exclude apps Backup now - Recovery Code + Recovery code Verify existing code or generate a new one @@ -154,6 +154,6 @@ Written by: Steve Soltys and Torsten Grote Design by: Glenn Sorrentino Sponsored by: Calyx Institute for use in CalyxOS - Source Code: https://github.com/seedvault-app/seedvault + Source code: https://github.com/seedvault-app/seedvault From 02c7ba28b903e706684f3d453835e5f4a31a134b Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Thu, 13 May 2021 02:00:50 +0530 Subject: [PATCH 02/37] On phones we tap, not click! Change-Id: Id0f0587b5174810de9e7d8036ca7e1264ea43c76 --- app/src/main/res/values/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4abfc615..13e0440a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -39,8 +39,8 @@ Needs to be plugged in %1$s free Nextcloud - Click to install - Click to set up account + Tap to install + Tap to set up account Account not available. Set one up (or disable passcode). Initializing backup location… Looking for backups… From 11564c8c35a04ee671a3b999776647e54b6f89fa Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Mon, 19 Apr 2021 15:44:48 -0300 Subject: [PATCH 03/37] Make recovery code fit on smaller screens --- app/src/main/res/layout/fragment_recovery_code_output.xml | 8 +++++--- .../main/res/layout/list_item_recovery_code_output.xml | 7 ++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/app/src/main/res/layout/fragment_recovery_code_output.xml b/app/src/main/res/layout/fragment_recovery_code_output.xml index 8a84d5bd..5d0d918e 100644 --- a/app/src/main/res/layout/fragment_recovery_code_output.xml +++ b/app/src/main/res/layout/fragment_recovery_code_output.xml @@ -57,13 +57,14 @@ @@ -78,6 +79,7 @@ android:text="@string/recovery_code_confirm_button" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" /> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/wordList" /> \ No newline at end of file diff --git a/app/src/main/res/layout/list_item_recovery_code_output.xml b/app/src/main/res/layout/list_item_recovery_code_output.xml index fade3223..780f3df7 100644 --- a/app/src/main/res/layout/list_item_recovery_code_output.xml +++ b/app/src/main/res/layout/list_item_recovery_code_output.xml @@ -4,7 +4,8 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:padding="24dp" + android:layout_marginTop="24dp" + android:layout_marginBottom="24dp" tools:showIn="@layout/fragment_recovery_code_output"> + tools:text="Test1CanBeLong" /> \ No newline at end of file From 7f9c2b4eb15124697a378831544cf20347cdf2e6 Mon Sep 17 00:00:00 2001 From: Dhina17 Date: Sun, 18 Apr 2021 02:23:05 +0530 Subject: [PATCH 04/37] colors: Sync with Settings theme Change-Id: I69366b7744a76658607bd48a81e06975c4c6060c --- .../layout/fragment_recovery_code_input.xml | 1 + .../layout/fragment_recovery_code_output.xml | 1 + .../res/layout/fragment_restore_progress.xml | 2 +- .../main/res/layout/fragment_restore_set.xml | 2 +- .../main/res/layout/fragment_storage_check.xml | 4 ++-- app/src/main/res/values-night/bools.xml | 4 ++++ app/src/main/res/values-night/colors.xml | 10 ++++++++++ app/src/main/res/values/bools.xml | 4 ++++ app/src/main/res/values/colors.xml | 11 ++++++++--- app/src/main/res/values/themes.xml | 18 +++++++++++++++++- 10 files changed, 49 insertions(+), 8 deletions(-) create mode 100644 app/src/main/res/values-night/bools.xml create mode 100644 app/src/main/res/values-night/colors.xml create mode 100644 app/src/main/res/values/bools.xml diff --git a/app/src/main/res/layout/fragment_recovery_code_input.xml b/app/src/main/res/layout/fragment_recovery_code_input.xml index 911415eb..03521fdf 100644 --- a/app/src/main/res/layout/fragment_recovery_code_input.xml +++ b/app/src/main/res/layout/fragment_recovery_code_input.xml @@ -60,6 +60,7 @@