Skip to content

Commit

Permalink
Merge pull request #4 from IamRezaMousavi/fix-lang-bug
Browse files Browse the repository at this point in the history
Fix Language Bugs
  • Loading branch information
IamRezaMousavi authored Apr 12, 2024
2 parents 3482981 + d62d8bf commit 50df5bb
Showing 4 changed files with 35 additions and 1 deletion.
Original file line number Diff line number Diff line change
@@ -105,7 +105,7 @@ class MainActivity : AppCompatActivity() {
}

LangData.language.observe(this) {
// TODO
// TODO: Change Language in settings page must change language here too
}
}

Original file line number Diff line number Diff line change
@@ -1,18 +1,30 @@
package com.github.iamrezamousavi.mafia.view

import android.content.Context
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import androidx.recyclerview.widget.DefaultItemAnimator
import androidx.recyclerview.widget.DividerItemDecoration
import androidx.recyclerview.widget.LinearLayoutManager
import com.github.iamrezamousavi.mafia.data.model.NarratorItem
import com.github.iamrezamousavi.mafia.databinding.ActivityNarratorBinding
import com.github.iamrezamousavi.mafia.utils.LangData
import com.github.iamrezamousavi.mafia.utils.PlayersData
import com.github.iamrezamousavi.mafia.view.adapter.PlayerRoleAdapter
import com.github.iamrezamousavi.mafia.viewmodel.SettingsViewModel

class NarratorActivity : AppCompatActivity() {

private lateinit var binding: ActivityNarratorBinding

override fun attachBaseContext(newBase: Context?) {
newBase?.let { context ->
val settingsViewModel = SettingsViewModel(context)
LangData.getContextWrapper(context, settingsViewModel.language.code)
}
super.attachBaseContext(newBase)
}

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
binding = ActivityNarratorBinding.inflate(layoutInflater)
Original file line number Diff line number Diff line change
@@ -1,23 +1,34 @@
package com.github.iamrezamousavi.mafia.view

import android.content.Context
import android.content.Intent
import android.os.Bundle
import android.widget.Toast
import androidx.appcompat.app.AppCompatActivity
import androidx.recyclerview.widget.GridLayoutManager
import com.github.iamrezamousavi.mafia.R
import com.github.iamrezamousavi.mafia.databinding.ActivityPlayerRoleBinding
import com.github.iamrezamousavi.mafia.utils.LangData
import com.github.iamrezamousavi.mafia.utils.PlayersData
import com.github.iamrezamousavi.mafia.view.adapter.PlayerNameAdapter
import com.github.iamrezamousavi.mafia.view.dialog.PlayerDialog
import com.github.iamrezamousavi.mafia.view.dialog.RoleDoneDialog
import com.github.iamrezamousavi.mafia.viewmodel.SettingsViewModel

class PlayerRoleActivity : AppCompatActivity() {

private lateinit var binding: ActivityPlayerRoleBinding

private lateinit var playerNameAdapter: PlayerNameAdapter

override fun attachBaseContext(newBase: Context?) {
newBase?.let { context ->
val settingsViewModel = SettingsViewModel(context)
LangData.getContextWrapper(context, settingsViewModel.language.code)
}
super.attachBaseContext(newBase)
}

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
binding = ActivityPlayerRoleBinding.inflate(layoutInflater)
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
package com.github.iamrezamousavi.mafia.view

import android.content.Context
import android.os.Bundle
import android.widget.Toast
import androidx.activity.viewModels
import androidx.appcompat.app.AppCompatActivity
import com.github.iamrezamousavi.mafia.R
import com.github.iamrezamousavi.mafia.data.model.Role
import com.github.iamrezamousavi.mafia.databinding.ActivityRoleBinding
import com.github.iamrezamousavi.mafia.utils.LangData
import com.github.iamrezamousavi.mafia.utils.MafiaError
import com.github.iamrezamousavi.mafia.utils.getRoleId
import com.github.iamrezamousavi.mafia.view.dialog.RoleDialog
import com.github.iamrezamousavi.mafia.viewmodel.RoleViewModel
import com.github.iamrezamousavi.mafia.viewmodel.SettingsViewModel
import com.google.android.material.chip.Chip

class RoleActivity : AppCompatActivity() {
@@ -19,6 +22,14 @@ class RoleActivity : AppCompatActivity() {

private val roleViewModel: RoleViewModel by viewModels { RoleViewModel.Factory }

override fun attachBaseContext(newBase: Context?) {
newBase?.let { context ->
val settingsViewModel = SettingsViewModel(context)
LangData.getContextWrapper(context, settingsViewModel.language.code)
}
super.attachBaseContext(newBase)
}

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
binding = ActivityRoleBinding.inflate(layoutInflater)

0 comments on commit 50df5bb

Please # to comment.