Integrate IconShapeManager into Dagger dependency injection

Author: saulhdev

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

@@ -22,11 +22,19 @@ import android.content.Context
 import android.graphics.Path
 import android.graphics.Region
 import android.graphics.drawable.AdaptiveIconDrawable
+import com.android.launcher3.dagger.ApplicationContext
+import com.android.launcher3.dagger.LauncherAppComponent
+import com.android.launcher3.dagger.LauncherAppSingleton
 import com.android.launcher3.graphics.ThemeManager
 import com.android.launcher3.icons.GraphicsUtils
-import com.android.launcher3.util.MainThreadInitializedObject
+import com.android.launcher3.util.DaggerSingletonObject
+import com.android.launcher3.util.SafeCloseable
+import jakarta.inject.Inject
 
-class IconShapeManager(private val context: Context) {
+@LauncherAppSingleton
+class IconShapeManager @Inject constructor(
+    @ApplicationContext private val context: Context,
+) : SafeCloseable {
     fun getSystemShape(): IconShape {
         val iconMask = AdaptiveIconDrawable(null, null).iconMask
         val systemShape = findNearestShape(iconMask)
@@ -80,10 +88,13 @@ class IconShapeManager(private val context: Context) {
             }!!
     }
 
-    companion object {
+    override fun close() {
+        TODO("Not yet implemented")
+    }
 
+    companion object {
         @JvmField
-        val INSTANCE = MainThreadInitializedObject(::IconShapeManager)
+        val INSTANCE = DaggerSingletonObject(LauncherAppComponent::getIconShapeManager)
     }
 
 }

src/com/android/launcher3/dagger/LauncherBaseAppComponent.java

@@ -72,12 +72,13 @@
 import com.android.launcher3.widget.custom.CustomWidgetManager;
 import com.android.launcher3.widget.util.WidgetSizeHandler;
 import com.neoapps.neolauncher.data.IconOverrideRepository;
+import com.neoapps.neolauncher.icons.IconShapeManager;
 import com.neoapps.neolauncher.util.CustomActivityCachingLogic;
 
-import dagger.BindsInstance;
-
 import javax.inject.Named;
 
+import dagger.BindsInstance;
+
 /**
  * Launcher base component for Dagger injection.
  *
@@ -182,6 +183,8 @@ public interface LauncherBaseAppComponent {
     IconOverrideRepository getIconOverrideRepository();
     CustomActivityCachingLogic getCustomActivityCachingLogic();
 
+    IconShapeManager getIconShapeManager();
+
     /** Builder for LauncherBaseAppComponent. */
     interface Builder {
         @BindsInstance Builder appContext(@ApplicationContext Context context);