sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-07-13 17:51:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Armoire tweaks

Browse source
This commit is contained in:
Phillip Thelen 2022-05-20 15:05:25 +02:00
parent 131d8e3344
commit 52a5f0baf4
4 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Habitica/build.gradle
View file

@ -167,7 +167,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 3506
versionCode 3508
versionName "3.6"
targetSdkVersion 32

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

@ -135,16 +135,18 @@
android:id="@+id/equip_button"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="60dp"
android:layout_height="69dp"
android:text="@string/equip"
android:textStyle="bold"
style="@style/HabiticaButton.White"
android:padding="0dp"
android:layout_marginEnd="12dp"/>
<Button
android:id="@+id/close_button"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="60dp"
android:layout_height="69dp"
android:text="@string/close"
android:textStyle="bold"
style="@style/HabiticaButton.White"/>

2
Habitica/res/values/strings.xml
View file

@ -278,7 +278,7 @@
<string name="quest_items_found">You\'ve found %d quest items</string>
<string name="armoireEquipment_new">You find a piece of rare Equipment in the Armoire!</string>
<string name="armoireFood_new">You rummage in the Armoire and find food. What\'s that doing in here?</string>
<string name="armoireExp_new">You wrestle with the Armoire and gain %s Experience. Take that!</string>
<string name="armoireExp">You wrestle with the Armoire and gain Experience. Take that!</string>
<string name="sell">Sell (%d Gold)</string>
<string name="hatch_with_potion">Hatch with potion</string>
<string name="hatch_egg">Hatch with egg</string>

7
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ArmoireActivity.kt
View file

@ -1,5 +1,6 @@
package com.habitrpg.android.habitica.ui.activities
import android.annotation.SuppressLint
import android.os.Bundle
import android.util.Log
import android.view.Gravity
@ -25,9 +26,9 @@ import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
import com.habitrpg.android.habitica.ui.views.ads.AdButton
import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaBottomSheetDialog
import com.plattysoft.leonids.ParticleSystem
import kotlinx.coroutines.launch
import java.util.Locale
import javax.inject.Inject
import kotlinx.coroutines.launch
class ArmoireActivity : BaseActivity() {
@ -207,7 +208,9 @@ class ArmoireActivity : BaseActivity() {
binding.iconView.loadImage("Pet_Food_$key")
}
else -> {
binding.subtitleView.text = getString(R.string.armoireExp_new, value)
@SuppressLint("SetTextI18n")
binding.titleView.text = "+${value} ${binding.titleView.text}"
binding.subtitleView.text = getString(R.string.armoireExp)
binding.iconView.setImageResource(R.drawable.armoire_experience)
val layoutParams = RelativeLayout.LayoutParams(108.dpToPx(this), 122.dpToPx(this))
layoutParams.addRule(RelativeLayout.CENTER_IN_PARENT)