diff --git a/Localizable.xcstrings b/Localizable.xcstrings index ff54d051c..dc46e18a8 100644 --- a/Localizable.xcstrings +++ b/Localizable.xcstrings @@ -147,12 +147,6 @@ }, "“喵哩喵哩”新功能" : { - }, - "[Hex Data]" : { - - }, - "[Privacy Hidden]" : { - }, "%@" : { "localizations" : { @@ -9292,6 +9286,9 @@ } } } + }, + "更新标签" : { + }, "未完成的编辑" : { @@ -9364,6 +9361,9 @@ } } } + }, + "标签不会被本地化,因为它们是动态添加的。" : { + }, "标题" : { "localizations" : { @@ -9957,9 +9957,6 @@ } } } - }, - "通知令牌" : { - }, "重新载入" : { "localizations" : { diff --git a/MeowBili/Errors/FeedbackView.swift b/MeowBili/Errors/FeedbackView.swift index b35e3b9ad..5262954d0 100644 --- a/MeowBili/Errors/FeedbackView.swift +++ b/MeowBili/Errors/FeedbackView.swift @@ -418,12 +418,43 @@ struct InAppFeedbackView: View { Text(from[i].split(separator: ":").count > 1 ? String(from[i].split(separator: ":")[1]) : from[i]) .font(.system(size: 14)) } - } else if (from[i].contains(":") && from[i] != ":" ? from[i].split(separator: ":")[0] : "") == "NotificationToken" { - Text("[Hex Data]") - .font(.system(size: 14)) - } else if (from[i].contains(":") && from[i] != ":" ? from[i].split(separator: ":")[0] : "") == "Settings" { - Text("[Privacy Hidden]") - .font(.system(size: 14)) + } else if (from[i].contains(":") && from[i] != ":" ? from[i].split(separator: ":")[0] : "") == "UpdateTitle" { + if let source = from[i].split(separator: ":")[from: 1]?.split(separator: "__->__")[from: 0], + let to = from[i].split(separator: ":")[from: 1]?.split(separator: "__->__")[from: 1] { + Markdown("~\(source)~ → **\(to)**") + .markdownTheme(.gitHub) + } + } else if (from[i].contains(":") && from[i] != ":" ? from[i].split(separator: ":")[0] : "") == "UpdateTags" { + if let combined = from[i].split(separator: ":")[from: 1] { + let tags = Array(fromCombined: String(combined)) + if !tags.isEmpty { + ScrollView(.horizontal) { + HStack { + ForEach(0.. String { + let uiColor = UIColor(color) + var red: CGFloat = 0 + var green: CGFloat = 0 + var blue: CGFloat = 0 + uiColor.getRed(&red, green: &green, blue: &blue, alpha: nil) + return "\(name)&&&\(red),\(green),\(blue)" + } + + static func == (lhs: FeedbackTag, rhs: FeedbackTag) -> Bool { + return lhs.name == rhs.name + } +} +extension Array { + init(fromCombined string: String) { + var result = [FeedbackTag]() + let spd = string.components(separatedBy: "<****>") + for tag in spd { + if let tag = FeedbackTag(fromCombined: tag) { + result.append(tag) + } + } + + self = result + } + + func toString() -> String { + if isEmpty { + return "[None]" + } + return map { $0.toString() }.joined(separator: "<****>") + } +} diff --git a/MeowBili/PersonalCenter/DownloadsView.swift b/MeowBili/PersonalCenter/DownloadsView.swift index 67ab8bba6..25d79fce3 100644 --- a/MeowBili/PersonalCenter/DownloadsView.swift +++ b/MeowBili/PersonalCenter/DownloadsView.swift @@ -32,15 +32,6 @@ struct DownloadsView: View { @State var searchInput = "" var body: some View { List { - #if os(watchOS) - if #unavailable(watchOS 10) { - Section { - NavigationLink(destination: { DownloadingListView() }, label: { - Label("Download.list", systemImage: "list.bullet.below.rectangle") - }) - } - } - #endif Section { if metadatas.count != 0 { ForEach(0...metadatas.count - 1, id: \.self) { i in @@ -79,6 +70,13 @@ struct DownloadsView: View { }, label: { Image(systemName: "xmark.bin.fill") }) + #if os(watchOS) + Button(action: { + playAudio(url: URL(filePath: vRootPath + metadatas[i]["Path"]!).absoluteString) + }, label: { + Image(systemName: "music.note") + }) + #endif } } } else { diff --git a/README.md b/README.md index 46fdab2cf..2d4a3a74e 100644 --- a/README.md +++ b/README.md @@ -59,8 +59,6 @@ 使用[最新的 Release](https://github.com/Darock-Studio/Darock-Bili/releases/latest) 编译以获取与官方分发相同的稳定版本。 -由于一个未知问题,您可能需要使用 [Xcode 15.2](https://developer.apple.com/download/all/) (而不是最新的 15.3) 来进行编译。 - ## 🙌贡献 欢迎提交Issue和Pull Request帮助我们变得更好!