# 0.5.0

- Add Legacy back-stack support, via fragment-manager (only for activity)
- Migrate code to Rx to enable background thread
- Add sample activity with fragment-manager
- General optimization of filtering options
- Migrate to Java11
- Add Timber for logging

Author: afaucogney

Diff for: CHANGELOG.md

@@ -1,6 +1,14 @@
+# 0.5.0
+- Add Legacy back-stack support, via fragment-manager (only for activity)
+- Migrate code to Rx to enable background thread
+- Add sample activity with fragment-manager
+- General optimization of filtering options
+- Migrate to Java11
+- Add Timber for logging
+
 # 0.4.1
 - Add filtering for event logs
-- Add filtering menu for object strcuture (wip)
+- Add filtering menu for object structure (wip)
 
 # 0.4.0
 - Add log side windows with events of Activities and Fragments

Diff for: CONTRIBUTE.md

@@ -24,18 +24,25 @@ https://fbflipper.com/docs/extending/loading-custom-plugins
 ## Start flipper from source
 
 ```shell script
+git fetch
 git pull
-yarn
+cd desktop
 yarn start
 ```
 
+In case of issue : brew reinstall icu4c
+yarn install
+
 
 ## Update version on JitPack
 
 - Update version number on build.gradle
 - Git commit, push
 
-- Delete binary and lock file in destkop plugin
+## Update version on Npm
+
+- Update version number on package.json
+- Delete binary and lock file in desktop plugin
 - npm install --force
 - (npm pack)
 - Git commit, push

Diff for: app/build.gradle

@@ -22,11 +22,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = JavaVersion.VERSION_11.toString()
     }
 }
 

Diff for: app/src/main/AndroidManifest.xml

@@ -16,6 +16,15 @@
         <activity
             android:name=".MainActivity"
             android:label="@string/title_activity_main">
+<!--            <intent-filter>-->
+<!--                <action android:name="android.intent.action.MAIN" />-->
+
+<!--                <category android:name="android.intent.category.LAUNCHER" />-->
+<!--            </intent-filter>-->
+
+        </activity>
+
+        <activity android:name=".OldSchoolActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

Diff for: app/src/main/java/fr/afaucogney/mobile/android/flipper/flipperandroidbackstack/App.kt

@@ -7,10 +7,12 @@ import com.facebook.flipper.plugins.inspector.DescriptorMapping
 import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin
 import com.facebook.soloader.SoLoader
 import fr.afaucogney.mobile.flipper.BackStackFlipperPlugin
+import fr.afaucogney.mobile.flipper.internal.util.rx.HyperlinkedDebugTree
 
 class App : Application() {
     override fun onCreate() {
         super.onCreate()
+
 //        if (BuildConfig.DEBUG) {
         SoLoader.init(this, false)
 //            if (FlipperUtils.shouldEnableFlipper(this)) {

Diff for: app/src/main/java/fr/afaucogney/mobile/android/flipper/flipperandroidbackstack/OldSchoolActivity.kt

@@ -0,0 +1,54 @@
+package fr.afaucogney.mobile.android.flipper.flipperandroidbackstack
+
+import android.os.Bundle
+import android.view.ContextMenu
+import android.view.MenuItem
+import android.view.View
+import androidx.appcompat.app.AppCompatActivity
+import com.google.android.material.bottomnavigation.BottomNavigationView
+import fr.afaucogney.mobile.android.flipper.flipperandroidbackstack.ui.dashboard.DashboardFragment
+import fr.afaucogney.mobile.android.flipper.flipperandroidbackstack.ui.home.HomeFragment
+import fr.afaucogney.mobile.android.flipper.flipperandroidbackstack.ui.notifications.NotificationsFragment
+
+class OldSchoolActivity : AppCompatActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_old)
+//        registerForContextMenu(findViewById(R.id.nav_view))
+        supportFragmentManager
+            .beginTransaction()
+            .replace(R.id.nav_host_fragment, HomeFragment())
+            .addToBackStack(null)
+            .commit()
+
+        findViewById<BottomNavigationView>(R.id.nav_view).setOnNavigationItemSelectedListener { item->
+            when (item.itemId) {
+                R.id.navigation_home -> {
+                    supportFragmentManager
+                        .beginTransaction()
+                        .replace(R.id.nav_host_fragment, HomeFragment())
+                        .addToBackStack("1")
+                        .commit()
+                    true
+                }
+                R.id.navigation_dashboard -> {
+                    supportFragmentManager
+                        .beginTransaction()
+                        .replace(R.id.nav_host_fragment, DashboardFragment())
+                        .addToBackStack("2")
+                        .commit()
+                    true
+                }
+                else -> {
+                    supportFragmentManager
+                        .beginTransaction()
+                        .replace(R.id.nav_host_fragment, NotificationsFragment())
+                        .addToBackStack("3")
+                        .commit()
+                    true
+                }
+            }
+        }
+    }
+}

Diff for: app/src/main/res/layout/activity_old.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingTop="?attr/actionBarSize">
+
+    <com.google.android.material.bottomnavigation.BottomNavigationView
+        android:id="@+id/nav_view"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="0dp"
+        android:layout_marginEnd="0dp"
+        android:background="?android:attr/windowBackground"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:menu="@menu/bottom_nav_menu" />
+
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/nav_host_fragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_constraintBottom_toTopOf="@id/nav_view"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

Diff for: flipper-backstack/build.gradle

@@ -7,7 +7,7 @@ plugins {
 
 android {
     compileSdkVersion 30
-    buildToolsVersion "30.0.3"
+    buildToolsVersion "31.0.0"
 
     defaultConfig {
         minSdkVersion 21
@@ -25,27 +25,35 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = JavaVersion.VERSION_11.toString()
     }
 }
 
 dependencies {
 
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
+    // Kotlin
 
     // Flipper
     implementation deps.flipper_core
     implementation deps.flipper_soloader
     implementation deps.flipper_reflect
 
-    implementation 'androidx.core:core-ktx:1.3.2'
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.3.3'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.3.3'
+    // Android
+    implementation 'androidx.core:core-ktx:1.6.0'
+    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.3.5'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.3.5'
+
+    // Rx
+    implementation "io.reactivex.rxjava3:rxjava:3.0.12"
+    implementation 'io.reactivex.rxjava3:rxandroid:3.0.0'
+    implementation "io.reactivex.rxjava3:rxkotlin:3.0.1"
+
+    implementation "com.jakewharton.timber:timber:4.7.1"
 
     // Test
     testImplementation deps.junit4