better world state syncing

HabitRPG · Nov 4, 2024 · 8759bf2 · 8759bf2
1 parent e4bf648
commit 8759bf2
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 deletions.
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
@@ -1560,6 +1560,10 @@
     <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="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">
         <item quantity="zero">You</item>

diff --git a/...tica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt b/...tica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt
@@ -205,6 +205,11 @@ class NavigationDrawerFragment : DialogFragment() {
                                 "spring" -> R.string.spring
                                 "summer" -> R.string.summer
                                 "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
                             }
                             seasonalItem.pillText = requireContext().getString(seasonID)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/TasksViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/TasksViewModel.kt
@@ -7,6 +7,7 @@ import androidx.core.content.edit
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
 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.TaskRepository
 import com.habitrpg.android.habitica.data.UserRepository
@@ -42,6 +43,7 @@ class TasksViewModel
         val tagRepository: TagRepository,
         val appConfigManager: AppConfigManager,
         val sharedPreferences: SharedPreferences,
+        val contentRepository: ContentRepository
     ) : BaseViewModel(userRepository, userViewModel), GroupPlanInfoProvider {
         private var owners: List<Pair<String, CharSequence>> = listOf()
         var canSwitchOwners = MutableLiveData<Boolean?>()
@@ -90,6 +92,7 @@ class TasksViewModel
                     if (activeFilters[TaskType.TODO] == Task.FILTER_COMPLETED) {
                         taskRepository.retrieveCompletedTodos()
                     }
+                    contentRepository.retrieveWorldState()
                 } else {
                     userRepository.retrieveTeamPlan(ownerID.value ?: "")
                 }

diff --git a/fastlane/README.md b/fastlane/README.md
@@ -63,14 +63,6 @@ Submit a new Beta Build to 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.

diff --git a/version.properties b/version.properties
@@ -1,2 +1,2 @@
 NAME=4.5.0
-CODE=8771
+CODE=8781