kutesir/KisaniCal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: widget iOS 17 deployment target + register FloatingTabState

Browse Source 
- Widget extension: 16.0 → 17.0 (containerBackground/widget API require 17)
- xcodegen re-run picks up FloatingTabState.swift (was on disk but
  not registered in project.pbxproj after previous xcodegen run)
This commit is contained in:
kutesir
2026-05-28 20:35:44 +03:00
parent 5e232f2d81
commit dc99a3f1f0
9 changed files with 74 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
KisaniCal/ContentView.swift
View File

@@ -11,6 +11,7 @@ struct ContentView: View {
@AppStorage("hasOnboarded") private var hasOnboarded = false
@State private var showOnboarding = false
@State private var selectedTab = 0
@StateObject private var tabState = FloatingTabState()
@State private var iPadSelection: Int? = 0
@State private var calIconImage: Image = ContentView.buildCalIcon()
@@ -135,16 +136,19 @@ struct ContentView: View {
.tabBarInset()
}
.tint(AppColors.accent)
.onChange(of: selectedTab) { _ in tabState.resetOffset() }
KisaniTabBar(
selection: $selectedTab,
calIcon: calIconImage,
showMatrix: showMatrixTab,
showWorkout: showWorkoutTab
showWorkout: showWorkoutTab,
isCollapsed: tabState.isCollapsed
)
.padding(.horizontal, 24)
.padding(.bottom, 8)
}
.environmentObject(tabState)
.onAppear { UITabBar.appearance().isHidden = true }
}
@@ -191,6 +195,7 @@ struct KisaniTabBar: View {
let calIcon: Image
var showMatrix: Bool
var showWorkout: Bool
var isCollapsed: Bool = false
@Environment(\.colorScheme) private var cs
private struct Entry: Identifiable {
@@ -224,15 +229,15 @@ struct KisaniTabBar: View {
}
if let img = entry.custom {
img
.font(.system(size: 20))
.font(.system(size: isCollapsed ? 17 : 20))
.foregroundColor(selection == entry.id ? AppColors.accent : AppColors.text(cs))
} else if let icon = entry.sfIcon {
Image(systemName: icon)
.font(.system(size: 17, weight: selection == entry.id ? .semibold : .regular))
.font(.system(size: isCollapsed ? 15 : 17, weight: selection == entry.id ? .semibold : .regular))
.foregroundColor(selection == entry.id ? AppColors.accent : AppColors.text(cs))
}
}
.frame(maxWidth: .infinity).frame(height: 50)
.frame(maxWidth: .infinity).frame(height: isCollapsed ? 38 : 50)
}
.buttonStyle(PressButtonStyle(scale: 0.88))
}
@@ -241,8 +246,9 @@ struct KisaniTabBar: View {
.background(
RoundedRectangle(cornerRadius: 28)
.fill(AppColors.surface(cs))
.shadow(color: .black.opacity(0.10), radius: 20, x: 0, y: 6)
.shadow(color: .black.opacity(isCollapsed ? 0.06 : 0.10), radius: 20, x: 0, y: 6)
.shadow(color: .black.opacity(0.04), radius: 4, x: 0, y: 1)
)
.animation(KisaniSpring.snappy, value: isCollapsed)
}
}