Update to latest flow (0.10) and mortar (0.17)

Author: Aleksey Malevaniy

.idea/codeStyleSettings.xml

@@ -3,8 +3,8 @@
 import android.content.Context;
 import android.util.AttributeSet;
 
-import flow.Path;
-import flow.PathContextFactory;
+import flow.path.Path;
+import flow.path.PathContextFactory;
 import io.techery.presenta.addition.flow.container.SimplePathContainer;
 import io.techery.presenta.addition.flow.path.MasterDetailPath;
 

library-additions/src/main/java/io/techery/presenta/addition/DetailContainerView.java

@@ -23,9 +23,9 @@
 import android.widget.FrameLayout;
 
 import flow.Flow;
-import flow.Path;
-import flow.PathContainer;
-import flow.PathContainerView;
+import flow.path.Path;
+import flow.path.PathContainer;
+import flow.path.PathContainerView;
 import io.techery.presenta.addition.flow.container.SimplePathContainer;
 import io.techery.presenta.addition.flow.util.BackSupport;
 
@@ -40,7 +40,7 @@ public FramePathContainerView(Context context, AttributeSet attrs) {
   }
 
   /**
-   * Allows subclasses to use custom {@link flow.PathContainer} implementations. Allows the use
+   * Allows subclasses to use custom {@link PathContainer} implementations. Allows the use
    * of more sophisticated transition schemes, and customized context wrappers.
    */
   protected FramePathContainerView(Context context, AttributeSet attrs, PathContainer container) {

library-additions/src/main/java/io/techery/presenta/addition/FramePathContainerView.java

@@ -8,21 +8,21 @@
 import io.techery.presenta.addition.flow.path.MasterDetailPath;
 
 import flow.Flow;
-import flow.Path;
-import flow.PathContextFactory;
+import flow.path.Path;
+import flow.path.PathContextFactory;
 
 public class MasterPathContainerView extends FramePathContainerView {
 
   public MasterPathContainerView(Context context, AttributeSet attrs) {
     super(context, attrs, new MasterPathContainer(R.id.mortar_screen_switcher_tag, Path.contextFactory()));
   }
 
-  @Override public void dispatch(Flow.Traversal traversal, final Flow.TraversalCallback callback) {
+  @Override
+  public void dispatch(Flow.Traversal traversal, final Flow.TraversalCallback callback) {
 
-    MasterDetailPath currentMaster =
-        ((MasterDetailPath) Flow.get(getContext()).getBackstack().current()).getMaster();
+    MasterDetailPath currentMaster = ((MasterDetailPath) traversal.origin.top()).getMaster();
 
-    MasterDetailPath newMaster = ((MasterDetailPath) traversal.destination.current()).getMaster();
+    MasterDetailPath newMaster = ((MasterDetailPath) traversal.destination.top()).getMaster();
 
     // Short circuit if the new screen has the same master.
     if (getCurrentChild() != null && newMaster.equals(currentMaster)) {

library-additions/src/main/java/io/techery/presenta/addition/MasterPathContainerView.java

@@ -18,7 +18,7 @@
 import android.content.Context;
 import android.util.AttributeSet;
 
-import flow.Path;
+import flow.path.Path;
 import io.techery.presenta.addition.flow.container.SimplePathContainer;
 import io.techery.presenta.mortarflow.MortarContextFactory;
 

library-additions/src/main/java/io/techery/presenta/addition/MortarFramePathContainerView.java

@@ -12,8 +12,8 @@
 import io.techery.presenta.addition.flow.util.BackSupport;
 
 import flow.Flow;
-import flow.Path;
-import flow.PathContainerView;
+import flow.path.Path;
+import flow.path.PathContainerView;
 
 import static io.techery.presenta.addition.flow.util.BackSupport.HandlesBack;
 
@@ -53,7 +53,7 @@ public TabletMasterDetailRoot(Context context, AttributeSet attrs) {
     return this;
   }
 
-  @Override public void dispatch(Flow.Traversal traversal, Flow.TraversalCallback callback) {
+  @Override public void dispatch(final Flow.Traversal traversal, Flow.TraversalCallback callback) {
 
     class CountdownCallback implements Flow.TraversalCallback {
       final Flow.TraversalCallback wrapped;
@@ -68,7 +68,8 @@ class CountdownCallback implements Flow.TraversalCallback {
         if (countDown == 0) {
           disabled = false;
           wrapped.onTraversalCompleted();
-          ((IsMasterView) masterContainer.getCurrentChild()).updateSelection();
+          ((IsMasterView) masterContainer.getCurrentChild()).updateSelection(
+              traversal.destination.<MasterDetailPath>top());
         }
       }
     }

library-additions/src/main/java/io/techery/presenta/addition/TabletMasterDetailRoot.java

@@ -23,22 +23,24 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-
-import io.techery.presenta.flow.Utils;
-
 import flow.Flow;
-import flow.Path;
-import flow.PathContainer;
-import flow.PathContext;
-import flow.PathContextFactory;
+import flow.path.Path;
+import flow.path.PathContainer;
+import flow.path.PathContext;
+import flow.path.PathContextFactory;
+import io.techery.presenta.addition.flow.path.Layout;
+import io.techery.presenta.flow.Utils;
+import java.util.LinkedHashMap;
+import java.util.Map;
 
 import static flow.Flow.Direction.REPLACE;
 
 /**
  * Provides basic right-to-left transitions. Saves and restores view state.
- * Uses {@link flow.PathContext} to allow customized sub-containers.
+ * Uses {@link PathContext} to allow customized sub-containers.
  */
 public class SimplePathContainer extends PathContainer {
+  private static final Map<Class, Integer> PATH_LAYOUT_CACHE = new LinkedHashMap<>();
   private final PathContextFactory contextFactory;
 
   public SimplePathContainer(int tagKey, PathContextFactory contextFactory) {
@@ -60,12 +62,11 @@ public SimplePathContainer(int tagKey, PathContextFactory contextFactory) {
 
     Path to = traversalState.toPath();
 
-    ViewGroup newView;
+    View newView;
     context = PathContext.create(oldPath, to, contextFactory);
     int layout = getLayout(to);
-    newView = (ViewGroup) LayoutInflater.from(context)
-        .cloneInContext(context)
-        .inflate(layout, containerView, false);
+    newView =
+        LayoutInflater.from(context).cloneInContext(context).inflate(layout, containerView, false);
 
     View fromView = null;
     if (traversalState.fromPath() != null) {
@@ -83,11 +84,9 @@ public SimplePathContainer(int tagKey, PathContextFactory contextFactory) {
       containerView.addView(newView);
       final View finalFromView = fromView;
       Utils.waitForMeasure(newView, new Utils.OnMeasuredCallback() {
-        @Override
-        public void onMeasured(View view, int width, int height) {
+        @Override public void onMeasured(View view, int width, int height) {
           runAnimation(containerView, finalFromView, view, direction, new Flow.TraversalCallback() {
-            @Override
-            public void onTraversalCompleted() {
+            @Override public void onTraversalCompleted() {
               containerView.removeView(finalFromView);
               oldPath.destroyNotIn(context, contextFactory);
               callback.onTraversalCompleted();
@@ -98,6 +97,22 @@ public void onTraversalCompleted() {
     }
   }
 
+  protected int getLayout(Path path) {
+    Class pathType = path.getClass();
+    Integer layoutResId = PATH_LAYOUT_CACHE.get(pathType);
+    if (layoutResId == null) {
+      Layout layout = (Layout) pathType.getAnnotation(Layout.class);
+      if (layout == null) {
+        throw new IllegalArgumentException(
+            String.format("@%s annotation not found on class %s", Layout.class.getSimpleName(),
+                pathType.getName()));
+      }
+      layoutResId = layout.value();
+      PATH_LAYOUT_CACHE.put(pathType, layoutResId);
+    }
+    return layoutResId;
+  }
+
   private void runAnimation(final ViewGroup container, final View from, final View to,
       Flow.Direction direction, final Flow.TraversalCallback callback) {
     Animator animator = createSegue(from, to, direction);

library-additions/src/main/java/io/techery/presenta/addition/flow/container/SimplePathContainer.java

@@ -1,6 +1,6 @@
 package io.techery.presenta.addition.flow.path;
 
-import flow.Path;
+import flow.path.Path;
 
 // @Layout(R.layout.no_details)
 public abstract class EmptyPath extends Path {

library-additions/src/main/java/io/techery/presenta/addition/flow/path/EmptyPath.java

@@ -1,5 +1,5 @@
 package io.techery.presenta.addition.flow.path;
 
 public interface IsMasterView {
-  void updateSelection();
+  void updateSelection(MasterDetailPath newPath);
 }

library-additions/src/main/java/io/techery/presenta/addition/flow/path/IsMasterView.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright 2013 Square Inc.
+ *
+ * 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 io.techery.presenta.addition.flow.path;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+/**
+ * Marks a class that designates a screen and specifies its layout. A screen is a distinct part of
+ * an application containing all information that describes this state.
+ *
+ * <p>For example, <pre><code>
+ * {@literal@}Layout(R.layout.conversation_screen_layout)
+ * public class ConversationScreen { ... }
+ * </code></pre>
+ */
+@Retention(RUNTIME) @Target(TYPE)
+public @interface Layout {
+  int value();
+}

library-additions/src/main/java/io/techery/presenta/addition/flow/path/Layout.java

@@ -1,6 +1,6 @@
 package io.techery.presenta.addition.flow.path;
 
-import flow.Path;
+import flow.path.Path;
 
 /**
  * Identifies screens in a master / detail relationship. Both master and detail screens

library-additions/src/main/java/io/techery/presenta/addition/flow/path/MasterDetailPath.java

@@ -18,26 +18,22 @@
 
 import android.os.Parcel;
 import android.os.Parcelable;
-
 import com.google.gson.Gson;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-
+import flow.StateParceler;
 import java.io.IOException;
 import java.io.StringReader;
 import java.io.StringWriter;
 
-import flow.Parceler;
-import flow.Path;
-
-public class GsonParceler implements Parceler {
+public class GsonParceler implements StateParceler {
   private final Gson gson;
 
   public GsonParceler(Gson gson) {
     this.gson = gson;
   }
 
-  @Override public Parcelable wrap(Path instance) {
+  @Override public Parcelable wrap(Object instance) {
     try {
       String json = encode(instance);
       return new Wrapper(json);
@@ -46,7 +42,7 @@ public GsonParceler(Gson gson) {
     }
   }
 
-  @Override public Path unwrap(Parcelable parcelable) {
+  @Override public Object unwrap(Parcelable parcelable) {
     Wrapper wrapper = (Wrapper) parcelable;
     try {
       return decode(wrapper.json);
@@ -55,7 +51,7 @@ public GsonParceler(Gson gson) {
     }
   }
 
-  private String encode(Path instance) throws IOException {
+  private String encode(Object instance) throws IOException {
     StringWriter stringWriter = new StringWriter();
     JsonWriter writer = new JsonWriter(stringWriter);
 
@@ -73,7 +69,7 @@ private String encode(Path instance) throws IOException {
     }
   }
 
-  private Path decode(String json) throws IOException {
+  private Object decode(String json) throws IOException {
     JsonReader reader = new JsonReader(new StringReader(json));
 
     try {
@@ -103,7 +99,7 @@ private static class Wrapper implements Parcelable {
       out.writeString(json);
     }
 
-    public static final Creator<Wrapper> CREATOR = new Creator<Wrapper>() {
+    public static final Parcelable.Creator<Wrapper> CREATOR = new Parcelable.Creator<Wrapper>() {
       @Override public Wrapper createFromParcel(Parcel in) {
         String json = in.readString();
         return new Wrapper(json);
@@ -114,4 +110,4 @@ private static class Wrapper implements Parcelable {
       }
     };
   }
-}
+}

library-additions/src/main/java/io/techery/presenta/addition/flow/util/GsonParceler.java

@@ -18,8 +18,9 @@ repositories {
 }
 
 dependencies {
-    compile 'com.github.almozavr:flow:8d5d023a34c334ce03d95104434cfc7e0b255823'
-    compile 'com.squareup.mortar:mortar:0.17-SNAPSHOT'
+    compile 'com.squareup.flow:flow:0.10'
+    compile 'com.squareup.flow:flow-path:0.10'
+    compile 'com.squareup.mortar:mortar:0.17'
     provided 'com.google.dagger:dagger:2.0'
     provided 'com.google.dagger:dagger-compiler:2.0'
     provided 'org.glassfish:javax.annotation:10.0-b28'

library/build.gradle

@@ -12,6 +12,7 @@ public class DaggerService {
    */
   @SuppressWarnings("unchecked") //
   public static <T> T getDaggerComponent(Context context) {
+    //noinspection ResourceType
     return (T) context.getSystemService(SERVICE_NAME);
   }
 
@@ -31,7 +32,7 @@ public static <T> T createComponent(Class<T> componentClass, Object... dependenc
       Class<?> generatedClass = Class.forName(generatedName);
       Object builder = generatedClass.getMethod("builder").invoke(null);
 
-      for (Method method : builder.getClass().getMethods()) {
+      for (Method method : builder.getClass().getDeclaredMethods()) {
         Class<?>[] params = method.getParameterTypes();
         if (params.length == 1) {
           Class<?> dependencyClass = params[0];

library/src/main/java/io/techery/presenta/mortar/DaggerService.java

@@ -4,10 +4,9 @@
 import android.content.ContextWrapper;
 import android.view.LayoutInflater;
 
+import flow.path.Path;
+import flow.path.PathContextFactory;
 import io.techery.presenta.mortarscreen.ScreenScoper;
-
-import flow.Path;
-import flow.PathContextFactory;
 import mortar.MortarScope;
 
 /**

library/src/main/java/io/techery/presenta/mortarflow/MortarContextFactory.java

@@ -3,7 +3,7 @@
 import android.content.Context;
 import android.util.Log;
 
-import flow.Path;
+import flow.path.Path;
 import io.techery.presenta.mortar.DaggerService;
 import io.techery.presenta.mortar.PresenterService;
 import io.techery.presenta.mortarscreen.component.ComponentServiceFactoryProvider;

library/src/main/java/io/techery/presenta/mortarscreen/ScreenScoper.java

@@ -2,7 +2,7 @@
 
 import android.content.Context;
 
-import flow.Path;
+import flow.path.Path;
 
 /**
  * Provides some Service to be used for mortar scope depending on T object.