admin/Pocket-Poster
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'video' into carplay

Browse Source
This commit is contained in:
leminlimez committed 2025-06-21 13:47:17 -04:00
2 parents f305e4b2c6 7bf227a6de
commit 759597dfb2
11 files changed
+6249 -100
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Pocket Poster.xcodeproj/project.pbxproj
+2 -2
View File
@@ -268,7 +268,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 5;
CURRENT_PROJECT_VERSION = 6;
DEVELOPMENT_ASSET_PATHS = "\"Pocket Poster/Preview Content\"";
DEVELOPMENT_TEAM = 2P4CP47H76;
ENABLE_PREVIEWS = YES;
@@ -300,7 +300,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 5;
CURRENT_PROJECT_VERSION = 6;
DEVELOPMENT_ASSET_PATHS = "\"Pocket Poster/Preview Content\"";
DEVELOPMENT_TEAM = 2P4CP47H76;
ENABLE_PREVIEWS = YES;
Pocket Poster.xcodeproj/xcuserdata/lemin.xcuserdatad/xcschemes/xcschememanagement.plist
+1 -1
View File
@@ -7,7 +7,7 @@
<key>Pocket Poster.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
<integer>1</integer>
</dict>
</dict>
</dict>
Pocket Poster/Assets.xcassets/Credits/POEditor.imageset/Contents.json
Vendored
+21
View File
@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "POEditor@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Pocket Poster/Assets.xcassets/Credits/POEditor.imageset/POEditor@2x.png
Vendored
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 20 KiB

Pocket Poster/Controllers/PosterBoardManager.swift
-38
View File
@@ -8,44 +8,6 @@
import Foundation
import ZIPFoundation
import UIKit
import CoreTransferable
struct Movie: Transferable {
let url: URL
static var transferRepresentation: some TransferRepresentation {
FileRepresentation(contentType: .movie) { movie in
SentTransferredFile(movie.url)
} importing: { received in
let videoFolder = SymHandler.getDocumentsDirectory().appendingPathComponent("Videos", conformingTo: .directory)
if !FileManager.default.fileExists(atPath: videoFolder.path()) {
try? FileManager.default.createDirectory(at: videoFolder, withIntermediateDirectories: true)
}
let copy = videoFolder.appending(path: "\(UUID()).mp4")
if FileManager.default.fileExists(atPath: copy.path()) {
try FileManager.default.removeItem(at: copy)
}
try FileManager.default.copyItem(at: received.file, to: copy)
return Self.init(url: copy)
}
}
}
enum LoadState {
case unknown, loading, loaded(Movie), failed
}
struct LoadInfo: Identifiable, Equatable {
static func == (lhs: LoadInfo, rhs: LoadInfo) -> Bool {
lhs.id == rhs.id
}
var id = UUID()
var autoReverses: Bool = false
var loadState: LoadState
}
class PosterBoardManager: ObservableObject {
static let ShortcutURL = "https://www.icloud.com/shortcuts/a28d2c02ca11453cb5b8f91c12cfa692"
Pocket Poster/Controllers/VideoHandler.swift
+49
View File
@@ -8,6 +8,7 @@
import Foundation
import AVFoundation
import UIKit
import CoreTransferable
extension CGImage {
var png: Data? {
@@ -23,7 +24,55 @@ extension CGImage {
}
}
struct Movie: Transferable {
let url: URL
static var transferRepresentation: some TransferRepresentation {
FileRepresentation(contentType: .movie) { movie in
SentTransferredFile(movie.url)
} importing: { received in
let videoFolder = SymHandler.getDocumentsDirectory().appendingPathComponent("Videos", conformingTo: .directory)
if !FileManager.default.fileExists(atPath: videoFolder.path()) {
try? FileManager.default.createDirectory(at: videoFolder, withIntermediateDirectories: true)
}
let copy = videoFolder.appending(path: "\(UUID()).mp4")
if FileManager.default.fileExists(atPath: copy.path()) {
try FileManager.default.removeItem(at: copy)
}
try FileManager.default.copyItem(at: received.file, to: copy)
return Self.init(url: copy)
}
}
}
enum LoadState {
case unknown, loading, loaded(Movie), failed
}
struct LoadInfo: Identifiable, Equatable {
static func == (lhs: LoadInfo, rhs: LoadInfo) -> Bool {
lhs.id == rhs.id
}
var id = UUID()
var autoReverses: Bool = false
var loadState: LoadState
}
class VideoHandler {
static let MaxDurationSecs = 12.0
static func isVideoTooLong(at url: URL) -> Bool {
let asset = AVAsset(url: url)
let duration = asset.duration
let durationTime = CMTimeGetSeconds(duration)
return durationTime > MaxDurationSecs
}
static func createCaml(from url: URL, autoReverses: Bool) throws -> URL {
// copy the resources
let descrURL = SymHandler.getDocumentsDirectory().appendingPathComponent(UUID().uuidString, conformingTo: .directory)
Pocket Poster/Localizable.xcstrings
+5947 -37
View File
File diff suppressed because it is too large. Load diff
Pocket Poster/Pocket-Poster-InfoPlist.xcstrings
+150
View File
@@ -5,6 +5,36 @@
"comment" : "Bundle name",
"extractionState" : "extracted_with_value",
"localizations" : {
"ar" : {
"stringUnit" : {
"state" : "translated",
"value" : "Pocket Poster"
}
},
"ar-AE" : {
"stringUnit" : {
"state" : "translated",
"value" : "Pocket Poster Ar"
}
},
"ar-SA" : {
"stringUnit" : {
"state" : "translated",
"value" : "Pocket Poster"
}
},
"cs" : {
"stringUnit" : {
"state" : "translated",
"value" : "Pocket Poster"
}
},
"de" : {
"stringUnit" : {
"state" : "translated",
"value" : "Pocket Poster"
}
},
"en" : {
"stringUnit" : {
"state" : "new",
@@ -17,12 +47,60 @@
"value" : "Pocket Poster"
}
},
"es-MX" : {
"stringUnit" : {
"state" : "translated",
"value" : "Pocket Poster"
}
},
"fr" : {
"stringUnit" : {
"state" : "translated",
"value" : "Pocket Poster"
}
},
"hu" : {
"stringUnit" : {
"state" : "translated",
"value" : "Pocket Poster"
}
},
"ja" : {
"stringUnit" : {
"state" : "translated",
"value" : "Pocket Poster"
}
},
"nl" : {
"stringUnit" : {
"state" : "translated",
"value" : "Pocket Poster"
}
},
"pl" : {
"stringUnit" : {
"state" : "translated",
"value" : "Pocket Poster"
}
},
"ru" : {
"stringUnit" : {
"state" : "translated",
"value" : "Pocket Poster"
}
},
"th" : {
"stringUnit" : {
"state" : "translated",
"value" : "Pocket Poster"
}
},
"tr" : {
"stringUnit" : {
"state" : "translated",
"value" : "Pocket Poster"
}
},
"vi" : {
"stringUnit" : {
"state" : "translated",
@@ -33,18 +111,90 @@
},
"Nugget Wallpaper" : {
"localizations" : {
"ar" : {
"stringUnit" : {
"state" : "translated",
"value" : "خلفيات Nugget"
}
},
"ar-AE" : {
"stringUnit" : {
"state" : "translated",
"value" : "خلفيات Nugget"
}
},
"cs" : {
"stringUnit" : {
"state" : "translated",
"value" : "Nugget Tapeta"
}
},
"de" : {
"stringUnit" : {
"state" : "translated",
"value" : "Nugget Hintergrundbilder"
}
},
"es" : {
"stringUnit" : {
"state" : "translated",
"value" : "Nugget Wallpaper"
}
},
"es-MX" : {
"stringUnit" : {
"state" : "translated",
"value" : "Nugget Wallpaper"
}
},
"fr" : {
"stringUnit" : {
"state" : "translated",
"value" : "Fond d'écran Nugget"
}
},
"hu" : {
"stringUnit" : {
"state" : "translated",
"value" : "Nugget Háttérkép"
}
},
"ja" : {
"stringUnit" : {
"state" : "translated",
"value" : "Nugget Wallpaper"
}
},
"nl" : {
"stringUnit" : {
"state" : "translated",
"value" : "Nugget Achtergrond"
}
},
"pl" : {
"stringUnit" : {
"state" : "translated",
"value" : "Tapeta Nugget"
}
},
"ru" : {
"stringUnit" : {
"state" : "translated",
"value" : "Обои Nugget"
}
},
"th" : {
"stringUnit" : {
"state" : "translated",
"value" : "วอลเปเปอร์ Nugget"
}
},
"tr" : {
"stringUnit" : {
"state" : "translated",
"value" : "Nugget Duvar Kağıdı"
}
},
"vi" : {
"stringUnit" : {
"state" : "translated",
Pocket Poster/Views/NavigatorViews/VideoView.swift
+56 -9
View File
@@ -11,14 +11,33 @@ import AVKit
struct VideoView: View {
@ObservedObject var pbManager = PosterBoardManager.shared
@AppStorage("ignoreDurationLimit") var ignoreDurationLimit: Bool = false
@State var selectedVideo: PhotosPickerItem?
@State private var currentPage: Int = 0
@State private var currentDate = Date()
private let timer = Timer.publish(every: 1, on: .main, in: .common).autoconnect() // update every second
private var dateFormatter: DateFormatter {
let formatter = DateFormatter()
formatter.dateFormat = "EEEE, MMMM d"
return formatter
}
private var timeFormatter: DateFormatter {
let formatter = DateFormatter()
if Locale.current.hourCycle == .zeroToEleven || Locale.current.hourCycle == .oneToTwelve {
formatter.dateFormat = "h:mm"
} else {
formatter.dateFormat = "HH:mm"
}
return formatter
}
var body: some View {
VStack {
GeometryReader { geom in
TabView {
ForEach(pbManager.videos) { vid in
TabView(selection: $currentPage) {
ForEach(Array(pbManager.videos.enumerated()), id: \.offset) { idx, vid in
ZStack {
switch vid.loadState {
case .unknown:
@@ -30,6 +49,17 @@ struct VideoView: View {
.scaledToFill()
.frame(width: geom.size.width * 0.7, height: geom.size.height * 0.8)
.clipped()
VStack {
Text(dateFormatter.string(from: currentDate))
.shadow(radius: 10)
Text(timeFormatter.string(from: currentDate))
.font(.system(size: 75, weight: .semibold, design: .rounded))
.shadow(radius: 10)
Spacer()
}
.padding(.top, 45)
.foregroundStyle(.white)
case .failed:
Text("Failed")
}
@@ -38,6 +68,7 @@ struct VideoView: View {
.shadow(radius: 5)
.background(Color.black.opacity(0.6))
.cornerRadius(24)
.tag(idx)
.overlay {
RoundedRectangle(cornerRadius: 24)
.stroke(.gray, lineWidth: 4)
@@ -50,22 +81,30 @@ struct VideoView: View {
.overlay(
// Loops Button
Button(action: {
if let index = pbManager.videos.firstIndex(of: vid) {
pbManager.videos[index].autoReverses = !vid.autoReverses
}
pbManager.videos[idx].autoReverses = !vid.autoReverses
}) {
Image(systemName: "arrow.left.arrow.right.circle")
.font(.title)
.foregroundStyle(.black)
.foregroundStyle(Color(uiColor: .label))
.background {
if vid.autoReverses {
Circle()
.foregroundStyle(vid.autoReverses ? .blue : .white)
.foregroundStyle(.blue.opacity(0.8))
.shadow(radius: 5)
} else {
Circle()
.foregroundStyle(.regularMaterial)
.shadow(radius: 5)
}
}
}.offset(x: 8, y: -8),
alignment: .topTrailing
)
}
.onDelete(perform: removeVideo)
.onReceive(timer) { input in
currentDate = input
}
// MARK: Select Photo Option
if selectedVideo == nil && pbManager.videos.count < 5 {
@@ -89,6 +128,7 @@ struct VideoView: View {
.shadow(radius: 5)
.background(Color.black.opacity(0.6))
.cornerRadius(24)
.tag(pbManager.videos.count)
.overlay {
RoundedRectangle(cornerRadius: 24)
.stroke(.gray, lineWidth: 4)
@@ -103,7 +143,13 @@ struct VideoView: View {
do {
if let movie = try await selectedVideo?.loadTransferable(type: Movie.self) {
await MainActor.run {
if !ignoreDurationLimit && VideoHandler.isVideoTooLong(at: movie.url) {
pbManager.videos.remove(at: id)
UIApplication.shared.alert(title: NSLocalizedString("Failed to Import Video", comment: ""), body: String(format: NSLocalizedString("The video you imported is too long! Your video must be %@ seconds or less.", comment: ""), "\(Int(VideoHandler.MaxDurationSecs))"))
} else {
pbManager.videos[id].loadState = .loaded(movie)
currentPage = id
}
}
} else {
await MainActor.run {
@@ -118,7 +164,7 @@ struct VideoView: View {
selectedVideo = nil
}
}
.tabViewStyle(.page)
.tabViewStyle(PageTabViewStyle(indexDisplayMode: .always))
}
}
}
@@ -149,7 +195,8 @@ struct DeleteButton: View {
.font(.title)
.background {
Circle()
.foregroundStyle(.white)
.foregroundStyle(.regularMaterial)
.shadow(radius: 5)
}
}
.offset(x: -8, y: -8)
Pocket Poster/Views/OnBoarding/OnBoardingPage.swift
+11 -11
View File
@@ -29,30 +29,30 @@ struct OnBoardingPage: Identifiable {
let onBoardingCards: [OnBoardingPage] = [
.init(
title: "Welcome to Pocket Poster!",
description: "Here is a tutorial to help you get started with the app.",
title: NSLocalizedString("Welcome to Pocket Poster!", comment: ""),
description: NSLocalizedString("Here is a tutorial to help you get started with the app.", comment: ""),
image: "Logo"
),
.init(
title: "Install the Fallback Shortcut (Optional)",
description: "To apply, PosterBoard will need to open.\n\nYou can install an optional shortcut if the original method fails.",
title: NSLocalizedString("Install the Fallback Shortcut (Optional)", comment: ""),
description: NSLocalizedString("To apply, PosterBoard will need to open.", comment: "") + "\n\n" + NSLocalizedString("You can install an optional shortcut if the original method fails.", comment: ""),
image: "Shortcuts",
link: URL(string: PosterBoardManager.ShortcutURL),
linkName: "Get Shortcut"
linkName: NSLocalizedString("Get Shortcut", comment: "")
),
.init(
title: "Install Nugget",
description: "To get the app bundle id, Nugget is required.\n\nOn your computer, download Nugget from the GitHub.",
title: NSLocalizedString("Install Nugget", comment: ""),
description: NSLocalizedString("To get the app bundle id, Nugget is required.", comment: "") + "\n\n" + NSLocalizedString("On your computer, download Nugget from the GitHub.", comment: ""),
image: "Nugget",
link: URL(string: "https://github.com/leminlimez/Nugget/releases/latest"),
linkName: "Open GitHub"
linkName: NSLocalizedString("Open GitHub", comment: "")
),
.init(
title: "Enjoy!",
description: "You can find wallpapers on the official Cowabun.ga website.",
title: NSLocalizedString("Enjoy!", comment: ""),
description: NSLocalizedString("You can find wallpapers on the official Cowabun.ga website.", comment: ""),
image: "Cowabunga",
link: URL(string: PosterBoardManager.WallpapersURL),
linkName: "Find Wallpapers"
linkName: NSLocalizedString("Find Wallpapers", comment: "")
)
]
Pocket Poster/Views/SettingsView.swift
+12 -2
View File
@@ -9,8 +9,9 @@ import SwiftUI
struct SettingsView: View {
// Prefs
@AppStorage("pbHash") var pbHash: String = ""
@AppStorage("cpHash") var cpHash: String = ""
@AppStorage("pbHash") var pbHash: String = "" // PosterBoard hash
@AppStorage("cpHash") var cpHash: String = "" // CarPlay hash
@AppStorage("ignoreDurationLimit") var ignoreDurationLimit: Bool = false
@State var checkingForHash: Bool = false
@State var hashCheckTask: Task<Void, any Error>? = nil
@@ -49,6 +50,14 @@ struct SettingsView: View {
Label("App Hash", systemImage: "lock.app.dashed")
}
Section {
Toggle(isOn: $ignoreDurationLimit, label: {
Label("Disable Video Duration Limit", systemImage: "ruler")
})
} header: {
Label("Preferences", systemImage: "gear")
}
Section {
Button(action: {
UIImpactFeedbackGenerator(style: .soft).impactOccurred()
@@ -128,6 +137,7 @@ struct SettingsView: View {
LinkCell(imageName: "Nathan", url: "https://github.com/verygenericname", title: "Nathan", contribution: NSLocalizedString("Exploit", comment: ""), circle: true)
LinkCell(imageName: "duy", url: "https://github.com/khanhduytran0", title: "DuyKhanhTran", contribution: NSLocalizedString("Exploit", comment: ""), circle: true)
LinkCell(imageName: "sky", url: "https://bsky.app/profile/did:plc:xykfeb7ieeo335g3aly6vev4", title: "dootskyre", contribution: NSLocalizedString("Fallback Shortcut Creator", comment: ""), circle: true)
LinkCell(imageName: "POEditor", url: "https://poeditor.com/join/project/MPZOsunwVj", title: NSLocalizedString("Community Translators", comment: ""), contribution: "POEditor")
} header: {
Label("Credits", systemImage: "wrench.and.screwdriver")
}