fix(android): prevent ending up scrolled past end

timmyers · Mar 20, 2020 · 5c14956 · 5c14956
1 parent e1157bb
commit 5c14956
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -71,6 +71,7 @@ jobs:
           turtle setup:ios
           turtle build:ios --public-url=https://expo.brewedhere.co/ios-index.json --type=simulator --output=brewed-here.tar.gz
       - name: Upload ios artifact
+        if: steps.set_output.outputs.BUILD_APPS == 'true'
         uses: actions/upload-artifact@v1
         with:
           name: ios-archive

diff --git a/app/components/BreweryList.tsx b/app/components/BreweryList.tsx
@@ -1,23 +1,32 @@
-import React, { useRef } from 'react';
-import { StyleSheet, FlatList, SafeAreaView } from 'react-native';
+import React, { useRef, useState } from 'react';
+import { StyleSheet, FlatList, SafeAreaView, Dimensions } from 'react-native';
 import BreweryListItem from './BreweryListItem';
 
 export default ({ breweries }) => {
   const flatList = useRef(undefined);
+  const [refresh, setRefresh] = useState(true)
+
+  const renderItem = ({ item }) => <BreweryListItem brewery={item} />;
+  const itemWidth = Dimensions.get('window').width * .8;
 
   return (
     <SafeAreaView style={styles.holder}>
       <FlatList
         ref={flatList}
         style={{ height: '100%' }}
         data={breweries}
-        renderItem={({ item }) => <BreweryListItem brewery={item} />}
+        renderItem={renderItem}
         keyExtractor={(item: any) => item.id}
         horizontal={true}
         showsHorizontalScrollIndicator={false}
-        onContentSizeChange={() => {
-          flatList.current.scrollToOffset(0)
+        getItemLayout={(data, index) => (
+          { length: itemWidth, offset: itemWidth * index, index }
+        )}
+        // Hack to not end up scrolled past end on Android
+        onContentSizeChange={(size) => {
+          setRefresh(!refresh)
         }}
+        extraData={refresh}
       />
     </SafeAreaView>
   )

diff --git a/app/db/index.ts b/app/db/index.ts
@@ -7,7 +7,6 @@ let dbConn: Promise<Connection>;
 
 export const connect = () => {
   if (dbConn == undefined) {
-    console.log('connect')
     dbConn = createConnection({
       database: 'db',
       driver: require('expo-sqlite'),
@@ -32,7 +31,6 @@ export const connect = () => {
 // })()
 
 export const getAllVisits = async () => {
-  console.log('getAllVisits')
   try {
     const db = await dbConn;