Merge branch 'master' into andrew/fix-inverted-flatlist

textileio · Mar 25, 2019 · dd4e749 · dd4e749
2 parents b839525 + e9006e8
commit dd4e749
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/App/Components/QRCodeModal.tsx b/App/Components/QRCodeModal.tsx
@@ -6,7 +6,8 @@ import {
   View,
   Text,
   TouchableOpacity,
-  KeyboardAvoidingView
+  KeyboardAvoidingView,
+  Platform
 } from 'react-native'
 import QRCode from 'react-native-qrcode'
 import Modal from 'react-native-modal'
@@ -32,6 +33,10 @@ interface ScreenProps {
 
 class QRCodeModal extends React.Component<DispatchProps & ScreenProps> {
   getLink (link: string): string {
+    if (Platform.OS === 'android') {
+      // issues with Android link getting stolen by chrome... so just going to URL it now
+      return link
+    }
     return link.replace('https://', `${Config.RN_URL_SCHEME}://`)
   }
 
@@ -55,7 +60,7 @@ class QRCodeModal extends React.Component<DispatchProps & ScreenProps> {
               </View>
               <View style={styles.qrCode}>
                 {this.props.invite && <QRCode
-                  value={this.getLink(this.props.invite.link)}
+                  value={this.props.invite.link}
                   size={240}
                   bgColor='transparent'
                   fgColor='white'

diff --git a/App/screens/group/group.tsx b/App/screens/group/group.tsx
@@ -108,6 +108,7 @@ class Group extends Component<Props, State> {
   }
 
   render () {
+    // flexGrow allows android to scroll, however https://github.com/facebook/react-native/issues/19434 is still an issue
     return (
       <SafeAreaView style={{ flex: 1, flexGrow: 1 }}>
         <KeyboardResponsiveContainer>

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -35,7 +35,9 @@
           <action android:name="android.intent.action.VIEW" />
           <category android:name="android.intent.category.DEFAULT" />
           <category android:name="android.intent.category.BROWSABLE" />
+          <data android:scheme="textile-beta" android:host="textile.photos"/>
           <data android:scheme="textile-dev" android:host="textile.photos"/>
+          <data android:scheme="textile" android:host="textile.photos"/>
           <data android:scheme="https"
                 android:host="www.textile.photos"
                 android:pathPrefix="/invites" />