Skip to content

Commit

Permalink
a
Browse files Browse the repository at this point in the history
  • Loading branch information
aaaa committed Feb 14, 2024
1 parent d72cfad commit cefd9d4
Show file tree
Hide file tree
Showing 13 changed files with 21 additions and 21 deletions.
12 changes: 6 additions & 6 deletions SpatialClock.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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 */; };
Expand All @@ -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 */; };
Expand Down Expand Up @@ -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 */,
Expand All @@ -79,7 +79,7 @@

/* Begin PBXFileReference section */
160786D52B5512AE00E2B2CA /* 🛠️SettingMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "🛠️SettingMenu.swift"; sourceTree = "<group>"; };
160786D72B5512EB00E2B2CA /* 📱AppModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "📱AppModel.swift"; sourceTree = "<group>"; };
160786D72B5512EB00E2B2CA /* 🥽AppModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "🥽AppModel.swift"; sourceTree = "<group>"; };
160786D92B55257F00E2B2CA /* 🕒ClockView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "🕒ClockView.swift"; sourceTree = "<group>"; };
160786DB2B5526BA00E2B2CA /* 🛠️SettingButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "🛠️SettingButton.swift"; sourceTree = "<group>"; };
160F46BD2B5A6309001FE696 /* icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon.png; sourceTree = "<group>"; };
Expand Down Expand Up @@ -227,7 +227,7 @@
children = (
16C4CE402B550680002260A6 /* App.swift */,
16C4CE422B550680002260A6 /* ContentView.swift */,
160786D72B5512EB00E2B2CA /* 📱AppModel.swift */,
160786D72B5512EB00E2B2CA /* 🥽AppModel.swift */,
160786D92B55257F00E2B2CA /* 🕒ClockView.swift */,
164C77FC2B565DAA008FF872 /* 🛠️Setting */,
164C77FD2B565DD2008FF872 /* 💾Option */,
Expand Down Expand Up @@ -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 */,
Expand Down
2 changes: 1 addition & 1 deletion SpatialClock/App.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion SpatialClock/ContentView.swift
Original file line number Diff line number Diff line change
@@ -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() }
Expand Down
2 changes: 1 addition & 1 deletion SpatialClock/Rest/🔋BatteryView.swift
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions SpatialClock/Rest/🗒️StaticInfo.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -39,7 +39,7 @@ extension 🗒️StaticInfo {
case .main: [
"App.swift",
"ContentView.swift",
"📱AppModel.swift",
"🥽AppModel.swift",
"🕒ClockView.swift"
]
case .Setting: [
Expand Down
2 changes: 1 addition & 1 deletion SpatialClock/💾Option/💾Option.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions SpatialClock/🕒ClockView.swift
Original file line number Diff line number Diff line change
@@ -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<Void, Never>? = nil
var body: some View {
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion SpatialClock/🛠️Setting/🛠️ClockTab.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import SwiftUI

struct 🛠️ClockTab: View {
@EnvironmentObject var model: 📱AppModel
@EnvironmentObject var model: 🥽AppModel
var body: some View {
NavigationStack {
List {
Expand Down
2 changes: 1 addition & 1 deletion SpatialClock/🛠️Setting/🛠️RestTab.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import SwiftUI

struct 🛠️RestTab: View {
@EnvironmentObject var model: 📱AppModel
@EnvironmentObject var model: 🥽AppModel
var body: some View {
NavigationStack {
List {
Expand Down
2 changes: 1 addition & 1 deletion SpatialClock/🛠️Setting/🛠️SettingButton.swift
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion SpatialClock/🛠️Setting/🛠️SettingMenu.swift
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions SpatialClock/🛠️Setting/🛠️VisualTab.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import SwiftUI

struct 🛠️VisualTab: View {
@EnvironmentObject var model: 📱AppModel
@EnvironmentObject var model: 🥽AppModel
var body: some View {
NavigationStack {
List {
Expand Down Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit cefd9d4

Please sign in to comment.