-
Notifications
You must be signed in to change notification settings - Fork 52
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'ubuntu-flutter-community:main' into patch-6
- Loading branch information
Showing
18 changed files
with
268 additions
and
222 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| import 'package:flutter/foundation.dart'; | ||
|
|
||
| void printMessageInDebugMode(String message) { | ||
| void printMessageInDebugMode(Object? object) { | ||
| if (kDebugMode) { | ||
| print(message); | ||
| print(object); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,171 @@ | ||
| import 'package:flutter/material.dart'; | ||
| import 'package:podcast_search/podcast_search.dart'; | ||
| import 'package:watch_it/watch_it.dart'; | ||
|
|
||
| import '../../common/view/country_auto_complete.dart'; | ||
| import '../../common/view/icons.dart'; | ||
| import '../../common/view/language_autocomplete.dart'; | ||
| import '../../common/view/theme.dart'; | ||
| import '../../extensions/build_context_x.dart'; | ||
| import '../../l10n/l10n.dart'; | ||
| import '../../library/library_model.dart'; | ||
| import '../../settings/settings_model.dart'; | ||
| import '../search_model.dart'; | ||
|
|
||
| class PodcastSearchInputPrefix extends StatelessWidget with WatchItMixin { | ||
| const PodcastSearchInputPrefix({ | ||
| super.key, | ||
| }); | ||
|
|
||
| @override | ||
| Widget build(BuildContext context) { | ||
| final usePodcastIndex = | ||
| watchPropertyValue((SettingsModel m) => m.usePodcastIndex); | ||
| final l10n = context.l10n; | ||
| return IconButton( | ||
| tooltip: usePodcastIndex ? l10n.language : l10n.country, | ||
| onPressed: () => showDialog( | ||
| context: context, | ||
| builder: (context) => const LocationFilterDialog(), | ||
| ), | ||
| icon: Icon(Iconz.globe), | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| class LocationFilterDialog extends StatelessWidget { | ||
| const LocationFilterDialog({ | ||
| super.key, | ||
| }); | ||
|
|
||
| @override | ||
| Widget build(BuildContext context) { | ||
| return AlertDialog( | ||
| titlePadding: EdgeInsets.zero, | ||
| contentPadding: const EdgeInsets.all(20), | ||
| shape: RoundedRectangleBorder( | ||
| borderRadius: BorderRadius.circular(50), | ||
| ), | ||
| content: const LocationFilter(), | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| class LocationFilter extends StatelessWidget with WatchItMixin { | ||
| const LocationFilter({super.key}); | ||
|
|
||
| @override | ||
| Widget build(BuildContext context) { | ||
| final libraryModel = di<LibraryModel>(); | ||
| final theme = context.theme; | ||
| final searchModel = di<SearchModel>(); | ||
| watchPropertyValue((LibraryModel m) => m.favLanguagesLength); | ||
| watchPropertyValue((LibraryModel m) => m.favCountriesLength); | ||
| final country = watchPropertyValue((SearchModel m) => m.country); | ||
|
|
||
| void setCountry(Country? country) { | ||
| searchModel.setCountry(country); | ||
| if (country?.code != null) { | ||
| libraryModel.setLastCountryCode(country!.code); | ||
| } | ||
| } | ||
|
|
||
| final usePodcastIndex = | ||
| watchPropertyValue((SettingsModel m) => m.usePodcastIndex); | ||
| watchPropertyValue((LibraryModel m) => m.favLanguagesLength); | ||
| watchPropertyValue((LibraryModel m) => m.favCountriesLength); | ||
| final favLanguageCodes = | ||
| watchPropertyValue((LibraryModel m) => m.favLanguageCodes); | ||
|
|
||
| final language = watchPropertyValue((SearchModel m) => m.language); | ||
|
|
||
| final fillColor = theme.chipTheme.selectedColor; | ||
|
|
||
| const width = 150.0; | ||
| final height = chipHeight; | ||
| var outlineInputBorder = OutlineInputBorder( | ||
| borderRadius: BorderRadius.circular(100), | ||
| borderSide: yaruStyled | ||
| ? BorderSide.none | ||
| : BorderSide( | ||
| color: theme.colorScheme.outline, | ||
| width: 1.3, | ||
| strokeAlign: 1, | ||
| ), | ||
| ); | ||
| final style = theme.textTheme.bodyMedium?.copyWith( | ||
| fontWeight: FontWeight.w500, | ||
| ); | ||
|
|
||
| return usePodcastIndex | ||
| ? LanguageAutoComplete( | ||
| autofocus: true, | ||
| contentPadding: countryPillPadding, | ||
| fillColor: language != null | ||
| ? fillColor | ||
| : yaruStyled | ||
| ? theme.dividerColor | ||
| : null, | ||
| filled: language != null, | ||
| border: outlineInputBorder, | ||
| style: style, | ||
| isDense: true, | ||
| width: width, | ||
| height: height, | ||
| value: language, | ||
| favs: favLanguageCodes, | ||
| addFav: (language) { | ||
| if (language?.isoCode == null) return; | ||
| libraryModel.addFavLanguageCode(language!.isoCode); | ||
| }, | ||
| removeFav: (language) { | ||
| if (language?.isoCode == null) return; | ||
| libraryModel.removeFavLanguageCode(language!.isoCode); | ||
| }, | ||
| onSelected: (language) { | ||
| Navigator.of(context).pop(); | ||
| searchModel.setLanguage(language); | ||
| if (language?.isoCode != null) { | ||
| libraryModel.setLastLanguage(language!.isoCode); | ||
| } | ||
| searchModel.search(); | ||
| }, | ||
| ) | ||
| : CountryAutoComplete( | ||
| autofocus: true, | ||
| contentPadding: countryPillPadding, | ||
| fillColor: fillColor, | ||
| filled: true, | ||
| border: outlineInputBorder, | ||
| style: style, | ||
| isDense: true, | ||
| width: width, | ||
| height: height, | ||
| countries: [ | ||
| ...[ | ||
| ...Country.values, | ||
| ].where( | ||
| (e) => libraryModel.favCountryCodes.contains(e.code) == true, | ||
| ), | ||
| ...[...Country.values].where( | ||
| (e) => libraryModel.favCountryCodes.contains(e.code) == false, | ||
| ), | ||
| ]..remove(Country.none), | ||
| onSelected: (country) { | ||
| Navigator.of(context).pop(); | ||
| setCountry(country); | ||
| searchModel.search(); | ||
| }, | ||
| value: country, | ||
| addFav: (v) { | ||
| if (country?.code == null) return; | ||
| libraryModel.addFavCountryCode(v!.code); | ||
| }, | ||
| removeFav: (v) { | ||
| if (country?.code == null) return; | ||
| libraryModel.removeFavCountryCode(v!.code); | ||
| }, | ||
| favs: libraryModel.favCountryCodes, | ||
| ); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.