fix datetime order pattern for vi-vn locale (#228)

* fix order pattern

* remove comment string before getOrderedWheels

* Update .gitignore

* Delete gradle-wrapper.properties

* Delete Utils.java

* Revert "Delete Utils.java"

This reverts commit 97acf132f6.

Co-authored-by: Vinh Le <vinhlv@vnpay.vn>
Co-authored-by: Henning Hall <henning.hall@hotmail.com>

android/src/main/java/com/henninghall/date_picker/DerivedData.java

@@ -55,7 +55,10 @@ public class DerivedData {
     }
 
     private ArrayList<WheelType> getOrderedWheels() {
-        String dateTimePattern = LocaleUtils.getDateTimePattern(state.getLocale());
+        String dateTimePatternOld = LocaleUtils.getDateTimePattern(state.getLocale());
+        String dateTimePattern = dateTimePatternOld.replaceAll("\\('(.+?)'\\)","\\${$1}")
+                .replaceAll("'.+?'","")
+                .replaceAll("\\$\\{(.+?)\\}","('$1')");
         ArrayList<WheelType> unorderedTypes = new ArrayList(Arrays.asList(WheelType.values()));
         ArrayList<WheelType> orderedWheels = new ArrayList<>();
 
@@ -63,9 +66,9 @@ public class DerivedData {
         unorderedTypes.remove(WheelType.DAY);
         orderedWheels.add(WheelType.DAY);
 
-        for (char ch : dateTimePattern.toCharArray()){
+        for (char c: dateTimePattern.toCharArray()){
             try {
-                WheelType wheelType = Utils.patternCharToWheelType(ch);
+                WheelType wheelType = Utils.patternCharToWheelType(c);
                 if (unorderedTypes.contains(wheelType)) {
                     unorderedTypes.remove(wheelType);
                     orderedWheels.add(wheelType);

android/src/main/java/com/henninghall/date_picker/Utils.java

@@ -85,6 +85,4 @@ public class Utils {
             default: throw new Exception("Invalid pattern char: " + patternChar);
         }
     }
-
-
 }

examples/detox/e2e/tests/displayText.spec.js

@@ -14,6 +14,9 @@ describe('Display text', () => {
   })
 
   describe('datetime', () => {
+    it('vi-VN', async () => {
+      await expectLocaleDateString('vi-VN', 'CN 2 thg 1' + '1200 SA ')
+    })
     it('en-US', async () => {
       await expectLocaleDateString('en-US', 'Sun Jan 2' + '1200 AM ')
     })