Optimize localizable, added Sleep Time (#162)

Darock-Studio · Feb 10, 2024 · 704650d · 704650d
1 parent f90ca60
commit 704650d
Show file tree

Hide file tree

Showing 9 changed files with 563 additions and 84 deletions.
diff --git a/DarockBili Watch App/Bangumi/BangumiDetailView.swift b/DarockBili Watch App/Bangumi/BangumiDetailView.swift
@@ -188,7 +188,7 @@ struct BangumiDetailView: View {
             .tag(2)
             .navigationTitle("Bangumi.commnets")
         }
-        .navigationTitle("番剧")
+        .navigationTitle("Bangumi")
         .navigationBarTitleDisplayMode(.inline)
         .onAppear {
             let headers: HTTPHeaders = [

diff --git a/DarockBili Watch App/DarockBiliApp.swift b/DarockBili Watch App/DarockBiliApp.swift
@@ -106,6 +106,9 @@ struct DarockBili_Watch_AppApp: App {
     @WKApplicationDelegateAdaptor(AppDelegate.self) var appDelegate
     @Environment(\.scenePhase) var scenePhase
     // Screen Time
+    @AppStorage("isSleepNotificationOn") var isSleepNotificationOn = false
+    @AppStorage("notifyHour") var notifyHour = 0
+    @AppStorage("notifyMinute") var notifyMinute = 0
     @AppStorage("IsScreenTimeEnabled") var isScreenTimeEnabled = true
     @State var screenTimeCaculateTimer: Timer? = nil
     @State var isMemoryWarningPresented = false
@@ -119,6 +122,8 @@ struct DarockBili_Watch_AppApp: App {
     @State var systemResourceRefreshTimer: Timer?
     @State var memoryUsage: Float = 0.0
     @State var isShowMemoryUsage = false
+    @State var currentHour = 0
+    @State var currentMinute = 0
     var body: some Scene {
         WindowGroup {
             if UserDefaults.standard.string(forKey: "NewSignalError") ?? "" != "" {
@@ -200,6 +205,19 @@ struct DarockBili_Watch_AppApp: App {
                                 timer.invalidate()
                             }
                         }
+                        let timer = Timer(timeInterval: 1, repeats: true) { timer in
+                            currentHour = getCurrentTime().hour
+                            currentMinute = getCurrentTime().minute
+                        }
+                        let sleepTimeCheck = Timer(timeInterval: 60, repeats: true) { timer in
+                            if currentHour == notifyHour && currentMinute == notifyMinute && isSleepNotificationOn {
+                                tipWithText(String(localized: "Sleep.notification"), symbol: "bed.double.fill")
+                            }
+                        }
+                        RunLoop.current.add(timer, forMode: .default)
+                        timer.fire()
+                            RunLoop.current.add(sleepTimeCheck, forMode: .default)
+                            sleepTimeCheck.fire()
                     }
                     .overlay {
                         VStack {

diff --git a/DarockBili Watch App/Live/LiveDetailView.swift b/DarockBili Watch App/Live/LiveDetailView.swift
@@ -116,7 +116,7 @@ struct LiveDetailView: View {
                     .bold()
             }
         }
-        .navigationTitle("直播")
+        .navigationTitle("Live")
         .navigationBarTitleDisplayMode(.inline)
         .sheet(isPresented: $isLivePlayerPresented, content: {LivePlayerView()})
         .onAppear {
@@ -294,7 +294,7 @@ struct LiveDetailView: View {
                             }
                             HStack {
                                 Image(systemName: "clock")
-                                Text("于 \(startTime) 开始")
+                                Text("Live.starting.\(startTime)")
                                 Spacer()
                             }
                             .offset(y: publishTimeTextOffset)

diff --git a/DarockBili Watch App/Others/AboutView.swift b/DarockBili Watch App/Others/AboutView.swift
@@ -115,7 +115,7 @@ struct AboutCredits: View {
             if isGenshin {
                 ZStack(alignment: .center) {
                     Color.white
-                    Text("原神")
+                    Text("About.genshin")
                         .font(.system(size: 30, weight: .heavy))
                         .foregroundColor(.black)
                         .opacity(genshinOverlayTextOpacity)
@@ -140,16 +140,16 @@ struct AboutCredits: View {
         @State var codeInput = ""
         var body: some View {
             VStack {
-                TextField("神秘代码", text: $codeInput)
+                TextField("About.mystery-code", text: $codeInput)
                 Button(action: {
                     if codeInput == "Genshin" {
                         isGenshin = true
                         dismiss()
                     } else {
-                        codeInput = "输入错误"
+                        codeInput = String(localized: "About.mystery-code.error")
                     }
                 }, label: {
-                    Text("确认")
+                    Text("About.confirm")
                 })
             }
         }

diff --git a/DarockBili Watch App/Others/SettingsView.swift b/DarockBili Watch App/Others/SettingsView.swift
@@ -91,6 +91,18 @@ struct SettingsView: View {
                         Text("Settings.battery")
                     }
                 })
+                NavigationLink(destination: {SleepTimeView().navigationTitle("Settings.sleep")}, label: {
+                    HStack {
+                        ZStack {
+                            Color.cyan
+                                .frame(width: 20, height: 20)
+                                .clipShape(Circle())
+                            Image(systemName: "bed.double.fill")
+                                .font(.system(size: 12))
+                        }
+                        Text("Settings.sleep")
+                    }
+                })
                 NavigationLink(destination: {FeedbackView().navigationTitle("Settings.feedback")}, label: {
                     HStack {
                         ZStack {
@@ -368,20 +380,20 @@ struct ScreenTimeSettingsView: View {
                     Button(role: .destructive, action: {
                         isScreenTimeEnabled = false
                     }, label: {
-                        Text("关闭“屏幕使用时间”")
+                        Text("Screen-time.off")
                     })
                 } footer: {
-                    Text("将不再记录您的屏幕使用时间, 已记录的数据不会被删除")
+                    Text("Screen-time.description")
                 }
             } else {
                 Section {
                     Button(action: {
                         isScreenTimeEnabled = true
                     }, label: {
-                        Text("开启屏幕使用时间")
+                        Text("Screen-time.on")
                     })
                 } footer: {
-                    Text("“屏幕使用时间”会记录您每天使用喵哩喵哩的时间并作出统计")
+                    Text("Screen-time.usage")
                 }
             }
         }
@@ -454,6 +466,81 @@ struct BatterySettingsView: View {
     }
 }
 
+struct SleepTimeView: View {
+    @AppStorage("isSleepNotificationOn") var isSleepNotificationOn = false
+    @AppStorage("notifyHour") var notifyHour = 0
+    @AppStorage("notifyMinute") var notifyMinute = 0
+    @State var currentHour = 0
+    @State var currentMinute = 0
+    @State var currentSecond = 0
+    @State var isEditingTime = false
+    var body: some View {
+        List {
+            Section(content: {
+                Toggle(isOn: $isSleepNotificationOn, label: {
+                    Text("Sleep")
+                })
+                if isSleepNotificationOn {
+                    Button(action: {
+                        isEditingTime = true
+                    }, label: {
+                        Text("Sleep.edit.\(notifyHour<10 ? "0\(notifyHour)" : "\(notifyHour)").\(notifyMinute<10 ? "0\(notifyMinute)" : "\(notifyMinute)")")
+                    })
+                }
+            }, footer: {
+                Text("Sleep.discription")
+            })
+            Section {
+                Text("Sleep.current.\(currentHour<10 ? "0\(currentHour)" : "\(currentHour)").\(currentMinute<10 ? "0\(currentMinute)" : "\(currentMinute)").\(currentSecond<10 ? "0\(currentSecond)" : "\(currentSecond)")")
+            }
+        }
+        .navigationTitle("Sleep")
+        .onAppear {
+            let timer = Timer(timeInterval: 0.5, repeats: true) { timer in
+                currentHour = getCurrentTime().hour
+                currentMinute = getCurrentTime().minute
+                currentSecond = getCurrentTime().second
+            }
+            RunLoop.current.add(timer, forMode: .default)
+            timer.fire()
+        }
+        .sheet(isPresented: $isEditingTime, content: {
+            VStack {
+                Text("Sleep.edit.title")
+                    .bold()
+                HStack {
+                    Picker("Sleep.edit.hour", selection: $notifyHour) {
+                        ForEach(0..<24) { index in
+                            Text("\(index<10 ? "0\(index)" : "\(index)")").tag(index)
+                        }
+                    }
+                    Text(":")
+                    Picker("Sleep.edit.minute", selection: $notifyMinute) {
+                        ForEach(0..<60) { index in
+                            Text("\(index<10 ? "0\(index)" : "\(index)")").tag(index)
+                        }
+                    }
+                }
+            }
+        })
+    }
+}
+
+struct Time {
+    var hour: Int
+    var minute: Int
+    var second: Int
+}
+
+func getCurrentTime() -> Time {
+    let calendar = Calendar.current
+    let components = calendar.dateComponents([.hour, .minute, .second], from: Date())
+    let currentTime = Time(hour: components.hour ?? 0, minute: components.minute ?? 0, second: components.second ?? 0)
+    return currentTime
+}
+
+
+
 struct DebugMenuView: View {
     var body: some View {
         List {

diff --git a/DarockBili Watch App/PersonalCenter/HistoryView.swift b/DarockBili Watch App/PersonalCenter/HistoryView.swift
@@ -73,7 +73,7 @@ struct HistoryView: View {
                     HStack {
                         Spacer(minLength: 0)
                         Image(systemName: "xmark.bin.fill")
-                        Text("这里空空如也")
+                        Text("History.none")
                         Spacer(minLength: 0)
                     }
                     .padding()

diff --git a/DarockBili Watch App/Video/VideoDetailView.swift b/DarockBili Watch App/Video/VideoDetailView.swift
@@ -290,7 +290,7 @@ struct VideoDetailView: View {
         }
         .accentColor(.white)
         .animation(.smooth, value: isLoading)
-        .navigationTitle("视频")
+        .navigationTitle("Video")
         .navigationBarTitleDisplayMode(.inline)
         .onAppear {
             let headers: HTTPHeaders = [

diff --git a/DarockBili Watch App/Video/VideoDownloadView.swift b/DarockBili Watch App/Video/VideoDownloadView.swift
@@ -51,7 +51,7 @@ struct VideoDownloadView: View {
                     Section {
                         NavigationLink(destination: {DownloadingListView()}, label: {
                             HStack {
-                                Text("视频下载列表")
+                                Text("Download.title")
                                 Spacer()
                                 Image(systemName: "chevron.right")
                                     .opacity(0.65)