Merge pull request #42 from nsswifter/feature/6-implement-session-module

Feature/6 implement session module

Author: karami-mehdi

AISightQuest/Common/View/TextView.swift

@@ -22,7 +22,7 @@ struct TextView: UIViewRepresentable {
         textView.showsHorizontalScrollIndicator = false
         textView.showsVerticalScrollIndicator = false
         textView.tintColor = .darkBlue500
-        textView.font = UIFontMetrics(forTextStyle: .body).scaledFont(for: UIFont.systemFont(ofSize: 17))
+        textView.font = UIFontMetrics(forTextStyle: .body).scaledFont(for: .preferredFont(forTextStyle: .body))
         return textView
     }
 

AISightQuest/Modules/Session/View/SessionView.swift

@@ -90,6 +90,7 @@ struct SessionView: View {
 
                             Button {
                                 setAttributedText("")
+                                questionText = ""
                                 clearAttributedTextButtonTapped += 1
                             } label: {
                                 Image(systemName: "xmark")
@@ -132,7 +133,7 @@ private extension SessionView {
                                                        attributes: [.foregroundColor: colorScheme == .dark
                                                                     ? UIColor.white : UIColor.black,
                                                                     .font: UIFontMetrics(forTextStyle: .body)
-                                                                    .scaledFont(for: UIFont.systemFont(ofSize: 17))])
+                                                                    .scaledFont(for: .preferredFont(forTextStyle: .body))])
         }
     }
 
@@ -194,7 +195,7 @@ private extension SessionView {
                     .font(.title)
                     .padding(.trailing)
             }
-            .hidden(questionText.isEmpty/*, remove: questionText.isEmpty*/)
+            .hidden(questionText.isEmpty)
             .sensoryFeedback(.impact(flexibility: .rigid, intensity: 1),
                              trigger: clearQuestionButtonTapped)
         }

AISightQuest/Modules/Session/ViewModel/SessionViewModel.swift

@@ -42,19 +42,22 @@ extension SessionView {
             // Highlight the answer substring in the original text.
             var attributedText: NSAttributedString?
             if answer.base == context {
-                let mutableAttributedText = NSMutableAttributedString(string: context,
-                                                                      attributes: [.foregroundColor: colorScheme == .dark
-                                                                                   ? UIColor.white : UIColor.black,
-                                                                                   .font: UIFontMetrics(forTextStyle: .body)
-                                                                                   .scaledFont(for: UIFont.systemFont(ofSize: 17))])
+                let bodyFont = UIFont.preferredFont(forTextStyle: .body)
+                let boldFont = UIFont.systemFont(ofSize: bodyFont.pointSize, weight: .bold)
 
+                let bodyScaledFont = UIFontMetrics(forTextStyle: .body).scaledFont(for: bodyFont)
+                let boldScaledFont = UIFontMetrics(forTextStyle: .body).scaledFont(for: boldFont)
+
+                let mutableAttributedText = NSMutableAttributedString(string: context,
+                                                                       attributes: [.foregroundColor: colorScheme == .dark ? UIColor.white : UIColor.black,
+                                                                                    .font: bodyScaledFont])
+
                 let location = answer.startIndex.utf16Offset(in: context)
                 let length = answer.endIndex.utf16Offset(in: context) - location
                 let answerRange = NSRange(location: location, length: length)
-                
+
                 mutableAttributedText.addAttributes([.foregroundColor: UIColor.darkBlue500,
-                                                     .font: UIFontMetrics(forTextStyle: .body)
-                                                     .scaledFont(for: UIFont(name: "Avenir-HeavyOblique", size: 17) ?? UIFont.boldSystemFont(ofSize: 17))],
+                                                     .font: boldScaledFont],
                                                     range: answerRange)
                 attributedText = mutableAttributedText
             }