Update to 0.4.5 => add result into fragmentbase

joxad · May 6, 2016 · 434e26f · 434e26f
1 parent 0991456
commit 434e26f
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 This project goal is to create activity fragment and views, with less code to be more efficient on the view models
 
 
-# Version : 0.4.2K
+# Version : 0.4.5
 # Goal
 
 I used DataBinding for a few weeks since Google allows us to use it.

diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.0.0'
+        classpath 'com.android.tools.build:gradle:2.1.0'
 
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'

diff --git a/gradle.properties b/gradle.properties
@@ -17,7 +17,7 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-VERSION_NAME=0.4.2
+VERSION_NAME=0.4.5
 
 POM_GROUP=com.joxad.easydatabinding
 POM_NAME=easydatabinding

diff --git a/lib/src/main/java/com/joxad/easydatabinding/activity/ActivityBase.java b/lib/src/main/java/com/joxad/easydatabinding/activity/ActivityBase.java
@@ -31,10 +31,14 @@ public abstract class ActivityBase<B extends ViewDataBinding, VM extends Activit
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         binding = DataBindingUtil.setContentView(this, layoutResources());
-        vm = baseActivityVM(binding);
+        vm = baseActivityVM(binding,savedInstanceState);
         binding.setVariable(data(), vm);
     }
 
+    @Override
+    public void onBackPressed() {
+        if (vm.onBackPressed() ) super.onBackPressed();
+    }
 
     @Override
     protected void onResume() {
@@ -64,9 +68,10 @@ protected void onPause() {
 
     /***
      * @param binding
+     * @param savedInstanceState
      * @return the {@link VM} you want to use in this activity
      */
-    public abstract VM baseActivityVM(B binding);
+    public abstract VM baseActivityVM(B binding, Bundle savedInstanceState);
 
 
     /***

diff --git a/lib/src/main/java/com/joxad/easydatabinding/activity/ActivityBaseVM.java b/lib/src/main/java/com/joxad/easydatabinding/activity/ActivityBaseVM.java
@@ -43,4 +43,13 @@ protected void onResume() {
     protected void onPause() {
 
     }
+
+    /***
+     * Manage the backpressed
+     *
+     * @return true if u want to call super
+     */
+    protected boolean onBackPressed() {
+        return true;
+    }
 }
diff --git a/lib/src/main/java/com/joxad/easydatabinding/fragment/FragmentBase.java b/lib/src/main/java/com/joxad/easydatabinding/fragment/FragmentBase.java
@@ -1,5 +1,6 @@
 package com.joxad.easydatabinding.fragment;
 
+import android.content.Intent;
 import android.databinding.DataBindingUtil;
 import android.databinding.ViewDataBinding;
 import android.os.Bundle;
@@ -12,6 +13,7 @@
 import android.view.ViewGroup;
 
 import com.joxad.easydatabinding.activity.IPermission;
+import com.joxad.easydatabinding.activity.IResult;
 
 import lombok.Getter;
 
@@ -68,6 +70,19 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis
             ((IPermission) vm).onRequestPermissionsResult(requestCode, permissions, grantResults);
     }
 
+    /***
+     * Handle the activity result if you need to use it inside the vm of the fragment
+     *
+     * @param requestCode
+     * @param resultCode
+     * @param data
+     */
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (vm instanceof IResult)
+            ((IResult) vm).onActivityResult(requestCode, resultCode, data);
+    }
 
     /**
      * The int value found in the {@link com.joxad.easydatabinding.BR} class generated by DataBinding

diff --git a/sample/src/main/java/joxad/easydatabinding/sample/ActivityMain.java b/sample/src/main/java/joxad/easydatabinding/sample/ActivityMain.java
@@ -1,5 +1,7 @@
 package joxad.easydatabinding.sample;
 
+import android.os.Bundle;
+
 import com.joxad.easydatabinding.activity.ActivityBase;
 
 import joxad.easydatabinding.sample.databinding.ActivityMainBinding;
@@ -22,7 +24,7 @@ public int layoutResources() {
     }
 
     @Override
-    public ActivityMainVM baseActivityVM(ActivityMainBinding binding) {
+    public ActivityMainVM baseActivityVM(ActivityMainBinding binding, Bundle savedInstanceState) {
         return new ActivityMainVM(this, binding);
     }
 }