Fixed the Issue #48.
Localization is hardcoded to english since 3.2.0 #48 Added the localization use and boolean
This commit is contained in:
@@ -89,6 +89,7 @@ class MyAppState extends State<MyApp> {
|
|||||||
],
|
],
|
||||||
localizationsDelegates: const [
|
localizationsDelegates: const [
|
||||||
CountryLocalizations.delegate,
|
CountryLocalizations.delegate,
|
||||||
|
/// CountryLocalizations.getDelegate(enableLocalization: false), // For no localization only english just declare delegate this way.
|
||||||
GlobalMaterialLocalizations.delegate,
|
GlobalMaterialLocalizations.delegate,
|
||||||
GlobalWidgetsLocalizations.delegate,
|
GlobalWidgetsLocalizations.delegate,
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -152,16 +152,13 @@ class CountryCodePicker extends StatefulWidget {
|
|||||||
this.closeIcon = const Icon(Icons.close),
|
this.closeIcon = const Icon(Icons.close),
|
||||||
this.countryList = codes,
|
this.countryList = codes,
|
||||||
this.pickerStyle = PickerStyle.dialog,
|
this.pickerStyle = PickerStyle.dialog,
|
||||||
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),
|
||||||
this.headerAlignment = MainAxisAlignment.spaceBetween,
|
this.headerAlignment = MainAxisAlignment.spaceBetween,
|
||||||
this.headerText = "Select Country",
|
this.headerText = "Select Country",
|
||||||
this.headerTextStyle =
|
this.headerTextStyle = const TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
|
||||||
const TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
|
|
||||||
this.hideHeaderText = false,
|
this.hideHeaderText = false,
|
||||||
this.topBarPadding =
|
this.topBarPadding = const EdgeInsets.symmetric(vertical: 5.0, horizontal: 20),
|
||||||
const EdgeInsets.symmetric(vertical: 5.0, horizontal: 20),
|
|
||||||
Key? key,
|
Key? key,
|
||||||
}) : super(key: key);
|
}) : super(key: key);
|
||||||
|
|
||||||
@@ -170,16 +167,14 @@ class CountryCodePicker extends StatefulWidget {
|
|||||||
State<StatefulWidget> createState() {
|
State<StatefulWidget> createState() {
|
||||||
List<Map<String, String>> jsonList = countryList;
|
List<Map<String, String>> jsonList = countryList;
|
||||||
|
|
||||||
List<CountryCode> elements =
|
List<CountryCode> elements = jsonList.map((json) => CountryCode.fromJson(json)).toList();
|
||||||
jsonList.map((json) => CountryCode.fromJson(json)).toList();
|
|
||||||
|
|
||||||
if (comparator != null) {
|
if (comparator != null) {
|
||||||
elements.sort(comparator);
|
elements.sort(comparator);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (countryFilter != null && countryFilter!.isNotEmpty) {
|
if (countryFilter != null && countryFilter!.isNotEmpty) {
|
||||||
final uppercaseCustomList =
|
final uppercaseCustomList = countryFilter!.map((criteria) => criteria.toUpperCase()).toList();
|
||||||
countryFilter!.map((criteria) => criteria.toUpperCase()).toList();
|
|
||||||
elements = elements
|
elements = elements
|
||||||
.where((criteria) =>
|
.where((criteria) =>
|
||||||
uppercaseCustomList.contains(criteria.code) ||
|
uppercaseCustomList.contains(criteria.code) ||
|
||||||
@@ -205,9 +200,7 @@ class CountryCodePickerState extends State<CountryCodePicker> {
|
|||||||
Widget internalWidget;
|
Widget internalWidget;
|
||||||
if (widget.builder != null) {
|
if (widget.builder != null) {
|
||||||
internalWidget = InkWell(
|
internalWidget = InkWell(
|
||||||
onTap: pickerStyle == PickerStyle.dialog
|
onTap: pickerStyle == PickerStyle.dialog ? showCountryCodePickerDialog : showCountryCodePickerBottomSheet,
|
||||||
? showCountryCodePickerDialog
|
|
||||||
: showCountryCodePickerBottomSheet,
|
|
||||||
child: widget.builder!(selectedItem),
|
child: widget.builder!(selectedItem),
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
@@ -223,16 +216,12 @@ class CountryCodePickerState extends State<CountryCodePicker> {
|
|||||||
direction: Axis.horizontal,
|
direction: Axis.horizontal,
|
||||||
mainAxisSize: MainAxisSize.min,
|
mainAxisSize: MainAxisSize.min,
|
||||||
children: <Widget>[
|
children: <Widget>[
|
||||||
if (widget.showFlagMain != null
|
if (widget.showFlagMain != null ? widget.showFlagMain! : widget.showFlag)
|
||||||
? widget.showFlagMain!
|
|
||||||
: widget.showFlag)
|
|
||||||
Flexible(
|
Flexible(
|
||||||
flex: widget.alignLeft ? 0 : 1,
|
flex: widget.alignLeft ? 0 : 1,
|
||||||
fit: widget.alignLeft ? FlexFit.tight : FlexFit.loose,
|
fit: widget.alignLeft ? FlexFit.tight : FlexFit.loose,
|
||||||
child: Container(
|
child: Container(
|
||||||
clipBehavior: widget.flagDecoration == null
|
clipBehavior: widget.flagDecoration == null ? Clip.none : Clip.hardEdge,
|
||||||
? Clip.none
|
|
||||||
: Clip.hardEdge,
|
|
||||||
decoration: widget.flagDecoration,
|
decoration: widget.flagDecoration,
|
||||||
margin: widget.margin ??
|
margin: widget.margin ??
|
||||||
(widget.alignLeft
|
(widget.alignLeft
|
||||||
@@ -249,11 +238,8 @@ class CountryCodePickerState extends State<CountryCodePicker> {
|
|||||||
Flexible(
|
Flexible(
|
||||||
fit: widget.alignLeft ? FlexFit.tight : FlexFit.loose,
|
fit: widget.alignLeft ? FlexFit.tight : FlexFit.loose,
|
||||||
child: Text(
|
child: Text(
|
||||||
widget.showOnlyCountryWhenClosed
|
widget.showOnlyCountryWhenClosed ? selectedItem!.toCountryStringOnly() : selectedItem.toString(),
|
||||||
? selectedItem!.toCountryStringOnly()
|
style: widget.textStyle ?? Theme.of(context).textTheme.labelLarge,
|
||||||
: selectedItem.toString(),
|
|
||||||
style: widget.textStyle ??
|
|
||||||
Theme.of(context).textTheme.labelLarge,
|
|
||||||
overflow: widget.textOverflow,
|
overflow: widget.textOverflow,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
@@ -295,11 +281,9 @@ class CountryCodePickerState extends State<CountryCodePicker> {
|
|||||||
if (widget.initialSelection != null) {
|
if (widget.initialSelection != null) {
|
||||||
selectedItem = elements.firstWhere(
|
selectedItem = elements.firstWhere(
|
||||||
(criteria) =>
|
(criteria) =>
|
||||||
(criteria.code!.toUpperCase() ==
|
(criteria.code!.toUpperCase() == widget.initialSelection!.toUpperCase()) ||
|
||||||
widget.initialSelection!.toUpperCase()) ||
|
|
||||||
(criteria.dialCode == widget.initialSelection) ||
|
(criteria.dialCode == widget.initialSelection) ||
|
||||||
(criteria.name!.toUpperCase() ==
|
(criteria.name!.toUpperCase() == widget.initialSelection!.toUpperCase()),
|
||||||
widget.initialSelection!.toUpperCase()),
|
|
||||||
orElse: () => elements[0]);
|
orElse: () => elements[0]);
|
||||||
} else {
|
} else {
|
||||||
selectedItem = elements[0];
|
selectedItem = elements[0];
|
||||||
@@ -315,11 +299,9 @@ class CountryCodePickerState extends State<CountryCodePicker> {
|
|||||||
if (widget.initialSelection != null) {
|
if (widget.initialSelection != null) {
|
||||||
selectedItem = elements.firstWhere(
|
selectedItem = elements.firstWhere(
|
||||||
(item) =>
|
(item) =>
|
||||||
(item.code!.toUpperCase() ==
|
(item.code!.toUpperCase() == widget.initialSelection!.toUpperCase()) ||
|
||||||
widget.initialSelection!.toUpperCase()) ||
|
|
||||||
(item.dialCode == widget.initialSelection) ||
|
(item.dialCode == widget.initialSelection) ||
|
||||||
(item.name!.toUpperCase() ==
|
(item.name!.toUpperCase() == widget.initialSelection!.toUpperCase()),
|
||||||
widget.initialSelection!.toUpperCase()),
|
|
||||||
orElse: () => elements[0]);
|
orElse: () => elements[0]);
|
||||||
} else {
|
} else {
|
||||||
selectedItem = elements[0];
|
selectedItem = elements[0];
|
||||||
|
|||||||
@@ -15,14 +15,17 @@ class CountryLocalizations {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
static const LocalizationsDelegate<CountryLocalizations> delegate =
|
static const LocalizationsDelegate<CountryLocalizations> delegate = _CountryLocalizationsDelegate();
|
||||||
_CountryLocalizationsDelegate();
|
|
||||||
|
static LocalizationsDelegate<CountryLocalizations> getDelegate({bool enableLocalization = true}) {
|
||||||
|
return _CountryLocalizationsDelegate(enableLocalization: enableLocalization);
|
||||||
|
}
|
||||||
|
|
||||||
late Map<String, String> _localizedStrings;
|
late Map<String, String> _localizedStrings;
|
||||||
|
|
||||||
Future<bool> load() async {
|
Future<bool> load() async {
|
||||||
String jsonString = await rootBundle.loadString(
|
String jsonString =
|
||||||
'packages/country_code_picker/src/i18n/${locale.languageCode}.json');
|
await rootBundle.loadString('packages/country_code_picker/src/i18n/${locale.languageCode}.json');
|
||||||
Map<String, dynamic> jsonMap = json.decode(jsonString);
|
Map<String, dynamic> jsonMap = json.decode(jsonString);
|
||||||
|
|
||||||
_localizedStrings = jsonMap.map((key, value) {
|
_localizedStrings = jsonMap.map((key, value) {
|
||||||
@@ -37,9 +40,10 @@ class CountryLocalizations {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class _CountryLocalizationsDelegate
|
class _CountryLocalizationsDelegate extends LocalizationsDelegate<CountryLocalizations> {
|
||||||
extends LocalizationsDelegate<CountryLocalizations> {
|
final bool enableLocalization;
|
||||||
const _CountryLocalizationsDelegate();
|
|
||||||
|
const _CountryLocalizationsDelegate({this.enableLocalization = true});
|
||||||
|
|
||||||
@override
|
@override
|
||||||
bool isSupported(Locale locale) {
|
bool isSupported(Locale locale) {
|
||||||
@@ -119,7 +123,10 @@ class _CountryLocalizationsDelegate
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
Future<CountryLocalizations> load(Locale locale) async {
|
Future<CountryLocalizations> load(Locale locale) async {
|
||||||
CountryLocalizations localizations = CountryLocalizations(const Locale('en'));//locale);
|
// Use the provided locale if localization is enabled; otherwise, use English.
|
||||||
|
Locale effectiveLocale = enableLocalization ? locale : const Locale('en');
|
||||||
|
|
||||||
|
CountryLocalizations localizations = CountryLocalizations(effectiveLocale);
|
||||||
await localizations.load();
|
await localizations.load();
|
||||||
return localizations;
|
return localizations;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user