From 2c867544aa32fe0deac0a4c3b2da1543357841db Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Tue, 14 Nov 2017 17:35:16 +0100
Subject: [PATCH] show stat points on correct menu item. Fixes #869

---
 Habitica/build.gradle                                     | 8 ++++----
 .../com/habitrpg/android/habitica/extensions/ViewExt.kt   | 8 +++++++-
 .../android/habitica/ui/activities/MainActivity.java      | 4 ++--
 build.gradle                                              | 2 +-
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index 77954efc1..cf6006298 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -66,10 +66,10 @@ dependencies {
     implementation('com.mikepenz:materialdrawer:5.8.3@aar') {
         transitive = true
     }
-    implementation 'com.android.support:appcompat-v7:27.0.0'
-    implementation 'com.android.support:design:27.0.0'
-    implementation 'com.android.support:recyclerview-v7:27.0.0'
-    implementation 'com.android.support:preference-v14:27.0.0'
+    implementation 'com.android.support:appcompat-v7:27.0.1'
+    implementation 'com.android.support:design:27.0.1'
+    implementation 'com.android.support:recyclerview-v7:27.0.1'
+    implementation 'com.android.support:preference-v14:27.0.1'
     //QR Code
     implementation 'com.github.kenglxn.QRGen:android:2.2.0'
     // Emojis
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/ViewExt.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/ViewExt.kt
index ce44cd8ba..93ec88a5b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/ViewExt.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/ViewExt.kt
@@ -1,9 +1,15 @@
 package com.habitrpg.android.habitica.extensions
 
 import android.content.Context
+import android.support.annotation.IdRes
 import android.view.View
 
 
-public fun View.setScaledPadding(context: Context?, left: Int, top: Int, right: Int, bottom: Int) {
+fun View.setScaledPadding(context: Context?, left: Int, top: Int, right: Int, bottom: Int) {
     this.setPadding(left.dpToPx(context), top.dpToPx(context), right.dpToPx(context), bottom.dpToPx(context))
 }
+
+fun <T : View> View.bindView(@IdRes res: Int) : Lazy<T> {
+    @Suppress("UNCHECKED_CAST")
+    return lazy(LazyThreadSafetyMode.NONE) { findViewById<T>(res) }
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java
index 8033abab2..49ba39db9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java
@@ -491,8 +491,8 @@ public class MainActivity extends BaseActivity implements TutorialView.OnTutoria
             }
             IDrawerItem statsItem = drawer.getDrawerItem(MainDrawerBuilder.INSTANCE.getSIDEBAR_STATS());
             PrimaryDrawerItem newStatsItem = new PrimaryDrawerItem()
-                    .withName(this.getString(R.string.sidebar_skills))
-                    .withIdentifier(MainDrawerBuilder.INSTANCE.getSIDEBAR_SKILLS());
+                    .withName(this.getString(R.string.sidebar_stats))
+                    .withIdentifier(MainDrawerBuilder.INSTANCE.getSIDEBAR_STATS());
             if (user.getStats() != null && user.getStats().lvl >= 0 && user.getStats().points > 0) {
                 newStatsItem = newStatsItem.withBadge(this.getString(R.string.available_stats, user.getStats().points));
             }
diff --git a/build.gradle b/build.gradle
index c0f53f478..51e051678 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.1.51'
+    ext.kotlin_version = '1.1.60'
     ext.build_tools_version = '26.0.2'
     ext.sdk_version = 26