From 9bd8fa9353dab75b6eb5963bf0da7f30678de129 Mon Sep 17 00:00:00 2001
From: Brandon Presley <brandon@presley.nz>
Date: Fri, 14 Oct 2022 18:12:21 +1300
Subject: [PATCH] Replace height percent setting with flex: 1

This way reacts better to changing the screen sizes.
I think there was one bug where the fab wouldn't be
precisely at the bottom of the page depending on the
flat list length.
---
 BestList.tsx    | 6 +-----
 EditPlan.tsx    | 4 ++--
 EditWorkout.tsx | 4 ++--
 MassiveFab.tsx  | 2 +-
 Page.tsx        | 1 -
 PlanList.tsx    | 2 +-
 SetList.tsx     | 2 +-
 WorkoutList.tsx | 2 +-
 8 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/BestList.tsx b/BestList.tsx
index eef96b8..b9199bb 100644
--- a/BestList.tsx
+++ b/BestList.tsx
@@ -65,11 +65,7 @@ export default function BestList() {
           description="Once sets have been added, this will highlight your personal bests."
         />
       ) : (
-        <FlatList
-          style={{height: '99%'}}
-          renderItem={renderItem}
-          data={bests}
-        />
+        <FlatList style={{flex: 1}} renderItem={renderItem} data={bests} />
       )}
     </Page>
   );
diff --git a/EditPlan.tsx b/EditPlan.tsx
index b8c4169..c7c364b 100644
--- a/EditPlan.tsx
+++ b/EditPlan.tsx
@@ -87,8 +87,8 @@ export default function EditPlan() {
   );
 
   return (
-    <View style={{padding: PADDING}}>
-      <ScrollView style={{height: '90%'}}>
+    <View style={{padding: PADDING, flex: 1}}>
+      <ScrollView style={{flex: 1}}>
         <Text style={styles.title}>Days</Text>
         {DAYS.map(day => (
           <Switch
diff --git a/EditWorkout.tsx b/EditWorkout.tsx
index 5114837..7271bcf 100644
--- a/EditWorkout.tsx
+++ b/EditWorkout.tsx
@@ -118,8 +118,8 @@ export default function EditWorkout() {
   };
 
   return (
-    <View style={{padding: PADDING}}>
-      <ScrollView style={{height: '90%'}}>
+    <View style={{padding: PADDING, flex: 1}}>
+      <ScrollView style={{flex: 1}}>
         <MassiveInput
           autoFocus
           label="Name"
diff --git a/MassiveFab.tsx b/MassiveFab.tsx
index 191b75a..ba82bfd 100644
--- a/MassiveFab.tsx
+++ b/MassiveFab.tsx
@@ -18,7 +18,7 @@ export default function MassiveFab(
       style={{
         position: 'absolute',
         right: 10,
-        bottom: 60,
+        bottom: 10,
         backgroundColor: color,
       }}
       {...props}
diff --git a/Page.tsx b/Page.tsx
index aafbaa6..c945fc4 100644
--- a/Page.tsx
+++ b/Page.tsx
@@ -34,6 +34,5 @@ const styles = StyleSheet.create({
   container: {
     flexGrow: 1,
     padding: PADDING,
-    paddingBottom: '10%',
   },
 });
diff --git a/PlanList.tsx b/PlanList.tsx
index 06d1561..7ba8cf5 100644
--- a/PlanList.tsx
+++ b/PlanList.tsx
@@ -54,7 +54,7 @@ export default function PlanList() {
         />
       ) : (
         <FlatList
-          style={{height: '99%'}}
+          style={{flex: 1}}
           data={plans}
           renderItem={renderItem}
           keyExtractor={set => set.id?.toString() || ''}
diff --git a/SetList.tsx b/SetList.tsx
index 55423c3..8521a4e 100644
--- a/SetList.tsx
+++ b/SetList.tsx
@@ -95,7 +95,7 @@ export default function SetList() {
       ) : (
         <FlatList
           data={sets}
-          style={{height: '99%'}}
+          style={{flex: 1}}
           renderItem={renderItem}
           keyExtractor={s => s.id!.toString()}
           onEndReached={next}
diff --git a/WorkoutList.tsx b/WorkoutList.tsx
index 41dca82..bda6b3d 100644
--- a/WorkoutList.tsx
+++ b/WorkoutList.tsx
@@ -88,7 +88,7 @@ export default function WorkoutList() {
       ) : (
         <FlatList
           data={workouts}
-          style={{height: '99%'}}
+          style={{flex: 1}}
           renderItem={renderItem}
           keyExtractor={w => w.name}
           onEndReached={next}