Merge pull request #473 from wyne/android-activity-permission

Fix android bugs
wyne · Jul 24, 2024 · 9c8602c · 9c8602c
2 parents 6c5f5dd + c5314c6
commit 9c8602c
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 23 deletions.
diff --git a/app.config.js b/app.config.js
@@ -82,6 +82,7 @@ export default {
         },
         package: packageName,
         permissions: [],
+        blockedPermissions: ['android.permission.ACTIVITY_RECOGNITION'],
         versionCode: 80,
         googleServicesFile: './google-services.json',
     },

diff --git a/eas.json b/eas.json
@@ -23,6 +23,9 @@
       "ios": {
         "resourceClass": "m-medium"
       },
+      "android": {
+        "buildType": "apk"
+      },
       "env": {
         "APP_VARIANT": "development",
         "EXPO_PUBLIC_FIREBASE_ANALYTICS": "false"
@@ -34,6 +37,9 @@
       "ios": {
         "resourceClass": "m-medium"
       },
+      "android": {
+        "buildType": "apk"
+      },
       "channel": "preview",
       "env": {
         "APP_VARIANT": "preview",

diff --git a/src/components/GameListItem.tsx b/src/components/GameListItem.tsx
@@ -64,14 +64,12 @@ const GameListItem: React.FunctionComponent<Props> = ({ navigation, gameId, inde
                 index={index}
             >
                 <ListItem key={gameId} bottomDivider
-                    onLongPress={() => {
+                    onLongPress={Platform.OS == 'android' ? undefined : () => {
                         Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Heavy);
                         logEvent('list_menu_open');
                     }}
-                    onPress={
-                        // Only select game if iOS because Android is handled by PopupMenu
-                        Platform.OS == 'ios' ? chooseGameHandler : undefined
-                    }>
+                    onPress={Platform.OS == 'android' ? undefined : chooseGameHandler}
+                >
                     <ListItem.Content>
                         <ListItem.Title style={{ alignItems: 'center' }}>
                             {gameTitle}

diff --git a/src/components/Headers/AppInfoHeader.tsx b/src/components/Headers/AppInfoHeader.tsx
@@ -2,7 +2,8 @@ import React from 'react';
 
 import { ParamListBase } from '@react-navigation/native';
 import { NativeStackNavigationProp } from '@react-navigation/native-stack';
-import { Text, View } from 'react-native';
+import { Platform, StyleSheet, Text, View } from 'react-native';
+import { SafeAreaView } from 'react-native-safe-area-context';
 
 import { systemBlue } from '../../constants';
 import HeaderButton from '../Buttons/HeaderButton';
@@ -14,22 +15,35 @@ interface Props {
 
 const AppInfoHeader: React.FunctionComponent<Props> = ({ navigation }: Props) => {
 
+    const Wrapper = Platform.OS == 'ios' ? View : SafeAreaView;
+
     return (
-        <View style={{
-            justifyContent: 'flex-end',
-            alignItems: 'center',
-            flexDirection: 'row',
-            backgroundColor: '#F2F2F7',
-        }}>
-            <HeaderButton
-                accessibilityLabel='Save Game'
-                onPress={async () => {
-                    navigation.goBack();
-                }}>
-                <Text style={{ color: systemBlue, fontSize: 20 }}>Done</Text>
-            </HeaderButton>
-        </View>
+        <Wrapper style={Platform.OS == 'ios' ? undefined : styles.headerContainer} >
+            <View style={{
+                justifyContent: 'flex-end',
+                alignItems: 'center',
+                flexDirection: 'row',
+                backgroundColor: '#F2F2F7',
+            }}>
+                <HeaderButton
+                    accessibilityLabel='Save Game'
+                    onPress={async () => {
+                        navigation.goBack();
+                    }}>
+                    <Text style={{ color: systemBlue, fontSize: 20 }}>Done</Text>
+                </HeaderButton>
+            </View>
+        </Wrapper>
     );
 };
 
 export default AppInfoHeader;
+
+const styles = StyleSheet.create({
+    headerContainer: {
+        backgroundColor: '#F2F2F7',
+        flexDirection: 'row',
+        justifyContent: 'flex-end',
+        textAlign: 'center',
+    },
+});
diff --git a/src/components/Onboarding/OnboardingPage.tsx b/src/components/Onboarding/OnboardingPage.tsx
@@ -137,6 +137,7 @@ const styles = StyleSheet.create({
     },
     finishButton: {
         borderColor: 'black',
+        borderWidth: 1,
         borderRadius: 20,
         padding: 10,
         margin: 15,

diff --git a/src/components/Onboarding/SkipButton.tsx b/src/components/Onboarding/SkipButton.tsx
@@ -1,6 +1,7 @@
 import React, { useEffect } from 'react';
 
 import {
+    Platform,
     StyleSheet,
     Text,
     TouchableOpacity,
@@ -51,6 +52,7 @@ export default SkipButton;
 
 const styles = StyleSheet.create({
     button: {
+        marginTop: Platform.OS == 'ios' ? 'auto' : 30,
         padding: 10,
         margin: 10,
         borderRadius: 20,

diff --git a/src/components/Rounds.tsx b/src/components/Rounds.tsx
@@ -2,8 +2,8 @@ import React, { useCallback, useEffect, useRef, useState } from 'react';
 
 import { ParamListBase } from '@react-navigation/native';
 import { NativeStackNavigationProp } from '@react-navigation/native-stack';
-import { LayoutChangeEvent, Platform, ScrollView, StyleSheet, View } from 'react-native';
-import { TouchableOpacity } from 'react-native-gesture-handler';
+import { LayoutChangeEvent, Platform, StyleSheet, View } from 'react-native';
+import { TouchableOpacity, ScrollView } from 'react-native-gesture-handler';
 
 import { selectGameById, setSortSelector } from '../../redux/GamesSlice';
 import { useAppDispatch, useAppSelector } from '../../redux/hooks';
@@ -83,6 +83,7 @@ const Rounds: React.FunctionComponent<Props> = ({ }) => {
             </TouchableOpacity>
 
             <ScrollView horizontal={true}
+                nestedScrollEnabled={true}
                 contentContainerStyle={{ flexDirection: 'row' }}
                 ref={roundsScrollViewEl}>
                 {roundsIterator.map((item, round) => (

diff --git a/src/components/Sheets/GameSheet.tsx b/src/components/Sheets/GameSheet.tsx
@@ -227,7 +227,7 @@ const GameSheet: React.FunctionComponent<Props> = ({ navigation, containerHeight
             animatedPosition={animatedPosition}
             enablePanDownToClose={false}
         >
-            <BottomSheetScrollView >
+            <BottomSheetScrollView>
                 <SafeAreaView edges={['right', 'left']}>
                     <View style={styles.sheetHeaderContainer}>
                         <TouchableWithoutFeedback onPress={() => sheetTitlePress()}>