ember/fluffychat
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: reduce padding in learning setting dropdowns (#1772)

Browse source
This commit is contained in:
ggurdin 2025-02-12 12:24:30 -05:00 • committed by GitHub
parent c72a2da7fc
commit 3af3f78d93
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 42 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/pangea/learning_settings/pages/settings_learning_view.dart
View file

@ -47,7 +47,10 @@ class SettingsLearningView extends StatelessWidget {
child: Form(
key: controller.formKey,
child: Padding(
padding: const EdgeInsets.all(16.0),
padding: const EdgeInsets.symmetric(
vertical: 16.0,
horizontal: 8.0,
),
child: Column(
children: [
Expanded(
@ -186,6 +189,7 @@ class SettingsLearningView extends StatelessWidget {
L10n.of(context).publicProfileDesc,
),
activeColor: AppConfig.activeToggleColor,
contentPadding: EdgeInsets.zero,
),
],
),

57
lib/pangea/learning_settings/widgets/country_picker_tile.dart
View file

@ -30,13 +30,19 @@ class CountryPickerDropdownState extends State<CountryPickerDropdown> {
@override
Widget build(BuildContext context) {
final countries = CountryService().getAll();
return DropdownButtonFormField2<Country>(
customButton: widget.learningController.country != null
customButton: widget.learningController.country != null &&
countries.any(
(country) =>
country.name == widget.learningController.country!.name,
)
? CountryPickerTile(
widget.learningController.country!,
isDropdown: true,
)
: null,
isExpanded: true,
decoration: InputDecoration(
labelText: L10n.of(context).countryInformation,
),
@ -44,12 +50,12 @@ class CountryPickerDropdownState extends State<CountryPickerDropdown> {
maxHeight: 300,
),
items: [
...CountryService().getAll().map(
(country) => DropdownMenuItem(
value: country,
child: CountryPickerTile(country),
),
),
...countries.map(
(country) => DropdownMenuItem(
value: country,
child: CountryPickerTile(country),
),
),
],
onChanged: widget.learningController.changeCountry,
value: widget.learningController.country,
@ -94,23 +100,28 @@ class CountryPickerTile extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
CountryDisplayUtil.flagEmoji(country.name),
style: const TextStyle(fontSize: 25),
),
const SizedBox(width: 10),
Text(
CountryDisplayUtil.countryDisplayName(
country.name,
context,
) ??
'',
style: const TextStyle().copyWith(
color: Theme.of(context).textTheme.bodyLarge!.color,
fontSize: 14,
),
overflow: TextOverflow.ellipsis,
Row(
children: [
Text(
CountryDisplayUtil.flagEmoji(country.name),
style: const TextStyle(fontSize: 25),
),
const SizedBox(width: 10),
Text(
CountryDisplayUtil.countryDisplayName(
country.name,
context,
) ??
'',
style: const TextStyle().copyWith(
color: Theme.of(context).textTheme.bodyLarge!.color,
fontSize: 14,
),
overflow: TextOverflow.ellipsis,
),
],
),
if (isDropdown)
Icon(

3
lib/pangea/learning_settings/widgets/p_language_dropdown.dart
View file

@ -80,7 +80,8 @@ class PLanguageDropdownState extends State<PLanguageDropdown> {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
DropdownButtonFormField2<LanguageModel>(
customButton: widget.initialLanguage != null
customButton: widget.initialLanguage != null &&
sortedLanguages.contains(widget.initialLanguage)
? LanguageDropDownEntry(
languageModel: widget.initialLanguage!,
isL2List: widget.isL2List,

1
lib/pangea/learning_settings/widgets/p_settings_switch_list_tile.dart
View file

@ -44,6 +44,7 @@ class PSettingsSwitchListTileState
@override
Widget build(BuildContext context) {
return SwitchListTile.adaptive(
contentPadding: EdgeInsets.zero,
value: currentValue,
title: Text(widget.title),
activeColor: AppConfig.activeToggleColor,