diff --git a/HabitRPG/Habitica-Info.plist b/HabitRPG/Habitica-Info.plist index cf8e25e76..8fb8aa862 100644 --- a/HabitRPG/Habitica-Info.plist +++ b/HabitRPG/Habitica-Info.plist @@ -39,7 +39,7 @@ CFBundleVersion - 954 + 953 CustomDomain ${CUSTOM_DOMAIN} DisableSSL diff --git a/HabitRPG/UI/Settings/AccountSettingsViewController.swift b/HabitRPG/UI/Settings/AccountSettingsViewController.swift index a75c36508..8cdf468e3 100644 --- a/HabitRPG/UI/Settings/AccountSettingsViewController.swift +++ b/HabitRPG/UI/Settings/AccountSettingsViewController.swift @@ -548,6 +548,7 @@ struct ResetAccountView: View { } var body: some View { + let _ = print(isSocial) ScrollView { VStack(alignment: .leading, spacing: 12) { Text(L10n.Settings.resetAccountConfirm).font(.headline) @@ -557,14 +558,12 @@ struct ResetAccountView: View { Text(L10n.Settings.resetAccountDescription).font(.body).foregroundColor(Color(ThemeService.shared.theme.secondaryTextColor)) } if #available(iOS 15.0, *) { - TextField(text: $text, prompt: Text(L10n.confirm)) { - + TextField(text: $text, prompt: Text(isSocial ? "RESET" : L10n.password)) { } .padding(12) .overlay(RoundedRectangle(cornerRadius: 8).stroke().foregroundColor(Color(ThemeService.shared.theme.tableviewSeparatorColor))) } else { TextField(text: $text) { - } .padding(12) .overlay(RoundedRectangle(cornerRadius: 8).stroke().foregroundColor(Color(ThemeService.shared.theme.tableviewSeparatorColor))) @@ -572,13 +571,15 @@ struct ResetAccountView: View { HabiticaButtonUI(label: Text(L10n.Settings.resetAccount), color: Color(isValidInput() ? ThemeService.shared.theme.errorColor : ThemeService.shared.theme.dimmedColor)) { onReset(text) } - Text(L10n.Login.forgotPassword) - .foregroundColor(Color(ThemeService.shared.theme.tintColor)) - .frame(maxWidth: .infinity, alignment: .center) - .onTapGesture { - onForgotPassword() - } - .padding(16) + if (!isSocial) { + Text(L10n.Login.forgotPassword) + .foregroundColor(Color(ThemeService.shared.theme.tintColor)) + .frame(maxWidth: .infinity, alignment: .center) + .onTapGesture { + onForgotPassword() + } + .padding(16) + } }.padding(16) } } @@ -609,7 +610,7 @@ struct DeleteAccountView: View { Text(L10n.Settings.deleteAccountDescription).font(.body).foregroundColor(Color(ThemeService.shared.theme.secondaryTextColor)) } if #available(iOS 15.0, *) { - TextField(text: $text, prompt: Text(L10n.confirm)) { + TextField(text: $text, prompt: Text(isSocial ? "DELETE" : L10n.password)) { } .padding(12) .overlay(RoundedRectangle(cornerRadius: 8).stroke().foregroundColor(Color(ThemeService.shared.theme.tableviewSeparatorColor))) @@ -622,13 +623,15 @@ struct DeleteAccountView: View { HabiticaButtonUI(label: Text(L10n.Settings.deleteAccount), color: Color(isValidInput() ? ThemeService.shared.theme.errorColor : ThemeService.shared.theme.dimmedColor)) { onDelete(text) } - Text(L10n.Login.forgotPassword) - .foregroundColor(Color(ThemeService.shared.theme.tintColor)) - .frame(maxWidth: .infinity, alignment: .center) - .onTapGesture { - onForgotPassword() - } - .padding(16) + if (!isSocial) { + Text(L10n.Login.forgotPassword) + .foregroundColor(Color(ThemeService.shared.theme.tintColor)) + .frame(maxWidth: .infinity, alignment: .center) + .onTapGesture { + onForgotPassword() + } + .padding(16) + } }.padding(16) } } diff --git a/Habitica Intents/Info.plist b/Habitica Intents/Info.plist index e70566e4e..40b781081 100644 --- a/Habitica Intents/Info.plist +++ b/Habitica Intents/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString $(MARKETING_VERSION) CFBundleVersion - 954 + 953 NSExtension NSExtensionAttributes diff --git a/Habitica IntentsUI/Info.plist b/Habitica IntentsUI/Info.plist index e3c413f76..e74747a50 100644 --- a/Habitica IntentsUI/Info.plist +++ b/Habitica IntentsUI/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString $(MARKETING_VERSION) CFBundleVersion - 954 + 953 NSExtension NSExtensionAttributes diff --git a/Habitica Snapshots/Info.plist b/Habitica Snapshots/Info.plist index 5e037009e..ac2c6d91f 100644 --- a/Habitica Snapshots/Info.plist +++ b/Habitica Snapshots/Info.plist @@ -17,6 +17,6 @@ CFBundleShortVersionString 1.0 CFBundleVersion - 954 + 953 diff --git a/Habitica Widgets/Info.plist b/Habitica Widgets/Info.plist index edc391bce..98ea0d7de 100644 --- a/Habitica Widgets/Info.plist +++ b/Habitica Widgets/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString $(MARKETING_VERSION) CFBundleVersion - 954 + 953 NSExtension NSExtensionPointIdentifier diff --git a/Habitica.xcodeproj/project.pbxproj b/Habitica.xcodeproj/project.pbxproj index 4e360dd05..423b61b80 100644 --- a/Habitica.xcodeproj/project.pbxproj +++ b/Habitica.xcodeproj/project.pbxproj @@ -3969,7 +3969,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = YES; - CURRENT_PROJECT_VERSION = 954; + CURRENT_PROJECT_VERSION = 953; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_USER_SCRIPT_SANDBOXING = YES; @@ -4000,7 +4000,7 @@ CODE_SIGN_ENTITLEMENTS = Habitica.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 954; + CURRENT_PROJECT_VERSION = 953; DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = NO; DEVELOPMENT_TEAM = 9Q9SMRMCNN; ENABLE_BITCODE = NO; @@ -4152,7 +4152,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 954; + CURRENT_PROJECT_VERSION = 953; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 9Q9SMRMCNN; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -4193,7 +4193,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 954; + CURRENT_PROJECT_VERSION = 953; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 9Q9SMRMCNN; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -4236,7 +4236,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 954; + CURRENT_PROJECT_VERSION = 953; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 9Q9SMRMCNN; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -4274,7 +4274,7 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 954; + CURRENT_PROJECT_VERSION = 953; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 9Q9SMRMCNN; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -4326,7 +4326,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = YES; - CURRENT_PROJECT_VERSION = 954; + CURRENT_PROJECT_VERSION = 953; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_USER_SCRIPT_SANDBOXING = YES; @@ -4357,7 +4357,7 @@ CODE_SIGN_ENTITLEMENTS = Habitica.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 954; + CURRENT_PROJECT_VERSION = 953; DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = NO; DEVELOPMENT_TEAM = 9Q9SMRMCNN; ENABLE_BITCODE = NO; @@ -4509,7 +4509,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 954; + CURRENT_PROJECT_VERSION = 953; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 9Q9SMRMCNN; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -4550,7 +4550,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 954; + CURRENT_PROJECT_VERSION = 953; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 9Q9SMRMCNN; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -4593,7 +4593,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 954; + CURRENT_PROJECT_VERSION = 953; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 9Q9SMRMCNN; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -4631,7 +4631,7 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 954; + CURRENT_PROJECT_VERSION = 953; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 9Q9SMRMCNN; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -4661,7 +4661,7 @@ CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 954; + CURRENT_PROJECT_VERSION = 953; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = 9Q9SMRMCNN; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -4694,7 +4694,7 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 954; + CURRENT_PROJECT_VERSION = 953; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 9Q9SMRMCNN; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -4730,7 +4730,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 954; + CURRENT_PROJECT_VERSION = 953; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = 9Q9SMRMCNN; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -4776,7 +4776,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 954; + CURRENT_PROJECT_VERSION = 953; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 9Q9SMRMCNN; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -4816,7 +4816,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 954; + CURRENT_PROJECT_VERSION = 953; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = 9Q9SMRMCNN; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -4858,7 +4858,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 954; + CURRENT_PROJECT_VERSION = 953; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 9Q9SMRMCNN; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -4898,7 +4898,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 954; + CURRENT_PROJECT_VERSION = 953; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = 9Q9SMRMCNN; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -4942,7 +4942,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 954; + CURRENT_PROJECT_VERSION = 953; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 9Q9SMRMCNN; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -5151,7 +5151,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 954; + CURRENT_PROJECT_VERSION = 953; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; ENABLE_USER_SCRIPT_SANDBOXING = YES; @@ -5209,7 +5209,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = YES; - CURRENT_PROJECT_VERSION = 954; + CURRENT_PROJECT_VERSION = 953; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_USER_SCRIPT_SANDBOXING = YES; @@ -5240,7 +5240,7 @@ CODE_SIGN_ENTITLEMENTS = Habitica.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 954; + CURRENT_PROJECT_VERSION = 953; DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = NO; DEVELOPMENT_TEAM = 9Q9SMRMCNN; ENABLE_BITCODE = NO; @@ -5314,7 +5314,7 @@ CODE_SIGN_ENTITLEMENTS = Habitica.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 954; + CURRENT_PROJECT_VERSION = 953; DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = NO; DEVELOPMENT_TEAM = 9Q9SMRMCNN; ENABLE_BITCODE = NO; diff --git a/HabiticaTests/Info.plist b/HabiticaTests/Info.plist index 2f11ccc5c..2592e0b84 100644 --- a/HabiticaTests/Info.plist +++ b/HabiticaTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 954 + 953