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

Fix image display issues

Browse source
This commit is contained in:
Phillip Thelen 2021-06-29 19:03:18 +02:00
parent 3166b8f611
commit bcdbcdf95d
8 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Habitica/build.gradle
View file

@ -146,7 +146,7 @@ android {
buildConfigField "String", "TESTING_LEVEL", "\"production\""
resConfigs "en", "bg", "de", "en-rGB", "es", "fr", "hr-rHR", "in", "it", "iw", "ja", "ko", "lt", "nl", "pl", "pt-rBR", "pt-rPT", "ru", "tr", "zh", "zh-rTW"
versionCode 2984
versionCode 2990
versionName "3.3"
}

4
Habitica/res/layout/dialog_login_incentive.xml
View file

@ -6,8 +6,8 @@
android:layout_height="match_parent"
android:gravity="center_horizontal">
<ImageView
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_width="@dimen/shopitem_image_size"
android:layout_height="@dimen/shopitem_image_size"
android:id="@+id/imageView"
android:layout_marginTop="16dp" />

4
Habitica/res/layout/pet_imageview.xml
View file

@ -3,5 +3,7 @@
android:layout_width="@dimen/pet_image_width" android:layout_height="@dimen/pet_image_height"
android:layout_gravity="center">
<ImageView android:id="@+id/pet_imageview"
android:layout_width="90dp" android:layout_height="90dp" android:layout_gravity="center" android:scaleType="center" />
android:layout_width="68dp"
android:layout_height="68dp"
android:layout_gravity="center" />
</FrameLayout>

2
Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.kt
View file

@ -27,7 +27,7 @@ open class ShopItem : RealmObject(), BaseObject {
field
}
} else {
"shop_" + key
"shop_$key"
}
}

5
Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarView.kt
View file

@ -8,6 +8,7 @@ import android.util.AttributeSet
import android.view.View
import android.widget.FrameLayout
import android.widget.ImageView
import coil.clear
import coil.imageLoader
import coil.load
import coil.request.ImageRequest
@ -147,6 +148,10 @@ class AvatarView : FrameLayout {
})
}
}
while (i < (imageViewHolder.size-1)) {
i++
imageViewHolder[i].clear()
}
}
private fun getLayerMap(avatar: Avatar, resetHasAttributes: Boolean): Map<LayerType, String> {

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt
View file

@ -761,7 +761,7 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
if (imageKey?.contains("armor") == true) {
imageKey = "slim_$imageKey"
}
DataBindingUtils.loadImage(imageView, imageKey)
DataBindingUtils.loadImage(imageView, "shop_$imageKey")
val youEarnedMessage = this.getString(R.string.checkInRewardEarned, notificationData?.rewardText)
val youEarnedTexView = view.findViewById(R.id.you_earned_message) as? TextView

1
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AuthenticationPreferenceFragment.kt
View file

@ -228,6 +228,7 @@ class AuthenticationPreferenceFragment: BasePreferencesFragment() {
private fun deleteAccount(password: String) {
val dialog = HabiticaProgressDialog.show(context, R.string.deleting_account)
compositeSubscription.add(userRepository.deleteAccount(password).subscribe({ _ ->
dialog?.dismiss()
context?.let { HabiticaBaseApplication.logout(it) }
activity?.finish()
}) { throwable ->

9
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyDetailFragment.kt
View file

@ -17,6 +17,7 @@ import com.habitrpg.android.habitica.data.ChallengeRepository
import com.habitrpg.android.habitica.data.SocialRepository
import com.habitrpg.android.habitica.data.UserRepository
import com.habitrpg.android.habitica.databinding.FragmentPartyDetailBinding
import com.habitrpg.android.habitica.extensions.dpToPx
import com.habitrpg.android.habitica.extensions.inflate
import com.habitrpg.android.habitica.helpers.HapticFeedbackManager
import com.habitrpg.android.habitica.helpers.MainNavigationController
@ -217,6 +218,14 @@ class PartyDetailFragment : BaseFragment<FragmentPartyDetailBinding>() {
if (questContent.hasGifImage()) {
DataBindingUtils.loadImage(binding?.questImageView, "quest_" + questContent.key, "gif")
} else {
context?.let { context ->
DataBindingUtils.loadImage(context, "quest_" + questContent.key) {
binding?.questImageView?.setImageDrawable(it)
val params = binding?.questImageView?.layoutParams ?: return@loadImage
params.height = it.intrinsicHeight.dpToPx(context)
binding?.questImageView?.layoutParams = params
}
}
DataBindingUtils.loadImage(binding?.questImageView, "quest_" + questContent.key)
}
binding?.questImageWrapper?.alpha = 1.0f