From 180bc6f606c9c6336967c44a2646375421f3829b Mon Sep 17 00:00:00 2001
From: Chris Glein <26607885+chrisglein@users.noreply.github.com>
Date: Mon, 3 Apr 2023 10:17:32 -0700
Subject: [PATCH] Remove icon from dialogs

---
 package.json     |  5 +++--
 src/Feedback.tsx |  4 ++--
 src/Settings.tsx |  1 +
 src/Styles.tsx   |  9 +--------
 yarn.lock        | 45 +++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 52 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index 5449aa4..445ffde 100644
--- a/package.json
+++ b/package.json
@@ -39,10 +39,11 @@
     "babel-jest": "^29.6.3",
     "eslint": "^8.19.0",
     "jest": "^29.6.3",
+    "metro-config": "^0.79.1",
+    "metro-react-native-babel-preset": "^0.77.0",
     "prettier": "2.8.8",
     "react-test-renderer": "18.2.0",
-    "typescript": "5.0.4",
-    "metro-config": "^0.79.1"
+    "typescript": "5.0.4"
   },
   "engines": {
     "node": ">=18"
diff --git a/src/Feedback.tsx b/src/Feedback.tsx
index cb1f0f9..0cb1c8d 100644
--- a/src/Feedback.tsx
+++ b/src/Feedback.tsx
@@ -50,10 +50,10 @@ function FeedbackPopup({show, close, isPositive, response}: FeedbackPopupProps):
     <ContentDialog
       show={show}
       close={close}
-      titleIconStyle={{backgroundColor: isPositive ? 'green' : 'red'}}
-      title={(isPositive ? "👍" : "👎") + "Provide additional feedback"}
+      title="Provide additional feedback"
       buttons={buttons}
       defaultButtonIndex={1}>
+      <Text>{"Your feedback: " + (isPositive ? "👍" : "👎")}</Text>
       <TextInput
         multiline={true}
         placeholder="What would the ideal answer have been?"
diff --git a/src/Settings.tsx b/src/Settings.tsx
index b29d73d..643e9b1 100644
--- a/src/Settings.tsx
+++ b/src/Settings.tsx
@@ -178,6 +178,7 @@ function SettingsPopup({show, close}: SettingsPopupProps): JSX.Element {
     <ContentDialog
       show={show}
       close={cancel}
+      isLightDismissEnabled={false}
       title="OpenAI Settings"
       buttons={buttons}
       defaultButtonIndex={0}>
diff --git a/src/Styles.tsx b/src/Styles.tsx
index 90f327c..bd5cd57 100644
--- a/src/Styles.tsx
+++ b/src/Styles.tsx
@@ -22,7 +22,6 @@ const StylesContext = React.createContext<{
   horizontalContainer: StyleProp<ViewStyle>;
   dalleImage: StyleProp<ImageStyle>;
   inlineCard: StyleProp<ViewStyle>;
-  dialogTitleIcon: StyleProp<TextStyle>;
   dialogTitle: StyleProp<TextStyle>;
   dialogSectionsContainer: StyleProp<ViewStyle>;
   dialogSection: StyleProp<ViewStyle>;
@@ -87,12 +86,6 @@ const CreateStyles = (isDarkMode: boolean) => {
       borderRadius: 8,
       padding: 8,
     },
-    dialogTitleIcon: {
-      backgroundColor: 'gray',
-      borderRadius: 4,
-      alignSelf: 'center',
-      padding: 2,
-    },
     dialogTitle: {
       fontSize: 20,
     },
@@ -121,7 +114,7 @@ const CreateStyles = (isDarkMode: boolean) => {
       flexDirection: 'row',
       flexWrap: 'wrap',
       alignItems: 'center',
-      gap: 4,
+      gap: 8,
     },
     codeBlockTitle: {
       backgroundColor: isDarkMode ? 'white' : '#444',
diff --git a/yarn.lock b/yarn.lock
index 6a2d71c..ef6b349 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6666,6 +6666,51 @@ metro-minify-terser@0.80.6:
   dependencies:
     terser "^5.15.0"
 
+metro-react-native-babel-preset@^0.77.0:
+  version "0.77.0"
+  resolved "https://registry.yarnpkg.com/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.77.0.tgz#47457eca8e36b77156afbe790247a70dbb40faaa"
+  integrity sha512-HPPD+bTxADtoE4y/4t1txgTQ1LVR6imOBy7RMHUsqMVTbekoi8Ph5YI9vKX2VMPtVWeFt0w9YnCSLPa76GcXsA==
+  dependencies:
+    "@babel/core" "^7.20.0"
+    "@babel/plugin-proposal-async-generator-functions" "^7.0.0"
+    "@babel/plugin-proposal-class-properties" "^7.18.0"
+    "@babel/plugin-proposal-export-default-from" "^7.0.0"
+    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.18.0"
+    "@babel/plugin-proposal-numeric-separator" "^7.0.0"
+    "@babel/plugin-proposal-object-rest-spread" "^7.20.0"
+    "@babel/plugin-proposal-optional-catch-binding" "^7.0.0"
+    "@babel/plugin-proposal-optional-chaining" "^7.20.0"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.0"
+    "@babel/plugin-syntax-export-default-from" "^7.0.0"
+    "@babel/plugin-syntax-flow" "^7.18.0"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.0.0"
+    "@babel/plugin-syntax-optional-chaining" "^7.0.0"
+    "@babel/plugin-transform-arrow-functions" "^7.0.0"
+    "@babel/plugin-transform-async-to-generator" "^7.20.0"
+    "@babel/plugin-transform-block-scoping" "^7.0.0"
+    "@babel/plugin-transform-classes" "^7.0.0"
+    "@babel/plugin-transform-computed-properties" "^7.0.0"
+    "@babel/plugin-transform-destructuring" "^7.20.0"
+    "@babel/plugin-transform-flow-strip-types" "^7.20.0"
+    "@babel/plugin-transform-function-name" "^7.0.0"
+    "@babel/plugin-transform-literals" "^7.0.0"
+    "@babel/plugin-transform-modules-commonjs" "^7.0.0"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.0.0"
+    "@babel/plugin-transform-parameters" "^7.0.0"
+    "@babel/plugin-transform-react-display-name" "^7.0.0"
+    "@babel/plugin-transform-react-jsx" "^7.0.0"
+    "@babel/plugin-transform-react-jsx-self" "^7.0.0"
+    "@babel/plugin-transform-react-jsx-source" "^7.0.0"
+    "@babel/plugin-transform-runtime" "^7.0.0"
+    "@babel/plugin-transform-shorthand-properties" "^7.0.0"
+    "@babel/plugin-transform-spread" "^7.0.0"
+    "@babel/plugin-transform-sticky-regex" "^7.0.0"
+    "@babel/plugin-transform-typescript" "^7.5.0"
+    "@babel/plugin-transform-unicode-regex" "^7.0.0"
+    "@babel/template" "^7.0.0"
+    babel-plugin-transform-flow-enums "^0.0.2"
+    react-refresh "^0.4.0"
+
 metro-resolver@0.79.1:
   version "0.79.1"
   resolved "https://registry.yarnpkg.com/metro-resolver/-/metro-resolver-0.79.1.tgz#80e6e27305eb446188009f54374b642f28f49b65"