Merge branch 'release/0.4.3'

Author: Jorge Costa

activity-fragment-manager/build.gradle

@@ -78,7 +78,7 @@ publish {
     userOrg = "jmspt"
     groupId = "com.massivedisaster"
     artifactId = 'activity-fragment-manager'
-    publishVersion = "0.4.2"
+    publishVersion = "0.4.3"
     desc = 'Activity Fragment Manager'
     website = websiteBase
     licences = licensesBase

activity-fragment-manager/src/main/java/com/massivedisaster/activitymanager/ActivityFragmentManager.java

@@ -26,6 +26,7 @@
 package com.massivedisaster.activitymanager;
 
 import android.app.Activity;
+import android.content.Context;
 import android.support.v4.app.Fragment;
 
 import com.massivedisaster.activitymanager.activity.AbstractFragmentActivity;
@@ -93,4 +94,19 @@ public static ActivityTransaction open(Fragment fragment, Class<? extends Abstra
                                            Class<? extends Fragment> fragmentClass) {
         return new ActivityTransaction(fragment, activityClass, fragmentClass);
     }
+
+    /**
+     * Starts a new {@link ActivityTransaction},
+     * when you {@link ActivityTransaction#commit} w'll open a new activity with the specific fragment.
+     * Use this method if you only have the context, ex: Service, Broadcast, etc
+     *
+     * @param context       The Context.
+     * @param activityClass The AbstractFragmentActivity class.
+     * @param fragmentClass The Fragment to be injected in the activityClass.
+     * @return The {@link ActivityTransaction}.
+     */
+    public static ActivityTransaction open(Context context, Class<? extends AbstractFragmentActivity> activityClass,
+                                           Class<? extends Fragment> fragmentClass) {
+        return new ActivityTransaction(context, activityClass, fragmentClass);
+    }
 }

activity-fragment-manager/src/main/java/com/massivedisaster/activitymanager/ActivityTransaction.java

@@ -26,6 +26,7 @@
 package com.massivedisaster.activitymanager;
 
 import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.app.ActivityCompat;
@@ -55,6 +56,7 @@ public class ActivityTransaction implements ITransaction<ActivityTransaction> {
     private List<Pair<View, String>> mSharedElements;
     private Activity mActivityBase;
     private Fragment mFragment;
+    private Context mContext;
     private Integer mRequestCode;
 
     /**
@@ -89,6 +91,22 @@ public class ActivityTransaction implements ITransaction<ActivityTransaction> {
         mIntent.putExtra(ACTIVITY_MANAGER_FRAGMENT, fragmentClass.getCanonicalName());
     }
 
+    /**
+     * ActivityTransaction constructor, created to be used by a fragment.
+     *
+     * @param context                   The context to be used to start the new activity.
+     * @param abstractBaseActivityClass The AbstractFragmentActivity class.
+     * @param fragmentClass             The Fragment to be injected in the activityClass.
+     */
+    ActivityTransaction(Context context, Class<? extends AbstractFragmentActivity> abstractBaseActivityClass,
+                        Class<? extends Fragment> fragmentClass) {
+        mContext = context;
+        mAbstractBaseActivity = abstractBaseActivityClass;
+
+        mIntent = new Intent(mContext, mAbstractBaseActivity);
+        mIntent.putExtra(ACTIVITY_MANAGER_FRAGMENT, fragmentClass.getCanonicalName());
+    }
+
 
     @Override
     public ActivityTransaction setTag(String tag) {
@@ -159,14 +177,18 @@ public void commit() {
         if (mRequestCode == null) {
             if (mActivityBase != null) {
                 ContextCompat.startActivity(mActivityBase, intent, bundleOptions);
-            } else {
+            } else if (mFragment != null) {
                 mFragment.startActivity(intent, bundleOptions);
+            } else {
+                mContext.startActivity(intent);
             }
         } else {
             if (mActivityBase != null) {
                 ActivityCompat.startActivityForResult(mActivityBase, intent, mRequestCode, bundleOptions);
-            } else {
+            } else if (mFragment != null) {
                 mFragment.startActivityForResult(intent, mRequestCode, bundleOptions);
+            } else {
+                mContext.startActivity(intent);
             }
         }
     }

deploy/configuration.json

@@ -1,7 +1,7 @@
 {
   "basePath": "../",
   "readmePath": "../README.md",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "modules": [
     "activity-fragment-manager"
   ]