Merge pull request #26 from FrantisekGazo/develop

mvp fix

CHANGELOG.md

@@ -1,6 +1,11 @@
 Change Log
 ==========
 
+Version 2.6.1 *(2017-01-28)*
+----------------------------
+
+ * Fix: `mvp` generated Activity classes
+
 Version 2.6.0 *(2017-01-01)*
 ----------------------------
 

core-compiler/src/test/java/eu/f3rog/blade/compiler/mvp/PresenterTest.java

@@ -207,7 +207,7 @@ public void activityWithoutPresenter() {
     }
 
     @Test
-    public void activityWithoutPresenterWithBlade() {
+    public void activityWithoutPresenterWithBladeImplementingIView() {
         JavaFileObject viewInterface = file("com.example", "IMyView")
                 .imports(
                         IView.class, "V"
@@ -246,6 +246,36 @@ public void activityWithoutPresenterWithBlade() {
                 .generatesSources(expected);
     }
 
+    @Test
+    public void activityWithoutPresenterWithBlade() {
+        JavaFileObject activity = file("com.example", "MyActivity")
+                .imports(
+                        Activity.class,
+                        Blade.class, "B"
+                )
+                .body(
+                        "@$B",
+                        "public class $T extends Activity {",
+                        "}"
+                );
+
+
+        JavaFileObject expected = generatedFile("com.example", "MyActivity_Helper")
+                .imports(
+                        WeavedMvpActivity.class, "M"
+                )
+                .body(
+                        "abstract class $T implements $M {",
+                        "}"
+                );
+
+        assertFiles(activity)
+                .with(BladeProcessor.Module.MVP)
+                .compilesWithoutError()
+                .and()
+                .generatesSources(expected);
+    }
+
     @Test
     public void activityWith1Presenter() {
         JavaFileObject viewInterface = file("com.example", "IMyView")

gradle.properties

@@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx1536M
 
 LIB_GROUP_ID = eu.f3rog.blade
 ARTIFACT_ID = none
-LIB_VERSION = 2.6.0
+LIB_VERSION = 2.6.1
 
 LIB_VERSION_DESC = Android Library for Boilerplate Destruction
 

module/mvp-compiler/src/main/java/eu/f3rog/blade/compiler/mvp/PresenterHelperModule.java

@@ -54,6 +54,8 @@ public void checkClass(TypeElement e) throws ProcessorError {
             } else if (isSubClassOf(e, View.class)) {
                 viewType = ViewType.VIEW;
             }
+        } else if (isActivitySubClass(e)) {
+            viewType = ViewType.ACTIVITY;
         }
 
         mViewType = viewType;

plugin/src/main/groovy/eu/f3rog/blade/plugin/BladePlugin.groovy

@@ -32,7 +32,7 @@ public final class BladePlugin
     public static String ERROR_CONFIG_FILE_IS_MISSING = "Blade configuration file is missing! (more info here: https://github.com/FrantisekGazo/Blade/wiki#1-create-configuration-file)"
 
     public static String LIB_GROUP_ID = "eu.f3rog.blade"
-    public static String LIB_VERSION = "2.6.0"
+    public static String LIB_VERSION = "2.6.1"
     public static String LIB_CONFIG_FILE_NAME = "blade"
     public static String[] LIB_MODULES = ["arg", "extra", "mvp", "parcel", "state"]
 

sample/build.gradle

@@ -9,7 +9,7 @@ buildscript {
         }
 
         classpath 'com.android.tools.build:gradle:2.2.2'
-        classpath 'eu.f3rog.blade:plugin:2.6.0-beta1'
+        classpath 'eu.f3rog.blade:plugin:2.6.0'
     }
 }
 

sample/src/main/java/eu/f3rog/blade/sample/state/StringCustomBundler.java

@@ -5,7 +5,7 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
-import eu.f3rog.blade.core.Bundler;
+import blade.Bundler;
 
 public final class StringCustomBundler implements Bundler<String> {