From 8f28ad9cf358002b2eddcdc36beab82ffa816632 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Tue, 12 Nov 2019 15:48:42 +0100 Subject: [PATCH] Fix minor issues --- Habitica/build.gradle | 2 +- .../fragments/purchases/GiftBalanceGemsFragment.kt | 14 ++++++++------ .../skills/SkillTasksRecyclerViewFragment.kt | 7 +------ 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/Habitica/build.gradle b/Habitica/build.gradle index cfe519dbf..ca803df03 100644 --- a/Habitica/build.gradle +++ b/Habitica/build.gradle @@ -151,7 +151,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 2296 + versionCode 2299 versionName "2.3" } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GiftBalanceGemsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GiftBalanceGemsFragment.kt index 9591267ae..60ff0ed88 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GiftBalanceGemsFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GiftBalanceGemsFragment.kt @@ -59,11 +59,13 @@ class GiftBalanceGemsFragment : BaseFragment() { } private fun sendGift() { - val amount = giftEditText.text.toString().toInt() - giftedMember?.id?.let { - compositeSubscription.add(socialRepository.transferGems(it, amount).subscribe(Consumer { - onCompleted?.invoke() - }, RxErrorHandler.handleEmptyError())) - } + try { + val amount = giftEditText.text.toString().toInt() + giftedMember?.id?.let { + compositeSubscription.add(socialRepository.transferGems(it, amount).subscribe(Consumer { + onCompleted?.invoke() + }, RxErrorHandler.handleEmptyError())) + } + } catch (ignored: NumberFormatException) {} } } \ No newline at end of file diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillTasksRecyclerViewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillTasksRecyclerViewFragment.kt index 39d356626..fafed249e 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillTasksRecyclerViewFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillTasksRecyclerViewFragment.kt @@ -4,7 +4,6 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import androidx.core.content.ContextCompat import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.habitrpg.android.habitica.R @@ -71,11 +70,7 @@ class SkillTasksRecyclerViewFragment : BaseFragment() { }, RxErrorHandler.handleEmptyError())) recyclerView?.adapter = adapter - context?.let { - recyclerView?.setBackgroundColor(ContextCompat.getColor(it, R.color.blue_5)) - } - - compositeSubscription.add(tasks.firstElement().subscribe(Consumer { + compositeSubscription.add(tasks.subscribe(Consumer { adapter.updateData(it) }, RxErrorHandler.handleEmptyError())) }