sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-07-17 11:32:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix unequipping backgrounds

Browse source
This commit is contained in:
Phillip Thelen 2020-11-16 12:00:42 +01:00
parent db1e8cccd6
commit 93d119f8b0
5 changed files with 44 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Habitica/build.gradle
View file

@ -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 2632
versionCode 2635
versionName "3.1"
}

2
Habitica/res/layout/checklist_item_row.xml
View file

@ -30,7 +30,7 @@
android:scaleType="center"
android:src="@drawable/checkmark" />
</FrameLayout>
<com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
<com.habitrpg.android.habitica.ui.views.EllipsisTextView
android:id="@+id/checkedTextView"
style="@style/Body2"
android:layout_width="match_parent"

60
Habitica/res/layout/customization_grid_background_item.xml
View file

@ -1,36 +1,42 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/card_view"
style="@style/FlatCardView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_width="match_parent">
<RelativeLayout
android:id="@+id/linearLayout"
android:layout_width="match_parent"
android:minHeight="60dp">
<LinearLayout
android:id="@+id/wrapper"
android:layout_width="76dp"
android:layout_height="wrap_content"
android:minHeight="60dp"
android:background="@drawable/layout_rounded_bg_window"
android:orientation="vertical"
android:clickable="true"
android:background="@drawable/selection_highlight">
<View
android:id="@+id/purchaseOverlay"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true"
android:layout_alignParentTop="true"
android:layout_alignParentStart="true"
android:background="@android:color/black" />
android:layout_gravity="center">
<com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/imageView"
android:layout_width="@dimen/avatar_width"
android:layout_height="@dimen/avatar_height"
android:layout_gravity="center_horizontal"
android:scaleType="fitCenter"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_centerVertical="true"
android:layout_centerHorizontal="true" />
</RelativeLayout>
android:layout_width="76dp"
android:layout_height="76dp"
android:layout_gravity="start"
app:roundedCornerRadius="6dp"
app:roundingBorderWidth="6dp"
android:scaleType="fitEnd" />
<FrameLayout
android:id="@+id/buy_button"
android:layout_width="match_parent"
android:layout_height="32dp"
android:background="@drawable/layout_rounded_bg_shopitem_price">
<com.habitrpg.android.habitica.ui.views.CurrencyView
android:id="@+id/price_label"
android:layout_width="wrap_content"
android:layout_height="32dp"
android:textColor="@color/text_quad"
tools:text="150"
style="@style/Body1"
android:textSize="15sp"
android:layout_gravity="center" />
</FrameLayout>
</LinearLayout>
</FrameLayout>

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/BaseTaskViewHolder.kt
View file

@ -227,7 +227,7 @@ abstract class BaseTaskViewHolder constructor(itemView: View, var scoreTaskFunc:
override fun onTouch(view: View?, motionEvent: MotionEvent?): Boolean {
if (motionEvent != null) {
if (motionEvent.action != MotionEvent.ACTION_UP) return true
if (motionEvent.y <= mainTaskWrapper.height + 20.dpToPx(context)) {
if (motionEvent.y <= mainTaskWrapper.height + 5.dpToPx(context)) {
if (motionEvent.x <= 60.dpToPx(context)) {
onLeftActionTouched()
return true

8
Habitica/src/main/java/com/habitrpg/android/habitica/utils/ContentDeserializer.kt
View file

@ -96,6 +96,14 @@ class ContentDeserializer : JsonDeserializer<ContentResult> {
}
result.appearances = context.deserialize(obj.get("appearances"), object : TypeToken<RealmList<Customization>>() {}.type)
result.backgrounds = context.deserialize(obj.get("backgrounds"), object : TypeToken<RealmList<Customization>>() {}.type)
val noBackground = Customization()
noBackground.customizationSet = "incentiveBackgrounds"
noBackground.customizationSetName = "Login Incentive"
noBackground.identifier = ""
noBackground.price = 0
noBackground.type = "background"
noBackground.category = ""
result.backgrounds.add(noBackground)
result.faq = context.deserialize(obj.get("faq"), object : TypeToken<RealmList<FAQArticle>>() {}.type)
deserializeTrace.stop()