diff --git a/Habitica/res/values/strings.tutorial.xml b/Habitica/res/values/strings.tutorial.xml index d27624738..fe1e06ca3 100644 --- a/Habitica/res/values/strings.tutorial.xml +++ b/Habitica/res/values/strings.tutorial.xml @@ -20,4 +20,5 @@ This is where you and your friends can hold each other accountable to your goals and fight monsters with your tasks! Welcome to the Tavern, a public, all-ages chatroom! Here you can chat about productivity and ask questions. Have fun! Choose to become a Warrior, Mage, Healer, or Rogue! Each class has unique equipment and skills. Tap the (?) to learn more! + Tap the gray button to allocate lots of your stats at once, or tap the arrows to add them one point at a time. \ No newline at end of file diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/TutorialStep.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/TutorialStep.java deleted file mode 100644 index 7dc5e8dfe..000000000 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/TutorialStep.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.habitrpg.android.habitica.models; - -import com.habitrpg.android.habitica.models.user.Flags; - -import java.util.Date; - -import io.realm.RealmObject; -import io.realm.annotations.PrimaryKey; - -public class TutorialStep extends RealmObject { - - public Flags flags; - @PrimaryKey - private String key; - private String tutorialGroup, identifier; - private boolean wasCompleted; - private Date displayedOn; - - public String getKey() { - return key; - } - - public void setKey(String key) { - this.key = key; - } - - public String getTutorialGroup() { - return tutorialGroup; - } - - public void setTutorialGroup(String group) { - this.tutorialGroup = group; - this.key = group + "_" + this.identifier; - } - - public String getIdentifier() { - return identifier; - } - - public void setIdentifier(String identifier) { - this.identifier = identifier; - this.key = this.tutorialGroup + "_" + identifier; - } - - public boolean getWasCompleted() { - return wasCompleted; - } - - public void setWasCompleted(boolean wasCompleted) { - this.wasCompleted = wasCompleted; - } - - public Date getDisplayedOn() { - return displayedOn; - } - - public void setDisplayedOn(Date displayedOn) { - this.displayedOn = displayedOn; - } - - public boolean shouldDisplay() { - return !this.getWasCompleted() && (this.getDisplayedOn() == null || (new Date().getTime() - this.getDisplayedOn().getTime()) > 86400000); - } -} diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/TutorialStep.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/TutorialStep.kt new file mode 100644 index 000000000..65d38119a --- /dev/null +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/TutorialStep.kt @@ -0,0 +1,29 @@ +package com.habitrpg.android.habitica.models + +import com.habitrpg.android.habitica.models.user.Flags + +import java.util.Date + +import io.realm.RealmObject +import io.realm.annotations.PrimaryKey + +open class TutorialStep : RealmObject() { + + @PrimaryKey + var key: String? = null + var tutorialGroup: String? = null + set(group) { + field = group + this.key = group + "_" + this.identifier + } + var identifier: String? = null + set(identifier) { + field = identifier + this.key = this.tutorialGroup + "_" + identifier + } + var wasCompleted: Boolean = false + var displayedOn: Date? = null + + fun shouldDisplay(): Boolean = + !this.wasCompleted && (this.displayedOn == null || Date().time - this.displayedOn!!.time > 86400000) +} diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt index 5a144ecfb..95df81b26 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt @@ -57,6 +57,10 @@ class StatsFragment: BaseMainFragment() { override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { super.onCreateView(inflater, container, savedInstanceState) hideToolbar() + + tutorialStepIdentifier = "stats" + tutorialText = getString(R.string.tutorial_stats) + return container?.inflate(R.layout.fragment_stats) }