Merge branch 'master' into rn-64

ApollosProject · Oct 21, 2021 · cbaa6b6 · cbaa6b6
2 parents 635ae38 + 3d65272
commit cbaa6b6
Show file tree

Hide file tree

Showing 8 changed files with 203 additions and 227 deletions.
diff --git a/apollos-church-api/apollos.json b/apollos-church-api/apollos.json
@@ -1,4 +1,4 @@
 {
-  "version": "2.34.0",
+  "version": "2.35.0",
   "environment": "api"
 }
diff --git a/apollos-church-api/package.json b/apollos-church-api/package.json
@@ -18,21 +18,21 @@
     "node": ">=14"
   },
   "dependencies": {
-    "@apollosproject/config": "^2.34.0",
-    "@apollosproject/data-connector-algolia-search": "^2.34.0",
-    "@apollosproject/data-connector-analytics": "^2.34.0",
-    "@apollosproject/data-connector-bible": "^2.34.0",
-    "@apollosproject/data-connector-church-online": "^2.34.0",
-    "@apollosproject/data-connector-cloudinary": "^2.34.0",
-    "@apollosproject/data-connector-onesignal": "^2.34.0",
-    "@apollosproject/data-connector-passes": "^2.34.0",
-    "@apollosproject/data-connector-postgres": "^2.34.0",
-    "@apollosproject/data-connector-redis-cache": "^2.34.0",
-    "@apollosproject/data-connector-rock": "^2.34.0",
-    "@apollosproject/data-connector-twilio": "^2.34.0",
-    "@apollosproject/data-schema": "^2.34.0",
-    "@apollosproject/rock-apollo-data-source": "^2.34.0",
-    "@apollosproject/server-core": "^2.34.0",
+    "@apollosproject/config": "^2.35.0",
+    "@apollosproject/data-connector-algolia-search": "^2.35.0",
+    "@apollosproject/data-connector-analytics": "^2.35.0",
+    "@apollosproject/data-connector-bible": "^2.35.0",
+    "@apollosproject/data-connector-church-online": "^2.35.0",
+    "@apollosproject/data-connector-cloudinary": "^2.35.0",
+    "@apollosproject/data-connector-onesignal": "^2.35.0",
+    "@apollosproject/data-connector-passes": "^2.35.0",
+    "@apollosproject/data-connector-postgres": "^2.35.0",
+    "@apollosproject/data-connector-redis-cache": "^2.35.0",
+    "@apollosproject/data-connector-rock": "^2.35.0",
+    "@apollosproject/data-connector-twilio": "^2.35.0",
+    "@apollosproject/data-schema": "^2.35.0",
+    "@apollosproject/rock-apollo-data-source": "^2.35.0",
+    "@apollosproject/server-core": "^2.35.0",
     "apollo-server": "^2.24.1",
     "apollo-server-express": "2.14.2",
     "color": "3.0.0",
@@ -42,9 +42,9 @@
     "randomcolor": "0.5.3"
   },
   "devDependencies": {
-    "@apollosproject/apollo-server-env-mock": "^2.34.0",
-    "@apollosproject/babel-preset-apollos": "^2.34.0",
-    "@apollosproject/eslint-config": "^2.34.0",
+    "@apollosproject/apollo-server-env-mock": "^2.35.0",
+    "@apollosproject/babel-preset-apollos": "^2.35.0",
+    "@apollosproject/eslint-config": "^2.35.0",
     "@babel/cli": "^7.4.5",
     "@babel/core": "^7.4.5",
     "@babel/node": "^7.7.4",

diff --git a/apolloschurchapp/apollos.json b/apolloschurchapp/apollos.json
@@ -1,4 +1,4 @@
 {
-    "version": "2.34.0",
+    "version": "2.35.0",
     "environment": "client"
 }
diff --git a/apolloschurchapp/fastlane/Fastfile b/apolloschurchapp/fastlane/Fastfile
@@ -63,10 +63,10 @@ platform :ios do
     app_store_connect_api_key(key_filepath: "ios/apollos.p8", in_house: false)
     deliver(
       skip_binary_upload: true,
-      skip_screenshots: true,
-      skip_metadata: true,
+      skip_screenshots: false,
+      skip_metadata: false,
       submit_for_review: true,
-      automatic_release: true,
+      automatic_release: false,
       submission_information: {
         add_id_info_uses_idfa: false
       },

diff --git a/apolloschurchapp/ios/Podfile.lock b/apolloschurchapp/ios/Podfile.lock
@@ -259,7 +259,7 @@ PODS:
     - React-jsi (= 0.64.2)
     - React-perflogger (= 0.64.2)
   - React-jsinspector (0.64.2)
-  - react-native-apollos-player (2.34.0):
+  - react-native-apollos-player (2.35.0):
     - React
   - react-native-config (0.11.7):
     - React
@@ -659,7 +659,7 @@ SPEC CHECKSUMS:
   React-jsi: 67747b9722f6dab2ffe15b011bcf6b3f2c3f1427
   React-jsiexecutor: 80c46bd381fd06e418e0d4f53672dc1d1945c4c3
   React-jsinspector: cc614ec18a9ca96fd275100c16d74d62ee11f0ae
-  react-native-apollos-player: f503cf8f6d4a582f02d00909134ddc0fd9bed4a0
+  react-native-apollos-player: af0449934fae6e2a84fbe2299692c8ecbefca01f
   react-native-config: 55548054279d92e0e4566ea15a8b9b81028ec342
   react-native-geolocation: c956aeb136625c23e0dce0467664af2c437888c9
   react-native-geolocation-service: f33626f1ae12381ca2ae60f98b2f5edd676bf95a

diff --git a/apolloschurchapp/package.json b/apolloschurchapp/package.json
@@ -41,22 +41,22 @@
   "dependencies": {
     "@apollo/client": "3.3.20",
     "@apollo/react-hooks": "^3.1.3",
-    "@apollosproject/config": "^2.34.0",
+    "@apollosproject/config": "^2.35.0",
     "@apollosproject/react-native-airplay-btn": "^0.2.0",
-    "@apollosproject/ui-analytics": "^2.34.0",
-    "@apollosproject/ui-auth": "^2.34.0",
-    "@apollosproject/ui-connected": "^2.34.0",
-    "@apollosproject/ui-fragments": "^2.34.0",
-    "@apollosproject/ui-htmlview": "^2.34.0",
-    "@apollosproject/ui-kit": "^2.34.0",
-    "@apollosproject/ui-mapview": "^2.34.0",
-    "@apollosproject/ui-media-player": "^2.34.0",
-    "@apollosproject/ui-notifications": "^2.34.0",
-    "@apollosproject/ui-onboarding": "^2.34.0",
-    "@apollosproject/ui-passes": "^2.34.0",
-    "@apollosproject/ui-prayer": "^2.34.0",
-    "@apollosproject/ui-scripture": "^2.34.0",
-    "@apollosproject/ui-test-utils": "^2.34.0",
+    "@apollosproject/ui-analytics": "^2.35.0",
+    "@apollosproject/ui-auth": "^2.35.0",
+    "@apollosproject/ui-connected": "^2.35.0",
+    "@apollosproject/ui-fragments": "^2.35.0",
+    "@apollosproject/ui-htmlview": "^2.35.0",
+    "@apollosproject/ui-kit": "^2.35.0",
+    "@apollosproject/ui-mapview": "^2.35.0",
+    "@apollosproject/ui-media-player": "^2.35.0",
+    "@apollosproject/ui-notifications": "^2.35.0",
+    "@apollosproject/ui-onboarding": "^2.35.0",
+    "@apollosproject/ui-passes": "^2.35.0",
+    "@apollosproject/ui-prayer": "^2.35.0",
+    "@apollosproject/ui-scripture": "^2.35.0",
+    "@apollosproject/ui-test-utils": "^2.35.0",
     "@gorhom/bottom-sheet": "3.4.1",
     "@react-native-community/async-storage": "^1.5.1",
     "@react-native-community/datetimepicker": "^3.0.0",
@@ -113,7 +113,7 @@
     "yup": "0.26.6"
   },
   "devDependencies": {
-    "@apollosproject/eslint-config": "^2.34.0",
+    "@apollosproject/eslint-config": "^2.35.0",
     "@babel/core": "^7.14.6",
     "@babel/runtime": "^7.14.6",
     "@bam.tech/react-native-make": "^3.0.3",

diff --git a/apolloschurchapp/src/tabs/index.js b/apolloschurchapp/src/tabs/index.js
@@ -1,12 +1,12 @@
 import React, { useEffect } from 'react';
-import PropTypes from 'prop-types';
 import { Image, View } from 'react-native';
 import { useNavigation } from '@react-navigation/native';
 import { createNativeStackNavigator } from 'react-native-screens/native-stack';
 import { createBottomTabNavigator } from '@react-navigation/bottom-tabs';
 import {
   NavigationService,
   withTheme,
+  useTheme,
   Icon,
   Touchable,
 } from '@apollosproject/ui-kit';
@@ -33,70 +33,46 @@ const HeaderLogo = withTheme(({ theme }) => ({
       : require('./wordmark.dark.png'),
 }))(Image);
 
-const SearchIcon = withTheme(({ theme: { colors, sizing: { baseUnit } } }) => ({
-  name: 'search',
-  size: baseUnit * 2,
-  fill: colors.primary,
-}))(Icon);
-
-const SearchButton = ({ onPress }) => (
-  <Touchable onPress={onPress}>
-    <SearchIcon />
-  </Touchable>
-);
-
-SearchButton.propTypes = {
-  onPress: PropTypes.func,
-};
-
-const Avatar = withTheme(({ theme: { sizing: { baseUnit } } }) => ({
-  size: 'xsmall',
-  containerStyle: {
-    paddingBottom: baseUnit * 0.25,
-  },
-}))(UserAvatarConnected);
-
-const ProfileButton = ({ onPress }) => (
-  <Touchable onPress={onPress}>
-    <View>
-      <Avatar />
-    </View>
-  </Touchable>
-);
-
-ProfileButton.propTypes = {
-  onPress: PropTypes.func,
-};
-
-const HeaderLeft = () => {
+const ProfileButton = () => {
   const navigation = useNavigation();
   return (
-    <ProfileButton
+    <Touchable
       onPress={() => {
         navigation.navigate('UserSettingsNavigator');
       }}
-    />
+    >
+      <View>
+        <UserAvatarConnected size="xsmall" />
+      </View>
+    </Touchable>
   );
 };
-const HeaderCenter = () => <HeaderLogo source={require('./wordmark.png')} />;
-const HeaderRight = () => {
+
+const SearchButton = () => {
   const navigation = useNavigation();
+  const theme = useTheme();
   return (
-    <SearchButton
+    <Touchable
       onPress={() => {
         navigation.navigate('Search');
       }}
-    />
+    >
+      <Icon
+        name="search"
+        size={theme.sizing.baseUnit * 2}
+        fill={theme.colors.primary}
+      />
+    </Touchable>
   );
 };
 
 // we nest stack inside of tabs so we can use all the fancy native header features
 const HomeTab = createFeatureFeedTab({
   screenOptions: {
     headerHideShadow: true,
-    headerCenter: HeaderCenter,
-    headerRight: HeaderRight,
-    headerLeft: HeaderLeft,
+    headerCenter: HeaderLogo,
+    headerRight: SearchButton,
+    headerLeft: ProfileButton,
     headerLargeTitle: false,
   },
   tabName: 'Home',
@@ -105,23 +81,23 @@ const HomeTab = createFeatureFeedTab({
 
 const ReadTab = createFeatureFeedTab({
   options: {
-    headerLeft: HeaderLeft,
+    headerLeft: ProfileButton,
   },
   tabName: 'Read',
   feedName: 'READ',
 });
 
 const WatchTab = createFeatureFeedTab({
   options: {
-    headerLeft: HeaderLeft,
+    headerLeft: ProfileButton,
   },
   tabName: 'Watch',
   feedName: 'WATCH',
 });
 
 const PrayTab = createFeatureFeedTab({
   options: {
-    headerLeft: HeaderLeft,
+    headerLeft: ProfileButton,
   },
   tabName: 'Pray',
   feedName: 'PRAY',
@@ -143,7 +119,7 @@ const ConnectTabStackNavigator = () => (
       name={'Connect'}
       component={CustomConnectScreen}
       options={{
-        headerLeft: HeaderLeft,
+        headerLeft: ProfileButton,
       }}
     />
   </ConnectTabStack.Navigator>