Thanks to visit codestin.com
Credit goes to github.com

Skip to content

refactor: overlayとbackgroundでdeprecated APIを使っている部分を修正 #506

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 26, 2025
Merged

refactor: overlayとbackgroundでdeprecated APIを使っている部分を修正 #506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15856df
refactor: stop using deprecated overlay API
ensan-hcl Apr 26, 2025
46b4e0c
refactor: stop using deprecated background API
ensan-hcl Apr 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 19 additions & 17 deletions AzooKeyCore/Sources/KeyboardViews/View/Components/ResizingRect.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,11 +232,11 @@ struct ResizingRect<Extension: ApplicationSpecificKeyboardViewExtension>: View {
Circle()
.fill(Color.blue)
.frame(width: r, height: r)
.overlay(
.overlay {
Image(systemName: "arrow.up.and.down.and.arrow.left.and.right")
.foregroundStyle(.white)
.font(Font.system(size: r * 0.5))
)
}
.gesture(moveGesture)
Button {
KeyboardFeedback<Extension>.reset()
Expand All @@ -249,31 +249,31 @@ struct ResizingRect<Extension: ApplicationSpecificKeyboardViewExtension>: View {
self.bottom_right_edge = (.init(x: initialSize.width, y: initialSize.height), .init(x: initialSize.width, y: initialSize.height))
self.initialPosition = .zero
self.updateUserDefaults()
}label: {
} label: {
Circle()
.fill(Color.red)
.frame(width: r, height: r)
.overlay(
.overlay {
Image(systemName: "arrow.triangle.2.circlepath")
.foregroundStyle(.white)
.font(Font.system(size: r * 0.5))
)
}
}
Button {
if self.position == .zero && self.size == self.initialSize {
variableStates.setResizingMode(.fullwidth)
} else {
variableStates.setResizingMode(.onehanded)
}
}label: {
} label: {
Circle()
.fill(Color.blue)
.frame(width: r, height: r)
.overlay(
.overlay {
Image(systemName: "checkmark")
.foregroundStyle(.white)
.font(Font.system(size: r * 0.5))
)
}
}
}
}
Expand Down Expand Up @@ -329,29 +329,29 @@ struct ResizingBindingFrame<Extension: ApplicationSpecificKeyboardViewExtension>
let r = min(data.max * 0.7, max)
let button1 = Button {
variableStates.setResizingMode(.resizing)
}label: {
} label: {
Circle()
.fill(Color.blue)
.frame(width: r, height: r)
.overlay(
.overlay {
Image(systemName: "aspectratio")
.foregroundStyle(.white)
.font(Font.system(size: r * 0.5))
)
}
}
.frame(width: r, height: r)

let button2 = Button {
variableStates.setResizingMode(.fullwidth)
}label: {
} label: {
Circle()
.fill(Color.blue)
.frame(width: r, height: r)
.overlay(
.overlay {
Image(systemName: "arrow.up.backward.and.arrow.down.forward")
.foregroundStyle(.white)
.font(Font.system(size: r * 0.5))
)
}
}
.frame(width: r, height: r)

Expand All @@ -370,11 +370,11 @@ struct ResizingBindingFrame<Extension: ApplicationSpecificKeyboardViewExtension>
Circle()
.fill(Color.red)
.frame(width: r, height: r)
.overlay(
.overlay {
Image(systemName: "arrow.triangle.2.circlepath")
.foregroundStyle(.white)
.font(Font.system(size: r * 0.5))
)
}
}

switch data.stack {
Expand Down Expand Up @@ -416,7 +416,9 @@ struct ResizingBindingFrame<Extension: ApplicationSpecificKeyboardViewExtension>
.frame(width: size.width, height: size.height)
}
.disabled(true)
.overlay(ResizingRect<Extension>(size: $size, position: $position, initialSize: initialSize))
.overlay {
ResizingRect<Extension>(size: $size, position: $position, initialSize: initialSize)
}
.frame(width: size.width, height: size.height)
.offset(x: position.x, y: position.y)
}
Expand Down
8 changes: 4 additions & 4 deletions AzooKeyCore/Sources/KeyboardViews/View/CustomKeybaord/SimpleKeyView/SimpleKeyView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,17 +44,17 @@ public struct SimpleKeyView<Extension: ApplicationSpecificKeyboardViewExtension>

public var body: some View {
label(width: keyViewWidth)
.background(
.background {
RoundedRectangle(cornerRadius: 6)
.strokeAndFill(
fillContent: isPressed ? model.backGroundColorWhenPressed(theme: theme) : model.unpressedKeyColorType.color(states: variableStates, theme: theme),
strokeContent: theme.borderColor.color,
lineWidth: theme.borderWidth
)
.frame(width: keyViewWidth, height: keyViewHeight)
)
}
.frame(width: keyViewWidth, height: keyViewHeight)
.overlay(
.overlay {
Group {
if !(model is SimpleChangeKeyboardKeyModel<Extension> && SemiStaticStates.shared.needsInputModeSwitchKey) {
TouchDownAndTouchUpGestureView {
Expand All @@ -81,7 +81,7 @@ public struct SimpleKeyView<Extension: ApplicationSpecificKeyboardViewExtension>
.onDisappear {
action.registerLongPressActionEnd(self.model.longPressActions(variableStates: variableStates))
}
)
}
.frame(width: keyViewWidth, height: keyViewHeight)
}
}
4 changes: 3 additions & 1 deletion AzooKeyCore/Sources/KeyboardViews/View/FlickKeyboard/KeyView/FlickKeyView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,9 @@ public struct FlickKeyView<Extension: ApplicationSpecificKeyboardViewExtension>:
.gesture(gesture)
.compositingGroup()
.shadow(color: theme.keyShadow?.color.color ?? .clear, radius: theme.keyShadow?.radius ?? 0, x: theme.keyShadow?.x ?? 0, y: theme.keyShadow?.y ?? 0)
.overlay(self.label(width: keySize.width))
.overlay {
self.label(width: keySize.width)
}
}

func longFlickReserve(_ direction: FlickDirection) {
Expand Down
12 changes: 7 additions & 5 deletions AzooKeyCore/Sources/KeyboardViews/View/KeyboardBar/ReflectStyleCursorBar.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ struct ReflectStyleCursorBar<Extension: ApplicationSpecificKeyboardViewExtension
.font(symbolFont(size: 18))
.foregroundStyle(symbolsColor)
.padding()
.overlay(
.overlay {
TouchDownAndTouchUpGestureView {
self.startLongPress(offset: -1)
} touchMovedCallBack: { state in
Expand All @@ -260,7 +260,7 @@ struct ReflectStyleCursorBar<Extension: ApplicationSpecificKeyboardViewExtension
KeyboardFeedback<Extension>.tabOrOtherKey()
}
}
)
}
Spacer()
Text(verbatim: "│")
.font(.system(size: fontSize + 4))
Expand All @@ -271,7 +271,7 @@ struct ReflectStyleCursorBar<Extension: ApplicationSpecificKeyboardViewExtension
.font(symbolFont(size: 18))
.foregroundStyle(symbolsColor)
.padding()
.overlay(
.overlay {
TouchDownAndTouchUpGestureView {
self.startLongPress(offset: 1)
} touchMovedCallBack: { state in
Expand All @@ -288,14 +288,16 @@ struct ReflectStyleCursorBar<Extension: ApplicationSpecificKeyboardViewExtension
KeyboardFeedback<Extension>.tabOrOtherKey()
}
}
)
}
}
}
}

var body: some View {
background
.overlay(foregroundButtons)
.overlay {
foregroundButtons
}
.onAppear {
cursorBarState.updateItemCount(viewWidth: viewWidth, itemWidth: itemWidth)
let surroundingText = variableStates.surroundingText
Expand Down
4 changes: 2 additions & 2 deletions AzooKeyCore/Sources/KeyboardViews/View/KeyboardBar/SliderStyleCursorBar.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ struct SliderStyleCursorBar<Extension: ApplicationSpecificKeyboardViewExtension>
RadialGradient(gradient: Gradient(colors: [centerColor, edgeColor]), center: .center, startRadius: 1, endRadius: 200)
.cornerRadius(20)
.gesture(swipeGesture)
.overlay(
.overlay {
HStack {
Spacer()
moveLeftButton
Expand All @@ -160,6 +160,6 @@ struct SliderStyleCursorBar<Extension: ApplicationSpecificKeyboardViewExtension>
moveRightButton
Spacer()
}
)
}
}
}
18 changes: 8 additions & 10 deletions AzooKeyCore/Sources/KeyboardViews/View/KeyboardView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,15 @@ public struct KeyboardView<Extension: ApplicationSpecificKeyboardViewExtension>:
ZStack { [unowned variableStates] in
theme.backgroundColor.color
.frame(maxWidth: .infinity)
.overlay(
Group {
if let image = theme.picture.image {
image
.resizable()
.scaledToFill()
.frame(width: SemiStaticStates.shared.screenWidth, height: Design.keyboardScreenHeight(upsideComponent: variableStates.upsideComponent, orientation: variableStates.keyboardOrientation))
.clipped()
}
.overlay {
if let image = theme.picture.image {
image
.resizable()
.scaledToFill()
.frame(width: SemiStaticStates.shared.screenWidth, height: Design.keyboardScreenHeight(upsideComponent: variableStates.upsideComponent, orientation: variableStates.keyboardOrientation))
.clipped()
}
)
}
VStack(spacing: 0) {
if let upsideComponent = variableStates.upsideComponent {
Group {
Expand Down
19 changes: 10 additions & 9 deletions AzooKeyCore/Sources/KeyboardViews/View/QwertyKeyboard/KeyView/QwertyKeyView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,9 +247,11 @@ struct QwertyKeyView<Extension: ApplicationSpecificKeyboardViewExtension>: View
.gesture(gesture)
.compositingGroup()
.shadow(color: theme.keyShadow?.color.color ?? .clear, radius: theme.keyShadow?.radius ?? 0, x: theme.keyShadow?.x ?? 0, y: theme.keyShadow?.y ?? 0)
.overlay(label(width: size.width, color: nil))
.overlay {
label(width: size.width, color: nil)
}
}
.overlay(Group {
.overlay(alignment: .bottom) {
if self.suggest && self.model.needSuggestView {
let height = tabDesign.verticalSpacing + size.height
if self.pressState.needVariationsView && !self.model.variationsModel.variations.isEmpty {
Expand All @@ -263,11 +265,10 @@ struct QwertyKeyView<Extension: ApplicationSpecificKeyboardViewExtension>: View
direction: model.variationsModel.direction,
tabDesign: tabDesign
)
.overlay(
.overlay(alignment: self.model.variationsModel.direction.alignment) {
QwertyVariationsView<Extension>(model: self.model.variationsModel, selection: selection, tabDesign: tabDesign)
.padding(.bottom, height),
alignment: self.model.variationsModel.direction.alignment
)
.padding(.bottom, height)
}
.compositingGroup()
.shadow(color: shadowColor, radius: 1, x: 0, y: 0)
.allowsHitTesting(false)
Expand All @@ -280,16 +281,16 @@ struct QwertyKeyView<Extension: ApplicationSpecificKeyboardViewExtension>: View
borderWidth: keyBorderWidth,
tabDesign: tabDesign
)
.overlay(
.overlay {
label(width: size.width, color: suggestTextColor)
.padding(.bottom, height)
)
}
.compositingGroup()
.shadow(color: shadowColor, radius: 1, x: 0, y: 0)
.allowsHitTesting(false)
}
}
}, alignment: .bottom)
}
}
}
}
4 changes: 2 additions & 2 deletions MainApp/Customize/CustomizeTabWalkthrough.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,11 @@ struct CustomizeTabWalkthroughView: View {
let length = geometry.size.width / 4.8
Image(systemName: "gearshape.2.fill")
.font(.system(size: length / 2, weight: .bold, design: .default))
.background(
.background {
RoundedRectangle(cornerRadius: length * 0.17)
.fill(Color.systemGray5)
.frame(width: length, height: length)
)
}
Text("azooKeyを拡張する").font(.largeTitle.bold())
.padding()
let imagesFont: Font = Font.system(size: length / 2.4, weight: .light, design: .default)
Expand Down
8 changes: 4 additions & 4 deletions MainApp/Customize/EditingTenkeyCustardView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,13 +172,13 @@ struct EditingTenkeyCustardView: CancelableEditor {
} label: {
view.disabled(true)
.opacity(0)
.overlay(
.overlay {
Rectangle().stroke(style: .init(lineWidth: 2, dash: [5]))
)
.overlay(
}
.overlay {
Image(systemName: "plus.circle")
.foregroundStyle(.accentColor)
)
}
}
}
} else {
Expand Down
4 changes: 2 additions & 2 deletions MainApp/General/LargeButtonStyle.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ struct LargeButtonStyle: ButtonStyle {
.font(.body.bold())
.padding()
.frame(maxWidth: .infinity)
.background(
.background {
RoundedRectangle(cornerRadius: 12)
.fill(backgroundColor)
)
}
.opacity(configuration.isPressed ? 0.8 : 1)
}
}
8 changes: 6 additions & 2 deletions MainApp/Setting/CustomKeys/FlickCustomKeys/CustomKeySettingFlickKeyView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,14 @@ struct CustomKeySettingFlickKeyView<Label: View>: View {
var body: some View {
RoundedRectangle(cornerRadius: 10)
.stroke(strokeColor)
.background(RoundedRectangle(cornerRadius: 10).fill(Color.background))
.background {
RoundedRectangle(cornerRadius: 10).fill(Color.background)
}
.compositingGroup()
.focus(.accentColor, focused: focused)
.overlay(label())
.overlay {
label()
}
.onTapGesture {
self.selectedPosition = position
}
Expand Down
16 changes: 12 additions & 4 deletions MainApp/Setting/CustomKeys/QwertyCustomKeys/QwertyCustomKeysItemView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,11 +164,15 @@ struct QwertyCustomKeysSettingView<SettingKey: QwertyCustomKeyKeyboardSetting>:
}()
RoundedRectangle(cornerRadius: 10)
.stroke(strokeColor)
.background(RoundedRectangle(cornerRadius: 10).fill(Color.background))
.background {
RoundedRectangle(cornerRadius: 10).fill(Color.background)
}
.compositingGroup()
.focus(.accentColor, focused: isSelected && selection.longpressSelectIndex == -1)
.focus(.systemGray, focused: isSelected && selection.longpressSelectIndex != -1)
.overlay(Text(item.name))
.overlay {
Text(item.name)
}
}

if setting.value.keys.indices ~= selection.selectIndex {
Expand All @@ -179,10 +183,14 @@ struct QwertyCustomKeysSettingView<SettingKey: QwertyCustomKeyKeyboardSetting>:
DraggableView(items: $setting.value.keys[selection.selectIndex].longpresses, selection: $selection.longpressSelectIndex, enabled: selection.longpressEnabled && editState.allowDrag, width: variationWidth, height: keySize.height, padding: padding) {item, isSelected in
RoundedRectangle(cornerRadius: 10)
.stroke(isSelected ? Color.accentColor : .primary)
.background(RoundedRectangle(cornerRadius: 10).fill(Color.background))
.background {
RoundedRectangle(cornerRadius: 10).fill(Color.background)
}
.compositingGroup()
.focus(.accentColor, focused: isSelected)
.overlay(Text(item.name))
.overlay {
Text(item.name)
}
}
}
Spacer()
Expand Down
4 changes: 3 additions & 1 deletion MainApp/Setting/FontSizeSetting/FontSizeSettingItemView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,8 @@ private struct KeyView: View {
RoundedRectangle(cornerRadius: 5)
.stroke()
.frame(width: size.width, height: size.height)
.overlay(Text(verbatim: "あ").font(.system(size: fontSize)))
.overlay {
Text(verbatim: "あ").font(.system(size: fontSize))
}
}
}
Loading
Loading