sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-07-14 02:01:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix task form issues

Browse source
This commit is contained in:
Phillip Thelen 2019-04-26 10:48:21 +02:00
parent 6640e570b5
commit b94549684d
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.kt
View file

@ -7,6 +7,7 @@ import io.reactivex.Maybe
import io.realm.Realm
import io.realm.RealmObject
import io.realm.RealmResults
import io.realm.Sort
class RealmTaskLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm), TaskLocalRepository {
@ -14,7 +15,7 @@ class RealmTaskLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm),
return realm.where(Task::class.java)
.equalTo("type", taskType)
.equalTo("userId", userID)
.sort("position")
.sort("position", Sort.ASCENDING, "dateCreated", Sort.DESCENDING)
.findAll()
.asFlowable()
.filter { it.isLoaded }
@ -23,7 +24,7 @@ class RealmTaskLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm),
override fun getTasks(userId: String): Flowable<RealmResults<Task>> {
return realm.where(Task::class.java).equalTo("userId", userId)
.sort("position")
.sort("position", Sort.ASCENDING, "dateCreated", Sort.DESCENDING)
.findAll()
.asFlowable()
.filter { it.isLoaded }

1
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt
View file

@ -323,6 +323,7 @@ class TaskFormActivity : BaseActivity() {
if (thisTask == null) {
thisTask = Task()
thisTask.type = taskType
thisTask.dateCreated = Date()
}
thisTask.text = textEditText.text.toString()
thisTask.notes = notesEditText.text.toString()

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskSchedulingControls.kt
View file

@ -75,7 +75,7 @@ class TaskSchedulingControls @JvmOverloads constructor(
configureViewsForFrequency()
}
var everyX
get() = (repeatsEveryEdittext.text ?: "1").toString().toInt()
get() = (repeatsEveryEdittext.text ?: "1").toString().toIntOrNull() ?: 1
set(value) {
try {
repeatsEveryEdittext.setText(value.toString())