Merge pull request #42 from massivedisaster/feature/fix_activity_start

Feature/fix activity start

Author: Jorge Costa

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.3'
-        classpath 'com.novoda:bintray-release:0.3.4'
+        classpath 'com.android.tools.build:gradle:3.0.0-beta2'
+        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
+#Thu Aug 24 17:03:38 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-rc-1-all.zip