Use top level function instead of companion object.

[satorufujiwara]

Issue

• No issue.

Overview (Required)

• Use top level function instead of companion object.

Changes

These are decompiled java code.

Before

public final class AppInjector {
   public static final AppInjector.Companion Companion = new AppInjector.Companion((DefaultConstructorMarker)null);

   public static final class Companion {
      public final void init(@NotNull App app) {
         Intrinsics.checkParameterIsNotNull(app, "app");
         DaggerAppComponent.builder().application((Application)app).networkModule(NetworkModule.Companion.getInstance()).databaseModule(DatabaseModule.Companion.getInstance()).build().inject(app);
         app.registerActivityLifecycleCallbacks((ActivityLifecycleCallbacks)(new ActivityLifecycleCallbacks() {
            public void onActivityCreated(@NotNull Activity activity, @Nullable Bundle savedInstanceState) {
               Intrinsics.checkParameterIsNotNull(activity, "activity");
               AppInjector.Companion.handleActivity(activity);
            }

            public void onActivityStarted(@NotNull Activity activity) {
               Intrinsics.checkParameterIsNotNull(activity, "activity");
            }

            public void onActivityResumed(@NotNull Activity activity) {
               Intrinsics.checkParameterIsNotNull(activity, "activity");
            }

            public void onActivityPaused(@NotNull Activity activity) {
               Intrinsics.checkParameterIsNotNull(activity, "activity");
            }

            public void onActivityStopped(@NotNull Activity activity) {
               Intrinsics.checkParameterIsNotNull(activity, "activity");
            }

            public void onActivitySaveInstanceState(@NotNull Activity activity, @Nullable Bundle outState) {
               Intrinsics.checkParameterIsNotNull(activity, "activity");
            }

            public void onActivityDestroyed(@NotNull Activity activity) {
               Intrinsics.checkParameterIsNotNull(activity, "activity");
            }
         }));
      }

      private final void handleActivity(Activity activity) {
         if(activity instanceof HasSupportFragmentInjector) {
            AndroidInjection.inject(activity);
         }

         Activity var10000 = activity;
         if(!(activity instanceof FragmentActivity)) {
            var10000 = null;
         }

         FragmentActivity fragmentActivity = (FragmentActivity)var10000;
         if(fragmentActivity != null) {
            FragmentManager var3 = fragmentActivity.getSupportFragmentManager();
            if(var3 != null) {
               var3.registerFragmentLifecycleCallbacks((FragmentLifecycleCallbacks)(new FragmentLifecycleCallbacks() {
                  public void onFragmentCreated(@Nullable FragmentManager fm, @Nullable Fragment f, @Nullable Bundle savedInstanceState) {
                     if(f instanceof Injectable) {
                        AndroidSupportInjection.inject(f);
                     }

                  }
               }), true);
            }
         }

      }

      private Companion() {
      }

      // $FF: synthetic method
      public Companion(DefaultConstructorMarker $constructor_marker) {
         this();
      }
   }
}

• AppInjector.Companion class and its insntance is redundant.

After

public final class AppInjectorKt {
   public static final void initDaggerComponent(@NotNull App $receiver) {
      Intrinsics.checkParameterIsNotNull($receiver, "$receiver");
      DaggerAppComponent.builder().application((Application)$receiver).networkModule(NetworkModule.Companion.getInstance()).databaseModule(DatabaseModule.Companion.getInstance()).build().inject($receiver);
      $receiver.registerActivityLifecycleCallbacks((ActivityLifecycleCallbacks)(new ActivityLifecycleCallbacks() {
         public void onActivityCreated(@NotNull Activity activity, @Nullable Bundle savedInstanceState) {
            Intrinsics.checkParameterIsNotNull(activity, "activity");
            AppInjectorKt.handleActivity(activity);
         }

         public void onActivityStarted(@NotNull Activity activity) {
            Intrinsics.checkParameterIsNotNull(activity, "activity");
         }

         public void onActivityResumed(@NotNull Activity activity) {
            Intrinsics.checkParameterIsNotNull(activity, "activity");
         }

         public void onActivityPaused(@NotNull Activity activity) {
            Intrinsics.checkParameterIsNotNull(activity, "activity");
         }

         public void onActivityStopped(@NotNull Activity activity) {
            Intrinsics.checkParameterIsNotNull(activity, "activity");
         }

         public void onActivitySaveInstanceState(@NotNull Activity activity, @Nullable Bundle outState) {
            Intrinsics.checkParameterIsNotNull(activity, "activity");
         }

         public void onActivityDestroyed(@NotNull Activity activity) {
            Intrinsics.checkParameterIsNotNull(activity, "activity");
         }
      }));
   }

   private static final void handleActivity(Activity activity) {
      if(activity instanceof HasSupportFragmentInjector) {
         AndroidInjection.inject(activity);
      }

      Activity var10000 = activity;
      if(!(activity instanceof FragmentActivity)) {
         var10000 = null;
      }

      FragmentActivity fragmentActivity = (FragmentActivity)var10000;
      if(fragmentActivity != null) {
         FragmentManager var2 = fragmentActivity.getSupportFragmentManager();
         if(var2 != null) {
            var2.registerFragmentLifecycleCallbacks((FragmentLifecycleCallbacks)(new FragmentLifecycleCallbacks() {
               public void onFragmentCreated(@Nullable FragmentManager fm, @Nullable Fragment f, @Nullable Bundle savedInstanceState) {
                  if(f instanceof Injectable) {
                     AndroidSupportInjection.inject(f);
                  }

               }
            }), true);
         }
      }

   }
}

Links

• https://github.com/satorufujiwara/kotlin-architecture-components/blob/master/app/src/main/java/jp/satorufujiwara/kotlin/di/AutoInjector.kt
  • Similar code.

Screenshot

• Nothing has changed.

[takahirom]

:eyes:

[takahirom]

Thank you for deleting useless instances! LGTM 🥇

[takahirom]

I listen with this just interesting, do you think that it is better to replace it with the top level function in this case too? 🤔 https://github.com/DroidKaigi/conference-app-2018/blob/master/app/src/main/java/io/github/droidkaigi/confsched2018/presentation/common/notification/NotificationHelper.kt

[takahirom]

anyway merged! 👍