.drone.yml

@@ -1,14 +0,0 @@
-kind: pipeline
-type: exec
-name: default
-platform:
-  os: darwin
-  arch: amd64
-steps:
-  - name: flutter-dart-version
-    commands:
-      - flutter --version
-      - dart --version
-  - name: test
-    commands:
-      - dart test

.github/workflows/dart.yml

@@ -2,9 +2,9 @@ name: Dart
 
 on:
   push:
-    branches: [ main ]
+    branches: [ master ]
   pull_request:
-    branches: [ main ]
+    branches: [ master ]
 
 jobs:
   build:

.gitignore

@@ -8,4 +8,3 @@ build/
 # Omit committing pubspec.lock for library packages; see
 # https://dart.dev/guides/libraries/private-files#pubspeclock.
 pubspec.lock
-.dccache

CHANGELOG.md

@@ -2,9 +2,3 @@
 
 - Configurable
 - Text Formatter
-
-## 1.0.1
-
-- Add translator provider
-- Enhanced text formatter able to translate by options
-- Fixed text formatter params and args for optional

example/cubetiq_functions.dart

@@ -1,7 +0,0 @@
-import 'package:cubetiq/src/text/functions.dart';
-import 'package:cubetiq/src/xlog/xlog.dart';
-
-void main(List<String> args) {
-  XLog.debug(StringUtils.format(10.5555, 2));
-  XLog.debug(StringUtils.formatFromString('10.5555', 2));
-}

example/cubetiq_text_formatter_example.dart

@@ -3,8 +3,8 @@ import 'package:cubetiq/text.dart';
 void main(List<String> args) {
   var text1 = 'Hello, {0}, then do this it by {1}!';
   var text2 = 'Hello, {firstName}, then do this it by {lastName}!';
-  var result1 = TextFormatter(text1).format(args: ['Sambo', 'Chea']);
+  var result1 = TextFormatter(text1).format(['Sambo', 'Chea']);
-  var result2 = TextFormatter(text2).decorate(params: {
+  var result2 = TextFormatter(text2).decorate({
     'firstName': 'Sambo',
     'lastName': 'Chea',
   });

example/cubetiq_translator_example.dart

@@ -1,36 +0,0 @@
-import 'package:cubetiq/text.dart';
-import 'package:cubetiq/i18n_translator.dart';
-
-void main(List<String> args) {
-  var text = 'Your name is {name}!';
-  // Before set provider
-  var result = StringUtils.decorator(text, translate: true, params: {
-    'name': 'Sambo Chea',
-  });
-  print('Result Before => $result');
-
-  TranslatorFactory.setProvider(TranslatorProviderExample());
-
-  // After set provider
-  result = StringUtils.decorator(text, translate: true, params: {
-    'name': 'Sambo Chea',
-  });
-  print('Result After => $result');
-}
-
-class TranslatorProviderExample implements TranslatorProvider {
-  @override
-  bool hasKey(String key) {
-    return false;
-  }
-
-  @override
-  String translate(String key,
-      {Map<String, dynamic>? params, String? fallback}) {
-    if (key == 'Your name is {name}!') {
-      return 'ឈ្មោះរបស់អ្នកគឺ {name}!';
-    }
-
-    return key;
-  }
-}

example/my_cart_example.dart

@@ -1,91 +0,0 @@
-import 'package:cubetiq/model.dart';
-
-void main(List<String> args) {
-  MyCart.addCart(
-    Cart(id: 1, name: 'Apple', qty: 1),
-  );
-
-  MyCart.show();
-
-  MyCart.addCart(
-    Cart(id: 1, name: 'Apple', qty: 2),
-  );
-
-  MyCart.show();
-
-  MyCart.inc(1, qty: 2);
-
-  MyCart.show();
-
-  MyCart.dec(1, qty: 4);
-
-  MyCart.show();
-}
-
-class Cart extends BaseModel<Cart> {
-  final int id;
-  final String? name;
-  double qty;
-
-  Cart({this.id = -1, this.name, this.qty = 0});
-
-  @override
-  Cart fromMap(Map<String, dynamic> map) {
-    return Cart(
-      id: map['id'],
-      name: map['name'],
-      qty: map['qty'],
-    );
-  }
-
-  @override
-  Map<String, dynamic> toMap() {
-    return {
-      'id': id,
-      'name': name,
-      'qty': qty,
-    };
-  }
-}
-
-class MyCart {
-  static final Map<int, Cart> carts = {};
-
-  static void inc(int id, {double qty = 1}) {
-    if (carts.containsKey(id)) {
-      carts[id]!.qty += qty;
-    }
-  }
-
-  static void dec(int id, {double qty = 1}) {
-    if (carts.containsKey(id)) {
-      carts[id]!.qty -= qty;
-    }
-  }
-
-  static void addCart(Cart cart) {
-    if (carts.containsKey(cart.id)) {
-      carts[cart.id]!.qty += cart.qty;
-    } else {
-      carts[cart.id] = cart;
-    }
-  }
-
-  static void removeCart(Cart cart) {
-    if (carts.containsKey(cart.id)) {
-      carts.remove(cart.id);
-    }
-  }
-
-  static void show() {
-    var data = carts.map((key, value) => MapEntry(key, value));
-    var json = data.map((key, value) => MapEntry(key, value.toJson()));
-    var model = json.map((key, value) => MapEntry(key, Cart().fromJson(value)));
-    print('================ Map =================');
-    print('$data');
-    print('================ Json =================');
-    print('$json');
-    print('================ Model =================');
-    print('$model');
-  }
-}

lib/i18n_translator.dart

@@ -1,4 +0,0 @@
-library i18n_translator;
-
-export 'src/i18n/translator_provider.dart';
-export 'src/i18n/translator_factory.dart';

lib/model.dart

@@ -1,3 +0,0 @@
-library model;
-
-export 'src/model/base.dart';

lib/src/i18n/translator_factory.dart

@@ -1,34 +0,0 @@
-import 'translator_provider.dart';
-
-/// Translate Factory
-///
-/// @author sombochea
-/// @since 1.0.0
-class TranslatorFactory {
-  static TranslatorProvider? _provider;
-  static void setProvider(TranslatorProvider provider) {
-    _provider = provider;
-  }
-
-  static bool hasProvider() => _provider != null;
-
-  static bool hasKey(String key) {
-    if (hasProvider()) {
-      return _provider!.hasKey(key);
-    }
-
-    return false;
-  }
-
-  static String translate(
-    String key, {
-    Map<String, dynamic>? params,
-    String? fallback,
-  }) {
-    if (hasProvider()) {
-      return _provider!.translate(key, params: params, fallback: fallback);
-    }
-
-    return fallback ?? key;
-  }
-}

lib/src/i18n/translator_provider.dart

@@ -1,9 +0,0 @@
-/// Translate Provider
-///
-/// @author sombochea
-/// @since 1.0.0
-abstract class TranslatorProvider {
-  bool hasKey(String key);
-  String translate(String key,
-      {Map<String, dynamic>? params, String? fallback});
-}

lib/src/model/base.dart

@@ -1,33 +0,0 @@
-import 'dart:convert';
-
-abstract class BaseModel<T> {
-  BaseModel();
-
-  Map<String, dynamic> toMap();
-
-  T fromMap(Map<String, dynamic> map);
-
-  T fromJson(String json) {
-    return fromMap(decode(json));
-  }
-
-  @override
-  String toString() {
-    return toMap().toString();
-  }
-
-  @override
-  bool operator ==(Object other) {
-    if (identical(this, other)) return true;
-
-    return other is BaseModel && other.toMap() == toMap();
-  }
-
-  @override
-  int get hashCode => toMap().hashCode;
-
-  String toJson() => encode(toMap());
-
-  dynamic decode(String json) => jsonDecode(json);
-  String encode(dynamic json) => jsonEncode(json);
-}

lib/src/text/extension.dart

@@ -7,11 +7,10 @@ extension StringExtensionOnNonull on String {
 }
 
 extension StringExtensionOnNullable on String? {
-  String? textFormat({List<dynamic>? args, bool translate = false}) =>
+  String? textFormat(List<dynamic> args) => StringUtils.textFormat(this, args);
-      StringUtils.textFormat(this, args: args, translate: translate);
 
-  String? decorator({Map<String, dynamic>? params, bool translate = false}) =>
+  String? decorator(Map<String, dynamic> params) =>
-      StringUtils.decorator(this, params: params, translate: translate);
+      StringUtils.decorator(this, params);
 
   bool get isBlank {
     if (this == null) return true;
@@ -33,8 +32,4 @@ extension StringExtensionOnNullable on String? {
   bool get isNullOrEmptyOrBlank => StringUtils.isNullOrEmptyOrBlank(this);
 
   bool get isEqualsIgnoreCase => StringUtils.equalsIgnoreCase(this, this);
-
-  String toPrecision([int precision = 2]) {
-    return StringUtils.formatFromString(this, precision);
-  }
 }

lib/src/text/functions.dart

@@ -6,26 +6,13 @@ class StringUtils {
     return n.toStringAsFixed(n.truncateToDouble() == n ? precision : precision);
   }
 
-  /// Format number from String with precision
-  static String formatFromString(String? text, [int precision = 2]) {
-    text ??= '0.0';
-    var n = double.parse(text);
-    return n.toStringAsFixed(n.truncateToDouble() == n ? precision : precision);
-  }
-
-  /// Text formatter with custom args
-  static TextFormatter textFormatter(String? text, {bool translate = false}) =>
-      TextFormatter(text).translate(translate: translate);
-
   /// Text format with custom args
-  static String? textFormat(String? text,
+  static String? textFormat(String? text, List<dynamic> args) =>
-          {List<dynamic>? args, bool translate = false}) =>
+      TextFormatter(text).format(args);
-      textFormatter(text, translate: translate).format(args: args);
 
   /// Text decorator with custom key/value params
-  static String? decorator(String? text,
+  static String? decorator(String? text, Map<String, dynamic> params) =>
-          {Map<String, dynamic>? params, bool translate = false}) =>
+      TextFormatter(text).decorate(params);
-      textFormatter(text, translate: translate).decorate(params: params);
 
   static String? asLowerCaseThenTrim(String? text) =>
       text?.toLowerCase().trim();

lib/src/text/text_formatter.dart

@@ -1,5 +1,3 @@
-import 'package:cubetiq/i18n_translator.dart';
-
 /// Text Formatter
 ///
 /// @author sombochea
@@ -11,20 +9,12 @@ class TextFormatter {
     this.text = text;
   }
 
-  TextFormatter translate({bool translate = true}) {
+  String? format(List<dynamic> args) {
-    if (translate && text != null && text?.isNotEmpty == true) {
-      text = TranslatorFactory.translate(text!);
-    }
-
-    return this;
-  }
-
-  String? format({List<dynamic>? args}) {
     if (text == null) {
       return null;
     }
 
-    if (args == null || args.isEmpty == true) {
+    if (args.isEmpty) {
       return text;
     }
 
@@ -41,12 +31,12 @@ class TextFormatter {
     return msg;
   }
 
-  String? decorate({Map<String, dynamic>? params}) {
+  String? decorate(Map<String, dynamic> params) {
     if (text == null) {
       return null;
     }
 
-    if (params == null || params.isEmpty == true) {
+    if (params.isEmpty) {
       return text;
     }
 

lib/src/xlog/xlog.dart

@@ -8,14 +8,6 @@ class XLog {
     logger.success(data, args);
   }
 
-  static void log(String prefix, dynamic data, [List? args]) {
-    logger.show(XLogType.DEBUG, prefix, data, args);
-  }
-
-  static void show(XLogType type, String prefix, dynamic data, [List? args]) {
-    logger.show(type, prefix, data, args);
-  }
-
   static void info(dynamic data, [List? args]) {
     logger.info(data, args);
   }

lib/src/xlog/xlog_provider.dart

@@ -25,7 +25,7 @@ abstract class XLogProvider {
     if (args == null || args.isEmpty) {
       content = data;
     } else {
-      content = StringUtils.textFormat(data, args: args) ?? 'null';
+      content = StringUtils.textFormat(data, args) ?? 'null';
     }
 
     var text = '[$type] ${nowToString()}: $prefix => $content'.trim();

pubspec.yaml

@@ -1,6 +1,6 @@
 name: cubetiq
 description: CUBETIQ Dart Shared is functions, utils, and extensions for developers.
-version: 1.0.1
+version: 1.0.0
 homepage: https://www.cubetiqs.com
 repository: https://git.cubetiqs.com/CUBETIQ/cubetiq_dart_shared.git
 

test/cubetiq_i18n_test.dart

@@ -1,37 +0,0 @@
-import 'package:cubetiq/i18n_translator.dart';
-import 'package:cubetiq/src/xlog/xlog.dart';
-import 'package:cubetiq/text.dart';
-import 'package:test/test.dart';
-
-void main() {
-  test('test translate function', () {
-    var text1 = 'Hello, my name is {0}!';
-    var result1 = TextFormatter(text1).translate().format(args: ['Sambo']);
-    XLog.success(result1);
-
-    expect('Hello, my name is Sambo!', result1);
-
-    TranslatorFactory.setProvider(TranslatorProviderExample());
-
-    result1 = TextFormatter(text1).translate().format(args: ['Sambo']);
-    XLog.success(result1);
-    expect('ឈ្មោះរបស់អ្នកគឺ Sambo!', result1);
-  });
-}
-
-class TranslatorProviderExample implements TranslatorProvider {
-  @override
-  bool hasKey(String key) {
-    return false;
-  }
-
-  @override
-  String translate(String key,
-      {Map<String, dynamic>? params, String? fallback}) {
-    if (key == 'Hello, my name is {0}!') {
-      return 'ឈ្មោះរបស់អ្នកគឺ {0}!';
-    }
-
-    return key;
-  }
-}

test/cubetiq_text_formatter_test.dart

@@ -4,10 +4,10 @@ import 'package:test/test.dart';
 void main() {
   test('text formatter function format', () {
     var text1 = 'Hello, {0}!';
-    var result1 = TextFormatter(text1).format(args: ['Sambo']);
+    var result1 = TextFormatter(text1).format(['Sambo']);
 
     var text2 = 'Hello, {name}!';
-    var result2 = TextFormatter(text2).decorate(params: {'name': 'Chea'});
+    var result2 = TextFormatter(text2).decorate({'name': 'Chea'});
 
     expect('Hello, Sambo!', result1);
     expect('Hello, Chea!', result2);