mirror of
https://github.com/sudoxnym/habitica-android.git
synced 2026-04-15 12:16:31 +00:00
better world state syncing
This commit is contained in:
parent
e4bf648095
commit
8759bf2a67
5 changed files with 13 additions and 9 deletions
|
|
@ -1560,6 +1560,10 @@
|
||||||
<string name="rescrubscribe_to_pick_up">Resubscribe to pick up where you left off!</string>
|
<string name="rescrubscribe_to_pick_up">Resubscribe to pick up where you left off!</string>
|
||||||
<string name="gem_cap_extra">%d/%d Gem Cap</string>
|
<string name="gem_cap_extra">%d/%d Gem Cap</string>
|
||||||
<string name="open_habitica_website">Open Habitica Website</string>
|
<string name="open_habitica_website">Open Habitica Website</string>
|
||||||
|
<string name="nye">New Year\'s Eve</string>
|
||||||
|
<string name="valentines">Valentines</string>
|
||||||
|
<string name="habitoween" translatable="false">Habitoween</string>
|
||||||
|
<string name="turkey_day">Turkey Day</string>
|
||||||
|
|
||||||
<plurals name="you_x_others">
|
<plurals name="you_x_others">
|
||||||
<item quantity="zero">You</item>
|
<item quantity="zero">You</item>
|
||||||
|
|
|
||||||
|
|
@ -205,6 +205,11 @@ class NavigationDrawerFragment : DialogFragment() {
|
||||||
"spring" -> R.string.spring
|
"spring" -> R.string.spring
|
||||||
"summer" -> R.string.summer
|
"summer" -> R.string.summer
|
||||||
"fall" -> R.string.fall
|
"fall" -> R.string.fall
|
||||||
|
"nye" -> R.string.nye
|
||||||
|
"birthday" -> R.string.winter
|
||||||
|
"valentines" -> R.string.valentines
|
||||||
|
"habitoween" -> R.string.habitoween
|
||||||
|
"thanksgiving" -> R.string.turkey_day
|
||||||
else -> R.string.open
|
else -> R.string.open
|
||||||
}
|
}
|
||||||
seasonalItem.pillText = requireContext().getString(seasonID)
|
seasonalItem.pillText = requireContext().getString(seasonID)
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,7 @@ import androidx.core.content.edit
|
||||||
import androidx.lifecycle.MutableLiveData
|
import androidx.lifecycle.MutableLiveData
|
||||||
import androidx.lifecycle.viewModelScope
|
import androidx.lifecycle.viewModelScope
|
||||||
import com.habitrpg.android.habitica.R
|
import com.habitrpg.android.habitica.R
|
||||||
|
import com.habitrpg.android.habitica.data.ContentRepository
|
||||||
import com.habitrpg.android.habitica.data.TagRepository
|
import com.habitrpg.android.habitica.data.TagRepository
|
||||||
import com.habitrpg.android.habitica.data.TaskRepository
|
import com.habitrpg.android.habitica.data.TaskRepository
|
||||||
import com.habitrpg.android.habitica.data.UserRepository
|
import com.habitrpg.android.habitica.data.UserRepository
|
||||||
|
|
@ -42,6 +43,7 @@ class TasksViewModel
|
||||||
val tagRepository: TagRepository,
|
val tagRepository: TagRepository,
|
||||||
val appConfigManager: AppConfigManager,
|
val appConfigManager: AppConfigManager,
|
||||||
val sharedPreferences: SharedPreferences,
|
val sharedPreferences: SharedPreferences,
|
||||||
|
val contentRepository: ContentRepository
|
||||||
) : BaseViewModel(userRepository, userViewModel), GroupPlanInfoProvider {
|
) : BaseViewModel(userRepository, userViewModel), GroupPlanInfoProvider {
|
||||||
private var owners: List<Pair<String, CharSequence>> = listOf()
|
private var owners: List<Pair<String, CharSequence>> = listOf()
|
||||||
var canSwitchOwners = MutableLiveData<Boolean?>()
|
var canSwitchOwners = MutableLiveData<Boolean?>()
|
||||||
|
|
@ -90,6 +92,7 @@ class TasksViewModel
|
||||||
if (activeFilters[TaskType.TODO] == Task.FILTER_COMPLETED) {
|
if (activeFilters[TaskType.TODO] == Task.FILTER_COMPLETED) {
|
||||||
taskRepository.retrieveCompletedTodos()
|
taskRepository.retrieveCompletedTodos()
|
||||||
}
|
}
|
||||||
|
contentRepository.retrieveWorldState()
|
||||||
} else {
|
} else {
|
||||||
userRepository.retrieveTeamPlan(ownerID.value ?: "")
|
userRepository.retrieveTeamPlan(ownerID.value ?: "")
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -63,14 +63,6 @@ Submit a new Beta Build to Google Play
|
||||||
|
|
||||||
Deploy a new version to the Google Play
|
Deploy a new version to the Google Play
|
||||||
|
|
||||||
### android upload_to_slack
|
|
||||||
|
|
||||||
```sh
|
|
||||||
[bundle exec] fastlane android upload_to_slack
|
|
||||||
```
|
|
||||||
|
|
||||||
Upload the latest output APK to slack
|
|
||||||
|
|
||||||
----
|
----
|
||||||
|
|
||||||
This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run.
|
This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run.
|
||||||
|
|
|
||||||
|
|
@ -1,2 +1,2 @@
|
||||||
NAME=4.5.0
|
NAME=4.5.0
|
||||||
CODE=8771
|
CODE=8781
|
||||||
Loading…
Reference in a new issue