diff --git a/.circleci/build-uitest-config.yml b/.circleci/build-uitest-config.yml index 6c23c03e..1201e9c3 100644 --- a/.circleci/build-uitest-config.yml +++ b/.circleci/build-uitest-config.yml @@ -48,8 +48,8 @@ jobs: brew install rbenv ruby-build fi eval "$(rbenv init -)" - rbenv install -s 3.2.2 - rbenv global 3.2.2 + rbenv install -s 3.3.0 + rbenv global 3.3.0 ruby -v # Clean gem environment diff --git a/.circleci/config.yml b/.circleci/config.yml index ab0b9cd7..46678e59 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -48,8 +48,8 @@ jobs: brew install rbenv ruby-build fi eval "$(rbenv init -)" - rbenv install -s 3.2.2 - rbenv global 3.2.2 + rbenv install -s 3.3.0 + rbenv global 3.3.0 ruby -v # Clean gem environment diff --git a/.circleci/daily-develop-config.yml b/.circleci/daily-develop-config.yml index 34061698..9b4f6ba6 100644 --- a/.circleci/daily-develop-config.yml +++ b/.circleci/daily-develop-config.yml @@ -49,8 +49,8 @@ jobs: brew install rbenv ruby-build fi eval "$(rbenv init -)" - rbenv install -s 3.2.2 - rbenv global 3.2.2 + rbenv install -s 3.3.0 + rbenv global 3.3.0 ruby -v # Clean gem environment diff --git a/Gemfile b/Gemfile index 8649fb6b..870cda1d 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source "https://rubygems.org" -ruby "3.2.2" +ruby "3.3.0" gem "abbrev" gem "mutex_m" gem "ostruct" diff --git a/Modules/core b/Modules/core index 807a1121..4c903166 160000 --- a/Modules/core +++ b/Modules/core @@ -1 +1 @@ -Subproject commit 807a11214bd6db7faf0189dfa727e5b7121768d9 +Subproject commit 4c90316690ce613482649ccd8b07583749a72266 diff --git a/brainwallet.xcodeproj/project.pbxproj b/brainwallet.xcodeproj/project.pbxproj index ad78a83e..0e7d33a6 100644 --- a/brainwallet.xcodeproj/project.pbxproj +++ b/brainwallet.xcodeproj/project.pbxproj @@ -396,6 +396,7 @@ C33C4A1F2FC1C96100C23DA7 /* ShopStructs.swift in Sources */ = {isa = PBXBuildFile; fileRef = C33C4A192FC1C94B00C23DA7 /* ShopStructs.swift */; }; C353E3BA2FAE9F9E00BFFB30 /* ShopBentoViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = C353E3B42FAE9F9000BFFB30 /* ShopBentoViewModel.swift */; }; C35C122A293D48340009022D /* KeychainAccess in Frameworks */ = {isa = PBXBuildFile; productRef = C35C1229293D48340009022D /* KeychainAccess */; }; + C38F57252FD490430005538A /* boingspringmouthharp042013.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = C38F57242FD490430005538A /* boingspringmouthharp042013.mp3 */; }; C3C95F082FA13DEF002E2BEE /* SignupAskView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3C95F072FA13DEF002E2BEE /* SignupAskView.swift */; }; C3E18A9F2F9E657000966C74 /* ShopCardsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3E18A9E2F9E656600966C74 /* ShopCardsView.swift */; }; C3E18AA12F9EC22000966C74 /* ConfirmationStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3E18AA02F9EC21600966C74 /* ConfirmationStatus.swift */; }; @@ -989,6 +990,7 @@ C3236A002D7DE34D007039A1 /* URLController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = URLController.swift; sourceTree = ""; }; C33C4A192FC1C94B00C23DA7 /* ShopStructs.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShopStructs.swift; sourceTree = ""; }; C353E3B42FAE9F9000BFFB30 /* ShopBentoViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShopBentoViewModel.swift; sourceTree = ""; }; + C38F57242FD490430005538A /* boingspringmouthharp042013.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = boingspringmouthharp042013.mp3; sourceTree = ""; }; C3C95F072FA13DEF002E2BEE /* SignupAskView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignupAskView.swift; sourceTree = ""; }; C3E18A9E2F9E656600966C74 /* ShopCardsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShopCardsView.swift; sourceTree = ""; }; C3E18AA02F9EC21600966C74 /* ConfirmationStatus.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConfirmationStatus.swift; sourceTree = ""; }; @@ -1924,6 +1926,7 @@ 24F5BD432E042F1D0010D340 /* clicksound.mp3 */, 24BC37BF2E22B249005DD3AC /* coinflip.mp3 */, C312D0AF2D7DC27700BB97A4 /* coinflip.aiff */, + C38F57242FD490430005538A /* boingspringmouthharp042013.mp3 */, ); path = Sounds; sourceTree = ""; @@ -2452,6 +2455,7 @@ 24AFEEEC2F3152CE00427D02 /* IBMPlexSans-Bold.ttf in Resources */, 24DBB7C62F34E75A002E6511 /* IBMPlexSans-ExtraLight.ttf in Resources */, 24AFEEED2F3152CE00427D02 /* IBMPlexSans-SemiBold.ttf in Resources */, + C38F57252FD490430005538A /* boingspringmouthharp042013.mp3 in Resources */, 24AFEEEE2F3152CE00427D02 /* IBMPlexSans-Medium.ttf in Resources */, 24AFEEEF2F3152CE00427D02 /* IBMPlexSans-Light.ttf in Resources */, 24AFEEF02F3152CE00427D02 /* IBMPlexSans-Italic.ttf in Resources */, @@ -3210,7 +3214,7 @@ CODE_SIGN_ENTITLEMENTS = brainwallet/brainwallet.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2602285; + CURRENT_PROJECT_VERSION = 2602286; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEPLOYMENT_POSTPROCESSING = NO; DEVELOPMENT_TEAM = U8WDVUDC2P; @@ -3227,7 +3231,7 @@ "@executable_path/Frameworks", "$(FRAMEWORK_SEARCH_PATHS)", ); - MARKETING_VERSION = 3.9.6; + MARKETING_VERSION = 3.9.7; ONLY_ACTIVE_ARCH = NO; OTHER_SWIFT_FLAGS = "-DDebug $(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = com.gruntsoftware.brainwallet; @@ -3402,7 +3406,7 @@ CODE_SIGN_ENTITLEMENTS = brainwallet/brainwallet.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2602285; + CURRENT_PROJECT_VERSION = 2602286; DEPLOYMENT_POSTPROCESSING = YES; DEVELOPMENT_TEAM = U8WDVUDC2P; DOCC_EXTRACT_SWIFT_INFO_FOR_OBJC_SYMBOLS = YES; @@ -3418,7 +3422,7 @@ "@executable_path/Frameworks", "$(FRAMEWORK_SEARCH_PATHS)", ); - MARKETING_VERSION = 3.9.6; + MARKETING_VERSION = 3.9.7; ONLY_ACTIVE_ARCH = NO; OTHER_SWIFT_FLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = com.gruntsoftware.brainwallet; diff --git a/brainwallet/Bento Views/BalanceBentoView.swift b/brainwallet/Bento Views/BalanceBentoView.swift index de06d231..4abdae27 100644 --- a/brainwallet/Bento Views/BalanceBentoView.swift +++ b/brainwallet/Bento Views/BalanceBentoView.swift @@ -30,6 +30,10 @@ struct BalanceBentoView: View { _userPrefersDarkTheme = userPrefersDarkTheme newMainViewModel = viewModel } + + private func playBoing() { + SoundsHelper().play(filename: "boingspringmouthharp042013", type: "mp3") + } var body: some View { GeometryReader { geometry in @@ -59,6 +63,7 @@ struct BalanceBentoView: View { Spacer() Button(action: { shouldShowBalance.toggle() + playBoing() }) { Image(systemName: shouldShowBalance ? "eye.slash" : "eye") .resizable() diff --git a/brainwallet/Sounds/boingspringmouthharp042013.mp3 b/brainwallet/Sounds/boingspringmouthharp042013.mp3 new file mode 100644 index 00000000..1f75f9a1 Binary files /dev/null and b/brainwallet/Sounds/boingspringmouthharp042013.mp3 differ