From 4b7166e90fe3059f71289773ba7d52e0af703a23 Mon Sep 17 00:00:00 2001 From: darthpaul Date: Fri, 19 Aug 2022 00:18:00 +0100 Subject: [PATCH] properly hide flash --- .../camera/activities/MainActivity.kt | 2 +- app/src/main/res/layout/activity_main.xml | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) 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 1cac8959..51208744 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt @@ -514,7 +514,7 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener, Camera if (available) { toggle_flash.beVisible() } else { - toggle_flash.beInvisible() + toggle_flash.beGone() toggle_flash.setImageResource(R.drawable.ic_flash_off_vector) mPreview?.setFlashlightState(FLASH_OFF) } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 3914c758..27cc7530 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -35,11 +35,13 @@ android:id="@+id/toggle_photo_video" android:layout_width="@dimen/icon_size" android:layout_height="@dimen/icon_size" + android:layout_marginStart="@dimen/normal_margin" + android:layout_marginEnd="@dimen/normal_margin" android:contentDescription="@string/toggle_photo_video" android:padding="@dimen/normal_margin" android:src="@drawable/ic_video_vector" app:layout_constraintEnd_toStartOf="@id/toggle_flash" - app:layout_constraintHorizontal_chainStyle="spread" + app:layout_constraintHorizontal_chainStyle="spread_inside" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -47,6 +49,8 @@ android:id="@+id/toggle_flash" android:layout_width="@dimen/icon_size" android:layout_height="@dimen/icon_size" + android:layout_marginStart="@dimen/normal_margin" + android:layout_marginEnd="@dimen/normal_margin" android:layout_weight="1" android:contentDescription="@string/toggle_flash" android:padding="@dimen/normal_margin" @@ -62,6 +66,8 @@ android:layout_height="@dimen/icon_size" android:layout_below="@+id/toggle_photo_video" android:layout_alignParentEnd="true" + android:layout_marginStart="@dimen/normal_margin" + android:layout_marginEnd="@dimen/normal_margin" android:contentDescription="@string/resolution" android:padding="@dimen/normal_margin" android:src="@drawable/ic_resolution_vector" @@ -73,6 +79,8 @@ android:id="@+id/settings" android:layout_width="@dimen/icon_size" android:layout_height="@dimen/icon_size" + android:layout_marginStart="@dimen/normal_margin" + android:layout_marginEnd="@dimen/normal_margin" android:contentDescription="@string/settings" android:padding="@dimen/normal_margin" android:src="@drawable/ic_settings_cog_vector"