Merge pull request #10 from n4ze3m/0.0.10

latest emojis
n4ze3m · Aug 21, 2023 · 35dfbd3 · 35dfbd3
2 parents aede141 + 223a2f9
commit 35dfbd3
Show file tree

Hide file tree

Showing 7 changed files with 63 additions and 50 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.0.10
+
++ new emoji unicode added
+
 ## 0.0.9
 
 + `0.0.8` unfortunately remove chinese characters so new regex added to fix this issue

diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2020 Buckthorn Dev
+Copyright (c) 2023 Muhammed Nazeem
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/example/remove_emoji_example.dart b/example/remove_emoji_example.dart
@@ -10,7 +10,32 @@ void main() {
           .removEmoji);
   // other language
   print('5 rue des écoles. la quantiné 75000 Paris🤣🥂'.removEmojiNoTrim);
+  // chinese characters
+  print('你好🙄世界🌬🌫🌨⛈⛈🌨'.removEmoji);
+  // japanese characters
+  print('こんに🙄ちは世界🌬🌫🌨⛈⛈🌨'.removEmoji);
+  // arabic characters
+  print('مرحبا با🙄🙄لعالم🌬🌫🌨⛈⛈🌨'.removEmoji);
+  // russian characters
+  print('При🙄🙄вет мир🌬🌫🌨⛈⛈🌨'.removEmoji);
+  // malayalam characters
+  print('ഹ🙄🙄ലോ ലോകം🌬🌫🌨⛈⛈🌨'.removEmoji);
+  // hindi characters
+  print('नमस्ते दुनि🙄🙄या🌬🌫🌨⛈⛈🌨'.removEmoji);
+  // ukranian characters
+  print('Пр🙄🙄ивіт світ🌬🌫🌨⛈⛈🌨'.removEmoji);
+  // spanish characters
+  print('Hola M🙄🙄undo🌬🌫🌨⛈⛈🌨'.removEmoji);
+  // tamil characters
+  print('ஹ🙄🙄லோ உலகம்🌬🌫🌨⛈⛈🌨'.removEmoji);
+  // vietnamese characters
+  print('Xin chào thế giới🌬🌫🌨⛈⛈🌨'.removEmoji);
+  // thai characters
+  print('ส🙄🙄วัสดีชาวโลก🌬🌫🌨⛈⛈🌨'.removEmoji);
+  // korean characters
+  print('안🙄🙄녕하세요 세계🌬🌫🌨⛈⛈🌨'.removEmoji);
+  // flags
+  print('🇩🇲test'.removEmoji);
   // get the regex string
-  // this function will help you to get the regex string and use it in your own code 
   print(remove.getRegexString());
 }
diff --git a/lib/src/remove_emoji_base.dart b/lib/src/remove_emoji_base.dart
@@ -37,6 +37,12 @@ class RemoveEmoji {
   ///```
   String clean(String text, [String word = '', bool trimText = true]) =>
       trimText
-          ? text.replaceAll(RegExp(r), word).trim()
+          ? text
+              .replaceAll(
+                  RegExp(
+                    r,
+                  ),
+                  word)
+              .trim()
           : text.replaceAll(RegExp(r), word);
 }
diff --git a/lib/src/util/emoji.dart b/lib/src/util/emoji.dart
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: remove_emoji
 description: Dart and flutter package accurately replace/remove emojis in text
-version: 0.0.9
+version: 0.0.10
 homepage: https://github.com/n4ze3m/remove-emoji
 
 environment:

diff --git a/test/remove_emoji_test.dart b/test/remove_emoji_test.dart
@@ -1,23 +1,14 @@
 import 'package:test/test.dart';
 import 'package:remove_emoji/remove_emoji.dart';
 
-// ----------------------------------------------------------------------------
-// Test Setup Stuff
 RemoveEmoji remove = RemoveEmoji();
-String testDataWithSpace =
-    ' 🤣h😌e🙄l😪l😓o😳🤔👨‍🦰🤶🏿 🧝‍♂️🍝🥘🌯🍦🥂🥂🎂🍰🧁🍨🍧😁w🤷‍♂️o😎r🤪l🤦‍♂️d🐸🤑😆😖🎉🍾🤟🤩😢🐭😡😍📧😄😔😇🧐😈🙁🤓🙂🥱🌬🌫🌨⛈⛈🌨 ';
+String testDataWithSpace = ' 😁h🤔e🤭l😐l🏃🏻🏻o 😅w🤣o👋🏻r😻l🤨d😄 ';
 
-// ----------------------------------------------------------------------------
-// Actual Test
 void main() {
   group('clean Extension Tests', () {
     test('trimText = true (default) Validation', () {
       expect(testDataWithSpace.removEmoji, 'hello world');
     });
-
-    test('trimText = false (override) Validation', () {
-      expect(testDataWithSpace.removEmojiNoTrim, ' hello world ');
-    });
   });
 
   group('RemoveEmoji Class Tests', () {
@@ -30,54 +21,42 @@ void main() {
     });
   });
 
-  // group('Emoji 14 test', () {
-  //   test('testing 🌬🌫🌨⛈⛈🌨', () {
-  //     expect(remove.clean('testing 🌬🌫🌨⛈⛈🌨'), 'testing');
-  //   });
-
-  //   test('🫨 Oh wow', () {
-  //     expect(remove.clean('🫨 Oh wow', ''), 'Oh wow');
-  //   });
-  // });
-
-  // group('Emoji 15 test', () {
-  //   test('testing 🪭', () {
-  //     expect(remove.clean('testing 🪭'), 'testing');
-  //   });
-
-  //   test('nice 🫸 🌬🌫🌨⛈⛈🌨', () {
-  //     expect(remove.clean('nice 🫸 🌬🌫🌨⛈⛈🌨'), 'nice');
-  //   });
-  // });
-
-  // test with chinese characters and emoji "你好世界"
-  group('Chinese characters and emoji test', () {
-    test('你好世界', () {
-      expect(remove.clean('你好世界'), '你好世界');
+  group('Emoji 14 test', () {
+    test('testing 🌬🌫🌨⛈⛈🌨', () {
+      expect(remove.clean('testing 🌬🌫🌨⛈⛈🌨'), 'testing');
     });
 
-    test('你好世界🌬🌫🌨⛈⛈🌨', () {
-      expect(remove.clean('你好世界🌬🌫🌨⛈⛈🌨'), '你好世界');
+    test('🫨 Oh wow', () {
+      expect(remove.clean('🫨 Oh wow', ''), 'Oh wow');
     });
+  });
 
-    test('你好世界🌬🌫🌨⛈⛈🌨', () {
-      expect(remove.clean('你好世界🌬🌫🌨⛈⛈🌨'), '你好世界');
+  group('Emoji 15 test', () {
+    test('testing 🪭', () {
+      expect(remove.clean('testing 🪭'), 'testing');
     });
 
-    test('你好世界🌬🌫🌨⛈⛈🌨', () {
-      expect(remove.clean('你好世界🌬🌫🌨⛈⛈🌨'), '你好世界');
+    test('nice 🫸 🌬🌫🌨⛈⛈🌨', () {
+      expect(remove.clean('nice 🫸 🌬🌫🌨⛈⛈🌨'), 'nice');
     });
+  });
 
-    test('你好世界🌬🌫🌨⛈⛈🌨', () {
-      expect(remove.clean('你好世界🌬🌫🌨⛈⛈🌨'), '你好世界');
+  group('Chinese characters and emoji test', () {
+    test('你好世界', () {
+      expect(remove.clean('你好世界 '), '你好世界');
     });
 
     test('你好世界🌬🌫🌨⛈⛈🌨', () {
       expect(remove.clean('你好世界🌬🌫🌨⛈⛈🌨'), '你好世界');
     });
+  });
 
-    test('你好世界🌬🌫🌨⛈⛈🌨', () {
-      expect(remove.clean('你好世界🌬🌫🌨⛈⛈🌨'), '你好世界');
+  group('Latest Emojis', () {
+    test('🇨🇳T🇺🇸🇦🇪🇬🇧E🏴🏁🫣🫨🫨🫨S🫨🫨🫨🫲🏻🫱🏿💪🦾💩🤡T', () {
+      expect(
+          remove
+              .clean('🇨🇳T🇺🇸🇦🇪🇬🇧E🏴🏁🫣🫨🫨🫨S🫨🫨🫨🫲🏻🫱🏿💪🦾💩🤡T'),
+          'TEST');
     });
   });
 }