From a83aa1c2e273303d5a1f78cf3c1186f54797a068 Mon Sep 17 00:00:00 2001 From: darthpaul Date: Thu, 6 Oct 2022 23:08:54 +0100 Subject: [PATCH] disable settings icon when recording - disable settings icon when recording video and enable when recording stopped - create ic_settings vector drawable resource that uses the @color/camera_option_color fillColor for simplicity. --- .../camera/activities/MainActivity.kt | 2 ++ app/src/main/res/drawable/ic_settings.xml | 11 +++++++++++ app/src/main/res/layout/layout_top.xml | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 app/src/main/res/drawable/ic_settings.xml diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt index 38e9ccc2..9e3c6ac3 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt @@ -687,6 +687,7 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener, Camera shutter.isSelected = true toggle_camera.beInvisible() change_resolution.isEnabled = false + settings.isEnabled = false video_rec_curr_timer.beVisible() } @@ -696,6 +697,7 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener, Camera video_rec_curr_timer.text = 0.getFormattedDuration() video_rec_curr_timer.beGone() change_resolution.isEnabled = true + settings.isEnabled = true toggle_camera.beVisible() } diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml new file mode 100644 index 00000000..7e6bf97f --- /dev/null +++ b/app/src/main/res/drawable/ic_settings.xml @@ -0,0 +1,11 @@ + + + + + diff --git a/app/src/main/res/layout/layout_top.xml b/app/src/main/res/layout/layout_top.xml index 0fa7f66e..7e671fbb 100644 --- a/app/src/main/res/layout/layout_top.xml +++ b/app/src/main/res/layout/layout_top.xml @@ -43,7 +43,7 @@ android:layout_weight="1" android:contentDescription="@string/settings" android:padding="@dimen/normal_margin" - app:icon="@drawable/ic_settings_cog_vector" + app:icon="@drawable/ic_settings" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/change_resolution" app:layout_constraintTop_toTopOf="@id/toggle_flash" />