Merge pull request #9 from jbarr21/jb/simplify-enum

Remove boilerplate
Commit451 · Aug 25, 2018 · 3f92801 · 3f92801
2 parents 78781fb + d3d8bc1
commit 3f92801
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 69 deletions.
diff --git a/src/main/kotlin/com/commit451/resourcespoet/Plural.kt b/src/main/kotlin/com/commit451/resourcespoet/Plural.kt
@@ -4,13 +4,13 @@ package com.commit451.resourcespoet
  * Represents an Android Plural
  * See <a https:></a>//developer.android.com/guide/topics/resources/string-resource.html#Plurals">https://developer.android.com/guide/topics/resources/string-resource.html#Plurals
  */
-class Plural
+data class Plural
 /**
  * Construct a new plural
  * @param quantity the quantity
  * @param value the value
  */
-(var quantity: Quantity, var value: String) {
+(val quantity: Quantity, val value: String) {
 
     enum class Quantity {
         zero,

diff --git a/src/main/kotlin/com/commit451/resourcespoet/StyleItem.kt b/src/main/kotlin/com/commit451/resourcespoet/StyleItem.kt
@@ -5,4 +5,4 @@ package com.commit451.resourcespoet
  *
  * <item name="android:windowBackground">@android:color/black</item>
  */
-class StyleItem(var name: String, var value: String)
+data class StyleItem(val name: String, val value: String)
diff --git a/src/main/kotlin/com/commit451/resourcespoet/Type.kt b/src/main/kotlin/com/commit451/resourcespoet/Type.kt
@@ -5,72 +5,21 @@ package com.commit451.resourcespoet
  *
  * [Available Resources](https://developer.android.com/guide/topics/resources/available-resources.html)
  */
-enum class Type {
+enum class Type(private val xmlName: String) {
 
-    ATTR {
-        override fun toString(): String {
-            return "attr"
-        }
-    },
-    BOOL {
-        override fun toString(): String {
-            return "bool"
-        }
-    },
-    COLOR {
-        override fun toString(): String {
-            return "color"
-        }
-    },
-    DRAWABLE {
-        override fun toString(): String {
-            return "drawable"
-        }
-    },
-    DIMENSION {
-        override fun toString(): String {
-            return "dimen"
-        }
-    },
-    ID {
-        override fun toString(): String {
-            return "item"
-        }
-    },
-    INTEGER {
-        override fun toString(): String {
-            return "integer"
-        }
-    },
-    INTEGER_ARRAY {
-        override fun toString(): String {
-            return "integer-array"
-        }
-    },
-    PLURALS {
-        override fun toString(): String {
-            return "plurals"
-        }
-    },
-    STRING {
-        override fun toString(): String {
-            return "string"
-        }
-    },
-    STRING_ARRAY {
-        override fun toString(): String {
-            return "string-array"
-        }
-    },
-    STYLE {
-        override fun toString(): String {
-            return "style"
-        }
-    },
-    TYPED_ARRAY {
-        override fun toString(): String {
-            return "array"
-        }
-    }
+    ATTR("attr"),
+    BOOL("bool"),
+    COLOR("color"),
+    DRAWABLE("drawable"),
+    DIMENSION("dimen"),
+    ID("item"),
+    INTEGER("integer"),
+    INTEGER_ARRAY("integer-array"),
+    PLURALS("plurals"),
+    STRING("string"),
+    STRING_ARRAY("string-array"),
+    STYLE("style"),
+    TYPED_ARRAY("array");
 
+    override fun toString() = xmlName
 }