Merge pull request #423 from hummingbird-me/develop

v6.10.2 Master
hummingbird-me · Jan 3, 2019 · f0bdc7e · f0bdc7e
2 parents 934a2db + 431dc6a
commit f0bdc7e
Show file tree

Hide file tree

Showing 17 changed files with 28 additions and 56 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -119,7 +119,7 @@ android {
         targetSdkVersion 27
         missingDimensionStrategy "RNN.reactNativeVersion", "reactNative51"
         versionCode 1
-        versionName "6.10.1"
+        versionName "6.10.2"
         multiDexEnabled true
         ndk {
             abiFilters "armeabi-v7a", "x86"

diff --git a/android/app/src/main/assets/fonts/AntDesign.ttf b/android/app/src/main/assets/fonts/AntDesign.ttf
diff --git a/android/app/src/main/assets/fonts/EvilIcons.ttf b/android/app/src/main/assets/fonts/EvilIcons.ttf
diff --git a/android/app/src/main/assets/fonts/Feather.ttf b/android/app/src/main/assets/fonts/Feather.ttf
diff --git a/android/app/src/main/assets/fonts/FontAwesome5_Brands.ttf b/android/app/src/main/assets/fonts/FontAwesome5_Brands.ttf
diff --git a/android/app/src/main/assets/fonts/FontAwesome5_Regular.ttf b/android/app/src/main/assets/fonts/FontAwesome5_Regular.ttf
diff --git a/android/app/src/main/assets/fonts/FontAwesome5_Solid.ttf b/android/app/src/main/assets/fonts/FontAwesome5_Solid.ttf
diff --git a/android/app/src/main/assets/fonts/Ionicons.ttf b/android/app/src/main/assets/fonts/Ionicons.ttf
diff --git a/android/app/src/main/assets/fonts/MaterialCommunityIcons.ttf b/android/app/src/main/assets/fonts/MaterialCommunityIcons.ttf
diff --git a/android/app/src/main/assets/fonts/Octicons.ttf b/android/app/src/main/assets/fonts/Octicons.ttf
diff --git a/ios/kitsu_mobile.xcodeproj/project.pbxproj b/ios/kitsu_mobile.xcodeproj/project.pbxproj
@@ -100,6 +100,10 @@
 		F743ACFD56F641BEA63F5B1D /* OpenSans-Italic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 008C13A99553484BA0B2963B /* OpenSans-Italic.ttf */; };
 		FD2D5EEC2CE94BD494A797F8 /* libRCTYouTube.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DDA0D65E0D5748EFB8A14463 /* libRCTYouTube.a */; };
 		FFF738ABC088423B91E45FD7 /* config.json in Resources */ = {isa = PBXBuildFile; fileRef = 694A904745DB4D368E2CB836 /* config.json */; };
+		8B7CED64136E4863B96D8E7B /* AntDesign.ttf in Resources */ = {isa = PBXBuildFile; fileRef = D9CB1B6D886446B78488DFDA /* AntDesign.ttf */; };
+		9E4983E7DD3346E285C881AA /* FontAwesome5_Brands.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E6F903DE06D94D93A3E9B397 /* FontAwesome5_Brands.ttf */; };
+		F1756455D4BF48E98E8CEA71 /* FontAwesome5_Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 924735C10B5743198555DC9D /* FontAwesome5_Regular.ttf */; };
+		371F91069BB545AABC0511B2 /* FontAwesome5_Solid.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 524005450A7F4E0BB9660080 /* FontAwesome5_Solid.ttf */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -613,6 +617,10 @@
 		FD61A198D0A948A68EDEFB8F /* Asap-Medium.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Asap-Medium.otf"; path = "../src/assets/fonts/open-sans/Asap-Medium.otf"; sourceTree = "<group>"; };
 		FF0AD57CF1A14A05AB0F02EE /* libRNShimmer.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNShimmer.a; sourceTree = "<group>"; };
 		FF2549FBAE04493884146CC1 /* libimageCropPicker.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libimageCropPicker.a; sourceTree = "<group>"; };
+		D9CB1B6D886446B78488DFDA /* AntDesign.ttf */ = {isa = PBXFileReference; name = "AntDesign.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/AntDesign.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
+		E6F903DE06D94D93A3E9B397 /* FontAwesome5_Brands.ttf */ = {isa = PBXFileReference; name = "FontAwesome5_Brands.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Brands.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
+		924735C10B5743198555DC9D /* FontAwesome5_Regular.ttf */ = {isa = PBXFileReference; name = "FontAwesome5_Regular.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Regular.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
+		524005450A7F4E0BB9660080 /* FontAwesome5_Solid.ttf */ = {isa = PBXFileReference; name = "FontAwesome5_Solid.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Solid.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -1122,6 +1130,10 @@
 				AA6869EC232B47169CCD5CEE /* Octicons.ttf */,
 				9A01976E63A64A90B5397B05 /* SimpleLineIcons.ttf */,
 				82B9F0CF4A0E41E9B91136B8 /* Zocial.ttf */,
+				D9CB1B6D886446B78488DFDA /* AntDesign.ttf */,
+				E6F903DE06D94D93A3E9B397 /* FontAwesome5_Brands.ttf */,
+				924735C10B5743198555DC9D /* FontAwesome5_Regular.ttf */,
+				524005450A7F4E0BB9660080 /* FontAwesome5_Solid.ttf */,
 			);
 			name = Resources;
 			sourceTree = "<group>";
@@ -1812,6 +1824,10 @@
 				96210DDE81CC4DD6A05F214A /* Octicons.ttf in Resources */,
 				DC4A549233794E748A21C458 /* SimpleLineIcons.ttf in Resources */,
 				CD67F805AB69427FA9617334 /* Zocial.ttf in Resources */,
+				8B7CED64136E4863B96D8E7B /* AntDesign.ttf in Resources */,
+				9E4983E7DD3346E285C881AA /* FontAwesome5_Brands.ttf in Resources */,
+				F1756455D4BF48E98E8CEA71 /* FontAwesome5_Regular.ttf in Resources */,
+				371F91069BB545AABC0511B2 /* FontAwesome5_Solid.ttf in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

diff --git a/ios/kitsu_mobile/Info.plist b/ios/kitsu_mobile/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.10.1</string>
+	<string>6.10.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -129,6 +129,10 @@
 		<string>Asap-MediumItalic.otf</string>
 		<string>Asap-Regular.otf</string>
 		<string>Feather.ttf</string>
+		<string>AntDesign.ttf</string>
+		<string>FontAwesome5_Brands.ttf</string>
+		<string>FontAwesome5_Regular.ttf</string>
+		<string>FontAwesome5_Solid.ttf</string>
 	</array>
 	<key>UIBackgroundModes</key>
 	<array>

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "kitsu_mobile",
-  "version": "6.10.1",
+  "version": "6.10.2",
   "private": true,
   "scripts": {
     "debug": "REACT_DEBUGGER=\"rndebugger-open --open --port 8081\" yarn start",

diff --git a/src/config/env.js b/src/config/env.js
@@ -12,7 +12,7 @@ export const kitsuConfig = {
   assetsUrl: `${kitsuUrl}/images`,
   baseUrl: apiUrl,
   uploadUrl: `${apiUrl}/edge/uploads/_bulk`,
-  version: '6.10.1',
+  version: '6.10.2',
   stream: {
     API_KEY: 'eb6dvmba4ct3',
     API_SECRET:

diff --git a/src/screens/Feed/index.js b/src/screens/Feed/index.js
@@ -22,9 +22,6 @@ import { statusBarHeight } from 'kitsu/constants/app';
 import { registerDeepLinks, unregisterDeepLinks } from 'kitsu/utils/deeplink';
 import { feedStreams } from './feedStreams';
 import { isAoProOrKitsuPro } from 'kitsu/utils/user';
-import { StyledText } from 'kitsu/components/StyledText';
-import { Button } from 'kitsu/components/Button';
-import { dismissBanner } from 'kitsu/store/app/actions';;
 
 const styles = StyleSheet.create({
   container: {
@@ -36,12 +33,6 @@ const styles = StyleSheet.create({
     flex: 1,
     backgroundColor: listBackPurple,
   },
-  banner: {
-    backgroundColor: listBackPurple,
-    width: Dimensions.get('window').width,
-    padding: 10,
-    paddingBottom: 20,
-  }
 });
 
 class Feed extends React.PureComponent {
@@ -222,17 +213,6 @@ class Feed extends React.PureComponent {
     });
   };
 
-  openSurvey = () => {
-    Linking.openURL("https://kitsu.typeform.com/to/tqNQN4");
-    this.closeSurvey();
-  };
-
-  closeSurvey = () => {
-    if (this.props.dismissBanner) {
-      this.props.dismissBanner();
-    }
-  };
-
   keyExtractor = (item, index) => {
     return `${item.id}-${item.updatedAt}`;
   }
@@ -316,24 +296,14 @@ class Feed extends React.PureComponent {
             removeClippedSubviews={Platform.OS === 'android'}
           />
         </View>
-
-        {!this.props.bannerDismissed && (
-          <View style={styles.banner}>
-            <StyledText bold size="large" textStyle={{ textAlign: 'center' }}>Give us your feedback</StyledText>
-            <StyledText size="small" color="lightGrey" textStyle={{ textAlign: 'center' }}>Most users complete this survey in a few minutes.</StyledText>
-            <Button title="Okay, let's start" style={{ marginVertical: 15 }} onPress={this.openSurvey} />
-            <StyledText size="small" color="red" textStyle={{ textAlign: 'center' }} onPress={this.closeSurvey}>CLOSE</StyledText>
-          </View>
-        )}
       </View>
     );
   }
 }
 
-const mapStateToProps = ({ app, user }) => {
+const mapStateToProps = ({ user }) => {
   const { currentUser } = user;
-  const { bannerDismissed } = app;
-  return { currentUser, bannerDismissed };
+  return { currentUser };
 };
 
-export default connect(mapStateToProps, { dismissBanner })(Feed);
+export default connect(mapStateToProps)(Feed);
diff --git a/src/screens/Sidebar/SidebarScreen.js b/src/screens/Sidebar/SidebarScreen.js
@@ -65,9 +65,6 @@ class SidebarScreen extends PureComponent {
       case 'mailto':
         Linking.openURL('mailto:[email protected]');
         break;
-      case 'survey':
-        Linking.openURL('https://kitsu.typeform.com/to/tqNQN4');
-        break;
       default:
         break;
     }
@@ -90,15 +87,6 @@ class SidebarScreen extends PureComponent {
     };
   }
 
-  get kitsuSections() {
-    return {
-      title: 'Kitsu',
-      data: [
-        { title: 'Community Survey', image: contact, target: 'survey' },
-      ],
-    };
-  }
-
   navigateTo = (screen, props = {}) => {
     Navigation.mergeOptions(Screens.SIDEBAR, {
       sideMenu: {
@@ -178,12 +166,6 @@ class SidebarScreen extends PureComponent {
             this.renderSectionItem(item)
           ))}
 
-          {/* Kitsu Settings */}
-          {this.renderSectionHeader(this.kitsuSections)}
-          {this.kitsuSections.data.map(item => (
-            this.renderSectionItem(item)
-          ))}
-
           {/* Logout */}
           <Button
             style={styles.logoutButton}

diff --git a/src/store/app/reducer.js b/src/store/app/reducer.js
@@ -43,7 +43,7 @@ export const appReducer = (state = initialState, action) => {
     case types.DISMISS_BANNER:
       return {
         ...state,
-        bannerDismissed: true
+        bannerDismissed: true,
       };
     case REHYDRATE: {
       const payload = action && action.payload;