From c3bdc1d66561ae344bf85da36962a912f5c78b15 Mon Sep 17 00:00:00 2001
From: Sven Bendel <ubuntudroid@gmail.com>
Date: Tue, 16 Apr 2019 16:56:39 +0200
Subject: [PATCH 1/9] SFW-300 Remove source and javadoc tasks as jitpack does
 this for us now

---
 .idea/codeStyles/Project.xml                  | 112 ++++++++++++++++++
 .../mhwdb/repository/user/UserMapper.kt       |   1 -
 build.gradle                                  |   3 +-
 core/build.gradle                             |  27 +----
 di/build.gradle                               |  27 +----
 nav/build.gradle                              |  27 +----
 6 files changed, 116 insertions(+), 81 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 5a41fe3..edf5740 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,6 +1,9 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
     <option name="RIGHT_MARGIN" value="140" />
+    <AndroidXmlCodeStyleSettings>
+      <option name="USE_CUSTOM_SETTINGS" value="true" />
+    </AndroidXmlCodeStyleSettings>
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
         <value>
@@ -36,6 +39,115 @@
         <pair source="c" header="h" fileNamingConvention="NONE" />
       </extensions>
     </Objective-C-extensions>
+    <XML>
+      <option name="XML_KEEP_LINE_BREAKS" value="false" />
+      <option name="XML_ALIGN_ATTRIBUTES" value="false" />
+      <option name="XML_SPACE_INSIDE_EMPTY_TAG" value="true" />
+    </XML>
+    <codeStyleSettings language="XML">
+      <option name="FORCE_REARRANGE_MODE" value="1" />
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      </indentOptions>
+      <arrangement>
+        <rules>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:android</NAME>
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:.*</NAME>
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:id</NAME>
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:name</NAME>
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>name</NAME>
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>style</NAME>
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>ANDROID_ATTRIBUTE_ORDER</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_NAMESPACE>.*</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+        </rules>
+      </arrangement>
+    </codeStyleSettings>
     <codeStyleSettings language="kotlin">
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
       <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
diff --git a/app/src/main/java/io/stanwood/mhwdb/repository/user/UserMapper.kt b/app/src/main/java/io/stanwood/mhwdb/repository/user/UserMapper.kt
index 7dab7cd..170055f 100644
--- a/app/src/main/java/io/stanwood/mhwdb/repository/user/UserMapper.kt
+++ b/app/src/main/java/io/stanwood/mhwdb/repository/user/UserMapper.kt
@@ -24,4 +24,3 @@ package io.stanwood.mhwdb.repository.user
 import io.stanwood.mhwdb.datasource.local.user.LocalUser
 
 fun LocalUser.mapToUser() = User(this.id)
-
diff --git a/build.gradle b/build.gradle
index 0b3ea00..ce13e4c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 stanwood GmbH
+ * Copyright (c) 2019 stanwood GmbH
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -35,7 +35,6 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:3.3.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath 'gradle.plugin.org.jlleitschuh.gradle:ktlint-gradle:6.2.1'
     }
 }
diff --git a/core/build.gradle b/core/build.gradle
index 184f6eb..3d78035 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 stanwood GmbH
+ * Copyright (c) 2019 stanwood GmbH
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -21,7 +21,6 @@
 
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'com.github.dcendents.android-maven'
 apply from: rootProject.file('.githooks/install-git-hooks.gradle')
 
 
@@ -59,27 +58,3 @@ dependencies {
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
 }
-
-// build a jar with source files
-task sourcesJar(type: Jar) {
-    from android.sourceSets.main.java.srcDirs
-    classifier = 'sources'
-}
-
-task javadoc(type: Javadoc) {
-    failOnError  false
-    source = android.sourceSets.main.java.sourceFiles
-    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
-    classpath += configurations.compile
-}
-
-// build a jar with javadoc
-task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
-    from javadoc.destinationDir
-}
-
-artifacts {
-    archives sourcesJar
-    archives javadocJar
-}
diff --git a/di/build.gradle b/di/build.gradle
index 4abc956..f8573ff 100644
--- a/di/build.gradle
+++ b/di/build.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 stanwood GmbH
+ * Copyright (c) 2019 stanwood GmbH
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -21,7 +21,6 @@
 
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'com.github.dcendents.android-maven'
 apply from: rootProject.file('.githooks/install-git-hooks.gradle')
 
 android {
@@ -59,27 +58,3 @@ dependencies {
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
 }
-
-// build a jar with source files
-task sourcesJar(type: Jar) {
-    from android.sourceSets.main.java.srcDirs
-    classifier = 'sources'
-}
-
-task javadoc(type: Javadoc) {
-    failOnError  false
-    source = android.sourceSets.main.java.sourceFiles
-    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
-    classpath += configurations.compile
-}
-
-// build a jar with javadoc
-task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
-    from javadoc.destinationDir
-}
-
-artifacts {
-    archives sourcesJar
-    archives javadocJar
-}
diff --git a/nav/build.gradle b/nav/build.gradle
index 65d59ff..74d1796 100644
--- a/nav/build.gradle
+++ b/nav/build.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 stanwood GmbH
+ * Copyright (c) 2019 stanwood GmbH
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -21,7 +21,6 @@
 
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'com.github.dcendents.android-maven'
 apply from: rootProject.file('.githooks/install-git-hooks.gradle')
 
 android {
@@ -58,27 +57,3 @@ dependencies {
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
 }
-
-// build a jar with source files
-task sourcesJar(type: Jar) {
-    from android.sourceSets.main.java.srcDirs
-    classifier = 'sources'
-}
-
-task javadoc(type: Javadoc) {
-    failOnError  false
-    source = android.sourceSets.main.java.sourceFiles
-    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
-    classpath += configurations.compile
-}
-
-// build a jar with javadoc
-task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
-    from javadoc.destinationDir
-}
-
-artifacts {
-    archives sourcesJar
-    archives javadocJar
-}

From 966cdab91607e502422d4abcbbdb655230d6b853 Mon Sep 17 00:00:00 2001
From: Sven Bendel <ubuntudroid@gmail.com>
Date: Wed, 17 Apr 2019 15:45:42 +0200
Subject: [PATCH 2/9] SFW-332 Add navEditor.xml to .gitignore

---
 .gitignore          |  1 +
 .idea/navEditor.xml | 53 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 .idea/navEditor.xml

diff --git a/.gitignore b/.gitignore
index fd45b12..f69181d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
 /.idea/libraries
 /.idea/modules.xml
 /.idea/workspace.xml
+/.idea/navEditor.xml
 .DS_Store
 /build
 /captures
diff --git a/.idea/navEditor.xml b/.idea/navEditor.xml
new file mode 100644
index 0000000..3bbb475
--- /dev/null
+++ b/.idea/navEditor.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="navEditor-manualLayoutAlgorithm2">
+    <option name="myPositions">
+      <map>
+        <entry key="nav_graph_container.xml">
+          <value>
+            <LayoutPositions>
+              <option name="myPositions">
+                <map>
+                  <entry key="armorFragment">
+                    <value>
+                      <LayoutPositions>
+                        <option name="myPosition">
+                          <Point>
+                            <option name="x" value="168" />
+                            <option name="y" value="12" />
+                          </Point>
+                        </option>
+                      </LayoutPositions>
+                    </value>
+                  </entry>
+                  <entry key="showArmor">
+                    <value>
+                      <LayoutPositions />
+                    </value>
+                  </entry>
+                  <entry key="showWeapons">
+                    <value>
+                      <LayoutPositions />
+                    </value>
+                  </entry>
+                  <entry key="weaponsPagerFragment">
+                    <value>
+                      <LayoutPositions>
+                        <option name="myPosition">
+                          <Point>
+                            <option name="x" value="12" />
+                            <option name="y" value="12" />
+                          </Point>
+                        </option>
+                      </LayoutPositions>
+                    </value>
+                  </entry>
+                </map>
+              </option>
+            </LayoutPositions>
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+</project>
\ No newline at end of file

From a36200a009045c48e68e35fa5aa840ca21b21155 Mon Sep 17 00:00:00 2001
From: Sven Bendel <ubuntudroid@gmail.com>
Date: Wed, 17 Apr 2019 17:00:37 +0200
Subject: [PATCH 3/9] SFW-332 Add support for navigation via destination res ID
 as well as back and up

---
 .../mhwdb/feature/armors/ui/ArmorsFragment.kt |  2 +-
 .../feature/armors/vm/ArmorsViewModel.kt      | 24 +++++-
 .../feature/container/ui/ContainerFragment.kt | 25 +++++-
 .../container/vm/ContainerViewModel.kt        | 24 +++++-
 .../onboarding/ui/OnboardingFragment.kt       | 23 +++++-
 .../onboarding/vm/OnboardingViewModel.kt      | 24 +++++-
 .../feature/weapons/ui/WeaponsFragment.kt     | 23 +++++-
 .../framework/arch/nav/NavigationTarget.kt    | 76 ++++++++++++++++++-
 8 files changed, 213 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/io/stanwood/mhwdb/feature/armors/ui/ArmorsFragment.kt b/app/src/main/java/io/stanwood/mhwdb/feature/armors/ui/ArmorsFragment.kt
index 2d1a7da..f175217 100644
--- a/app/src/main/java/io/stanwood/mhwdb/feature/armors/ui/ArmorsFragment.kt
+++ b/app/src/main/java/io/stanwood/mhwdb/feature/armors/ui/ArmorsFragment.kt
@@ -102,7 +102,7 @@ class ArmorsFragment : Fragment(), HasSupportFragmentInjector {
             })
             navigator.subscribeBy(
                 viewLifecycleOwner,
-                onSuccess = { mainNavController.navigate(it.navDirections, it.navOptions) })
+                onSuccess = { it.navigate(mainNavController) })
         }
     }
 
diff --git a/app/src/main/java/io/stanwood/mhwdb/feature/armors/vm/ArmorsViewModel.kt b/app/src/main/java/io/stanwood/mhwdb/feature/armors/vm/ArmorsViewModel.kt
index 633b372..5682878 100644
--- a/app/src/main/java/io/stanwood/mhwdb/feature/armors/vm/ArmorsViewModel.kt
+++ b/app/src/main/java/io/stanwood/mhwdb/feature/armors/vm/ArmorsViewModel.kt
@@ -1,3 +1,24 @@
+/*
+ * Copyright (c) 2019 stanwood GmbH
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * 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.
+ */
+
 package io.stanwood.mhwdb.feature.armors.vm
 
 import io.reactivex.android.schedulers.AndroidSchedulers
@@ -5,6 +26,7 @@ import io.reactivex.subjects.BehaviorSubject
 import io.reactivex.subjects.PublishSubject
 import io.stanwood.framework.arch.core.ViewModel
 import io.stanwood.framework.arch.core.rx.ResourceStatusTransformer
+import io.stanwood.framework.arch.nav.Direction
 import io.stanwood.framework.arch.nav.NavigationTarget
 import io.stanwood.mhwdb.NavGraphMainDirections
 import io.stanwood.mhwdb.feature.armors.dataprovider.ArmorDataProvider
@@ -53,7 +75,7 @@ class ArmorsViewModel @Inject constructor(private val dataProvider: ArmorDataPro
                 expandedSetsSubject.onNext(expandedSets)
             }
             is ArmorItem.ArmorViewModel -> {
-                navigation.onNext(NavigationTarget(NavGraphMainDirections.showArmorDetails(item.id)))
+                navigation.onNext(Direction(NavGraphMainDirections.showArmorDetails(item.id)))
             }
         }
     }
diff --git a/app/src/main/java/io/stanwood/mhwdb/feature/container/ui/ContainerFragment.kt b/app/src/main/java/io/stanwood/mhwdb/feature/container/ui/ContainerFragment.kt
index dd869e4..d1719ca 100644
--- a/app/src/main/java/io/stanwood/mhwdb/feature/container/ui/ContainerFragment.kt
+++ b/app/src/main/java/io/stanwood/mhwdb/feature/container/ui/ContainerFragment.kt
@@ -1,3 +1,24 @@
+/*
+ * Copyright (c) 2019 stanwood GmbH
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * 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.
+ */
+
 package io.stanwood.mhwdb.feature.container.ui
 
 import android.os.Bundle
@@ -58,7 +79,9 @@ class ContainerFragment : Fragment(), HasSupportFragmentInjector {
         }
         viewModel.apply {
             navigator.subscribeBy(viewLifecycleOwner, onNext = {
-                childNavController?.navigate(it.navDirections, it.navOptions)
+                childNavController?.let { navController ->
+                    it.navigate(navController)
+                }
             })
         }
     }
diff --git a/app/src/main/java/io/stanwood/mhwdb/feature/container/vm/ContainerViewModel.kt b/app/src/main/java/io/stanwood/mhwdb/feature/container/vm/ContainerViewModel.kt
index 774b7dd..0e14c8a 100644
--- a/app/src/main/java/io/stanwood/mhwdb/feature/container/vm/ContainerViewModel.kt
+++ b/app/src/main/java/io/stanwood/mhwdb/feature/container/vm/ContainerViewModel.kt
@@ -1,9 +1,31 @@
+/*
+ * Copyright (c) 2019 stanwood GmbH
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * 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.
+ */
+
 package io.stanwood.mhwdb.feature.container.vm
 
 import androidx.annotation.IdRes
 import io.reactivex.Observable
 import io.reactivex.subjects.PublishSubject
 import io.stanwood.framework.arch.core.ViewModel
+import io.stanwood.framework.arch.nav.Direction
 import io.stanwood.framework.arch.nav.NavigationTarget
 import io.stanwood.mhwdb.NavGraphContainerDirections
 import io.stanwood.mhwdb.R
@@ -23,7 +45,7 @@ class ContainerViewModel @Inject constructor() : ViewModel {
             else -> null
         }
             ?.let {
-                navigation.onNext(NavigationTarget(it))
+                navigation.onNext(Direction(it))
                 true
             }
             ?: false
diff --git a/app/src/main/java/io/stanwood/mhwdb/feature/onboarding/ui/OnboardingFragment.kt b/app/src/main/java/io/stanwood/mhwdb/feature/onboarding/ui/OnboardingFragment.kt
index 7f5558a..4827f4f 100644
--- a/app/src/main/java/io/stanwood/mhwdb/feature/onboarding/ui/OnboardingFragment.kt
+++ b/app/src/main/java/io/stanwood/mhwdb/feature/onboarding/ui/OnboardingFragment.kt
@@ -1,3 +1,24 @@
+/*
+ * Copyright (c) 2019 stanwood GmbH
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * 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.
+ */
+
 package io.stanwood.mhwdb.feature.onboarding.ui
 
 import android.os.Bundle
@@ -48,7 +69,7 @@ class OnboardingFragment : Fragment(), HasSupportFragmentInjector {
             binding?.also { bind ->
                 bind.lifecycleOwner = viewLifecycleOwner
                 bind.btnContinue.setOnClickListener { viewModel.nextPage() }
-                navigator.subscribeBy(viewLifecycleOwner, onNext = { findNavController().navigate(it.navDirections, it.navOptions) })
+                navigator.subscribeBy(viewLifecycleOwner, onNext = { it.navigate(findNavController()) })
             }
         }
     }
diff --git a/app/src/main/java/io/stanwood/mhwdb/feature/onboarding/vm/OnboardingViewModel.kt b/app/src/main/java/io/stanwood/mhwdb/feature/onboarding/vm/OnboardingViewModel.kt
index 82677c3..3c65410 100644
--- a/app/src/main/java/io/stanwood/mhwdb/feature/onboarding/vm/OnboardingViewModel.kt
+++ b/app/src/main/java/io/stanwood/mhwdb/feature/onboarding/vm/OnboardingViewModel.kt
@@ -1,3 +1,24 @@
+/*
+ * Copyright (c) 2019 stanwood GmbH
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * 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.
+ */
+
 package io.stanwood.mhwdb.feature.onboarding.vm
 
 import io.reactivex.Observable
@@ -6,6 +27,7 @@ import io.reactivex.disposables.Disposable
 import io.reactivex.rxkotlin.subscribeBy
 import io.reactivex.subjects.PublishSubject
 import io.stanwood.framework.arch.core.ViewModel
+import io.stanwood.framework.arch.nav.Direction
 import io.stanwood.framework.arch.nav.NavigationTarget
 import io.stanwood.mhwdb.feature.main.dataprovider.MainDataProvider
 import io.stanwood.mhwdb.feature.onboarding.ui.OnboardingFragmentDirections
@@ -23,7 +45,7 @@ class OnboardingViewModel @Inject constructor(private val dataProvider: MainData
                 .subscribeBy(
                     onError = { it.printStackTrace() },
                     onComplete = {
-                        navigation.onNext(NavigationTarget(OnboardingFragmentDirections.actionToContainerFragment()))
+                        navigation.onNext(Direction(OnboardingFragmentDirections.actionToContainerFragment()))
                     })
         }
     }
diff --git a/app/src/main/java/io/stanwood/mhwdb/feature/weapons/ui/WeaponsFragment.kt b/app/src/main/java/io/stanwood/mhwdb/feature/weapons/ui/WeaponsFragment.kt
index ed8fadf..e8534f2 100644
--- a/app/src/main/java/io/stanwood/mhwdb/feature/weapons/ui/WeaponsFragment.kt
+++ b/app/src/main/java/io/stanwood/mhwdb/feature/weapons/ui/WeaponsFragment.kt
@@ -1,3 +1,24 @@
+/*
+ * Copyright (c) 2019 stanwood GmbH
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * 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.
+ */
+
 package io.stanwood.mhwdb.feature.weapons.ui
 
 import android.os.Bundle
@@ -76,7 +97,7 @@ class WeaponsFragment : Fragment(), HasSupportFragmentInjector {
                     }
                 }
             })
-            navigator.subscribeBy(viewLifecycleOwner, onSuccess = { findNavController().navigate(it.navDirections, it.navOptions) })
+            navigator.subscribeBy(viewLifecycleOwner, onSuccess = { it.navigate(findNavController()) })
         }
     }
 
diff --git a/nav/src/main/java/io/stanwood/framework/arch/nav/NavigationTarget.kt b/nav/src/main/java/io/stanwood/framework/arch/nav/NavigationTarget.kt
index bbadaaf..d484319 100644
--- a/nav/src/main/java/io/stanwood/framework/arch/nav/NavigationTarget.kt
+++ b/nav/src/main/java/io/stanwood/framework/arch/nav/NavigationTarget.kt
@@ -1,6 +1,80 @@
+/*
+ * Copyright (c) 2019 stanwood GmbH
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * 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.
+ */
+
 package io.stanwood.framework.arch.nav
 
+import android.os.Bundle
+import androidx.annotation.IdRes
+import androidx.navigation.NavController
 import androidx.navigation.NavDirections
 import androidx.navigation.NavOptions
+import androidx.navigation.Navigator
+
+interface NavigationTarget {
+    fun navigate(navController: NavController)
+}
+
+open class Direction(
+    val navDirections: NavDirections,
+    val navOptions: NavOptions? = null,
+    val navigatorExtras: Navigator.Extras? = null
+) : NavigationTarget {
+
+    override fun navigate(navController: NavController) {
+        if (navigatorExtras != null && navOptions != null) {
+            throw IllegalArgumentException(
+                "You can't set both NavOptions AND Navigator.Extras.\n$navDirections\n$navOptions\n$navigatorExtras"
+            )
+        }
+
+        if (navigatorExtras != null) {
+            navController.navigate(navDirections, navigatorExtras)
+        } else {
+            navController.navigate(navDirections, navOptions)
+        }
+    }
+}
+
+open class Destination(
+    @IdRes val destinationId: Int,
+    val bundle: Bundle? = null,
+    val navOptions: NavOptions? = null,
+    val navigatorExtras: Navigator.Extras? = null
+) : NavigationTarget {
+
+    override fun navigate(navController: NavController) {
+        navController.navigate(destinationId, bundle, navOptions, navigatorExtras)
+    }
+}
+
+open class Back : NavigationTarget {
+
+    override fun navigate(navController: NavController) {
+        navController.popBackStack()
+    }
+}
+
+open class Up : NavigationTarget {
 
-data class NavigationTarget(val navDirections: NavDirections, val navOptions: NavOptions? = null)
\ No newline at end of file
+    override fun navigate(navController: NavController) {
+        navController.navigateUp()
+    }
+}
\ No newline at end of file

From 2d840c24cde6c75ac5eed42b0f51d21bf60daef1 Mon Sep 17 00:00:00 2001
From: Sven Bendel <ubuntudroid@gmail.com>
Date: Wed, 17 Apr 2019 17:01:41 +0200
Subject: [PATCH 4/9] SFW-332 Close Back and Up

---
 .../java/io/stanwood/framework/arch/nav/NavigationTarget.kt   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nav/src/main/java/io/stanwood/framework/arch/nav/NavigationTarget.kt b/nav/src/main/java/io/stanwood/framework/arch/nav/NavigationTarget.kt
index d484319..b3939f1 100644
--- a/nav/src/main/java/io/stanwood/framework/arch/nav/NavigationTarget.kt
+++ b/nav/src/main/java/io/stanwood/framework/arch/nav/NavigationTarget.kt
@@ -65,14 +65,14 @@ open class Destination(
     }
 }
 
-open class Back : NavigationTarget {
+class Back : NavigationTarget {
 
     override fun navigate(navController: NavController) {
         navController.popBackStack()
     }
 }
 
-open class Up : NavigationTarget {
+class Up : NavigationTarget {
 
     override fun navigate(navController: NavController) {
         navController.navigateUp()

From 3a66d8281ee7c586a05fcf5cac4b781c486c73e2 Mon Sep 17 00:00:00 2001
From: Sven Bendel <ubuntudroid@gmail.com>
Date: Wed, 17 Apr 2019 17:18:32 +0200
Subject: [PATCH 5/9] SFW-332 Remove navEditor.xml

---
 .idea/navEditor.xml | 53 ---------------------------------------------
 1 file changed, 53 deletions(-)
 delete mode 100644 .idea/navEditor.xml

diff --git a/.idea/navEditor.xml b/.idea/navEditor.xml
deleted file mode 100644
index 3bbb475..0000000
--- a/.idea/navEditor.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="navEditor-manualLayoutAlgorithm2">
-    <option name="myPositions">
-      <map>
-        <entry key="nav_graph_container.xml">
-          <value>
-            <LayoutPositions>
-              <option name="myPositions">
-                <map>
-                  <entry key="armorFragment">
-                    <value>
-                      <LayoutPositions>
-                        <option name="myPosition">
-                          <Point>
-                            <option name="x" value="168" />
-                            <option name="y" value="12" />
-                          </Point>
-                        </option>
-                      </LayoutPositions>
-                    </value>
-                  </entry>
-                  <entry key="showArmor">
-                    <value>
-                      <LayoutPositions />
-                    </value>
-                  </entry>
-                  <entry key="showWeapons">
-                    <value>
-                      <LayoutPositions />
-                    </value>
-                  </entry>
-                  <entry key="weaponsPagerFragment">
-                    <value>
-                      <LayoutPositions>
-                        <option name="myPosition">
-                          <Point>
-                            <option name="x" value="12" />
-                            <option name="y" value="12" />
-                          </Point>
-                        </option>
-                      </LayoutPositions>
-                    </value>
-                  </entry>
-                </map>
-              </option>
-            </LayoutPositions>
-          </value>
-        </entry>
-      </map>
-    </option>
-  </component>
-</project>
\ No newline at end of file

From 2867fcae6de5fd9952e82e3cc606a7942dffba55 Mon Sep 17 00:00:00 2001
From: Sven Bendel <ubuntudroid@gmail.com>
Date: Thu, 18 Apr 2019 11:06:00 +0200
Subject: [PATCH 6/9] SFW-331 Update to AS 3.4 and Kotlin 1.3.30

---
 .idea/codeStyles/Project.xml             | 25 ------------------------
 .idea/encodings.xml                      |  4 ++++
 build.gradle                             |  4 ++--
 gradle/wrapper/gradle-wrapper.properties | 25 ++++++++++++++++++++++--
 4 files changed, 29 insertions(+), 29 deletions(-)
 create mode 100644 .idea/encodings.xml

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index edf5740..fcb09a4 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -14,31 +14,6 @@
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
-    <Objective-C-extensions>
-      <file>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
-      </file>
-      <class>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
-      </class>
-      <extensions>
-        <pair source="cpp" header="h" fileNamingConvention="NONE" />
-        <pair source="c" header="h" fileNamingConvention="NONE" />
-      </extensions>
-    </Objective-C-extensions>
     <XML>
       <option name="XML_KEEP_LINE_BREAKS" value="false" />
       <option name="XML_ALIGN_ATTRIBUTES" value="false" />
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 0000000..15a15b2
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
+</project>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index ce13e4c..5e2422d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,7 +22,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.21'
+    ext.kotlin_version = '1.3.30'
     ext.min_version = 16
     ext.target_version = 28
     repositories {
@@ -33,7 +33,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.2'
+        classpath 'com.android.tools.build:gradle:3.4.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'gradle.plugin.org.jlleitschuh.gradle:ktlint-gradle:6.2.1'
     }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 00bb1cd..93ba0f2 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,27 @@
-#Thu Feb 07 16:15:09 CET 2019
+#
+# Copyright (c) 2019 stanwood GmbH
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# 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.
+#
+
+#Thu Apr 18 10:54:13 CEST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip

From e3463c0a4066c404347114f4a1afc95f78a9bee7 Mon Sep 17 00:00:00 2001
From: Sven Bendel <ubuntudroid@gmail.com>
Date: Thu, 18 Apr 2019 12:26:11 +0200
Subject: [PATCH 7/9] SFW-331 Sync navigation destination back to
 NavigationView

---
 .gitignore                                    |  1 +
 .../mhwdb/feature/armors/ui/ArmorsFragment.kt |  5 ++
 .../feature/container/ui/ContainerFragment.kt |  4 ++
 .../container/vm/ContainerViewModel.kt        |  5 +-
 .../drawable/ic_arrow_forward_white_24dp.xml  | 31 ++++++++++
 app/src/main/res/layout/fragment_armor.xml    | 33 ++++++++++
 .../res/menu/menu_container_navigation.xml    | 29 +++++++--
 app/src/main/res/values/strings.xml           | 29 +++++++--
 .../arch/nav/NavigationViewExtensions.kt      | 35 +++++++++++
 .../arch/nav/NavigationViewSyncer.kt          | 61 +++++++++++++++++++
 10 files changed, 222 insertions(+), 11 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_arrow_forward_white_24dp.xml
 create mode 100644 nav/src/main/java/io/stanwood/framework/arch/nav/NavigationViewExtensions.kt
 create mode 100644 nav/src/main/java/io/stanwood/framework/arch/nav/NavigationViewSyncer.kt

diff --git a/.gitignore b/.gitignore
index f69181d..c9fad65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
 /.idea/modules.xml
 /.idea/workspace.xml
 /.idea/navEditor.xml
+/.idea/assetWizardSettings.xml
 .DS_Store
 /build
 /captures
diff --git a/app/src/main/java/io/stanwood/mhwdb/feature/armors/ui/ArmorsFragment.kt b/app/src/main/java/io/stanwood/mhwdb/feature/armors/ui/ArmorsFragment.kt
index f175217..54fd8aa 100644
--- a/app/src/main/java/io/stanwood/mhwdb/feature/armors/ui/ArmorsFragment.kt
+++ b/app/src/main/java/io/stanwood/mhwdb/feature/armors/ui/ArmorsFragment.kt
@@ -29,12 +29,14 @@ import androidx.core.content.res.ResourcesCompat
 import androidx.databinding.DataBindingComponent
 import androidx.fragment.app.Fragment
 import androidx.navigation.NavController
+import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.LinearLayoutManager
 import dagger.android.DispatchingAndroidInjector
 import dagger.android.support.AndroidSupportInjection
 import dagger.android.support.HasSupportFragmentInjector
 import io.stanwood.framework.arch.core.rx.subscribeBy
 import io.stanwood.framework.arch.di.factory.ViewModelFactory
+import io.stanwood.mhwdb.NavGraphContainerDirections
 import io.stanwood.mhwdb.R
 import io.stanwood.mhwdb.databinding.FragmentArmorBinding
 import io.stanwood.mhwdb.feature.armors.vm.ArmorsViewModel
@@ -72,6 +74,9 @@ class ArmorsFragment : Fragment(), HasSupportFragmentInjector {
             .apply {
                 binding = this
                 retryCallback = View.OnClickListener { viewModel.retry() }
+                toWeaponsCallback = View.OnClickListener {
+                    findNavController().navigate(NavGraphContainerDirections.showWeapons())
+                }
             }.root
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/io/stanwood/mhwdb/feature/container/ui/ContainerFragment.kt b/app/src/main/java/io/stanwood/mhwdb/feature/container/ui/ContainerFragment.kt
index d1719ca..12fa0e1 100644
--- a/app/src/main/java/io/stanwood/mhwdb/feature/container/ui/ContainerFragment.kt
+++ b/app/src/main/java/io/stanwood/mhwdb/feature/container/ui/ContainerFragment.kt
@@ -32,6 +32,7 @@ import dagger.android.support.AndroidSupportInjection
 import dagger.android.support.HasSupportFragmentInjector
 import io.stanwood.framework.arch.core.rx.subscribeBy
 import io.stanwood.framework.arch.di.factory.ViewModelFactory
+import io.stanwood.framework.arch.nav.syncWith
 import io.stanwood.framework.ui.extensions.setApplyWindowInsetsToChild
 import io.stanwood.mhwdb.R
 import io.stanwood.mhwdb.databinding.FragmentContainerBinding
@@ -68,6 +69,9 @@ class ContainerFragment : Fragment(), HasSupportFragmentInjector {
             .apply {
                 binding = this
                 root.setApplyWindowInsetsToChild()
+                childNavController?.let {
+                    binding?.bottomNav?.syncWith(it, lifecycle)
+                }
             }.root
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/io/stanwood/mhwdb/feature/container/vm/ContainerViewModel.kt b/app/src/main/java/io/stanwood/mhwdb/feature/container/vm/ContainerViewModel.kt
index 0e14c8a..b43372e 100644
--- a/app/src/main/java/io/stanwood/mhwdb/feature/container/vm/ContainerViewModel.kt
+++ b/app/src/main/java/io/stanwood/mhwdb/feature/container/vm/ContainerViewModel.kt
@@ -39,9 +39,8 @@ class ContainerViewModel @Inject constructor() : ViewModel {
         if (id == currentSelectedId) {
             true
         } else when (id) {
-            R.id.action_armor -> NavGraphContainerDirections.showArmor()
-            R.id.action_weapon -> NavGraphContainerDirections.showWeapons()
-            R.id.thirdItem -> NavGraphContainerDirections.showArmor()
+            R.id.armorFragment -> NavGraphContainerDirections.showArmor()
+            R.id.weaponsPagerFragment -> NavGraphContainerDirections.showWeapons()
             else -> null
         }
             ?.let {
diff --git a/app/src/main/res/drawable/ic_arrow_forward_white_24dp.xml b/app/src/main/res/drawable/ic_arrow_forward_white_24dp.xml
new file mode 100644
index 0000000..be188be
--- /dev/null
+++ b/app/src/main/res/drawable/ic_arrow_forward_white_24dp.xml
@@ -0,0 +1,31 @@
+<!--
+  ~ Copyright (c) 2019 stanwood GmbH
+  ~
+  ~ Permission is hereby granted, free of charge, to any person obtaining a copy
+  ~ of this software and associated documentation files (the "Software"), to deal
+  ~ 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.
+  -->
+
+<vector android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,4l-1.41,1.41L16.17,11H4v2h12.17l-5.58,5.59L12,20l8,-8z" />
+</vector>
diff --git a/app/src/main/res/layout/fragment_armor.xml b/app/src/main/res/layout/fragment_armor.xml
index 95ae5b7..35e2033 100644
--- a/app/src/main/res/layout/fragment_armor.xml
+++ b/app/src/main/res/layout/fragment_armor.xml
@@ -1,4 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2019 stanwood GmbH
+  ~
+  ~ Permission is hereby granted, free of charge, to any person obtaining a copy
+  ~ of this software and associated documentation files (the "Software"), to deal
+  ~ 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.
+  -->
+
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
@@ -11,6 +32,10 @@
         <variable
             name="retryCallback"
             type="android.view.View.OnClickListener" />
+
+        <variable
+            name="toWeaponsCallback"
+            type="android.view.View.OnClickListener" />
     </data>
 
 
@@ -38,6 +63,14 @@
             android:layout_height="match_parent"
             app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom|end"
+            android:layout_margin="16dp"
+            app:srcCompat="@drawable/ic_arrow_forward_white_24dp"
+            android:onClick="@{toWeaponsCallback}" />
+
         <include
             layout="@layout/layout_connection"
             app:retryCallback="@{retryCallback}"
diff --git a/app/src/main/res/menu/menu_container_navigation.xml b/app/src/main/res/menu/menu_container_navigation.xml
index 9492c14..ec0086b 100644
--- a/app/src/main/res/menu/menu_container_navigation.xml
+++ b/app/src/main/res/menu/menu_container_navigation.xml
@@ -1,19 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2019 stanwood GmbH
+  ~
+  ~ Permission is hereby granted, free of charge, to any person obtaining a copy
+  ~ of this software and associated documentation files (the "Software"), to deal
+  ~ 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.
+  -->
+
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-    <!-- TODO: Change ids and titles -->
+    <!-- note that these IDs match those from the appropriate destinations (note the missing + in @id!) -->
     <item
-        android:id="@+id/action_armor"
+        android:id="@id/armorFragment"
         android:icon="@mipmap/ic_launcher"
         android:title="@string/container_first_title"
         app:showAsAction="ifRoom" />
     <item
-        android:id="@+id/action_weapon"
+        android:id="@id/weaponsPagerFragment"
         android:icon="@mipmap/ic_launcher"
         android:title="@string/container_second_title"
         app:showAsAction="ifRoom" />
     <item
-        android:id="@+id/thirdItem"
+        android:id="@id/armorFragment"
         android:icon="@mipmap/ic_launcher"
         android:title="@string/container_third_title"
         app:showAsAction="ifRoom" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8fdbb9b..3f2498b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,11 +1,32 @@
+<!--
+  ~ Copyright (c) 2019 stanwood GmbH
+  ~
+  ~ Permission is hereby granted, free of charge, to any person obtaining a copy
+  ~ of this software and associated documentation files (the "Software"), to deal
+  ~ 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.
+  -->
+
 <resources>
     <string name="app_name">MhwDb</string>
     <string name="container_first_title">Armors</string>
     <string name="container_second_title">Weapons</string>
-    <string name="container_third_title">third</string>
+    <string name="container_third_title">Armors again</string>
     <string name="weapons_title">Weapons</string>
     <string name="armor_title">Armors</string>
-    <string name="error_no_connection">Keine Internetverbindung!</string>
-    <string name="error_unknown">Unbekannter Fehler</string>
-    <string name="error_response">Vorübergehender Serverfehler\nBitte versuche es später erneut.\nCode(%1$d)</string>
+    <string name="error_no_connection">No internet connection!</string>
+    <string name="error_unknown">Unexpected error</string>
+    <string name="error_response">Temporary server outage\nPlease try again later.\nCode(%1$d)</string>
 </resources>
diff --git a/nav/src/main/java/io/stanwood/framework/arch/nav/NavigationViewExtensions.kt b/nav/src/main/java/io/stanwood/framework/arch/nav/NavigationViewExtensions.kt
new file mode 100644
index 0000000..eebf73c
--- /dev/null
+++ b/nav/src/main/java/io/stanwood/framework/arch/nav/NavigationViewExtensions.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2019 stanwood GmbH
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * 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.
+ */
+
+package io.stanwood.framework.arch.nav
+
+import androidx.lifecycle.Lifecycle
+import androidx.navigation.NavController
+import com.google.android.material.bottomnavigation.BottomNavigationView
+import com.google.android.material.navigation.NavigationView
+
+fun BottomNavigationView.syncWith(navController: NavController, lifecycle: Lifecycle) {
+    lifecycle.addObserver(NavigationViewSyncer(navController, this))
+}
+
+fun NavigationView.syncWith(navController: NavController, lifecycle: Lifecycle) {
+    lifecycle.addObserver(NavigationViewSyncer(navController, null, this))
+}
\ No newline at end of file
diff --git a/nav/src/main/java/io/stanwood/framework/arch/nav/NavigationViewSyncer.kt b/nav/src/main/java/io/stanwood/framework/arch/nav/NavigationViewSyncer.kt
new file mode 100644
index 0000000..dc4f49f
--- /dev/null
+++ b/nav/src/main/java/io/stanwood/framework/arch/nav/NavigationViewSyncer.kt
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2019 stanwood GmbH
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * 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.
+ */
+
+package io.stanwood.framework.arch.nav
+
+import android.os.Bundle
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleObserver
+import androidx.lifecycle.OnLifecycleEvent
+import androidx.navigation.NavController
+import androidx.navigation.NavDestination
+import com.google.android.material.bottomnavigation.BottomNavigationView
+import com.google.android.material.navigation.NavigationView
+
+class NavigationViewSyncer(
+    val navController: NavController,
+    val bottomNav: BottomNavigationView? = null,
+    val navigationView: NavigationView? = null
+) : LifecycleObserver {
+
+    val destinationChangedListener: (NavController, NavDestination, Bundle?) -> Unit = { _, destination, _ ->
+        bottomNav?.also {
+            it.menu.findItem(destination.id)?.apply {
+                isChecked = true
+            }
+        }
+        navigationView?.also {
+            it.menu.findItem(destination.id)?.apply {
+                isChecked = true
+            }
+        }
+    }
+
+    @OnLifecycleEvent(Lifecycle.Event.ON_CREATE)
+    fun registerDestinationChangedListener() {
+        navController.addOnDestinationChangedListener(destinationChangedListener)
+    }
+
+    @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
+    fun unregisterDestinationChangedListener() {
+        navController.removeOnDestinationChangedListener(destinationChangedListener)
+    }
+}
\ No newline at end of file

From 23925e2b4041d19235e08aa6029c7eb1caa3a1d2 Mon Sep 17 00:00:00 2001
From: Sven Bendel <ubuntudroid@gmail.com>
Date: Thu, 18 Apr 2019 12:41:15 +0200
Subject: [PATCH 8/9] SFW-331 Use Navigation.createNavigationOnClickListener()
 for slicker click handling

---
 .../io/stanwood/mhwdb/feature/armors/ui/ArmorsFragment.kt  | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/io/stanwood/mhwdb/feature/armors/ui/ArmorsFragment.kt b/app/src/main/java/io/stanwood/mhwdb/feature/armors/ui/ArmorsFragment.kt
index 54fd8aa..28c8247 100644
--- a/app/src/main/java/io/stanwood/mhwdb/feature/armors/ui/ArmorsFragment.kt
+++ b/app/src/main/java/io/stanwood/mhwdb/feature/armors/ui/ArmorsFragment.kt
@@ -29,14 +29,13 @@ import androidx.core.content.res.ResourcesCompat
 import androidx.databinding.DataBindingComponent
 import androidx.fragment.app.Fragment
 import androidx.navigation.NavController
-import androidx.navigation.fragment.findNavController
+import androidx.navigation.Navigation
 import androidx.recyclerview.widget.LinearLayoutManager
 import dagger.android.DispatchingAndroidInjector
 import dagger.android.support.AndroidSupportInjection
 import dagger.android.support.HasSupportFragmentInjector
 import io.stanwood.framework.arch.core.rx.subscribeBy
 import io.stanwood.framework.arch.di.factory.ViewModelFactory
-import io.stanwood.mhwdb.NavGraphContainerDirections
 import io.stanwood.mhwdb.R
 import io.stanwood.mhwdb.databinding.FragmentArmorBinding
 import io.stanwood.mhwdb.feature.armors.vm.ArmorsViewModel
@@ -74,9 +73,7 @@ class ArmorsFragment : Fragment(), HasSupportFragmentInjector {
             .apply {
                 binding = this
                 retryCallback = View.OnClickListener { viewModel.retry() }
-                toWeaponsCallback = View.OnClickListener {
-                    findNavController().navigate(NavGraphContainerDirections.showWeapons())
-                }
+                toWeaponsCallback = Navigation.createNavigateOnClickListener(R.id.showWeapons)
             }.root
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {

From eae0268278dea3bbffe189e02b2e616c54f995f9 Mon Sep 17 00:00:00 2001
From: Sven Bendel <ubuntudroid@gmail.com>
Date: Thu, 18 Apr 2019 12:59:05 +0200
Subject: [PATCH 9/9] SFW-331 Update README

---
 nav/README.md | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/nav/README.md b/nav/README.md
index 72def34..4b118fe 100644
--- a/nav/README.md
+++ b/nav/README.md
@@ -2,4 +2,13 @@
 
 We handle navigation by means of the [Navigation Architecture Component](https://developer.android.com/topic/libraries/architecture/navigation/). 
 
-This library provides helper classes for simplified and more consistent navigation handling. This is mainly used by the IntelliJ plugin.
\ No newline at end of file
+This library provides helper classes for simplified and more consistent navigation handling. This is mainly used by the IntelliJ plugin.
+
+The central class is `NavigationTarget`. This class encapsulates navigation and can easily be extended for other means than classic Architecture Components supported navigation such as dialogs. A `NavigationTarget` is usally passed via RX from the ViewModel to the Fragment.
+
+In the Fragment you can use `NavigationTarget.navigate()` to execute navigation.
+
+Additionally this library brings some extension functions for BottomNavigationViews, NavigationViews and Toolbars which all help you when implementing navigation.
+
+The plugin supports you in setting all those things up.
+