Merge remote-tracking branch 'origin/master'

# Conflicts:
#	frag-nav/pom.xml

Author: ncapdevi

.gitignore

@@ -7,3 +7,4 @@
 /build
 /captures
 .idea
+/.idea/

.idea/misc.xml

@@ -313,6 +313,8 @@ Feel free to send me a pull request with your app and I'll link you here:
 
 | Logo                                     | Name       | Play Store                               |
 | ---------------------------------------- | ---------- | ---------------------------------------- |
+| <img alt='RockbotDJ' src='https://lh3.googleusercontent.com/oPIgSrhWuIGUO_UCynx4HHop7s2F90EzuIUY1p4SV1APeUADwX2MNVV6uQ8aAGMAWT0=s360-rw' height='48px'/> | Rockbot DJ | <a href='https://play.google.com/store/apps/details?id=com.roqbot.client&utm_source=Github&utm_campaign=FragNav'><img alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png' height='70px'/></a> |
+| <img alt='RockbotRemote' src='https://lh3.googleusercontent.com/y1z-eAO0QiRVCzG4MkrrhNE1qCfjAFK5Pp-5AQ0HjAcXrxa1wiGbGGV68pdbF1B6zQ=s360-rw' height='48px'/> | Rockbot Remote | <a href='https://play.google.com/store/apps/details?id=com.roqbot.player&utm_source=Github&utm_campaign=FragNav'><img alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png' height='70px'/></a> |
 | <img alt='Skyscanner' src='https://assets.brandfolder.com/odwv71-9z8zyo-8xj1p3/v/718530/[email protected]' height='48px'/> | Skyscanner | <a href='https://play.google.com/store/apps/details?id=net.skyscanner.android.main&utm_source=Github&utm_campaign=FragNav&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png' height='70px'/></a> |
 | <img alt='Fonic' src='https://www.fonic.de/assets/images/about/fonic.png' height='48px'/> | Fonic / Fonic Mobile | <a href='https://play.google.com/store/apps/details?id=de.fonic.meinfonic'><img alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png' height='70px'/></a> |
 

README.md

@@ -6,7 +6,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.1'
+        classpath 'com.android.tools.build:gradle:3.1.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

build.gradle

@@ -1 +1,2 @@
 /build
+pom.xml

frag-nav/.gitignore

@@ -175,7 +175,8 @@ class FragNavController constructor(private val fragmentManger: FragmentManager,
             throw java.lang.IllegalStateException("Shouldn't have both a rootFragmentListener and rootFragments set, this is clearly a mistsake")
         }
 
-        val numberOfTabs: Int = rootFragmentListener?.numberOfRootFragments ?: rootFragments?.size ?: 0
+        val numberOfTabs: Int = rootFragmentListener?.numberOfRootFragments ?: rootFragments?.size
+        ?: 0
 
         //Attempt to restore from bundle, if not, initialize
         if (!restoreFromBundle(savedInstanceState)) {
@@ -210,10 +211,10 @@ class FragNavController constructor(private val fragmentManger: FragmentManager,
                 fragmentStacksTags[currentStackIndex].push(fragmentTag)
                 ft.add(containerId, fragment, fragmentTag)
                 if (i != index) {
-                    if (shouldDetachAttachOnSwitch()) {
-                        ft.detach(fragment)
-                    } else {
-                        ft.hide(fragment)
+                    when {
+                        shouldDetachAttachOnSwitch() -> ft.detach(fragment)
+                        shouldRemoveAttachOnSwitch() -> ft.remove(fragment)
+                        else -> ft.hide(fragment)
                     }
                 } else {
                     mCurrentFrag = fragment
@@ -263,20 +264,21 @@ class FragNavController constructor(private val fragmentManger: FragmentManager,
 
             val ft = createTransactionWithOptions(transactionOptions, false)
 
-            removeCurrentFragment(ft, shouldDetachAttachOnSwitch())
+            removeCurrentFragment(ft, shouldDetachAttachOnSwitch(), shouldRemoveAttachOnSwitch())
 
             var fragment: Fragment? = null
             if (index == NO_TAB) {
                 commitTransaction(ft, transactionOptions)
             } else {
                 //Attempt to reattach previous fragment
-                fragment = addPreviousFragment(ft, shouldDetachAttachOnSwitch())
+                fragment = addPreviousFragment(ft, shouldDetachAttachOnSwitch() || shouldRemoveAttachOnSwitch())
                 if (fragment != null) {
                     commitTransaction(ft, transactionOptions)
                 } else {
                     fragment = getRootFragment(currentStackIndex)
-                    var tag = fragment.tag
-                    if (tag.isNullOrEmpty()){
+                    // Handle special case of indexes, restore tag of removed fragment
+                    var tag = fragment.tag ?: fragmentStacksTags[index].peek()
+                    if (tag.isNullOrEmpty()) {
                         tag = generateTag(fragment)
                         fragmentStacksTags[currentStackIndex].push(tag)
                     }
@@ -300,7 +302,7 @@ class FragNavController constructor(private val fragmentManger: FragmentManager,
         if (fragment != null && currentStackIndex != NO_TAB) {
             val ft = createTransactionWithOptions(transactionOptions, false)
 
-            removeCurrentFragment(ft, shouldDetachAttachOnPushPop())
+            removeCurrentFragment(ft, shouldDetachAttachOnPushPop(), shouldRemoveAttachOnSwitch())
 
             val fragmentTag = generateTag(fragment)
             fragmentStacksTags[currentStackIndex].push(fragmentTag)
@@ -375,6 +377,9 @@ class FragNavController constructor(private val fragmentManger: FragmentManager,
             if (!fragmentStacksTags[currentStackIndex].isEmpty()) {
                 val fragmentTag = fragmentStacksTags[currentStackIndex].peek()
                 fragment = fragmentManger.findFragmentByTag(fragmentTag)
+                        // Fragment destroyed (probably removed from fragment manager)
+                        ?: getRootFragment(currentStackIndex)
+
                 ft.add(containerId, fragment, fragmentTag)
                 commitTransaction(ft, transactionOptions)
             } else {
@@ -439,6 +444,8 @@ class FragNavController constructor(private val fragmentManger: FragmentManager,
                 if (fragmentStack.isNotEmpty()) {
                     val fragmentTag = fragmentStack.peek()
                     fragment = fragmentManger.findFragmentByTag(fragmentTag)
+                            // Fragment destroyed (probably removed from fragment manager)
+                            ?: getRootFragment(currentStackIndex)
                     ft.add(containerId, fragment, fragmentTag)
                     commitTransaction(ft, transactionOptions)
                 } else {
@@ -597,12 +604,12 @@ class FragNavController constructor(private val fragmentManger: FragmentManager,
      *
      * @param ft the current transaction being performed
      */
-    private fun removeCurrentFragment(ft: FragmentTransaction, isDetach: Boolean) {
+    private fun removeCurrentFragment(ft: FragmentTransaction, isDetach: Boolean, isRemove: Boolean) {
         currentFrag?.let {
-            if (isDetach) {
-                ft.detach(it)
-            } else {
-                ft.hide(it)
+            when {
+                isDetach -> ft.detach(it)
+                isRemove -> ft.remove(it)
+                else -> ft.hide(it)
             }
         }
     }
@@ -696,6 +703,10 @@ class FragNavController constructor(private val fragmentManger: FragmentManager,
         return fragmentHideStrategy == DETACH
     }
 
+    private fun shouldRemoveAttachOnSwitch(): Boolean {
+        return fragmentHideStrategy == REMOVE
+    }
+
     /**
      * Get a copy of the stack at a given index
      *
@@ -810,7 +821,10 @@ class FragNavController constructor(private val fragmentManger: FragmentManager,
             // Restore selected tab if we have one
             val selectedTabIndex = savedInstanceState.getInt(EXTRA_SELECTED_TAB_INDEX)
             if (selectedTabIndex in 0..(MAX_NUM_TABS - 1)) {
-                switchTab(selectedTabIndex, FragNavTransactionOptions.newBuilder().build())
+                // Shortcut for switchTab. We  already restored fragment, so just notify history controller
+                // We cannot use switchTab, because switchTab removes fragment, but we don't want it
+                currentStackIndex = selectedTabIndex
+                fragNavTabHistoryController.switchTab(selectedTabIndex)
             }
 
             //Successfully restored state
@@ -846,7 +860,7 @@ class FragNavController constructor(private val fragmentManger: FragmentManager,
     /**
      * Define what happens when we try to pop on a tab where root fragment is at the top
      */
-    @IntDef(DETACH, HIDE, DETACH_ON_NAVIGATE_HIDE_ON_SWITCH)
+    @IntDef(DETACH, HIDE, REMOVE, DETACH_ON_NAVIGATE_HIDE_ON_SWITCH)
     @kotlin.annotation.Retention(AnnotationRetention.SOURCE)
     annotation class FragmentHideStrategy
 
@@ -923,5 +937,10 @@ class FragNavController constructor(private val fragmentManger: FragmentManager,
          * using show and hide methods to switch between tabs
          */
         const val DETACH_ON_NAVIGATE_HIDE_ON_SWITCH = 2
+
+        /**
+         * Using create + attach and remove methods of Fragment transaction to switch between fragments
+         */
+        const val REMOVE = 3
     }
 }