diff --git a/Habitica/build.gradle b/Habitica/build.gradle index 76a35fd5d..5c8b52cfb 100644 --- a/Habitica/build.gradle +++ b/Habitica/build.gradle @@ -146,7 +146,7 @@ android { buildConfigField "String", "TESTING_LEVEL", "\"production\"" resConfigs "en", "bg", "de", "en-rGB", "es", "fr", "hr-rHR", "in", "it", "iw", "ja", "ko", "lt", "nl", "pl", "pt-rBR", "pt-rPT", "ru", "tr", "zh", "zh-rTW" - versionCode 2971 + versionCode 2973 versionName "3.3" } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/ChallengeMembership.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/ChallengeMembership.kt index 98ca67621..529dc0806 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/ChallengeMembership.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/ChallengeMembership.kt @@ -16,16 +16,4 @@ open class ChallengeMembership : RealmObject, BaseObject { } constructor() : super() - - override fun equals(other: Any?): Boolean { - return if (other is ChallengeMembership) { - this.userID == other.userID && challengeID == other.challengeID - } else super.equals(other) - } - - override fun hashCode(): Int { - var result = userID.hashCode() - result = 31 * result + challengeID.hashCode() - return result - } } \ No newline at end of file diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/ToolbarColorHelper.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/ToolbarColorHelper.kt index 106948dee..0a3ffa987 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/ToolbarColorHelper.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/ToolbarColorHelper.kt @@ -114,8 +114,4 @@ object ToolbarColorHelper { overflowViewParent.overflowIcon?.setTintMode(PorterDuff.Mode.SRC_ATOP) } } - - private fun removeOnGlobalLayoutListener(v: View, listener: OnGlobalLayoutListener) { - v.viewTreeObserver.removeOnGlobalLayoutListener(listener) - } } \ No newline at end of file