Fixed IconPack.getIconDrawable not using icon.drawable

Author: maltaisn

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

@@ -33,18 +33,18 @@ import java.nio.ByteOrder
  * Class use to load icon drawables.
  * @param context Any context, needed to get resources.
  */
-open class IconDrawableLoader(context: Context) {
+class IconDrawableLoader(context: Context) {
 
     private val context = context.applicationContext
 
     /**
      * Create the vector drawable for an [icon] and set it.
      */
     @SuppressLint("DiscouragedPrivateApi,PrivateApi")
-    open fun loadDrawable(icon: Icon): Drawable? {
+    fun loadDrawable(icon: Icon) {
         if (icon.drawable != null) {
             // Icon drawable is already loaded.
-            return icon.drawable
+            return
         }
 
         val drawable: Drawable?
@@ -74,11 +74,10 @@ open class IconDrawableLoader(context: Context) {
         } catch (e: Exception) {
             // Could not load icon.
             Log.e(TAG, "Could not create vector drawable for icon ID ${icon.id}.", e)
-            return null
+            return
         }
 
         icon.drawable = drawable
-        return icon.drawable
     }
 
     companion object {

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

@@ -83,7 +83,9 @@ class IconPack(val parent: IconPack? = null,
      * or if the drawable couldn't be loaded with the [loader].
      */
     fun getIconDrawable(id: Int, loader: IconDrawableLoader): Drawable? {
-        return loader.loadDrawable(getIcon(id) ?: return null)
+        val icon = getIcon(id) ?: return null
+        loader.loadDrawable(icon)
+        return icon.drawable
     }
 
     /**