2 Commits

Author SHA1 Message Date
jingyun
2ce3306e1f fix:修改弹窗搜索框边距属性 2025-08-28 11:33:00 +08:00
jingyun
13e437d81b feat: hongkong to chinese hongkong 2025-05-28 10:29:32 +08:00
9 changed files with 49 additions and 71 deletions

View File

@@ -1,19 +1,20 @@
# This workflow uses actions that are not certified by GitHub. name: Publish plugin
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.
name: Publish to pub.dev
on: on:
push: push:
tags: tags:
- '[0-9]+.[0-9]+.[0-9]+*' - v*
jobs: jobs:
publish: publish:
permissions:
id-token: write # Required for authentication using OIDC runs-on: ubuntu-latest
uses: dart-lang/setup-dart/.github/workflows/publish.yml@v1
# with: steps:
# working-directory: path/to/package/within/repository - name: Checkout
uses: actions/checkout@v1
- name: Publish
uses: sakebook/actions-flutter-pub-publisher@v1.2.1
with:
credential: ${{ secrets.CREDENTIALS }}
skip_test: true

View File

@@ -1,9 +1,3 @@
## 3.3.1 - August 19 2025
- Fix French translation accent display issue
- Correct French country name translations (Biélorussie, Koweït, Grenade, etc.)
- Preserve accents in displayed names while maintaining search functionality
- Update search logic to handle both accented and non-accented input
## 3.3.0 - March 26 2025 ## 3.3.0 - March 26 2025
- Fix localization, typo, and flag issue #51 thanks to @MrRoy121 - Fix localization, typo, and flag issue #51 thanks to @MrRoy121

View File

@@ -386,6 +386,7 @@ class CountryCodePickerState extends State<CountryCodePicker> {
hideSearch: widget.hideSearch, hideSearch: widget.hideSearch,
closeIcon: widget.closeIcon, closeIcon: widget.closeIcon,
flagDecoration: widget.flagDecoration, flagDecoration: widget.flagDecoration,
searchPadding: widget.searchPadding,
); );
}, },
); );

View File

@@ -28,6 +28,8 @@ class SelectionBottomSheet extends StatefulWidget {
/// elements passed as favorite /// elements passed as favorite
final List<CountryCode> favoriteElements; final List<CountryCode> favoriteElements;
final EdgeInsetsGeometry searchPadding;
SelectionBottomSheet( SelectionBottomSheet(
this.elements, this.elements,
this.favoriteElements, { this.favoriteElements, {
@@ -46,6 +48,7 @@ class SelectionBottomSheet extends StatefulWidget {
this.barrierColor, this.barrierColor,
this.hideSearch = false, this.hideSearch = false,
this.closeIcon, this.closeIcon,
this.searchPadding = const EdgeInsets.symmetric(horizontal: 24),
}) : searchDecoration = searchDecoration.prefixIcon == null }) : searchDecoration = searchDecoration.prefixIcon == null
? searchDecoration.copyWith(prefixIcon: const Icon(Icons.search)) ? searchDecoration.copyWith(prefixIcon: const Icon(Icons.search))
: searchDecoration, : searchDecoration,
@@ -93,7 +96,7 @@ class _SelectionBottomSheetState extends State<SelectionBottomSheet> {
), ),
if (!widget.hideSearch) if (!widget.hideSearch)
Padding( Padding(
padding: const EdgeInsets.symmetric(horizontal: 24), padding: widget.searchPadding,
child: TextField( child: TextField(
style: widget.searchStyle, style: widget.searchStyle,
decoration: widget.searchDecoration, decoration: widget.searchDecoration,

View File

@@ -1,4 +1,5 @@
import 'package:collection/collection.dart' show IterableExtension; import 'package:collection/collection.dart' show IterableExtension;
import 'package:diacritic/diacritic.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/foundation.dart' show kDebugMode; import 'package:flutter/foundation.dart' show kDebugMode;
@@ -44,9 +45,7 @@ class CountryCode {
try { try {
return CountryCode.fromCountryCode(countryCode); return CountryCode.fromCountryCode(countryCode);
} catch (e) { } catch (e) {
if (kDebugMode) { if (kDebugMode) print('Failed to recognize country from countryCode: $countryCode');
print('Failed to recognize country from countryCode: $countryCode');
}
return null; return null;
} }
} }
@@ -62,21 +61,20 @@ class CountryCode {
try { try {
return CountryCode.fromDialCode(dialCode); return CountryCode.fromDialCode(dialCode);
} catch (e) { } catch (e) {
if (kDebugMode) { if (kDebugMode) print('Failed to recognize country from dialCode: $dialCode');
print('Failed to recognize country from dialCode: $dialCode');
}
return null; return null;
} }
} }
CountryCode localize(BuildContext context) { CountryCode localize(BuildContext context) {
final nam = CountryLocalizations.of(context)?.translate(code) ?? name; final nam = CountryLocalizations.of(context)?.translate(code) ?? name;
return this..name = nam ?? name; return this
..name = nam == null? name : removeDiacritics(nam);
} }
factory CountryCode.fromJson(Map<String, dynamic> json) { factory CountryCode.fromJson(Map<String, dynamic> json) {
return CountryCode( return CountryCode(
name: json['name'], name: removeDiacritics(json['name']),
code: json['code'], code: json['code'],
dialCode: json['dial_code'], dialCode: json['dial_code'],
flagUri: 'flags/${json['code'].toLowerCase()}.png', flagUri: 'flags/${json['code'].toLowerCase()}.png',

View File

@@ -18,7 +18,7 @@
"BH": "Bahrein", "BH": "Bahrein",
"BD": "Bangladesh", "BD": "Bangladesh",
"BB": "Barbade", "BB": "Barbade",
"BY": "Biélorussie", "BY": "Bielorussie",
"BE": "Belgique", "BE": "Belgique",
"BZ": "Belize", "BZ": "Belize",
"BJ": "Bénin", "BJ": "Bénin",
@@ -38,7 +38,7 @@
"CM": "Cameroun", "CM": "Cameroun",
"CA": "Canada", "CA": "Canada",
"CV": "Cap-Vert", "CV": "Cap-Vert",
"KY": "Îles Caïmans", "KY": "Caïmanes",
"CF": "Centrafricaine, République", "CF": "Centrafricaine, République",
"TD": "Tchad", "TD": "Tchad",
"CL": "Chili", "CL": "Chili",
@@ -83,7 +83,7 @@
"GI": "Gibraltar", "GI": "Gibraltar",
"GR": "Grèce", "GR": "Grèce",
"GL": "Groenland", "GL": "Groenland",
"GD": "Grenade", "GD": "Grenada",
"GP": "Guadeloupe", "GP": "Guadeloupe",
"GU": "Guam", "GU": "Guam",
"GT": "Guatemala", "GT": "Guatemala",
@@ -110,9 +110,9 @@
"KZ": "Kazakhstan", "KZ": "Kazakhstan",
"KE": "Kenya", "KE": "Kenya",
"KI": "Kiribati", "KI": "Kiribati",
"KP": "Corée du Nord", "KP": "Corée du Nord, République populaire démocratique",
"KR": "Corée du Sud", "KR": "Corée du Sud, République",
"KW": "Koweït", "KW": "Koweit",
"KG": "Kirghistan", "KG": "Kirghistan",
"LA": "Laos", "LA": "Laos",
"LV": "Lettonie", "LV": "Lettonie",
@@ -179,7 +179,7 @@
"SH": "Sainte-Hélène", "SH": "Sainte-Hélène",
"KN": "Saint-Christophe-et-Niévès", "KN": "Saint-Christophe-et-Niévès",
"LC": "Sainte-Lucie", "LC": "Sainte-Lucie",
"PM": "Saint-Pierre-et-Miquelon", "PM": "Saint Pierre and Miquelon",
"VC": "Saint-Vincent et les Grenadines", "VC": "Saint-Vincent et les Grenadines",
"WS": "Samoa", "WS": "Samoa",
"SM": "Saint-Marin", "SM": "Saint-Marin",
@@ -200,15 +200,15 @@
"SD": "Soudan", "SD": "Soudan",
"SR": "Suriname", "SR": "Suriname",
"SJ": "Svalbard et Île Jan Mayen", "SJ": "Svalbard et Île Jan Mayen",
"SZ": "Eswatini", "SZ": "Ngwane, Royaume d'Eswatini",
"SE": "Suède", "SE": "Suède",
"CH": "Suisse", "CH": "Suisse",
"SY": "Syrie", "SY": "Syrie",
"TW": "Taïwan", "TW": "Taïwan",
"TJ": "Tadjikistan", "TJ": "Tadjikistan",
"TZ": "Tanzanie", "TZ": "Tanzanie, République unie",
"TH": "Thaïlande", "TH": "Thaïlande",
"TL": "Timor-Leste", "TL": "Timor Leste",
"TG": "Togo", "TG": "Togo",
"TK": "Tokelau", "TK": "Tokelau",
"TO": "Tonga", "TO": "Tonga",

View File

@@ -93,7 +93,7 @@
"GU": "关岛", "GU": "关岛",
"GW": "几内亚比绍", "GW": "几内亚比绍",
"GY": "圭亚那", "GY": "圭亚那",
"HK": "香港", "HK": "中国香港",
"HM": "赫德岛和麦克唐纳群岛", "HM": "赫德岛和麦克唐纳群岛",
"HN": "洪都拉斯", "HN": "洪都拉斯",
"HR": "克罗地亚", "HR": "克罗地亚",
@@ -146,7 +146,7 @@
"ML": "马里", "ML": "马里",
"MM": "缅甸", "MM": "缅甸",
"MN": "蒙古", "MN": "蒙古",
"MO": "澳门", "MO": "中国澳门",
"MP": "北马里亚纳群岛", "MP": "北马里亚纳群岛",
"MQ": "马提尼克", "MQ": "马提尼克",
"MR": "毛里塔尼亚", "MR": "毛里塔尼亚",

View File

@@ -1,5 +1,4 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:diacritic/diacritic.dart';
import 'country_code.dart'; import 'country_code.dart';
import 'country_localizations.dart'; import 'country_localizations.dart';
@@ -51,7 +50,7 @@ class SelectionDialog extends StatefulWidget {
InputDecoration searchDecoration = const InputDecoration(), InputDecoration searchDecoration = const InputDecoration(),
this.searchStyle, this.searchStyle,
this.textStyle, this.textStyle,
required this.topBarPadding, required this.topBarPadding,
this.headerText, this.headerText,
this.boxDecoration, this.boxDecoration,
this.showFlag, this.showFlag,
@@ -63,12 +62,9 @@ class SelectionDialog extends StatefulWidget {
this.hideSearch = false, this.hideSearch = false,
this.hideCloseIcon = false, this.hideCloseIcon = false,
this.closeIcon, this.closeIcon,
this.dialogItemPadding = this.dialogItemPadding = const EdgeInsets.symmetric(horizontal: 24, vertical: 8),
const EdgeInsets.symmetric(horizontal: 24, vertical: 8),
this.searchPadding = const EdgeInsets.symmetric(horizontal: 24), this.searchPadding = const EdgeInsets.symmetric(horizontal: 24),
}) : searchDecoration = searchDecoration.prefixIcon == null }) : searchDecoration = searchDecoration.prefixIcon == null ? searchDecoration.copyWith(prefixIcon: const Icon(Icons.search)) : searchDecoration,
? searchDecoration.copyWith(prefixIcon: const Icon(Icons.search))
: searchDecoration,
super(key: key); super(key: key);
@override @override
@@ -85,8 +81,7 @@ class _SelectionDialogState extends State<SelectionDialog> {
child: Container( child: Container(
clipBehavior: Clip.hardEdge, clipBehavior: Clip.hardEdge,
width: widget.size?.width ?? MediaQuery.of(context).size.width, width: widget.size?.width ?? MediaQuery.of(context).size.width,
height: height: widget.size?.height ?? MediaQuery.of(context).size.height * 0.85,
widget.size?.height ?? MediaQuery.of(context).size.height * 0.85,
decoration: widget.boxDecoration ?? decoration: widget.boxDecoration ??
BoxDecoration( BoxDecoration(
color: widget.backgroundColor ?? Colors.white, color: widget.backgroundColor ?? Colors.white,
@@ -105,9 +100,7 @@ class _SelectionDialogState extends State<SelectionDialog> {
crossAxisAlignment: CrossAxisAlignment.end, crossAxisAlignment: CrossAxisAlignment.end,
children: [ children: [
Padding( Padding(
padding: !widget.hideHeaderText padding:!widget.hideHeaderText? widget.topBarPadding: EdgeInsets.zero,
? widget.topBarPadding
: EdgeInsets.zero,
child: Row( child: Row(
mainAxisAlignment: widget.headerAlignment, mainAxisAlignment: widget.headerAlignment,
children: [ children: [
@@ -184,14 +177,11 @@ class _SelectionDialogState extends State<SelectionDialog> {
if (widget.showFlag!) if (widget.showFlag!)
Flexible( Flexible(
child: Container( child: Container(
margin: Directionality.of(context) == margin: Directionality.of(context) == TextDirection.ltr // Here Adding padding depending on the locale language direction
TextDirection
.ltr // Here Adding padding depending on the locale language direction
? const EdgeInsets.only(right: 16.0) ? const EdgeInsets.only(right: 16.0)
: const EdgeInsets.only(left: 16.0), : const EdgeInsets.only(left: 16.0),
decoration: widget.flagDecoration, decoration: widget.flagDecoration,
clipBehavior: clipBehavior: widget.flagDecoration == null ? Clip.none : Clip.hardEdge,
widget.flagDecoration == null ? Clip.none : Clip.hardEdge,
child: Image.asset( child: Image.asset(
e.flagUri!, e.flagUri!,
package: 'country_code_picker', package: 'country_code_picker',
@@ -202,9 +192,7 @@ class _SelectionDialogState extends State<SelectionDialog> {
Expanded( Expanded(
flex: 4, flex: 4,
child: Text( child: Text(
widget.showCountryOnly! widget.showCountryOnly! ? e.toCountryStringOnly() : e.toLongString(),
? e.toCountryStringOnly()
: e.toLongString(),
overflow: TextOverflow.fade, overflow: TextOverflow.fade,
style: widget.textStyle, style: widget.textStyle,
), ),
@@ -220,8 +208,7 @@ class _SelectionDialogState extends State<SelectionDialog> {
} }
return Center( return Center(
child: Text(CountryLocalizations.of(context)?.translate('no_country') ?? child: Text(CountryLocalizations.of(context)?.translate('no_country') ?? 'No country found'),
'No country found'),
); );
} }
@@ -232,15 +219,9 @@ class _SelectionDialogState extends State<SelectionDialog> {
} }
void _filterElements(String s) { void _filterElements(String s) {
final normalizedSearch = removeDiacritics(s.toUpperCase()); s = s.toUpperCase();
setState(() { setState(() {
filteredElements = widget.elements filteredElements = widget.elements.where((e) => e.code!.contains(s) || e.dialCode!.contains(s) || e.name!.toUpperCase().contains(s)).toList();
.where((e) =>
e.code!.contains(normalizedSearch) ||
e.dialCode!.contains(normalizedSearch) ||
removeDiacritics(e.name!.toUpperCase())
.contains(normalizedSearch))
.toList();
}); });
} }

View File

@@ -1,6 +1,6 @@
name: country_code_picker name: country_code_picker
description: A flutter package for showing a country code selector. In addition it gives the possibility to select a list of favorites countries, as well as to search using a simple searchbox description: A flutter package for showing a country code selector. In addition it gives the possibility to select a list of favorites countries, as well as to search using a simple searchbox
version: 3.3.1 version: 3.3.0
homepage: https://github.com/chandrabezzo/CountryCodePicker homepage: https://github.com/chandrabezzo/CountryCodePicker
repository: https://github.com/chandrabezzo/CountryCodePicker repository: https://github.com/chandrabezzo/CountryCodePicker
issue_tracker: https://github.com/imtoori/CountryCodePicker/issues issue_tracker: https://github.com/imtoori/CountryCodePicker/issues