From 705bbb93b75a4030d172f4d787e023b98702eba6 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Thu, 24 Aug 2023 13:28:44 +0200 Subject: [PATCH] fix opening own profile --- .../habitrpg/android/habitica/ui/activities/MainActivity.kt | 5 +++-- .../habitica/ui/fragments/NavigationDrawerFragment.kt | 6 ++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt index 6c6fdbf24..c058d41ac 100755 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt @@ -41,6 +41,7 @@ import com.google.firebase.crashlytics.ktx.crashlytics import com.google.firebase.ktx.Firebase import com.google.firebase.perf.FirebasePerformance import com.habitrpg.android.habitica.BuildConfig +import com.habitrpg.android.habitica.MainNavDirections import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.data.ApiClient import com.habitrpg.android.habitica.data.InventoryRepository @@ -313,7 +314,7 @@ open class MainActivity : BaseActivity(), SnackbarActivity { color = Color.White, onClick = { dismiss() - MainNavigationController.navigate(R.id.openProfileActivity) + MainNavDirections.openProfileActivity(user?.id ?: "") }) { Text(stringResource(id = R.string.open_profile)) } @@ -340,7 +341,7 @@ open class MainActivity : BaseActivity(), SnackbarActivity { ShareAvatarUseCase.RequestValues( this@MainActivity, it, - null, + "Check out my avatar on Habitica!", "avatar_bottomsheet" ) ) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt index 8f358a526..5a4970987 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt @@ -19,6 +19,7 @@ import androidx.drawerlayout.widget.DrawerLayout import androidx.fragment.app.DialogFragment import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.SimpleItemAnimator +import com.habitrpg.android.habitica.MainNavDirections import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.data.ContentRepository import com.habitrpg.android.habitica.data.InventoryRepository @@ -259,10 +260,7 @@ class NavigationDrawerFragment : DialogFragment() { private fun updateUser(user: User) { binding?.avatarView?.setOnClickListener { - MainNavigationController.navigate( - R.id.openProfileActivity, - bundleOf(Pair("userID", user.id)) - ) + MainNavDirections.openProfileActivity(user.id ?: "") } setMessagesCount(user.inbox)