Skip to content
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.

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

Delimiter Added in case of Number format #6

Merged
merged 7 commits into from
Dec 23, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 16 additions & 3 deletions example/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,22 @@ void main(List<String> arguments) {
print(date5.format(gorkhaEarthQuake));

heading('Nepali Number Format');
var currencyFormat = NepaliNumberFormat(
final numberFormat = NepaliNumberFormat(
symbol: 'Rs.',
);
var commaSeparated = NepaliNumberFormat(
final commaSeparated = NepaliNumberFormat(
decimalDigits: 2,
);

final numberFormatWithDefaultDelimiter = NepaliNumberFormat(
symbol: 'Rs.',
delimiter: ',',
);
final numberFormatWithEmptyDelimiter = NepaliNumberFormat(
symbol: 'Rs.',
delimiter: '',
);

// Sets default language for nepali utilities to be Nepali.
NepaliUtils(Language.nepali);

Expand All @@ -51,11 +60,15 @@ void main(List<String> arguments) {
language: Language.nepali,
isMonetory: true,
);
print('123456 -> ${currencyFormat.format(123456)}');
print('123456 -> ${numberFormat.format(123456)}');
print('123456789.6548 -> ${commaSeparated.format(123456789.6548)}');
print('123456 -> ${inWords.format(123456)}');
print('123456789.6548 -> ${currencyInWords.format(123456789.6548)}');

heading('Number Format With Delimiter');
print('12345 -> ${numberFormatWithDefaultDelimiter.format(12345)}');
print('12345 -> ${numberFormatWithEmptyDelimiter.format(12345)}');

heading('Nepali Unicode');
print(NepaliUnicode.convert(
"sayau' thu''gaa fUlakaa haamii, euTai maalaa nepaalii"));
Expand Down
16 changes: 13 additions & 3 deletions lib/src/nepali_number_format.dart
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,15 @@ class NepaliNumberFormat {
/// [isMonetory] is required to be set as true.
final String? symbol;

/// The character used to separate place value in number.
///
/// i.e. 2000(delimiter = ',') -> 2,000
/// 2000(delimiter = '') -> 2000
/// 2000(delimiter = '.') -> 2.000
///
/// Default value is ','.
final String delimiter;

/// If true, place the symbol on left side of the formatted number.
///
/// Default is true.
Expand Down Expand Up @@ -57,6 +66,7 @@ class NepaliNumberFormat {
this.decimalDigits,
this.symbol,
this.symbolOnLeft = true,
this.delimiter = ',',
this.spaceBetweenAmountAndSymbol = true,
this.includeDecimalIfZero = true,
Language? language,
Expand Down Expand Up @@ -227,17 +237,17 @@ class NepaliNumberFormat {
} else if (_number.length < 5) {
var localizedNum = _isEnglish ? _number : NepaliUnicode.convert(_number);
if (hideDecimal) {
return '${localizedNum[0]},${localizedNum.substring(1)}';
return '${localizedNum[0]}$delimiter${localizedNum.substring(1)}';
}
return '${localizedNum[0]},${localizedNum.substring(1)}$_fractionalPart';
return '${localizedNum[0]}$delimiter${localizedNum.substring(1)}$_fractionalPart';
} else {
var paddedNumber = _number.length.isOdd ? _number : '0$_number';
var formattedString = '';
var digitMatcher = RegExp(r'\d{1,2}');
var matches = digitMatcher.allMatches(paddedNumber);
for (var i = 0; i < matches.length; i++) {
if (i < matches.length - 2) {
formattedString += '${matches.elementAt(i).group(0)},';
formattedString += '${matches.elementAt(i).group(0)}$delimiter';
} else {
formattedString +=
_number.substring(_number.length - 3, _number.length);
Expand Down
41 changes: 41 additions & 0 deletions test/nepali_number_format_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,47 @@ void main() {
),
);
});

group('delimiter default tests:', () {
test(
'in english',
() => expect(NepaliNumberFormat().format(1234), '1,234'),
);
test(
'in nepali',
() => expect(
NepaliNumberFormat(language: Language.nepali).format(1234),
'१,२३४',
),
);
});

group('delimiter tests:', () {
test(
'using empty delimiter in English',
() => expect(NepaliNumberFormat(delimiter: '').format(1234), '1234'),
);
test(
'using empty delimiter in English',
() => expect(
NepaliNumberFormat(language: Language.nepali, delimiter: '')
.format(1234),
'१२३४',
),
);
test(
'using . delimiter in English',
() => expect(NepaliNumberFormat(delimiter: '.').format(1234), '1.234'),
);
test(
'using . delimiter in Nepali',
() => expect(
NepaliNumberFormat(language: Language.nepali, delimiter: '.')
.format(1234),
'१.२३४',
),
);
});
}

String _format(number) => NepaliNumberFormat().format(number);