From 473ccc1083e93abfd25bd98c1fe57d10b1471c1d Mon Sep 17 00:00:00 2001
From: Oliverl11 <145501997+Oliverl11@users.noreply.github.com>
Date: Wed, 13 Dec 2023 19:19:46 -0500
Subject: [PATCH] feat: localized string text for 5 views

---
 .DS_Store                                     | Bin 6148 -> 6148 bytes
 .../Constants/Localization+Constants.swift    |  37 ++++++++++++++++++
 .../Views/Onboarding/ViewBirthday.swift       |   8 ++--
 .../Views/Onboarding/ViewGender.swift         |  19 +++------
 NutritionNest/Views/Onboarding/ViewGoal.swift |  24 +++++-------
 .../Views/Onboarding/ViewStatus.swift         |  20 ++++------
 .../Views/Onboarding/ViewWeight.swift         |   8 ++--
 7 files changed, 65 insertions(+), 51 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index 7849705522f156e215c672413c25815be46a1562..af2f977b9e8cb9e3bb233e89736e7b15eec50128 100644
GIT binary patch
delta 68
zcmZoMXffDO%)}JoKbeu)NGLbo#U&{xKZ${XfurnB#Wwv3lm9cBOn%G6!v^O%u`K{f
QGYCx<V3OLL$h=qt00wy$5&!@I

delta 68
zcmZoMXffDO%*5n(YBD3Ukx*{Fi%U{Yei8!%1IM)uB5Ti7O#aVgGWjhN4;!58#5Msa
Q%^);cfJtg|BJ*Mq05Oyo3jhEB

diff --git a/NutritionNest/Constants/Localization+Constants.swift b/NutritionNest/Constants/Localization+Constants.swift
index 6d983cc..6c9df2d 100644
--- a/NutritionNest/Constants/Localization+Constants.swift
+++ b/NutritionNest/Constants/Localization+Constants.swift
@@ -21,6 +21,43 @@ enum Localization {
         static let account = Localization.tr("Onboarding.Account", fallback: "Have an account?")
         static let login = Localization.tr("Onboarding.Login", fallback: "Log In")
     }
+    enum ViewGender {
+        static let iam = Localization.tr("ViewGender.Iam", fallback: "I am...")
+        static let male = Localization.tr("ViewGender.Male", fallback: "Male")
+        static let female = Localization.tr("ViewGender.Female", fallback: "Female")
+        static let nonbinary = Localization.tr("ViewGender.Nonbinary", fallback: "Nonbinary")
+        static let next = Localization.tr("ViewGender.Next", fallback: "Next")
+        static let skip = Localization.tr("ViewGender.Skip", fallback: "Skip")
+    }
+    enum ViewGoal {
+        static let mygoal = Localization.tr("ViewGoal.Mygoal", fallback: "My goals are...")
+        static let muloptions = Localization.tr("ViewGoal.Muloptions", fallback: "You may select multiple options")
+        static let maintainweight = Localization.tr("ViewGoal.Maintainweight", fallback: "Maintain weight")
+        static let gainweight = Localization.tr("ViewGoal.Gainweight", fallback: "Gain weight")
+        static let loseweight = Localization.tr("ViewGoal.Loseweight", fallback: "Lose weight")
+        static let comment = Localization.tr("ViewGoal.Comment", fallback: "Comment")
+        static let next = Localization.tr("ViewGoal.Next", fallback: "Next")
+        static let skip = Localization.tr("ViewGoal.Skip", fallback: "Skip")
+    }
+    enum ViewBirthday {
+        static let birthday = Localization.tr("ViewBirthday.Birthday", fallback: "What is your Birthdate?")
+        static let next = Localization.tr("ViewBirthday.Next", fallback: "Next")
+        static let skip = Localization.tr("ViewBirthday.Skip", fallback: "Skip")
+    }
+    enum ViewWeight {
+        static let weight = Localization.tr("ViewWeight.Weight", fallback: "What is your current weight?")
+        static let next = Localization.tr("ViewWeight.Next", fallback: "Next")
+        static let skip = Localization.tr("ViewWeight.Skip", fallback: "Skip")
+    }
+    enum ViewStatus {
+        static let status = Localization.tr("ViewStatus.Status", fallback: "How active are you?")
+        static let notactive = Localization.tr("ViewStatus.Notactive", fallback: "Not active")
+        static let lightlyactive = Localization.tr("ViewStatus.Lightlyactive", fallback: "Lightly active")
+        static let active = Localization.tr("ViewStatus.Active", fallback: "Active")
+        static let comment = Localization.tr("ViewStatus.Comment", fallback: "Comment")
+        static let next = Localization.tr("ViewStatus.Next", fallback: "Next")
+        static let skip = Localization.tr("ViewStatus.Skip", fallback: "Skip")
+    }
     enum SignUp {
         static let title = Localization.tr("SignUp.Title", fallback: "NutritionNest")
         static let message = Localization.tr("SignUp.Message", fallback: "Our AI friend is excited to assist you on your health journey!")
diff --git a/NutritionNest/Views/Onboarding/ViewBirthday.swift b/NutritionNest/Views/Onboarding/ViewBirthday.swift
index 5a72cd6..56e30a6 100644
--- a/NutritionNest/Views/Onboarding/ViewBirthday.swift
+++ b/NutritionNest/Views/Onboarding/ViewBirthday.swift
@@ -52,7 +52,7 @@ struct ViewBirthday: View {
                     }
                 }.padding(.top, -10)
 
-                Text("What is your Birthdate?").font(.custom("Inter", size: 26)).padding(.top, 25)
+                Text(Localization.ViewBirthday.birthday).font(CustomFonts.inter.font(size: 26)).padding(.top, 25)
                 
                 ZStack {
                     RoundedRectangle(cornerRadius: 20).fill(Color.blue).frame(width: 310, height: 35)
@@ -107,8 +107,7 @@ struct ViewBirthday: View {
 
                 } label: {
 
-                    Text("Next")
-                        .font(.custom("Inter", size: 25)).bold()
+                    Text(Localization.ViewBirthday.next).font(CustomFonts.inter.font(size: 25)).bold()
                         .padding(EdgeInsets(top: 20, leading: 140, bottom: 20, trailing: 140))
                         .background(Color.accentColor)
                         .foregroundColor(.white)
@@ -120,8 +119,7 @@ struct ViewBirthday: View {
 
                 } label: {
 
-                    Text("Skip")
-                        .font(.custom("Inter", size: 18)).bold()
+                    Text(Localization.ViewBirthday.skip).font(CustomFonts.inter.font(size: 18)).bold()
                         .padding(.top, 25)
 
                 }
diff --git a/NutritionNest/Views/Onboarding/ViewGender.swift b/NutritionNest/Views/Onboarding/ViewGender.swift
index 57ac212..5d82e13 100644
--- a/NutritionNest/Views/Onboarding/ViewGender.swift
+++ b/NutritionNest/Views/Onboarding/ViewGender.swift
@@ -46,8 +46,7 @@ struct ViewGender: View {
                 }
             }.padding(.top, 30)
 
-            Text("I am...").font(.custom("Inter", size: 26)).padding()
-
+            Text(Localization.ViewGender.iam).font(CustomFonts.inter.font(size: 26)).padding()
             Button {
                 if selectedGender == "Male" {
                     selectedGender = nil
@@ -64,9 +63,7 @@ struct ViewGender: View {
                                 .stroke(Color.gray, lineWidth: 1)
                         )
                     
-                    Text("Male")
-                        .font(.custom("Inter", size: 18))
-                        .frame(width: 250, height: 85)
+                    Text(Localization.ViewGender.male).font(CustomFonts.inter.font(size: 18)).frame(width: 250, height: 85)
                         .foregroundColor(selectedGender == "Male" ? .white : .black)
                 }
             }.padding(.top, 60)
@@ -87,8 +84,7 @@ struct ViewGender: View {
                                 .stroke(Color.gray, lineWidth: 1)
                         )
                     
-                    Text("Female")
-                        .font(.custom("Inter", size: 18))
+                    Text(Localization.ViewGender.female).font(CustomFonts.inter.font(size: 18))
                         .frame(width: 250, height: 85)
                         .foregroundColor(selectedGender == "Female" ? .white : .black)
                 }
@@ -110,8 +106,7 @@ struct ViewGender: View {
                                 .stroke(Color.gray, lineWidth: 1)
                         )
                     
-                    Text("Nonbinary")
-                        .font(.custom("Inter", size: 18))
+                    Text(Localization.ViewGender.nonbinary).font(CustomFonts.inter.font(size: 18))
                         .frame(width: 250, height: 85)
                         .foregroundColor(selectedGender == "Nonbinary" ? .white : .black)
                 }
@@ -121,8 +116,7 @@ struct ViewGender: View {
 
             } label: {
 
-                Text("Next")
-                    .font(.custom("Inter", size: 25)).bold()
+                Text(Localization.ViewGender.next).font(CustomFonts.inter.font(size: 25)).bold()
                     .padding(EdgeInsets(top: 20, leading: 140, bottom: 20, trailing: 140))
                     .background(Color.accentColor)
                     .foregroundColor(.white)
@@ -134,8 +128,7 @@ struct ViewGender: View {
 
             } label: {
 
-                Text("Skip")
-                    .font(.custom("Inter", size: 18)).bold()
+                Text(Localization.ViewGender.skip).font(CustomFonts.inter.font(size: 18)).bold()
                     .padding(.top, 25)
                     
             }
diff --git a/NutritionNest/Views/Onboarding/ViewGoal.swift b/NutritionNest/Views/Onboarding/ViewGoal.swift
index 03efae7..23fb31a 100644
--- a/NutritionNest/Views/Onboarding/ViewGoal.swift
+++ b/NutritionNest/Views/Onboarding/ViewGoal.swift
@@ -48,10 +48,10 @@ struct ViewGoal: View {
                 }
             }.padding(.top, 30)
 
-            Text("My goals are...").font(.custom("Inter", size: 30)).padding()
-            Text("You may select multiple options").font(.custom("Inter", size: 18)).foregroundColor(.gray)
+            Text(Localization.ViewGoal.mygoal).font(CustomFonts.inter.font(size: 30)).padding()
+            
+            Text(Localization.ViewGoal.muloptions).font(CustomFonts.inter.font(size: 18)).foregroundColor(.gray)
                 .padding(.top, -10)
-                
             Button {
                 if selectedGoal == "Maintain weight" {
                     selectedGoal = nil
@@ -68,8 +68,7 @@ struct ViewGoal: View {
                                 .stroke(Color.gray, lineWidth: 1)
                         )
                     
-                    Text("Maintain weight")
-                        .font(.custom("Inter", size: 18))
+                    Text(Localization.ViewGoal.maintainweight).font(CustomFonts.inter.font(size: 18))
                         .frame(width: 250, height: 85)
                         .foregroundColor(selectedGoal == "Maintain weight" ? .white : .black)
                 }
@@ -91,8 +90,7 @@ struct ViewGoal: View {
                                 .stroke(Color.gray, lineWidth: 1)
                         )
                     
-                    Text("Gain weight")
-                        .font(.custom("Inter", size: 18))
+                    Text(Localization.ViewGoal.gainweight).font(CustomFonts.inter.font(size: 18))
                         .frame(width: 250, height: 85)
                         .foregroundColor(selectedGoal == "Gain weight" ? .white : .black)
                 }
@@ -114,8 +112,7 @@ struct ViewGoal: View {
                                 .stroke(Color.gray, lineWidth: 1)
                         )
                     
-                    Text("Lose weight")
-                        .font(.custom("Inter", size: 18))
+                    Text(Localization.ViewGoal.loseweight).font(CustomFonts.inter.font(size: 18))
                         .frame(width: 250, height: 85)
                         .foregroundColor(selectedGoal == "Lose weight" ? .white : .black)
                 }
@@ -127,8 +124,7 @@ struct ViewGoal: View {
                         .stroke(Color.gray, lineWidth: 1)
                         .frame(width: 250, height: 120)
 
-                    Text("Comment")
-                        .font(.custom("Inter", size: 18))
+                    Text(Localization.ViewGoal.comment).font(CustomFonts.inter.font(size: 18))
                         .foregroundColor(.black)
                         .offset(x: 20, y: 20)
                 }
@@ -147,8 +143,7 @@ struct ViewGoal: View {
 
             } label: {
 
-                Text("Next")
-                    .font(.custom("Inter", size: 25)).bold()
+                Text(Localization.ViewGoal.next).font(CustomFonts.inter.font(size: 25)).bold()
                     .padding(EdgeInsets(top: 20, leading: 140, bottom: 20, trailing: 140))
                     .background(Color.accentColor)
                     .foregroundColor(.white)
@@ -160,8 +155,7 @@ struct ViewGoal: View {
 
             } label: {
 
-                Text("Skip")
-                    .font(.custom("Inter", size: 18)).bold()
+                Text(Localization.ViewGoal.skip).font(CustomFonts.inter.font(size: 18)).bold()
                     .padding(.top, 25)
                     
             }
diff --git a/NutritionNest/Views/Onboarding/ViewStatus.swift b/NutritionNest/Views/Onboarding/ViewStatus.swift
index 1b0aa97..2527ba4 100644
--- a/NutritionNest/Views/Onboarding/ViewStatus.swift
+++ b/NutritionNest/Views/Onboarding/ViewStatus.swift
@@ -48,7 +48,7 @@ struct ViewStatus: View {
                 }
             }.padding(.top, 30)
 
-            Text("How active are you?").font(.custom("Inter", size: 30)).padding()
+            Text(Localization.ViewStatus.status).font(CustomFonts.inter.font(size: 30)).padding()
                             
             Button {
                 if selectedStatus == "Not active" {
@@ -66,8 +66,7 @@ struct ViewStatus: View {
                                 .stroke(Color.gray, lineWidth: 1)
                         )
                     
-                    Text("Not active")
-                        .font(.custom("Inter", size: 18))
+                    Text(Localization.ViewStatus.notactive).font(CustomFonts.inter.font(size: 18))
                         .frame(width: 250, height: 85)
                         .foregroundColor(selectedStatus == "Not active" ? .white : .black)
                 }
@@ -89,8 +88,7 @@ struct ViewStatus: View {
                                 .stroke(Color.gray, lineWidth: 1)
                         )
                     
-                    Text("Lightly active")
-                        .font(.custom("Inter", size: 18))
+                    Text(Localization.ViewStatus.lightlyactive).font(CustomFonts.inter.font(size: 18))
                         .frame(width: 250, height: 85)
                         .foregroundColor(selectedStatus == "Lightly active" ? .white : .black)
                 }
@@ -112,8 +110,7 @@ struct ViewStatus: View {
                                 .stroke(Color.gray, lineWidth: 1)
                         )
                     
-                    Text("Active")
-                        .font(.custom("Inter", size: 18))
+                    Text(Localization.ViewStatus.active).font(CustomFonts.inter.font(size: 18))
                         .frame(width: 250, height: 85)
                         .foregroundColor(selectedStatus == "Active" ? .white : .black)
                 }
@@ -125,8 +122,7 @@ struct ViewStatus: View {
                         .stroke(Color.gray, lineWidth: 1)
                         .frame(width: 250, height: 120)
 
-                    Text("Comment")
-                        .font(.custom("Inter", size: 18))
+                    Text(Localization.ViewStatus.comment).font(CustomFonts.inter.font(size: 18))
                         .foregroundColor(.black)
                         .offset(x: 20, y: 20)
                 }
@@ -146,8 +142,7 @@ struct ViewStatus: View {
 
             } label: {
 
-                Text("Next")
-                    .font(.custom("Inter", size: 25)).bold()
+                Text(Localization.ViewStatus.next).font(CustomFonts.inter.font(size: 25)).bold()
                     .padding(EdgeInsets(top: 20, leading: 140, bottom: 20, trailing: 140))
                     .background(Color.accentColor)
                     .foregroundColor(.white)
@@ -159,8 +154,7 @@ struct ViewStatus: View {
 
             } label: {
 
-                Text("Skip")
-                    .font(.custom("Inter", size: 18)).bold()
+                Text(Localization.ViewStatus.skip).font(CustomFonts.inter.font(size: 18)).bold()
                     .padding(.top, 15)
                     
             }
diff --git a/NutritionNest/Views/Onboarding/ViewWeight.swift b/NutritionNest/Views/Onboarding/ViewWeight.swift
index 4144cd3..34ea14e 100644
--- a/NutritionNest/Views/Onboarding/ViewWeight.swift
+++ b/NutritionNest/Views/Onboarding/ViewWeight.swift
@@ -52,7 +52,7 @@ struct ViewWeight: View {
                     }
                 }.padding(.top, -10)
 
-                Text("What is your current weight?").font(.custom("Inter", size: 25)).padding(.top, 25)
+                Text(Localization.ViewWeight.weight).font(CustomFonts.inter.font(size: 25)).padding(.top, 25)
                 
                 ZStack {
                     RoundedRectangle(cornerRadius: 20).fill(Color.blue).frame(width: 310, height: 35)
@@ -108,8 +108,7 @@ struct ViewWeight: View {
 
                 } label: {
 
-                    Text("Next")
-                        .font(.custom("Inter", size: 25)).bold()
+                    Text(Localization.ViewWeight.next).font(CustomFonts.inter.font(size: 25)).bold()
                         .padding(EdgeInsets(top: 20, leading: 140, bottom: 20, trailing: 140))
                         .background(Color.accentColor)
                         .foregroundColor(.white)
@@ -121,8 +120,7 @@ struct ViewWeight: View {
 
                 } label: {
 
-                    Text("Skip")
-                        .font(.custom("Inter", size: 18)).bold()
+                    Text(Localization.ViewWeight.skip).font(CustomFonts.inter.font(size: 18)).bold()
                         .padding(.top, 25)
 
                 }