diff --git a/app/src/main/java/org/lineageos/aperture/CameraActivity.kt b/app/src/main/java/org/lineageos/aperture/CameraActivity.kt
index b6a1d9d..5f16937 100644
--- a/app/src/main/java/org/lineageos/aperture/CameraActivity.kt
+++ b/app/src/main/java/org/lineageos/aperture/CameraActivity.kt
@@ -35,7 +35,6 @@
 import android.view.MotionEvent
 import android.view.OrientationEventListener
 import android.view.ScaleGestureDetector
-import android.view.View
 import android.view.ViewGroup
 import android.view.WindowManager
 import android.widget.Button
@@ -294,15 +293,15 @@
             super.handleMessage(msg)
             when (msg.what) {
                 MSG_HIDE_ZOOM_SLIDER -> {
-                    zoomLevel.visibility = View.GONE
+                    zoomLevel.isVisible = false
                 }
 
                 MSG_HIDE_FOCUS_RING -> {
-                    viewFinderFocus.visibility = View.GONE
+                    viewFinderFocus.isVisible = false
                 }
 
                 MSG_HIDE_EXPOSURE_SLIDER -> {
-                    exposureLevel.visibility = View.GONE
+                    exposureLevel.isVisible = false
                 }
             }
         }
@@ -673,7 +672,7 @@
         cameraController.tapToFocusState.observe(this) {
             when (it) {
                 CameraController.TAP_TO_FOCUS_STARTED -> {
-                    viewFinderFocus.visibility = View.VISIBLE
+                    viewFinderFocus.isVisible = true
                     handler.removeMessages(MSG_HIDE_FOCUS_RING)
                     ValueAnimator.ofInt(0.px, 8.px).apply {
                         addUpdateListener { anim ->
@@ -751,7 +750,7 @@
             }
 
             zoomLevel.progress = it.linearZoom
-            zoomLevel.visibility = View.VISIBLE
+            zoomLevel.isVisible = true
 
             handler.removeMessages(MSG_HIDE_ZOOM_SLIDER)
             handler.sendMessageDelayed(handler.obtainMessage(MSG_HIDE_ZOOM_SLIDER), 2000)
