gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-10 06:14:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1706 from nextcloud/bugfix/1694/camIconStateFix

Browse Source 
make all cam buttons reflect current state instead of triggered action
This commit is contained in:
Andy Scherzinger 2021-11-18 14:56:24 +01:00 committed by GitHub
commit bc85337f5f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/com/nextcloud/talk/models/TakePictureViewModel.java
View File

@ -99,19 +99,19 @@ public class TakePictureViewModel extends ViewModel {
public LiveData<Integer> getTorchToggleButtonImageResource() { public LiveData<Integer> getTorchToggleButtonImageResource() {
return Transformations.map(isTorchEnabled(), enabled -> enabled 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<Integer> getLowResolutionToggleButtonImageResource() { public LiveData<Integer> getLowResolutionToggleButtonImageResource() {
return Transformations.map(isLowResolutionEnabled(), enabled -> enabled 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<Integer> getCropToggleButtonImageResource() { public LiveData<Integer> getCropToggleButtonImageResource() {
return Transformations.map(isCropEnabled(), enabled -> enabled 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);
} }
} }

2
scripts/analysis/lint-results.txt
View File

@ -1,2 +1,2 @@
DO NOT TOUCH; GENERATED BY DRONE DO NOT TOUCH; GENERATED BY DRONE
<span class="mdl-layout-title">Lint Report: 1 error and 222 warnings</span> <span class="mdl-layout-title">Lint Report: 1 error and 223 warnings</span>