Fixed tests and code style, changed 'drawableResId' attribute to 'src'

Author: maltaisn

iconpacks/iconpack-default/src/main/res/xml/iconpack_default_icons.xml

@@ -16,6 +16,7 @@
 
 <!--@formatter:off-->
 <icons width="24" height="24">
+
     <category id="0" name="@string/icd_category_people">
         <icon id="0" tags="account,user,person" path="M12 4a4 4 0 1 1 0 8 4 4 0 0 1 0-8zm0 10c4.418 0 8 1.79 8 4v2H4v-2c0-2.21 3.582-4 8-4z"/>
         <icon id="1" tags="account,user,person,card,license,passport,details" path="M2 3h20c1 0 2 0.95 2 2v14c0 1-1 2-2 2H2c-1.05 0-2-1-2-2V5c0-1.05 0.953 -2 2-2zm12 3v1h8V6h-8zm0 2v1h8V8h-8zm0 2v1h7v-1h-7zm-6 3.9c-2 0-6 1.1-6 3.1v1h12v-1c0-2-4-3.1-6-3.1zM8 6C6.34 6 5 7.34 5 9c0 1.7 1.34 3 3 3s3-1.3 3-3c0-1.66-1.34-3-3-3z"/>

lib/src/androidTest/kotlin/com/maltaisn/icondialog/pack/IconPackLoaderTest.kt

@@ -21,9 +21,7 @@ import com.maltaisn.icondialog.data.Category
 import com.maltaisn.icondialog.data.Icon
 import com.maltaisn.icondialog.data.NamedTag
 import com.maltaisn.icondialog.test.R
-import com.nhaarman.mockitokotlin2.any
 import com.nhaarman.mockitokotlin2.mock
-import com.nhaarman.mockitokotlin2.whenever
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.junit.MockitoJUnitRunner
@@ -37,7 +35,6 @@ internal class IconPackLoaderTest {
 
     private val packLoader = IconPackLoader(context).apply {
         drawableLoader = mock()
-        whenever(drawableLoader.loadDrawable(any())).thenReturn(mock())
     }
 
     /*
@@ -145,6 +142,11 @@ internal class IconPackLoaderTest {
         packLoader.load(R.xml.icons_wrong_icon_size, R.xml.tags_empty)
     }
 
+    @Test(expected = IconPackParseException::class)
+    fun loadIcons_wrongIconData_shouldFail() {
+        packLoader.load(R.xml.icons_wrong_icon_data, R.xml.tags_empty)
+    }
+
     @Test
     fun loadIcons_valid() {
         val pack = packLoader.load(R.xml.icons_valid, R.xml.tags_empty)

lib/src/androidTest/res/xml/icons_wrong_icon_data.xml

@@ -0,0 +1,4 @@
+<!--@formatter:off-->
+<icons>
+    <icon id="0" path="    " src="image" />
+</icons>

lib/src/main/kotlin/com/maltaisn/icondialog/data/Icon.kt

@@ -31,15 +31,14 @@ data class Icon(val id: Int,
                 val pathData: String,
                 val width: Int,
                 val height: Int,
-                val drawableResId: Int? = null
-) {
+                val srcId: Int? = null) {
 
     /**
      * The icon drawable.
      * Can be `null` if drawable isn't loaded or couldn't be loaded.
      * Use [IconDrawableLoader] class to load it.
-     * 
-     * Note that each get call creates a new drawable that shares its constant state with all 
+     *
+     * Note that each get call creates a new drawable that shares its constant state with all
      * drawables created for this icon. You should also call `drawable.mutate()` before tinting it.
      */
     var drawable: Drawable? = null

lib/src/main/kotlin/com/maltaisn/icondialog/pack/IconDrawableLoader.kt

@@ -34,7 +34,7 @@ import java.nio.ByteOrder
  * Class use to load icon drawables.
  * @param context Any context, needed to get resources.
  */
-class IconDrawableLoader(context: Context) {
+open class IconDrawableLoader(context: Context) {
 
     private val context = context.applicationContext
 
@@ -49,8 +49,9 @@ class IconDrawableLoader(context: Context) {
         }
 
         val drawable: Drawable?
-        if (icon.drawableResId != null) {
-            drawable = ResourcesCompat.getDrawable(context.resources, icon.drawableResId, null)
+        if (icon.srcId != null) {
+            drawable = ResourcesCompat.getDrawable(context.resources, icon.srcId, null)
+
         } else {
             val binXml = createDrawableBinaryXml(icon.pathData, icon.width, icon.height)
             try {

lib/src/main/kotlin/com/maltaisn/icondialog/pack/IconPackLoader.kt

@@ -208,30 +208,30 @@ class IconPackLoader(context: Context) {
 
         val pathStr = parser.getAttributeValue(null, XML_ATTR_ICON_PATH)
         val pathData = pathStr ?: overriden?.pathData ?: ""
-        val drawableResId = parser.getAttributeValue(null, XML_ATTR_ICON_DRAWABLE_RES_ID)
-                ?.let { parseIconDrawableId(it) } ?: overriden?.drawableResId
+        val srcStr = parser.getAttributeValue(null, XML_ATTR_ICON_SRC)
+        val srcId = srcStr?.let { parseDrawableId(it) } ?: overriden?.srcId
 
-        if (pathData.isBlank() && drawableResId == null)
-            parseError("Icon ID $id has no path data and no valid drawableResId")
+        if (pathData.isBlank() && srcId == null) {
+            parseError("Icon ID $id has no path data and no drawable resource specified.")
+        }
 
         val width = parser.getPositiveInt(XML_ATTR_ICON_WIDTH) { "Invalid icon width '$it'." } ?: packWidth
         val height = parser.getPositiveInt(XML_ATTR_ICON_HEIGHT) { "Invalid icon height '$it'." } ?: packHeight
 
-        return Icon(id, catgId, tags, pathData, width, height, drawableResId)
+        return Icon(id, catgId, tags, pathData, width, height, srcId)
     }
 
-    private fun parseIconDrawableId(drawableIdString: String): Int? {
-        return if (drawableIdString.startsWith('@')) {
-            if (drawableIdString.startsWith("@drawable/")) {
-                context.resources.getIdentifier(
-                        drawableIdString.substring(10), "drawable", context.packageName)
+    private fun parseDrawableId(str: String) =
+            if (str.startsWith('@')) {
+                if (str.startsWith("@drawable/")) {
+                    context.resources.getIdentifier(
+                            str.substring(10), "drawable", context.packageName)
+                } else {
+                    str.substring(1).toIntOrNull()
+                }
             } else {
-                drawableIdString.substring(1).toIntOrNull()
+                null
             }
-        } else {
-            null
-        }
-    }
 
     /**
      * Load tags of a [pack].
@@ -357,7 +357,7 @@ class IconPackLoader(context: Context) {
         private const val XML_ATTR_ICON_PATH = "path"
         private const val XML_ATTR_ICON_WIDTH = "width"
         private const val XML_ATTR_ICON_HEIGHT = "height"
-        private const val XML_ATTR_ICON_DRAWABLE_RES_ID = "drawableResId"
+        private const val XML_ATTR_ICON_SRC = "src"
 
         private const val XML_TAG_TAG = "tag"
         private const val XML_TAG_ALIAS = "alias"