diff --git a/SpatialClock.xcodeproj/project.pbxproj b/SpatialClock.xcodeproj/project.pbxproj index 7b11ab6..2ebe679 100644 --- a/SpatialClock.xcodeproj/project.pbxproj +++ b/SpatialClock.xcodeproj/project.pbxproj @@ -8,7 +8,7 @@ /* Begin PBXBuildFile section */ 160786D62B5512AE00E2B2CA /* 🛠️SettingMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 160786D52B5512AE00E2B2CA /* 🛠️SettingMenu.swift */; }; - 160786D82B5512EB00E2B2CA /* 📱AppModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 160786D72B5512EB00E2B2CA /* 📱AppModel.swift */; }; + 160786D82B5512EB00E2B2CA /* 🥽AppModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 160786D72B5512EB00E2B2CA /* 🥽AppModel.swift */; }; 160786DA2B55257F00E2B2CA /* 🕒ClockView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 160786D92B55257F00E2B2CA /* 🕒ClockView.swift */; }; 160786DC2B5526BA00E2B2CA /* 🛠️SettingButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 160786DB2B5526BA00E2B2CA /* 🛠️SettingButton.swift */; }; 16267B462B578836000CA8AD /* Localizable.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = 16267B452B578836000CA8AD /* Localizable.xcstrings */; }; @@ -28,7 +28,7 @@ 16891EC52B7B0A8300C6F0B3 /* 🛠️AboutTab.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16891EC42B7B0A8300C6F0B3 /* 🛠️AboutTab.swift */; }; 16891EC72B7B0E4000C6F0B3 /* App.swift in CopyFiles */ = {isa = PBXBuildFile; fileRef = 16C4CE402B550680002260A6 /* App.swift */; }; 16891EC82B7B0E4000C6F0B3 /* ContentView.swift in CopyFiles */ = {isa = PBXBuildFile; fileRef = 16C4CE422B550680002260A6 /* ContentView.swift */; }; - 16891EC92B7B0E4000C6F0B3 /* 📱AppModel.swift in CopyFiles */ = {isa = PBXBuildFile; fileRef = 160786D72B5512EB00E2B2CA /* 📱AppModel.swift */; }; + 16891EC92B7B0E4000C6F0B3 /* 🥽AppModel.swift in CopyFiles */ = {isa = PBXBuildFile; fileRef = 160786D72B5512EB00E2B2CA /* 🥽AppModel.swift */; }; 16891ECA2B7B0E4000C6F0B3 /* 🕒ClockView.swift in CopyFiles */ = {isa = PBXBuildFile; fileRef = 160786D92B55257F00E2B2CA /* 🕒ClockView.swift */; }; 16891ECB2B7B0E4000C6F0B3 /* 🛠️SettingButton.swift in CopyFiles */ = {isa = PBXBuildFile; fileRef = 160786DB2B5526BA00E2B2CA /* 🛠️SettingButton.swift */; }; 16891ECC2B7B0E4000C6F0B3 /* 🛠️SettingMenu.swift in CopyFiles */ = {isa = PBXBuildFile; fileRef = 160786D52B5512AE00E2B2CA /* 🛠️SettingMenu.swift */; }; @@ -58,7 +58,7 @@ files = ( 16891EC72B7B0E4000C6F0B3 /* App.swift in CopyFiles */, 16891EC82B7B0E4000C6F0B3 /* ContentView.swift in CopyFiles */, - 16891EC92B7B0E4000C6F0B3 /* 📱AppModel.swift in CopyFiles */, + 16891EC92B7B0E4000C6F0B3 /* 🥽AppModel.swift in CopyFiles */, 16891ECA2B7B0E4000C6F0B3 /* 🕒ClockView.swift in CopyFiles */, 16891ECB2B7B0E4000C6F0B3 /* 🛠️SettingButton.swift in CopyFiles */, 16891ECC2B7B0E4000C6F0B3 /* 🛠️SettingMenu.swift in CopyFiles */, @@ -79,7 +79,7 @@ /* Begin PBXFileReference section */ 160786D52B5512AE00E2B2CA /* 🛠️SettingMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "🛠️SettingMenu.swift"; sourceTree = ""; }; - 160786D72B5512EB00E2B2CA /* 📱AppModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "📱AppModel.swift"; sourceTree = ""; }; + 160786D72B5512EB00E2B2CA /* 🥽AppModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "🥽AppModel.swift"; sourceTree = ""; }; 160786D92B55257F00E2B2CA /* 🕒ClockView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "🕒ClockView.swift"; sourceTree = ""; }; 160786DB2B5526BA00E2B2CA /* 🛠️SettingButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "🛠️SettingButton.swift"; sourceTree = ""; }; 160F46BD2B5A6309001FE696 /* icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon.png; sourceTree = ""; }; @@ -227,7 +227,7 @@ children = ( 16C4CE402B550680002260A6 /* App.swift */, 16C4CE422B550680002260A6 /* ContentView.swift */, - 160786D72B5512EB00E2B2CA /* 📱AppModel.swift */, + 160786D72B5512EB00E2B2CA /* 🥽AppModel.swift */, 160786D92B55257F00E2B2CA /* 🕒ClockView.swift */, 164C77FC2B565DAA008FF872 /* 🛠️Setting */, 164C77FD2B565DD2008FF872 /* 💾Option */, @@ -328,7 +328,7 @@ 16891EC52B7B0A8300C6F0B3 /* 🛠️AboutTab.swift in Sources */, 16891EB62B7B081200C6F0B3 /* ℹ️AboutApp.swift in Sources */, 16891EA92B7AEE8300C6F0B3 /* 🔋BatteryView.swift in Sources */, - 160786D82B5512EB00E2B2CA /* 📱AppModel.swift in Sources */, + 160786D82B5512EB00E2B2CA /* 🥽AppModel.swift in Sources */, 16F828702B560FBB00A29476 /* 💾Option.swift in Sources */, 160786DC2B5526BA00E2B2CA /* 🛠️SettingButton.swift in Sources */, 16F8286E2B560D8700A29476 /* 💾Key.swift in Sources */, diff --git a/SpatialClock/App.swift b/SpatialClock/App.swift index 48f7923..02c3a35 100644 --- a/SpatialClock/App.swift +++ b/SpatialClock/App.swift @@ -2,7 +2,7 @@ import SwiftUI @main struct SpatialClockApp: App { - @StateObject private var model: 📱AppModel = .init() + @StateObject private var model: 🥽AppModel = .init() var body: some Scene { WindowGroup { ContentView() diff --git a/SpatialClock/ContentView.swift b/SpatialClock/ContentView.swift index ee1cf0e..238d40a 100644 --- a/SpatialClock/ContentView.swift +++ b/SpatialClock/ContentView.swift @@ -1,7 +1,7 @@ import SwiftUI struct ContentView: View { - @EnvironmentObject var model: 📱AppModel + @EnvironmentObject var model: 🥽AppModel var body: some View { 🕒ClockView() .overlay(alignment: .bottom) { 🛠️SettingButton() } diff --git "a/SpatialClock/Rest/\360\237\224\213BatteryView.swift" "b/SpatialClock/Rest/\360\237\224\213BatteryView.swift" index 1248361..22e5519 100644 --- "a/SpatialClock/Rest/\360\237\224\213BatteryView.swift" +++ "b/SpatialClock/Rest/\360\237\224\213BatteryView.swift" @@ -1,7 +1,7 @@ import SwiftUI struct 🔋BatteryView: View { - @EnvironmentObject var model: 📱AppModel + @EnvironmentObject var model: 🥽AppModel private let batteryLevel: Float = Self.getBatteryLevel() private let batteryState: UIDevice.BatteryState = Self.getBatteryState() var body: some View { diff --git "a/SpatialClock/Rest/\360\237\227\222\357\270\217StaticInfo.swift" "b/SpatialClock/Rest/\360\237\227\222\357\270\217StaticInfo.swift" index 22521d1..f1ea18c 100644 --- "a/SpatialClock/Rest/\360\237\227\222\357\270\217StaticInfo.swift" +++ "b/SpatialClock/Rest/\360\237\227\222\357\270\217StaticInfo.swift" @@ -28,7 +28,7 @@ enum 🗒️StaticInfo { } extension 🗒️StaticInfo { - static let versionInfos: [(version: String, date: String)] = [("1.1", "2024-02-13"), + static let versionInfos: [(version: String, date: String)] = [("1.1", "2024-02-14"), ("1.0", "2024-02-02")] //降順。先頭の方が新しい enum SourceCodeCategory: String, CaseIterable, Identifiable { @@ -39,7 +39,7 @@ extension 🗒️StaticInfo { case .main: [ "App.swift", "ContentView.swift", - "📱AppModel.swift", + "🥽AppModel.swift", "🕒ClockView.swift" ] case .Setting: [ diff --git "a/SpatialClock/\360\237\222\276Option/\360\237\222\276Option.swift" "b/SpatialClock/\360\237\222\276Option/\360\237\222\276Option.swift" index 2722093..6775f59 100644 --- "a/SpatialClock/\360\237\222\276Option/\360\237\222\276Option.swift" +++ "b/SpatialClock/\360\237\222\276Option/\360\237\222\276Option.swift" @@ -52,7 +52,7 @@ enum 💾Option { } } struct Animation: ViewModifier { - @EnvironmentObject var model: 📱AppModel + @EnvironmentObject var model: 🥽AppModel var value: Date func body(content: Content) -> some View { switch self.model.animation { diff --git "a/SpatialClock/\360\237\225\222ClockView.swift" "b/SpatialClock/\360\237\225\222ClockView.swift" index 0ee376b..452a59b 100644 --- "a/SpatialClock/\360\237\225\222ClockView.swift" +++ "b/SpatialClock/\360\237\225\222ClockView.swift" @@ -1,7 +1,7 @@ import SwiftUI struct 🕒ClockView: View { - @EnvironmentObject var model: 📱AppModel + @EnvironmentObject var model: 🥽AppModel @AppStorage("firstLaunch") private var firstLaunch: Bool = true @State private var taskToDisappearSettingButton: Task? = nil var body: some View { @@ -65,7 +65,7 @@ private extension 🕒ClockView { } } private struct ApplyAnimation: ViewModifier { - @EnvironmentObject var model: 📱AppModel + @EnvironmentObject var model: 🥽AppModel func body(content: Content) -> some View { content .animation(.default, value: self.model.hideDate) diff --git "a/SpatialClock/\360\237\233\240\357\270\217Setting/\360\237\233\240\357\270\217ClockTab.swift" "b/SpatialClock/\360\237\233\240\357\270\217Setting/\360\237\233\240\357\270\217ClockTab.swift" index 13abbec..7aa18a9 100644 --- "a/SpatialClock/\360\237\233\240\357\270\217Setting/\360\237\233\240\357\270\217ClockTab.swift" +++ "b/SpatialClock/\360\237\233\240\357\270\217Setting/\360\237\233\240\357\270\217ClockTab.swift" @@ -1,7 +1,7 @@ import SwiftUI struct 🛠️ClockTab: View { - @EnvironmentObject var model: 📱AppModel + @EnvironmentObject var model: 🥽AppModel var body: some View { NavigationStack { List { diff --git "a/SpatialClock/\360\237\233\240\357\270\217Setting/\360\237\233\240\357\270\217RestTab.swift" "b/SpatialClock/\360\237\233\240\357\270\217Setting/\360\237\233\240\357\270\217RestTab.swift" index d07f836..63ffd26 100644 --- "a/SpatialClock/\360\237\233\240\357\270\217Setting/\360\237\233\240\357\270\217RestTab.swift" +++ "b/SpatialClock/\360\237\233\240\357\270\217Setting/\360\237\233\240\357\270\217RestTab.swift" @@ -1,7 +1,7 @@ import SwiftUI struct 🛠️RestTab: View { - @EnvironmentObject var model: 📱AppModel + @EnvironmentObject var model: 🥽AppModel var body: some View { NavigationStack { List { diff --git "a/SpatialClock/\360\237\233\240\357\270\217Setting/\360\237\233\240\357\270\217SettingButton.swift" "b/SpatialClock/\360\237\233\240\357\270\217Setting/\360\237\233\240\357\270\217SettingButton.swift" index 4a4f369..9a62bd8 100644 --- "a/SpatialClock/\360\237\233\240\357\270\217Setting/\360\237\233\240\357\270\217SettingButton.swift" +++ "b/SpatialClock/\360\237\233\240\357\270\217Setting/\360\237\233\240\357\270\217SettingButton.swift" @@ -1,7 +1,7 @@ import SwiftUI struct 🛠️SettingButton: View { - @EnvironmentObject var model: 📱AppModel + @EnvironmentObject var model: 🥽AppModel @Environment(\.scenePhase) var scenePhase @Environment(\.openWindow) var openWindow var body: some View { diff --git "a/SpatialClock/\360\237\233\240\357\270\217Setting/\360\237\233\240\357\270\217SettingMenu.swift" "b/SpatialClock/\360\237\233\240\357\270\217Setting/\360\237\233\240\357\270\217SettingMenu.swift" index caccbad..758abbc 100644 --- "a/SpatialClock/\360\237\233\240\357\270\217Setting/\360\237\233\240\357\270\217SettingMenu.swift" +++ "b/SpatialClock/\360\237\233\240\357\270\217Setting/\360\237\233\240\357\270\217SettingMenu.swift" @@ -1,7 +1,7 @@ import SwiftUI struct 🛠️SettingMenu: View { - @EnvironmentObject var model: 📱AppModel + @EnvironmentObject var model: 🥽AppModel @Environment(\.scenePhase) var scenePhase @Environment(\.dismissWindow) var dismissWindow var body: some View { diff --git "a/SpatialClock/\360\237\233\240\357\270\217Setting/\360\237\233\240\357\270\217VisualTab.swift" "b/SpatialClock/\360\237\233\240\357\270\217Setting/\360\237\233\240\357\270\217VisualTab.swift" index fdb40bb..ae145a0 100644 --- "a/SpatialClock/\360\237\233\240\357\270\217Setting/\360\237\233\240\357\270\217VisualTab.swift" +++ "b/SpatialClock/\360\237\233\240\357\270\217Setting/\360\237\233\240\357\270\217VisualTab.swift" @@ -1,7 +1,7 @@ import SwiftUI struct 🛠️VisualTab: View { - @EnvironmentObject var model: 📱AppModel + @EnvironmentObject var model: 🥽AppModel var body: some View { NavigationStack { List { @@ -76,7 +76,7 @@ struct 🛠️VisualTab: View { private extension 🛠️VisualTab { private struct TextColorPicker: View { - @EnvironmentObject var model: 📱AppModel + @EnvironmentObject var model: 🥽AppModel var body: some View { ColorPicker(selection: self.$model.textColor, supportsOpacity: false) { Label("Text color", systemImage: "paintpalette") diff --git "a/SpatialClock/\360\237\223\261AppModel.swift" "b/SpatialClock/\360\237\245\275AppModel.swift" similarity index 96% rename from "SpatialClock/\360\237\223\261AppModel.swift" rename to "SpatialClock/\360\237\245\275AppModel.swift" index 28e6449..66d51ed 100644 --- "a/SpatialClock/\360\237\223\261AppModel.swift" +++ "b/SpatialClock/\360\237\245\275AppModel.swift" @@ -1,6 +1,6 @@ import SwiftUI -class 📱AppModel: ObservableObject { +class 🥽AppModel: ObservableObject { @Published var presentSettingButton: Bool = false @AppStorage(💾Key.showYear) var showYear: Bool = false @AppStorage(💾Key.hideWeekday) var hideWeekday: Bool = false