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

Fixes #1555

Browse source
This commit is contained in:
Phillip Thelen 2021-11-10 15:11:49 +01:00
parent 3b6251f114
commit d561ab01b6
10 changed files with 105 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
Habitica/res/drawable-hdpi/stable_equipped_star.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 381 B

BIN
Habitica/res/drawable-mdpi/stable_equipped_star.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 299 B

BIN
Habitica/res/drawable-xhdpi/stable_equipped_star.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 421 B

BIN
Habitica/res/drawable-xxhdpi/stable_equipped_star.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 672 B

6
Habitica/res/drawable/pill_bg_teal_100.xml Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/teal_100"/>
<corners android:radius="12dip"/>
<padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
</shape>

13
Habitica/res/layout/mount_overview_item.xml
View file

@ -3,6 +3,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:clickable="true"
android:focusable="true">
@ -46,4 +47,16 @@
android:gravity="center"
android:textSize="12sp" />
</LinearLayout>
<ImageView
android:id="@+id/active_indicator"
android:layout_width="wrap_content"
android:layout_height="@dimen/shopitem_status_size"
android:layout_gravity="end"
android:visibility="gone"
tools:visibility="visible"
android:layout_alignParentTop="true"
android:layout_alignStart="@id/card_view"
android:layout_marginStart="-4dp"
android:src="@drawable/star"
style="@style/ActiveLabel"/>
</RelativeLayout>

127
Habitica/res/layout/pet_detail_item.xml
View file

@ -1,57 +1,78 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/card_view"
android:layout_height="88dp"
android:layout_width="76dp"
android:background="@drawable/layout_rounded_bg_window"
android:orientation="vertical"
android:padding="8dp">
<ImageView
android:id="@+id/imageView"
android:layout_width="68dp"
android:layout_height="68dp"
android:layout_gravity="center"/>
<ProgressBar
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/trainedProgressBar"
android:progressTint="@color/green_100"
android:progressBackgroundTint="@color/offset_background"
android:layout_marginStart="7dp"
android:layout_marginEnd="7dp"
android:max="50" />
<RelativeLayout
android:id="@+id/item_wrapper"
android:layout_width="86dp"
android:layout_height="68dp"
android:layout_gravity="center">
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clickable="true"
android:focusable="true">
<LinearLayout
android:layout_marginTop="6dp"
android:layout_marginBottom="6dp"
android:id="@+id/card_view"
android:layout_height="88dp"
android:layout_width="76dp"
android:background="@drawable/layout_rounded_bg_window"
android:orientation="vertical"
android:layout_centerInParent="true"
android:padding="8dp">
<ImageView
android:id="@+id/hatchingPotion_view"
android:layout_width="72dp"
android:layout_height="72dp"
android:layout_alignParentTop="true"
android:layout_alignParentEnd="true" />
android:id="@+id/imageView"
android:layout_width="68dp"
android:layout_height="68dp"
android:layout_gravity="center"/>
<ProgressBar
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/trainedProgressBar"
android:progressTint="@color/green_100"
android:progressBackgroundTint="@color/offset_background"
android:layout_marginStart="7dp"
android:layout_marginEnd="7dp"
android:max="50" />
<RelativeLayout
android:id="@+id/item_wrapper"
android:layout_width="86dp"
android:layout_height="68dp"
android:layout_gravity="center">
<ImageView
android:id="@+id/hatchingPotion_view"
android:layout_width="72dp"
android:layout_height="72dp"
android:layout_alignParentTop="true"
android:layout_alignParentEnd="true" />
<ImageView
android:id="@+id/egg_view"
android:layout_width="72dp"
android:layout_height="72dp"
android:layout_alignParentTop="true"
android:layout_alignParentStart="true" />
</RelativeLayout>
<ImageView
android:id="@+id/egg_view"
android:layout_width="72dp"
android:layout_height="72dp"
android:layout_alignParentTop="true"
android:layout_alignParentStart="true" />
</RelativeLayout>
android:id="@+id/checkmark_view"
android:layout_width="12dp"
android:layout_height="10dp"
android:src="@drawable/pet_checkmark"
android:layout_gravity="center" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:id="@+id/titleTextView"
android:textSize="12sp"
android:gravity="center"
style="@style/RowTitle" />
</LinearLayout>
<ImageView
android:id="@+id/checkmark_view"
android:layout_width="12dp"
android:layout_height="10dp"
android:src="@drawable/pet_checkmark"
android:layout_gravity="center" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:id="@+id/titleTextView"
android:textSize="12sp"
android:gravity="center"
style="@style/RowTitle" />
</LinearLayout>
android:id="@+id/active_indicator"
android:layout_width="@dimen/shopitem_status_size"
android:layout_height="@dimen/shopitem_status_size"
android:layout_gravity="end"
android:visibility="gone"
tools:visibility="visible"
android:layout_alignStart="@id/card_view"
android:layout_marginStart="-4dp"
android:layout_alignParentTop="true"
android:src="@drawable/star"
style="@style/ActiveLabel"/>
</RelativeLayout>

10
Habitica/res/values/styles.xml
View file

@ -822,4 +822,14 @@
<item name="android:textSize">12sp</item>
<item name="android:textStyle">bold</item>
</style>
<style name="ActiveLabel">
<item name="android:background">@drawable/pill_bg_teal_100</item>
<item name="android:paddingStart">4dp</item>
<item name="android:paddingEnd">4dp</item>
<item name="android:minWidth">24dp</item>
<item name="android:gravity">center</item>
<item name="android:textColor">@color/white</item>
<item name="android:textSize">12sp</item>
<item name="android:textStyle">bold</item>
</style>
</resources>

1
Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/MountViewHolder.kt
View file

@ -39,6 +39,7 @@ class MountViewHolder(parent: ViewGroup, private val equipEvents: PublishSubject
binding.imageView.alpha = 0.2f
}
binding.imageView.background = null
binding.activeIndicator.visibility = if (user?.currentMount.equals(animal?.key)) View.VISIBLE else View.GONE
DataBindingUtils.loadImage(itemView.context, imageName) {
val drawable = if (owned) it else BitmapDrawable(itemView.context.resources, it.toBitmap().extractAlpha())
binding.imageView.background = drawable

1
Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/PetViewHolder.kt
View file

@ -96,6 +96,7 @@ class PetViewHolder(parent: ViewGroup, private val equipEvents: PublishSubject<S
binding.trainedProgressBar.progressBackgroundTintMode = PorterDuff.Mode.SRC_OVER
}
binding.imageView.background = null
binding.activeIndicator.visibility = if (user?.currentPet.equals(animal?.key)) View.VISIBLE else View.GONE
DataBindingUtils.loadImage(itemView.context, imageName) {
val resources = itemView.context.resources ?: return@loadImage
val drawable = if (trained == 0) BitmapDrawable(resources, it.toBitmap().extractAlpha()) else it