From 7a104c0c1f5666d7e8a14013b0eb2c898cbb8d75 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Mon, 16 Nov 2020 13:56:15 +0100 Subject: [PATCH] Fix send message button on profile --- Habitica/res/layout/activity_gift_gems.xml | 2 +- Habitica/res/layout/activity_gift_subscription.xml | 2 +- .../habitica/ui/activities/FullProfileActivity.kt | 11 ++++++++++- .../ui/views/yesterdailies/YesterdailyDialog.kt | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Habitica/res/layout/activity_gift_gems.xml b/Habitica/res/layout/activity_gift_gems.xml index 3c2046b70..ca68acf4d 100644 --- a/Habitica/res/layout/activity_gift_gems.xml +++ b/Habitica/res/layout/activity_gift_gems.xml @@ -20,7 +20,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="?attr/actionBarSize" - android:theme="@style/Toolbar" + android:theme="@style/Toolbar.Modern" app:layout_scrollFlags="scroll|enterAlways" app:popupTheme="@style/ThemeOverlay.AppCompat.Dark"/> diff --git a/Habitica/res/layout/activity_gift_subscription.xml b/Habitica/res/layout/activity_gift_subscription.xml index 2a7a98388..2e4ccfa96 100644 --- a/Habitica/res/layout/activity_gift_subscription.xml +++ b/Habitica/res/layout/activity_gift_subscription.xml @@ -16,7 +16,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="?attr/actionBarSize" - android:theme="@style/Toolbar" + android:theme="@style/Toolbar.Modern" app:layout_scrollFlags="scroll|enterAlways" app:popupTheme="@style/ThemeOverlay.AppCompat.Dark"/> 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 0073f008b..cc354aab7 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 @@ -44,9 +44,14 @@ import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar.SnackbarDisplayTy import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog import io.reactivex.rxjava3.core.Flowable import io.realm.RealmResults +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.GlobalScope +import kotlinx.coroutines.delay +import kotlinx.coroutines.launch import java.text.SimpleDateFormat import java.util.* import javax.inject.Inject +import kotlin.coroutines.CoroutineContext import kotlin.math.floor import kotlin.math.min @@ -182,7 +187,11 @@ class FullProfileActivity : BaseActivity() { } private fun showSendMessageToUserDialog() { - MainNavigationController.navigate(R.id.inboxFragment, bundleOf(Pair("username", username), Pair("userID", userID))) + finish() + GlobalScope.launch(context = Dispatchers.Main) { + delay(1000L) + MainNavigationController.navigate(R.id.inboxMessageListFragment, bundleOf(Pair("username", username), Pair("userID", userID))) + } } private fun updateView(user: Member) { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/yesterdailies/YesterdailyDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/yesterdailies/YesterdailyDialog.kt index 4202c66ef..adf2b8129 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/yesterdailies/YesterdailyDialog.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/yesterdailies/YesterdailyDialog.kt @@ -134,7 +134,7 @@ class YesterdailyDialog private constructor(context: Context, private val userRe val completed = !task.isDisplayedActive val checkmark = taskView.findViewById(R.id.checkmark) val checkboxHolder = taskView.findViewById(R.id.checkBoxHolder) - var checkboxBackground = taskView.findViewById(R.id.checkbox_background) + val checkboxBackground = taskView.findViewById(R.id.checkbox_background) checkmark?.visibility = if (completed) View.VISIBLE else View.GONE if (completed) { checkboxHolder.setBackgroundResource(R.color.window_background)