From 95c9590be4d1baaaade6f404196aa13e4db2c036 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Wed, 25 Mar 2020 10:51:49 +0100
Subject: [PATCH] Fix crash in shops

---
 Habitica/build.gradle                                     | 2 +-
 .../habitrpg/android/habitica/models/user/Preferences.kt  | 3 ++-
 .../android/habitica/ui/viewHolders/SectionViewHolder.kt  | 8 ++------
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index dcdbfa64f..8631a26a5 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -155,7 +155,7 @@ android {
         multiDexEnabled true
         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 2388
+        versionCode 2390
         versionName "2.5"
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.kt
index 9b4a87f3e..8d450cfc4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.kt
@@ -6,6 +6,7 @@ import com.habitrpg.android.habitica.models.AvatarPreferences
 
 import io.realm.RealmObject
 import io.realm.annotations.PrimaryKey
+import java.util.*
 
 open class Preferences : RealmObject(), AvatarPreferences {
 
@@ -121,6 +122,6 @@ open class Preferences : RealmObject(), AvatarPreferences {
     }
 
     fun hasTaskBasedAllocation(): Boolean {
-        return allocationMode?.toLowerCase() == "taskbased" && automaticAllocation
+        return allocationMode?.toLowerCase(Locale.ROOT) == "taskbased" && automaticAllocation
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/SectionViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/SectionViewHolder.kt
index b05085a9a..59c3f0b14 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/SectionViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/SectionViewHolder.kt
@@ -1,20 +1,17 @@
 package com.habitrpg.android.habitica.ui.viewHolders
 
 import android.content.Context
-import androidx.recyclerview.widget.RecyclerView
 import android.view.View
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
-import android.widget.Button
 import android.widget.Spinner
 import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
 import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.databinding.CustomizationSectionHeaderBinding
 import com.habitrpg.android.habitica.ui.helpers.bindView
 
 class SectionViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
 
-    private val binding = CustomizationSectionHeaderBinding.bind(itemView)
     private val label: TextView by bindView(itemView, R.id.label)
     private val selectionSpinner: Spinner? by bindView(itemView, R.id.classSelectionSpinner)
     internal val notesView: TextView? by bindView(itemView, R.id.headerNotesView)
@@ -23,7 +20,7 @@ class SectionViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
     var spinnerSelectionChanged: (() -> Unit)? = null
 
     init {
-        binding.purchaseSetButton.visibility = View.GONE
+        itemView.findViewById<View?>(R.id.purchaseSetButton)?.visibility = View.GONE
         selectionSpinner?.onItemSelectedListener = object: AdapterView.OnItemSelectedListener {
             override fun onNothingSelected(parent: AdapterView<*>?) {
                 spinnerSelectionChanged?.invoke()
@@ -33,7 +30,6 @@ class SectionViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
                 spinnerSelectionChanged?.invoke()
             }
         }
-
     }
 
     fun bind(title: String) {