sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-07-19 04:14:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix npc banner handling

Browse source
This commit is contained in:
Phillip Thelen 2023-11-29 14:12:38 +01:00
parent cf9ab0a833
commit 5110cc2766
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.kt
View file

@ -60,7 +60,7 @@ interface UserRepository : BaseRepository {
suspend fun updateLanguage(languageCode: String): User?
suspend fun resetAccount(): User?
suspend fun resetAccount(password: String): User?
suspend fun deleteAccount(password: String): Void?
suspend fun sendPasswordResetEmail(email: String): Void?

4
Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AppConfigManager.kt
View file

@ -35,8 +35,8 @@ class AppConfigManager(contentRepository: ContentRepository?) : com.habitrpg.com
private val remoteConfig = FirebaseRemoteConfig.getInstance()
fun shopSpriteSuffix(): String {
return worldState?.npcImageSuffix ?: remoteConfig.getString("shopSpriteSuffix")
fun shopSpriteSuffix(): String? {
return worldState?.npcImageSuffix
}
fun maxChatLength(): Long {

4
Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.kt
View file

@ -42,7 +42,7 @@ class ShopRecyclerAdapter : androidx.recyclerview.widget.RecyclerView.Adapter<Vi
var changeClassEvents: ((String) -> Unit)? = null
var shopSpriteSuffix: String = ""
var shopSpriteSuffix: String? = null
set(value) {
field = value
if (items.size > 0) {
@ -274,7 +274,7 @@ class ShopRecyclerAdapter : androidx.recyclerview.widget.RecyclerView.Adapter<Vi
binding.descriptionView.movementMethod = LinkMovementMethod.getInstance()
}
fun bind(shop: Shop, shopSpriteSuffix: String) {
fun bind(shop: Shop, shopSpriteSuffix: String?) {
binding.npcBannerView.shopSpriteSuffix = shopSpriteSuffix
binding.npcBannerView.identifier = shop.identifier

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

@ -19,9 +19,9 @@ import kotlin.math.roundToInt
class NPCBannerView(context: Context, attrs: AttributeSet?) : FrameLayout(context, attrs) {
private val binding = NpcBannerBinding.inflate(context.layoutInflater, this)
var shopSpriteSuffix: String = ""
var shopSpriteSuffix: String? = null
set(value) {
field = if (value.isEmpty() || value.startsWith("_")) {
field = if (value == null || value.isEmpty() || value.startsWith("_")) {
value
} else {
"_$value"