Replace icon shape string literals with constants

Author: saulhdev

Omega/src/com/neoapps/neolauncher/icons/IconShape.kt

@@ -27,6 +27,7 @@ import android.util.Log
 import com.android.launcher3.R
 import com.android.launcher3.Utilities
 import com.android.launcher3.shapes.IconShapeModel
+import com.neoapps.neolauncher.util.Config
 
 open class IconShape(
     private val topLeft: Corner,
@@ -424,21 +425,19 @@ open class IconShape(
         }
 
         fun fromString(value: String): IconShape = when (value) {
-            // TODO add constants instead of string literals
-            "circle"        -> Circle
-            "square"        -> Square
-            "sharpSquare"   -> SharpSquare
-            "roundedSquare" -> RoundedSquare
-            "squircle"      -> Squircle
-            "sammy"         -> Sammy
-            "teardrop"      -> Teardrop
-            "cylinder"      -> Cylinder
-            "cupertino"     -> Cupertino
-            "hexagon"       -> Hexagon
-            "octagon"       -> Octagon
-            "egg"           -> Egg
-            ""              -> Circle
-            else            -> runCatching { parseCustomShape(value) }.getOrDefault(Circle)
+            Config.SHAPE_CIRCLE -> Circle
+            Config.SHAPE_SQUARE -> Square
+            Config.SHAPE_SHARP_SQUARE -> SharpSquare
+            Config.SHAPE_ROUNDED_SQUARE -> RoundedSquare
+            Config.SHAPE_SQUIRCLE -> Squircle
+            Config.SHAPE_SAMMY -> Sammy
+            Config.SHAPE_TEARDROP -> Teardrop
+            Config.SHAPE_CYLINDER -> Cylinder
+            Config.SHAPE_CUPERTINO -> Cupertino
+            Config.SHAPE_HEXAGON -> Hexagon
+            Config.SHAPE_OCTAGON -> Octagon
+            Config.SHAPE_EGG -> Egg
+            else -> runCatching { parseCustomShape(value) }.getOrDefault(Circle)
         }
 
         private fun parseCustomShape(value: String): IconShape {

Omega/src/com/neoapps/neolauncher/util/Config.kt

@@ -115,6 +115,20 @@ class Config(val context: Context) {
         const val BS_CREATE_GROUP = 1
         const val BS_EDIT_GROUP = 2
 
+        //ICON SHAPE
+        const val SHAPE_CIRCLE = "circle"
+        const val SHAPE_SQUARE = "square"
+        const val SHAPE_SHARP_SQUARE = "sharpSquare"
+        const val SHAPE_ROUNDED_SQUARE = "roundedSquare"
+        const val SHAPE_SQUIRCLE = "squircle"
+        const val SHAPE_SAMMY = "sammy"
+        const val SHAPE_TEARDROP = "teardrop"
+        const val SHAPE_CYLINDER = "cylinder"
+        const val SHAPE_CUPERTINO = "cupertino"
+        const val SHAPE_HEXAGON = "hexagon"
+        const val SHAPE_OCTAGON = "octagon"
+        const val SHAPE_EGG = "egg"
+
         val drawerSortOptions = mutableMapOf(
             SORT_AZ to R.string.title__sort_alphabetical_az,
             SORT_ZA to R.string.title__sort_alphabetical_za,