begin implementing improved pet screen

This commit is contained in:
Phillip Thelen 2020-07-20 14:50:11 +02:00
parent 1d9345376c
commit 0a282cb776
10 changed files with 36 additions and 1 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 592 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 459 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 415 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 299 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 817 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 612 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 869 B

View file

@ -23,4 +23,21 @@
android:progressBackgroundTint="@color/gray_600"
android:layout_marginTop="4dp"
android:max="50" />
<LinearLayout
android:id="@+id/items_available_wrapper"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center">
<ImageView
android:id="@+id/egg_available_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/pet_status_egg"
android:layout_marginEnd="8dp"/>
<ImageView
android:id="@+id/potion_available_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/pet_status_potion" />
</LinearLayout>
</LinearLayout>

View file

@ -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<Pet>?, 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<Pet>?, 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<Pet>?, 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
}