fenix/Simple-Calculator
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calculator.git synced 2025-06-05 21:49:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
FunkyMuse
2023-07-24 21:33:43 +02:00
parent 30e4aad112 e0cc62d340
commit d280f40c87
5 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -11,4 +11,3 @@ keystore.properties
fastlane/fastlane.json fastlane/fastlane.json
Gemfile Gemfile
Gemfile.lock Gemfile.lock
/java_pid3915.hprof

8
app/src/main/kotlin/com/simplemobiletools/calculator/compose/extensions/ComposeExtensions.kt
View File

@ -10,11 +10,13 @@ import androidx.lifecycle.Lifecycle
import com.google.accompanist.systemuicontroller.rememberSystemUiController import com.google.accompanist.systemuicontroller.rememberSystemUiController
fun Context.getActivity(): Activity { fun Context.getActivity(): Activity {
if (this is Activity) return this return when (this) {
return if (this is ContextWrapper) baseContext.getActivity() else getActivity() is Activity -> this
is ContextWrapper -> baseContext.getActivity()
else -> getActivity()
}
} }
@Composable @Composable
fun TransparentSystemBars() { fun TransparentSystemBars() {
val systemUiController = rememberSystemUiController() val systemUiController = rememberSystemUiController()

1
app/src/main/kotlin/com/simplemobiletools/calculator/compose/settings/SettingsGroup.kt
View File

@ -16,7 +16,6 @@ fun SettingsGroup(
title: @Composable (() -> Unit)? = null, title: @Composable (() -> Unit)? = null,
content: @Composable ColumnScope.() -> Unit, content: @Composable ColumnScope.() -> Unit,
) { ) {
Column( Column(
modifier = modifier.fillMaxWidth(), modifier = modifier.fillMaxWidth(),
) { ) {

1
app/src/main/kotlin/com/simplemobiletools/calculator/compose/theme/AppTheme.kt
View File

@ -10,7 +10,6 @@ import androidx.lifecycle.Lifecycle
import com.simplemobiletools.calculator.compose.extensions.OnLifecycleEvent import com.simplemobiletools.calculator.compose.extensions.OnLifecycleEvent
import com.simplemobiletools.calculator.compose.theme.model.Theme.Companion.systemDefaultMaterialYou import com.simplemobiletools.calculator.compose.theme.model.Theme.Companion.systemDefaultMaterialYou
@Composable @Composable
fun AppThemeSurface( fun AppThemeSurface(
modifier: Modifier = Modifier, modifier: Modifier = Modifier,

2
app/src/main/kotlin/com/simplemobiletools/calculator/compose/theme/Colors.kt
View File

@ -2,7 +2,6 @@ package com.simplemobiletools.calculator.compose.theme
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
val color_primary = Color(0xFFF57C00) val color_primary = Color(0xFFF57C00)
val color_primary_dark = Color(0xFFD76D00) val color_primary_dark = Color(0xFFD76D00)
val color_accent = color_primary val color_accent = color_primary
@ -19,7 +18,6 @@ val hint_white = Color(0x99FFFFFF)
val hint_black = Color(0x66000000) val hint_black = Color(0x66000000)
val light_grey_stroke = Color(0x40FFFFFF) val light_grey_stroke = Color(0x40FFFFFF)
val thumb_deactivated = Color(0xFFECECEC) val thumb_deactivated = Color(0xFFECECEC)
val track_deactivated = Color(0xFFB2B2B2) val track_deactivated = Color(0xFFB2B2B2)