Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Still working on upgrading deps. #785

Merged
merged 3 commits into from
Mar 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 10 additions & 9 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ android {
compose true
}
composeOptions {
kotlinCompilerExtensionVersion = "1.5.8"
kotlinCompilerExtensionVersion = "1.5.10"
}
namespace 'com.dessalines.thumbkey'
}
Expand All @@ -72,8 +72,9 @@ dependencies {

implementation "com.github.jeziellago:compose-markdown:0.3.5"

implementation 'androidx.navigation:navigation-compose:2.7.6'
implementation 'com.github.alorma:compose-settings-ui-m3:1.0.3'
implementation 'androidx.navigation:navigation-compose:2.7.7'
implementation 'com.github.alorma:compose-settings-ui-android:1.2.0'
implementation 'com.github.alorma:compose-settings-storage-disk:1.2.0'

// To use Kotlin annotation processing tool
ksp 'androidx.room:room-compiler:2.6.1'
Expand All @@ -91,16 +92,16 @@ dependencies {
implementation 'androidx.room:room-paging:2.6.1'

// LiveData
implementation 'androidx.compose.runtime:runtime-livedata:1.6.0'
implementation 'androidx.compose.runtime:runtime-livedata:1.6.2'
implementation "androidx.lifecycle:lifecycle-runtime-compose:2.7.0"

implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.9.22'
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.compose.ui:ui:1.6.0'
implementation 'androidx.compose.material3:material3:1.1.2'
implementation 'androidx.compose.material:material-icons-extended-desktop:1.6.0'
implementation 'androidx.compose.material3:material3-window-size-class:1.1.2'
implementation 'androidx.compose.ui:ui-tooling:1.6.0'
implementation 'androidx.compose.ui:ui:1.6.2'
implementation 'androidx.compose.material3:material3:1.2.0'
implementation 'androidx.compose.material:material-icons-extended-desktop:1.6.2'
implementation 'androidx.compose.material3:material3-window-size-class:1.2.0'
implementation 'androidx.compose.ui:ui-tooling:1.6.2'
implementation 'androidx.activity:activity-compose:1.8.2'
implementation "com.louiscad.splitties:splitties-systemservices:3.0.0"
implementation "com.louiscad.splitties:splitties-views:3.0.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.navigation.NavController
import com.alorma.compose.settings.storage.base.SettingValueState
import com.alorma.compose.settings.storage.base.rememberIntSetSettingState
import com.alorma.compose.settings.storage.disk.rememberIntSetSettingState
import com.alorma.compose.settings.ui.SettingsListMultiSelect
import com.alorma.compose.settings.ui.SettingsMenuLink
import com.dessalines.thumbkey.R
Expand Down Expand Up @@ -97,7 +97,8 @@ fun SettingsActivity(

val layoutsState =
rememberIntSetSettingState(
keyboardLayoutsSetFromTitleIndex(settings?.keyboardLayouts),
key = "layouts",
defaultValue = keyboardLayoutsSetFromTitleIndex(settings?.keyboardLayouts),
)

Scaffold(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import androidx.compose.material.icons.outlined.BugReport
import androidx.compose.material.icons.outlined.Code
import androidx.compose.material.icons.outlined.NewReleases
import androidx.compose.material.icons.outlined.TravelExplore
import androidx.compose.material3.Divider
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Scaffold
Expand Down Expand Up @@ -169,7 +169,7 @@ fun AboutActivity(navController: NavController) {

@Composable
fun SettingsDivider() {
Divider(modifier = Modifier.padding(vertical = 10.dp))
HorizontalDivider(modifier = Modifier.padding(vertical = 10.dp))
}

@Composable
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.navigation.NavController
import com.alorma.compose.settings.storage.base.SettingValueState
import com.alorma.compose.settings.storage.base.rememberBooleanSettingState
import com.alorma.compose.settings.storage.base.rememberFloatSettingState
import com.alorma.compose.settings.storage.base.rememberIntSettingState
import com.alorma.compose.settings.storage.disk.rememberBooleanSettingState
import com.alorma.compose.settings.storage.disk.rememberFloatSettingState
import com.alorma.compose.settings.storage.disk.rememberIntSettingState
import com.alorma.compose.settings.ui.SettingsCheckbox
import com.alorma.compose.settings.ui.SettingsList
import com.alorma.compose.settings.ui.SettingsSlider
Expand Down Expand Up @@ -65,35 +65,43 @@ fun BehaviorActivity(

val minSwipeLengthState =
rememberFloatSettingState(
(settings?.minSwipeLength ?: DEFAULT_MIN_SWIPE_LENGTH).toFloat(),
key = "minSwipeLength",
defaultValue = (settings?.minSwipeLength ?: DEFAULT_MIN_SWIPE_LENGTH).toFloat(),
)
val slideSensitivityState =
rememberFloatSettingState(
(settings?.slideSensitivity ?: DEFAULT_SLIDE_SENSITIVITY).toFloat(),
key = "slideSensitivity",
defaultValue = (settings?.slideSensitivity ?: DEFAULT_SLIDE_SENSITIVITY).toFloat(),
)
val slideCursorMovementModeState =
rememberIntSettingState(
(settings?.slideCursorMovementMode ?: DEFAULT_SLIDE_CURSOR_MOVEMENT_MODE),
key = "slideCursorMovementMode",
defaultValue = (settings?.slideCursorMovementMode ?: DEFAULT_SLIDE_CURSOR_MOVEMENT_MODE),
)
val slideEnabledState =
rememberBooleanSettingState(
(settings?.slideEnabled ?: DEFAULT_SLIDE_ENABLED).toBool(),
key = "slideEnabled",
defaultValue = (settings?.slideEnabled ?: DEFAULT_SLIDE_ENABLED).toBool(),
)
val slideSpacebarDeadzoneEnabledState =
rememberBooleanSettingState(
(settings?.slideSpacebarDeadzoneEnabled ?: DEFAULT_SLIDE_SPACEBAR_DEADZONE_ENABLED).toBool(),
key = "slideSpacebarDeadzone",
defaultValue = (settings?.slideSpacebarDeadzoneEnabled ?: DEFAULT_SLIDE_SPACEBAR_DEADZONE_ENABLED).toBool(),
)
val slideBackspaceDeadzoneEnabledState =
rememberBooleanSettingState(
(settings?.slideBackspaceDeadzoneEnabled ?: DEFAULT_SLIDE_BACKSPACE_DEADZONE_ENABLED).toBool(),
key = "slideBackspaceDeadZone",
defaultValue = (settings?.slideBackspaceDeadzoneEnabled ?: DEFAULT_SLIDE_BACKSPACE_DEADZONE_ENABLED).toBool(),
)
val autoCapitalizeState =
rememberBooleanSettingState(
((settings?.autoCapitalize ?: DEFAULT_AUTO_CAPITALIZE).toBool()),
key = "autoCapitalize",
defaultValue = ((settings?.autoCapitalize ?: DEFAULT_AUTO_CAPITALIZE).toBool()),
)
val spacebarMultiTapsState =
rememberBooleanSettingState(
((settings?.spacebarMultiTaps ?: DEFAULT_SPACEBAR_MULTITAPS).toBool()),
key = "spacebarMultiTaps",
defaultValue = ((settings?.spacebarMultiTaps ?: DEFAULT_SPACEBAR_MULTITAPS).toBool()),
)

val snackbarHostState = remember { SnackbarHostState() }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.navigation.NavController
import com.alorma.compose.settings.storage.base.SettingValueState
import com.alorma.compose.settings.storage.base.rememberBooleanSettingState
import com.alorma.compose.settings.storage.base.rememberFloatSettingState
import com.alorma.compose.settings.storage.base.rememberIntSettingState
import com.alorma.compose.settings.storage.disk.rememberBooleanSettingState
import com.alorma.compose.settings.storage.disk.rememberFloatSettingState
import com.alorma.compose.settings.storage.disk.rememberIntSettingState
import com.alorma.compose.settings.ui.SettingsCheckbox
import com.alorma.compose.settings.ui.SettingsList
import com.alorma.compose.settings.ui.SettingsSlider
Expand Down Expand Up @@ -85,77 +85,101 @@ fun LookAndFeelActivity(

val keySizeState =
rememberFloatSettingState(
(settings?.keySize ?: DEFAULT_KEY_SIZE).toFloat(),
key = "keySize",
defaultValue = (settings?.keySize ?: DEFAULT_KEY_SIZE).toFloat(),
)
val keyWidthState =
rememberFloatSettingState(
(settings?.keyWidth ?: keySizeState.value).toFloat(),
key = "keyWidth",
defaultValue = (settings?.keyWidth ?: keySizeState.value).toFloat(),
)
val nonSquareKeysState =
rememberBooleanSettingState(
keySizeState.value != keyWidthState.value,
key = "nonSquare",
defaultValue = keySizeState.value != keyWidthState.value,
)
val pushupSizeState =
rememberFloatSettingState(
(settings?.pushupSize ?: DEFAULT_PUSHUP_SIZE).toFloat(),
key = "pushupSize",
defaultValue = (settings?.pushupSize ?: DEFAULT_PUSHUP_SIZE).toFloat(),
)
val animationSpeedState =
rememberFloatSettingState(
(settings?.animationSpeed ?: DEFAULT_ANIMATION_SPEED).toFloat(),
key = "animationSpeed",
defaultValue = (settings?.animationSpeed ?: DEFAULT_ANIMATION_SPEED).toFloat(),
)
val animationHelperSpeedState =
rememberFloatSettingState(
(settings?.animationHelperSpeed ?: DEFAULT_ANIMATION_HELPER_SPEED).toFloat(),
key = "animationHelperSpeed",
defaultValue = (settings?.animationHelperSpeed ?: DEFAULT_ANIMATION_HELPER_SPEED).toFloat(),
)
val positionState =
rememberIntSettingState(
settings?.position ?: DEFAULT_POSITION,
key = "position",
defaultValue = settings?.position ?: DEFAULT_POSITION,
)
val vibrateOnTapState =
rememberBooleanSettingState(
((settings?.vibrateOnTap ?: DEFAULT_VIBRATE_ON_TAP).toBool()),
key = "vibrateOnTap",
defaultValue = ((settings?.vibrateOnTap ?: DEFAULT_VIBRATE_ON_TAP).toBool()),
)
val soundOnTapState =
rememberBooleanSettingState(
((settings?.soundOnTap ?: DEFAULT_SOUND_ON_TAP).toBool()),
key = "soundOnTap",
defaultValue = ((settings?.soundOnTap ?: DEFAULT_SOUND_ON_TAP).toBool()),
)
val hideLettersState =
rememberBooleanSettingState(
((settings?.hideLetters ?: DEFAULT_HIDE_LETTERS).toBool()),
key = "hideLetters",
defaultValue = ((settings?.hideLetters ?: DEFAULT_HIDE_LETTERS).toBool()),
)
val hideSymbolsState =
rememberBooleanSettingState(
((settings?.hideSymbols ?: DEFAULT_HIDE_SYMBOLS).toBool()),
key = "hideSymbols",
defaultValue = ((settings?.hideSymbols ?: DEFAULT_HIDE_SYMBOLS).toBool()),
)

val themeState = rememberIntSettingState(settings?.theme ?: DEFAULT_THEME)
val themeColorState = rememberIntSettingState(settings?.themeColor ?: DEFAULT_THEME_COLOR)
val themeState =
rememberIntSettingState(
key = "theme",
defaultValue = settings?.theme ?: DEFAULT_THEME,
)
val themeColorState =
rememberIntSettingState(
key = "themeColor",
defaultValue = settings?.themeColor ?: DEFAULT_THEME_COLOR,
)
val keyBordersState =
rememberBooleanSettingState(
((settings?.keyBorders ?: DEFAULT_KEY_BORDERS).toBool()),
key = "keyBorders",
defaultValue = ((settings?.keyBorders ?: DEFAULT_KEY_BORDERS).toBool()),
)

val snackbarHostState = remember { SnackbarHostState() }

val scrollState = rememberScrollState()

val backdropEnabledState =
rememberBooleanSettingState(
((settings?.backdropEnabled ?: DEFAULT_BACKDROP_ENABLED).toBool()),
key = "backdropEnabled",
defaultValue = ((settings?.backdropEnabled ?: DEFAULT_BACKDROP_ENABLED).toBool()),
)
val keyPaddingState =
rememberFloatSettingState(
(settings?.keyPadding ?: DEFAULT_KEY_PADDING).toFloat(),
key = "keyPadding",
defaultValue = (settings?.keyPadding ?: DEFAULT_KEY_PADDING).toFloat(),
)
val keyBorderWidthState =
rememberFloatSettingState(
(settings?.keyBorderWidth ?: DEFAULT_KEY_BORDER_WIDTH).toFloat(),
key = "keyBorderWidth",
defaultValue = (settings?.keyBorderWidth ?: DEFAULT_KEY_BORDER_WIDTH).toFloat(),
)
val keyRadiusState =
rememberFloatSettingState(
(settings?.keyRadius ?: DEFAULT_KEY_RADIUS).toFloat(),
key = "keyRadius",
defaultValue = (settings?.keyRadius ?: DEFAULT_KEY_RADIUS).toFloat(),
)

val snackbarHostState = remember { SnackbarHostState() }

val scrollState = rememberScrollState()

Scaffold(
snackbarHost = { SnackbarHost(snackbarHostState) },
topBar = {
Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ buildscript {
}

plugins {
id 'com.android.application' version '8.2.2' apply false
id 'com.android.library' version '8.2.2' apply false
id 'com.android.application' version '8.3.0' apply false
id 'com.android.library' version '8.3.0' apply false
id 'org.jetbrains.kotlin.android' version '1.9.22' apply false
id 'org.jmailen.kotlinter' version "4.2.0" apply false
id 'com.google.devtools.ksp' version "1.9.22-1.0.16" apply false
id 'com.google.devtools.ksp' version "1.9.22-1.0.17" apply false
}

subprojects {
Expand Down