fenix
/
Simple-Thank-You
mirror of https://github.com/SimpleMobileTools/Simple-Thank-You.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #145 from FunkyMuse/master 

build: update to latest commons
This commit is contained in:
Tibor Kaputa 2023-10-16 10:25:48 +02:00 committed by GitHub
parent 3637e6175b b011416ed5
commit e39bd16b50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/kotlin/com/simplemobiletools/thankyou/helpers/Config.kt
View File

@ -15,6 +15,4 @@ class Config(context: Context) : BaseConfig(context) {
set(hideLauncherIcon) = prefs.edit().putBoolean(HIDE_LAUNCHER_ICON, hideLauncherIcon).apply() set(hideLauncherIcon) = prefs.edit().putBoolean(HIDE_LAUNCHER_ICON, hideLauncherIcon).apply()
val hideLauncherIconFlow: Flow<Boolean> = ::hideLauncherIcon.asFlowNonNull() val hideLauncherIconFlow: Flow<Boolean> = ::hideLauncherIcon.asFlowNonNull()
val wasUseEnglishToggledFlow: Flow<Boolean> = ::wasUseEnglishToggled.asFlowNonNull()
val useEnglishFlow: Flow<Boolean> = ::useEnglish.asFlowNonNull()
} }

6
app/src/main/kotlin/com/simplemobiletools/thankyou/screens/MainScreen.kt
View File

@ -20,10 +20,10 @@ import androidx.compose.ui.unit.sp
import androidx.compose.ui.viewinterop.AndroidView import androidx.compose.ui.viewinterop.AndroidView
import com.simplemobiletools.commons.R import com.simplemobiletools.commons.R
import com.simplemobiletools.commons.compose.extensions.MyDevices import com.simplemobiletools.commons.compose.extensions.MyDevices
import com.simplemobiletools.commons.compose.lists.*
import com.simplemobiletools.commons.compose.menus.ActionItem import com.simplemobiletools.commons.compose.menus.ActionItem
import com.simplemobiletools.commons.compose.menus.ActionMenu import com.simplemobiletools.commons.compose.menus.ActionMenu
import com.simplemobiletools.commons.compose.menus.OverflowMode import com.simplemobiletools.commons.compose.menus.OverflowMode
import com.simplemobiletools.commons.compose.settings.scaffold.*
import com.simplemobiletools.commons.compose.theme.AppThemeSurface import com.simplemobiletools.commons.compose.theme.AppThemeSurface
import com.simplemobiletools.commons.compose.theme.SimpleTheme import com.simplemobiletools.commons.compose.theme.SimpleTheme
import kotlinx.collections.immutable.toImmutableList import kotlinx.collections.immutable.toImmutableList
@ -36,7 +36,7 @@ internal fun MainScreen(
moreAppsFromUs: () -> Unit, moreAppsFromUs: () -> Unit,
linkColor: Color, linkColor: Color,
) { ) {
SettingsLazyScaffold(customTopBar = { scrolledColor: Color, _: MutableInteractionSource, scrollBehavior: TopAppBarScrollBehavior, statusBarColor: Int, colorTransitionFraction: Float, contrastColor: Color -> SimpleScaffold(customTopBar = { scrolledColor: Color, _: MutableInteractionSource, scrollBehavior: TopAppBarScrollBehavior, statusBarColor: Int, colorTransitionFraction: Float, contrastColor: Color ->
TopAppBar( TopAppBar(
title = {}, title = {},
actions = { actions = {
@ -45,7 +45,7 @@ internal fun MainScreen(
ActionMenu(items = actionMenus, numIcons = 2, isMenuVisible = isMenuVisible, onMenuToggle = { isMenuVisible = it }, iconsColor = scrolledColor) ActionMenu(items = actionMenus, numIcons = 2, isMenuVisible = isMenuVisible, onMenuToggle = { isMenuVisible = it }, iconsColor = scrolledColor)
}, },
scrollBehavior = scrollBehavior, scrollBehavior = scrollBehavior,
colors = topAppBarColors(statusBarColor, colorTransitionFraction, contrastColor), colors = simpleTopAppBarColors(statusBarColor, colorTransitionFraction, contrastColor),
modifier = Modifier.topAppBarPaddings(), modifier = Modifier.topAppBarPaddings(),
windowInsets = topAppBarInsets() windowInsets = topAppBarInsets()
) )

6
app/src/main/kotlin/com/simplemobiletools/thankyou/screens/SettingsScreen.kt
View File

@ -1,15 +1,13 @@
package com.simplemobiletools.thankyou.screens package com.simplemobiletools.thankyou.screens
import androidx.compose.material3.HorizontalDivider
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import com.simplemobiletools.commons.R import com.simplemobiletools.commons.R
import com.simplemobiletools.commons.compose.extensions.MyDevices import com.simplemobiletools.commons.compose.extensions.MyDevices
import com.simplemobiletools.commons.compose.lists.SimpleColumnScaffold
import com.simplemobiletools.commons.compose.settings.* import com.simplemobiletools.commons.compose.settings.*
import com.simplemobiletools.commons.compose.settings.scaffold.SettingsScaffold
import com.simplemobiletools.commons.compose.theme.AppThemeSurface import com.simplemobiletools.commons.compose.theme.AppThemeSurface
import com.simplemobiletools.commons.compose.theme.SimpleTheme import com.simplemobiletools.commons.compose.theme.SimpleTheme
import com.simplemobiletools.commons.compose.theme.divider_grey
import com.simplemobiletools.commons.helpers.isTiramisuPlus import com.simplemobiletools.commons.helpers.isTiramisuPlus
@Composable @Composable
@ -24,7 +22,7 @@ internal fun SettingsScreen(
customizeColors: () -> Unit, customizeColors: () -> Unit,
goBack: () -> Unit, goBack: () -> Unit,
) { ) {
SettingsScaffold(title = stringResource(id = R.string.settings), goBack = goBack) { SimpleColumnScaffold(title = stringResource(id = R.string.settings), goBack = goBack) {
SettingsGroup(title = { SettingsGroup(title = {
SettingsTitleTextComponent(text = stringResource(id = R.string.color_customization)) SettingsTitleTextComponent(text = stringResource(id = R.string.color_customization))
}) { }) {

2
gradle/libs.versions.toml
View File

@ -2,7 +2,7 @@
#jetbrains #jetbrains
kotlin = "1.9.10" kotlin = "1.9.10"
#Simple tools #Simple tools
simple-commons = "80c40375a5" simple-commons = "fd497d3719"
#Compose #Compose
composeActivity = "1.8.0" composeActivity = "1.8.0"
compose = "1.6.0-alpha07" compose = "1.6.0-alpha07"