Merge branch 'release/0.4.4'

Author: Jorge Costa

.travis.yml

@@ -1,41 +1,58 @@
-language: android
-cache: false
+# Tutorial here: https://medium.com/@harmittaa/travis-ci-android-example-357f6e632fc4
 
+language: android
 sudo: false
+jdk: oraclejdk8
+
+branches:
+ only:
+ - master
+ - develop
+ - config_travis
+
+before_cache:
+ - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
+ - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
+
+cache:
+ directories:
+ - $HOME/.gradle/caches/
+ - $HOME/.gradle/wrapper/
+
+env:
+ global:
+ - ANDROID_API=26
+ - EMULATOR_API=22
+ - ANDROID_BUILD_TOOLS=26.0.1
+ - ADB_INSTALL_TIMEOUT=5 # minutes
+ - ANDROID_ABI=armeabi-v7a
+ - ANDROID_TAG=google_apis
+
 android:
-  components:
-    - tools
-    - build-tools-25.0.3
-    - platform-tools
-    - extra-android-m2repository
-    - extra-google-m2repository
-    - extra-google-android-support
-    - android-25
-    - sys-img-armeabi-v7a-android-25
+ components:
+ - tools
+ - platform-tools
+ - build-tools-$ANDROID_BUILD_TOOLS
+ - android-$ANDROID_API
+ - android-$EMULATOR_API
+ - extra-google-m2repository
+ - extra-android-m2repository # for design library
+ - extra-google-google_play_services
+ - sys-img-armeabi-v7a-google_apis-$ANDROID_API
+ - sys-img-armeabi-v7a-google_apis-$EMULATOR_API
 
-jdk: oraclejdk8
-os:
-  - linux
+ licenses:
+ - android-sdk-preview-license-.+
+ - android-sdk-license-.+
+ - google-gdk-license-.+
 
-licenses:
-    - 'android-sdk-preview-license-.+'
-    - 'android-sdk-license-.+'
-    - 'google-gdk-license-.+'
+before_install:
+- mkdir "$ANDROID_HOME/licenses" || true
+- echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"
+- echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license"
+- chmod +x gradlew
+- ./gradlew dependencies || true # DON'T ADD unless you are getting "Install missing components using SDK manager"
+#Source: https://medium.com/@oldergod/constraint-layout-and-circleci-travis-d50342696d2
 
-branches:
-  only:
-  - master
-  - develop
-  - config_travis
-
-install:
-  # Ensure Gradle wrapper is executable, download wrapper and show version
-  - chmod +x ./gradlew;
-
-before_script:
-  - echo no | android create avd --force -n test -t android-21 --abi armeabi-v7a
-  - emulator -avd test -no-skin -no-audio -no-window &
-  - android-wait-for-emulator
-  - adb shell input keyevent 82 &
-
-script: ./gradlew build connectedCheck
+script:
+- "./gradlew clean build connectedCheck -PdisablePreDex --stacktrace"

README.md

@@ -1,10 +1,9 @@
 # Activity Fragment Manager 
 [![Download](https://api.bintray.com/packages/jmspt/maven/activity-fragment-manager/images/download.svg)](https://bintray.com/jmspt/maven/activity-fragment-manager/)
 [![Build Status](https://travis-ci.org/massivedisaster/ActivityFragmentManager.svg?branch=master)](https://travis-ci.org/massivedisaster/ActivityFragmentManager)
-[![API](https://img.shields.io/badge/API-10%2B-brightgreen.svg?style=flat)](https://android-arsenal.com/api?level=10)
-[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
-[![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-Activity%20Fragment%20Manager-red.svg?style=flat)](https://android-arsenal.com/details/1/5916)  
-A library to help android developer working easly with activities and fragments 
+[![API](https://img.shields.io/badge/API-16%2B-brightgreen.svg?style=flat)](https://android-arsenal.com/api?level=16)[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
+[![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-Activity%20Fragment%20Manager-red.svg?style=flat)](https://android-arsenal.com/details/1/5916)
+A library to help android developer working easly with activities and fragments
 
 ## Motivation
 
@@ -30,7 +29,7 @@ To use the Activity Fragment Manager, add the compile dependency with the latest
 Add the Activity Fragment Manager to your `build.gradle`:
 ```gradle
 dependencies {
-    compile 'com.massivedisaster:activity-fragment-manager:0.4.2'
+    compile 'com.massivedisaster:activity-fragment-manager:0.4.3'
 }
 ```
 
@@ -41,7 +40,7 @@ In the `pom.xml` file:
 <dependency>
     <groupId>com.massivedisaster</groupId>
     <artifactId>activity-fragment-manager</artifactId>
-    <version>0.4.2</version>
+    <version>0.4.3</version>
 </dependency>
 ```
 
@@ -109,7 +108,7 @@ An example, if your ```AbstractFragmentActivity``` is started by an external int
 public class ActivityPrimaryTheme extends AbstractFragmentActivity {
 
     ...
-    
+
     @Override
     protected Class<? extends Fragment> getDefaultFragment() {
         return FragmentSplash.class;
@@ -158,7 +157,7 @@ If you want to add a custom animation for all transactions inside of a ```Abstra
 public class ActivityPrimaryTheme extends AbstractFragmentActivity {
 
     ...
-    
+
     @Override
     public int getAnimationEnter() {
         return R.anim.enter_from_right;
@@ -183,8 +182,8 @@ public class ActivityPrimaryTheme extends AbstractFragmentActivity {
 ```
 
 ### 5. Shared Elements
-If you want to make your app beautiful you need to put some cool animation on it!  
-Shared elements are introduce in API 21 and makes the transactions so great and sweet.  
+If you want to make your app beautiful you need to put some cool animation on it!
+Shared elements are introduce in API 21 and makes the transactions so great and sweet.
 So, now it's very easy to share elements between fragments or activities.
 Let's take a look:
 
@@ -208,7 +207,7 @@ or
   android:transitionName="sharedElement" />
 ```
 
-**Attention:** Shared elements doesn't work when you use ```add()```!  
+**Attention:** Shared elements doesn't work when you use ```add()```!
 Well if you remove the first fragment it's possible, i.e. a replace :)
 
 ### 6. Custom Intents
@@ -219,7 +218,7 @@ Intent intent = ActivityFragmentManager.open(getContext(), ActivityPrimaryTheme.
 intent.setFlag(Intent.FLAG_ACTIVITY_NEW_TASK
                 | intent.FLAG_ACTIVITY_CLEAR_TASK);
 getActivity().startActivity(intent);
-``` 
+```
 
 ### 7. Fragment#OnBackPressed
 Allows to have back pressed events in `Fragments`.
@@ -241,6 +240,7 @@ public class FragmentA extends Fragment implements OnBackPressedListener {
 
 * You can pass a tag to be applied in the ```Fragment```.
 * You can pass ```REQUEST_CODE``` to the ```startActivityForResult```.
+* You can ```addToBackStack```.
 * You can pass data between fragments using a ```Bundle```.
 * You can get acess to the original ```FragmentTransaction```.
 * You can use ```DataBinding``` in your ```AbstractFragmentActivity```, all you need is override ```initializeDataBinding()``` and bind the view!

activity-fragment-manager/build.gradle

@@ -55,7 +55,7 @@ android {
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support:appcompat-v7:26.0.1'
+    compile 'com.android.support:appcompat-v7:26.1.0'
 
     lintRules project(':lint')
 }
@@ -78,7 +78,7 @@ publish {
     userOrg = "jmspt"
     groupId = "com.massivedisaster"
     artifactId = 'activity-fragment-manager'
-    publishVersion = "0.4.3"
+    publishVersion = "0.4.4"
     desc = 'Activity Fragment Manager'
     website = websiteBase
     licences = licensesBase

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

@@ -47,6 +47,16 @@ class AddFragmentTransaction extends FragmentTransaction {
 
     @Override
     public void commit() {
+        // Apply the default activity animation if the FragmentTransaction is null.
+        if (mTransactionAnimation == null) {
+            mTransactionAnimation = mActivity;
+        }
+
+        // Set the custom transaction animation.
+        mFrgTransaction.setCustomAnimations(mTransactionAnimation.getAnimationEnter(), mTransactionAnimation.getAnimationExit(),
+                mTransactionAnimation.getAnimationPopEnter(),
+                mTransactionAnimation.getAnimationPopExit());
+
         // Add the new fragment to the stack.
         mFrgTransaction.add(mActivity.getContainerViewId(), mFragment, mTag);
         // Hide the first fragment in the container.

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

@@ -45,6 +45,7 @@ public abstract class FragmentTransaction implements ITransaction<FragmentTransa
     protected Fragment mFragment;
     protected android.support.v4.app.FragmentTransaction mFrgTransaction;
     protected String mTag;
+    protected TransactionAnimation mTransactionAnimation;
 
     /**
      * FragmentTransaction constructor, created to be used by an activity.
@@ -129,15 +130,7 @@ public Fragment getFragment() {
      * @return Return the Transaction instance.
      */
     public FragmentTransaction setTransactionAnimation(TransactionAnimation transactionAnimation) {
-        // Apply the default activity animation if the FragmentTransaction is null.
-        if (transactionAnimation == null) {
-            transactionAnimation = mActivity;
-        }
-
-        // Set the custom transaction animation.
-        mFrgTransaction.setCustomAnimations(transactionAnimation.getAnimationEnter(), transactionAnimation.getAnimationExit(),
-                transactionAnimation.getAnimationPopEnter(),
-                transactionAnimation.getAnimationPopExit());
+        mTransactionAnimation = transactionAnimation;
 
         return this;
     }

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

@@ -47,6 +47,16 @@ class ReplaceFragmentTransaction extends FragmentTransaction {
 
     @Override
     public void commit() {
+        // Apply the default activity animation if the FragmentTransaction is null.
+        if (mTransactionAnimation == null) {
+            mTransactionAnimation = mActivity;
+        }
+
+        // Set the custom transaction animation.
+        mFrgTransaction.setCustomAnimations(mTransactionAnimation.getAnimationEnter(), mTransactionAnimation.getAnimationExit(),
+                mTransactionAnimation.getAnimationPopEnter(),
+                mTransactionAnimation.getAnimationPopExit());
+
         // Hide the first fragment in the container.
         if (mActivity.getSupportFragmentManager().findFragmentById(mActivity.getContainerViewId()) != null) {
             mFrgTransaction.hide(mActivity.getSupportFragmentManager().findFragmentById(mActivity.getContainerViewId()));

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

@@ -88,10 +88,12 @@ public void onCreate(Bundle savedInstanceState) {
         setContentView(rootView);
         initializeDataBinding(rootView);
 
-        if (getSupportFragmentManager().getBackStackEntryCount() == 0 && getIntent().hasExtra(ACTIVITY_MANAGER_FRAGMENT)) {
-            performInitialTransaction(getFragment(getIntent().getStringExtra(ACTIVITY_MANAGER_FRAGMENT)), getFragmentTag());
-        } else if (getDefaultFragment() != null) {
-            performInitialTransaction(getFragment(getDefaultFragment().getCanonicalName()), null);
+        if (getSupportFragmentManager().getFragments().isEmpty() && getSupportFragmentManager().getBackStackEntryCount() == 0) {
+            if (getIntent().hasExtra(ACTIVITY_MANAGER_FRAGMENT)) {
+                performInitialTransaction(getFragment(getIntent().getStringExtra(ACTIVITY_MANAGER_FRAGMENT)), getFragmentTag());
+            } else if (getDefaultFragment() != null) {
+                performInitialTransaction(getFragment(getDefaultFragment().getCanonicalName()), null);
+            }
         }
     }
 

build.gradle

@@ -43,22 +43,23 @@ ext {
 buildscript {
     repositories {
         jcenter()
+        google()
         maven {
             url "https://plugins.gradle.org/m2/"
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.2'
-        classpath 'com.novoda:bintray-release:0.3.4'
+        classpath 'com.android.tools.build:gradle:3.0.0-beta6'
+        classpath 'com.novoda:bintray-release:0.5.0'
         classpath 'pt.simdea.verifier:verifier:3.5.8'
         classpath 'gradle.plugin.com.kageiit:lintrules:1.1.2'
     }
 }
 
 allprojects {
     repositories {
-        maven { url 'https://maven.google.com' }
         jcenter()
+        google()
     }
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,31 +1,6 @@
-#
-# ActivityFragmentManager - A library to help android developer working easily with activities and fragments.
-#
-# Copyright (c) 2017 ActivityFragmentManager
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-
-#Wed May 31 13:33:17 UTC 2017
+#Tue Sep 05 11:15:31 UTC 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

sample/build.gradle

@@ -48,7 +48,8 @@ android {
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support:appcompat-v7:26.0.1'
+    compile 'com.android.support:appcompat-v7:26.1.0'
+    compile 'com.android.support:design:26.1.0'
     compile 'android.arch.lifecycle:extensions:1.0.0-alpha9'
     compile 'com.massivedisaster.adal:adal-fragments:0.1.15'
     compile 'com.massivedisaster.adal:adal-adapters:0.1.15'