Move preferences to the back

shezz77 · Jul 10, 2020 · 29c599d · 29c599d
1 parent 0a08ebc
commit 29c599d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/client/src/components/AchievementPopup.tsx b/client/src/components/AchievementPopup.tsx
@@ -202,8 +202,6 @@ class BouncingCircle extends React.Component {
   ];
 
   _reset = () => {
-    console.log("tag");
-
     this.reset();
     this.animate();
   };

diff --git a/client/src/components/Footer.tsx b/client/src/components/Footer.tsx
@@ -65,7 +65,6 @@ function Footer({ game, screenshot, navigation }) {
   if (!Settings.isPromo) {
     views.push(<ChallengesButton onPress={onChallengesPress} />);
   }
-  views.push(<PreferencesButton onPress={onPreferencesPress} />);
 
   const onLeaderboardPress = () => {
     if (Settings.isFirebaseEnabled) {
@@ -87,6 +86,8 @@ function Footer({ game, screenshot, navigation }) {
     views.push(<AdButton />);
     adMargin += 48;
   }
+  views.push(<PreferencesButton onPress={onPreferencesPress} />);
+
   return (
     <View style={[styles.container, { marginBottom: bottom + adMargin }]}>
       {views.map((view, index) => {

diff --git a/client/src/screens/AchievementScreen.tsx b/client/src/screens/AchievementScreen.tsx
@@ -14,7 +14,6 @@ function AchievementScreen({ showActionSheetWithOptions, achievements }) {
   const [filter, setFilter] = React.useState("All");
 
   const _onOpenActionSheet = () => {
-    console.log("pressed");
     const options = ["All", "Completed", "Cancel"];
     const cancelButtonIndex = options.length - 1;
 

diff --git a/client/src/screens/PreferencesScreen.tsx b/client/src/screens/PreferencesScreen.tsx
@@ -127,7 +127,7 @@ function PreferencesScreen({
             );
           },
         },
-        {
+        Platform.OS !== "web" && {
           title: "🎥 Watch an ad",
           onPress: async () => {
             // Display a rewarded ad
@@ -195,7 +195,7 @@ function PreferencesScreen({
             navigation.navigate("Licenses");
           },
         },
-        {
+        Platform.OS !== "web" && {
           title: "Deep Linking Scheme",
           value: `${Constants.manifest.scheme}://`,
         },
@@ -210,11 +210,11 @@ function PreferencesScreen({
           web: null,
           ios: {
             title: "Bundle ID",
-            value: Constants.manifest.ios.bundleIdentifier,
+            value: Constants.manifest?.ios?.bundleIdentifier,
           },
           android: {
             title: "Package Name",
-            value: Constants.manifest.android["package"],
+            value: Constants.manifest?.android?.["package"],
           },
         }),
       ].filter(Boolean),