Merge branch 'dev_views_ViewTitle' into dev_views

DouShouQi_App/DouShouQi_App/Assets/TextStyles/TextStyles.swift

@@ -8,14 +8,14 @@
 import Foundation
 import SwiftUI
 
-protocol TextStyle: ViewModifier {}
+protocol TextStyles: ViewModifier {}
 
 extension Text {
-    func textStyle(T: any TextStyle) {
+    func textStyle<T: TextStyles>(_ style: T) -> some View {
-        modifier(T)
+        modifier(style)
     }
 }
 
-struct TextStyles {
+struct CustomTextStyles {
-    static let ViewTitle = ViewTitleTextStyle()
+    static let Title = ViewTitleTextStyle()
 }

DouShouQi_App/DouShouQi_App/Assets/TextStyles/ViewTitleTextStyle.swift

@@ -8,7 +8,7 @@
 import Foundation
 import SwiftUI
 
-struct ViewTitleTextStyle: TextStyle {
+struct ViewTitleTextStyle: TextStyles {
     func body(content: Content) -> some View {
         content
             .foregroundColor(Colors.TitleText)

DouShouQi_App/DouShouQi_App/Components/TitlePageFrame.swift

@@ -13,8 +13,8 @@ struct TitlePageFrame: View {
     var Text: String
     
     // Image Params
-    var ImageWidth: CGFloat
+    var ImageWidth: CGFloat = 200
-    var ImageHeight: CGFloat
+    var ImageHeight: CGFloat = 200
     
     var body: some View {
         VStack(alignment: .leading) {
@@ -25,9 +25,7 @@ struct TitlePageFrame: View {
                     .frame(width: ImageWidth, height: ImageHeight)
                 
                 SwiftUI.Text(self.Text)
-                    .foregroundColor(Colors.TitleText)
+                    .textStyle(CustomTextStyles.Title)
-                    .fontWeight(.bold)
-                    .font(.custom(Fonts.title, size: 30))
                 
             }
         }
@@ -36,6 +34,6 @@ struct TitlePageFrame: View {
 
 struct TitlePageFrame_Previews: PreviewProvider {
     static var previews: some View {
-        TitlePageFrame(Text: "DouShouQi", ImageWidth: 200, ImageHeight: 200)
+        TitlePageFrame(Text: "DouShouQi")
     }
 }