Skip to content

Commit

Permalink
party fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@phillipthelen
phillipthelen committed Jan 27, 2025
1 parent 3deb64a commit 8065cac
Show file tree
Hide file tree
Showing 10 changed files with 41 additions and 33 deletions.
2 changes: 1 addition & 1 deletion HabitRPG/Habitica-Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>1010</string>
<string>1013</string>
<key>CustomDomain</key>
<string>${CUSTOM_DOMAIN}</string>
<key>DisableSSL</key>
Expand Down
2 changes: 1 addition & 1 deletion HabitRPG/UI/General/FaintViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ struct FaintView: View {
@State var appear = false
@State var isReviving = false
@State var isUsingPerk = false
@StateObject fileprivate var viewModel = ViewModel()
@ObservedObject fileprivate var viewModel = ViewModel()
private let positions = (0..<6).map { _ in Int.random(in: 5...50) }

var body: some View {
Expand Down
6 changes: 5 additions & 1 deletion HabitRPG/UI/Social/Party/PartyViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ class PartyViewController: SplitSocialViewController {
@IBOutlet weak var leaveLookingForPartySubtitle: UILabel!
var userDisposable: Disposable?
private var isSeekingParty = false

override func viewDidLoad() {
super.viewDidLoad()

Expand All @@ -43,7 +44,10 @@ class PartyViewController: SplitSocialViewController {
gradient.locations = [0, 0.4, 1]
noPartyHeaderBackground.gradient = gradient
chatViewController?.autocompleteContext = "party"

}

override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(true)
userDisposable = userRepository.getUser()
.on(value: {[weak self] user in
self?.isSeekingParty = user.party?.seeking != nil
Expand Down
6 changes: 5 additions & 1 deletion HabitRPG/UI/Social/QuestDetailViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,11 @@ class QuestDetailViewController: BaseUIViewController {
participants.forEach { (participant) in
let view = QuestParticipantView()
if let member = members.first(where: { (member) -> Bool in
return member.id == participant.userID
if isQuestActive {
return member.id == participant.userID && participant.accepted
} else {
return member.id == participant.userID
}
}) {
view.configure(member: member)
} else {
Expand Down
2 changes: 1 addition & 1 deletion Habitica Intents/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<key>CFBundleShortVersionString</key>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleVersion</key>
<string>1010</string>
<string>1013</string>
<key>NSExtension</key>
<dict>
<key>NSExtensionAttributes</key>
Expand Down
2 changes: 1 addition & 1 deletion Habitica IntentsUI/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<key>CFBundleShortVersionString</key>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleVersion</key>
<string>1010</string>
<string>1013</string>
<key>NSExtension</key>
<dict>
<key>NSExtensionAttributes</key>
Expand Down
2 changes: 1 addition & 1 deletion Habitica Snapshots/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleVersion</key>
<string>1010</string>
<string>1013</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion Habitica Widgets/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<key>CFBundleShortVersionString</key>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleVersion</key>
<string>1010</string>
<string>1013</string>
<key>NSExtension</key>
<dict>
<key>NSExtensionPointIdentifier</key>
Expand Down
48 changes: 24 additions & 24 deletions Habitica.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4035,7 +4035,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = YES;
CURRENT_PROJECT_VERSION = 1010;
CURRENT_PROJECT_VERSION = 1013;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
Expand Down Expand Up @@ -4071,7 +4071,7 @@
CODE_SIGN_ENTITLEMENTS = Habitica.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CURRENT_PROJECT_VERSION = 1010;
CURRENT_PROJECT_VERSION = 1013;
DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = NO;
DEVELOPMENT_TEAM = 9Q9SMRMCNN;
ENABLE_BITCODE = NO;
Expand Down Expand Up @@ -4221,7 +4221,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1010;
CURRENT_PROJECT_VERSION = 1013;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 9Q9SMRMCNN;
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand Down Expand Up @@ -4263,7 +4263,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1010;
CURRENT_PROJECT_VERSION = 1013;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 9Q9SMRMCNN;
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand Down Expand Up @@ -4307,7 +4307,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1010;
CURRENT_PROJECT_VERSION = 1013;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 9Q9SMRMCNN;
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand Down Expand Up @@ -4346,7 +4346,7 @@
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1010;
CURRENT_PROJECT_VERSION = 1013;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 9Q9SMRMCNN;
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand Down Expand Up @@ -4399,7 +4399,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = YES;
CURRENT_PROJECT_VERSION = 1010;
CURRENT_PROJECT_VERSION = 1013;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
Expand Down Expand Up @@ -4435,7 +4435,7 @@
CODE_SIGN_ENTITLEMENTS = Habitica.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CURRENT_PROJECT_VERSION = 1010;
CURRENT_PROJECT_VERSION = 1013;
DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = NO;
DEVELOPMENT_TEAM = 9Q9SMRMCNN;
ENABLE_BITCODE = NO;
Expand Down Expand Up @@ -4585,7 +4585,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1010;
CURRENT_PROJECT_VERSION = 1013;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 9Q9SMRMCNN;
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand Down Expand Up @@ -4627,7 +4627,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1010;
CURRENT_PROJECT_VERSION = 1013;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 9Q9SMRMCNN;
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand Down Expand Up @@ -4671,7 +4671,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1010;
CURRENT_PROJECT_VERSION = 1013;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 9Q9SMRMCNN;
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand Down Expand Up @@ -4710,7 +4710,7 @@
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1010;
CURRENT_PROJECT_VERSION = 1013;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 9Q9SMRMCNN;
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand Down Expand Up @@ -4741,7 +4741,7 @@
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1010;
CURRENT_PROJECT_VERSION = 1013;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = 9Q9SMRMCNN;
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand Down Expand Up @@ -4775,7 +4775,7 @@
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1010;
CURRENT_PROJECT_VERSION = 1013;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 9Q9SMRMCNN;
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand Down Expand Up @@ -4812,7 +4812,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1010;
CURRENT_PROJECT_VERSION = 1013;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = 9Q9SMRMCNN;
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand Down Expand Up @@ -4859,7 +4859,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1010;
CURRENT_PROJECT_VERSION = 1013;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 9Q9SMRMCNN;
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand Down Expand Up @@ -4900,7 +4900,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1010;
CURRENT_PROJECT_VERSION = 1013;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = 9Q9SMRMCNN;
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand Down Expand Up @@ -4943,7 +4943,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1010;
CURRENT_PROJECT_VERSION = 1013;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 9Q9SMRMCNN;
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand Down Expand Up @@ -4984,7 +4984,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1010;
CURRENT_PROJECT_VERSION = 1013;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = 9Q9SMRMCNN;
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand Down Expand Up @@ -5029,7 +5029,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1010;
CURRENT_PROJECT_VERSION = 1013;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 9Q9SMRMCNN;
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand Down Expand Up @@ -5235,7 +5235,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1010;
CURRENT_PROJECT_VERSION = 1013;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
Expand Down Expand Up @@ -5298,7 +5298,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = YES;
CURRENT_PROJECT_VERSION = 1010;
CURRENT_PROJECT_VERSION = 1013;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
Expand Down Expand Up @@ -5334,7 +5334,7 @@
CODE_SIGN_ENTITLEMENTS = Habitica.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CURRENT_PROJECT_VERSION = 1010;
CURRENT_PROJECT_VERSION = 1013;
DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = NO;
DEVELOPMENT_TEAM = 9Q9SMRMCNN;
ENABLE_BITCODE = NO;
Expand Down Expand Up @@ -5408,7 +5408,7 @@
CODE_SIGN_ENTITLEMENTS = Habitica.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CURRENT_PROJECT_VERSION = 1010;
CURRENT_PROJECT_VERSION = 1013;
DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = NO;
DEVELOPMENT_TEAM = 9Q9SMRMCNN;
ENABLE_BITCODE = NO;
Expand Down
2 changes: 1 addition & 1 deletion HabiticaTests/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1010</string>
<string>1013</string>
</dict>
</plist>

0 comments on commit 8065cac

Please sign in to comment.