diff --git a/Habitica/res/layout/fragment_faq_overview.xml b/Habitica/res/layout/fragment_faq_overview.xml
index 032f1802b..bbda2072c 100644
--- a/Habitica/res/layout/fragment_faq_overview.xml
+++ b/Habitica/res/layout/fragment_faq_overview.xml
@@ -26,7 +26,7 @@
android:layout_height="wrap_content"
app:subtitle="HP"
app:title="@string/health_points"
- app:titleColor="@color/text_red_white"
+ app:titleColor="@color/text_red"
android:layout_marginStart="@dimen/spacing_medium"
android:layout_marginEnd="@dimen/spacing_medium"
android:layout_marginBottom="@dimen/spacing_medium"
@@ -38,7 +38,7 @@
android:layout_height="wrap_content"
app:subtitle="EXP"
app:title="@string/experience_points"
- app:titleColor="@color/text_yellow_white"
+ app:titleColor="@color/text_yellow"
android:layout_marginStart="@dimen/spacing_medium"
android:layout_marginEnd="@dimen/spacing_medium"
android:layout_marginBottom="@dimen/spacing_medium"
@@ -49,7 +49,7 @@
android:layout_height="wrap_content"
app:subtitle="MP"
app:title="@string/mana_points"
- app:titleColor="@color/text_blue_white"
+ app:titleColor="@color/text_blue"
android:layout_marginStart="@dimen/spacing_medium"
android:layout_marginEnd="@dimen/spacing_medium"
android:layout_marginBottom="@dimen/spacing_medium"
@@ -60,7 +60,7 @@
android:layout_height="wrap_content"
app:subtitle="@string/currency"
app:title="@string/gold_capitalized"
- app:titleColor="@color/text_orange_white"
+ app:titleColor="@color/text_orange"
android:layout_marginStart="@dimen/spacing_medium"
android:layout_marginEnd="@dimen/spacing_medium"
android:layout_marginBottom="@dimen/spacing_medium"
@@ -71,7 +71,7 @@
android:layout_height="wrap_content"
app:subtitle="@string/premium_currency"
app:title="@string/gems"
- app:titleColor="@color/text_green_white"
+ app:titleColor="@color/text_green"
android:layout_marginStart="@dimen/spacing_medium"
android:layout_marginEnd="@dimen/spacing_medium"
android:layout_marginBottom="@dimen/spacing_medium"
@@ -82,7 +82,7 @@
android:layout_height="wrap_content"
app:subtitle="@string/subscriber_currency"
app:title="@string/mystic_hourglasses"
- app:titleColor="@color/text_brand_white"
+ app:titleColor="@color/text_brand"
android:layout_marginStart="@dimen/spacing_medium"
android:layout_marginEnd="@dimen/spacing_medium"
android:layout_marginBottom="@dimen/spacing_medium"
@@ -93,7 +93,7 @@
android:layout_height="wrap_content"
app:subtitle="STR, CON, INT, PER"
app:title="@string/stat_allocation"
- app:titleColor="@color/text_brown_white"
+ app:titleColor="@color/text_brown"
android:layout_marginStart="@dimen/spacing_medium"
android:layout_marginEnd="@dimen/spacing_medium"
android:layout_marginBottom="@dimen/spacing_medium"
diff --git a/Habitica/res/values-en-rGB/strings.xml b/Habitica/res/values-en-rGB/strings.xml
index 7028a90a2..f8bdac912 100644
--- a/Habitica/res/values-en-rGB/strings.xml
+++ b/Habitica/res/values-en-rGB/strings.xml
@@ -223,7 +223,7 @@
By Email
Invite Existing Users
Send
- Invite Friends
+ Find Members
If a friend joins Habitica via your email, they\'ll automatically be invited to your party!
Add Invites
Email
diff --git a/Habitica/res/values-night/colors.xml b/Habitica/res/values-night/colors.xml
index 8b3ad7f16..2cd59c3ab 100644
--- a/Habitica/res/values-night/colors.xml
+++ b/Habitica/res/values-night/colors.xml
@@ -27,6 +27,7 @@
@color/teal_50
@color/brand_200
#4D4f2a93
+ #F26100
#40000000
#80000000
diff --git a/Habitica/res/values/colors.xml b/Habitica/res/values/colors.xml
index 6c9806637..24939ef1d 100644
--- a/Habitica/res/values/colors.xml
+++ b/Habitica/res/values/colors.xml
@@ -98,6 +98,7 @@
@color/teal_100
@color/brand_300
#4D6033B5
+ #7f3300
#50ffffff
#99FFFFFF
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 676a5a36e..2d5714bca 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -304,7 +304,7 @@
By Email
Invite Existing Users
Send
- Invite Friends
+ Find Members
If you have friends already using Habitica, invite them by username here.
If a friend joins Habitica via your email, they\'ll automatically be invited to your party!
Add Invites
@@ -326,7 +326,7 @@
Unlock by logging into Habitica regularly
Unlock by checking into Habitica %d times.
Unlock by creating an account
- Invite Friends
+ Find Members
log into Habitica regularly
%d Checkins
create an account
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 5166e040b..c0d3aabbb 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
@@ -323,7 +323,7 @@ class FullProfileActivity : BaseActivity() {
private fun useBlock() {
lifecycleScope.launchCatching {
socialRepository.blockMember(userID)
- userRepository.retrieveUser()
+ userRepository.retrieveUser(false, true)
invalidateOptionsMenu()
}
}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/PartySeekingListItem.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/PartySeekingListItem.kt
index 4a85215ef..707ec10b7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/PartySeekingListItem.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/PartySeekingListItem.kt
@@ -1,6 +1,7 @@
package com.habitrpg.android.habitica.ui.views.social
import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
@@ -22,7 +23,9 @@ import androidx.compose.ui.tooling.preview.PreviewParameter
import androidx.compose.ui.tooling.preview.PreviewParameterProvider
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
+import com.habitrpg.android.habitica.MainNavDirections
import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.helpers.MainNavigationController
import com.habitrpg.android.habitica.models.auth.LocalAuthentication
import com.habitrpg.android.habitica.models.members.Member
import com.habitrpg.android.habitica.models.members.MemberFlags
@@ -53,6 +56,10 @@ fun PartySeekingListItem(
Column(
modifier
.fillMaxWidth()
+ .clickable {
+ val profileDirections = MainNavDirections.openProfileActivity(user.id)
+ MainNavigationController.navigate(profileDirections)
+ }
.padding(bottom = 6.dp)
.background(HabiticaTheme.colors.windowBackground, HabiticaTheme.shapes.large)
.padding(14.dp)
diff --git a/version.properties b/version.properties
index 051399735..70214c331 100644
--- a/version.properties
+++ b/version.properties
@@ -1,2 +1,2 @@
NAME=4.2
-CODE=6031
\ No newline at end of file
+CODE=6041
\ No newline at end of file