/*
 * Copyright (C) 2017 The Dagger Authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package dagger.example.android.simple;

import android.app.Activity;
import android.app.Application;
import android.util.Log;
import dagger.BindsInstance;
import dagger.android.AndroidInjector;
import dagger.android.DispatchingAndroidInjector;
import dagger.android.HasActivityInjector;
import dagger.android.support.AndroidSupportInjectionModule;
import javax.inject.Inject;

/**
 * A simple, skeletal application that demonstrates a dependency-injected application using the
 * utilities in {@code dagger.android}.
 */
public class SimpleApplication extends Application implements HasActivityInjector {
  private static final String TAG = SimpleApplication.class.getSimpleName();

  @dagger.Component(
    modules = {AndroidSupportInjectionModule.class, MainActivity.Module.class, BuildModule.class}
  )
  /* @ApplicationScoped and/or @Singleton */
  interface Component {
    void inject(SimpleApplication app);

    @dagger.Component.Builder
    interface Builder {
      @BindsInstance
      Builder application(SimpleApplication application);

      Component build();
    }
  }

  @Inject DispatchingAndroidInjector<Activity> activityInjector;

  @Inject
  void logInjection() {
    Log.i(TAG, "Injecting " + SimpleApplication.class.getSimpleName());
  }

  @Override
  public void onCreate() {
    super.onCreate();
    DaggerSimpleApplication_Component.builder().application(this).build().inject(this);
  }

  @Override
  public AndroidInjector<Activity> activityInjector() {
    return activityInjector;
  }
}

@@ -656,238 +656,96 @@
 oid.
-app.Activity;%0Aimport android.app.Application;%0Aimport android.util.Log;%0Aimport dagger.BindsInstance;%0Aimport dagger.android.AndroidInjector;%0Aimport dagger.android.DispatchingAndroidInjector;%0Aimport dagger.android.HasActivityInjector
+util.Log;%0Aimport dagger.android.AndroidInjector;%0Aimport dagger.android.DaggerApplication
 ;%0Aim
@@ -1015,16 +1015,22 @@
 extends 
+Dagger
 Applicat
@@ -1037,39 +1037,8 @@
 ion 
-implements HasActivityInjector 
 %7B%0A  
@@ -1307,26 +1307,32 @@
 ent 
-%7B%0A    void i
+extends AndroidI
 nject
-(
+or%3C
 Simp
@@ -1348,15 +1348,11 @@
 tion
- app);%0A
+%3E %7B
 %0A   
@@ -1386,208 +1386,88 @@
     
-interface Builder %7B%0A      @BindsInstance%0A      Builder application(SimpleApplication application);%0A%0A      Component build();%0A    %7D%0A  %7D%0A%0A  @Inject DispatchingAndroidInjector%3CActivity%3E activityInjector;
+abstract class Builder extends AndroidInjector.Builder%3CSimpleApplication%3E %7B%7D%0A  %7D
 %0A%0A  
@@ -1640,96 +1640,8 @@
 ();%0A
-    DaggerSimpleApplication_Component.builder().application(this).build().inject(this);%0A
   %7D%0A
@@ -1656,21 +1656,24 @@
 ride%0A  p
-ublic
+rotected
  Android
@@ -1685,66 +1685,118 @@
 tor%3C
-Activity%3E activityInjector() %7B%0A    return activityInjector
+SimpleApplication%3E applicationInjector() %7B%0A    return DaggerSimpleApplication_Component.builder().create(this)
 ;%0A  

Update our simple Android example to use DaggerApplication.