From cd07acaa1b69a0e8bcd56ade78205a5e703822ce Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Wed, 26 May 2021 10:13:45 +0200 Subject: [PATCH 1/6] Simplify settings Resolves #1058 Signed-off-by: Andy Scherzinger --- .../main/res/layout/controller_settings.xml | 34 +++++++++---------- app/src/main/res/values/strings.xml | 7 ++-- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/app/src/main/res/layout/controller_settings.xml b/app/src/main/res/layout/controller_settings.xml index b8bc571de..00f53eae4 100644 --- a/app/src/main/res/layout/controller_settings.xml +++ b/app/src/main/res/layout/controller_settings.xml @@ -122,25 +122,11 @@ apc:roundAsCircle="true" tools:src="@tools:sample/avatars[0]" /> - - - - @@ -279,7 +265,19 @@ android:animateLayoutChanges="true" apc:cardBackgroundColor="@color/bg_default" apc:cardElevation="0dp" - apc:mpc_title="@string/nc_settings_proxy_title"> + apc:mpc_title="@string/nc_settings_advanced_title"> + + + + + apc:mp_title="@string/nc_settings_proxy_username_title" /> + apc:mp_title="@string/nc_settings_proxy_password_title" /> Your SSL setup prevented connection + Advanced Proxy proxy_type Proxy type @@ -73,12 +74,14 @@ Proxy host proxy_port Proxy port + Proxy username proxy_username + Proxy password proxy_password - Use credentials + Proxy requires credentials proxy_credentials Switch between accounts - Reauthorize + Reauthorize account Set up client certificate Change client certificate Remove From c3e336b716cd7712d032fd018553bd170d24f1b9 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Wed, 26 May 2021 11:04:31 +0200 Subject: [PATCH 2/6] align avatar placeholders with dark/light theme and add placeholder to settings avatar Signed-off-by: Andy Scherzinger --- .../talk/controllers/SettingsController.java | 3 ++- .../drawable-night/account_circle_48dp.xml | 27 +++++++++++++++++++ .../drawable-night/account_circle_96dp.xml | 27 +++++++++++++++++++ .../main/res/drawable/account_circle_48dp.xml | 2 +- .../main/res/drawable/account_circle_96dp.xml | 27 +++++++++++++++++++ .../main/res/layout/controller_settings.xml | 5 +++- 6 files changed, 88 insertions(+), 3 deletions(-) create mode 100644 app/src/main/res/drawable-night/account_circle_48dp.xml create mode 100644 app/src/main/res/drawable-night/account_circle_96dp.xml create mode 100644 app/src/main/res/drawable/account_circle_96dp.xml diff --git a/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java b/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java index eb4885642..38612e4ac 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java @@ -107,6 +107,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; import androidx.core.content.ContextCompat; +import androidx.core.content.res.ResourcesCompat; import androidx.core.view.ViewCompat; import androidx.emoji.widget.EmojiTextView; import androidx.work.OneTimeWorkRequest; @@ -561,7 +562,7 @@ public class SettingsController extends BaseController { if (currentUser.getDisplayName() != null) { displayNameTextView.setText(currentUser.getDisplayName()); } - + DisplayUtils.loadAvatarImage(currentUser, avatarImageView, false); profileQueryDisposable = ncApi.getUserProfile(credentials, diff --git a/app/src/main/res/drawable-night/account_circle_48dp.xml b/app/src/main/res/drawable-night/account_circle_48dp.xml new file mode 100644 index 000000000..464e2af74 --- /dev/null +++ b/app/src/main/res/drawable-night/account_circle_48dp.xml @@ -0,0 +1,27 @@ + + + + diff --git a/app/src/main/res/drawable-night/account_circle_96dp.xml b/app/src/main/res/drawable-night/account_circle_96dp.xml new file mode 100644 index 000000000..7e0864ab8 --- /dev/null +++ b/app/src/main/res/drawable-night/account_circle_96dp.xml @@ -0,0 +1,27 @@ + + + + diff --git a/app/src/main/res/drawable/account_circle_48dp.xml b/app/src/main/res/drawable/account_circle_48dp.xml index 260d5b5d1..730582ce1 100644 --- a/app/src/main/res/drawable/account_circle_48dp.xml +++ b/app/src/main/res/drawable/account_circle_48dp.xml @@ -21,7 +21,7 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/account_circle_96dp.xml b/app/src/main/res/drawable/account_circle_96dp.xml new file mode 100644 index 000000000..eca5e2318 --- /dev/null +++ b/app/src/main/res/drawable/account_circle_96dp.xml @@ -0,0 +1,27 @@ + + + + diff --git a/app/src/main/res/layout/controller_settings.xml b/app/src/main/res/layout/controller_settings.xml index 00f53eae4..1411f010f 100644 --- a/app/src/main/res/layout/controller_settings.xml +++ b/app/src/main/res/layout/controller_settings.xml @@ -23,6 +23,7 @@ + fresco:failureImage="@drawable/account_circle_96dp" + fresco:placeholderImage="@drawable/account_circle_96dp" /> Date: Wed, 26 May 2021 11:17:04 +0200 Subject: [PATCH 3/6] remove unused strings Signed-off-by: Andy Scherzinger --- app/src/main/res/values/strings.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 53552a3ee..386f1566b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -67,7 +67,6 @@ Advanced - Proxy proxy_type Proxy type proxy_host @@ -80,14 +79,12 @@ proxy_password Proxy requires credentials proxy_credentials - Switch between accounts Reauthorize account Set up client certificate Change client certificate Remove Please confirm your intent to remove the current account. Remove account - Add a new account Unsupported server The server version is too old and not supported by this version of the Android app The server version is very old and will not be supported in the next release! @@ -153,7 +150,6 @@ Cancel No proxy - Username Password Conversation link New password @@ -350,13 +346,11 @@ Unknown error Unauthorized - General Allow guests Could not leave conversation You need to promote a new moderator before you can leave %1$s. - 99+ Copy Reply Reply privately From 799acc4f81f82357f1b0b1a71e208933b3c79440 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Wed, 26 May 2021 13:44:05 +0200 Subject: [PATCH 4/6] Drone: update Lint results to reflect reduced error/warning count [skip ci] Signed-off-by: Andy Scherzinger --- scripts/analysis/lint-results.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/analysis/lint-results.txt b/scripts/analysis/lint-results.txt index 246459982..bbb08d2ee 100644 --- a/scripts/analysis/lint-results.txt +++ b/scripts/analysis/lint-results.txt @@ -1,2 +1,2 @@ DO NOT TOUCH; GENERATED BY DRONE - Lint Report: 3 errors and 336 warnings + Lint Report: 3 errors and 332 warnings From 02a129c3fcb48b345a65476df085eee807a557aa Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Wed, 26 May 2021 14:26:37 +0200 Subject: [PATCH 5/6] Add error logging when reading user profile from server Signed-off-by: Andy Scherzinger --- .../java/com/nextcloud/talk/controllers/ProfileController.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ProfileController.java b/app/src/main/java/com/nextcloud/talk/controllers/ProfileController.java index ec8f290ea..f4070d2b5 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ProfileController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/ProfileController.java @@ -194,6 +194,7 @@ public class ProfileController extends BaseController { @Override public void onError(@io.reactivex.annotations.NonNull Throwable e) { + Log.e(TAG, "Error loading editable user profile from server", e); edit = false; } @@ -365,6 +366,7 @@ public class ProfileController extends BaseController { @Override public void onError(@io.reactivex.annotations.NonNull Throwable e) { + Log.e(TAG, "Error loading editable user profile from server", e); edit = false; } From 98e5ff5771f8766647a730d4ba6ead19349c6a95 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Wed, 26 May 2021 14:39:18 +0200 Subject: [PATCH 6/6] remove unsed imports Signed-off-by: Andy Scherzinger --- .../java/com/nextcloud/talk/controllers/SettingsController.java | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java b/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java index 38612e4ac..3355b9549 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java @@ -107,7 +107,6 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; import androidx.core.content.ContextCompat; -import androidx.core.content.res.ResourcesCompat; import androidx.core.view.ViewCompat; import androidx.emoji.widget.EmojiTextView; import androidx.work.OneTimeWorkRequest;