Fix sentence choice numbering.

frasermince · May 13, 2020 · 796ee4f · 796ee4f
1 parent f2a2492
commit 796ee4f
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 13 deletions.
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -337,8 +337,6 @@ PODS:
     - RNSound/Core (= 0.11.0)
   - RNSound/Core (0.11.0):
     - React
-  - RNSVG (12.1.0):
-    - React
   - RNVectorIcons (6.6.0):
     - React
   - RNZipArchive (5.0.0):
@@ -406,7 +404,6 @@ DEPENDENCIES:
   - RNReanimated (from `../node_modules/react-native-reanimated`)
   - RNScreens (from `../node_modules/react-native-screens`)
   - RNSound (from `../node_modules/react-native-sound`)
-  - RNSVG (from `../node_modules/react-native-svg`)
   - RNVectorIcons (from `../node_modules/react-native-vector-icons`)
   - RNZipArchive (from `../node_modules/react-native-zip-archive`)
   - TextToSpeech (from `../node_modules/react-native-tts`)
@@ -516,8 +513,6 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-screens"
   RNSound:
     :path: "../node_modules/react-native-sound"
-  RNSVG:
-    :path: "../node_modules/react-native-svg"
   RNVectorIcons:
     :path: "../node_modules/react-native-vector-icons"
   RNZipArchive:
@@ -583,7 +578,6 @@ SPEC CHECKSUMS:
   RNReanimated: 031fe8d9ea93c2bd689a40f05320ef9d96f74d7f
   RNScreens: ba539a5086136eb356e43699cb588a80369763ca
   RNSound: da030221e6ac7e8290c6b43f2b5f2133a8e225b0
-  RNSVG: ce9d996113475209013317e48b05c21ee988d42e
   RNVectorIcons: 0bb4def82230be1333ddaeee9fcba45f0b288ed4
   RNZipArchive: be636657a6630e9771d4a3223dc8fd0bd0137b55
   SDWebImage: a99471f452bdfa0ca52ddf5b1adf2b61cab1d1eb

diff --git a/ios/Unchart.app.dSYM.zip b/ios/Unchart.app.dSYM.zip
diff --git a/ios/unchart-tvOS/Info.plist b/ios/unchart-tvOS/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2</string>
+	<string>5</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>

diff --git a/ios/unchart-tvOSTests/Info.plist b/ios/unchart-tvOSTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2</string>
+	<string>5</string>
 </dict>
 </plist>
diff --git a/ios/unchart.xcodeproj/project.pbxproj b/ios/unchart.xcodeproj/project.pbxproj
@@ -713,7 +713,7 @@
 			baseConfigurationReference = 24186A8997925397B6D891EA /* Pods-Unchart.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 5;
 				DEAD_CODE_STRIPPING = NO;
 				DEVELOPMENT_TEAM = G95K8LU6GG;
 				INFOPLIST_FILE = Unchart/Info.plist;
@@ -735,7 +735,7 @@
 			baseConfigurationReference = D6782936862EC0348E7DDC38 /* Pods-Unchart.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_TEAM = G95K8LU6GG;
 				INFOPLIST_FILE = Unchart/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";

diff --git a/ios/unchart/Info.plist b/ios/unchart/Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2</string>
+	<string>5</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>

diff --git a/ios/unchartTests/Info.plist b/ios/unchartTests/Info.plist
@@ -17,6 +17,6 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
-	<string>2</string>
+	<string>5</string>
 </dict>
 </plist>
diff --git a/src/FlashcardBuilder/SentenceChoice.purs b/src/FlashcardBuilder/SentenceChoice.purs
@@ -80,7 +80,7 @@ buildJsx props = React.do
         if length selection.phrase /= length selection.sentence
           then sentenceListItem selection.phrase selection.phraseOffset selection.word phraseTranslation (redirect wordTranslation) numberOne else mempty
         divider {style: M.css {height: 1, width: "100%"}}
-        sentenceListItem selection.sentence selection.sentenceOffset selection.word sentenceTranslation (redirect wordTranslation) numberTwo
+        sentenceListItem selection.sentence selection.sentenceOffset selection.word sentenceTranslation (redirect wordTranslation) (if length selection.phrase /= length selection.sentence then numberTwo else numberOne)
         divider {style: M.css {height: 1, width: "100%"}}
   where redirectFn selection wordTranslation range rangeTranslation rangeOffset =
           runEffectFn2 props.navigation.navigate "ImageChoice" $