Fix option to show or hide icon shadow

Signed-off-by: Saul Henriquez <saul_henriquez@hotmail.com>

Author: saulhdev

Omega/res/values/strings.xml

@@ -273,6 +273,8 @@
     <string name="color_presets">Presets</string>
     <string name="color_dynamic">Dynamic</string>
     <string name="title_adaptify_pack">Create adaptive icons for icon pack</string>
+    <string name="title_show_icon_shadow">Show Icon Shadow</string>
+    <string name="summary_show_icon_shadow">Show shadow for non-adaptive icons.</string>
     <string name="title_force_shapeless">Force shapeless icons</string>
     <string name="title_themed_icons">Themed Icons</string>
     <string name="title_themed_background">Transparent icon background</string>

Omega/src/com/neoapps/neolauncher/compose/pages/preferences/ProfilePrefsPage.kt

@@ -75,6 +75,7 @@ fun ProfilePrefsPage() {
         prefs.profileIconShape,
         prefs.profileIconAdaptify,
         prefs.profileIconColoredBackground,
+        prefs.profileIconShadow,
         if (customIconsCount > 0) {
             prefs.profileResetCustomIcons
         } else {

Omega/src/com/neoapps/neolauncher/preferences/NeoPrefs.kt

@@ -187,22 +187,6 @@ class NeoPrefs private constructor(val context: Context) {
         }
     )
 
-    var profileTransparentBgIcons = BooleanPref(
-        titleId = R.string.title_themed_background,
-        dataStore = dataStore,
-        key = PrefKey.PROFILE_ICON_TRANSPARENT_BG,
-        defaultValue = false
-    )
-
-    var profileShapeLessIcon = BooleanPref(
-        titleId = R.string.title_force_shapeless,
-        summaryId = R.string.summary_force_shapeless,
-        dataStore = dataStore,
-        key = PrefKey.PROFILE_ICON_SHAPE_LESS,
-        defaultValue = false,
-        onChange = { reloadModel() }
-    )
-
     var profileIconColoredBackground = BooleanPref(
         dataStore = dataStore,
         key = PrefKey.PROFILE_ICON_COLORED_BG,
@@ -214,6 +198,17 @@ class NeoPrefs private constructor(val context: Context) {
         }
     )
 
+    var profileIconShadow = BooleanPref(
+        dataStore = dataStore,
+        key = PrefKey.PROFILE_ICON_SHADOW,
+        titleId = R.string.title_show_icon_shadow,
+        summaryId = R.string.summary_show_icon_shadow,
+        defaultValue = false,
+        onChange = {
+            legacyPrefs.savePreference("profile_icon_shadow", it)
+        }
+    )
+
     var profileIconAdaptify = BooleanPref(
         dataStore = dataStore,
         key = PrefKey.PROFILE_ICON_ADAPTIFY,

Omega/src/com/neoapps/neolauncher/preferences/PrefKey.kt

@@ -38,11 +38,10 @@ object PrefKey {
     val PROFILE_ICON_PACK = stringPreferencesKey("profile_icon_pack")
     val PROFILE_ICON_SHAPE = stringPreferencesKey("profile_icon_shape")
     val PROFILE_ICON_COLORED_BG = booleanPreferencesKey("profile_icon_colored_background")
-    val PROFILE_ICON_TRANSPARENT_BG = booleanPreferencesKey("profile_transparent_icon")
     val PROFILE_THEMED_ICONS = booleanPreferencesKey("themed_icons")
     val PROFILE_ICON_ADAPTIFY = booleanPreferencesKey("profile_icon_adaptify")
     val PROFILE_ICON_RESET_CUSTOM = stringPreferencesKey("profile_icon_reset_custom")
-    val PROFILE_ICON_SHAPE_LESS = booleanPreferencesKey("profile_icon_shape_less")
+    val PROFILE_ICON_SHADOW = booleanPreferencesKey("profile_icon_shadow")
     val PROFILE_WINDOW_CORNER_RADIUS = floatPreferencesKey("profile_custom_window_corner_radius")
     val PROFILE_STATUSBAR_SHADOW = booleanPreferencesKey("profile_status_bar_shadow")
 

libs_systemui/iconloaderlib/src/com/android/launcher3/icons/BaseIconFactory.kt

@@ -398,17 +398,22 @@ constructor(
                     icon.wrapIntoSquareDrawable(options.iconScale)
                 else icon
             iconToDraw.setBounds(0, 0, iconBitmapSize, iconBitmapSize)
-
+            val legacyBackground = prefs.getWrapperBackgroundColor(icon)
             return createBitmap(options) { canvas, bitmap ->
-                if (drawFullBleed) canvas.drawColor(Color.BLACK)
-                iconToDraw.draw(canvas)
+                if (prefs.coloredIconBackground() && prefs.coloredIconBackground()) {
+                    canvas.drawColor(legacyBackground)
+                } else {
+                    canvas.drawColor(Color.TRANSPARENT)
+                }
 
-                if (options.addShadows && bitmap != null && !drawFullBleed) {
+                if (options.addShadows && bitmap != null && !drawFullBleed && prefs.iconShadow()) {
                     // Shadow extraction only works in software mode
                     shadowGenerator.drawShadow(bitmap, canvas)
 
                     // Draw the icon again on top
                     iconToDraw.draw(canvas)
+                } else {
+                    iconToDraw.draw(canvas)
                 }
             }
         }

libs_systemui/iconloaderlib/src/com/neoapps/neolauncher/icons/IconPreferences.kt

@@ -36,6 +36,9 @@ class IconPreferences(context: Context) {
     fun shouldWrapAdaptive(): Boolean {
         return prefs.getBoolean("profile_icon_adaptify", false)
     }
+    fun iconShadow(): Boolean {
+        return prefs.getBoolean("profile_icon_shadow", false)
+    }
 
     fun coloredIconBackground(): Boolean {
         return prefs.getBoolean("profile_icon_colored_background", false)