THEMING - ICON-SHAPE - refactor - move CustomIconShape to subpackage

AndroidManifest-common.xml

@@ -194,7 +194,7 @@
 
         <!-- A shape from the website's icon shape editor (see CustomIconShape) -->
         <activity
-            android:name="app.murinelauncher.settings.CustomIconShape$ImportActivity"
+            android:name="app.murinelauncher.settings.icons.CustomIconShape$ImportActivity"
             android:theme="@android:style/Theme.NoDisplay"
             android:taskAffinity=""
             android:excludeFromRecents="true"

src/app/murinelauncher/settings/SettingsIconsFragment.kt

@@ -3,6 +3,7 @@ package app.murinelauncher.settings
 import androidx.preference.Preference
 import app.murinelauncher.graphics.IconShapeDrawables
 import app.murinelauncher.settings.common.AbstractSettingsFragment
+import app.murinelauncher.settings.icons.CustomIconShape
 import app.murinelauncher.settings.prefs.AdaptiveIcons
 import app.murinelauncher.util.isResourceHackSupported
 import app.murinelauncher.settings.prefs.LabelVisibility

src/app/murinelauncher/settings/icons/CustomIconShape.kt

@@ -1,4 +1,4 @@
-package app.murinelauncher.settings
+package app.murinelauncher.settings.icons
 
 import android.app.Activity
 import android.content.Context
@@ -7,6 +7,7 @@ import android.net.Uri
 import android.os.Bundle
 import android.util.Base64
 import androidx.core.graphics.PathParser
+import app.murinelauncher.settings.SettingsIconsFragment
 import com.android.launcher3.LauncherPrefs
 import com.android.launcher3.graphics.ThemeManager
 import com.android.launcher3.settings.SettingsActivity
@@ -14,6 +15,7 @@ import com.android.launcher3.shapes.ShapesProvider
 import java.io.ByteArrayOutputStream
 import java.util.zip.Inflater
 import java.util.zip.InflaterInputStream
+import kotlin.to
 
 /**
  * The Custom icon shape: made on the website's editor, sent back with murine-home://icon-shape?shape=...
@@ -73,4 +75,4 @@ object CustomIconShape {
     } catch (e: Exception) {
         null
     }
-}
+}

src/com/android/launcher3/graphics/ThemeManager.kt

@@ -171,7 +171,7 @@ constructor(
         const val KEY_THEMED_ICONS = "themed_icons"
         @JvmField val THEMED_ICONS = backedUpItem(KEY_THEMED_ICONS, false, EncryptionType.ENCRYPTED)
         @JvmField val PREF_ICON_SHAPE = backedUpItem(SettingsIconsFragment.ICON_SHAPE_KEY, ShapesProvider.IconShape.IOS, EncryptionType.ENCRYPTED)
-        /** Path of the CUSTOM shape, kept when another shape is picked; only written once validated (see [app.murinelauncher.settings.CustomIconShape]) */
+        /** Path of the CUSTOM shape, kept when another shape is picked; only written once validated (see [app.murinelauncher.settings.icons.CustomIconShape]) */
         @JvmField val PREF_CUSTOM_ICON_SHAPE = backedUpItem("pref_icon_shape_custom", "", EncryptionType.ENCRYPTED)
 
         private const val ACTION_OVERLAY_CHANGED = "android.intent.action.OVERLAY_CHANGED"