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

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

Дженерики #2

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
78 changes: 14 additions & 64 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
Expand Up @@ -27,6 +27,7 @@ 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
Expand All @@ -35,70 +36,19 @@ fun CountryCodeBottomSheet(
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(
isSelected = isSelected,
countryCode = countryCode,
selectedCodes = selectedCodes,
onCodesSelected = onCodesSelected
)
}
}

Expand Down
77 changes: 14 additions & 63 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
Expand Up @@ -27,6 +27,7 @@ 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
import ru.yandex.practicum.contacts.presentation.ui.components.CommonBottomSheet

@OptIn(ExperimentalMaterial3Api::class)
@Composable
Expand All @@ -35,70 +36,20 @@ fun MessengersBottomSheet(
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(
isSelected = isSelected,
app = app,
selectedApps = selectedApps,
onAppsSelected = onAppsSelected
)
}
}

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ android.useAndroidX=true
# Enables namespacing of each library's R class so that its R class includes only the
# resources declared in the library itself and none from the library's dependencies,
# thereby reducing the size of the R class for that library
android.nonTransitiveRClass=true
android.nonTransitiveRClass=true