Refactor project, add loading/editing/saving notes, add client/server basic logic
This commit is contained in:
@@ -10,12 +10,13 @@ import SwiftUI
|
|||||||
struct ContentView: View {
|
struct ContentView: View {
|
||||||
@AppStorage("peered_username") private var username: String = ""
|
@AppStorage("peered_username") private var username: String = ""
|
||||||
@State private var notes = [Note]()
|
@State private var notes = [Note]()
|
||||||
|
@State private var notesClient: NoteEditingSessionClient?
|
||||||
|
|
||||||
var body: some View {
|
var body: some View {
|
||||||
NavigationView {
|
NavigationView {
|
||||||
List(notes) { note in
|
List(notes) { note in
|
||||||
NavigationLink(note.name) {
|
NavigationLink(note.name) {
|
||||||
NoteEditorScreen(note: note)
|
NoteEditorScreen(note: note, username: username)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.navigationTitle("Peered")
|
.navigationTitle("Peered")
|
||||||
@@ -28,6 +29,10 @@ struct ContentView: View {
|
|||||||
}
|
}
|
||||||
.onAppear {
|
.onAppear {
|
||||||
notes = NotesStorage().loadNotes()
|
notes = NotesStorage().loadNotes()
|
||||||
|
if notesClient == nil {
|
||||||
|
notesClient = .init(id: username)
|
||||||
|
}
|
||||||
|
notesClient?.startBrowsingForNotes()
|
||||||
}
|
}
|
||||||
.sheet(isPresented: .constant(username.isEmpty)) {
|
.sheet(isPresented: .constant(username.isEmpty)) {
|
||||||
SetUserNameBottomSheetView(username: $username)
|
SetUserNameBottomSheetView(username: $username)
|
||||||
|
|||||||
@@ -0,0 +1,37 @@
|
|||||||
|
import MultipeerConnectivity
|
||||||
|
import Foundation
|
||||||
|
|
||||||
|
@Observable
|
||||||
|
final class NoteEditingSessionServer: NSObject {
|
||||||
|
private let session: MCSession
|
||||||
|
private let browser: MCNearbyServiceBrowser
|
||||||
|
|
||||||
|
init(username: String) {
|
||||||
|
let peer = MCPeerID(displayName: username)
|
||||||
|
browser = .init(peer: peer, serviceType: "peered")
|
||||||
|
session = .init(peer: peer)
|
||||||
|
super.init()
|
||||||
|
browser.delegate = self
|
||||||
|
}
|
||||||
|
|
||||||
|
func startServer() {
|
||||||
|
browser.startBrowsingForPeers()
|
||||||
|
}
|
||||||
|
|
||||||
|
func stopServer() {
|
||||||
|
browser.stopBrowsingForPeers()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
extension NoteEditingSessionServer: MCNearbyServiceBrowserDelegate {
|
||||||
|
func browser(
|
||||||
|
_ browser: MCNearbyServiceBrowser,
|
||||||
|
foundPeer peerID: MCPeerID,
|
||||||
|
withDiscoveryInfo info: [String : String]?
|
||||||
|
) {
|
||||||
|
browser.invitePeer(peerID, to: session, withContext: nil, timeout: 30)
|
||||||
|
print("seeing peer \(peerID.displayName)")
|
||||||
|
}
|
||||||
|
|
||||||
|
func browser(_ browser: MCNearbyServiceBrowser, lostPeer peerID: MCPeerID) {}
|
||||||
|
}
|
||||||
@@ -9,8 +9,32 @@ import SwiftUI
|
|||||||
|
|
||||||
struct NoteEditorScreen: View {
|
struct NoteEditorScreen: View {
|
||||||
let note: Note
|
let note: Note
|
||||||
|
@State private var noteAdvertiser: NoteEditingSessionServer
|
||||||
|
@State private var noteContent: String = ""
|
||||||
|
@State private var timer = Timer.publish(every: 5, on: .current, in: .common)
|
||||||
|
.autoconnect()
|
||||||
|
|
||||||
|
init(note: Note, username: String) {
|
||||||
|
self.note = note
|
||||||
|
self._noteAdvertiser = .init(wrappedValue: .init(username: username))
|
||||||
|
}
|
||||||
|
|
||||||
var body: some View {
|
var body: some View {
|
||||||
TextEditor(text: .constant("eee"))
|
TextEditor(text: $noteContent)
|
||||||
|
.onAppear {
|
||||||
|
noteContent = try! String(contentsOf: note.path, encoding: .utf8)
|
||||||
|
noteAdvertiser.startServer()
|
||||||
|
}
|
||||||
|
.onDisappear {
|
||||||
|
noteAdvertiser.stopServer()
|
||||||
|
saveNote()
|
||||||
|
}
|
||||||
|
.onReceive(timer) { _ in
|
||||||
|
saveNote()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func saveNote() {
|
||||||
|
try! noteContent.write(to: note.path, atomically: true, encoding: .utf8)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,53 @@
|
|||||||
|
//
|
||||||
|
// NoteEditingSessionClient.swift
|
||||||
|
// Peered
|
||||||
|
//
|
||||||
|
// Created by Oskar Chybowski on 05/10/2025.
|
||||||
|
//
|
||||||
|
|
||||||
|
|
||||||
|
import MultipeerConnectivity
|
||||||
|
import Foundation
|
||||||
|
|
||||||
|
@Observable
|
||||||
|
final class NoteEditingSessionClient: NSObject {
|
||||||
|
private let session: MCSession
|
||||||
|
private let advertiser: MCNearbyServiceAdvertiser
|
||||||
|
|
||||||
|
init(id: String) {
|
||||||
|
let id = MCPeerID(displayName: id)
|
||||||
|
session = MCSession(
|
||||||
|
peer: id,
|
||||||
|
securityIdentity: nil,
|
||||||
|
encryptionPreference: .required
|
||||||
|
)
|
||||||
|
advertiser = MCNearbyServiceAdvertiser(
|
||||||
|
peer: id,
|
||||||
|
discoveryInfo: [:],
|
||||||
|
serviceType: "peered"
|
||||||
|
)
|
||||||
|
super.init()
|
||||||
|
advertiser.delegate = self
|
||||||
|
}
|
||||||
|
|
||||||
|
func startBrowsingForNotes() {
|
||||||
|
advertiser.startAdvertisingPeer()
|
||||||
|
}
|
||||||
|
|
||||||
|
func stopBrowsingForNotes() {
|
||||||
|
advertiser.stopAdvertisingPeer()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
extension NoteEditingSessionClient: MCNearbyServiceAdvertiserDelegate {
|
||||||
|
func advertiser(
|
||||||
|
_ advertiser: MCNearbyServiceAdvertiser,
|
||||||
|
didReceiveInvitationFromPeer peerID: MCPeerID,
|
||||||
|
withContext context: Data?,
|
||||||
|
invitationHandler: @escaping (Bool, MCSession?) -> Void
|
||||||
|
) {
|
||||||
|
DispatchQueue.main.async {
|
||||||
|
invitationHandler(true, self.session)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -11,10 +11,17 @@ struct NotesStorage {
|
|||||||
let storageProvider: FileManager = FileManager.default
|
let storageProvider: FileManager = FileManager.default
|
||||||
|
|
||||||
func loadNotes() -> [Note] {
|
func loadNotes() -> [Note] {
|
||||||
let files = try! storageProvider.contentsOfDirectory(atPath: URL.documentsDirectory.path)
|
let files = try! storageProvider
|
||||||
|
.contentsOfDirectory(atPath: URL.documentsDirectory.path)
|
||||||
var notes = [Note]()
|
var notes = [Note]()
|
||||||
|
|
||||||
for file in files.compactMap(URL.init) {
|
for file in files.compactMap({
|
||||||
|
URL(
|
||||||
|
filePath: $0,
|
||||||
|
directoryHint: .notDirectory,
|
||||||
|
relativeTo: URL.documentsDirectory
|
||||||
|
)
|
||||||
|
}) {
|
||||||
let name = file.lastPathComponent
|
let name = file.lastPathComponent
|
||||||
let note = Note(
|
let note = Note(
|
||||||
name: name,
|
name: name,
|
||||||
|
|||||||
Reference in New Issue
Block a user