utils: ShortcutUtils: mark new line; remove Function

Bambooin · Sep 8, 2021 · 33a893d · 33a893d
1 parent 25c7b26
commit 33a893d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 210 deletions.
diff --git a/app/src/main/java/com/osfans/trime/util/Function.java b/app/src/main/java/com/osfans/trime/util/Function.java
diff --git a/app/src/main/java/com/osfans/trime/util/ShortcutUtils.kt b/app/src/main/java/com/osfans/trime/util/ShortcutUtils.kt
@@ -18,7 +18,8 @@ import com.osfans.trime.Rime
 import com.osfans.trime.ime.core.Preferences
 import java.text.FieldPosition
 import java.text.SimpleDateFormat
-import java.util.*
+import java.util.Date
+import java.util.Locale
 
 /**
  * Implementation to open/call specified application/function
@@ -97,7 +98,7 @@ object ShortcutUtils {
             val df = if (option.isEmpty()) {
                 DateFormat.getDateInstance(DateFormat.LONG, ul)
             } else {
-                android.icu.text.SimpleDateFormat(option, Locale(locale))
+                android.icu.text.SimpleDateFormat(option, ul.toLocale())
             }
             df.format(cc, StringBuffer(256), FieldPosition(0)).toString()
         } else {
@@ -136,4 +137,4 @@ object ShortcutUtils {
         append(KeyEvent.KEYCODE_MUSIC, "android.intent.category.APP_MUSIC")
         append(KeyEvent.KEYCODE_CALCULATOR, "android.intent.category.APP_CALCULATOR")
     }
-}
+}