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

Fix changing glasses in setup

Browse source
This commit is contained in:
Phillip Thelen 2018-09-05 14:33:46 +02:00
parent 58eb13555e
commit 6e83b6c2ca
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.kt
View file

@ -17,6 +17,7 @@ import com.habitrpg.android.habitica.R
import com.habitrpg.android.habitica.api.HostConfig
import com.habitrpg.android.habitica.components.AppComponent
import com.habitrpg.android.habitica.data.ApiClient
import com.habitrpg.android.habitica.data.InventoryRepository
import com.habitrpg.android.habitica.data.TaskRepository
import com.habitrpg.android.habitica.data.UserRepository
import com.habitrpg.android.habitica.events.commands.EquipCommand
@ -34,6 +35,7 @@ import com.viewpagerindicator.IconPageIndicator
import com.viewpagerindicator.IconPagerAdapter
import io.reactivex.functions.Consumer
import org.greenrobot.eventbus.Subscribe
import org.solovyev.android.checkout.Inventory
import java.util.*
import javax.inject.Inject
@ -46,6 +48,8 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
@Inject
lateinit var userRepository: UserRepository
@Inject
lateinit var inventoryRepository: InventoryRepository
@Inject
lateinit var taskRepository: TaskRepository
private val pager: FadingViewPager by bindView(R.id.viewPager)
@ -125,7 +129,7 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
@Subscribe
fun onEvent(event: EquipCommand) {
this.apiClient.equipItem(event.type, event.key)
this.inventoryRepository.equip(user, event.type, event.key)
.subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
}

4
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.kt
View file

@ -14,7 +14,6 @@ import android.widget.ImageView
import android.widget.RelativeLayout
import com.habitrpg.android.habitica.R
import com.habitrpg.android.habitica.components.AppComponent
import com.habitrpg.android.habitica.data.ApiClient
import com.habitrpg.android.habitica.data.SetupCustomizationRepository
import com.habitrpg.android.habitica.events.commands.UpdateUserCommand
import com.habitrpg.android.habitica.extensions.inflate
@ -28,7 +27,6 @@ import com.habitrpg.android.habitica.ui.activities.SetupActivity
import com.habitrpg.android.habitica.ui.adapter.setup.CustomizationSetupAdapter
import com.habitrpg.android.habitica.ui.fragments.BaseFragment
import com.habitrpg.android.habitica.ui.helpers.bindOptionalView
import com.habitrpg.android.habitica.ui.helpers.bindView
import com.habitrpg.android.habitica.ui.helpers.resetViews
import com.habitrpg.android.habitica.ui.views.setup.AvatarCategoryView
import org.greenrobot.eventbus.EventBus
@ -39,8 +37,6 @@ class AvatarSetupFragment : BaseFragment() {
@Inject
lateinit var customizationRepository: SetupCustomizationRepository
@Inject
lateinit var apiClient: ApiClient
var activity: SetupActivity? = null
var width: Int = 0