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

Improve wheelchair support

Browse source
This commit is contained in:
Phillip Thelen 2018-09-05 14:55:52 +02:00
parent 6e83b6c2ca
commit 33fcaa6da5
7 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Habitica/res/layout/fragment_avatar_overview.xml
View file

@ -68,6 +68,11 @@
android:layout_height="wrap_content"
android:id="@+id/avatarSkinView"
app:equipmentTitle="@string/avatar_skin"/>
<com.habitrpg.android.habitica.ui.views.EquipmentItemRow
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/avatarChairView"
app:equipmentTitle="@string/avatar_wheelchair"/>
</LinearLayout>
</android.support.v7.widget.CardView>
<TextView

2
Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Customization.java
View file

@ -165,6 +165,8 @@ public class Customization extends RealmObject {
}
case "background":
return "background_" + this.identifier;
case "chair":
return "chair_" + identifier;
}
return "";
}

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarView.kt
View file

@ -367,6 +367,8 @@ class AvatarView : View {
private fun getFileName(imageName: String): String {
val name = if (FILENAME_MAP.containsKey(imageName)) {
FILENAME_MAP[imageName]
} else if (imageName.startsWith("handleless")) {
"chair_$imageName"
} else {
imageName
}

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.kt
View file

@ -49,7 +49,7 @@ class CustomizationRecyclerViewAdapter : RecyclerView.Adapter<RecyclerView.ViewH
fun updateOwnership(ownedCustomizations: List<String>) {
for ((position, obj) in customizationList.withIndex()) {
if (obj.javaClass == Customization::class.java) {
val customization = obj as Customization
val customization = obj as? Customization ?: return
if (customization.purchased != ownedCustomizations.contains(customization.id)) {
customization.purchased = ownedCustomizations.contains(customization.id)
notifyItemChanged(position)

6
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.kt
View file

@ -38,6 +38,7 @@ class AvatarOverviewFragment : BaseMainFragment(), AdapterView.OnItemSelectedLis
avatarShirtView.setOnClickListener { displayCustomizationFragment("shirt", null) }
avatarSkinView.setOnClickListener { displayCustomizationFragment("skin", null) }
avatarChairView.setOnClickListener { displayCustomizationFragment("chair", null) }
avatarHairColorView.setOnClickListener { displayCustomizationFragment("hair", "color") }
avatarHairBangsView.setOnClickListener { displayCustomizationFragment("hair", "bangs") }
avatarHairBaseView.setOnClickListener { displayCustomizationFragment("hair", "base") }
@ -54,6 +55,9 @@ class AvatarOverviewFragment : BaseMainFragment(), AdapterView.OnItemSelectedLis
avatarShirtView.equipmentName = user?.preferences?.shirt
avatarSkinView.customizationIdentifier = "skin_" + user?.preferences?.skin
avatarSkinView.equipmentName = user?.preferences?.skin
val chair = user?.preferences?.chair
avatarChairView.customizationIdentifier = if (chair?.startsWith("handleless") == true) "chair_$chair" else chair
avatarChairView.equipmentName = chair?.removePrefix("chair_")
avatarHairColorView.customizationIdentifier = if (user?.preferences?.hair?.color != null && user?.preferences?.hair?.color != "") "hair_bangs_1_" + user?.preferences?.hair?.color else ""
avatarHairColorView.equipmentName = user?.preferences?.hair?.color
avatarHairBangsView.customizationIdentifier = if (user?.preferences?.hair?.bangs != null && user?.preferences?.hair?.bangs != 0) "hair_bangs_" + user?.preferences?.hair?.bangs + "_" + user?.preferences?.hair?.color else ""
@ -100,7 +104,7 @@ class AvatarOverviewFragment : BaseMainFragment(), AdapterView.OnItemSelectedLis
override fun onItemSelected(parent: AdapterView<*>, view: View, position: Int, id: Long) {
val newSize: String = if (position == 0) "slim" else "broad"
if (this.user != null && this.user!!.preferences?.size != newSize) {
if (this.user != null && this.user?.preferences?.size != newSize) {
userRepository.updateUser(user, "preferences.size", newSize)
.subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
}

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/NPCBannerView.kt
View file

@ -28,7 +28,7 @@ class NPCBannerView(context: Context?, attrs: AttributeSet?) : FrameLayout(conte
field = if (value.isEmpty() || value.startsWith("_")) {
value
} else {
"_"+value
"_$value"
}
if (identifier.isNotEmpty()) {
setImage()

2
Habitica/src/main/java/com/habitrpg/android/habitica/utils/CustomizationDeserializer.java
View file

@ -47,7 +47,7 @@ public class CustomizationDeserializer implements JsonDeserializer<List<Customiz
}
}
for (String type : Arrays.asList("shirt", "skin")) {
for (String type : Arrays.asList("shirt", "skin", "chair")) {
for (Map.Entry<String, JsonElement> entry : object.get(type).getAsJsonObject().entrySet()) {
customizations.add(this.parseCustomization(null, type, null, entry.getKey(), entry.getValue().getAsJsonObject()));
}