Skip to content

Commit

Permalink
reset/delete flow fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@phillipthelen
phillipthelen committed Feb 21, 2024
1 parent 0131fc9 commit ff04c13
Show file tree
Hide file tree
Showing 10 changed files with 34 additions and 34 deletions.
2 changes: 1 addition & 1 deletion HabitRPG/Generated/Strings.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2325,7 +2325,7 @@ public enum L10n {
public static var resetAccountConfirm: String { return L10n.tr("Mainstrings", "settings.reset_account_confirm") }
/// You will lose all your levels, Gold, and Experience. All your tasks and their historical data will be deleted (Challenge tasks will stay). You will lose all equipment, except Subscriber items and free commemorative items, but you will be able to buy it back. You will need to be the correct class to re-buy class-specific gear. You will keep your current class, Achievements, and your Pets and Mounts. To confirm reset, type your password below.
public static var resetAccountDescription: String { return L10n.tr("Mainstrings", "settings.reset_account_description") }
/// You will lose all your levels, Gold, and Experience. All your tasks and their historical data will be deleted (Challenge tasks will stay). You will lose all equipment, except Subscriber items and free commemorative items, but you will be able to buy it back. You will need to be the correct class to re-buy class-specific gear. You will keep your current class, Achievements, and your Pets and Mounts. If you’re absolutely certain, type DELETE into the text box below.
/// You will lose all your levels, Gold, and Experience. All your tasks and their historical data will be deleted (Challenge tasks will stay). You will lose all equipment, except Subscriber items and free commemorative items, but you will be able to buy it back. You will need to be the correct class to re-buy class-specific gear. You will keep your current class, Achievements, and your Pets and Mounts. If you’re absolutely certain, type RESET into the text box below.
public static var resetAccountDescriptionSocial: String { return L10n.tr("Mainstrings", "settings.reset_account_description_social") }
/// Resume Damage
public static var resumeDamage: String { return L10n.tr("Mainstrings", "settings.resume_damage") }
Expand Down
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>952</string>
<string>953</string>
<key>CustomDomain</key>
<string>${CUSTOM_DOMAIN}</string>
<key>DisableSSL</key>
Expand Down
2 changes: 1 addition & 1 deletion HabitRPG/Strings/Base.lproj/Mainstrings.strings
View file
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@
"settings.updated_email" = "Email updated";
"settings.updated_password" = "Password updated";
"settings.reset_account_description" = "You will lose all your levels, Gold, and Experience. All your tasks and their historical data will be deleted (Challenge tasks will stay). You will lose all equipment, except Subscriber items and free commemorative items, but you will be able to buy it back. You will need to be the correct class to re-buy class-specific gear. You will keep your current class, Achievements, and your Pets and Mounts. To confirm reset, type your password below.";
"settings.reset_account_description_social" = "You will lose all your levels, Gold, and Experience. All your tasks and their historical data will be deleted (Challenge tasks will stay). You will lose all equipment, except Subscriber items and free commemorative items, but you will be able to buy it back. You will need to be the correct class to re-buy class-specific gear. You will keep your current class, Achievements, and your Pets and Mounts. If you’re absolutely certain, type DELETE into the text box below.";
"settings.reset_account_description_social" = "You will lose all your levels, Gold, and Experience. All your tasks and their historical data will be deleted (Challenge tasks will stay). You will lose all equipment, except Subscriber items and free commemorative items, but you will be able to buy it back. You will need to be the correct class to re-buy class-specific gear. You will keep your current class, Achievements, and your Pets and Mounts. If you’re absolutely certain, type RESET into the text box below.";

"settings.delete_account" = "Delete Account";
"settings.delete_account_confirm" = "Are you sure you want to delete?";
Expand Down
4 changes: 2 additions & 2 deletions HabitRPG/UI/Settings/AccountSettingsViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,7 @@ 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.password)) {
TextField(text: $text, prompt: Text(L10n.confirm)) {

}
.padding(12)
Expand Down Expand Up @@ -609,7 +609,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.password)) {
TextField(text: $text, prompt: Text(L10n.confirm)) {
}
.padding(12)
.overlay(RoundedRectangle(cornerRadius: 8).stroke().foregroundColor(Color(ThemeService.shared.theme.tableviewSeparatorColor)))
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>952</string>
<string>953</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>952</string>
<string>953</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>952</string>
<string>953</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>952</string>
<string>953</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 @@ -3969,7 +3969,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = YES;
CURRENT_PROJECT_VERSION = 952;
CURRENT_PROJECT_VERSION = 953;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
Expand Down Expand Up @@ -4000,7 +4000,7 @@
CODE_SIGN_ENTITLEMENTS = Habitica.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CURRENT_PROJECT_VERSION = 952;
CURRENT_PROJECT_VERSION = 953;
DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = NO;
DEVELOPMENT_TEAM = 9Q9SMRMCNN;
ENABLE_BITCODE = NO;
Expand Down Expand Up @@ -4152,7 +4152,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 952;
CURRENT_PROJECT_VERSION = 953;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 9Q9SMRMCNN;
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand Down Expand Up @@ -4193,7 +4193,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 952;
CURRENT_PROJECT_VERSION = 953;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 9Q9SMRMCNN;
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand Down Expand Up @@ -4236,7 +4236,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 952;
CURRENT_PROJECT_VERSION = 953;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 9Q9SMRMCNN;
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand Down Expand Up @@ -4274,7 +4274,7 @@
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 952;
CURRENT_PROJECT_VERSION = 953;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 9Q9SMRMCNN;
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand Down Expand Up @@ -4326,7 +4326,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = YES;
CURRENT_PROJECT_VERSION = 952;
CURRENT_PROJECT_VERSION = 953;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
Expand Down Expand Up @@ -4357,7 +4357,7 @@
CODE_SIGN_ENTITLEMENTS = Habitica.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CURRENT_PROJECT_VERSION = 952;
CURRENT_PROJECT_VERSION = 953;
DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = NO;
DEVELOPMENT_TEAM = 9Q9SMRMCNN;
ENABLE_BITCODE = NO;
Expand Down Expand Up @@ -4509,7 +4509,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 952;
CURRENT_PROJECT_VERSION = 953;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 9Q9SMRMCNN;
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand Down Expand Up @@ -4550,7 +4550,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 952;
CURRENT_PROJECT_VERSION = 953;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 9Q9SMRMCNN;
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand Down Expand Up @@ -4593,7 +4593,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 952;
CURRENT_PROJECT_VERSION = 953;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 9Q9SMRMCNN;
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand Down Expand Up @@ -4631,7 +4631,7 @@
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 952;
CURRENT_PROJECT_VERSION = 953;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 9Q9SMRMCNN;
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand Down Expand Up @@ -4661,7 +4661,7 @@
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 952;
CURRENT_PROJECT_VERSION = 953;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = 9Q9SMRMCNN;
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand Down Expand Up @@ -4694,7 +4694,7 @@
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 952;
CURRENT_PROJECT_VERSION = 953;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 9Q9SMRMCNN;
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand Down Expand Up @@ -4730,7 +4730,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 952;
CURRENT_PROJECT_VERSION = 953;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = 9Q9SMRMCNN;
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand Down Expand Up @@ -4776,7 +4776,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 952;
CURRENT_PROJECT_VERSION = 953;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 9Q9SMRMCNN;
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand Down Expand Up @@ -4816,7 +4816,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 952;
CURRENT_PROJECT_VERSION = 953;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = 9Q9SMRMCNN;
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand Down Expand Up @@ -4858,7 +4858,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 952;
CURRENT_PROJECT_VERSION = 953;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 9Q9SMRMCNN;
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand Down Expand Up @@ -4898,7 +4898,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 952;
CURRENT_PROJECT_VERSION = 953;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = 9Q9SMRMCNN;
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand Down Expand Up @@ -4942,7 +4942,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 952;
CURRENT_PROJECT_VERSION = 953;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 9Q9SMRMCNN;
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand Down Expand Up @@ -5151,7 +5151,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 952;
CURRENT_PROJECT_VERSION = 953;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
Expand Down Expand Up @@ -5209,7 +5209,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = YES;
CURRENT_PROJECT_VERSION = 952;
CURRENT_PROJECT_VERSION = 953;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
Expand Down Expand Up @@ -5240,7 +5240,7 @@
CODE_SIGN_ENTITLEMENTS = Habitica.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CURRENT_PROJECT_VERSION = 952;
CURRENT_PROJECT_VERSION = 953;
DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = NO;
DEVELOPMENT_TEAM = 9Q9SMRMCNN;
ENABLE_BITCODE = NO;
Expand Down Expand Up @@ -5314,7 +5314,7 @@
CODE_SIGN_ENTITLEMENTS = Habitica.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CURRENT_PROJECT_VERSION = 952;
CURRENT_PROJECT_VERSION = 953;
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>952</string>
<string>953</string>
</dict>
</plist>

0 comments on commit ff04c13

Please sign in to comment.