Commit b3d089ce authored by Govind Dixit's avatar Govind Dixit

made requested changes

parent 9063863c
...@@ -44,7 +44,7 @@ import javax.inject.Inject ...@@ -44,7 +44,7 @@ import javax.inject.Inject
private const val CURRENT_STATE = "current_state" private const val CURRENT_STATE = "current_state"
class MainActivity : AppCompatActivity(), MainView, HasActivityInjector, class MainActivity : AppCompatActivity(), MainView, HasActivityInjector,
HasSupportFragmentInjector { HasSupportFragmentInjector {
@Inject @Inject
lateinit var activityDispatchingAndroidInjector: DispatchingAndroidInjector<Activity> lateinit var activityDispatchingAndroidInjector: DispatchingAndroidInjector<Activity>
@Inject @Inject
...@@ -105,13 +105,13 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector, ...@@ -105,13 +105,13 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector,
override fun activityInjector(): AndroidInjector<Activity> = activityDispatchingAndroidInjector override fun activityInjector(): AndroidInjector<Activity> = activityDispatchingAndroidInjector
override fun supportFragmentInjector(): AndroidInjector<Fragment> = override fun supportFragmentInjector(): AndroidInjector<Fragment> =
fragmentDispatchingAndroidInjector fragmentDispatchingAndroidInjector
override fun showUserStatus(userStatus: UserStatus) { override fun showUserStatus(userStatus: UserStatus) {
headerLayout.apply { headerLayout.apply {
image_user_status.setImageDrawable( image_user_status.setImageDrawable(
DrawableHelper.getUserStatusDrawable(userStatus, this.context) DrawableHelper.getUserStatusDrawable(userStatus, this.context)
) )
} }
} }
...@@ -121,7 +121,7 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector, ...@@ -121,7 +121,7 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector,
with(uiModel) { with(uiModel) {
if (userStatus != null) { if (userStatus != null) {
image_user_status.setImageDrawable( image_user_status.setImageDrawable(
DrawableHelper.getUserStatusDrawable(userStatus, context) DrawableHelper.getUserStatusDrawable(userStatus, context)
) )
} }
if (userDisplayName != null) { if (userDisplayName != null) {
...@@ -178,29 +178,29 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector, ...@@ -178,29 +178,29 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector,
override fun alertNotRecommendedVersion() { override fun alertNotRecommendedVersion() {
AlertDialog.Builder(this) AlertDialog.Builder(this)
.setMessage( .setMessage(
getString( getString(
R.string.msg_ver_not_recommended, R.string.msg_ver_not_recommended,
BuildConfig.RECOMMENDED_SERVER_VERSION BuildConfig.RECOMMENDED_SERVER_VERSION
)
) )
.setPositiveButton(R.string.msg_ok, null) )
.create() .setPositiveButton(R.string.msg_ok, null)
.show() .create()
.show()
} }
override fun blockAndAlertNotRequiredVersion() { override fun blockAndAlertNotRequiredVersion() {
AlertDialog.Builder(this) AlertDialog.Builder(this)
.setMessage( .setMessage(
getString( getString(
R.string.msg_ver_not_minimum, R.string.msg_ver_not_minimum,
BuildConfig.REQUIRED_SERVER_VERSION BuildConfig.REQUIRED_SERVER_VERSION
)
) )
.setOnDismissListener { presenter.logout() } )
.setPositiveButton(R.string.msg_ok, null) .setOnDismissListener { presenter.logout() }
.create() .setPositiveButton(R.string.msg_ok, null)
.show() .create()
.show()
} }
override fun invalidateToken(token: String) = invalidateFirebaseToken(token) override fun invalidateToken(token: String) = invalidateFirebaseToken(token)
...@@ -235,10 +235,10 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector, ...@@ -235,10 +235,10 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector,
fun showLogoutDialog() { fun showLogoutDialog() {
val builder = AlertDialog.Builder(this) val builder = AlertDialog.Builder(this)
builder.setTitle(R.string.title_are_you_sure) builder.setTitle(R.string.title_are_you_sure)
.setPositiveButton(R.string.action_logout) { _, _ -> presenter.logout() } .setPositiveButton(R.string.action_logout) { _, _ -> presenter.logout() }
.setNegativeButton(android.R.string.no) { dialog, _ -> dialog.cancel() } .setNegativeButton(android.R.string.no) { dialog, _ -> dialog.cancel() }
.create() .create()
.show() .show()
} }
fun setAvatar(avatarUrl: String) { fun setAvatar(avatarUrl: String) {
...@@ -254,7 +254,13 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector, ...@@ -254,7 +254,13 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector,
fun setCheckedNavDrawerItem(@IdRes item: Int) = view_navigation.setCheckedItem(item) fun setCheckedNavDrawerItem(@IdRes item: Int) = view_navigation.setCheckedItem(item)
override fun showProgress() { override fun showProgress() {
progressDialog = ProgressDialog.show(this, getString(R.string.app_name), getString(R.string.msg_log_out), true, false) progressDialog = ProgressDialog.show(
this,
getString(R.string.app_name),
getString(R.string.msg_log_out),
true,
false
)
} }
override fun hideProgress() { override fun hideProgress() {
...@@ -268,21 +274,27 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector, ...@@ -268,21 +274,27 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector,
val builder = AlertDialog.Builder(this) val builder = AlertDialog.Builder(this)
builder.setTitle("Choose Language") builder.setTitle("Choose Language")
builder.setSingleChoiceItems(languages, -1) { dialog, which -> builder.setSingleChoiceItems(languages, -1) { dialog, which ->
if (which == 0) { when(which){
setLocale("en") 0->{
recreate() setLocale("en")
} else if (which == 1) { recreate()
setLocale("hi") }
recreate() 1->{
} else if (which == 2) { setLocale("hi")
setLocale("ja") recreate()
recreate() }
} else if (which == 3) { 2->{
setLocale("ru") setLocale("ja")
recreate() recreate()
} else if (which == 4) { }
setLocale("it") 3->{
recreate() setLocale("ru")
recreate()
}
4->{
setLocale("it")
recreate()
}
} }
dialog.dismiss() dialog.dismiss()
} }
......
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