From a7cf34c87a514490381de0665d6b9e64c35c5478 Mon Sep 17 00:00:00 2001
From: Mustafa Buyukcelebi <mustafa.buyukcel@gmail.com>
Date: Wed, 27 Nov 2019 19:36:14 +0300
Subject: [PATCH 1/2] Fixed webview crash issue

---
 android/app/build.gradle                 | 2 +-
 android/app/src/main/AndroidManifest.xml | 1 +
 android/build.gradle                     | 2 +-
 package.json                             | 2 +-
 yarn.lock                                | 8 ++++----
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index fe07b63c3..cd8281985 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -79,7 +79,7 @@ import com.android.build.OutputFile
 
 project.ext.react = [
     entryFile: "index.js",
-    enableHermes: false,  // clean and rebuild if changing
+    enableHermes: true,  // clean and rebuild if changing
 ]
 
 apply from: "../../node_modules/react-native/react.gradle"
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 4503d61ee..e8438216c 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -13,6 +13,7 @@
       android:icon="@mipmap/ic_launcher"
       android:roundIcon="@mipmap/ic_launcher_round"
       android:allowBackup="false"
+      android:largeHeap="true"
       android:theme="@style/AppTheme">
       <activity
         android:name=".MainActivity"
diff --git a/android/build.gradle b/android/build.gradle
index 50218ed93..6770fe6db 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -27,7 +27,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:3.4.2")
+        classpath('com.android.tools.build:gradle:3.5.2')
 
         classpath 'com.google.gms:google-services:4.0.2'
         classpath 'com.bugsnag:bugsnag-android-gradle-plugin:4.+'
diff --git a/package.json b/package.json
index 929766680..eb32bb949 100644
--- a/package.json
+++ b/package.json
@@ -74,7 +74,7 @@
     "react-native-vector-icons": "^6.6.0",
     "react-native-version": "^3.1.0",
     "react-native-version-number": "^0.3.5",
-    "react-native-webview": "^7.2.7",
+    "react-native-webview": "^7.5.2",
     "react-navigation": "^4.0.10",
     "react-navigation-drawer": "^2.2.2",
     "react-navigation-redux-helpers": "^2.0.8",
diff --git a/yarn.lock b/yarn.lock
index c39b7898c..3350184d3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7679,10 +7679,10 @@ react-native-version@^3.1.0:
     resolve-from "^5.0.0"
     semver "^6.0.0"
 
-react-native-webview@^7.2.7:
-  version "7.4.1"
-  resolved "https://registry.yarnpkg.com/react-native-webview/-/react-native-webview-7.4.1.tgz#4fe42263506ea06ec56e291dcda8dedf9e900542"
-  integrity sha512-AVT5HIEEWc/NZdNwXRVev0cAs1Si0O3BA4Crqyor8JbwuxUUCllLv+NK7TO3eOw/ENl+QyIPHu9dizkoycmgJQ==
+react-native-webview@^7.5.2:
+  version "7.5.2"
+  resolved "https://registry.yarnpkg.com/react-native-webview/-/react-native-webview-7.5.2.tgz#9da3006e03636faaa9d05f3abff46cd40bfb80f9"
+  integrity sha512-e2ODq2KuTchhATosONNMZIubAzmjWoHg7WK0s1R515PVeKqOc30v6KdJy8IW5/4kw/2aal+Pb7b/F4s1zp6PFQ==
   dependencies:
     escape-string-regexp "2.0.0"
     invariant "2.2.4"

From e0897315820e4e1c77af318555d72a039970a654 Mon Sep 17 00:00:00 2001
From: Mustafa Buyukcelebi <mustafa.buyukcel@gmail.com>
Date: Wed, 27 Nov 2019 21:01:02 +0300
Subject: [PATCH 2/2] Fixed subcomment design issue

---
 src/components/comment/view/commentStyles.js          | 1 +
 src/components/comment/view/commentView.js            | 1 +
 src/components/postElements/body/view/postBodyView.js | 7 +++----
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/components/comment/view/commentStyles.js b/src/components/comment/view/commentStyles.js
index 83defeda2..7345f67bc 100644
--- a/src/components/comment/view/commentStyles.js
+++ b/src/components/comment/view/commentStyles.js
@@ -36,6 +36,7 @@ export default EStyleSheet.create({
     alignSelf: 'flex-end',
     position: 'absolute',
     right: 0,
+    bottom: -10,
   },
   voteCountText: {
     alignSelf: 'center',
diff --git a/src/components/comment/view/commentView.js b/src/components/comment/view/commentView.js
index 650e91eef..dac606eda 100644
--- a/src/components/comment/view/commentView.js
+++ b/src/components/comment/view/commentView.js
@@ -80,6 +80,7 @@ class CommentView extends PureComponent {
           <View style={[{ marginLeft: marginLeft || 29 }, styles.bodyWrapper]}>
             <PostBody
               isComment
+              commentDepth={comment.depth}
               handleOnUserPress={handleOnUserPress}
               body={comment.body}
               textSelectable={false}
diff --git a/src/components/postElements/body/view/postBodyView.js b/src/components/postElements/body/view/postBodyView.js
index 3a3aef673..5c36943c7 100644
--- a/src/components/postElements/body/view/postBodyView.js
+++ b/src/components/postElements/body/view/postBodyView.js
@@ -17,6 +17,7 @@ const WIDTH = Dimensions.get('window').width;
 const PostBody = ({
   navigation,
   body,
+  commentDepth,
   isComment,
   textSelectable = true,
   handleOnUserPress,
@@ -208,10 +209,8 @@ const PostBody = ({
   return (
     <Fragment>
       <AutoHeightWebView
-        source={{
-          html: test,
-        }}
-        style={{ width: isComment ? WIDTH - 61 : WIDTH - 32 }}
+        source={{ html: test }}
+        style={{ width: isComment ? WIDTH - (32 + 29 * commentDepth) : WIDTH - 32 }}
         customStyle={customStyle}
         onMessage={_handleOnLinkPress}
         customScript={script.toString()}