diff --git a/Habitica/build.gradle b/Habitica/build.gradle index 9ace1cc21..dd5a68efc 100644 --- a/Habitica/build.gradle +++ b/Habitica/build.gradle @@ -150,7 +150,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 2659 + versionCode 2663 versionName "3.1" } diff --git a/Habitica/res/drawable/rounded_purple_square.xml b/Habitica/res/drawable/rounded_purple_square.xml index 043026ceb..bed89759c 100644 --- a/Habitica/res/drawable/rounded_purple_square.xml +++ b/Habitica/res/drawable/rounded_purple_square.xml @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/Habitica/res/layout/widget_avatar_stats.xml b/Habitica/res/layout/widget_avatar_stats.xml index b3caffceb..c7aa396ed 100644 --- a/Habitica/res/layout/widget_avatar_stats.xml +++ b/Habitica/res/layout/widget_avatar_stats.xml @@ -193,7 +193,7 @@ android:layout_height="wrap_content" android:gravity="center" android:textSize="14sp" - android:textColor="?textColorSecondaryDark" /> + android:textColor="@color/textColorSecondaryDark" /> @@ -226,7 +226,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="8dp" - android:textColor="?textColorSecondaryDark" + android:textColor="@color/textColorSecondaryDark" style="@style/CurrencyTextView" /> @@ -239,7 +239,7 @@ android:id="@+id/gold_tv" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="?textColorSecondaryDark" + android:textColor="@color/textColorSecondaryDark" style="@style/CurrencyTextView" /> diff --git a/Habitica/res/layout/widget_habit_button.xml b/Habitica/res/layout/widget_habit_button.xml index c22f60cd6..63adf9e2f 100644 --- a/Habitica/res/layout/widget_habit_button.xml +++ b/Habitica/res/layout/widget_habit_button.xml @@ -27,6 +27,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@drawable/selection_highlight_brand" + android:textSize="24sp" /> diff --git a/Habitica/res/values/colors.xml b/Habitica/res/values/colors.xml index afc84de5c..fbc8e3eef 100644 --- a/Habitica/res/values/colors.xml +++ b/Habitica/res/values/colors.xml @@ -72,6 +72,8 @@ @color/yellow_100 @color/blue_100 + @color/brand_500 + #66000000 @color/text_ternary diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PurchaseHandler.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PurchaseHandler.kt index c6ed0b78b..53a40845d 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PurchaseHandler.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PurchaseHandler.kt @@ -149,7 +149,6 @@ class PurchaseHandler(activity: Activity, val crashlyticsProxy: CrashlyticsProxy private fun checkIfPendingPurchases() { billingRequests?.getAllPurchases(ProductTypes.IN_APP, object : RequestListener { override fun onSuccess(purchases: Purchases) { - crashlyticsProxy.logException(Exception(purchases.toJson())) for (purchase in purchases.list) { if (PurchaseTypes.allGemTypes.contains(purchase.sku)) { billingRequests?.consume(purchase.token, object : RequestListener { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/yesterdailies/YesterdailyDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/yesterdailies/YesterdailyDialog.kt index 70f7136ff..ce919afdd 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/yesterdailies/YesterdailyDialog.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/yesterdailies/YesterdailyDialog.kt @@ -84,6 +84,16 @@ class YesterdailyDialog private constructor(context: Context, private val userRe taskContainer.setOnClickListener { task.completed = !task.completed configureTaskView(taskView, task) + + if (task.checklist?.size ?: 0 > 0) { + val checklistContainer = taskView.findViewById(R.id.checklistView) + checklistContainer.removeAllViews() + for (item in task.checklist ?: emptyList()) { + val checklistView = inflater.inflate(R.layout.checklist_item_row, checklistContainer, false) as ViewGroup + configureChecklistView(checklistView, task, item) + checklistContainer.addView(checklistView) + } + } } if (task.checklist?.size ?: 0 > 0) { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AvatarStatsWidgetProvider.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AvatarStatsWidgetProvider.kt index 7ed7285a4..bdc920cb8 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AvatarStatsWidgetProvider.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AvatarStatsWidgetProvider.kt @@ -113,10 +113,10 @@ class AvatarStatsWidgetProvider : BaseWidgetProvider() { avatarView.setAvatar(user) val finalRemoteViews = remoteViews - avatarView.onAvatarImageReady({ bitmap -> + avatarView.onAvatarImageReady { bitmap -> finalRemoteViews.setImageViewBitmap(R.id.avatar_view, bitmap) appWidgetManager.partiallyUpdateAppWidget(allWidgetIds, finalRemoteViews) - }) + } //If user click on life and xp: open the app val openAppIntent = Intent(context.applicationContext, MainActivity::class.java)