Reword MassiveX as AppX
This commit is contained in:
parent
41ed9464c9
commit
5115055280
|
@ -3,7 +3,7 @@ import {FAB, useTheme} from 'react-native-paper'
|
||||||
import {CombinedDarkTheme, CombinedDefaultTheme} from './App'
|
import {CombinedDarkTheme, CombinedDefaultTheme} from './App'
|
||||||
import {lightColors} from './colors'
|
import {lightColors} from './colors'
|
||||||
|
|
||||||
export default function MassiveFab(props: Partial<ComponentProps<typeof FAB>>) {
|
export default function AppFab(props: Partial<ComponentProps<typeof FAB>>) {
|
||||||
const {colors} = useTheme()
|
const {colors} = useTheme()
|
||||||
|
|
||||||
const fabColor = useMemo(
|
const fabColor = useMemo(
|
|
@ -4,7 +4,7 @@ import {CombinedDefaultTheme} from './App'
|
||||||
import {MARGIN} from './constants'
|
import {MARGIN} from './constants'
|
||||||
import useDark from './use-dark'
|
import useDark from './use-dark'
|
||||||
|
|
||||||
export default function MassiveInput(
|
export default function AppInput(
|
||||||
props: Partial<ComponentProps<typeof TextInput>> & {
|
props: Partial<ComponentProps<typeof TextInput>> & {
|
||||||
innerRef?: Ref<any>
|
innerRef?: Ref<any>
|
||||||
},
|
},
|
12
EditSet.tsx
12
EditSet.tsx
|
@ -14,7 +14,7 @@ import {MARGIN, PADDING} from './constants'
|
||||||
import {getNow, setRepo, settingsRepo} from './db'
|
import {getNow, setRepo, settingsRepo} from './db'
|
||||||
import GymSet from './gym-set'
|
import GymSet from './gym-set'
|
||||||
import {HomePageParams} from './home-page-params'
|
import {HomePageParams} from './home-page-params'
|
||||||
import MassiveInput from './MassiveInput'
|
import AppInput from './AppInput'
|
||||||
import Settings from './settings'
|
import Settings from './settings'
|
||||||
import StackHeader from './StackHeader'
|
import StackHeader from './StackHeader'
|
||||||
import {toast} from './toast'
|
import {toast} from './toast'
|
||||||
|
@ -118,7 +118,7 @@ export default function EditSet() {
|
||||||
<StackHeader title="Edit set" />
|
<StackHeader title="Edit set" />
|
||||||
|
|
||||||
<View style={{padding: PADDING, flex: 1}}>
|
<View style={{padding: PADDING, flex: 1}}>
|
||||||
<MassiveInput
|
<AppInput
|
||||||
label="Name"
|
label="Name"
|
||||||
value={name}
|
value={name}
|
||||||
onChangeText={setName}
|
onChangeText={setName}
|
||||||
|
@ -127,7 +127,7 @@ export default function EditSet() {
|
||||||
onSubmitEditing={() => repsRef.current?.focus()}
|
onSubmitEditing={() => repsRef.current?.focus()}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<MassiveInput
|
<AppInput
|
||||||
label="Reps"
|
label="Reps"
|
||||||
keyboardType="numeric"
|
keyboardType="numeric"
|
||||||
value={reps}
|
value={reps}
|
||||||
|
@ -139,7 +139,7 @@ export default function EditSet() {
|
||||||
innerRef={repsRef}
|
innerRef={repsRef}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<MassiveInput
|
<AppInput
|
||||||
label="Weight"
|
label="Weight"
|
||||||
keyboardType="numeric"
|
keyboardType="numeric"
|
||||||
value={weight}
|
value={weight}
|
||||||
|
@ -149,7 +149,7 @@ export default function EditSet() {
|
||||||
/>
|
/>
|
||||||
|
|
||||||
{settings.showUnit && (
|
{settings.showUnit && (
|
||||||
<MassiveInput
|
<AppInput
|
||||||
autoCapitalize="none"
|
autoCapitalize="none"
|
||||||
label="Unit"
|
label="Unit"
|
||||||
value={unit}
|
value={unit}
|
||||||
|
@ -159,7 +159,7 @@ export default function EditSet() {
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{typeof set.id === 'number' && settings.showDate && (
|
{typeof set.id === 'number' && settings.showDate && (
|
||||||
<MassiveInput
|
<AppInput
|
||||||
label="Created"
|
label="Created"
|
||||||
disabled
|
disabled
|
||||||
value={format(new Date(set.created), settings.date)}
|
value={format(new Date(set.created), settings.date)}
|
||||||
|
|
10
EditSets.tsx
10
EditSets.tsx
|
@ -14,7 +14,7 @@ import {MARGIN, PADDING} from './constants'
|
||||||
import {setRepo, settingsRepo} from './db'
|
import {setRepo, settingsRepo} from './db'
|
||||||
import GymSet from './gym-set'
|
import GymSet from './gym-set'
|
||||||
import {HomePageParams} from './home-page-params'
|
import {HomePageParams} from './home-page-params'
|
||||||
import MassiveInput from './MassiveInput'
|
import AppInput from './AppInput'
|
||||||
import Settings from './settings'
|
import Settings from './settings'
|
||||||
import StackHeader from './StackHeader'
|
import StackHeader from './StackHeader'
|
||||||
|
|
||||||
|
@ -81,7 +81,7 @@ export default function EditSets() {
|
||||||
<StackHeader title={`Edit ${ids.length} sets`} />
|
<StackHeader title={`Edit ${ids.length} sets`} />
|
||||||
|
|
||||||
<View style={{padding: PADDING, flex: 1}}>
|
<View style={{padding: PADDING, flex: 1}}>
|
||||||
<MassiveInput
|
<AppInput
|
||||||
label={`Names: ${names}`}
|
label={`Names: ${names}`}
|
||||||
value={name}
|
value={name}
|
||||||
onChangeText={setName}
|
onChangeText={setName}
|
||||||
|
@ -89,7 +89,7 @@ export default function EditSets() {
|
||||||
autoFocus={!name}
|
autoFocus={!name}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<MassiveInput
|
<AppInput
|
||||||
label={`Reps: ${oldReps}`}
|
label={`Reps: ${oldReps}`}
|
||||||
keyboardType="numeric"
|
keyboardType="numeric"
|
||||||
value={reps}
|
value={reps}
|
||||||
|
@ -99,7 +99,7 @@ export default function EditSets() {
|
||||||
autoFocus={!!name}
|
autoFocus={!!name}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<MassiveInput
|
<AppInput
|
||||||
label={`Weights: ${weights}`}
|
label={`Weights: ${weights}`}
|
||||||
keyboardType="numeric"
|
keyboardType="numeric"
|
||||||
value={weight}
|
value={weight}
|
||||||
|
@ -108,7 +108,7 @@ export default function EditSets() {
|
||||||
/>
|
/>
|
||||||
|
|
||||||
{settings.showUnit && (
|
{settings.showUnit && (
|
||||||
<MassiveInput
|
<AppInput
|
||||||
autoCapitalize="none"
|
autoCapitalize="none"
|
||||||
label={`Units: ${units}`}
|
label={`Units: ${units}`}
|
||||||
value={unit}
|
value={unit}
|
||||||
|
|
|
@ -12,7 +12,7 @@ import ConfirmDialog from './ConfirmDialog'
|
||||||
import {MARGIN, PADDING} from './constants'
|
import {MARGIN, PADDING} from './constants'
|
||||||
import {getNow, planRepo, setRepo, settingsRepo} from './db'
|
import {getNow, planRepo, setRepo, settingsRepo} from './db'
|
||||||
import {defaultSet} from './gym-set'
|
import {defaultSet} from './gym-set'
|
||||||
import MassiveInput from './MassiveInput'
|
import AppInput from './AppInput'
|
||||||
import Settings from './settings'
|
import Settings from './settings'
|
||||||
import StackHeader from './StackHeader'
|
import StackHeader from './StackHeader'
|
||||||
import {WorkoutsPageParams} from './WorkoutsPage'
|
import {WorkoutsPageParams} from './WorkoutsPage'
|
||||||
|
@ -110,7 +110,7 @@ export default function EditWorkout() {
|
||||||
<StackHeader title="Edit workout" />
|
<StackHeader title="Edit workout" />
|
||||||
<View style={{padding: PADDING, flex: 1}}>
|
<View style={{padding: PADDING, flex: 1}}>
|
||||||
<ScrollView style={{flex: 1}}>
|
<ScrollView style={{flex: 1}}>
|
||||||
<MassiveInput
|
<AppInput
|
||||||
autoFocus
|
autoFocus
|
||||||
label="Name"
|
label="Name"
|
||||||
value={name}
|
value={name}
|
||||||
|
@ -118,7 +118,7 @@ export default function EditWorkout() {
|
||||||
onSubmitEditing={submitName}
|
onSubmitEditing={submitName}
|
||||||
/>
|
/>
|
||||||
{settings?.steps && (
|
{settings?.steps && (
|
||||||
<MassiveInput
|
<AppInput
|
||||||
innerRef={stepsRef}
|
innerRef={stepsRef}
|
||||||
selectTextOnFocus={false}
|
selectTextOnFocus={false}
|
||||||
value={steps}
|
value={steps}
|
||||||
|
@ -128,7 +128,7 @@ export default function EditWorkout() {
|
||||||
onSubmitEditing={() => setsRef.current?.focus()}
|
onSubmitEditing={() => setsRef.current?.focus()}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
<MassiveInput
|
<AppInput
|
||||||
innerRef={setsRef}
|
innerRef={setsRef}
|
||||||
value={sets}
|
value={sets}
|
||||||
onChangeText={setSets}
|
onChangeText={setSets}
|
||||||
|
@ -138,7 +138,7 @@ export default function EditWorkout() {
|
||||||
/>
|
/>
|
||||||
{settings?.alarm && (
|
{settings?.alarm && (
|
||||||
<>
|
<>
|
||||||
<MassiveInput
|
<AppInput
|
||||||
innerRef={minutesRef}
|
innerRef={minutesRef}
|
||||||
onSubmitEditing={() => secondsRef.current?.focus()}
|
onSubmitEditing={() => secondsRef.current?.focus()}
|
||||||
value={minutes}
|
value={minutes}
|
||||||
|
@ -146,7 +146,7 @@ export default function EditWorkout() {
|
||||||
label="Rest minutes"
|
label="Rest minutes"
|
||||||
keyboardType="numeric"
|
keyboardType="numeric"
|
||||||
/>
|
/>
|
||||||
<MassiveInput
|
<AppInput
|
||||||
innerRef={secondsRef}
|
innerRef={secondsRef}
|
||||||
value={seconds}
|
value={seconds}
|
||||||
onChangeText={setSeconds}
|
onChangeText={setSeconds}
|
||||||
|
|
4
Page.tsx
4
Page.tsx
|
@ -1,7 +1,7 @@
|
||||||
import {StyleProp, StyleSheet, View, ViewStyle} from 'react-native'
|
import {StyleProp, StyleSheet, View, ViewStyle} from 'react-native'
|
||||||
import {Searchbar} from 'react-native-paper'
|
import {Searchbar} from 'react-native-paper'
|
||||||
|
import AppFab from './AppFab'
|
||||||
import {PADDING} from './constants'
|
import {PADDING} from './constants'
|
||||||
import MassiveFab from './MassiveFab'
|
|
||||||
|
|
||||||
export default function Page({
|
export default function Page({
|
||||||
onAdd,
|
onAdd,
|
||||||
|
@ -26,7 +26,7 @@ export default function Page({
|
||||||
clearIcon="clear"
|
clearIcon="clear"
|
||||||
/>
|
/>
|
||||||
{children}
|
{children}
|
||||||
{onAdd && <MassiveFab onPress={onAdd} />}
|
{onAdd && <AppFab onPress={onAdd} />}
|
||||||
</View>
|
</View>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,7 +9,7 @@ import CountMany from './count-many'
|
||||||
import {AppDataSource} from './data-source'
|
import {AppDataSource} from './data-source'
|
||||||
import {getNow, setRepo, settingsRepo} from './db'
|
import {getNow, setRepo, settingsRepo} from './db'
|
||||||
import GymSet from './gym-set'
|
import GymSet from './gym-set'
|
||||||
import MassiveInput from './MassiveInput'
|
import AppInput from './AppInput'
|
||||||
import {PlanPageParams} from './plan-page-params'
|
import {PlanPageParams} from './plan-page-params'
|
||||||
import Settings from './settings'
|
import Settings from './settings'
|
||||||
import StackHeader from './StackHeader'
|
import StackHeader from './StackHeader'
|
||||||
|
@ -111,7 +111,7 @@ export default function StartPlan() {
|
||||||
<StackHeader title={params.plan.days.replace(/,/g, ', ')} />
|
<StackHeader title={params.plan.days.replace(/,/g, ', ')} />
|
||||||
<View style={{padding: PADDING, flex: 1, flexDirection: 'column'}}>
|
<View style={{padding: PADDING, flex: 1, flexDirection: 'column'}}>
|
||||||
<View style={{flex: 1}}>
|
<View style={{flex: 1}}>
|
||||||
<MassiveInput
|
<AppInput
|
||||||
label="Reps"
|
label="Reps"
|
||||||
keyboardType="numeric"
|
keyboardType="numeric"
|
||||||
value={reps}
|
value={reps}
|
||||||
|
@ -121,7 +121,7 @@ export default function StartPlan() {
|
||||||
onSelectionChange={e => setSelection(e.nativeEvent.selection)}
|
onSelectionChange={e => setSelection(e.nativeEvent.selection)}
|
||||||
innerRef={repsRef}
|
innerRef={repsRef}
|
||||||
/>
|
/>
|
||||||
<MassiveInput
|
<AppInput
|
||||||
label="Weight"
|
label="Weight"
|
||||||
keyboardType="numeric"
|
keyboardType="numeric"
|
||||||
value={weight}
|
value={weight}
|
||||||
|
@ -131,7 +131,7 @@ export default function StartPlan() {
|
||||||
blurOnSubmit
|
blurOnSubmit
|
||||||
/>
|
/>
|
||||||
{settings?.showUnit && (
|
{settings?.showUnit && (
|
||||||
<MassiveInput
|
<AppInput
|
||||||
autoCapitalize="none"
|
autoCapitalize="none"
|
||||||
label="Unit"
|
label="Unit"
|
||||||
value={unit}
|
value={unit}
|
||||||
|
|
|
@ -3,10 +3,10 @@ import React, {useCallback, useMemo, useState} from 'react'
|
||||||
import {Dimensions, NativeModules, View} from 'react-native'
|
import {Dimensions, NativeModules, View} from 'react-native'
|
||||||
import {Button, Text, useTheme} from 'react-native-paper'
|
import {Button, Text, useTheme} from 'react-native-paper'
|
||||||
import {ProgressCircle} from 'react-native-svg-charts'
|
import {ProgressCircle} from 'react-native-svg-charts'
|
||||||
|
import AppFab from './AppFab'
|
||||||
import {MARGIN, PADDING} from './constants'
|
import {MARGIN, PADDING} from './constants'
|
||||||
import {settingsRepo} from './db'
|
import {settingsRepo} from './db'
|
||||||
import DrawerHeader from './DrawerHeader'
|
import DrawerHeader from './DrawerHeader'
|
||||||
import MassiveFab from './MassiveFab'
|
|
||||||
import Settings from './settings'
|
import Settings from './settings'
|
||||||
import useTimer from './use-timer'
|
import useTimer from './use-timer'
|
||||||
|
|
||||||
|
@ -69,7 +69,7 @@ export default function TimerPage() {
|
||||||
<Button onPress={add} style={{position: 'absolute', top: '82%', left}}>
|
<Button onPress={add} style={{position: 'absolute', top: '82%', left}}>
|
||||||
Add 1 min
|
Add 1 min
|
||||||
</Button>
|
</Button>
|
||||||
<MassiveFab icon="stop" onPress={stop} />
|
<AppFab icon="stop" onPress={stop} />
|
||||||
</>
|
</>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user