From e349acc548e5282c8427b50d96b1363c6afe4ef0 Mon Sep 17 00:00:00 2001 From: Tibor Kaputa Date: Mon, 24 Jul 2023 19:35:46 +0200 Subject: [PATCH 1/6] removing duplicate empty lines --- .../calculator/compose/extensions/ComposeExtensions.kt | 1 - 1 file changed, 1 deletion(-) 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..b4ddd5c9 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 @@ -14,7 +14,6 @@ fun Context.getActivity(): Activity { return if (this is ContextWrapper) baseContext.getActivity() else getActivity() } - @Composable fun TransparentSystemBars() { val systemUiController = rememberSystemUiController() From 2e08a0889c7e17d186f27dc8aebd0daae7b3d7d3 Mon Sep 17 00:00:00 2001 From: FunkyMuse <25645122+FunkyMuse@users.noreply.github.com> Date: Mon, 24 Jul 2023 20:42:43 +0200 Subject: [PATCH 2/6] Update .gitignore --- .gitignore | 1 - 1 file changed, 1 deletion(-) 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 From a7f02366869f8040d36d08d9f2db6149acb19a68 Mon Sep 17 00:00:00 2001 From: Tibor Kaputa Date: Mon, 24 Jul 2023 21:14:59 +0200 Subject: [PATCH 3/6] minor style tweak --- .../calculator/compose/extensions/ComposeExtensions.kt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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 b4ddd5c9..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,8 +10,11 @@ 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 From 83e0d3ee3c15ef486d6249c891e499b5762b7ed1 Mon Sep 17 00:00:00 2001 From: Tibor Kaputa Date: Mon, 24 Jul 2023 21:16:47 +0200 Subject: [PATCH 4/6] removing an empty line --- .../calculator/compose/settings/SettingsGroup.kt | 1 - 1 file changed, 1 deletion(-) 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(), ) { From 26a8243ea975074d335aa5b34dcd0abd6568a2a9 Mon Sep 17 00:00:00 2001 From: Tibor Kaputa Date: Mon, 24 Jul 2023 21:18:15 +0200 Subject: [PATCH 5/6] removing an empty line --- .../com/simplemobiletools/calculator/compose/theme/AppTheme.kt | 1 - 1 file changed, 1 deletion(-) 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, From e0cc62d340ee43f0bf5a14cb8689415ed09a86d7 Mon Sep 17 00:00:00 2001 From: Tibor Kaputa Date: Mon, 24 Jul 2023 21:19:12 +0200 Subject: [PATCH 6/6] removing duplicate empty lines --- .../com/simplemobiletools/calculator/compose/theme/Colors.kt | 2 -- 1 file changed, 2 deletions(-) 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 abc66757..2596dc92 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)