Update u2020 to u2021

build.gradle

@@ -6,6 +6,7 @@ buildscript {
     classpath 'com.android.tools.build:gradle:0.13.3'
     classpath 'com.jakewharton.hugo:hugo-plugin:1.1.0'
     classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.0'
+    classpath 'com.neenbedankt.gradle.plugins:android-apt:1.4'
   }
 }
 
@@ -18,23 +19,27 @@ def versionBuild = 0 // bump for dogfood builds, public betas, etc.
 apply plugin: 'android-sdk-manager'
 apply plugin: 'com.android.application'
 apply plugin: 'hugo'
+apply plugin: 'com.neenbedankt.android-apt'
 
 repositories {
   mavenCentral()
+  maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
+  mavenLocal()
 }
 
 dependencies {
   compile 'com.android.support:support-v4:21.0.0'
 
-  compile 'com.squareup.dagger:dagger:1.2.1'
-  provided 'com.squareup.dagger:dagger-compiler:1.2.1'
+  compile 'com.google.dagger:dagger:2.0-SNAPSHOT'
+  apt 'com.google.dagger:dagger-compiler:2.0-SNAPSHOT'
+  provided 'org.glassfish:javax.annotation:10.0-b28'
 
   compile 'com.squareup.okhttp:okhttp:1.3.0'
   compile 'com.squareup.picasso:picasso:2.2.0'
   compile 'com.squareup.retrofit:retrofit:1.4.1'
   debugCompile 'com.squareup.retrofit:retrofit-mock:1.4.1'
 
-  compile 'com.jakewharton:butterknife:4.0.1'
+  compile 'com.jakewharton:butterknife:6.0.0'
   compile 'com.jakewharton.timber:timber:2.2.2'
   debugCompile 'com.jakewharton.madge:madge:1.1.1'
   debugCompile 'com.jakewharton.scalpel:scalpel:1.1.1'

src/debug/java/com/jakewharton/u2020/U2020Component.java

@@ -0,0 +1,26 @@
+package com.jakewharton.u2020;
+
+import com.jakewharton.u2020.data.DebugDataModule;
+import com.jakewharton.u2020.ui.DebugUiModule;
+
+import dagger.Component;
+import javax.inject.Singleton;
+
+/**
+ * The core debug component for u2020 applications
+ */
+@Singleton
+@Component(modules = { U2020AppModule.class, DebugUiModule.class, DebugDataModule.class })
+public interface U2020Component extends U2020Graph {
+  /**
+   * An initializer that creates the graph from an application. 
+   */
+  final static class Initializer {
+    static U2020Graph init(U2020App app) {
+      return Dagger_U2020Component.builder()
+          .u2020AppModule(new U2020AppModule(app))
+          .build();
+    }
+    private Initializer() {} // No instances.
+  }
+}

src/debug/java/com/jakewharton/u2020/data/DebugDataModule.java

@@ -20,12 +20,7 @@
 import javax.net.ssl.X509TrustManager;
 import retrofit.MockRestAdapter;
 
-@Module(
-    includes = DebugApiModule.class,
-    complete = false,
-    library = true,
-    overrides = true
-)
+@Module(includes = { DataModule.class, DebugApiModule.class })
 public final class DebugDataModule {
   private static final int DEFAULT_ANIMATION_SPEED = 1; // 1x (normal) speed.
   private static final boolean DEFAULT_PICASSO_DEBUGGING = false; // Debug indicators displayed
@@ -93,7 +88,8 @@ BooleanPreference provideScalpelWireframeEnabled(SharedPreferences preferences)
         DEFAULT_SCALPEL_WIREFRAME_ENABLED);
   }
 
-  @Provides @Singleton Picasso providePicasso(OkHttpClient client, MockRestAdapter mockRestAdapter,
+  @Provides @Singleton Picasso providePicasso(
+      OkHttpClient client, MockRestAdapter mockRestAdapter,
       @IsMockMode boolean isMockMode, Application app) {
     Picasso.Builder builder = new Picasso.Builder(app);
     if (isMockMode) {

src/debug/java/com/jakewharton/u2020/data/api/DebugApiModule.java

@@ -13,11 +13,7 @@
 import retrofit.RestAdapter;
 import retrofit.android.AndroidMockValuePersistence;
 
-@Module(
-    complete = false,
-    library = true,
-    overrides = true
-)
+@Module(includes = ApiModule.class)
 public final class DebugApiModule {
 
   @Provides @Singleton

src/debug/java/com/jakewharton/u2020/ui/DebugUiModule.java

@@ -6,12 +6,7 @@
 import dagger.Provides;
 import javax.inject.Singleton;
 
-@Module(
-    injects = DebugAppContainer.class,
-    complete = false,
-    library = true,
-    overrides = true
-)
+@Module
 public class DebugUiModule {
   @Provides @Singleton AppContainer provideAppContainer(DebugAppContainer debugAppContainer) {
     return debugAppContainer;

src/debug/java/com/jakewharton/u2020/ui/debug/DebugAppContainer.java

@@ -127,7 +127,6 @@ public class DebugAppContainer implements AppContainer {
   }
 
   @InjectView(R.id.debug_drawer_layout) DrawerLayout drawerLayout;
-  @InjectView(R.id.debug_content) ViewGroup content;
 
   @InjectView(R.id.madge_container) MadgeFrameLayout madgeFrameLayout;
   @InjectView(R.id.debug_content) ScalpelFrameLayout scalpelFrameLayout;
@@ -188,7 +187,8 @@ public class DebugAppContainer implements AppContainer {
     // Set up the contextual actions to watch views coming in and out of the content area.
     Set<ContextualDebugActions.DebugAction<?>> debugActions = Collections.emptySet();
     ContextualDebugActions contextualActions = new ContextualDebugActions(this, debugActions);
-    content.setOnHierarchyChangeListener(HierarchyTreeChangeListener.wrap(contextualActions));
+    scalpelFrameLayout.setOnHierarchyChangeListener(
+        HierarchyTreeChangeListener.wrap(contextualActions));
 
     drawerLayout.setDrawerShadow(R.drawable.debug_drawer_shadow, Gravity.END);
     drawerLayout.setDrawerListener(new DrawerLayout.SimpleDrawerListener() {
@@ -214,7 +214,7 @@ public class DebugAppContainer implements AppContainer {
     setupDeviceSection();
     setupPicassoSection();
 
-    return content;
+    return scalpelFrameLayout;
   }
 
   private void setupNetworkSection() {
@@ -390,7 +390,7 @@ public void onItemSelected(AdapterView<?> adapterView, View view, int position,
       }
     });
     // Ensure the animation speed value is always applied across app restarts.
-    content.post(new Runnable() {
+    scalpelFrameLayout.post(new Runnable() {
       @Override public void run() {
         applyAnimationSpeed(animationSpeedValue);
       }
@@ -624,6 +624,6 @@ private void setEndpointAndRelaunch(String endpoint) {
     Intent newApp = new Intent(app, MainActivity.class);
     newApp.setFlags(FLAG_ACTIVITY_CLEAR_TASK | FLAG_ACTIVITY_NEW_TASK);
     app.startActivity(newApp);
-    U2020App.get(app).buildObjectGraphAndInject();
+    U2020App.get(app).buildComponentAndInject();
   }
 }

src/main/java/com/jakewharton/u2020/U2020App.java

@@ -3,15 +3,14 @@
 import android.app.Application;
 import android.content.Context;
 import com.jakewharton.u2020.ui.ActivityHierarchyServer;
-import dagger.ObjectGraph;
 import hugo.weaving.DebugLog;
 import javax.inject.Inject;
 import timber.log.Timber;
 
 import static timber.log.Timber.DebugTree;
 
 public class U2020App extends Application {
-  private ObjectGraph objectGraph;
+  private U2020Graph component;
 
   @Inject ActivityHierarchyServer activityHierarchyServer;
 
@@ -25,19 +24,19 @@ public class U2020App extends Application {
       // TODO Timber.plant(new CrashlyticsTree());
     }
 
-    buildObjectGraphAndInject();
+    buildComponentAndInject();
 
     registerActivityLifecycleCallbacks(activityHierarchyServer);
   }
 
-  @DebugLog
-  public void buildObjectGraphAndInject() {
-    objectGraph = ObjectGraph.create(Modules.list(this));
-    objectGraph.inject(this);
+  @DebugLog // Extracted for debugging.
+  public void buildComponentAndInject() {
+    component = U2020Component.Initializer.init(this);
+    component.inject(this);
   }
 
-  public void inject(Object o) {
-    objectGraph.inject(o);
+  public U2020Graph component() {
+    return component;
   }
 
   public static U2020App get(Context context) {

src/main/java/com/jakewharton/u2020/U2020AppModule.java

@@ -0,0 +1,19 @@
+package com.jakewharton.u2020;
+
+import android.app.Application;
+import dagger.Module;
+import dagger.Provides;
+import javax.inject.Singleton;
+
+@Module
+public final class U2020AppModule {
+  private final U2020App app;
+
+  public U2020AppModule(U2020App app) {
+    this.app = app;
+  }
+
+  @Provides @Singleton Application provideApplication() {
+    return app;
+  }
+}

src/main/java/com/jakewharton/u2020/U2020Graph.java

@@ -0,0 +1,15 @@
+package com.jakewharton.u2020;
+
+import com.jakewharton.u2020.ui.MainActivity;
+import com.jakewharton.u2020.ui.gallery.GalleryView;
+import dagger.Component;
+import javax.inject.Singleton;
+
+/**
+ * A common interface implemented by both the Release and Debug flavored components.
+ */
+public interface U2020Graph {
+  void inject(U2020App app);
+  void inject(MainActivity activity);
+  void inject(GalleryView view);
+}

src/main/java/com/jakewharton/u2020/data/DataModule.java

@@ -17,33 +17,14 @@
 
 import static android.content.Context.MODE_PRIVATE;
 
-@Module(
-    includes = ApiModule.class,
-    complete = false,
-    library = true
-)
+@Module(includes = ApiModule.class)
 public final class DataModule {
   static final int DISK_CACHE_SIZE = 50 * 1024 * 1024; // 50MB
 
   @Provides @Singleton SharedPreferences provideSharedPreferences(Application app) {
     return app.getSharedPreferences("u2020", MODE_PRIVATE);
   }
 
-  @Provides @Singleton OkHttpClient provideOkHttpClient(Application app) {
-    return createOkHttpClient(app);
-  }
-
-  @Provides @Singleton Picasso providePicasso(Application app, OkHttpClient client) {
-    return new Picasso.Builder(app)
-        .downloader(new OkHttpDownloader(client))
-        .listener(new Picasso.Listener() {
-          @Override public void onImageLoadFailed(Picasso picasso, Uri uri, Exception e) {
-            Timber.e(e, "Failed to load image: %s", uri);
-          }
-        })
-        .build();
-  }
-
   static OkHttpClient createOkHttpClient(Application app) {
     OkHttpClient client = new OkHttpClient();
 
@@ -58,4 +39,5 @@ static OkHttpClient createOkHttpClient(Application app) {
 
     return client;
   }
+
 }

src/main/java/com/jakewharton/u2020/data/api/ApiModule.java

@@ -10,22 +10,16 @@
 import retrofit.client.Client;
 import retrofit.client.OkClient;
 
-@Module(
-    complete = false,
-    library = true
-)
+@Module
 public final class ApiModule {
   public static final String PRODUCTION_API_URL = "https://api.imgur.com/3/";
+
   private static final String CLIENT_ID = "3436c108ccc17d3";
 
   @Provides @Singleton @ClientId String provideClientId() {
     return CLIENT_ID;
   }
 
-  @Provides @Singleton Endpoint provideEndpoint() {
-    return Endpoints.newFixedEndpoint(PRODUCTION_API_URL);
-  }
-
   @Provides @Singleton Client provideClient(OkHttpClient client) {
     return new OkClient(client);
   }
@@ -38,8 +32,4 @@ RestAdapter provideRestAdapter(Endpoint endpoint, Client client, ApiHeaders head
         .setRequestInterceptor(headers) //
         .build();
   }
-
-  @Provides @Singleton GalleryService provideGalleryService(RestAdapter restAdapter) {
-    return restAdapter.create(GalleryService.class);
-  }
 }

src/main/java/com/jakewharton/u2020/ui/MainActivity.java

@@ -16,7 +16,7 @@ public class MainActivity extends Activity {
     super.onCreate(savedInstanceState);
 
     U2020App app = U2020App.get(this);
-    app.inject(this);
+    app.component().inject(this);
 
     container = appContainer.get(this);
 

src/main/java/com/jakewharton/u2020/ui/gallery/GalleryView.java

@@ -30,7 +30,7 @@ public class GalleryView extends BetterViewAnimator {
 
   public GalleryView(Context context, AttributeSet attrs) {
     super(context, attrs);
-    U2020App.get(context).inject(this);
+    U2020App.get(context).component().inject(this);
 
     adapter = new GalleryAdapter(context, picasso);
   }