From 8bd12e39e84e8cf4cde7efb3b53de15f14408be5 Mon Sep 17 00:00:00 2001 From: Javernaut Date: Wed, 3 Apr 2024 10:12:20 +0200 Subject: [PATCH] Minor code refactoring --- .../whatthecodec/home/ui/RootActivity.kt | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/javernaut/whatthecodec/home/ui/RootActivity.kt b/app/src/main/java/com/javernaut/whatthecodec/home/ui/RootActivity.kt index 4ad27b55..43131856 100644 --- a/app/src/main/java/com/javernaut/whatthecodec/home/ui/RootActivity.kt +++ b/app/src/main/java/com/javernaut/whatthecodec/home/ui/RootActivity.kt @@ -35,13 +35,18 @@ class RootActivity : AppCompatActivity() { WhatTheCodecTheme { val screenState by mediaFileViewModel.screenState.observeAsState() if (screenState == null) { - EmptyScreen(::onPickVideoClicked, ::onPickAudioClicked) { - SettingsActivity.start(this@RootActivity) - } + EmptyScreen( + ::onPickVideoClicked, + ::onPickAudioClicked, + ::onSettingsClicked + ) } else { - MainScreen(screenState!!, ::onPickVideoClicked, ::onPickAudioClicked) { - SettingsActivity.start(this@RootActivity) - } + MainScreen( + screenState!!, + ::onPickVideoClicked, + ::onPickAudioClicked, + ::onSettingsClicked + ) } } } @@ -139,6 +144,10 @@ class RootActivity : AppCompatActivity() { } } + private fun onSettingsClicked() { + SettingsActivity.start(this@RootActivity) + } + private inline fun checkPermissionAndTryOpenMedia(requestCode: Int, actualAction: () -> Unit) { if (TinyActivityCompat.needRequestReadStoragePermission(this)) { TinyActivityCompat.requestReadStoragePermission(this, requestCode)