Refactor and add legal links to payment pages, change contribute view's layout

Reviewed-on: #1

Toki Trainer Widgets/Info.plist

@@ -2,6 +2,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>ITSAppUsesNonExemptEncryption</key>
+	<false/>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

Toki Trainer Widgets/Toki_Trainer_Widgets.swift

@@ -57,7 +57,7 @@ struct Toki_Trainer_WidgetsEntryView : View {
     
     var body: some View {
         ZStack {
-            Color("LightPurple")
+            //Color("LightPurple")
             VStack(alignment: .leading) {
                 Text(entry.word)
                     .foregroundColor(Color("FontColorTitle"))
@@ -70,6 +70,20 @@ struct Toki_Trainer_WidgetsEntryView : View {
                     .padding(8)
             }
         }
+        .widgetBackground(backgroundView: Color("LightPurple"))
+    }
+    
+}
+
+extension View {
+    func widgetBackground(backgroundView: some View) -> some View {
+        if #available(iOSApplicationExtension 17.0, *) {
+            return containerBackground(for: .widget) {
+                Color("LightPurple")
+            }
+        } else {
+            return background(Color("LightPurple"))
+        }
     }
 }
 

Toki Trainer.xcodeproj/project.pbxproj

@@ -12,8 +12,6 @@
 		7E2811172733027F0063DC78 /* TokiDictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E2811142733027F0063DC78 /* TokiDictionary.swift */; };
 		7E2811182733027F0063DC78 /* TokiJSONLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E2811152733027F0063DC78 /* TokiJSONLoader.swift */; };
 		7E2811192733027F0063DC78 /* TokiPartOfSpeech.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E2811162733027F0063DC78 /* TokiPartOfSpeech.swift */; };
-		7E28111C273302860063DC78 /* toki-partsofspeech.json in Resources */ = {isa = PBXBuildFile; fileRef = 7E28111A273302860063DC78 /* toki-partsofspeech.json */; };
-		7E28111D273302860063DC78 /* toki-dictionary.json in Resources */ = {isa = PBXBuildFile; fileRef = 7E28111B273302860063DC78 /* toki-dictionary.json */; };
 		7E28112227330DD30063DC78 /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E28112127330DD20063DC78 /* Constants.swift */; };
 		7E449775275AA0600016B6DC /* WidgetKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7E449774275AA0600016B6DC /* WidgetKit.framework */; };
 		7E449777275AA0600016B6DC /* SwiftUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7E449776275AA0600016B6DC /* SwiftUI.framework */; };
@@ -21,17 +19,15 @@
 		7E44977D275AA0620016B6DC /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7E44977C275AA0620016B6DC /* Assets.xcassets */; };
 		7E44977F275AA0620016B6DC /* Toki_Trainer_Widgets.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = 7E44977B275AA0600016B6DC /* Toki_Trainer_Widgets.intentdefinition */; };
 		7E449780275AA0620016B6DC /* Toki_Trainer_Widgets.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = 7E44977B275AA0600016B6DC /* Toki_Trainer_Widgets.intentdefinition */; };
-		7E449783275AA0620016B6DC /* Toki Trainer WidgetsExtension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 7E449772275AA0600016B6DC /* Toki Trainer WidgetsExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
+		7E449783275AA0620016B6DC /* Toki Trainer WidgetsExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 7E449772275AA0600016B6DC /* Toki Trainer WidgetsExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		7E449788275ABF5C0016B6DC /* TokiJSONLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E2811152733027F0063DC78 /* TokiJSONLoader.swift */; };
 		7E449789275ABF5C0016B6DC /* TokiLesson.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E716B3D273986E5009E2CF6 /* TokiLesson.swift */; };
 		7E44978A275ABF5C0016B6DC /* TokiPartOfSpeech.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E2811162733027F0063DC78 /* TokiPartOfSpeech.swift */; };
 		7E44978B275ABF5C0016B6DC /* TokiDictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E2811142733027F0063DC78 /* TokiDictionary.swift */; };
 		7E44978C275ABF690016B6DC /* TokiDictionaryViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E20D6002734466800D75B9A /* TokiDictionaryViewModel.swift */; };
-		7E44978D275AC4AE0016B6DC /* toki-dictionary.json in Resources */ = {isa = PBXBuildFile; fileRef = 7E28111B273302860063DC78 /* toki-dictionary.json */; };
 		7E716B3E273986E5009E2CF6 /* TokiLesson.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E716B3D273986E5009E2CF6 /* TokiLesson.swift */; };
 		7E716B4227398CDF009E2CF6 /* FlashCardLessonsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E716B4127398CDF009E2CF6 /* FlashCardLessonsView.swift */; };
 		7E716B4427398D3D009E2CF6 /* FlashCardLessonsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E716B4327398D3D009E2CF6 /* FlashCardLessonsViewModel.swift */; };
-		7E716B462739B968009E2CF6 /* FlashCardLessonResultsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E716B452739B968009E2CF6 /* FlashCardLessonResultsView.swift */; };
 		7E71E6ED2735D70C007CFF72 /* FlashCardView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E71E6EC2735D70C007CFF72 /* FlashCardView.swift */; };
 		7E71E6F12736DAE4007CFF72 /* FlashCardsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E71E6F02736DAE4007CFF72 /* FlashCardsViewModel.swift */; };
 		7E943A21273211C200E7DDF4 /* Toki_TrainerApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E943A20273211C200E7DDF4 /* Toki_TrainerApp.swift */; };
@@ -40,8 +36,15 @@
 		7E943A28273211C300E7DDF4 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7E943A27273211C300E7DDF4 /* Preview Assets.xcassets */; };
 		7E943A2A273211C300E7DDF4 /* Persistence.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E943A29273211C300E7DDF4 /* Persistence.swift */; };
 		7E943A2D273211C300E7DDF4 /* Toki_Trainer.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 7E943A2B273211C300E7DDF4 /* Toki_Trainer.xcdatamodeld */; };
-		7EBAE6AA273D65FD00BCFA09 /* toki-lessons.json in Resources */ = {isa = PBXBuildFile; fileRef = 7EBAE6A9273D65FD00BCFA09 /* toki-lessons.json */; };
 		7EF546162737B8FB00537AE6 /* FlashCardResultsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7EF546152737B8FA00537AE6 /* FlashCardResultsView.swift */; };
+		C13909F62B30ACC300B235EE /* TransactionObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = C13909F52B30ACC300B235EE /* TransactionObserver.swift */; };
+		C13FCE342A9D170B00E8976B /* toki-dictionary.json in Resources */ = {isa = PBXBuildFile; fileRef = C13FCE372A9D170B00E8976B /* toki-dictionary.json */; };
+		C13FCE352A9D170B00E8976B /* toki-dictionary.json in Resources */ = {isa = PBXBuildFile; fileRef = C13FCE372A9D170B00E8976B /* toki-dictionary.json */; };
+		C13FCE382A9D171300E8976B /* toki-lessons.json in Resources */ = {isa = PBXBuildFile; fileRef = C13FCE3A2A9D171300E8976B /* toki-lessons.json */; };
+		C13FCE3B2A9D171600E8976B /* toki-partsofspeech.json in Resources */ = {isa = PBXBuildFile; fileRef = C13FCE3D2A9D171600E8976B /* toki-partsofspeech.json */; };
+		C19DAB4E2AB38F2C00B17941 /* Localizable.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = C19DAB4D2AB38F2C00B17941 /* Localizable.xcstrings */; };
+		C1A70F5D2B2D78B300CDE5C8 /* ContributeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1A70F5C2B2D78B200CDE5C8 /* ContributeView.swift */; };
+		C1A70F5F2B2D900200CDE5C8 /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C1A70F5E2B2D900200CDE5C8 /* StoreKit.framework */; };
 		E1A8B364290B905600B53385 /* ViewExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1A8B363290B905600B53385 /* ViewExtensions.swift */; };
 		E1D79AE328EC396200A104BF /* DictionaryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1D79AE228EC396200A104BF /* DictionaryView.swift */; };
 		E1D79AE528F1914600A104BF /* TranslatorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1D79AE428F1914600A104BF /* TranslatorView.swift */; };
@@ -60,15 +63,15 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXCopyFilesBuildPhase section */
-		7E449784275AA0620016B6DC /* Embed App Extensions */ = {
+		7E449784275AA0620016B6DC /* Embed Foundation Extensions */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
 			dstPath = "";
 			dstSubfolderSpec = 13;
 			files = (
-				7E449783275AA0620016B6DC /* Toki Trainer WidgetsExtension.appex in Embed App Extensions */,
+				7E449783275AA0620016B6DC /* Toki Trainer WidgetsExtension.appex in Embed Foundation Extensions */,
 			);
-			name = "Embed App Extensions";
+			name = "Embed Foundation Extensions";
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXCopyFilesBuildPhase section */
@@ -79,8 +82,6 @@
 		7E2811142733027F0063DC78 /* TokiDictionary.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TokiDictionary.swift; sourceTree = "<group>"; };
 		7E2811152733027F0063DC78 /* TokiJSONLoader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TokiJSONLoader.swift; sourceTree = "<group>"; };
 		7E2811162733027F0063DC78 /* TokiPartOfSpeech.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TokiPartOfSpeech.swift; sourceTree = "<group>"; };
-		7E28111A273302860063DC78 /* toki-partsofspeech.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "toki-partsofspeech.json"; sourceTree = "<group>"; };
-		7E28111B273302860063DC78 /* toki-dictionary.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "toki-dictionary.json"; sourceTree = "<group>"; };
 		7E28112127330DD20063DC78 /* Constants.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = "<group>"; };
 		7E449772275AA0600016B6DC /* Toki Trainer WidgetsExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = "Toki Trainer WidgetsExtension.appex"; sourceTree = BUILT_PRODUCTS_DIR; };
 		7E449774275AA0600016B6DC /* WidgetKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WidgetKit.framework; path = System/Library/Frameworks/WidgetKit.framework; sourceTree = SDKROOT; };
@@ -93,7 +94,6 @@
 		7E716B3D273986E5009E2CF6 /* TokiLesson.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TokiLesson.swift; sourceTree = "<group>"; };
 		7E716B4127398CDF009E2CF6 /* FlashCardLessonsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlashCardLessonsView.swift; sourceTree = "<group>"; };
 		7E716B4327398D3D009E2CF6 /* FlashCardLessonsViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlashCardLessonsViewModel.swift; sourceTree = "<group>"; };
-		7E716B452739B968009E2CF6 /* FlashCardLessonResultsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlashCardLessonResultsView.swift; sourceTree = "<group>"; };
 		7E71E6EC2735D70C007CFF72 /* FlashCardView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlashCardView.swift; sourceTree = "<group>"; };
 		7E71E6F02736DAE4007CFF72 /* FlashCardsViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlashCardsViewModel.swift; sourceTree = "<group>"; };
 		7E943A1D273211C200E7DDF4 /* Toki Trainer.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Toki Trainer.app"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -103,8 +103,21 @@
 		7E943A27273211C300E7DDF4 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
 		7E943A29273211C300E7DDF4 /* Persistence.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Persistence.swift; sourceTree = "<group>"; };
 		7E943A2C273211C300E7DDF4 /* Toki_Trainer.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Toki_Trainer.xcdatamodel; sourceTree = "<group>"; };
-		7EBAE6A9273D65FD00BCFA09 /* toki-lessons.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "toki-lessons.json"; sourceTree = "<group>"; };
 		7EF546152737B8FA00537AE6 /* FlashCardResultsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlashCardResultsView.swift; sourceTree = "<group>"; };
+		C13909F52B30ACC300B235EE /* TransactionObserver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TransactionObserver.swift; sourceTree = "<group>"; };
+		C13FCE362A9D170B00E8976B /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.json; name = Base; path = "Base.lproj/toki-dictionary.json"; sourceTree = "<group>"; };
+		C13FCE392A9D171300E8976B /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.json; name = Base; path = "Base.lproj/toki-lessons.json"; sourceTree = "<group>"; };
+		C13FCE3C2A9D171600E8976B /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.json; name = Base; path = "Base.lproj/toki-partsofspeech.json"; sourceTree = "<group>"; };
+		C13FCE3E2A9D173000E8976B /* en */ = {isa = PBXFileReference; lastKnownFileType = text.json; name = en; path = "en.lproj/toki-partsofspeech.json"; sourceTree = "<group>"; };
+		C13FCE3F2A9D173A00E8976B /* en */ = {isa = PBXFileReference; lastKnownFileType = text.json; name = en; path = "en.lproj/toki-lessons.json"; sourceTree = "<group>"; };
+		C13FCE402A9D173F00E8976B /* en */ = {isa = PBXFileReference; lastKnownFileType = text.json; name = en; path = "en.lproj/toki-dictionary.json"; sourceTree = "<group>"; };
+		C13FCE412A9D181B00E8976B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.json; name = fr; path = "fr.lproj/toki-dictionary.json"; sourceTree = "<group>"; };
+		C13FCE422A9D181B00E8976B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.json; name = fr; path = "fr.lproj/toki-lessons.json"; sourceTree = "<group>"; };
+		C13FCE432A9D181B00E8976B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.json; name = fr; path = "fr.lproj/toki-partsofspeech.json"; sourceTree = "<group>"; };
+		C18C977E2B07FC9C0049EEF6 /* Toki-Trainer-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "Toki-Trainer-Info.plist"; sourceTree = SOURCE_ROOT; };
+		C19DAB4D2AB38F2C00B17941 /* Localizable.xcstrings */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; path = Localizable.xcstrings; sourceTree = "<group>"; };
+		C1A70F5C2B2D78B200CDE5C8 /* ContributeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContributeView.swift; sourceTree = "<group>"; };
+		C1A70F5E2B2D900200CDE5C8 /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = System/Library/Frameworks/StoreKit.framework; sourceTree = SDKROOT; };
 		E1A8B363290B905600B53385 /* ViewExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewExtensions.swift; sourceTree = "<group>"; };
 		E1D79AE228EC396200A104BF /* DictionaryView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DictionaryView.swift; sourceTree = "<group>"; };
 		E1D79AE428F1914600A104BF /* TranslatorView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TranslatorView.swift; sourceTree = "<group>"; };
@@ -126,6 +139,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				C1A70F5F2B2D900200CDE5C8 /* StoreKit.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -139,6 +153,7 @@
 				7E2811152733027F0063DC78 /* TokiJSONLoader.swift */,
 				7E2811162733027F0063DC78 /* TokiPartOfSpeech.swift */,
 				7E716B3D273986E5009E2CF6 /* TokiLesson.swift */,
+				C13909F52B30ACC300B235EE /* TransactionObserver.swift */,
 			);
 			path = Models;
 			sourceTree = "<group>";
@@ -152,7 +167,7 @@
 				7E71E6EC2735D70C007CFF72 /* FlashCardView.swift */,
 				7EF546152737B8FA00537AE6 /* FlashCardResultsView.swift */,
 				7E716B4127398CDF009E2CF6 /* FlashCardLessonsView.swift */,
-				7E716B452739B968009E2CF6 /* FlashCardLessonResultsView.swift */,
+				C1A70F5C2B2D78B200CDE5C8 /* ContributeView.swift */,
 			);
 			path = Views;
 			sourceTree = "<group>";
@@ -170,9 +185,9 @@
 		7E28111E273302890063DC78 /* JSON Data */ = {
 			isa = PBXGroup;
 			children = (
-				7E28111B273302860063DC78 /* toki-dictionary.json */,
-				7EBAE6A9273D65FD00BCFA09 /* toki-lessons.json */,
-				7E28111A273302860063DC78 /* toki-partsofspeech.json */,
+				C13FCE372A9D170B00E8976B /* toki-dictionary.json */,
+				C13FCE3A2A9D171300E8976B /* toki-lessons.json */,
+				C13FCE3D2A9D171600E8976B /* toki-partsofspeech.json */,
 			);
 			path = "JSON Data";
 			sourceTree = "<group>";
@@ -180,6 +195,7 @@
 		7E449773275AA0600016B6DC /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				C1A70F5E2B2D900200CDE5C8 /* StoreKit.framework */,
 				7E449774275AA0600016B6DC /* WidgetKit.framework */,
 				7E449776275AA0600016B6DC /* SwiftUI.framework */,
 			);
@@ -219,6 +235,7 @@
 		7E943A1F273211C200E7DDF4 /* Toki Trainer */ = {
 			isa = PBXGroup;
 			children = (
+				C18C977E2B07FC9C0049EEF6 /* Toki-Trainer-Info.plist */,
 				E1A8B362290B903B00B53385 /* Extensions */,
 				7E44978E275C495E0016B6DC /* Toki Trainer.entitlements */,
 				7E28111E273302890063DC78 /* JSON Data */,
@@ -230,6 +247,7 @@
 				7E943A29273211C300E7DDF4 /* Persistence.swift */,
 				7E943A2B273211C300E7DDF4 /* Toki_Trainer.xcdatamodeld */,
 				7E943A26273211C300E7DDF4 /* Preview Content */,
+				C19DAB4D2AB38F2C00B17941 /* Localizable.xcstrings */,
 			);
 			path = "Toki Trainer";
 			sourceTree = "<group>";
@@ -297,7 +315,7 @@
 				7E943A19273211C200E7DDF4 /* Sources */,
 				7E943A1A273211C200E7DDF4 /* Frameworks */,
 				7E943A1B273211C200E7DDF4 /* Resources */,
-				7E449784275AA0620016B6DC /* Embed App Extensions */,
+				7E449784275AA0620016B6DC /* Embed Foundation Extensions */,
 			);
 			buildRules = (
 			);
@@ -317,7 +335,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = 1;
 				LastSwiftUpdateCheck = 1310;
-				LastUpgradeCheck = 1310;
+				LastUpgradeCheck = 1430;
 				TargetAttributes = {
 					7E449771275AA0600016B6DC = {
 						CreatedOnToolsVersion = 13.1;
@@ -334,6 +352,7 @@
 			knownRegions = (
 				en,
 				Base,
+				fr,
 			);
 			mainGroup = 7E943A14273211C200E7DDF4;
 			productRefGroup = 7E943A1E273211C200E7DDF4 /* Products */;
@@ -351,7 +370,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				7E44978D275AC4AE0016B6DC /* toki-dictionary.json in Resources */,
+				C13FCE352A9D170B00E8976B /* toki-dictionary.json in Resources */,
 				7E44977D275AA0620016B6DC /* Assets.xcassets in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -360,11 +379,12 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				7EBAE6AA273D65FD00BCFA09 /* toki-lessons.json in Resources */,
+				C13FCE382A9D171300E8976B /* toki-lessons.json in Resources */,
 				7E943A28273211C300E7DDF4 /* Preview Assets.xcassets in Resources */,
+				C19DAB4E2AB38F2C00B17941 /* Localizable.xcstrings in Resources */,
 				7E943A25273211C300E7DDF4 /* Assets.xcassets in Resources */,
-				7E28111D273302860063DC78 /* toki-dictionary.json in Resources */,
-				7E28111C273302860063DC78 /* toki-partsofspeech.json in Resources */,
+				C13FCE342A9D170B00E8976B /* toki-dictionary.json in Resources */,
+				C13FCE3B2A9D171600E8976B /* toki-partsofspeech.json in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -390,7 +410,9 @@
 			buildActionMask = 2147483647;
 			files = (
 				7E943A2D273211C300E7DDF4 /* Toki_Trainer.xcdatamodeld in Sources */,
+				C1A70F5D2B2D78B300CDE5C8 /* ContributeView.swift in Sources */,
 				7E943A2A273211C300E7DDF4 /* Persistence.swift in Sources */,
+				C13909F62B30ACC300B235EE /* TransactionObserver.swift in Sources */,
 				7E20D5FF2733AFE700D75B9A /* PartsOfSpeechView.swift in Sources */,
 				7E71E6F12736DAE4007CFF72 /* FlashCardsViewModel.swift in Sources */,
 				E1D79AEB28F194EF00A104BF /* LanguageDirectionView.swift in Sources */,
@@ -408,7 +430,6 @@
 				E1A8B364290B905600B53385 /* ViewExtensions.swift in Sources */,
 				7E71E6ED2735D70C007CFF72 /* FlashCardView.swift in Sources */,
 				7E943A21273211C200E7DDF4 /* Toki_TrainerApp.swift in Sources */,
-				7E716B462739B968009E2CF6 /* FlashCardLessonResultsView.swift in Sources */,
 				7E2811182733027F0063DC78 /* TokiJSONLoader.swift in Sources */,
 				7E716B3E273986E5009E2CF6 /* TokiLesson.swift in Sources */,
 				7E28112227330DD30063DC78 /* Constants.swift in Sources */,
@@ -425,6 +446,39 @@
 		};
 /* End PBXTargetDependency section */
 
+/* Begin PBXVariantGroup section */
+		C13FCE372A9D170B00E8976B /* toki-dictionary.json */ = {
+			isa = PBXVariantGroup;
+			children = (
+				C13FCE362A9D170B00E8976B /* Base */,
+				C13FCE402A9D173F00E8976B /* en */,
+				C13FCE412A9D181B00E8976B /* fr */,
+			);
+			name = "toki-dictionary.json";
+			sourceTree = "<group>";
+		};
+		C13FCE3A2A9D171300E8976B /* toki-lessons.json */ = {
+			isa = PBXVariantGroup;
+			children = (
+				C13FCE392A9D171300E8976B /* Base */,
+				C13FCE3F2A9D173A00E8976B /* en */,
+				C13FCE422A9D181B00E8976B /* fr */,
+			);
+			name = "toki-lessons.json";
+			sourceTree = "<group>";
+		};
+		C13FCE3D2A9D171600E8976B /* toki-partsofspeech.json */ = {
+			isa = PBXVariantGroup;
+			children = (
+				C13FCE3C2A9D171600E8976B /* Base */,
+				C13FCE3E2A9D173000E8976B /* en */,
+				C13FCE432A9D181B00E8976B /* fr */,
+			);
+			name = "toki-partsofspeech.json";
+			sourceTree = "<group>";
+		};
+/* End PBXVariantGroup section */
+
 /* Begin XCBuildConfiguration section */
 		7E449785275AA0620016B6DC /* Debug */ = {
 			isa = XCBuildConfiguration;
@@ -443,7 +497,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.1;
+				MARKETING_VERSION = 1.3;
 				PRODUCT_BUNDLE_IDENTIFIER = "info.maddie.Toki-Trainer.Toki-Trainer-Widgets";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -470,7 +524,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.1;
+				MARKETING_VERSION = 1.3;
 				PRODUCT_BUNDLE_IDENTIFIER = "info.maddie.Toki-Trainer.Toki-Trainer-Widgets";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -484,6 +538,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
@@ -531,7 +586,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 17.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -545,6 +600,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
@@ -586,7 +642,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 17.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				SDKROOT = iphoneos;
@@ -609,16 +665,20 @@
 				DEVELOPMENT_TEAM = W9ASV855X5;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
+				INFOPLIST_FILE = "Toki-Trainer-Info.plist";
+				INFOPLIST_KEY_CFBundleDisplayName = "Toki Trainer";
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.education";
 				INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
+				IPHONEOS_DEPLOYMENT_TARGET = 17.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1;
+				MARKETING_VERSION = 1.3;
 				PRODUCT_BUNDLE_IDENTIFIER = "info.maddie.Toki-Trainer";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -640,16 +700,20 @@
 				DEVELOPMENT_TEAM = W9ASV855X5;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
+				INFOPLIST_FILE = "Toki-Trainer-Info.plist";
+				INFOPLIST_KEY_CFBundleDisplayName = "Toki Trainer";
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.education";
 				INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
+				IPHONEOS_DEPLOYMENT_TARGET = 17.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1;
+				MARKETING_VERSION = 1.3;
 				PRODUCT_BUNDLE_IDENTIFIER = "info.maddie.Toki-Trainer";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;

Toki Trainer.xcodeproj/xcshareddata/xcschemes/Toki Trainer WidgetsExtension.xcscheme

@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1430"
+   wasCreatedForAppExtension = "YES"
+   version = "2.0">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "7E449771275AA0600016B6DC"
+               BuildableName = "Toki Trainer WidgetsExtension.appex"
+               BlueprintName = "Toki Trainer WidgetsExtension"
+               ReferencedContainer = "container:Toki Trainer.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "7E943A1C273211C200E7DDF4"
+               BuildableName = "Toki Trainer.app"
+               BlueprintName = "Toki Trainer"
+               ReferencedContainer = "container:Toki Trainer.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = ""
+      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
+      launchStyle = "0"
+      askForAppToLaunch = "Yes"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES"
+      launchAutomaticallySubstyle = "2">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "7E943A1C273211C200E7DDF4"
+            BuildableName = "Toki Trainer.app"
+            BlueprintName = "Toki Trainer"
+            ReferencedContainer = "container:Toki Trainer.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "_XCWidgetKind"
+            value = ""
+            isEnabled = "NO">
+         </EnvironmentVariable>
+         <EnvironmentVariable
+            key = "_XCWidgetDefaultView"
+            value = "timeline"
+            isEnabled = "NO">
+         </EnvironmentVariable>
+         <EnvironmentVariable
+            key = "_XCWidgetFamily"
+            value = "medium"
+            isEnabled = "NO">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES"
+      askForAppToLaunch = "Yes"
+      launchAutomaticallySubstyle = "2">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "7E943A1C273211C200E7DDF4"
+            BuildableName = "Toki Trainer.app"
+            BlueprintName = "Toki Trainer"
+            ReferencedContainer = "container:Toki Trainer.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

Toki Trainer.xcodeproj/xcshareddata/xcschemes/Toki Trainer.xcscheme

@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1430"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "7E943A1C273211C200E7DDF4"
+               BuildableName = "Toki Trainer.app"
+               BlueprintName = "Toki Trainer"
+               ReferencedContainer = "container:Toki Trainer.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "7E943A1C273211C200E7DDF4"
+            BuildableName = "Toki Trainer.app"
+            BlueprintName = "Toki Trainer"
+            ReferencedContainer = "container:Toki Trainer.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "7E943A1C273211C200E7DDF4"
+            BuildableName = "Toki Trainer.app"
+            BlueprintName = "Toki Trainer"
+            ReferencedContainer = "container:Toki Trainer.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

Toki Trainer.xcodeproj/xcuserdata/madeline.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Bucket
+   uuid = "40DDD45F-6012-439E-A226-7CACD11FE451"
+   type = "1"
+   version = "2.0">
+</Bucket>

Toki Trainer.xcodeproj/xcuserdata/madeline.xcuserdatad/xcschemes/Toki Trainer French.xcscheme

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1430"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "7E943A1C273211C200E7DDF4"
+               BuildableName = "Toki Trainer.app"
+               BlueprintName = "Toki Trainer"
+               ReferencedContainer = "container:Toki Trainer.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = "fr"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "7E943A1C273211C200E7DDF4"
+            BuildableName = "Toki Trainer.app"
+            BlueprintName = "Toki Trainer"
+            ReferencedContainer = "container:Toki Trainer.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "7E943A1C273211C200E7DDF4"
+            BuildableName = "Toki Trainer.app"
+            BlueprintName = "Toki Trainer"
+            ReferencedContainer = "container:Toki Trainer.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

Toki Trainer.xcodeproj/xcuserdata/madeline.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -0,0 +1,37 @@
+<?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>Toki Trainer French.xcscheme</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+		<key>Toki Trainer WidgetsExtension.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>2</integer>
+		</dict>
+		<key>Toki Trainer.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>1</integer>
+		</dict>
+	</dict>
+	<key>SuppressBuildableAutocreation</key>
+	<dict>
+		<key>7E449771275AA0600016B6DC</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+		<key>7E943A1C273211C200E7DDF4</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+	</dict>
+</dict>
+</plist>

Toki Trainer/Constants.swift

@@ -24,7 +24,25 @@ struct K {
         "oth": UIColor.systemBrown,
         "extra": UIColor.systemBrown
     ]
-    
+
+    struct UserDefaults {
+        static let donationHearts = "donationHearts"
+        static let hasDonated = "hasDonated"
+    }
+
+    struct ConsumableTransactions {
+        static let TierOne = "SingleTimeTipTierOne"
+        static let TierTwo = "SingleTimeTipTierTwo"
+        static let TierThree = "SingleTimeTipTierThree"
+        static let TierFour = "SingleTimeTipTierFour"
+    }
+
+    struct MonthlyTransactions {
+        static let TierOne = "TierOne"
+        static let TierTwo = "TierTwo"
+        static let TierThree = "TierThree"
+    }
+
     static var getFlashCardAnswersFetchRequest: NSFetchRequest<FlashCardAnswer> {
         let request: NSFetchRequest<FlashCardAnswer> = FlashCardAnswer.fetchRequest()
         request.sortDescriptors = []

Toki Trainer/JSON Data/en.lproj/toki-partsofspeech.json

@@ -0,0 +1,46 @@
+[
+  {
+    "pos": "n",
+    "definition": "head noun"
+  },
+  {
+    "pos": "mod",
+    "definition": "modifier (adjective or adverb)"
+  },
+  {
+    "pos": "sep",
+    "definition": "separator"
+  },
+  {
+    "pos": "vt",
+    "definition": "verb, transitive (normally used with e)"
+  },
+  {
+    "pos": "vi",
+    "definition": "verb, intransitive"
+  },
+  {
+    "pos": "interj",
+    "definition": "interjection"
+  },
+  {
+    "pos": "prep",
+    "definition": "quasi-preposition"
+  },
+  {
+    "pos": "conj",
+    "definition": "conjunction"
+  },
+  {
+    "pos": "kama",
+    "definition": "compound verb preceded by kama"
+  },
+  {
+    "pos": "cont",
+    "definition": "context word used before la"
+  },
+  {
+    "pos": "oth",
+    "definition": "special, other word"
+  }
+]

Toki Trainer/JSON Data/fr.lproj/toki-partsofspeech.json

@@ -0,0 +1,46 @@
+[
+  {
+    "pos": "n",
+    "definition": "nom principal"
+  },
+  {
+    "pos": "mod",
+    "definition": "modificateur (adjectif ou adverbe)"
+  },
+  {
+    "pos": "sep",
+    "definition": "séparateur"
+  },
+  {
+    "pos": "vt",
+    "definition": "verbe transitif (généralement utilisé avec \"e\")"
+  },
+  {
+    "pos": "vi",
+    "definition": "verbe intransitif"
+  },
+  {
+    "pos": "interj",
+    "definition": "interjection"
+  },
+  {
+    "pos": "prep",
+    "definition": "quasi-préposition"
+  },
+  {
+    "pos": "conj",
+    "definition": "conjonction"
+  },
+  {
+    "pos": "kama",
+    "definition": "verbe composé précédé de \"kama\""
+  },
+  {
+    "pos": "cont",
+    "definition": "mot de contexte utilisé avant \"la\""
+  },
+  {
+    "pos": "oth",
+    "definition": "mot spécial, autre"
+  }
+]

Toki Trainer/Localizable.xcstrings

@@ -0,0 +1,258 @@
+{
+  "sourceLanguage" : "en",
+  "strings" : {
+    "" : {
+      "localizations" : {
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : ""
+          }
+        }
+      }
+    },
+    "%@ %%" : {
+      "localizations" : {
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : ""
+          }
+        }
+      }
+    },
+    "%lld 💕" : {
+
+    },
+    "Contribute" : {
+      "localizations" : {
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Contribuer"
+          }
+        }
+      }
+    },
+    "Correct" : {
+      "localizations" : {
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Correct"
+          }
+        }
+      }
+    },
+    "Definitions" : {
+      "localizations" : {
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Définitions"
+          }
+        }
+      }
+    },
+    "Dictionary" : {
+      "localizations" : {
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Dictionnaire"
+          }
+        }
+      }
+    },
+    "Donate Monthly" : {
+      "localizations" : {
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Faire un don mensuel"
+          }
+        }
+      }
+    },
+    "Donate Once" : {
+      "localizations" : {
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Don unique"
+          }
+        }
+      }
+    },
+    "Enter Toki Pona Word or Phrase" : {
+      "localizations" : {
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Entrer un mot ou une phrase en Toki Pona"
+          }
+        }
+      }
+    },
+    "Flash Cards" : {
+      "localizations" : {
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Flash Cards"
+          }
+        }
+      }
+    },
+    "Incorrect" : {
+      "localizations" : {
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Incorrect"
+          }
+        }
+      }
+    },
+    "Language" : {
+      "localizations" : {
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Langage"
+          }
+        }
+      }
+    },
+    "Legend" : {
+      "localizations" : {
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Légende"
+          }
+        }
+      }
+    },
+    "Lessons" : {
+      "localizations" : {
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Leçons"
+          }
+        }
+      }
+    },
+    "One-Time Donation" : {
+      "localizations" : {
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Don unique"
+          }
+        }
+      }
+    },
+    "Parts of Speech" : {
+      "localizations" : {
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Légende"
+          }
+        }
+      }
+    },
+    "Phrase Lookup" : {
+      "localizations" : {
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Recherche d'expressions"
+          }
+        }
+      }
+    },
+    "Please Select a Lesson" : {
+      "localizations" : {
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Veuillez sélectionner une leçon"
+          }
+        }
+      }
+    },
+    "Privacy Policy" : {
+
+    },
+    "Results" : {
+      "localizations" : {
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Résultats"
+          }
+        }
+      }
+    },
+    "Search" : {
+      "localizations" : {
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Rechercher"
+          }
+        }
+      }
+    },
+    "Search for:" : {
+      "localizations" : {
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Options de recherche"
+          }
+        }
+      }
+    },
+    "Source Code" : {
+
+    },
+    "Terms of Use" : {
+
+    },
+    "Thank you for donating!" : {
+      "localizations" : {
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Merci pour votre don !"
+          }
+        }
+      }
+    },
+    "Words" : {
+      "localizations" : {
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Mots"
+          }
+        }
+      }
+    },
+    "Write Review" : {
+      "localizations" : {
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Ecrire une critique"
+          }
+        }
+      }
+    }
+  },
+  "version" : "1.0"
+}

Toki Trainer/Models/TransactionObserver.swift

@@ -0,0 +1,97 @@
+//
+//  TransactionObserver.swift
+//  Toki Trainer
+//
+//  Created by Madeline Pace on 12/18/23.
+//
+
+import CoreData
+import StoreKit
+
+@MainActor
+final class TransactionObserver: ObservableObject {
+
+    var updates: Task<Void, Never>? = nil
+
+    @Published var donationHearts: Int = 0
+    @Published var hasDonated = false
+
+
+    init() {
+        updates = newTransactionListenerTask()
+        donationHearts = UserDefaults.standard.integer(forKey: K.UserDefaults.donationHearts)
+        hasDonated = UserDefaults.standard.bool(forKey: K.UserDefaults.hasDonated)
+    }
+
+    deinit {
+        updates?.cancel()
+    }
+
+    func addDonationHearts(_ amount: Int) {
+        if hasDonated == false {
+            hasDonated = true
+            UserDefaults.standard.set(hasDonated, forKey: K.UserDefaults.hasDonated)
+        }
+
+        DispatchQueue.main.async {
+            self.donationHearts += amount
+        }
+        UserDefaults.standard.set(donationHearts, forKey: K.UserDefaults.donationHearts)
+    }
+
+    private func newTransactionListenerTask() -> Task<Void, Never> {
+        Task(priority: .background) {
+            for await verificationResult in Transaction.updates {
+                await self.handle(updatedTransaction: verificationResult)
+            }
+        }
+    }
+
+    private func handle(updatedTransaction verificationResult: VerificationResult<Transaction>) async {
+        guard case .verified(let transaction) = verificationResult else {
+            return
+        }
+
+        switch transaction.productType {
+        case Product.ProductType.consumable:
+            processConsumable(transaction.productID)
+        case Product.ProductType.nonRenewable, Product.ProductType.autoRenewable:
+            processSubscription(transaction.productID)
+        default:
+            return
+        }
+
+        print("Finishing transaction")
+        await transaction.finish()
+    }
+
+    func processConsumable(_ productID: String) {
+        print("Consumable ID: \(productID)")
+        switch productID {
+        case K.ConsumableTransactions.TierOne:
+            self.addDonationHearts(100)
+        case K.ConsumableTransactions.TierTwo:
+            self.addDonationHearts(500)
+        case K.ConsumableTransactions.TierThree:
+            self.addDonationHearts(1000)
+        case K.ConsumableTransactions.TierFour:
+            self.addDonationHearts(2000)
+        default:
+            return
+        }
+    }
+
+    func processSubscription(_ productID: String) {
+        print("Subscription ID: \(productID)")
+        switch productID {
+        case K.MonthlyTransactions.TierOne:
+            self.addDonationHearts(100)
+        case K.MonthlyTransactions.TierTwo:
+            self.addDonationHearts(500)
+        case K.MonthlyTransactions.TierThree:
+            self.addDonationHearts(1000)
+        default:
+            return
+        }
+    }
+}

Toki Trainer/Views/ContentView.swift

@@ -6,6 +6,7 @@
 //
 
 import SwiftUI
+import StoreKit
 import CoreData
 
 extension String: Identifiable {
@@ -14,7 +15,9 @@ extension String: Identifiable {
 
 struct ContentView: View {
     @Environment(\.managedObjectContext) private var viewContext
-    
+
+    @StateObject var transactions: TransactionObserver = TransactionObserver()
+
     var body: some View {
         TabView {
             DictionaryView()
@@ -32,9 +35,15 @@ struct ContentView: View {
                     Image(systemName: "character.textbox")
                     Text("Flash Cards")
                 }
+            ContributeView()
+                .tabItem {
+                    Image(systemName: "heart.circle.fill")
+                    Text("Contribute")
+                }
         }
+        .environmentObject(transactions)
     }
-    
+
     func openPartsOfSpeechView() {
         print("Button pressed.")
     }

Toki Trainer/Views/ContributeView.swift

@@ -0,0 +1,317 @@
+//
+//  ContributeView.swift
+//  Toki Trainer
+//
+//  Created by Madeline Pace on 12/16/23.
+//
+
+import SwiftUI
+import StoreKit
+
+typealias Transaction = StoreKit.Transaction
+
+public enum StoreError: Error {
+    case failedVerification
+}
+
+// MARK: ContributeView
+struct ContributeView: View {
+
+    private let supportString = """
+Hi 👋
+
+I'm Maddie, the primary developer for Toki Trainer.
+
+This app is free and open source. If you find it \
+useful, please consider supporting my development efforts.
+
+I don't collect your data and am committed to providing \
+a high-quality, ad-free experience. Learning toki pona \
+easily and comfortably is the whole point, and ads would \
+ruin that!
+
+Taking a moment to add an App Store Review helps a ton. \
+Please also consider donating financially if you can. 💕
+"""
+
+
+
+    
+    private var recurringIAPs = ["TierThree"]
+
+    @EnvironmentObject var transactions: TransactionObserver
+
+    var body: some View {
+        VStack {
+            Spacer()
+            if transactions.hasDonated {
+                ThankYouBannerView(donationHearts: $transactions.donationHearts)
+            }
+            Text(supportString)
+                .padding(16)
+            Spacer()
+
+//            Link("Source Code", destination: URL(string: "https://git.corrupt.link/maddiefuzz/TokiTrainer")!)
+//                .padding(12)
+
+//            .padding([.bottom], 12)
+            HStack {
+                ReviewButton()
+                SourceCodeButton()
+            }
+            HStack {
+                SingleDonationButton()
+                RecurringDonationButton()
+            }
+            Spacer()
+        }
+    }
+}
+
+// MARK: ThankYouBannerView
+struct ThankYouBannerView: View {
+
+    @Binding var donationHearts: Int
+
+    var body: some View {
+        ZStack {
+            Rectangle()
+                .fill(.blue)
+                .cornerRadius(15)
+            VStack {
+                Text("Thank you for donating!")
+                    .multilineTextAlignment(.center)
+                    .font(.title)
+                Text("\(donationHearts) 💕")
+                    .padding(10)
+                    .font(.title3)
+            }
+        }
+        .frame(width: 250, height: 140)
+    }
+}
+
+struct SourceCodeButton: View {
+    var body: some View {
+        Link(destination: URL(string: "https://git.corrupt.link/maddiefuzz/TokiTrainer")!) {
+            VStack {
+                Image(systemName: "apple.terminal")
+                    .font(.system(size: 24, weight: .regular))
+                    .padding(2)
+                Text("Source Code")
+            }
+        }
+        .frame(width: 100)
+        .padding(8)
+    }
+}
+
+// MARK: ReviewButton
+struct ReviewButton: View  {
+    @Environment(\.requestReview) private var requestReview
+
+    var body: some View {
+        Button(action: {
+            print("Review requested")
+            presentReviewRequest()
+        }, label: {
+            VStack {
+                Image(systemName: "star.bubble")
+                    .font(.system(size: 24, weight: .regular))
+                    .padding(2)
+                Text("Write Review")
+            }
+        })
+        .frame(width: 100)
+        .padding(8)
+    }
+
+    func presentReviewRequest() {
+        Task {
+            await requestReview()
+        }
+    }
+}
+
+// Workaround for .sheet(item:) expecting an Identifiable
+struct DonationProducts: Identifiable {
+    let id = UUID()
+    var products = [Product]()
+}
+
+// MARK: SingleDonationButton
+struct SingleDonationButton: View {
+    @Environment(\.purchase) private var purchase: PurchaseAction
+
+    @EnvironmentObject var transactions: TransactionObserver
+
+    @State private var IAPs: DonationProducts?
+    @State private var productsFetched = false
+    @State private var disabledPurchaseButtons = false
+
+
+    private var singleIAPs = ["SingleTimeTipTierOne",
+                              "SingleTimeTipTierTwo",
+                              "SingleTimeTipTierThree",
+                              "SingleTimeTipTierFour"]
+
+    var body: some View {
+        Button {
+            Task {
+                try await loadSingleProducts()
+            }
+        } label: {
+            VStack {
+                Image(systemName: "dollarsign.circle")
+                    .font(.system(size: 24, weight: .regular))
+                    .padding(2)
+                Text("Donate Once")
+            }
+        }
+        .frame(width: 100)
+        .padding(8)
+        .sheet(item: self.$IAPs) { IAPs in
+            if(productsFetched) {
+                VStack {
+                    Spacer()
+                    Text("One-Time Donation")
+                        .font(.largeTitle)
+                    Spacer()
+                    ForEach(IAPs.products) { product in
+                        HStack {
+                            VStack {
+                                Text(product.displayName)
+                                    .font(.title)
+                                    .frame(maxWidth: .infinity, alignment: .leading)
+                                Text(product.description)
+                                    .frame(maxWidth: .infinity, alignment: .leading)
+                            }
+                            .padding(.leading, 12)
+                            Spacer()
+                            Button {
+                                print("Purchase this one: \(product)")
+                                disabledPurchaseButtons = true
+                                Task {
+                                    let _ = try? await purchase(product)
+                                    disabledPurchaseButtons = false
+                                }
+                            } label: {
+                                Text(product.displayPrice)
+                                    .frame(minWidth: 50)
+                                    .padding(8)
+                                    .fontWeight(/*@START_MENU_TOKEN@*/.bold/*@END_MENU_TOKEN@*/)
+                            }
+                            .padding(.trailing, 12)
+                            .buttonStyle(.bordered)
+                            .disabled(disabledPurchaseButtons)
+                        }
+                        .padding(12)
+                    }
+                    Spacer()
+                    LegalLinksView()
+                        .padding(16)
+                        .padding([.bottom], 20)
+                }
+                //.padding([.top], 60)
+            } else {
+                ProgressView()
+            }
+        }
+    }
+
+    private func purchase(_ product: Product) async throws -> Transaction? {
+        let result = try await product.purchase()
+
+        switch result {
+        case .success(let verification):
+            let transaction = try checkVerified(verification)
+            await transaction.finish()
+            print("Purchase success")
+            transactions.processConsumable(transaction.productID)
+            return transaction
+        case .userCancelled, .pending:
+            return nil
+        default:
+            return nil
+        }
+
+    }
+
+    func checkVerified<T>(_ result: VerificationResult<T>) throws -> T {
+        //Check whether the JWS passes StoreKit verification.
+        switch result {
+        case .unverified:
+            //StoreKit parses the JWS, but it fails verification.
+            throw StoreError.failedVerification
+        case .verified(let safe):
+            //The result is verified. Return the unwrapped value.
+            return safe
+        }
+    }
+
+    private func loadSingleProducts() async throws {
+        self.IAPs = DonationProducts()
+        self.IAPs?.products = try await Product.products(for: singleIAPs).sorted(by: { p1, p2 in
+            p1.price < p2.price
+        })
+        self.productsFetched = true
+    }
+}
+
+// MARK: RecurringDonationButton
+struct RecurringDonationButton: View {
+
+    @State var toggleSheet = false
+
+    private let groupID = "21424772"
+
+    var body: some View {
+        Button {
+            print("Subscription button pressed")
+            toggleSheet.toggle()
+        } label: {
+            VStack {
+                Image(systemName: "dollarsign.arrow.circlepath")
+                    .font(.system(size: 24, weight: .regular))
+                    .padding(2)
+                Text("Donate Monthly")
+            }
+        }
+        .frame(width: 100)
+        .padding(8)
+        .sheet(isPresented: $toggleSheet, content: {
+            VStack {
+                SubscriptionStoreView(groupID: self.groupID)
+//                HStack {
+//                    Link("Terms of Use", destination: URL(string: "https://www.apple.com/legal/internet-services/itunes/dev/stdeula/")!)
+//                        .padding(12)
+//                    Link("Privacy Policy", destination: URL(string: "https://maddie.info/null_privacy_policy")!)
+//                }
+                LegalLinksView()
+                    .padding(16)
+                    .padding([.bottom], 20)
+            }
+        })
+    }
+}
+
+struct LegalLinksView: View {
+
+    var body: some View {
+            HStack {
+                Link("Terms of Use", destination: URL(string: "https://www.apple.com/legal/internet-services/itunes/dev/stdeula/")!)
+                    .padding(12)
+                Link("Privacy Policy", destination: URL(string: "https://maddie.info/null_privacy_policy")!)
+            }
+    }
+}
+
+#Preview {
+    ContributeView().environmentObject(TransactionObserver())
+}
+
+#Preview {
+    @State var donationHearts = 5000
+
+    return ThankYouBannerView(donationHearts: $donationHearts)
+}

Toki Trainer/Views/FlashCardLessonResultsView.swift

@@ -1,20 +0,0 @@
-//
-//  FlashCardLessonResultsView.swift
-//  Toki Trainer
-//
-//  Created by Avery Ada Pace on 11/8/21.
-//
-
-import SwiftUI
-
-struct FlashCardLessonResultsView: View {
-    var body: some View {
-        Text(/*@START_MENU_TOKEN@*/"Hello, World!"/*@END_MENU_TOKEN@*/)
-    }
-}
-
-struct FlashCardLessonResultsView_Previews: PreviewProvider {
-    static var previews: some View {
-        FlashCardLessonResultsView()
-    }
-}

Toki Trainer/Views/WordListViews/DictionaryView.swift

@@ -17,33 +17,67 @@ struct DictionaryView: View {
     
     @State private var tokiInput: String = ""
     @State private var selectedPartOfSpeech: String?
+    @State private var showGenericLegend: Bool = false
+    @State private var advancedSearchEnabled = false
     @State var searchMode: SearchMode = .Dictionary
     
     @FocusState private var searchInputIsForuced: Bool
     
     var body: some View {
         VStack {
-            TextField("Search", text: $tokiInput)
-                .multilineTextAlignment(.center)
-                .textInputAutocapitalization(.never)
-                .disableAutocorrection(true)
-                .padding(8)
-                .onSubmit {
+            HStack {
+                TextField("Search", text: $tokiInput)
+                    //.multilineTextAlignment(.center)
+                    .textInputAutocapitalization(.never)
+                    .disableAutocorrection(true)
+                    .padding(8)
+                    .onSubmit {
+                        filterByInput()
+                        //tokiDictViewModel.filterDictionaryEnglishMode(tokiInput)
+                }
+                Button {
+                    hideKeyboard()
                     filterByInput()
-                    //tokiDictViewModel.filterDictionaryEnglishMode(tokiInput)
+                } label: {
+                    Image(systemName: "magnifyingglass")
                 }
-            Picker("Language", selection: $searchMode) {
-                Text("Dictionary").tag(SearchMode.Dictionary)
-                Text("Definitions").tag(SearchMode.Definitions)
+                .buttonStyle(.borderedProminent)
+
+                Button(action: {
+                    withAnimation {
+                        advancedSearchEnabled.toggle()
+                    }
+                }, label: {
+                    Image(systemName: "slider.horizontal.2.square.on.square")
+                })
+                .buttonStyle(.bordered)
             }
-            .pickerStyle(SegmentedPickerStyle())
-            .onTapGesture {
-                if self.searchMode == SearchMode.Dictionary {
-                    self.searchMode = SearchMode.Definitions
-                } else {
-                    self.searchMode = SearchMode.Dictionary
+            .padding([.top, .leading, .trailing], 16)
+            if advancedSearchEnabled == true {
+                VStack {
+                    Text("Search for:")
+                    Picker("Language", selection: $searchMode) {
+                        Text("Words").tag(SearchMode.Dictionary)
+                        Text("Definitions").tag(SearchMode.Definitions)
+                    }
+                    .pickerStyle(SegmentedPickerStyle())
+                    .onTapGesture {
+                        if self.searchMode == SearchMode.Dictionary {
+                            self.searchMode = SearchMode.Definitions
+                        } else {
+                            self.searchMode = SearchMode.Dictionary
+                        }
+                        filterByInput()
+                    }
+                    Button(action: {
+                        print("Legend")
+                        showGenericLegend.toggle()
+                    }, label: {
+                        Text("Legend")
+                    })
+                    .padding(4)
                 }
-                filterByInput()
+                .padding([.leading, .trailing], 8)
             }
             List(tokiDictViewModel.dictionary, id: \.word) { entry in
                 TokiWordsListEntryView(entry: entry, selectedPartOfSpeech: $selectedPartOfSpeech)
@@ -51,7 +85,10 @@ struct DictionaryView: View {
             .sheet(item: $selectedPartOfSpeech) { selectedPOS in
                 PartsOfSpeechView(selectedPartOfSpeech: selectedPOS)
             }
-            .onChange(of: tokiInput) { newValue in
+            .sheet(isPresented: $showGenericLegend, content: {
+                PartsOfSpeechView(selectedPartOfSpeech: nil)
+            })
+            .onChange(of: tokiInput) {
                 filterByInput()
                 //tokiDictViewModel.filterDictionaryEnglishMode(newValue)
             }
@@ -70,6 +107,16 @@ struct DictionaryView: View {
     }
 }
 
+extension View {
+    func searchOptionsButtonStyle(toggle: Binding<Bool>) -> any PrimitiveButtonStyle {
+        if toggle.wrappedValue == true {
+            BorderedButtonStyle()
+        } else {
+            BorderlessButtonStyle()
+        }
+    }
+}
+
 
 struct DictionaryView_Previews: PreviewProvider {
     

Toki Trainer/Views/WordListViews/TranslatorView.swift

@@ -15,22 +15,24 @@ struct TranslatorView: View {
     
     var body: some View {
         VStack {
-//            Button(action: changeTranslationDirection) {
-//                #warning("This needs to actually switch how the lookup happens")
-//                if translateToTokiPona == true {
-//                    LanguageDirectionView(from: "English", to: "Toki Pona", fromColor: .blue, toColor: .cyan)
-//                } else {
-//                    LanguageDirectionView(from: "Toki Pona", to: "English", fromColor: .cyan, toColor: .blue)
-//                }
-//            }
-            TextField("Enter Toki Pona Word or Phrase", text: $tokiInput)
-                .multilineTextAlignment(.center)
-                .textInputAutocapitalization(.never)
-                .disableAutocorrection(true)
-                .padding(8)
-                .onSubmit {
+            HStack {
+                TextField("Enter Toki Pona Word or Phrase", text: $tokiInput)
+                    .textInputAutocapitalization(.never)
+                    .disableAutocorrection(true)
+                    .padding(8)
+                    .onSubmit {
+                        tokiDictViewModel.translatePhrase(tokiInput)
+                    }
+                Button {
+                    hideKeyboard()
                     tokiDictViewModel.translatePhrase(tokiInput)
+                } label: {
+                    Image(systemName: "magnifyingglass")
                 }
+                .buttonStyle(.borderedProminent)
+            }
+            .padding([.top, .leading, .trailing], 16)
+
             if tokiInput.count == 0 {
                 List(tokiDictViewModel.dictionary, id: \.word) { entry in
                     TokiWordsListEntryView(entry: entry, selectedPartOfSpeech: $selectedPartOfSpeech)
@@ -50,8 +52,8 @@ struct TranslatorView: View {
         .sheet(item: $selectedPartOfSpeech) { selectedPOS in
             PartsOfSpeechView(selectedPartOfSpeech: selectedPOS)
         }
-        .onChange(of: tokiInput) { newValue in
-            tokiDictViewModel.translatePhrase(newValue)
+        .onChange(of: tokiInput) {
+            tokiDictViewModel.translatePhrase(tokiInput)
         }
         .onTapGesture {
             hideKeyboard()

Toki-Trainer-Info.plist

@@ -0,0 +1,8 @@
+<?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>ITSAppUsesNonExemptEncryption</key>
+	<false/>
+</dict>
+</plist>