Add Vue icons

Ivy-Apps · May 1, 2022 · d8066c4 · d8066c4
1 parent f1d8b32
commit d8066c4
Show file tree

Hide file tree

Showing 3 changed files with 402 additions and 108 deletions.
diff --git a/app/src/main/java/com/ivy/wallet/ui/theme/components/ItemIcon.kt b/app/src/main/java/com/ivy/wallet/ui/theme/components/ItemIcon.kt
@@ -237,17 +237,17 @@ fun getCustomIconId(
                     style = iconStyle,
                     newFormat = false
                 )
-            }
+            } ?: fallbackToNewIconFormat(
+                context = context,
+                iconName = iconName,
+                iconStyle = iconStyle
+            )
         } catch (e: Exception) {
             fallbackToNewIconFormat(
-                context = context, iconName = iconName
-            )?.let { nonNullId ->
-                IconInfo(
-                    iconId = nonNullId,
-                    style = iconStyle,
-                    newFormat = true
-                )
-            }
+                context = context,
+                iconName = iconName,
+                iconStyle = iconStyle
+            )
         }
     }
 }
@@ -263,22 +263,31 @@ enum class IconStyle {
     L, M, S, UNKNOWN
 }
 
-@DrawableRes
 fun fallbackToNewIconFormat(
+    iconStyle: IconStyle,
     context: Context,
     iconName: String?,
-): Int? {
+): IconInfo? {
     return iconName?.let {
         try {
             val iconNameNormalized = iconName
                 .replace(" ", "")
                 .trim()
                 .toLowerCaseLocal()
-            context.resources.getIdentifier(
+
+            val iconId = context.resources.getIdentifier(
                 iconNameNormalized,
                 "drawable",
                 context.packageName
             ).takeIf { it != 0 }
+
+            iconId?.let { nonNullId ->
+                IconInfo(
+                    iconId = nonNullId,
+                    style = iconStyle,
+                    newFormat = true
+                )
+            }
         } catch (e: Exception) {
             null
         }