Skip to content

Commit e67bf15

Browse files
committed
Fixed bugs
1 parent 9ae273b commit e67bf15

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

Diff for: app/src/main/java/com/example/basicapp/ui/viewmodel/TaskViewModel.kt

+10-10
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import android.content.Context
55
import android.location.Geocoder
66
import androidx.lifecycle.*
77
import androidx.work.*
8+
import com.example.basicapp.R
89
import com.example.basicapp.data.model.TaskPriority
910
import com.example.basicapp.data.room.TaskDao
1011
import com.example.basicapp.data.model.Task
@@ -19,6 +20,7 @@ import java.util.concurrent.TimeUnit
1920

2021
class TaskViewModel(private val taskDao: TaskDao, application: Application) : ViewModel() {
2122

23+
val context: Context = application.applicationContext
2224
private val tasksSortedByDate: LiveData<List<Task>> = taskDao.getItemsByTime().asLiveData()
2325
private val tasksSortedByPriority: LiveData<List<Task>> =
2426
taskDao.getItemByPriority().asLiveData()
@@ -152,9 +154,9 @@ class TaskViewModel(private val taskDao: TaskDao, application: Application) : Vi
152154

153155
fun setSelectedPriority(menuItemPosition : Int) {
154156
when(menuItemPosition) {
155-
0 -> _selectedPriority.value = "Low priority"
156-
1 -> _selectedPriority.value = "Medium priority"
157-
else -> _selectedPriority.value = "High priority"
157+
0 -> _selectedPriority.value = context.getString(R.string.low_priority)
158+
1 -> _selectedPriority.value = context.getString(R.string.medium_priority)
159+
else -> _selectedPriority.value = context.getString(R.string.high_priority)
158160
}
159161
}
160162

@@ -168,19 +170,17 @@ class TaskViewModel(private val taskDao: TaskDao, application: Application) : Vi
168170

169171
fun taskPriority(selectedPriority: String): TaskPriority {
170172
return when (selectedPriority) {
171-
"Low priority" -> TaskPriority.LOW
172-
"Prioridad baja" -> TaskPriority.LOW
173-
"Medium priority" -> TaskPriority.MEDIUM
174-
"Prioridad mediana" -> TaskPriority.MEDIUM
173+
context.getString(R.string.low_priority) -> TaskPriority.LOW
174+
context.getString(R.string.medium_priority) -> TaskPriority.MEDIUM
175175
else -> TaskPriority.HIGH
176176
}
177177
}
178178

179179
fun taskPriorityString(taskPriority: TaskPriority): String {
180180
return when (taskPriority) {
181-
TaskPriority.LOW -> "Low priority"
182-
TaskPriority.MEDIUM -> "Medium priority"
183-
else -> "High priority"
181+
TaskPriority.LOW -> context.getString(R.string.low_priority)
182+
TaskPriority.MEDIUM -> context.getString(R.string.medium_priority)
183+
else -> context.getString(R.string.high_priority)
184184
}
185185
}
186186

0 commit comments

Comments
 (0)