Skip to content

Refactor bottom sheets to use CommonBottomSheet #21

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

Open
Lesperio wants to merge 1 commit into
base: compose-start
Choose a base branch
from
Open

Refactor bottom sheets to use CommonBottomSheet #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
135 changes: 15 additions & 120 deletions ...src/main/java/ru/yandex/practicum/contacts/presentation/country/CountryCodeBottomSheet.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,140 +1,35 @@
package ru.yandex.practicum.contacts.presentation.country

import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Close
import androidx.compose.material3.BottomSheetDefaults
import androidx.compose.material3.Checkbox
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.ModalBottomSheet
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import ru.yandex.practicum.contacts.R
import ru.yandex.practicum.contacts.data.models.CountryCode
import ru.yandex.practicum.contacts.presentation.ui.components.CommonBottomSheet

@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun CountryCodeBottomSheet(
selectedCodes: Set<CountryCode>,
onCodesSelected: (Set<CountryCode>) -> Unit,
onDismiss: () -> Unit
) {
ModalBottomSheet(
onDismissRequest = onDismiss,
dragHandle = { BottomSheetDefaults.DragHandle() }
) {
Column(
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 16.dp)
) {
Row(
modifier = Modifier
.fillMaxWidth()
.padding(bottom = 16.dp),
horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.CenterVertically
) {
Text(
text = stringResource(R.string.filter_by_country_code),
style = MaterialTheme.typography.titleLarge
)
IconButton(onClick = onDismiss) {
Icon(
imageVector = Icons.Default.Close,
contentDescription = stringResource(R.string.close)
)
}
}

LazyColumn(
modifier = Modifier
.fillMaxWidth()
.padding(bottom = 16.dp)
) {
items(CountryCode.COMMON_CODES) { countryCode ->
val isSelected = selectedCodes.contains(countryCode)
Surface(
modifier = Modifier
.fillMaxWidth()
.padding(vertical = 4.dp),
onClick = {
val newSelection = selectedCodes.toMutableSet()
if (isSelected) {
newSelection.remove(countryCode)
} else {
newSelection.add(countryCode)
}
onCodesSelected(newSelection)
},
color = if (isSelected) {
MaterialTheme.colorScheme.primaryContainer
} else {
MaterialTheme.colorScheme.surface
}
) {
CountryCodeOption(
isSelected = isSelected,
countryCode = countryCode,
selectedCodes = selectedCodes,
onCodesSelected = onCodesSelected
)
}
}
}
}
CommonBottomSheet(
title = stringResource(R.string.filter_by_country_code),
items = CountryCode.COMMON_CODES,
selectedItems = selectedCodes,
onItemsSelected = onCodesSelected,
onDismiss = onDismiss
) { countryCode, isSelected ->
CountryCodeOption(
countryCode = countryCode,
isSelected = isSelected
)
}
}

@Composable
private fun CountryCodeOption(
isSelected: Boolean,
countryCode: CountryCode,
selectedCodes: Set<CountryCode>,
onCodesSelected: (Set<CountryCode>) -> Unit
isSelected: Boolean
) {
Row(
modifier = Modifier
.fillMaxWidth()
.padding(16.dp),
verticalAlignment = Alignment.CenterVertically
) {
Checkbox(
checked = isSelected,
onCheckedChange = { checked ->
val newSelection = selectedCodes.toMutableSet()
if (checked) {
newSelection.add(countryCode)
} else {
newSelection.remove(countryCode)
}
onCodesSelected(newSelection)
}
)
Spacer(modifier = Modifier.width(16.dp))
Column {
Text(countryCode.code)
Text(
countryCode.country,
style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.onSurfaceVariant
)
}
}
}

}
120 changes: 20 additions & 100 deletions ...c/main/java/ru/yandex/practicum/contacts/presentation/messengers/MessengersBottomSheet.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,113 +1,41 @@
package ru.yandex.practicum.contacts.presentation.messengers

import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Close
import androidx.compose.material3.BottomSheetDefaults
import androidx.compose.runtime.Composable
import androidx.compose.ui.res.stringResource
import ru.yandex.practicum.contacts.R
import ru.yandex.practicum.contacts.data.models.MessagingApp
import ru.yandex.practicum.contacts.presentation.ui.components.CommonBottomSheet
import androidx.compose.foundation.layout.*
import androidx.compose.material3.Checkbox
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.ModalBottomSheet
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import ru.yandex.practicum.contacts.R
import ru.yandex.practicum.contacts.data.models.MessagingApp

@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun MessengersBottomSheet(
selectedApps: Set<MessagingApp>,
onAppsSelected: (Set<MessagingApp>) -> Unit,
onDismiss: () -> Unit
) {
ModalBottomSheet(
onDismissRequest = onDismiss,
dragHandle = { BottomSheetDefaults.DragHandle() }
) {
Column(
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 16.dp)
) {
Row(
modifier = Modifier
.fillMaxWidth()
.padding(bottom = 16.dp),
horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.CenterVertically
) {
Text(
text = stringResource(R.string.filter_by_messaging_app),
style = MaterialTheme.typography.titleLarge
)
IconButton(onClick = onDismiss) {
Icon(
imageVector = Icons.Default.Close,
contentDescription = stringResource(R.string.close)
)
}
}

LazyColumn(
modifier = Modifier
.fillMaxWidth()
.padding(bottom = 16.dp)
) {
items(MessagingApp.entries) { app ->
val isSelected = selectedApps.contains(app)
Surface(
modifier = Modifier
.fillMaxWidth()
.padding(vertical = 4.dp),
onClick = {
val newSelection = selectedApps.toMutableSet()
if (isSelected) {
newSelection.remove(app)
} else {
newSelection.add(app)
}
onAppsSelected(newSelection)
},
color = if (isSelected) {
MaterialTheme.colorScheme.primaryContainer
} else {
MaterialTheme.colorScheme.surface
}
) {
MessengerOption(
isSelected = isSelected,
app = app,
selectedApps = selectedApps,
onAppsSelected = onAppsSelected
)
}
}
}
}
CommonBottomSheet(
title = stringResource(R.string.filter_by_messaging_app),
items = MessagingApp.entries,
selectedItems = selectedApps,
onItemsSelected = onAppsSelected,
onDismiss = onDismiss
) { app, isSelected ->
MessengerOption(
app = app,
isSelected = isSelected
)
}
}

@Composable
private fun MessengerOption(
isSelected: Boolean,
app: MessagingApp,
selectedApps: Set<MessagingApp>,
onAppsSelected: (Set<MessagingApp>) -> Unit
isSelected: Boolean
) {
Row(
modifier = Modifier
Expand All @@ -117,17 +45,9 @@ private fun MessengerOption(
) {
Checkbox(
checked = isSelected,
onCheckedChange = { checked ->
val newSelection = selectedApps.toMutableSet()
if (checked) {
newSelection.add(app)
} else {
newSelection.remove(app)
}
onAppsSelected(newSelection)
}
onCheckedChange = null
)
Spacer(modifier = Modifier.width(16.dp))
Text(app.name)
}
}
}
4 changes: 2 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
id 'com.android.application' version '8.11.1' apply false
id 'com.android.library' version '8.11.1' apply false
id 'com.android.application' version '8.13.2' apply false
id 'com.android.library' version '8.13.2' apply false
id 'org.jetbrains.kotlin.android' version '2.2.0' apply false
id("org.jetbrains.kotlin.plugin.compose") version "2.2.0" apply false
}