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

Fixes #1595

Browse source
This commit is contained in:
Phillip Thelen 2021-07-20 09:28:50 +02:00
parent 8e2653d4bd
commit 27d5f03f05
8 changed files with 37 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Habitica/res/drawable/pill_bg_gray_300.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/dimmed_background"/>
<corners android:radius="12dip"/>
<padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
</shape>

9
Habitica/res/layout/achievement_grid_item.xml
View file

@ -47,15 +47,8 @@
android:id="@+id/achievement_count_label"
android:layout_width="wrap_content"
android:layout_height="24dp"
android:minWidth="24dp"
android:background="@drawable/achievement_badge_bg"
android:gravity="center"
tools:text="1"
android:paddingStart="2dp"
android:paddingEnd="2dp"
android:textColor="@color/white"
android:textSize="12sp"
android:textStyle="bold"
style="@style/CountLabel"
android:layout_alignParentTop="true"
android:layout_alignStart="@id/achievement_container"
android:layout_marginStart="-4dp"/>

8
Habitica/res/layout/achievement_list_item.xml
View file

@ -18,15 +18,9 @@
android:id="@+id/achievement_count_label"
android:layout_width="wrap_content"
android:layout_height="24dp"
android:minWidth="24dp"
android:background="@drawable/achievement_badge_bg"
android:gravity="center"
tools:text="1"
android:paddingStart="2dp"
android:paddingEnd="2dp"
android:textColor="@color/white"
android:textSize="12sp"
android:textStyle="bold"
style="@style/CountLabel"
android:layout_alignParentTop="true"
android:layout_alignParentStart="true"
android:layout_marginStart="13dp"

6
Habitica/res/layout/profile_achievement_item.xml
View file

@ -21,11 +21,7 @@
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
tools:text="2"
android:background="@drawable/achievement_badge_bg"
android:paddingStart="2dp"
android:paddingEnd="2dp"
android:textSize="12sp"
android:textColor="@color/white" />
style="@style/CountLabel"/>
</FrameLayout>
<TextView

6
Habitica/res/layout/row_shopitem.xml
View file

@ -62,13 +62,11 @@
android:textColor="@color/white" />
<TextView
android:id="@+id/item_detail_indicator"
android:layout_width="@dimen/shopitem_status_size"
android:layout_width="wrap_content"
android:layout_height="@dimen/shopitem_status_size"
android:layout_gravity="end"
android:visibility="gone"
android:layout_alignEnd="@id/container"
android:gravity="center"
android:textColor="@color/white"
android:layout_marginEnd="-4dp"
android:textSize="12sp" />
style="@style/CountLabel"/>
</RelativeLayout>

8
Habitica/res/layout/skill_list_item.xml
View file

@ -69,14 +69,12 @@
</LinearLayout>
<TextView
android:id="@+id/count_label"
android:layout_width="24dp"
android:layout_width="wrap_content"
android:layout_height="24dp"
android:layout_alignParentTop="true"
android:layout_alignParentStart="true"
android:layout_marginStart="13dp"
android:background="@drawable/circle_gray300"
tools:text="1"
android:textColor="@color/white"
android:gravity="center"
tools:text="10000"
style="@style/CountLabel"
/>
</RelativeLayout>

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

@ -811,4 +811,15 @@
<item name="android:background">@drawable/layout_rounded_bg_window</item>
<item name="android:layout_margin">@dimen/spacing_medium</item>
</style>
<style name="CountLabel">
<item name="android:background">@drawable/pill_bg_gray_300</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>

12
Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ShopItemViewHolder.kt
View file

@ -3,9 +3,11 @@ package com.habitrpg.android.habitica.ui.viewHolders
import android.content.Context
import android.graphics.drawable.BitmapDrawable
import android.view.View
import android.view.ViewGroup
import androidx.recyclerview.widget.RecyclerView
import com.habitrpg.android.habitica.HabiticaBaseApplication
import com.habitrpg.android.habitica.databinding.RowShopitemBinding
import com.habitrpg.android.habitica.extensions.dpToPx
import com.habitrpg.android.habitica.extensions.isUsingNightModeResources
import com.habitrpg.android.habitica.models.shops.ShopItem
import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
@ -76,6 +78,16 @@ class ShopItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), Vi
binding.itemDetailIndicator.visibility = View.VISIBLE
}
if (binding.itemDetailIndicator.visibility == View.VISIBLE) {
val layoutParams = binding.itemDetailIndicator.layoutParams
layoutParams.width = if (binding.itemDetailIndicator.text.isBlank()) {
24.dpToPx(context)
} else {
ViewGroup.LayoutParams.WRAP_CONTENT
}
binding.itemDetailIndicator.layoutParams = layoutParams
}
binding.priceLabel.isLocked = item.locked || !canBuy
}