From 47aa8ea5d4ff3e2bb5429ed687b3a06b49cfe384 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Wed, 17 Nov 2021 14:57:08 +0100 Subject: [PATCH 1/2] make all cam buttons reflect current state instead of triggered action Resolves #1694 Signed-off-by: Andy Scherzinger --- .../nextcloud/talk/models/TakePictureViewModel.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/models/TakePictureViewModel.java b/app/src/main/java/com/nextcloud/talk/models/TakePictureViewModel.java index 39c009773..def90d3ca 100644 --- a/app/src/main/java/com/nextcloud/talk/models/TakePictureViewModel.java +++ b/app/src/main/java/com/nextcloud/talk/models/TakePictureViewModel.java @@ -99,19 +99,19 @@ public class TakePictureViewModel extends ViewModel { public LiveData getTorchToggleButtonImageResource() { return Transformations.map(isTorchEnabled(), enabled -> enabled - ? R.drawable.ic_baseline_flash_off_24 - : R.drawable.ic_baseline_flash_on_24); + ? R.drawable.ic_baseline_flash_on_24 + : R.drawable.ic_baseline_flash_off_24); } public LiveData getLowResolutionToggleButtonImageResource() { return Transformations.map(isLowResolutionEnabled(), enabled -> enabled - ? R.drawable.ic_high_quality - : R.drawable.ic_low_quality); + ? R.drawable.ic_low_quality + : R.drawable.ic_high_quality); } public LiveData getCropToggleButtonImageResource() { return Transformations.map(isCropEnabled(), enabled -> enabled - ? R.drawable.ic_crop_4_3 - : R.drawable.ic_crop_16_9); + ? R.drawable.ic_crop_16_9 + : R.drawable.ic_crop_4_3); } } From fbce40f93550656f287984ce774fc9603ac1f8e6 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Thu, 18 Nov 2021 14:53:46 +0100 Subject: [PATCH 2/2] increased due to new lib update dependency hit 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 96101281e..de06c6be4 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: 1 error and 222 warnings + Lint Report: 1 error and 223 warnings