murki · November 29, 2024 09:31 · Jun 1, 2018 · Jun 1, 2018 · May 16, 2018 · May 16, 2018
diff --git a/PlacesActivity.kt b/PlacesActivity.kt
@@ -5,6 +5,6 @@ class PlacesActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         // This is how you instantiate your Presenter while the service locator resolves all of its dependencies
         // Note that the explicit type argument <PlacesPresenter> is not even necessary since Kotlin can infer the type
-        placesPresenter = placesPresenter = application.getSystemService<PlacesPresenter>()
+        placesPresenter = application.getSystemService<PlacesPresenter>()
     }
 }
diff --git a/PlacesActivity.kt b/PlacesActivity.kt
@@ -4,6 +4,7 @@ class PlacesActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         // This is how you instantiate your Presenter while the service locator resolves all of its dependencies
+        // Note that the explicit type argument <PlacesPresenter> is not even necessary since Kotlin can infer the type
         placesPresenter = placesPresenter = application.getSystemService<PlacesPresenter>()
     }
 }
diff --git a/ServiceLocatorApplication.kt b/ServiceLocatorApplication.kt
@@ -6,6 +6,7 @@ class ServiceLocatorApplication : Application() {
     override fun getSystemService(name: String?): Any {
         // All this logic can be extracted into a separate "Module" class
         return when (name) {
+            // We use the full class' name as the key
             PlacesPresenter::class.java.name -> PlacesPresenter(getSystemService<ILocationRepository>(), getSystemService<IPlacesRepository>())
             ILocationRepository::class.java.name -> GmsLocationRepository(getSystemService<FusedLocationProviderClient>())
             IPlacesRepository::class.java.name -> GmsPlacesRepository(getSystemService<GeoDataClient>())
@@ -20,5 +21,6 @@ class ServiceLocatorApplication : Application() {
  * Generic strongly-typed extension method for injection
  */
 inline fun <reified T : Any> Application.getSystemService() : T {
+    // We extract the class name from the generic type
     return this.getSystemService(T::class.java.name) as T
 }
diff --git a/PlacesActivity.kt b/PlacesActivity.kt
@@ -3,7 +3,7 @@ class PlacesActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        // This is how you locate your Presenter
+        // This is how you instantiate your Presenter while the service locator resolves all of its dependencies
         placesPresenter = placesPresenter = application.getSystemService<PlacesPresenter>()
     }
 }
diff --git a/ServiceLocatorApplication.kt b/ServiceLocatorApplication.kt
@@ -1,16 +1,16 @@
-class CityGuideApp : Application() {
+class ServiceLocatorApplication : Application() {
 
     /**
      * Dependency injection using service locator pattern
      */
     override fun getSystemService(name: String?): Any {
-        // All this logic can be extracted into its own "module"
+        // All this logic can be extracted into a separate "Module" class
         return when (name) {
-            FusedLocationProviderClient::class.java.name -> LocationServices.getFusedLocationProviderClient(this)
-            GeoDataClient::class.java.name -> Places.getGeoDataClient(this, null)
+            PlacesPresenter::class.java.name -> PlacesPresenter(getSystemService<ILocationRepository>(), getSystemService<IPlacesRepository>())
             ILocationRepository::class.java.name -> GmsLocationRepository(getSystemService<FusedLocationProviderClient>())
             IPlacesRepository::class.java.name -> GmsPlacesRepository(getSystemService<GeoDataClient>())
-            PlacesPresenter::class.java.name -> PlacesPresenter(getSystemService<ILocationRepository>(), getSystemService<IPlacesRepository>())
+            FusedLocationProviderClient::class.java.name -> LocationServices.getFusedLocationProviderClient(this)
+            GeoDataClient::class.java.name -> Places.getGeoDataClient(this, null)
             else -> super.getSystemService(name)
         }
     }

diff --git a/PlacesActivity.kt b/PlacesActivity.kt
@@ -0,0 +1,9 @@
+class PlacesActivity : AppCompatActivity() {
+    private lateinit var placesPresenter: PlacesPresenter
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        // This is how you locate your Presenter
+        placesPresenter = placesPresenter = application.getSystemService<PlacesPresenter>()
+    }
+}
diff --git a/ServiceLocatorApplication.kt b/ServiceLocatorApplication.kt
@@ -0,0 +1,24 @@
+class CityGuideApp : Application() {
+
+    /**
+     * Dependency injection using service locator pattern
+     */
+    override fun getSystemService(name: String?): Any {
+        // All this logic can be extracted into its own "module"
+        return when (name) {
+            FusedLocationProviderClient::class.java.name -> LocationServices.getFusedLocationProviderClient(this)
+            GeoDataClient::class.java.name -> Places.getGeoDataClient(this, null)
+            ILocationRepository::class.java.name -> GmsLocationRepository(getSystemService<FusedLocationProviderClient>())
+            IPlacesRepository::class.java.name -> GmsPlacesRepository(getSystemService<GeoDataClient>())
+            PlacesPresenter::class.java.name -> PlacesPresenter(getSystemService<ILocationRepository>(), getSystemService<IPlacesRepository>())
+            else -> super.getSystemService(name)
+        }
+    }
+}
+
+/**
+ * Generic strongly-typed extension method for injection
+ */
+inline fun <reified T : Any> Application.getSystemService() : T {
+    return this.getSystemService(T::class.java.name) as T
+}