Skip to content

A
AloqaIM-Android
Unverified Commit 11f67b6e authored by Hussein El Feky's avatar Hussein El Feky Committed by GitHub
Browse files
Options

Merge branch 'develop' into layout

parents 83a5476a e15b75db
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
app/src/main/java/chat/rocket/android/main/ui/MainActivity.kt
View file @ 11f67b6e
...@@ -27,7 +27,7 @@ class MainActivity : AppCompatActivity(), HasActivityInjector, ...@@ -27,7 +27,7 @@ class MainActivity : AppCompatActivity(), HasActivityInjector,
@Inject @Inject
lateinit var activityDispatchingAndroidInjector: DispatchingAndroidInjector<Activity> lateinit var activityDispatchingAndroidInjector: DispatchingAndroidInjector<Activity>
@Inject @Inject
lateinit var fagmentDispatchingAndroidInjector: DispatchingAndroidInjector<Fragment> lateinit var fragmentDispatchingAndroidInjector: DispatchingAndroidInjector<Fragment>
@Inject @Inject
lateinit var presenter: MainPresenter lateinit var presenter: MainPresenter
...@@ -56,7 +56,7 @@ class MainActivity : AppCompatActivity(), HasActivityInjector, ...@@ -56,7 +56,7 @@ class MainActivity : AppCompatActivity(), HasActivityInjector,
activityDispatchingAndroidInjector activityDispatchingAndroidInjector
override fun supportFragmentInjector(): AndroidInjector<Fragment> = override fun supportFragmentInjector(): AndroidInjector<Fragment> =
fagmentDispatchingAndroidInjector fragmentDispatchingAndroidInjector
override fun updateLanguage(language: String, country: String?) { override fun updateLanguage(language: String, country: String?) {
val locale: Locale = if (country != null) { val locale: Locale = if (country != null) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023