Merge branch 'develop' into rtl_bug

f7f9f91c · Filipe de Lima Brito · GitHub · 02d52c8f · 28044ea6 · f7f9f91c
Unverified Commit f7f9f91c authored Mar 08, 2019 by Filipe de Lima Brito Committed by GitHub Mar 08, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

AboutFragment.kt ...c/main/java/chat/rocket/android/about/ui/AboutFragment.kt +5 -1

No files found.
--- a/app/src/main/java/chat/rocket/android/about/ui/AboutFragment.kt
+++ b/app/src/main/java/chat/rocket/android/about/ui/AboutFragment.kt
@@ -34,12 +34,16 @@ class AboutFragment : Fragment() {

    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
        super.onViewCreated(view, savedInstanceState)
-        setupToolbar()
        setupViews()

        analyticsManager.logScreenView(ScreenViewEvent.About)
    }

+    override fun onResume() {
+        super.onResume()
+        setupToolbar()
+    }
+
    private fun setupViews() {
        text_version_name.text = BuildConfig.VERSION_NAME
        text_build_number.text = getString(