Improve Gson extensions and refactor date and strings extensions

jeluchu · Jan 26, 2023 · 13d7a28 · 13d7a28
1 parent 42f5104
commit 13d7a28
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 43 deletions.
diff --git a/jchucomponents-ktx/src/main/java/com/jeluchu/jchucomponents/ktx/date/DateExtensions.kt b/jchucomponents-ktx/src/main/java/com/jeluchu/jchucomponents/ktx/date/DateExtensions.kt
@@ -6,9 +6,6 @@
 
 package com.jeluchu.jchucomponents.ktx.date
 
-import android.provider.Settings.System.DATE_FORMAT
-import com.jeluchu.jchucomponents.ktx.numbers.orEmpty
-import java.text.ParseException
 import java.text.SimpleDateFormat
 import java.util.*
 
@@ -139,39 +136,15 @@ fun Date.add(field: Int, amount: Int): Date {
     }
 }
 
-fun Date.addYears(years: Int): Date {
-    return add(Calendar.YEAR, years)
-}
-
-fun Date.addMonths(months: Int): Date {
-    return add(Calendar.MONTH, months)
-}
-
-fun Date.addDays(days: Int): Date {
-    return add(Calendar.DAY_OF_MONTH, days)
-}
-
-fun Date.addHours(hours: Int): Date {
-    return add(Calendar.HOUR_OF_DAY, hours)
-}
-
-fun Date.addMinutes(minutes: Int): Date {
-    return add(Calendar.MINUTE, minutes)
-}
-
-fun Date.addSeconds(seconds: Int): Date {
-    return add(Calendar.SECOND, seconds)
-}
+fun Date.addYears(years: Int): Date = add(Calendar.YEAR, years)
+fun Date.addMonths(months: Int): Date = add(Calendar.MONTH, months)
+fun Date.addDays(days: Int): Date = add(Calendar.DAY_OF_MONTH, days)
+fun Date.addHours(hours: Int): Date = add(Calendar.HOUR_OF_DAY, hours)
+fun Date.addMinutes(minutes: Int): Date = add(Calendar.MINUTE, minutes)
+fun Date.addSeconds(seconds: Int): Date = add(Calendar.SECOND, seconds)
 
 /** ---- CALENDAR ------------------------------------------------------------------------------ **/
 
-fun Date.addYear(years: Int): Date =
-    this.toCalendar()
-        .run {
-            add(Calendar.YEAR, years)
-            this.time
-        }
-
 fun Date.toCalendar(): Calendar {
     val calendar = Calendar.getInstance()
     calendar.time = this

diff --git a/jchucomponents-ktx/src/main/java/com/jeluchu/jchucomponents/ktx/gson/GsonExtensions.kt b/jchucomponents-ktx/src/main/java/com/jeluchu/jchucomponents/ktx/gson/GsonExtensions.kt
@@ -35,7 +35,16 @@ inline fun <T, reified R> T.convert(): R = gson.toJson(this).toObject()
 /**
  * Helps to get Map, List, Set or other generic type from Json using Gson.
  */
-inline fun <reified T : Any> Gson.fromJsonToGeneric(json: String): T {
-    val type = object : TypeToken<T>() {}.type
-    return fromJson(json, type)
+inline fun <reified T> Gson.fromJson(json: String): T? = try {
+    fromJson<T>(json, object : TypeToken<T>() {}.type)
+} catch (e: Exception) {
+    e.printStackTrace()
+    null
+}
+
+inline fun <reified T : Any> Gson.fromJsonList(json: String?): List<T>? = try {
+    fromJson<List<T>>(json, object : TypeToken<List<T>>() {}.type)
+} catch (e: Exception) {
+    e.printStackTrace()
+    null
 }
diff --git a/...components-ktx/src/main/java/com/jeluchu/jchucomponents/ktx/numbers/DecimalsExtensions.kt b/...components-ktx/src/main/java/com/jeluchu/jchucomponents/ktx/numbers/DecimalsExtensions.kt
@@ -8,17 +8,23 @@ package com.jeluchu.jchucomponents.ktx.numbers
 
 import java.math.RoundingMode
 import java.text.DecimalFormat
+import java.text.SimpleDateFormat
+import java.util.*
 
 fun Float.roundTo(n: Int): Float = toBigDecimal().setScale(n, RoundingMode.UP).toFloat()
 
 fun Double.roundTo(n: Int): Double = toBigDecimal().setScale(n, RoundingMode.UP).toDouble()
 
-fun String.toPriceAmount(): String {
-    val dec = DecimalFormat("###,###,###.00")
-    return dec.format(this.toDouble())
+/**
+ * Return date in specified format.
+ * @param milliSeconds Date in milliseconds
+ * @param dateFormat Date format
+ * @return String representing date in specified format
+ */
+fun Long.getDate(dateFormat: String?): String? {
+    val formatter = SimpleDateFormat(dateFormat, Locale.getDefault())
+    val calendar: Calendar = Calendar.getInstance().apply { timeInMillis = this@getDate }
+    return formatter.format(calendar.time)
 }
 
-fun Double.toPriceAmount(): String {
-    val dec = DecimalFormat("###,###,###.00")
-    return dec.format(this)
-}
+fun Double.toPriceAmount(): String = DecimalFormat("###,###,###.00").format(this)
diff --git a/jchucomponents-ktx/src/main/java/com/jeluchu/jchucomponents/ktx/strings/StringExtensions.kt b/jchucomponents-ktx/src/main/java/com/jeluchu/jchucomponents/ktx/strings/StringExtensions.kt
@@ -23,6 +23,7 @@ import java.net.HttpURLConnection
 import java.net.URL
 import java.net.URLEncoder
 import java.text.DateFormat
+import java.text.DecimalFormat
 import java.text.Format
 import java.text.SimpleDateFormat
 import java.util.*
@@ -350,3 +351,8 @@ fun String.getCurrencyString() =
         "RUB" -> "₽"
         else -> "€"
     }
+
+fun String.toPriceAmount(): String {
+    val dec = DecimalFormat("###,###,###.00")
+    return dec.format(this.toDouble())
+}