Switch from Kodein to Koin (#1112)

* Switch from Kodein to Koin

* Ktlint

AndroidCompat/src/main/java/android/app/Service.java

@@ -25,7 +25,7 @@ import android.os.IBinder;
 import android.util.Log;
 import kotlin.NotImplementedError;
 import xyz.nulldev.androidcompat.service.ServiceSupport;
-import xyz.nulldev.androidcompat.util.KodeinGlobalHelper;
+import xyz.nulldev.androidcompat.util.KoinGlobalHelper;
 
 import java.io.FileDescriptor;
 import java.io.PrintWriter;
@@ -299,7 +299,7 @@ import java.lang.annotation.RetentionPolicy;
  */
 public abstract class Service extends ContextWrapper implements ComponentCallbacks2 {
 
-    private static final ServiceSupport serviceSupport = KodeinGlobalHelper.instance(ServiceSupport.class);
+    private static final ServiceSupport serviceSupport = KoinGlobalHelper.instance(ServiceSupport.class);
 
     private static final String TAG = "Service";
     /**
@@ -328,7 +328,7 @@ public abstract class Service extends ContextWrapper implements ComponentCallbac
     public Service() {
         //==================[THIS LINE MODIFIED FROM ANDROID SOURCE!]==================
         //Service must be initialized with a base context!
-        super(KodeinGlobalHelper.instance(Context.class));
+        super(KoinGlobalHelper.instance(Context.class));
     }
     /** Return the application that owns this service. */
     public final Application getApplication() {

AndroidCompat/src/main/java/android/os/Environment.java

@@ -1,7 +1,7 @@
 package android.os;
 
 import xyz.nulldev.androidcompat.io.AndroidFiles;
-import xyz.nulldev.androidcompat.util.KodeinGlobalHelper;
+import xyz.nulldev.androidcompat.util.KoinGlobalHelper;
 
 import java.io.File;
 
@@ -9,7 +9,7 @@ import java.io.File;
  * Android compatibility layer for files
  */
 public class Environment {
-    private static AndroidFiles androidFiles = KodeinGlobalHelper.instance(AndroidFiles.class);
+    private static AndroidFiles androidFiles = KoinGlobalHelper.instance(AndroidFiles.class);
 
     public static String DIRECTORY_ALARMS = getHomeDirectory("Alarms").getAbsolutePath();
     public static String DIRECTORY_DCIM = getHomeDirectory("DCIM").getAbsolutePath();

AndroidCompat/src/main/java/dalvik/system/BaseDexClassLoader.java

@@ -17,7 +17,7 @@ package dalvik.system;
 
 import org.jetbrains.annotations.Nullable;
 import xyz.nulldev.androidcompat.pm.PackageController;
-import xyz.nulldev.androidcompat.util.KodeinGlobalHelper;
+import xyz.nulldev.androidcompat.util.KoinGlobalHelper;
 
 import java.io.File;
 import java.io.IOException;
@@ -33,7 +33,7 @@ import java.util.Enumeration;
  * {@link ClassLoader} implementations.
  */
 public class BaseDexClassLoader extends ClassLoader {
-    private PackageController controller = KodeinGlobalHelper.instance(PackageController.class);
+    private PackageController controller = KoinGlobalHelper.instance(PackageController.class);
 
     private final URLClassLoader realClassloader;
 

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/AndroidCompat.kt

@@ -1,13 +1,11 @@
 package xyz.nulldev.androidcompat
 
 import android.app.Application
-import org.kodein.di.DI
-import org.kodein.di.conf.global
-import org.kodein.di.instance
+import org.koin.mp.KoinPlatformTools
 import xyz.nulldev.androidcompat.androidimpl.CustomContext
 
 class AndroidCompat {
-    val context: CustomContext by DI.global.instance()
+    val context: CustomContext by KoinPlatformTools.defaultContext().get().inject()
 
     fun startApp(application: Application) {
         application.attach(context)

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/AndroidCompatInitializer.kt

@@ -1,7 +1,5 @@
 package xyz.nulldev.androidcompat
 
-import org.kodein.di.DI
-import org.kodein.di.conf.global
 import xyz.nulldev.androidcompat.config.ApplicationInfoConfigModule
 import xyz.nulldev.androidcompat.config.FilesConfigModule
 import xyz.nulldev.androidcompat.config.SystemConfigModule
@@ -12,8 +10,6 @@ import xyz.nulldev.ts.config.GlobalConfigManager
  */
 class AndroidCompatInitializer {
     fun init() {
-        DI.global.addImport(AndroidCompatModule().create())
-
         // Register config modules
         GlobalConfigManager.registerModules(
             FilesConfigModule.register(GlobalConfigManager.config),

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/AndroidCompatModule.kt

@@ -1,11 +1,8 @@
 package xyz.nulldev.androidcompat
 
 import android.content.Context
-import org.kodein.di.DI
-import org.kodein.di.bind
-import org.kodein.di.conf.global
-import org.kodein.di.instance
-import org.kodein.di.singleton
+import org.koin.core.module.Module
+import org.koin.dsl.module
 import xyz.nulldev.androidcompat.androidimpl.CustomContext
 import xyz.nulldev.androidcompat.androidimpl.FakePackageManager
 import xyz.nulldev.androidcompat.info.ApplicationInfoImpl
@@ -17,25 +14,19 @@ import xyz.nulldev.androidcompat.service.ServiceSupport
  * AndroidCompatModule
  */
 
-class AndroidCompatModule {
-    fun create() =
-        DI.Module("AndroidCompat") {
-            bind<AndroidFiles>() with singleton { AndroidFiles() }
+fun androidCompatModule(): Module =
+    module {
+        single { AndroidFiles() }
 
-            bind<ApplicationInfoImpl>() with singleton { ApplicationInfoImpl() }
+        single { ApplicationInfoImpl(get()) }
 
-            bind<ServiceSupport>() with singleton { ServiceSupport() }
+        single { ServiceSupport() }
 
-            bind<FakePackageManager>() with singleton { FakePackageManager() }
+        single { FakePackageManager() }
 
-            bind<PackageController>() with singleton { PackageController() }
+        single { PackageController() }
 
-            // Context
-            bind<CustomContext>() with singleton { CustomContext() }
-            bind<Context>() with
-                singleton {
-                    val context: Context by DI.global.instance<CustomContext>()
-                    context
-                }
-        }
-}
+        single { CustomContext() }
+
+        single<Context> { get<CustomContext>() }
+    }

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/androidimpl/CustomContext.java

@@ -32,15 +32,14 @@ import android.os.*;
 import android.view.Display;
 import android.view.DisplayAdjustments;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.kodein.di.*;
+import org.koin.core.Koin;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import xyz.nulldev.androidcompat.info.ApplicationInfoImpl;
 import xyz.nulldev.androidcompat.io.AndroidFiles;
 import xyz.nulldev.androidcompat.io.sharedprefs.JavaSharedPreferences;
 import xyz.nulldev.androidcompat.service.ServiceSupport;
-import xyz.nulldev.androidcompat.util.KodeinGlobalHelper;
+import xyz.nulldev.androidcompat.util.KoinGlobalHelper;
 
 import java.io.*;
 import java.util.HashMap;
@@ -51,26 +50,25 @@ import java.util.Map;
  * Custom context implementation.
  *
  */
-public class CustomContext extends Context implements DIAware {
-    private final DI kodein;
+public class CustomContext extends Context {
+    private final Koin koin;
     public CustomContext() {
-        this(KodeinGlobalHelper.kodein());
+        this(KoinGlobalHelper.koin());
     }
 
-    public CustomContext(DI kodein) {
-        this.kodein = kodein;
+    public CustomContext(Koin koin) {
+        this.koin = koin;
 
         //Init configs
-        androidFiles = KodeinGlobalHelper.instance(AndroidFiles.class, getDi());
-        applicationInfo = KodeinGlobalHelper.instance(ApplicationInfoImpl.class, getDi());
-        serviceSupport = KodeinGlobalHelper.instance(ServiceSupport.class, getDi());
-        fakePackageManager = KodeinGlobalHelper.instance(FakePackageManager.class, getDi());
+        androidFiles = KoinGlobalHelper.instance(AndroidFiles.class, getDi());
+        applicationInfo = KoinGlobalHelper.instance(ApplicationInfoImpl.class, getDi());
+        serviceSupport = KoinGlobalHelper.instance(ServiceSupport.class, getDi());
+        fakePackageManager = KoinGlobalHelper.instance(FakePackageManager.class, getDi());
     }
 
     @NotNull
-    @Override
-    public DI getDi() {
-        return kodein;
+    public Koin getDi() {
+        return koin;
     }
 
     private AndroidFiles androidFiles;
@@ -719,17 +717,5 @@ public class CustomContext extends Context implements DIAware {
     public boolean isCredentialProtectedStorage() {
         return false;
     }
-
-    @NotNull
-    @Override
-    public DIContext<?> getDiContext() {
-        return getDi().getDiContext();
-    }
-
-    @Nullable
-    @Override
-    public DITrigger getDiTrigger() {
-        return null;
-    }
 }
 

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/androidimpl/FakePackageManager.java

@@ -16,14 +16,14 @@ import android.os.UserHandle;
 import kotlin.NotImplementedError;
 import xyz.nulldev.androidcompat.pm.InstalledPackage;
 import xyz.nulldev.androidcompat.pm.PackageController;
-import xyz.nulldev.androidcompat.util.KodeinGlobalHelper;
+import xyz.nulldev.androidcompat.util.KoinGlobalHelper;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
 public class FakePackageManager extends PackageManager {
-    private PackageController controller = KodeinGlobalHelper.instance(PackageController.class);
+    private PackageController controller = KoinGlobalHelper.instance(PackageController.class);
 
     @Override
     public PackageInfo getPackageInfo(String packageName, int flags) throws NameNotFoundException {

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/info/ApplicationInfoImpl.kt

@@ -1,19 +1,12 @@
 package xyz.nulldev.androidcompat.info
 
 import android.content.pm.ApplicationInfo
-import org.kodein.di.DI
-import org.kodein.di.DIAware
-import org.kodein.di.conf.global
-import org.kodein.di.instance
 import xyz.nulldev.androidcompat.config.ApplicationInfoConfigModule
 import xyz.nulldev.ts.config.ConfigManager
 
 class ApplicationInfoImpl(
-    override val di: DI = DI.global,
-) : ApplicationInfo(),
-    DIAware {
-    val configManager: ConfigManager by di.instance()
-
+    private val configManager: ConfigManager,
+) : ApplicationInfo() {
     val appInfoConfig: ApplicationInfoConfigModule
         get() = configManager.module()
 

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/pm/PackageController.kt

@@ -1,14 +1,12 @@
 package xyz.nulldev.androidcompat.pm
 
 import net.dongliu.apk.parser.ApkParsers
-import org.kodein.di.DI
-import org.kodein.di.conf.global
-import org.kodein.di.instance
+import org.koin.mp.KoinPlatformTools
 import xyz.nulldev.androidcompat.io.AndroidFiles
 import java.io.File
 
 class PackageController {
-    private val androidFiles by DI.global.instance<AndroidFiles>()
+    private val androidFiles: AndroidFiles by KoinPlatformTools.defaultContext().get().inject()
     private val uninstallListeners = mutableListOf<(String) -> Unit>()
 
     fun registerUninstallListener(listener: (String) -> Unit) {

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/res/BuildConfigCompat.java

@@ -1,7 +1,7 @@
 package xyz.nulldev.androidcompat.res;
 
 import xyz.nulldev.androidcompat.info.ApplicationInfoImpl;
-import xyz.nulldev.androidcompat.util.KodeinGlobalHelper;
+import xyz.nulldev.androidcompat.util.KoinGlobalHelper;
 
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
@@ -10,7 +10,7 @@ import java.util.Calendar;
  * BuildConfig compat class.
  */
 public class BuildConfigCompat {
-    private static ApplicationInfoImpl applicationInfo = KodeinGlobalHelper.instance(ApplicationInfoImpl.class);
+    private static ApplicationInfoImpl applicationInfo = KoinGlobalHelper.instance(ApplicationInfoImpl.class);
 
     public static final boolean DEBUG = applicationInfo.getDebug();
 

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/util/KodeinGlobalHelper.kt

@@ -1,67 +0,0 @@
-package xyz.nulldev.androidcompat.util
-
-import android.content.Context
-import org.kodein.di.DI
-import org.kodein.di.conf.global
-import org.kodein.di.instance
-import xyz.nulldev.androidcompat.androidimpl.CustomContext
-import xyz.nulldev.androidcompat.androidimpl.FakePackageManager
-import xyz.nulldev.androidcompat.info.ApplicationInfoImpl
-import xyz.nulldev.androidcompat.io.AndroidFiles
-import xyz.nulldev.androidcompat.pm.PackageController
-import xyz.nulldev.androidcompat.service.ServiceSupport
-
-/**
- * Helper class to allow access to Kodein from Java
- */
-object KodeinGlobalHelper {
-    /**
-     * Get the Kodein object
-     */
-    @JvmStatic
-    fun kodein() = DI.global
-
-    /**
-     * Get a dependency
-     */
-    @JvmStatic
-    @Suppress("UNCHECKED_CAST")
-    fun <T : Any> instance(
-        type: Class<T>,
-        kodein: DI? = null,
-    ): T =
-        when (type) {
-            AndroidFiles::class.java -> {
-                val instance: AndroidFiles by (kodein ?: kodein()).instance()
-                instance as T
-            }
-            ApplicationInfoImpl::class.java -> {
-                val instance: ApplicationInfoImpl by (kodein ?: kodein()).instance()
-                instance as T
-            }
-            ServiceSupport::class.java -> {
-                val instance: ServiceSupport by (kodein ?: kodein()).instance()
-                instance as T
-            }
-            FakePackageManager::class.java -> {
-                val instance: FakePackageManager by (kodein ?: kodein()).instance()
-                instance as T
-            }
-            PackageController::class.java -> {
-                val instance: PackageController by (kodein ?: kodein()).instance()
-                instance as T
-            }
-            CustomContext::class.java -> {
-                val instance: CustomContext by (kodein ?: kodein()).instance()
-                instance as T
-            }
-            Context::class.java -> {
-                val instance: Context by (kodein ?: kodein()).instance()
-                instance as T
-            }
-            else -> throw IllegalArgumentException("Kodein instance not found")
-        }
-
-    @JvmStatic
-    fun <T : Any> instance(type: Class<T>): T = instance(type, null)
-}

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/util/KoinGlobalHelper.kt

@@ -0,0 +1,27 @@
+package xyz.nulldev.androidcompat.util
+
+import org.koin.core.Koin
+import org.koin.mp.KoinPlatformTools
+
+/**
+ * Helper class to allow access to Kodein from Java
+ */
+object KoinGlobalHelper {
+    /**
+     * Get the Kodein object
+     */
+    @JvmStatic
+    fun koin() = KoinPlatformTools.defaultContext().get()
+
+    /**
+     * Get a dependency
+     */
+    @JvmStatic
+    fun <T : Any> instance(
+        type: Class<T>,
+        koin: Koin? = null,
+    ): T = (koin ?: koin()).get(type.kotlin)
+
+    @JvmStatic
+    fun <T : Any> instance(type: Class<T>): T = instance(type, null)
+}