From 642c83569d776f41196d67651da90c696708ec3f Mon Sep 17 00:00:00 2001
From: marysoloman <nikitamarysolomanpvt@gmail.com>
Date: Tue, 3 Dec 2019 15:00:27 +0530
Subject: [PATCH 1/2] partial mixed fraction issue fix

---
 app/src/main/AndroidManifest.xml              | 22 +++++++++----------
 .../app/parser/StringToFractionParser.kt      |  8 +++----
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b25ddeeb2ea..ecc83d48d9b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -39,16 +39,7 @@
     <activity
       android:name=".splash.SplashActivity"
       android:theme="@style/SplashScreenTheme"
-      android:screenOrientation="portrait">
-      <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
-        <category android:name="android.intent.category.LAUNCHER" />
-      </intent-filter>
-      <intent-filter>
-        <action android:name="android.intent.action.VIEW" />
-        <category android:name="android.intent.category.DEFAULT" />
-      </intent-filter>
-    </activity>
+      android:screenOrientation="portrait"/>
     <activity
       android:name=".story.StoryActivity"
       android:theme="@style/OppiaThemeWithoutActionBar"
@@ -58,7 +49,16 @@
     <activity android:name=".testing.ContentCardTestActivity" />
     <activity android:name=".testing.ContinuePlayingFragmentTestActivity" />
     <activity android:name=".testing.HtmlParserTestActivity" />
-    <activity android:name=".testing.InputInteractionViewTestActivity" />
+    <activity android:name=".testing.InputInteractionViewTestActivity" >
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN" />
+        <category android:name="android.intent.category.LAUNCHER" />
+      </intent-filter>
+      <intent-filter>
+        <action android:name="android.intent.action.VIEW" />
+        <category android:name="android.intent.category.DEFAULT" />
+      </intent-filter>
+    </activity>
     <activity
       android:name=".testing.TopicTestActivity"
       android:theme="@style/OppiaThemeWithoutActionBar" />
diff --git a/app/src/main/java/org/oppia/app/parser/StringToFractionParser.kt b/app/src/main/java/org/oppia/app/parser/StringToFractionParser.kt
index be6e5f1c6d9..f335ed0acc2 100644
--- a/app/src/main/java/org/oppia/app/parser/StringToFractionParser.kt
+++ b/app/src/main/java/org/oppia/app/parser/StringToFractionParser.kt
@@ -6,8 +6,6 @@ import org.oppia.app.R
 import org.oppia.app.customview.interaction.FractionInputInteractionView
 import org.oppia.app.model.Fraction
 import org.oppia.domain.util.normalizeWhitespace
-import java.lang.Integer.parseInt
-import java.util.regex.Pattern
 
 /** This class contains method that helps to parse string to fraction. */
 class StringToFractionParser {
@@ -24,7 +22,7 @@ class StringToFractionParser {
    */
   fun getSubmitTimeError(text: String): FractionParsingError {
     // No need to check for real-time errors since the following logically include them.
-    val fraction = parseFraction(text)
+    val fraction = getFractionFromString(text)
     return when {
       fraction == null -> FractionParsingError.INVALID_FORMAT
       fraction.denominator == 0 -> FractionParsingError.DIVISION_BY_ZERO
@@ -49,13 +47,13 @@ class StringToFractionParser {
     }
   }
 
-  fun getFractionFromString(text: String): Fraction {
+  fun getFractionFromString(text: String): Fraction? {
     // Normalize whitespace to ensure that answer follows a simpler subset of possible patterns.
     val inputText: String = text.normalizeWhitespace()
     return parseMixedNumber(inputText)
       ?: parseFraction(inputText)
       ?: parseWholeNumber(inputText)
-      ?: throw IllegalArgumentException("Incorrectly formatted fraction: $text")
+      ?: null
   }
 
   private fun parseMixedNumber(inputText: String): Fraction? {

From 889813aafc2036bc901726f9bacb0c2851d2ca96 Mon Sep 17 00:00:00 2001
From: marysoloman <nikitamarysolomanpvt@gmail.com>
Date: Tue, 3 Dec 2019 15:01:12 +0530
Subject: [PATCH 2/2] nit

---
 app/src/main/AndroidManifest.xml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ecc83d48d9b..b25ddeeb2ea 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -39,17 +39,7 @@
     <activity
       android:name=".splash.SplashActivity"
       android:theme="@style/SplashScreenTheme"
-      android:screenOrientation="portrait"/>
-    <activity
-      android:name=".story.StoryActivity"
-      android:theme="@style/OppiaThemeWithoutActionBar"
-      android:screenOrientation="portrait" />
-    <activity android:name=".story.testing.StoryFragmentTestActivity" />
-    <activity android:name=".testing.BindableAdapterTestActivity" />
-    <activity android:name=".testing.ContentCardTestActivity" />
-    <activity android:name=".testing.ContinuePlayingFragmentTestActivity" />
-    <activity android:name=".testing.HtmlParserTestActivity" />
-    <activity android:name=".testing.InputInteractionViewTestActivity" >
+      android:screenOrientation="portrait">
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />
         <category android:name="android.intent.category.LAUNCHER" />
@@ -59,6 +49,16 @@
         <category android:name="android.intent.category.DEFAULT" />
       </intent-filter>
     </activity>
+    <activity
+      android:name=".story.StoryActivity"
+      android:theme="@style/OppiaThemeWithoutActionBar"
+      android:screenOrientation="portrait" />
+    <activity android:name=".story.testing.StoryFragmentTestActivity" />
+    <activity android:name=".testing.BindableAdapterTestActivity" />
+    <activity android:name=".testing.ContentCardTestActivity" />
+    <activity android:name=".testing.ContinuePlayingFragmentTestActivity" />
+    <activity android:name=".testing.HtmlParserTestActivity" />
+    <activity android:name=".testing.InputInteractionViewTestActivity" />
     <activity
       android:name=".testing.TopicTestActivity"
       android:theme="@style/OppiaThemeWithoutActionBar" />