diff --git a/Habitica/res/drawable-hdpi/pet_status_egg.png b/Habitica/res/drawable-hdpi/pet_status_egg.png new file mode 100644 index 000000000..5dd39f87d Binary files /dev/null and b/Habitica/res/drawable-hdpi/pet_status_egg.png differ diff --git a/Habitica/res/drawable-hdpi/pet_status_potion.png b/Habitica/res/drawable-hdpi/pet_status_potion.png new file mode 100644 index 000000000..dc63d40c8 Binary files /dev/null and b/Habitica/res/drawable-hdpi/pet_status_potion.png differ diff --git a/Habitica/res/drawable-mdpi/pet_status_egg.png b/Habitica/res/drawable-mdpi/pet_status_egg.png new file mode 100644 index 000000000..cc358b246 Binary files /dev/null and b/Habitica/res/drawable-mdpi/pet_status_egg.png differ diff --git a/Habitica/res/drawable-mdpi/pet_status_potion.png b/Habitica/res/drawable-mdpi/pet_status_potion.png new file mode 100644 index 000000000..34a1c5c92 Binary files /dev/null and b/Habitica/res/drawable-mdpi/pet_status_potion.png differ diff --git a/Habitica/res/drawable-xhdpi/pet_status_egg.png b/Habitica/res/drawable-xhdpi/pet_status_egg.png new file mode 100644 index 000000000..de8b3fdc2 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/pet_status_egg.png differ diff --git a/Habitica/res/drawable-xhdpi/pet_status_potion.png b/Habitica/res/drawable-xhdpi/pet_status_potion.png new file mode 100644 index 000000000..3a2ebe35e Binary files /dev/null and b/Habitica/res/drawable-xhdpi/pet_status_potion.png differ diff --git a/Habitica/res/drawable-xxhdpi/pet_status_egg.png b/Habitica/res/drawable-xxhdpi/pet_status_egg.png new file mode 100644 index 000000000..b4f145ea0 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/pet_status_egg.png differ diff --git a/Habitica/res/drawable-xxhdpi/pet_status_potion.png b/Habitica/res/drawable-xxhdpi/pet_status_potion.png new file mode 100644 index 000000000..5edb9dab0 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/pet_status_potion.png differ diff --git a/Habitica/res/layout/pet_detail_item.xml b/Habitica/res/layout/pet_detail_item.xml index 727289362..a407af260 100644 --- a/Habitica/res/layout/pet_detail_item.xml +++ b/Habitica/res/layout/pet_detail_item.xml @@ -23,4 +23,21 @@ android:progressBackgroundTint="@color/gray_600" android:layout_marginTop="4dp" android:max="50" /> + + + + \ No newline at end of file diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/PetDetailRecyclerAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/PetDetailRecyclerAdapter.kt index b66dd1c0b..54a20772b 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/PetDetailRecyclerAdapter.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/PetDetailRecyclerAdapter.kt @@ -5,6 +5,7 @@ import android.graphics.PorterDuff import android.graphics.drawable.BitmapDrawable import android.view.View import android.view.ViewGroup +import android.widget.ImageView import android.widget.ProgressBar import android.widget.TextView import com.facebook.drawee.view.SimpleDraweeView @@ -86,6 +87,9 @@ class PetDetailRecyclerAdapter(data: OrderedRealmCollection?, autoUpdate: B private val imageView: SimpleDraweeView by bindView(R.id.imageView) private val trainedProgressbar: ProgressBar by bindView(R.id.trainedProgressBar) + private val availableWrapper: ViewGroup by bindView(R.id.items_available_wrapper) + private val eggAvailableView: ImageView by bindView(R.id.egg_available_view) + private val potionAvailableView: ImageView by bindView(R.id.egg_available_view) private val isOwned: Boolean get() = this.ownedPet?.trained ?: 0 > 0 @@ -100,9 +104,18 @@ class PetDetailRecyclerAdapter(data: OrderedRealmCollection?, autoUpdate: B return false } + private val hasEgg: Boolean + get() { + return ownedItems?.get(animal?.animal + "-eggs") != null + } + private val hasPotion: Boolean + get() { + return ownedItems?.get(animal?.color + "-hatchingPotions") != null + } + private val canHatch: Boolean get() { - return ownedItems?.get(animal?.animal + "-eggs") != null && ownedItems?.get(animal?.color + "-hatchingPotions") != null + return hasEgg && hasPotion } init { @@ -121,10 +134,15 @@ class PetDetailRecyclerAdapter(data: OrderedRealmCollection?, autoUpdate: B } else { this.trainedProgressbar.visibility = View.GONE } + availableWrapper.visibility = View.GONE } else { this.trainedProgressbar.visibility = View.GONE this.imageView.alpha = 0.1f + availableWrapper.visibility = View.VISIBLE + eggAvailableView.alpha = if (hasEgg) 1.0f else 0.2f + potionAvailableView.alpha = if (hasPotion) 1.0f else 0.2f } + if (android.os.Build.VERSION.SDK_INT > android.os.Build.VERSION_CODES.LOLLIPOP_MR1) { trainedProgressbar.progressBackgroundTintMode = PorterDuff.Mode.SRC_OVER }