Merge branch 'develop' into layout

11f67b6e · Hussein El Feky · GitHub · 83a5476a · e15b75db · 11f67b6e
Unverified Commit 11f67b6e authored May 06, 2019 by Hussein El Feky Committed by GitHub May 06, 2019
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

MainActivity.kt ...src/main/java/chat/rocket/android/main/ui/MainActivity.kt +2 -2

No files found.
--- a/app/src/main/java/chat/rocket/android/main/ui/MainActivity.kt
+++ b/app/src/main/java/chat/rocket/android/main/ui/MainActivity.kt
@@ -27,7 +27,7 @@ class MainActivity : AppCompatActivity(), HasActivityInjector,
    @Inject
    lateinit var activityDispatchingAndroidInjector: DispatchingAndroidInjector<Activity>
    @Inject
-    lateinit var fagmentDispatchingAndroidInjector: DispatchingAndroidInjector<Fragment>
+    lateinit var fragmentDispatchingAndroidInjector: DispatchingAndroidInjector<Fragment>
    @Inject
    lateinit var presenter: MainPresenter

@@ -56,7 +56,7 @@ class MainActivity : AppCompatActivity(), HasActivityInjector,
        activityDispatchingAndroidInjector

    override fun supportFragmentInjector(): AndroidInjector<Fragment> =
-        fagmentDispatchingAndroidInjector
+        fragmentDispatchingAndroidInjector

    override fun updateLanguage(language: String, country: String?) {
        val locale: Locale = if (country != null) {