diff --git a/Fundoshi/Fundoshi.xcodeproj/project.pbxproj b/Fundoshi/Fundoshi.xcodeproj/project.pbxproj index 4a32e83..7984c73 100644 --- a/Fundoshi/Fundoshi.xcodeproj/project.pbxproj +++ b/Fundoshi/Fundoshi.xcodeproj/project.pbxproj @@ -157,7 +157,7 @@ attributes = { BuildIndependentTargetsInParallel = 1; LastSwiftUpdateCheck = 1520; - LastUpgradeCheck = 1600; + LastUpgradeCheck = 1610; TargetAttributes = { FBC5E8312B8A024000C2A459 = { CreatedOnToolsVersion = 15.2; @@ -233,6 +233,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; @@ -298,6 +299,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; @@ -361,7 +363,7 @@ "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 35; + CURRENT_PROJECT_VERSION = 57; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_ASSET_PATHS = "\"Fundoshi/Preview Content\""; DEVELOPMENT_TEAM = "$(inherited)"; @@ -379,7 +381,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 14.0; - MARKETING_VERSION = 1.3.3; + MARKETING_VERSION = 1.3.4; PRODUCT_BUNDLE_IDENTIFIER = com.ookamitai.Fundoshi; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = "$(inherited)"; @@ -398,7 +400,7 @@ "CODE_SIGN_IDENTITY[sdk=macosx*]" = "-"; CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 35; + CURRENT_PROJECT_VERSION = 57; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_ASSET_PATHS = "\"Fundoshi/Preview Content\""; DEVELOPMENT_TEAM = "$(inherited)"; @@ -415,7 +417,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 14.0; - MARKETING_VERSION = 1.3.3; + MARKETING_VERSION = 1.3.4; PRODUCT_BUNDLE_IDENTIFIER = com.ookamitai.Fundoshi; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = "$(inherited)"; diff --git a/Fundoshi/Fundoshi.xcodeproj/project.xcworkspace/xcuserdata/ookamitai.xcuserdatad/UserInterfaceState.xcuserstate b/Fundoshi/Fundoshi.xcodeproj/project.xcworkspace/xcuserdata/ookamitai.xcuserdatad/UserInterfaceState.xcuserstate index 5786b2f..1dd6ead 100644 Binary files a/Fundoshi/Fundoshi.xcodeproj/project.xcworkspace/xcuserdata/ookamitai.xcuserdatad/UserInterfaceState.xcuserstate and b/Fundoshi/Fundoshi.xcodeproj/project.xcworkspace/xcuserdata/ookamitai.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/Fundoshi/Fundoshi.xcodeproj/xcshareddata/xcschemes/Fundoshi.xcscheme b/Fundoshi/Fundoshi.xcodeproj/xcshareddata/xcschemes/Fundoshi.xcscheme index d90f28a..3839962 100644 --- a/Fundoshi/Fundoshi.xcodeproj/xcshareddata/xcschemes/Fundoshi.xcscheme +++ b/Fundoshi/Fundoshi.xcodeproj/xcshareddata/xcschemes/Fundoshi.xcscheme @@ -1,11 +1,29 @@ + + + + + + + + + + String { for i in h { s += (String(i) + ",") } - let _ = s.popLast() + s.removeLast() return s } diff --git a/Fundoshi/Fundoshi/MenuView.swift b/Fundoshi/Fundoshi/MenuView.swift index 468fded..7f8011f 100644 --- a/Fundoshi/Fundoshi/MenuView.swift +++ b/Fundoshi/Fundoshi/MenuView.swift @@ -36,7 +36,7 @@ public struct CustomCompactSliderStyle: CompactSliderStyle { } public extension CompactSliderStyle where Self == CustomCompactSliderStyle { - static var `custom`: CustomCompactSliderStyle { CustomCompactSliderStyle() } + static var `test`: CustomCompactSliderStyle { CustomCompactSliderStyle() } } @@ -73,9 +73,10 @@ struct MenuView: View { } .frame(maxWidth: showCustomTime ? 300 : .infinity) .onChange(of: doubleHelper) { _, newValue in + appState.timerOn = false audioPlayer = try! AVAudioPlayer(contentsOf: URL(fileURLWithPath: Bundle.main.path(forResource: "tick", ofType: "caf")!)) audioPlayer.play() - if doubleHelper == 61.0 { + if doubleHelper >= 61.0 { audioPlayer = try! AVAudioPlayer(contentsOf: URL(fileURLWithPath: Bundle.main.path(forResource: "extra", ofType: "caf")!)) audioPlayer.play() showCustomTime = true @@ -90,13 +91,14 @@ struct MenuView: View { } } .onAppear { - doubleHelper = Double(setTime / 60) + doubleHelper = setTime / 60 >= 60 ? 61.0 : Double(setTime / 60) } .animation(.default, value: showCustomTime) - .compactSliderStyle(.custom) + .compactSliderStyle(.test) TextField("", text: $tmp) .onChange(of: tmp) { + appState.timerOn = false setTime = (Int(tmp) ?? 1) * 60 timeSec = setTime timeString = buildString(secs: setTime) @@ -279,7 +281,7 @@ struct MenuView: View { .opacity(imageClockOpacity) .frame(width: 150, height: 150) .offset(x: 60, y: 60) - .blur(radius: 2) + .blur(radius: 8) .shadow(radius: 3) .animation(.default, value: imageClockOpacity) }