From fef5d15de29b52ee9097259f9024eedda4475b1c Mon Sep 17 00:00:00 2001
From: Mariana Brasil <marilemosbrasil@gmail.com>
Date: Mon, 24 Oct 2022 22:03:47 -0300
Subject: [PATCH 1/9] Refactor done + fix add new word bug that wouldn't update
 the words table

---
 VocabularyTrainer.xcodeproj/project.pbxproj   |  16 +-
 .../xcdebugger/Breakpoints_v2.xcbkptlist      |   6 +
 .../xcschemes/xcschememanagement.plist        |  14 ++
 .../AddNewWordViewController.swift            | 138 -----------
 .../AddWord/AddNewWordViewController.swift    | 230 ++++++++++++++++++
 VocabularyTrainer/Base.lproj/Main.storyboard  |  82 +------
 VocabularyTrainer/Helper.swift                |   1 -
 .../LanguageScreenViewController.swift        |  25 +-
 8 files changed, 279 insertions(+), 233 deletions(-)
 create mode 100644 VocabularyTrainer.xcodeproj/xcuserdata/marianabrasil.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
 create mode 100644 VocabularyTrainer.xcodeproj/xcuserdata/marianabrasil.xcuserdatad/xcschemes/xcschememanagement.plist
 delete mode 100644 VocabularyTrainer/AddNewWordViewController.swift
 create mode 100644 VocabularyTrainer/AddWord/AddNewWordViewController.swift

diff --git a/VocabularyTrainer.xcodeproj/project.pbxproj b/VocabularyTrainer.xcodeproj/project.pbxproj
index 0f1c8cb..5561889 100644
--- a/VocabularyTrainer.xcodeproj/project.pbxproj
+++ b/VocabularyTrainer.xcodeproj/project.pbxproj
@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		B3657DFD290740D9000D76C8 /* AddNewWordViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3657DFC290740D8000D76C8 /* AddNewWordViewController.swift */; };
 		CE0012FF2243F21C002F86DE /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE0012FE2243F21C002F86DE /* Extensions.swift */; };
 		CE05F622229F17AF0097E3BB /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = CE05F624229F17AF0097E3BB /* Localizable.strings */; };
 		CE0FE4F82238585A00430FDE /* TrainingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE0FE4F72238585A00430FDE /* TrainingViewController.swift */; };
@@ -20,7 +21,6 @@
 		CE86C57E2235BDC9008A5B73 /* NewLanguageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE86C57D2235BDC9008A5B73 /* NewLanguageViewController.swift */; };
 		CE86C5802235C8AD008A5B73 /* LanguageScreenViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE86C57F2235C8AD008A5B73 /* LanguageScreenViewController.swift */; };
 		CE86C5822235C971008A5B73 /* Helper.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE86C5812235C971008A5B73 /* Helper.swift */; };
-		CE86C584223684D2008A5B73 /* AddNewWordViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE86C583223684D2008A5B73 /* AddNewWordViewController.swift */; };
 		CECD6342235E54350060911F /* pp.html in Resources */ = {isa = PBXBuildFile; fileRef = CECD6344235E54350060911F /* pp.html */; };
 		CEE4988828F572E200B64FCF /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = CEE4988728F572E200B64FCF /* README.md */; };
 		E37D16F9261BCBCB006C1F71 /* LanugageTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E37D16F8261BCBCB006C1F71 /* LanugageTableViewCell.swift */; };
@@ -46,6 +46,7 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		B3657DFC290740D8000D76C8 /* AddNewWordViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddNewWordViewController.swift; sourceTree = "<group>"; };
 		CE0012FE2243F21C002F86DE /* Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Extensions.swift; sourceTree = "<group>"; };
 		CE05F621229F17830097E3BB /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Main.strings; sourceTree = "<group>"; };
 		CE05F623229F17AF0097E3BB /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
@@ -67,7 +68,6 @@
 		CE86C57D2235BDC9008A5B73 /* NewLanguageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewLanguageViewController.swift; sourceTree = "<group>"; };
 		CE86C57F2235C8AD008A5B73 /* LanguageScreenViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LanguageScreenViewController.swift; sourceTree = "<group>"; };
 		CE86C5812235C971008A5B73 /* Helper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Helper.swift; sourceTree = "<group>"; };
-		CE86C583223684D2008A5B73 /* AddNewWordViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddNewWordViewController.swift; sourceTree = "<group>"; };
 		CE92ABF928E97C5600FE2EBC /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = nl; path = nl.lproj/pp.html; sourceTree = "<group>"; };
 		CE92ABFA28E97CAF00FE2EBC /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/Localizable.strings; sourceTree = "<group>"; };
 		CECD6343235E54350060911F /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = Base; path = Base.lproj/pp.html; sourceTree = "<group>"; };
@@ -104,6 +104,14 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		B3657DFE290740F8000D76C8 /* AddWord */ = {
+			isa = PBXGroup;
+			children = (
+				B3657DFC290740D8000D76C8 /* AddNewWordViewController.swift */,
+			);
+			path = AddWord;
+			sourceTree = "<group>";
+		};
 		CE86C53F2235AE20008A5B73 = {
 			isa = PBXGroup;
 			children = (
@@ -139,7 +147,7 @@
 				E37D16FD261BCBF9006C1F71 /* Language Screens */,
 				CE86C5812235C971008A5B73 /* Helper.swift */,
 				E37D170A261BCD59006C1F71 /* VocabularyDateFormatter.swift */,
-				CE86C583223684D2008A5B73 /* AddNewWordViewController.swift */,
+				B3657DFE290740F8000D76C8 /* AddWord */,
 				CE0FE4F72238585A00430FDE /* TrainingViewController.swift */,
 				CE2EB8262245406A006B1C6D /* Launch Screen.storyboard */,
 				CE05F624229F17AF0097E3BB /* Localizable.strings */,
@@ -321,7 +329,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				CE86C5802235C8AD008A5B73 /* LanguageScreenViewController.swift in Sources */,
-				CE86C584223684D2008A5B73 /* AddNewWordViewController.swift in Sources */,
+				B3657DFD290740D9000D76C8 /* AddNewWordViewController.swift in Sources */,
 				CE86C54E2235AE20008A5B73 /* HomeScreenViewController.swift in Sources */,
 				E37D16FF261BCC10006C1F71 /* VocabularyCell.swift in Sources */,
 				CE0012FF2243F21C002F86DE /* Extensions.swift in Sources */,
diff --git a/VocabularyTrainer.xcodeproj/xcuserdata/marianabrasil.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/VocabularyTrainer.xcodeproj/xcuserdata/marianabrasil.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
new file mode 100644
index 0000000..6928609
--- /dev/null
+++ b/VocabularyTrainer.xcodeproj/xcuserdata/marianabrasil.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Bucket
+   uuid = "E7F3329F-8654-4CCB-85C1-EDD5B2EB3159"
+   type = "1"
+   version = "2.0">
+</Bucket>
diff --git a/VocabularyTrainer.xcodeproj/xcuserdata/marianabrasil.xcuserdatad/xcschemes/xcschememanagement.plist b/VocabularyTrainer.xcodeproj/xcuserdata/marianabrasil.xcuserdatad/xcschemes/xcschememanagement.plist
new file mode 100644
index 0000000..1541d55
--- /dev/null
+++ b/VocabularyTrainer.xcodeproj/xcuserdata/marianabrasil.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>VocabularyTrainer.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+	</dict>
+</dict>
+</plist>
diff --git a/VocabularyTrainer/AddNewWordViewController.swift b/VocabularyTrainer/AddNewWordViewController.swift
deleted file mode 100644
index 5a2eea8..0000000
--- a/VocabularyTrainer/AddNewWordViewController.swift
+++ /dev/null
@@ -1,138 +0,0 @@
-//
-//  AddNewWordViewController.swift
-//  VocabularyTrainer
-//
-//  Created by skrr on 11.03.19.
-//  Copyright © 2019 mic. All rights reserved.
-//
-
-import UIKit
-import Combine
-
-class AddNewWordViewController: UIViewController {
-  
-  var selectedLanguage: String?
-  var vocabularies = [String:String]()
-  var vocabulariesSuccessRates = [String:Float]()
-	var vocabulariesAddDates = [String:Date]()
-  var completed: (()->Void)?
-
-  @IBOutlet weak var newWordTextField: UITextField!
-  @IBOutlet weak var translationTextField: UITextField!
-
-  var newWordHasText = false
-  var translationHasText = false
-
-  @IBOutlet weak var backButton: UIButton!
-  @IBOutlet weak var addButton: UIButton!
-  @IBOutlet weak var addNewWordHeader: UILabel!
-  override func viewDidLoad() {
-    super.viewDidLoad()
-    
-    print("selected Language: \(String(describing: selectedLanguage))")
-    hideKeyboardWhenTappedAround()
-    styleButtons()
-    localize()
-    setGradientBackground(view: view)
-    newWordTextField.text = nil
-    translationTextField.text = nil
-    setAddButton(isEnabled: newWordHasText && translationHasText)
-
-    newWordTextField.addTarget(self, action: #selector(textFieldChanged(_:)), for: .editingChanged)
-    translationTextField.addTarget(self, action: #selector(textFieldChanged(_:)), for: .editingChanged)
-  }
-  
-  @IBAction func backButtonTapped(_ sender: Any) {
-    completed?()
-    dismiss(animated: true, completion: nil)
-  }
-  
-  @IBAction func addNewWordTapped(_ sender: Any) {
-    
-    guard let language = selectedLanguage else { print("error getting language"); return }
-    
-    let languageVocabProgressKey = "\(language)Progress"
-	let languageVocabDateAddedKey = "\(language)DateAdded"
-  
-    if let vocabs = UserDefaults.standard.dictionary(forKey: language) as? [String:String] {
-      vocabularies = vocabs
-    }
-    
-    if let vocabsSuccess = UserDefaults.standard.dictionary(forKey: languageVocabProgressKey) as? [String:Float] {
-      vocabulariesSuccessRates = vocabsSuccess
-    }
-
-	if let vocabsDates = UserDefaults.standard.dictionary(forKey: languageVocabDateAddedKey) as? [String:Date] {
-		vocabulariesAddDates = vocabsDates
-	}
-    
-    if let word = newWordTextField.text, let translatedWord = translationTextField.text {
-      vocabularies[word] = translatedWord
-      vocabulariesSuccessRates[word] = 100
-		vocabulariesAddDates[word] = Date()
-    }
-    
-    UserDefaults.standard.set(vocabularies, forKey: language)
-    UserDefaults.standard.set(vocabulariesSuccessRates, forKey: languageVocabProgressKey)
-	UserDefaults.standard.set(vocabulariesAddDates, forKey: languageVocabDateAddedKey)
-    
-    print( "words: \(String(describing: UserDefaults.standard.dictionary(forKey: language)))")
-    //dismiss(animated: true, completion: nil)
-    
-    newWordTextField.text = ""
-    translationTextField.text = ""
-    newWordHasText = false
-    translationHasText = false
-    setAddButton(isEnabled: false)
-    showToast(message: NSLocalizedString("New word added", comment: "New word added"), yCoord: 340.0)
-  }
-  
-  func styleButtons() {
-    backButton.backgroundColor = BackgroundColor.hansaYellow
-    backButton.layer.cornerRadius = 5.0
-    backButton.contentEdgeInsets = UIEdgeInsets.init(top: 0, left: 10, bottom: 0, right: 10)
-    backButton.setTitleColor(BackgroundColor.japaneseIndigo, for: .normal)
-
-    setAddButton(isEnabled: true)
-  }
-  
-  func localize() {
-    backButton.setTitle(NSLocalizedString("< Back", comment: "< Back"), for: .normal)
-    addButton.setTitle(NSLocalizedString("Add", comment: "Add"), for: .normal)
-    newWordTextField.placeholder = NSLocalizedString("New word", comment: "new word")
-    translationTextField.placeholder = NSLocalizedString("translation", comment: "translation")
-    addNewWordHeader.text = NSLocalizedString("Add new word", comment: "Add new word")
-  }
-
-  func setAddButton(isEnabled: Bool) {
-    if isEnabled {
-      UIView.animate(withDuration: 0.3) {
-        self.addButton.backgroundColor = BackgroundColor.mediumSpringBud
-      }
-      addButton.layer.cornerRadius = 5.0
-      addButton.contentEdgeInsets = UIEdgeInsets.init(top: 0, left: 10, bottom: 0, right: 10)
-      addButton.setTitleColor(.black, for: .normal)
-      addButton.isEnabled = true
-    } else {
-      UIView.animate(withDuration: 0.3) {
-        self.addButton.backgroundColor = UIColor(red: 207/255, green: 207/255, blue: 205/255, alpha: 0.4)
-      }
-      addButton.layer.cornerRadius = 5.0
-      addButton.contentEdgeInsets = UIEdgeInsets.init(top: 0, left: 10, bottom: 0, right: 10)
-      addButton.setTitleColor(.black, for: .normal)
-      addButton.isEnabled = false
-    }
-  }
-
-  @objc func textFieldChanged(_ sender: UITextField) {
-    let hasText = !(sender.text == nil || sender.text == "")
-    if sender === newWordTextField {
-      newWordHasText = hasText
-    }
-
-    if sender === translationTextField {
-      translationHasText = hasText
-    }
-    setAddButton(isEnabled: newWordHasText && translationHasText)
-  }
-}
diff --git a/VocabularyTrainer/AddWord/AddNewWordViewController.swift b/VocabularyTrainer/AddWord/AddNewWordViewController.swift
new file mode 100644
index 0000000..89e2181
--- /dev/null
+++ b/VocabularyTrainer/AddWord/AddNewWordViewController.swift
@@ -0,0 +1,230 @@
+//
+//  AddNewWordViewController.swift
+//  VocabularyTrainer
+//
+//  Created by Mariana Brasil on 24/10/22.
+//  Copyright © 2022 mic. All rights reserved.
+//
+
+import UIKit
+import Combine
+
+final class AddNewWordViewController: UIViewController {
+    
+    // MARK: - Private Properties
+    
+    private lazy var backButton: UIButton = {
+        let button = UIButton()
+        button.setTitle(NSLocalizedString("< Back", comment: "< Back"), for: .normal)
+        button.backgroundColor = BackgroundColor.hansaYellow
+        button.layer.cornerRadius = 5.0
+        button.contentEdgeInsets = .init(top: 5, left: 10, bottom: 5, right: 10)
+        button.setTitleColor(BackgroundColor.japaneseIndigo, for: .normal)
+        button.addTarget(self, action: #selector(didTapBackButton), for: .touchUpInside)
+        button.translatesAutoresizingMaskIntoConstraints = false
+        return button
+    }()
+    
+    private lazy var addNewWordLabel: UILabel = {
+        let label = UILabel()
+        label.text = NSLocalizedString("Add new word", comment: "Add new word")
+        label.font = UIFont.systemFont(ofSize: 30)
+        label.textColor = .black
+        label.translatesAutoresizingMaskIntoConstraints = false
+        return label
+    }()
+    
+    private lazy var newWordTextField: UITextField = {
+        let textField = UITextField()
+        textField.placeholder = NSLocalizedString("New word", comment: "new word")
+        textField.font = UIFont.systemFont(ofSize: 32)
+        textField.translatesAutoresizingMaskIntoConstraints = false
+        textField.backgroundColor = .white
+        textField.layer.cornerRadius = 5.0
+        textField.layer.sublayerTransform = CATransform3DMakeTranslation(8, 0, 0)
+        textField.autocapitalizationType = .none
+        textField.autocorrectionType = .no
+        textField.addTarget(self, action: #selector(textFieldChanged), for: .editingChanged)
+        return textField
+    }()
+    
+    private lazy var translationTextField: UITextField = {
+        let textField = UITextField()
+        textField.placeholder = NSLocalizedString("translation", comment: "translation")
+        textField.font = UIFont.systemFont(ofSize: 32)
+        textField.translatesAutoresizingMaskIntoConstraints = false
+        textField.backgroundColor = .white
+        textField.layer.cornerRadius = 5.0
+        textField.layer.sublayerTransform = CATransform3DMakeTranslation(8, 0, 0)
+        textField.autocapitalizationType = .none
+        textField.autocorrectionType = .no
+        textField.addTarget(self, action: #selector(textFieldChanged), for: .editingChanged)
+        return textField
+    }()
+    
+    private lazy var addButton: UIButton = {
+        let button = UIButton()
+        button.setTitle(NSLocalizedString("Add", comment: "Add"), for: .normal)
+        button.titleLabel?.font = UIFont.systemFont(ofSize: 32)
+        button.layer.cornerRadius = 5.0
+        button.contentEdgeInsets = .init(top: 0, left: 10, bottom: 0, right: 10)
+        button.setTitleColor(BackgroundColor.japaneseIndigo, for: .normal)
+        button.addTarget(self, action: #selector(addNewWordTapped), for: .touchUpInside)
+        button.backgroundColor = UIColor(red: 207/255, green: 207/255, blue: 205/255, alpha: 0.4)
+        button.translatesAutoresizingMaskIntoConstraints = false
+        return button
+    }()
+    
+    private var selectedLanguage: String?
+    private var vocabularies = [String:String]()
+    private var vocabulariesSuccessRates = [String:Float]()
+    private var vocabulariesAddDates = [String:Date]()
+    private var newWordHasText = false
+    private var translationHasText = false
+    private var completed: (()->Void)?
+    
+    // MARK: - Initializer
+    
+    init(selectedLanguage: String?) {
+        super.init(nibName: nil, bundle: nil)
+        self.selectedLanguage = selectedLanguage
+        hideKeyboardWhenTappedAround()
+        setUpUI()
+        setUpConstraints()
+        setUpInterfaceStyleUI()
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    // MARK: - Private Methods
+    
+    private func setUpUI() {
+        setGradientBackground(view: view)
+        view.addSubview(backButton)
+        view.addSubview(addNewWordLabel)
+        view.addSubview(newWordTextField)
+        view.addSubview(translationTextField)
+        view.addSubview(addButton)
+    }
+    
+    private func setUpConstraints() {
+        backButton.topAnchor.constraint(equalTo: view.topAnchor, constant: 16).isActive = true
+        backButton.leadingAnchor.constraint(equalTo: view.leadingAnchor, constant: 16).isActive = true
+        
+        addNewWordLabel.centerXAnchor.constraint(equalTo: view.centerXAnchor).isActive = true
+        addNewWordLabel.topAnchor.constraint(equalTo: backButton.bottomAnchor, constant: 16).isActive = true
+        
+        newWordTextField.topAnchor.constraint(equalTo: addNewWordLabel.bottomAnchor, constant: 16).isActive = true
+        newWordTextField.leadingAnchor.constraint(equalTo: view.leadingAnchor, constant: 24).isActive = true
+        newWordTextField.trailingAnchor.constraint(equalTo: view.trailingAnchor, constant: -24).isActive = true
+        
+        translationTextField.topAnchor.constraint(equalTo: newWordTextField.bottomAnchor, constant: 16).isActive = true
+        translationTextField.leadingAnchor.constraint(equalTo: newWordTextField.leadingAnchor).isActive = true
+        translationTextField.trailingAnchor.constraint(equalTo: newWordTextField.trailingAnchor).isActive = true
+        
+        addButton.topAnchor.constraint(equalTo: translationTextField.bottomAnchor, constant: 24).isActive = true
+        addButton.leadingAnchor.constraint(equalTo: translationTextField.leadingAnchor).isActive = true
+        addButton.trailingAnchor.constraint(equalTo: translationTextField.trailingAnchor).isActive = true
+    }
+    
+    private func setUpInterfaceStyleUI() {
+        switch traitCollection.userInterfaceStyle {
+        case .light, .unspecified:
+            addNewWordLabel.textColor = .black
+            
+            newWordTextField.backgroundColor = .white
+            newWordTextField.textColor = .black
+            
+            translationTextField.backgroundColor = .white
+            translationTextField.textColor = .black
+        case .dark:
+            addNewWordLabel.textColor = .white
+            
+            newWordTextField.backgroundColor = .black
+            newWordTextField.textColor = .white
+            
+            translationTextField.backgroundColor = .black
+            translationTextField.textColor = .white
+        }
+    }
+    
+    private func addButtonIsEnabled(_ isEnabled: Bool) {
+        if isEnabled {
+            UIView.animate(withDuration: 0.3) { [weak self] in
+                self?.addButton.backgroundColor = BackgroundColor.mediumSpringBud
+            }
+            addButton.isEnabled = isEnabled
+        } else {
+            UIView.animate(withDuration: 0.3) { [weak self] in
+                self?.addButton.backgroundColor = UIColor(red: 207/255, green: 207/255, blue: 205/255, alpha: 0.4)
+            }
+            addButton.isEnabled = isEnabled
+        }
+    }
+    
+    private func wordAddedNotification() {
+        NotificationCenter.default.post(name: NSNotification.Name(rawValue: "wordAdded"), object: nil)
+    }
+    
+    private func resetConfigs() {
+        newWordTextField.text = ""
+        translationTextField.text = ""
+        newWordHasText = false
+        translationHasText = false
+        addButtonIsEnabled(false)
+    }
+    
+    @objc private func didTapBackButton() {
+        completed?()
+        dismiss(animated: true)
+    }
+    
+    @objc private func addNewWordTapped() {
+        guard let language = selectedLanguage,
+              let word = newWordTextField.text,
+              let translatedWord = translationTextField.text else { return }
+        
+        let languageVocabProgressKey = "\(language)Progress"
+        let languageVocabDateAddedKey = "\(language)DateAdded"
+        
+        if let vocabs = UserDefaults.standard.dictionary(forKey: language) as? [String:String] {
+            vocabularies = vocabs
+        }
+        
+        if let vocabsSuccess = UserDefaults.standard.dictionary(forKey: languageVocabProgressKey) as? [String:Float] {
+            vocabulariesSuccessRates = vocabsSuccess
+        }
+        
+        if let vocabsDates = UserDefaults.standard.dictionary(forKey: languageVocabDateAddedKey) as? [String:Date] {
+            vocabulariesAddDates = vocabsDates
+        }
+        
+        vocabularies[word] = translatedWord
+        vocabulariesSuccessRates[word] = 100
+        vocabulariesAddDates[word] = Date()
+        
+        UserDefaults.standard.set(vocabularies, forKey: language)
+        UserDefaults.standard.set(vocabulariesSuccessRates, forKey: languageVocabProgressKey)
+        UserDefaults.standard.set(vocabulariesAddDates, forKey: languageVocabDateAddedKey)
+        
+        resetConfigs()
+        wordAddedNotification()
+        showToast(message: NSLocalizedString("New word added", comment: "New word added"), yCoord: 340.0)
+    }
+    
+    @objc private func textFieldChanged(_ sender: UITextField) {
+        let hasText = !(sender.text == nil || sender.text == "")
+        
+        if sender === newWordTextField {
+            newWordHasText = hasText
+        }
+        
+        if sender === translationTextField {
+            translationHasText = hasText
+        }
+        
+        addButtonIsEnabled(newWordHasText && translationHasText)
+    }
+}
diff --git a/VocabularyTrainer/Base.lproj/Main.storyboard b/VocabularyTrainer/Base.lproj/Main.storyboard
index 5cc90ca..f2a8ae9 100644
--- a/VocabularyTrainer/Base.lproj/Main.storyboard
+++ b/VocabularyTrainer/Base.lproj/Main.storyboard
@@ -19,6 +19,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Your languages" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rNH-Y6-8Zv">
+                                <rect key="frame" x="108" y="116" width="198.5" height="40"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="40" id="6Ip-Gd-olA"/>
                                 </constraints>
@@ -281,11 +282,11 @@
                                 <fontDescription key="fontDescription" type="system" pointSize="25"/>
                                 <state key="normal" title="New word"/>
                                 <connections>
-                                    <segue destination="QnJ-3n-hBa" kind="show" identifier="showAddWordSegue" id="XeU-GX-HbZ"/>
+                                    <action selector="newWordButtonTapped:" destination="t9m-aZ-wFG" eventType="touchUpInside" id="oQS-13-E1z"/>
                                 </connections>
                             </button>
                             <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="J69-hW-zYM">
-                                <rect key="frame" x="20" y="394" width="374" height="20.5"/>
+                                <rect key="frame" x="20" y="433" width="374" height="20.5"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
@@ -411,83 +412,6 @@
             </objects>
             <point key="canvasLocation" x="136.23188405797103" y="808.92857142857144"/>
         </scene>
-        <!--Add New Word View Controller-->
-        <scene sceneID="1W7-QQ-mfd">
-            <objects>
-                <viewController id="QnJ-3n-hBa" customClass="AddNewWordViewController" customModule="VocabularyTrainer" customModuleProvider="target" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="kAh-pM-yJJ">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="838"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="new word" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="FUL-dg-T2m">
-                                <rect key="frame" x="32" y="184" width="350" height="48"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="32"/>
-                                <textInputTraits key="textInputTraits" autocorrectionType="no" spellCheckingType="no" smartQuotesType="no"/>
-                            </textField>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Add new word" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Yd9-So-Lvv">
-                                <rect key="frame" x="115" y="116" width="184" height="36"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="30"/>
-                                <nil key="textColor"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="mxH-Yy-qRL">
-                                <rect key="frame" x="16" y="64" width="61" height="36"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="36" id="EiQ-lI-r7g"/>
-                                </constraints>
-                                <fontDescription key="fontDescription" type="system" pointSize="20"/>
-                                <state key="normal" title="&lt; Back"/>
-                                <connections>
-                                    <action selector="backButtonTapped:" destination="QnJ-3n-hBa" eventType="touchUpInside" id="1q2-e9-qPR"/>
-                                </connections>
-                            </button>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="TjA-tq-vO0">
-                                <rect key="frame" x="21" y="328" width="361" height="42"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="42" id="9aY-OA-WzN"/>
-                                </constraints>
-                                <fontDescription key="fontDescription" type="system" pointSize="25"/>
-                                <state key="normal" title="Add"/>
-                                <connections>
-                                    <action selector="addNewWordTapped:" destination="QnJ-3n-hBa" eventType="touchUpInside" id="F1L-r3-Vx3"/>
-                                </connections>
-                            </button>
-                            <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="translation" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="oJh-SC-LnC">
-                                <rect key="frame" x="32" y="248" width="350" height="48"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="32"/>
-                                <textInputTraits key="textInputTraits" autocorrectionType="no" spellCheckingType="no"/>
-                            </textField>
-                        </subviews>
-                        <viewLayoutGuide key="safeArea" id="1d0-wz-GFz"/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                        <constraints>
-                            <constraint firstItem="mxH-Yy-qRL" firstAttribute="leading" secondItem="1d0-wz-GFz" secondAttribute="leading" constant="16" id="60I-qz-rVN"/>
-                            <constraint firstItem="FUL-dg-T2m" firstAttribute="leading" secondItem="1d0-wz-GFz" secondAttribute="leading" constant="32" id="Bun-WG-Rei"/>
-                            <constraint firstItem="Yd9-So-Lvv" firstAttribute="top" secondItem="mxH-Yy-qRL" secondAttribute="bottom" constant="16" id="CDa-Jg-wbb"/>
-                            <constraint firstItem="FUL-dg-T2m" firstAttribute="top" secondItem="Yd9-So-Lvv" secondAttribute="bottom" constant="32" id="IF0-lF-bQ3"/>
-                            <constraint firstItem="mxH-Yy-qRL" firstAttribute="top" secondItem="1d0-wz-GFz" secondAttribute="top" constant="16" id="JHa-Xe-qZG"/>
-                            <constraint firstItem="Yd9-So-Lvv" firstAttribute="centerX" secondItem="kAh-pM-yJJ" secondAttribute="centerX" id="RgI-hD-wRC"/>
-                            <constraint firstItem="oJh-SC-LnC" firstAttribute="top" secondItem="FUL-dg-T2m" secondAttribute="bottom" constant="16" id="cNH-um-aXp"/>
-                            <constraint firstItem="TjA-tq-vO0" firstAttribute="top" secondItem="oJh-SC-LnC" secondAttribute="bottom" constant="32" id="gCH-iu-aU2"/>
-                            <constraint firstItem="1d0-wz-GFz" firstAttribute="trailing" secondItem="TjA-tq-vO0" secondAttribute="trailing" constant="32" id="hEf-3a-RcP"/>
-                            <constraint firstItem="oJh-SC-LnC" firstAttribute="leading" secondItem="1d0-wz-GFz" secondAttribute="leading" constant="32" id="hUV-dd-TO9"/>
-                            <constraint firstItem="TjA-tq-vO0" firstAttribute="leading" secondItem="1d0-wz-GFz" secondAttribute="leading" constant="21" id="sra-ej-Qsk"/>
-                            <constraint firstItem="1d0-wz-GFz" firstAttribute="trailing" secondItem="FUL-dg-T2m" secondAttribute="trailing" constant="32" id="u0G-iP-TGc"/>
-                            <constraint firstItem="1d0-wz-GFz" firstAttribute="trailing" secondItem="oJh-SC-LnC" secondAttribute="trailing" constant="32" id="yBE-hh-OB0"/>
-                        </constraints>
-                    </view>
-                    <connections>
-                        <outlet property="addButton" destination="TjA-tq-vO0" id="0ny-Fi-Sqo"/>
-                        <outlet property="addNewWordHeader" destination="Yd9-So-Lvv" id="KoG-dD-Owg"/>
-                        <outlet property="backButton" destination="mxH-Yy-qRL" id="XQj-vG-UwX"/>
-                        <outlet property="newWordTextField" destination="FUL-dg-T2m" id="82m-GT-jid"/>
-                        <outlet property="translationTextField" destination="oJh-SC-LnC" id="AVS-Ya-on0"/>
-                    </connections>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="fgA-Sq-yjN" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="894" y="809"/>
-        </scene>
         <!--Training View Controller-->
         <scene sceneID="x1h-n9-ts3">
             <objects>
diff --git a/VocabularyTrainer/Helper.swift b/VocabularyTrainer/Helper.swift
index 3c473c6..765084a 100644
--- a/VocabularyTrainer/Helper.swift
+++ b/VocabularyTrainer/Helper.swift
@@ -11,7 +11,6 @@ import UIKit
 
 class SegueName {
   static let showLanguageSegue = "showLanguageSegue"
-  static let showAddWordSegue = "showAddWordSegue"
   static let showTrainingSegue = "showTrainingSegue"
 }
 
diff --git a/VocabularyTrainer/Language Screens/LanguageScreenViewController.swift b/VocabularyTrainer/Language Screens/LanguageScreenViewController.swift
index 1ca3b3b..225d93d 100644
--- a/VocabularyTrainer/Language Screens/LanguageScreenViewController.swift	
+++ b/VocabularyTrainer/Language Screens/LanguageScreenViewController.swift	
@@ -70,6 +70,15 @@ class LanguageScreenViewController: UIViewController, UISearchBarDelegate, MFMai
         setGradientBackground(view: view)
         loadDataAndUpdate()
         sortVocabulary(element: .word, isAscending: true)
+        wordAddedObserver()
+    }
+    
+    private func wordAddedObserver() {
+        NotificationCenter.default.addObserver(self, selector: #selector(reloadData), name: NSNotification.Name(rawValue: "wordAdded"), object: nil)
+    }
+    
+    @objc private func reloadData() {
+        loadDataAndUpdate()
     }
     
     @IBAction func backButtonTapped(_ sender: Any) {
@@ -119,6 +128,11 @@ class LanguageScreenViewController: UIViewController, UISearchBarDelegate, MFMai
         present(alert, animated: true, completion: nil)
     }
     
+    @IBAction func newWordButtonTapped(_ sender: Any) {
+        let viewController = AddNewWordViewController(selectedLanguage: selectedLanguage)
+        self.present(viewController, animated: true)
+    }
+    
     @IBAction func sortButtonTapped(_ sender: UIButton) {
         
         let configuration = UIImage.SymbolConfiguration(textStyle: .title1, scale: .large)
@@ -177,17 +191,6 @@ class LanguageScreenViewController: UIViewController, UISearchBarDelegate, MFMai
         return vocabulary
     }
     
-    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
-        if segue.identifier == SegueName.showAddWordSegue {
-            guard let secondVC = segue.destination as? AddNewWordViewController else { print("no segue found"); return}
-            secondVC.selectedLanguage = selectedLanguage
-            secondVC.completed = { [weak self] in
-                self?.loadDataAndUpdate()
-            }
-        }
-        
-    }
-    
     func searchBar(_ searchBar: UISearchBar, textDidChange searchText: String) {
         if searchBar.text == nil || searchBar.text == "" {
             isSearching = false

From 144330b34869b8c3c3a4956ba439245c6bf745fe Mon Sep 17 00:00:00 2001
From: Mariana Brasil <marilemosbrasil@gmail.com>
Date: Mon, 24 Oct 2022 23:00:07 -0300
Subject: [PATCH 2/9] Removing combine import and organizing the code

---
 VocabularyTrainer/AddWord/AddNewWordViewController.swift | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/VocabularyTrainer/AddWord/AddNewWordViewController.swift b/VocabularyTrainer/AddWord/AddNewWordViewController.swift
index 89e2181..b7253a8 100644
--- a/VocabularyTrainer/AddWord/AddNewWordViewController.swift
+++ b/VocabularyTrainer/AddWord/AddNewWordViewController.swift
@@ -7,7 +7,6 @@
 //
 
 import UIKit
-import Combine
 
 final class AddNewWordViewController: UIViewController {
     
@@ -38,13 +37,13 @@ final class AddNewWordViewController: UIViewController {
         let textField = UITextField()
         textField.placeholder = NSLocalizedString("New word", comment: "new word")
         textField.font = UIFont.systemFont(ofSize: 32)
-        textField.translatesAutoresizingMaskIntoConstraints = false
         textField.backgroundColor = .white
         textField.layer.cornerRadius = 5.0
         textField.layer.sublayerTransform = CATransform3DMakeTranslation(8, 0, 0)
         textField.autocapitalizationType = .none
         textField.autocorrectionType = .no
         textField.addTarget(self, action: #selector(textFieldChanged), for: .editingChanged)
+        textField.translatesAutoresizingMaskIntoConstraints = false
         return textField
     }()
     
@@ -52,13 +51,13 @@ final class AddNewWordViewController: UIViewController {
         let textField = UITextField()
         textField.placeholder = NSLocalizedString("translation", comment: "translation")
         textField.font = UIFont.systemFont(ofSize: 32)
-        textField.translatesAutoresizingMaskIntoConstraints = false
         textField.backgroundColor = .white
         textField.layer.cornerRadius = 5.0
         textField.layer.sublayerTransform = CATransform3DMakeTranslation(8, 0, 0)
         textField.autocapitalizationType = .none
         textField.autocorrectionType = .no
         textField.addTarget(self, action: #selector(textFieldChanged), for: .editingChanged)
+        textField.translatesAutoresizingMaskIntoConstraints = false
         return textField
     }()
     

From eb39eddc615663d6235e44b38e384e9c5c14c095 Mon Sep 17 00:00:00 2001
From: Mariana Brasil <marilemosbrasil@gmail.com>
Date: Wed, 26 Oct 2022 10:56:12 -0300
Subject: [PATCH 3/9] Adding the NSNotification.Name to an extension

---
 VocabularyTrainer/AddWord/AddNewWordViewController.swift | 2 +-
 VocabularyTrainer/Extensions.swift                       | 9 +++++++++
 .../Language Screens/LanguageScreenViewController.swift  | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/VocabularyTrainer/AddWord/AddNewWordViewController.swift b/VocabularyTrainer/AddWord/AddNewWordViewController.swift
index b7253a8..5008a10 100644
--- a/VocabularyTrainer/AddWord/AddNewWordViewController.swift
+++ b/VocabularyTrainer/AddWord/AddNewWordViewController.swift
@@ -164,7 +164,7 @@ final class AddNewWordViewController: UIViewController {
     }
     
     private func wordAddedNotification() {
-        NotificationCenter.default.post(name: NSNotification.Name(rawValue: "wordAdded"), object: nil)
+        NotificationCenter.default.post(name: .wordAdded, object: nil)
     }
     
     private func resetConfigs() {
diff --git a/VocabularyTrainer/Extensions.swift b/VocabularyTrainer/Extensions.swift
index 079efb5..c00947e 100644
--- a/VocabularyTrainer/Extensions.swift
+++ b/VocabularyTrainer/Extensions.swift
@@ -42,3 +42,12 @@ extension UIViewController {
     })
   }
 }
+
+extension Notification.Name {
+    static let wordAdded = Notification.Name("wordAdded")
+}
+
+@objc extension NSNotification {
+    public static let wordAdded = Notification.Name.wordAdded
+}
+
diff --git a/VocabularyTrainer/Language Screens/LanguageScreenViewController.swift b/VocabularyTrainer/Language Screens/LanguageScreenViewController.swift
index 225d93d..ab39cb2 100644
--- a/VocabularyTrainer/Language Screens/LanguageScreenViewController.swift	
+++ b/VocabularyTrainer/Language Screens/LanguageScreenViewController.swift	
@@ -74,7 +74,7 @@ class LanguageScreenViewController: UIViewController, UISearchBarDelegate, MFMai
     }
     
     private func wordAddedObserver() {
-        NotificationCenter.default.addObserver(self, selector: #selector(reloadData), name: NSNotification.Name(rawValue: "wordAdded"), object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(reloadData), name: .wordAdded, object: nil)
     }
     
     @objc private func reloadData() {

From cbaec7cd1385c4d3872256ae39fd0b147bab1a1b Mon Sep 17 00:00:00 2001
From: Mariana Brasil <marilemosbrasil@gmail.com>
Date: Wed, 26 Oct 2022 10:57:18 -0300
Subject: [PATCH 4/9] Removing extra extension that wasn't being used

---
 VocabularyTrainer/Extensions.swift | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/VocabularyTrainer/Extensions.swift b/VocabularyTrainer/Extensions.swift
index c00947e..4753ff2 100644
--- a/VocabularyTrainer/Extensions.swift
+++ b/VocabularyTrainer/Extensions.swift
@@ -47,7 +47,4 @@ extension Notification.Name {
     static let wordAdded = Notification.Name("wordAdded")
 }
 
-@objc extension NSNotification {
-    public static let wordAdded = Notification.Name.wordAdded
-}
 

From a9debc2b1ce7b7e928796afc5d19e556dce48a58 Mon Sep 17 00:00:00 2001
From: Mariana Brasil <marilemosbrasil@gmail.com>
Date: Wed, 26 Oct 2022 19:30:18 -0300
Subject: [PATCH 5/9] Added PT-BR version

---
 VocabularyTrainer.xcodeproj/project.pbxproj   |   7 +
 .../TrainingViewController.swift              |   8 +-
 .../pt-BR.lproj/Localizable.strings           |  67 +++++++++
 VocabularyTrainer/pt-BR.lproj/Main.strings    |  84 +++++++++++
 VocabularyTrainer/pt-BR.lproj/pp.html         | 137 ++++++++++++++++++
 5 files changed, 299 insertions(+), 4 deletions(-)
 create mode 100644 VocabularyTrainer/pt-BR.lproj/Localizable.strings
 create mode 100644 VocabularyTrainer/pt-BR.lproj/Main.strings
 create mode 100644 VocabularyTrainer/pt-BR.lproj/pp.html

diff --git a/VocabularyTrainer.xcodeproj/project.pbxproj b/VocabularyTrainer.xcodeproj/project.pbxproj
index 5561889..c426325 100644
--- a/VocabularyTrainer.xcodeproj/project.pbxproj
+++ b/VocabularyTrainer.xcodeproj/project.pbxproj
@@ -46,6 +46,9 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		B31F83DA2909BB99005FB514 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/Main.strings"; sourceTree = "<group>"; };
+		B31F83DB2909BB99005FB514 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/Localizable.strings"; sourceTree = "<group>"; };
+		B31F83DC2909BB99005FB514 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = "pt-BR"; path = "pt-BR.lproj/pp.html"; sourceTree = "<group>"; };
 		B3657DFC290740D8000D76C8 /* AddNewWordViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddNewWordViewController.swift; sourceTree = "<group>"; };
 		CE0012FE2243F21C002F86DE /* Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Extensions.swift; sourceTree = "<group>"; };
 		CE05F621229F17830097E3BB /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Main.strings; sourceTree = "<group>"; };
@@ -280,6 +283,7 @@
 				Base,
 				de,
 				nl,
+				"pt-BR",
 			);
 			mainGroup = CE86C53F2235AE20008A5B73;
 			productRefGroup = CE86C5492235AE20008A5B73 /* Products */;
@@ -380,6 +384,7 @@
 				CE05F623229F17AF0097E3BB /* en */,
 				CE05F625229F17C40097E3BB /* de */,
 				CE92ABFA28E97CAF00FE2EBC /* nl */,
+				B31F83DB2909BB99005FB514 /* pt-BR */,
 			);
 			name = Localizable.strings;
 			sourceTree = "<group>";
@@ -389,6 +394,7 @@
 			children = (
 				CE86C5502235AE20008A5B73 /* Base */,
 				CE05F621229F17830097E3BB /* de */,
+				B31F83DA2909BB99005FB514 /* pt-BR */,
 			);
 			name = Main.storyboard;
 			sourceTree = "<group>";
@@ -399,6 +405,7 @@
 				CECD6343235E54350060911F /* Base */,
 				CECD6346235E54420060911F /* de */,
 				CE92ABF928E97C5600FE2EBC /* nl */,
+				B31F83DC2909BB99005FB514 /* pt-BR */,
 			);
 			name = pp.html;
 			sourceTree = "<group>";
diff --git a/VocabularyTrainer/TrainingViewController.swift b/VocabularyTrainer/TrainingViewController.swift
index 9678e99..5cae71d 100644
--- a/VocabularyTrainer/TrainingViewController.swift
+++ b/VocabularyTrainer/TrainingViewController.swift
@@ -33,8 +33,8 @@ class TrainingViewController: UIViewController {
     currentTrainingHeader.numberOfLines = 0;
     currentTrainingHeader.lineBreakMode = .byWordWrapping
     currentTrainingHeader.text = """
-    Training:
-    \(selectedLanguage ?? "no language selected")
+    \(NSLocalizedString("Training:", comment: "Training:"))
+    \(selectedLanguage ?? NSLocalizedString("No language selected", comment: "No language selected"))
     """
     
     styleButtons()
@@ -160,7 +160,7 @@ class TrainingViewController: UIViewController {
           self.checkInputButton.isHidden = true
           self.takeALookButton.isHidden = true
         })
-        showToast(message: "That's right! 🤠", yCoord: 400.0)
+        showToast(message: NSLocalizedString("That's right! 🤠", comment: "That's right! 🤠"), yCoord: 400.0)
         answerInput.text = solution
         nextButton.setTitle("Next word", for: .normal)
       } else {
@@ -172,7 +172,7 @@ class TrainingViewController: UIViewController {
         UIView.animate(withDuration: 0.2, animations: {
           self.answerInput.backgroundColor = BackgroundColor.red
         })
-        showToast(message: "That's wrong 😕", yCoord: 400.0)
+        showToast(message: NSLocalizedString("That's wrong 😕", comment: "That's wrong 😕"), yCoord: 400.0)
       }
     }
   }
diff --git a/VocabularyTrainer/pt-BR.lproj/Localizable.strings b/VocabularyTrainer/pt-BR.lproj/Localizable.strings
new file mode 100644
index 0000000..86465da
--- /dev/null
+++ b/VocabularyTrainer/pt-BR.lproj/Localizable.strings
@@ -0,0 +1,67 @@
+/* 
+  File.strings
+  VocabularyTrainer
+
+  Created by skrr on 29.05.19.
+  Copyright © 2019 mic. All rights reserved.
+*/
+
+"Your Languages" = "Seus idiomas";
+"Currently there are no languages" = "Atualmente não há idiomas.\n\nVocê pode adicionar um novo idioma no botão abaixo.";
+"Currently there are no words" = "Atualmente não há palavras.\n\nVocê pode adicionar uma nova palavra no botão abaixo.";
+/*
+\n\nIf you have any language files uploaded to your iPhone via iTunes, hit the \"import all\" button.";*/
+"Add language" = "➕ Adicionar idioma";
+"Add new language" = "Adicionar novo idioma";
+"which language?" = "Idioma";
+"Add" = "➕ Adicionar";
+"< Back" = "↤ Voltar";
+"%d words" = "%d palavras";
+"%d word" = "%d palavra";
+"0 words" = "0 palavras";
+"My words" = "⚙️ Editar";
+"new Word" = "nova palavra";
+"translation" = "tradução";
+"Training" = "📖 Treinar";
+"Training:" = "Treinando:";
+"Delete Language" = "🗑 Excluir idioma";
+"export" = "💾 exportar idioma";
+"New word" = "Nova palavra";
+"Add new word" = "Adicionar nova palavra";
+"No words inside 🕵️‍♀️" = "Sem palavras adicionadas 🕵️‍♀️";
+"Delete %@" = "Deletar %@";
+"Deleting this language will delete all your saved words and your learning progress.\nDo you want to proceed?" = "Deletando esse idioma, você irá deletar todas as palavras salvas e o seu progresso de aprendizado.\nVocê gostaria de continuar?";
+"Cancel" = "Cancelar";
+"Delete" = "🗑 Deletar";
+"New word added" = "Nova palavra adicionada";
+"Change word`s probability" = "Alterar probabilidade da palavra aparecer";
+"Change word`s probability value. Higher value -> higher probability for word to appear.\nNew words start with 100." = "Alterar a probabilidade da palavra aparecer. Valores maiores significa que há maior probabilidade da palavra aparecer.\nNovas palavras começam com o valor 100.";
+"Edit:" = "🛠 Editar:";
+"Export successful:" = "Exportado com sucesso:";
+"Exported the following languages:" = "Exportado os seguintes idiomas:";
+"You may copy your file to your machine via iTunes:\n iPhone->Filesharing->Flippy->drag %@.csv into Finder" = "Você pode copiar o arquivo de idiomas para o seu computador pelo iTunes.\nAcesse: iPhone->Compartilhamento de Arquivos->Flippy->arraste %@.csv para uma pasta da sua preferência";
+"You may copy your file to your machine via iTunes:\n iPhone->Filesharing->Flippy->drag csv-files into Finder" = "Você pode copiar o arquivo para o seu computador pelo iTunes.\nAcesse: iPhone->Compartilhamento de Arquivos->Flippy->arraste csv-files para o Finder";
+"⤵ import" = "⤋ importar";
+"↑ export" = "⇪ exportar";
+"answer" = "resposta";
+"Check" = "Confirmar";
+"Take a look" = "Espiar";
+"Skip word" = "Pular palavra";
+"search for words" = "buscar palavras";
+"Importing language files into the app will overwrite any languages in your app with the same name as the csv-file.\n Do you want to proceed?" = "Os idiomas existentes no seu aparelho caso possuam o mesmo nome que os arquivos csv-file a serem importados serão sobrescritos.\n Você gostaria de continuar?";
+"There were not found any language files for your app.\nFor a template of a language file you may create a new language with some vocabulary inside this app and export it." = "Não foi encontrado qualquer arquivo de idioma para o seu app.\nPara ter o modelo do arquivo de idioma, você terá que criar um novo idioma com algumas palavras adicionadas dentro do app e exportar.";
+"No language files found" = "Nenhum arquivo de idioma foi encontrado";
+"👍 I was right" = "👍";
+"👎 I was wrong" = "👎";
+"Swipe left to edit word (edit its probability or delete it)" = "ℹ️ Arraste a palavra para a esquerda para editar.\nPalavras que estejam com uma barra vermelha maior, terá uma probabilidade maior de aparecer durante a prática.";
+"ℹ️ Add new words with the button below" = "ℹ️ Adicione novas palavras pelo botão abaixo.";
+"Importing language files" = "Importando arquivos de idiomas";
+"Close" = "Fechar";
+"About Flippy App" = "Sobre o Flippy";
+"No language selected" = "Nenhum idioma selecionado";
+"Please select a language to export first." = "Por favor, selecione um idioma primeiro para exportar.";
+"Please wait..." = "Por favor, aguarde...";
+"Edit word" = "✏️ Editar palavra";
+"Your progress and probability configuration for this word will be saved" = "Seu progresso e configuração de probabilidade para essa palavra não será alterado com essa mudança";
+"That's wrong 😕" = "Errado 😕";
+"That's right! 🤠" = "Acertou! 🤠";
diff --git a/VocabularyTrainer/pt-BR.lproj/Main.strings b/VocabularyTrainer/pt-BR.lproj/Main.strings
new file mode 100644
index 0000000..894bb30
--- /dev/null
+++ b/VocabularyTrainer/pt-BR.lproj/Main.strings
@@ -0,0 +1,84 @@
+
+/* Class = "UIButton"; normalTitle = "Take a look"; ObjectID = "1g5-hc-GXA"; */
+"1g5-hc-GXA.normalTitle" = "Espiar";
+
+/* Class = "UISearchBar"; placeholder = "search for words"; ObjectID = "4AL-Ff-pOI"; */
+"4AL-Ff-pOI.placeholder" = "buscar palavras";
+
+/* Class = "UILabel"; text = "Language"; ObjectID = "4x2-GA-oeg"; */
+"4x2-GA-oeg.text" = "Idioma";
+
+/* Class = "UITextField"; placeholder = "answer"; ObjectID = "53n-g1-uwW"; */
+"53n-g1-uwW.placeholder" = "resposta";
+
+/* Class = "UILabel"; text = "Training:\nTurkish"; ObjectID = "5Cu-DE-YK3"; */
+"5Cu-DE-YK3.text" = "Praticando:\nTurco";
+
+/* Class = "UILabel"; text = "köpek"; ObjectID = "5Gx-1I-CQE"; */
+"5Gx-1I-CQE.text" = "köpek";
+
+/* Class = "UIButton"; normalTitle = "👍"; ObjectID = "87J-6T-hDZ"; */
+"87J-6T-hDZ.normalTitle" = "👍";
+
+/* Class = "UIButton"; normalTitle = "⤴ export"; ObjectID = "8Cb-Nv-Z0p"; */
+"8Cb-Nv-Z0p.normalTitle" = "⤴ exportar";
+
+/* Class = "UIButton"; normalTitle = "Training"; ObjectID = "8uJ-dW-rui"; */
+"8uJ-dW-rui.normalTitle" = "Praticar";
+
+/* Class = "UIButton"; normalTitle = "New word"; ObjectID = "BUp-gp-Omw"; */
+"BUp-gp-Omw.normalTitle" = "Nova palavra";
+
+/* Class = "UILabel"; text = "Hund"; ObjectID = "Il2-HT-ikf"; */
+"Il2-HT-ikf.text" = "Hund";
+
+/* Class = "UILabel"; text = "Label"; ObjectID = "J69-hW-zYM"; */
+"J69-hW-zYM.text" = "Label";
+
+/* Class = "UIButton"; normalTitle = "< Back"; ObjectID = "Jhf-6U-f7J"; */
+"Jhf-6U-f7J.normalTitle" = "< Voltar";
+
+/* Class = "UILabel"; text = "Dutch"; ObjectID = "Kdj-qz-jtM"; */
+"Kdj-qz-jtM.text" = "Holandês";
+
+/* Class = "UIButton"; normalTitle = "Add language"; ObjectID = "Nrq-QQ-ihD"; */
+"Nrq-QQ-ihD.normalTitle" = "Adicionar Idioma";
+
+/* Class = "UIButton"; normalTitle = "Check"; ObjectID = "SJQ-jN-5Xm"; */
+"SJQ-jN-5Xm.normalTitle" = "Confirmar";
+
+/* Class = "UIButton"; normalTitle = "About FlippyApp"; ObjectID = "WIf-kg-T6U"; */
+"WIf-kg-T6U.normalTitle" = "Sobre FlippyApp";
+
+/* Class = "UIButton"; normalTitle = "⤵ import"; ObjectID = "Wfy-tB-0pH"; */
+"Wfy-tB-0pH.normalTitle" = "⤵ importar";
+
+/* Class = "UILabel"; text = "dateAddedLabel"; ObjectID = "fnA-3F-RPz"; */
+"fnA-3F-RPz.text" = "dateAddedLabel";
+
+/* Class = "UIButton"; normalTitle = "My words"; ObjectID = "iBg-bb-bgl"; */
+"iBg-bb-bgl.normalTitle" = "Minhas palavras";
+
+/* Class = "UIButton"; normalTitle = "👎"; ObjectID = "lQT-3b-eN5"; */
+"lQT-3b-eN5.normalTitle" = "👎";
+
+/* Class = "UILabel"; text = "köpek"; ObjectID = "o3T-rB-i7W"; */
+"o3T-rB-i7W.text" = "köpek";
+
+/* Class = "UIButton"; normalTitle = "< Back"; ObjectID = "rDw-Te-IUC"; */
+"rDw-Te-IUC.normalTitle" = "< Voltar";
+
+/* Class = "UILabel"; text = "Your languages"; ObjectID = "rNH-Y6-8Zv"; */
+"rNH-Y6-8Zv.text" = "Seus idiomas";
+
+/* Class = "UIButton"; normalTitle = "Button"; ObjectID = "sIk-MR-VHX"; */
+"sIk-MR-VHX.normalTitle" = "Botão";
+
+/* Class = "UILabel"; text = "124 words"; ObjectID = "tDl-JN-tww"; */
+"tDl-JN-tww.text" = "124 palavras";
+
+/* Class = "UIButton"; normalTitle = "Skip word"; ObjectID = "vAt-0V-rIb"; */
+"vAt-0V-rIb.normalTitle" = "Pular palavra";
+
+/* Class = "UIButton"; normalTitle = "Delete Language"; ObjectID = "zUX-sC-O0i"; */
+"zUX-sC-O0i.normalTitle" = "Excluir idioma";
diff --git a/VocabularyTrainer/pt-BR.lproj/pp.html b/VocabularyTrainer/pt-BR.lproj/pp.html
new file mode 100644
index 0000000..3b4fdbf
--- /dev/null
+++ b/VocabularyTrainer/pt-BR.lproj/pp.html
@@ -0,0 +1,137 @@
+<!DOCTYPE html>
+<html>
+<head>
+
+<meta charset="UTF-8">
+
+</head>
+<body style="font-size: 20pt;">
+  
+<h1>Política de Privacidade</h1>
+
+
+<p>Data efetiva: 07 de Janeiro de 2020</p>
+
+
+<p>Michael Steudter (""nós" ou "nosso"") opera a aplicação móvel FlippyLearn (doravante denominado como "Serviço").</p>
+
+<p>Esta página informa-o das nossas políticas relativas à recolha, utilização, e divulgação de dados pessoais quando utiliza o nosso Serviço e as escolhas que tem associadas a esses dados. A Política de Privacidade para FlippyLearn foi criada com a ajuda de <a href="https://www.termsfeed.com/">TermsFeed</a>.</p>
+
+<p>Utilizamos os seus dados para fornecer e melhorar o Serviço. Ao utilizar o Serviço, concorda com a recolha e utilização de informações de acordo com esta política. Salvo definição em contrário na presente Política de Privacidade, os termos utilizados na presente Política de Privacidade têm os mesmos significados que nos nossos Termos e Condições.</p>
+
+<h2>Definições</h2>
+<ul>
+    <li>
+        <p><strong>Serviço</strong></p>
+                <p>Serviço é o aplicativo móvel FlippyLearn operado por Michael Steudter</p>
+            </li>
+    <li>
+        <p><strong>Dados Pessoais</strong></p>
+        <p>Dados Pessoais significam dados sobre um indivíduo vivo que pode ser identificado a partir desses dados (ou dessas e outras informações em nossa posse ou que possam vir a estar em nossa posse).</p>
+    </li>
+    <li>
+        <p><strong>Dados de Utilização</strong></p>
+        <p>Os Dados de Utilização são dados recolhidos automaticamente ou gerados pela utilização do Serviço ou da própria infra-estrutura do Serviço (por exemplo, a duração de uma visita à página).</p>
+    </li>
+    <li>
+        <p><strong>Cookies</strong></p>
+        <p>Os cookies são arquivos pequenos armazenados no seu dispositivo (computador ou dispositivo móvel).</p>
+    </li>
+</ul>
+
+<h2>Coleta e Uso de Informações</h2>
+<p>Coletamos diversos tipos diferentes de informação para vários fins a fim de fornecer e melhorar o nosso Serviço ao cliente.</p>
+
+<h3>Tipos de Dados Coletados</h3>
+
+<h4>Dados Pessoais</h4>
+<p>Ao utilizar o nosso Serviço, podemos pedir-lhe que nos forneça certas informações pessoalmente identificáveis que podem ser utilizadas para o contactar ou identificar ("Dados Pessoais"). As informações pessoalmente identificáveis podem incluir, mas não estão limitadas a:</p>
+
+<ul>
+<li>Cookies e Dados de Utilização</li>
+</ul>
+
+<h4>Dados de Utilização</h4>
+
+<p>Ao acessar o Serviço por ou através de um dispositivo móvel, podemos coletar certas informações automaticamente, incluindo, mas não se limitando a, o tipo de dispositivo móvel que utiliza, o seu ID único do dispositivo móvel, o endereço IP do seu dispositivo móvel, o seu sistema operativo móvel, o tipo de navegador de Internet móvel que utiliza, identificadores únicos do dispositivo e outros dados de diagnóstico ("Dados de Utilização").</p>
+
+<h4>Rastreio &amp; Dados de Cookies</h4>
+<p>Utilizamos cookies e tecnologias de rastreio semelhantes para rastrear a actividade no nosso Serviço e possuímos certas informações.</p>
+<p>Os cookies são arquivos com uma pequena quantidade de dados que podem incluir um identificador anônimo único. Os cookies são enviados para o seu navegador a partir de um website e armazenados no seu dispositivo. Outras tecnologias de rastreio também são utilizadas, tais como beacons, tags e scripts para coletar e rastrear informações e para melhorar e analisar o nosso Serviço.</p>
+<p>Pode instruir o seu navegador a recusar todos os cookies ou a indicar quando um cookie está a ser enviado. No entanto, se não aceitar cookies, poderá não ser possível utilizar algumas partes do nosso Serviço.</p>
+<p>Exemplos de Cookies que utilizamos:</p>
+<ul>
+    <li><strong>Cookies de Sessão.</strong> Utilizamos os Cookies de Sessão para operar o nosso Serviço.</li>
+    <li><strong>Cookies de Preferência.</strong> Utilizamos Cookies de Preferência para lembrar as suas preferências e várias configurações.
+</li>
+    <li><strong>Cookies de Segurança.</strong> Utilizamos Cookies de Segurança para fins de segurança.</li>
+</ul>
+
+<h2>Utilização de Dados</h2>
+    
+<p>FlippyLearn utiliza os dados recolhidos para vários fins:</p>
+<ul>
+    <li>Prestar e manter o Serviço</li>
+    <li>Para o notificar de alterações ao nosso Serviço</li>
+    <li>Para lhe permitir participar em funcionalidades interativas do nosso Serviço quando assim o desejar</li>
+    <li>Para prestar assistência e suporte ao cliente</li>
+    <li>Fornecer análises ou informações valiosas para que possamos melhorar o Serviço</li>
+    <li>Para monitorizar a utilização do Serviço.</li>
+    <li>Detectar, prevenir e abordar questões técnicas</li>
+</ul>
+
+<h2>Transferência de Dados</h2>
+<p>As suas informações, incluindo Dados Pessoais, podem ser transferidas para - e mantidas em - computadores localizados fora do seu estado, província, país ou outra jurisdição governamental onde as leis de protecção de dados possam ser diferentes das da sua jurisdição.</p>
+<p>Se estiver localizado fora da Alemanha e optar por nos fornecer informações, note que transferimos os dados, incluindo Dados Pessoais, para a Alemanha e processamo-los lá.</p>
+<p>O seu consentimento para esta Política de Privacidade seguida pelo envio de tais informações representa o seu consentimento para essa transferência.</p>
+<p>A FlippyLearn tomará todas as medidas razoavelmente necessárias para assegurar que os seus dados sejam tratados de forma segura e em conformidade com a presente Política de Privacidade e nenhuma transferência dos seus Dados Pessoais terá lugar para uma organização ou um país, a menos que existam controles adequados, incluindo a segurança dos seus dados e outras informações pessoais.</p>
+
+<h2>Divulgação de Dados</h2>
+
+<h3>Requisitos Legais</h3>
+<p>FlippyLearn pode revelar os seus Dados Pessoais na crença de boa fé de que tal ação é necessária:</p>
+<ul>
+    <li>Cumprir uma obrigação legal</li>
+    <li>Para proteger e defender os direitos ou propriedade da FlippyLearn</li>
+    <li>Para prevenir ou investigar possíveis infracções relacionadas com o Serviço</li>
+    <li>Para proteger a segurança pessoal dos utilizadores do Serviço ou do público</li>
+    <li>Para proteger contra a responsabilidade legal</li>
+</ul>
+
+<p>Como cidadão europeu, sob GDPR, tem certos direitos individuais. Pode saber mais sobre estes guias no <a href="https://termsfeed.com/blog/gdpr/#Individual_Rights_Under_the_GDPR">Guia do GDPR</a>.</p>
+
+<h2>Segurança dos Dados</h2>
+<p>A segurança dos seus dados é importante para nós, mas lembre-se que nenhum método de transmissão através da Internet ou método de armazenamento eletrônico é 100% seguro. Embora nos esforcemos por utilizar meios comercialmente aceitáveis para proteger os seus Dados Pessoais, não podemos garantir a sua segurança absoluta.</p>
+
+<h2>Prestadores de Serviços</h2>
+<p>Podemos empregar empresas e indivíduos terceiros para facilitar o nosso Serviço ("Prestadores de Serviços"), para fornecer o Serviço em nosso nome, para executar serviços relacionados com o Serviço ou para nos ajudar a analisar a forma como o nosso Serviço é utilizado.</p>
+<p>Estes terceiros têm acesso aos seus Dados Pessoais apenas para realizar estas tarefas em nosso nome e são obrigados a não os divulgar ou utilizar para qualquer outro fim.</p>
+
+ 
+
+
+<h2>Links para outros sites</h2>
+<p>O nosso Serviço pode conter links para outros sites que não são operados por nós. Se clicar num link de terceiros, será direcionado para o site desse terceiro. Aconselhamo-lo vivamente a rever a Política de Privacidade de cada site que visitar.</p>
+<p>Não temos controle sobre e não assumimos qualquer responsabilidade pelo conteúdo, políticas ou práticas de privacidade de quaisquer sites ou serviços de terceiros.</p>
+
+
+<h2>Privacidade das Crianças</h2>
+<p>O nosso Serviço não se dirige a menores de 18 anos ("Crianças").</p>
+<p>Não recolhemos intencionalmente informações pessoalmente identificáveis de ninguém com menos de 18 anos de idade. Se for pai ou tutor e estiver ciente de que o seu Filho nos forneceu Dados Pessoais, por favor contate-nos. Se tivermos conhecimento de que recolhemos dados pessoais de crianças sem verificação do consentimento dos pais, tomamos medidas para remover essa informação dos nossos servidores.</p>
+
+
+<h2>Alterações a esta Política de Privacidade</h2>
+<p>Podemos atualizar a nossa Política de Privacidade de tempos a tempos. Notificá-lo-emos de quaisquer alterações, colocando a nova Política de Privacidade nesta página.</p>
+<p>Ser-lhe-emos informados por e-mail e/ou um aviso em destaque no nosso Serviço, antes da mudança se tornar efetiva e atualizar a "data efetiva" no topo desta Política de Privacidade.</p>
+<p>É aconselhado rever periodicamente esta Política de Privacidade para quaisquer alterações. As alterações a esta Política de Privacidade são efetivas quando são publicadas nesta página.</p>
+
+
+<h2>Contate-nos</h2>
+<p>Se você tiver alguma dúvida sobre esta Política de Privacidade, entre em contato conosco:</p>
+<ul>
+        <li>Por email: contact@mic.st</li>
+          
+        </ul>
+
+</body>
+</html>

From b1f9f1a935be941a4e374cc6c5b568296cc8c3d3 Mon Sep 17 00:00:00 2001
From: Mariana Brasil <marilemosbrasil@gmail.com>
Date: Wed, 26 Oct 2022 20:22:15 -0300
Subject: [PATCH 6/9] Adding the pt-br files reference

---
 VocabularyTrainer.xcodeproj/project.pbxproj              | 9 ++++-----
 .../Home Screen/HomeScreenViewController.swift           | 2 ++
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/VocabularyTrainer.xcodeproj/project.pbxproj b/VocabularyTrainer.xcodeproj/project.pbxproj
index d0cdfd4..cae466b 100644
--- a/VocabularyTrainer.xcodeproj/project.pbxproj
+++ b/VocabularyTrainer.xcodeproj/project.pbxproj
@@ -49,6 +49,8 @@
 		18943A0929094F470017E1A2 /* LanguageScreenViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LanguageScreenViewController.swift; sourceTree = "<group>"; };
 		18943A0B2909726B0017E1A2 /* VocabularyCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VocabularyCell.swift; sourceTree = "<group>"; };
 		B3657DFC290740D8000D76C8 /* AddNewWordViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddNewWordViewController.swift; sourceTree = "<group>"; };
+		B3BBF4422909F64B004B2125 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = "pt-BR"; path = "pt-BR.lproj/pp.html"; sourceTree = "<group>"; };
+		B3BBF4432909F653004B2125 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		CE0012FE2243F21C002F86DE /* Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Extensions.swift; sourceTree = "<group>"; };
 		CE05F621229F17830097E3BB /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Main.strings; sourceTree = "<group>"; };
 		CE05F623229F17AF0097E3BB /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
@@ -332,8 +334,6 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				CE86C584223684D2008A5B73 /* AddNewWordViewController.swift in Sources */,
-				CE86C5802235C8AD008A5B73 /* LanguageScreenViewController.swift in Sources */,
 				B3657DFD290740D9000D76C8 /* AddNewWordViewController.swift in Sources */,
 				CE86C54E2235AE20008A5B73 /* HomeScreenViewController.swift in Sources */,
 				CE0012FF2243F21C002F86DE /* Extensions.swift in Sources */,
@@ -386,7 +386,7 @@
 				CE05F623229F17AF0097E3BB /* en */,
 				CE05F625229F17C40097E3BB /* de */,
 				CE92ABFA28E97CAF00FE2EBC /* nl */,
-				B31F83DB2909BB99005FB514 /* pt-BR */,
+				B3BBF4432909F653004B2125 /* pt-BR */,
 			);
 			name = Localizable.strings;
 			sourceTree = "<group>";
@@ -396,7 +396,6 @@
 			children = (
 				CE86C5502235AE20008A5B73 /* Base */,
 				CE05F621229F17830097E3BB /* de */,
-				B31F83DA2909BB99005FB514 /* pt-BR */,
 			);
 			name = Main.storyboard;
 			sourceTree = "<group>";
@@ -407,7 +406,7 @@
 				CECD6343235E54350060911F /* Base */,
 				CECD6346235E54420060911F /* de */,
 				CE92ABF928E97C5600FE2EBC /* nl */,
-				B31F83DC2909BB99005FB514 /* pt-BR */,
+				B3BBF4422909F64B004B2125 /* pt-BR */,
 			);
 			name = pp.html;
 			sourceTree = "<group>";
diff --git a/VocabularyTrainer/Home Screen/HomeScreenViewController.swift b/VocabularyTrainer/Home Screen/HomeScreenViewController.swift
index ef76550..3d33b81 100644
--- a/VocabularyTrainer/Home Screen/HomeScreenViewController.swift	
+++ b/VocabularyTrainer/Home Screen/HomeScreenViewController.swift	
@@ -465,6 +465,8 @@ class HomeScreenViewController: UIViewController, UITableViewDelegate, UITableVi
             ppUrl = URL(string: "https://mic.st/flippyLearn/pp_de.html")
         case "nl":
             ppUrl = URL(string: "https://mic.st/flippyLearn/pp_nl.html")
+        case "pt_BR":
+            ppUrl = URL(string: "https://mic.st/flippyLearn/pp_pt_br.html")
         default:
             ppUrl = URL(string: "https://mic.st/flippyLearn/pp_en.html")
         }

From 7b1559fb04294e0377f90923f06dfd1e67c1df77 Mon Sep 17 00:00:00 2001
From: Mariana Brasil <marilemosbrasil@gmail.com>
Date: Wed, 26 Oct 2022 20:28:56 -0300
Subject: [PATCH 7/9] Adding to eng localizable the new strings

---
 VocabularyTrainer/en.lproj/Localizable.strings | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/VocabularyTrainer/en.lproj/Localizable.strings b/VocabularyTrainer/en.lproj/Localizable.strings
index bd54a9c..a59a832 100644
--- a/VocabularyTrainer/en.lproj/Localizable.strings
+++ b/VocabularyTrainer/en.lproj/Localizable.strings
@@ -23,6 +23,7 @@
 "new Word" = "new word";
 "translation" = "translation";
 "Training" = "📖 Training";
+"Training:" = "Training:";
 "Delete Language" = "🗑 Delete Language";
 "export" = "💾 export language";
 "New word" = "New word";
@@ -63,3 +64,5 @@
 "Please wait..." = "Please wait...";
 "Edit word" = "✏️ Edit word";
 "Your progress and probability configuration for this word will be saved" = "Your progress and probability configuration for this word will be saved";
+"That's wrong 😕" = "That's wrong 😕";
+"That's right! 🤠" = "That's right! 🤠";

From 92873b04b72059f812b9ab0248f77246aa440c1d Mon Sep 17 00:00:00 2001
From: Mariana Brasil <marilemosbrasil@gmail.com>
Date: Wed, 26 Oct 2022 20:31:28 -0300
Subject: [PATCH 8/9] Added word import for eng and pt-br

---
 VocabularyTrainer/en.lproj/Localizable.strings    | 1 +
 VocabularyTrainer/pt-BR.lproj/Localizable.strings | 1 +
 2 files changed, 2 insertions(+)

diff --git a/VocabularyTrainer/en.lproj/Localizable.strings b/VocabularyTrainer/en.lproj/Localizable.strings
index a59a832..57c63e1 100644
--- a/VocabularyTrainer/en.lproj/Localizable.strings
+++ b/VocabularyTrainer/en.lproj/Localizable.strings
@@ -66,3 +66,4 @@
 "Your progress and probability configuration for this word will be saved" = "Your progress and probability configuration for this word will be saved";
 "That's wrong 😕" = "That's wrong 😕";
 "That's right! 🤠" = "That's right! 🤠";
+"Import" = "Import";
diff --git a/VocabularyTrainer/pt-BR.lproj/Localizable.strings b/VocabularyTrainer/pt-BR.lproj/Localizable.strings
index 86465da..dd221c4 100644
--- a/VocabularyTrainer/pt-BR.lproj/Localizable.strings
+++ b/VocabularyTrainer/pt-BR.lproj/Localizable.strings
@@ -65,3 +65,4 @@
 "Your progress and probability configuration for this word will be saved" = "Seu progresso e configuração de probabilidade para essa palavra não será alterado com essa mudança";
 "That's wrong 😕" = "Errado 😕";
 "That's right! 🤠" = "Acertou! 🤠";
+"Import" = "Importar";

From 4963009acda2785facc4e820b78daebfabbfdbb2 Mon Sep 17 00:00:00 2001
From: Mariana Brasil <69827434+nayushi@users.noreply.github.com>
Date: Wed, 26 Oct 2022 20:34:28 -0300
Subject: [PATCH 9/9] Delete
 VocabularyTrainer.xcodeproj/xcuserdata/marianabrasil.xcuserdatad directory

---
 .../xcdebugger/Breakpoints_v2.xcbkptlist           |  6 ------
 .../xcschemes/xcschememanagement.plist             | 14 --------------
 2 files changed, 20 deletions(-)
 delete mode 100644 VocabularyTrainer.xcodeproj/xcuserdata/marianabrasil.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
 delete mode 100644 VocabularyTrainer.xcodeproj/xcuserdata/marianabrasil.xcuserdatad/xcschemes/xcschememanagement.plist

diff --git a/VocabularyTrainer.xcodeproj/xcuserdata/marianabrasil.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/VocabularyTrainer.xcodeproj/xcuserdata/marianabrasil.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
deleted file mode 100644
index 6928609..0000000
--- a/VocabularyTrainer.xcodeproj/xcuserdata/marianabrasil.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Bucket
-   uuid = "E7F3329F-8654-4CCB-85C1-EDD5B2EB3159"
-   type = "1"
-   version = "2.0">
-</Bucket>
diff --git a/VocabularyTrainer.xcodeproj/xcuserdata/marianabrasil.xcuserdatad/xcschemes/xcschememanagement.plist b/VocabularyTrainer.xcodeproj/xcuserdata/marianabrasil.xcuserdatad/xcschemes/xcschememanagement.plist
deleted file mode 100644
index 1541d55..0000000
--- a/VocabularyTrainer.xcodeproj/xcuserdata/marianabrasil.xcuserdatad/xcschemes/xcschememanagement.plist
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>SchemeUserState</key>
-	<dict>
-		<key>VocabularyTrainer.xcscheme_^#shared#^_</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>0</integer>
-		</dict>
-	</dict>
-</dict>
-</plist>