diff --git a/.gitignore b/.gitignore index f0c90b45..21da4996 100644 --- a/.gitignore +++ b/.gitignore @@ -11,4 +11,3 @@ keystore.properties fastlane/fastlane.json Gemfile Gemfile.lock -/java_pid3915.hprof diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/compose/extensions/ComposeExtensions.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/compose/extensions/ComposeExtensions.kt index 70cc7bb2..ed088c31 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/compose/extensions/ComposeExtensions.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/compose/extensions/ComposeExtensions.kt @@ -10,11 +10,13 @@ import androidx.lifecycle.Lifecycle import com.google.accompanist.systemuicontroller.rememberSystemUiController fun Context.getActivity(): Activity { - if (this is Activity) return this - return if (this is ContextWrapper) baseContext.getActivity() else getActivity() + return when (this) { + is Activity -> this + is ContextWrapper -> baseContext.getActivity() + else -> getActivity() + } } - @Composable fun TransparentSystemBars() { val systemUiController = rememberSystemUiController() diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/compose/settings/SettingsGroup.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/compose/settings/SettingsGroup.kt index b52bb955..20c1b390 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/compose/settings/SettingsGroup.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/compose/settings/SettingsGroup.kt @@ -16,7 +16,6 @@ fun SettingsGroup( title: @Composable (() -> Unit)? = null, content: @Composable ColumnScope.() -> Unit, ) { - Column( modifier = modifier.fillMaxWidth(), ) { diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/compose/theme/AppTheme.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/compose/theme/AppTheme.kt index 19d5ddd6..9b167e7c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/compose/theme/AppTheme.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/compose/theme/AppTheme.kt @@ -10,7 +10,6 @@ import androidx.lifecycle.Lifecycle import com.simplemobiletools.calculator.compose.extensions.OnLifecycleEvent import com.simplemobiletools.calculator.compose.theme.model.Theme.Companion.systemDefaultMaterialYou - @Composable fun AppThemeSurface( modifier: Modifier = Modifier, diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/compose/theme/Colors.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/compose/theme/Colors.kt index 8310ed74..24004598 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/compose/theme/Colors.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/compose/theme/Colors.kt @@ -2,7 +2,6 @@ package com.simplemobiletools.calculator.compose.theme import androidx.compose.ui.graphics.Color - val color_primary = Color(0xFFF57C00) val color_primary_dark = Color(0xFFD76D00) val color_accent = color_primary @@ -19,7 +18,6 @@ val hint_white = Color(0x99FFFFFF) val hint_black = Color(0x66000000) val light_grey_stroke = Color(0x40FFFFFF) - val thumb_deactivated = Color(0xFFECECEC) val track_deactivated = Color(0xFFB2B2B2)