Fixed ArticleNote

- sheet now opens at first try in the right article

Author: kath0809

PG5602_H24-4/Views/APITest.swift

@@ -2,7 +2,6 @@
 //  ArticleListView.swift
 //  PG5602_H24-4
 //
-//  Created by Karima Thingvold on 07/12/2024.
 //
 
 import SwiftUI
@@ -40,7 +39,7 @@ struct ArticleListView: View {
                 }
                 .swipeActions(edge: .trailing, allowsFullSwipe: false) {
                     Button(action: {
-                        addNoteAction(article) // Bruker closure for å åpne NoteSheet
+                        addNoteAction(article)
                     }) {
                         Label("Add note", systemImage: "note")
                     }

PG5602_H24-4/Views/ArticleView/ArticleListView.swift

@@ -2,7 +2,6 @@
 //  ArticleNote.swift
 //  PG5602_H24-4
 //
-//  Created by Karima Thingvold on 07/12/2024.
 //
 
 import SwiftUI
@@ -13,7 +12,7 @@ struct ArticleNote: View {
     var onSave: () -> Void
 
     var body: some View {
-        NavigationView {
+        NavigationStack {
             VStack(alignment: .leading, spacing: 20) {
 
                 Text("Add Note for:")
@@ -22,12 +21,12 @@ struct ArticleNote: View {
 
                 Text(article.title)
                     .font(.subheadline)
-                    .foregroundColor(.secondary)
+                    .foregroundStyle(.secondary)
                     .lineLimit(2)
                     .padding(.bottom)
 
 
-                TextField("Enter your note here...", text: $noteText)
+                TextField("Enter note here...", text: $noteText)
                     .textFieldStyle(RoundedBorderTextFieldStyle())
                     .padding(.horizontal)
 
@@ -38,7 +37,7 @@ struct ArticleNote: View {
                         .frame(maxWidth: .infinity)
                         .padding()
                         .background(Color.blue)
-                        .foregroundColor(.white)
+                        .foregroundStyle(.white)
                         .cornerRadius(10)
                         .padding(.horizontal)
                 }

PG5602_H24-4/Views/ArticleView/ArticleNote.swift

@@ -2,8 +2,6 @@
 //  ArticlesView.swift
 //  PG5602_H24-4
 //
-//  Created by Karima Thingvold on 01/12/2024.
-//
 
 import SwiftUI
 import SwiftData
@@ -36,7 +34,7 @@ struct ArticlesView: View {
                     tickerTextColor: $tickerTextColor,
                     tickerFSize: $tickerFSize
                 )
-                    .frame(height: 50)
+                .frame(height: 50)
             }
 
             NavigationView {
@@ -53,10 +51,11 @@ struct ArticlesView: View {
                     )
                 }
             }
-            /// Works, but sometimes its to much to load so it takes som time.
-            .sheet(isPresented: $showNoteSheet, onDismiss: {
-                selectedArticle = nil
-            }) {
+                /// Works, but...
+            .sheet(isPresented: Binding(
+                get: { showNoteSheet && selectedArticle != nil },
+                set: { if !$0 { showNoteSheet = false; selectedArticle = nil } }
+            )) {
                 if let selectedArticle = selectedArticle {
                     ArticleNote(
                         article: selectedArticle,
@@ -66,12 +65,13 @@ struct ArticlesView: View {
                 }
             }
 
+            
             if !detailedView && tickerPosition == "Bottom" && isNewsTickerActive {
                 NewsTickerView(
                     tickerTextColor: $tickerTextColor,
                     tickerFSize: $tickerFSize
                 )
-                    .frame(height: 50)
+                .frame(height: 50)
             }
         }
     }
@@ -87,8 +87,11 @@ struct ArticlesView: View {
     func openNoteSheet(for article: Article) {
         selectedArticle = article
         noteText = article.note ?? ""
+        print("Selected Article: \(selectedArticle?.title ?? "None")")
+        print("Note Text: \(noteText)")
         showNoteSheet = true
     }
+
 
     func saveNote() {
         guard let article = selectedArticle else { return }