diff --git a/Habitica/build.gradle b/Habitica/build.gradle index 31847a81c..5d0ae5bb7 100644 --- a/Habitica/build.gradle +++ b/Habitica/build.gradle @@ -164,7 +164,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 3271 + versionCode 3274 versionName "3.5.1.3" targetSdkVersion 32 diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.kt index 450444f20..e0bb4baac 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.kt @@ -3,6 +3,7 @@ package com.habitrpg.android.habitica.ui.activities import android.content.Context import android.graphics.Typeface import android.os.Bundle +import android.text.method.LinkMovementMethod import android.view.Menu import android.view.MenuItem import android.view.View diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt index 1a133c82f..80830905c 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt @@ -6,8 +6,8 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import androidx.core.os.bundleOf import androidx.activity.result.contract.ActivityResultContracts +import androidx.core.os.bundleOf import androidx.swiperefreshlayout.widget.SwipeRefreshLayout import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.components.UserComponent @@ -37,10 +37,9 @@ import com.habitrpg.android.habitica.ui.fragments.BaseFragment import com.habitrpg.android.habitica.ui.helpers.EmptyItem import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator import com.habitrpg.android.habitica.ui.helpers.loadImage -import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog -import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar +import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog import com.habitrpg.android.habitica.ui.views.dialogs.OpenedMysteryitemDialog import io.reactivex.rxjava3.core.Flowable import javax.inject.Inject @@ -105,7 +104,7 @@ class ItemRecyclerFragment : BaseFragment(), SwipeRefreshL adapter = binding?.recyclerView?.adapter as? ItemRecyclerAdapter if (adapter == null) { context?.let { - adapter = ItemRecyclerAdapter(context, user) + adapter = ItemRecyclerAdapter(context, userViewModel.user.value) } binding?.recyclerView?.adapter = adapter adapter?.useSpecialEvents?.subscribeWithErrorHandler { onSpecialItemSelected(it) }?.let { compositeSubscription.add(it) } @@ -221,9 +220,9 @@ class ItemRecyclerFragment : BaseFragment(), SwipeRefreshL alert?.setMessage(R.string.quest_party_required_description) alert?.addButton(R.string.create_new_party, true, false) { _, _ -> socialRepository.createGroup( - getString(R.string.usernames_party, user?.profile?.name), + getString(R.string.usernames_party, userViewModel.user.value?.profile?.name), "", - user?.id, + userViewModel.user.value?.id, "party", "", false @@ -243,7 +242,7 @@ class ItemRecyclerFragment : BaseFragment(), SwipeRefreshL { MainNavigationController.navigate( R.id.partyFragment, - bundleOf(Pair("partyID", user?.party?.id)) + bundleOf(Pair("partyID", userViewModel.user.value?.party?.id)) ) }, RxErrorHandler.handleEmptyError()