diff --git a/AzooKeyCore/Sources/KeyboardViews/View/CustomKeybaord/SimpleKeyView/SimpleKeyModel.swift b/AzooKeyCore/Sources/KeyboardViews/View/CustomKeybaord/SimpleKeyView/SimpleKeyModel.swift index 1314062a..0b748c7c 100644 --- a/AzooKeyCore/Sources/KeyboardViews/View/CustomKeybaord/SimpleKeyView/SimpleKeyModel.swift +++ b/AzooKeyCore/Sources/KeyboardViews/View/CustomKeybaord/SimpleKeyView/SimpleKeyModel.swift @@ -89,7 +89,7 @@ struct SimpleKeyModel: Simp func pressActions(variableStates: VariableStates) -> [ActionType] { pressActions } - + func longPressActions(variableStates: VariableStates) -> LongpressActionType { longPressActions } @@ -132,7 +132,7 @@ struct SimpleEnterKeyModel: struct SimpleNextCandidateKeyModel: SimpleKeyModelProtocol { var unpressedKeyColorType: SimpleUnpressedKeyColorType = .normal - + func pressActions(variableStates: VariableStates) -> [ActionType] { if variableStates.resultModel.results.isEmpty { [.input(" ")] @@ -168,7 +168,6 @@ struct SimpleNextCandidateKeyModel: SimpleKeyModelProtocol { func pressActions(variableStates: VariableStates) -> [ActionType] { if SemiStaticStates.shared.needsInputModeSwitchKey { diff --git a/AzooKeyCore/Sources/KeyboardViews/View/FlickKeyboard/KeyView/FlickChangeKeyboardKeyModel.swift b/AzooKeyCore/Sources/KeyboardViews/View/FlickKeyboard/KeyView/FlickChangeKeyboardKeyModel.swift index e17f1be8..48581d84 100644 --- a/AzooKeyCore/Sources/KeyboardViews/View/FlickKeyboard/KeyView/FlickChangeKeyboardKeyModel.swift +++ b/AzooKeyCore/Sources/KeyboardViews/View/FlickKeyboard/KeyView/FlickChangeKeyboardKeyModel.swift @@ -34,7 +34,7 @@ struct FlickChangeKeyboardModel LongpressActionType { + func longPressActions(variableStates _: VariableStates) -> LongpressActionType { .none } diff --git a/AzooKeyCore/Sources/KeyboardViews/View/KeyboardBar/KeyboardBarView.swift b/AzooKeyCore/Sources/KeyboardViews/View/KeyboardBar/KeyboardBarView.swift index c7f4d417..e2cf1584 100644 --- a/AzooKeyCore/Sources/KeyboardViews/View/KeyboardBar/KeyboardBarView.swift +++ b/AzooKeyCore/Sources/KeyboardViews/View/KeyboardBar/KeyboardBarView.swift @@ -16,7 +16,7 @@ struct KeyboardBarView: Vie @Binding private var isResultViewExpanded: Bool @Environment(Extension.Theme.self) private var theme // CursorBarは操作がない場合に非表示にする。これをハンドルするためのタスク - @State private var dismissTask: Task<(), any Error>? = nil + @State private var dismissTask: Task<(), any Error>? private var useReflectStyleCursorBar: Bool { Extension.SettingProvider.useReflectStyleCursorBar diff --git a/AzooKeyCore/Sources/KeyboardViews/View/KeyboardBar/ReflectStyleCursorBar.swift b/AzooKeyCore/Sources/KeyboardViews/View/KeyboardBar/ReflectStyleCursorBar.swift index d42da070..85080ef8 100644 --- a/AzooKeyCore/Sources/KeyboardViews/View/KeyboardBar/ReflectStyleCursorBar.swift +++ b/AzooKeyCore/Sources/KeyboardViews/View/KeyboardBar/ReflectStyleCursorBar.swift @@ -73,11 +73,11 @@ private struct CursorBarState: Equatable, Hashable, Sendable { struct ReflectStyleCursorBar: View { init() {} - + @EnvironmentObject private var variableStates: VariableStates @Environment(Extension.Theme.self) private var theme @Environment(\.userActionManager) private var action - + private enum SwipeGestureState { case inactive case tap(l1: CGPoint, l2: CGPoint, l3: CGPoint) @@ -86,22 +86,22 @@ struct ReflectStyleCursorBar? - + @MainActor private var fontSize: CGFloat { Design.fonts.resultViewFontSize(userPrefrerence: Extension.SettingProvider.resultViewFontSize) } - + @MainActor fileprivate var itemWidth: CGFloat { fontSize * 1.3 } - + @MainActor fileprivate var viewWidth: CGFloat { variableStates.interfaceSize.width * 0.85 } - + @MainActor var swipeGesture: some Gesture { DragGesture(minimumDistance: 0, coordinateSpace: .global) @@ -181,34 +181,34 @@ struct ReflectStyleCursorBar Font { .system(size: size, weight: symbolsFontWeight, design: .default) } - + @MainActor private var textView: some View { HStack(spacing: .zero) { @@ -232,7 +232,7 @@ struct ReflectStyleCursorBar swipeGestureState = .moving(l1: value.location, l2: l1, l3: l2, count: count) } } - .onEnded {value in + .onEnded {_ in swipeGestureState = .inactive } } diff --git a/AzooKeyCore/Sources/KeyboardViews/View/QwertyKeyboard/KeyView/QwertyNextCandidateKeyModel.swift b/AzooKeyCore/Sources/KeyboardViews/View/QwertyKeyboard/KeyView/QwertyNextCandidateKeyModel.swift index 606a394e..12e8955e 100644 --- a/AzooKeyCore/Sources/KeyboardViews/View/QwertyKeyboard/KeyView/QwertyNextCandidateKeyModel.swift +++ b/AzooKeyCore/Sources/KeyboardViews/View/QwertyKeyboard/KeyView/QwertyNextCandidateKeyModel.swift @@ -13,13 +13,13 @@ import SwiftUI struct QwertyNextCandidateKeyModel: QwertyKeyModelProtocol { let keySizeType: QwertyKeySizeType = .space - + let needSuggestView: Bool = false - + let variationsModel: VariationsModel = .init([]) - + let unpressedKeyColorType: QwertyUnpressedKeyColorType = .normal - + static var shared: Self { QwertyNextCandidateKeyModel() } func pressActions(variableStates: VariableStates) -> [ActionType] { diff --git a/MainApp/Customize/CodableActionDataEditor.swift b/MainApp/Customize/CodableActionDataEditor.swift index 637f405d..8067b2b3 100644 --- a/MainApp/Customize/CodableActionDataEditor.swift +++ b/MainApp/Customize/CodableActionDataEditor.swift @@ -31,7 +31,7 @@ extension CodableActionData { case .paste: return "ペーストする" case .moveTab: return "タブの移動" case .replaceLastCharacters: return "文字を置換" - case let .selectCandidate(selection): + case let .selectCandidate(selection): return switch selection { case .first: "最初の候補を選択" case .last: "最後の候補を選択" diff --git a/MainApp/Setting/OpenSourceSoftwaresLicenseView.swift b/MainApp/Setting/OpenSourceSoftwaresLicenseView.swift index de18234d..504995f3 100644 --- a/MainApp/Setting/OpenSourceSoftwaresLicenseView.swift +++ b/MainApp/Setting/OpenSourceSoftwaresLicenseView.swift @@ -208,7 +208,7 @@ private struct FunnyAzooKeyIcon: View { init(stage: Stage = .normal) { self._stage = .init(initialValue: stage) } - + struct NormalAnimationValue { // degrees var angle: Double = -10