Skip to content

Скрываем клавиатуру свайпом #2

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.

Sign up for GitHub

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

Merged
easydev991 merged 2 commits into from
Jan 18, 2026
+9 −4
Merged

Скрываем клавиатуру свайпом #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d8cc88
Скрываем клавиатуру при скролле
easydev991 Jan 18, 2026
5e571c4
Поднял версию до 1.1
easydev991 Jan 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion app/src/main/java/com/dayscounter/ui/screen/components/createedit/CreateEditFormContent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
package com.dayscounter.ui.screen.components.createedit

import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.ExperimentalLayoutApi
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.imeNestedScroll
import androidx.compose.foundation.layout.imePadding
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
Expand Down Expand Up @@ -115,7 +118,7 @@ private fun colorAndDisplayOptionSection(
/**
* Контент формы создания/редактирования.
*/
@OptIn(ExperimentalMaterial3Api::class)
@OptIn(ExperimentalMaterial3Api::class, ExperimentalLayoutApi::class)
@Composable
internal fun createEditFormContent(params: CreateEditFormParams) {
// Функция для отслеживания изменений
Expand Down Expand Up @@ -144,6 +147,8 @@ internal fun createEditFormContent(params: CreateEditFormParams) {
Modifier
.fillMaxSize()
.padding(params.paddingValues)
.imePadding()
.imeNestedScroll()
.verticalScroll(rememberScrollState())
.padding(dimensionResource(R.dimen.spacing_regular)),
) {
Expand Down
6 changes: 3 additions & 3 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ kotlin.annotationProcessor=ksp
org.gradle.configuration-cache=true
org.gradle.configuration-cache.problems=warn
# App version (versionName: displayed in App Store, versionCode: build number)
VERSION_NAME=1.0
VERSION_CODE=5
VERSION_NAME=1.1
VERSION_CODE=6
android.uniquePackageNames=false
android.dependency.useConstraints=true
android.r8.strictFullModeForKeepRules=false
android.disallowKotlinSourceSets=false
# Disable WARNING: The property android.dependency.excludeLibraryComponentsFromConstraints improves project import performance for very large projects...
android.generateSyncIssueWhenLibraryConstraintsAreEnabled=false
android.generateSyncIssueWhenLibraryConstraintsAreEnabled=false