Replace all unit text boxes with dropdowns - 1.183 🚀

This commit is contained in:
Brandon Presley 2023-11-13 18:32:36 +13:00
parent d8eba22914
commit 315279e28d
5 changed files with 30 additions and 18 deletions

View File

@ -19,6 +19,7 @@ import { DrawerParams } from "./drawer-param-list";
import GymSet from "./gym-set"; import GymSet from "./gym-set";
import Settings from "./settings"; import Settings from "./settings";
import StackHeader from "./StackHeader"; import StackHeader from "./StackHeader";
import Select from "./Select";
export default function EditSets() { export default function EditSets() {
const { params } = useRoute<RouteProp<StackParams, "EditSets">>(); const { params } = useRoute<RouteProp<StackParams, "EditSets">>();
@ -144,11 +145,15 @@ export default function EditSets() {
</View> </View>
{settings.showUnit && ( {settings.showUnit && (
<AppInput <Select
autoCapitalize="none"
label={`Units: ${units}`}
value={unit} value={unit}
onChangeText={setUnit} onChange={setUnit}
items={[
{ label: "kg", value: "kg" },
{ label: "lb", value: "lb" },
{ label: "stone", value: "stone" },
]}
label={`Units: ${units}`}
/> />
)} )}

View File

@ -21,6 +21,7 @@ import Settings from "./settings";
import StackHeader from "./StackHeader"; import StackHeader from "./StackHeader";
import { toast } from "./toast"; import { toast } from "./toast";
import Weight from "./weight"; import Weight from "./weight";
import Select from "./Select";
export default function EditWeight() { export default function EditWeight() {
const { params } = useRoute<RouteProp<StackParams, "EditWeight">>(); const { params } = useRoute<RouteProp<StackParams, "EditWeight">>();
@ -127,12 +128,15 @@ export default function EditWeight() {
/> />
{settings.showUnit && ( {settings.showUnit && (
<AppInput <Select
autoCapitalize="none"
label="Unit"
value={unit} value={unit}
onChangeText={setUnit} onChange={setUnit}
innerRef={unitRef} items={[
{ label: "kg", value: "kg" },
{ label: "lb", value: "lb" },
{ label: "stone", value: "stone" },
]}
label="Unit"
/> />
)} )}

View File

@ -22,6 +22,7 @@ import StackHeader from "./StackHeader";
import StartPlanItem from "./StartPlanItem"; import StartPlanItem from "./StartPlanItem";
import { toast } from "./toast"; import { toast } from "./toast";
import { PERMISSIONS, RESULTS, check, request } from "react-native-permissions"; import { PERMISSIONS, RESULTS, check, request } from "react-native-permissions";
import Select from "./Select";
export default function StartPlan() { export default function StartPlan() {
const { params } = useRoute<RouteProp<StackParams, "StartPlan">>(); const { params } = useRoute<RouteProp<StackParams, "StartPlan">>();
@ -33,7 +34,6 @@ export default function StartPlan() {
const [counts, setCounts] = useState<CountMany[]>(); const [counts, setCounts] = useState<CountMany[]>();
const weightRef = useRef<TextInput>(null); const weightRef = useRef<TextInput>(null);
const repsRef = useRef<TextInput>(null); const repsRef = useRef<TextInput>(null);
const unitRef = useRef<TextInput>(null);
const exercises = useMemo(() => params.plan.exercises.split(","), [params]); const exercises = useMemo(() => params.plan.exercises.split(","), [params]);
const navigation = useNavigation<NavigationProp<StackParams>>(); const navigation = useNavigation<NavigationProp<StackParams>>();
@ -193,12 +193,15 @@ export default function StartPlan() {
</View> </View>
{settings?.showUnit && ( {settings?.showUnit && (
<AppInput <Select
autoCapitalize="none"
label="Unit"
value={unit} value={unit}
onChangeText={setUnit} onChange={setUnit}
innerRef={unitRef} items={[
{ label: "kg", value: "kg" },
{ label: "lb", value: "lb" },
{ label: "stone", value: "stone" },
]}
label="Unit"
/> />
)} )}
{counts && ( {counts && (

View File

@ -85,8 +85,8 @@ android {
applicationId "com.massive" applicationId "com.massive"
minSdkVersion rootProject.ext.minSdkVersion minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 36208 versionCode 36209
versionName "1.182" versionName "1.183"
} }
signingConfigs { signingConfigs {
release { release {

View File

@ -1,6 +1,6 @@
{ {
"name": "massive", "name": "massive",
"version": "1.182", "version": "1.183",
"private": true, "private": true,
"license": "GPL-3.0-only", "license": "GPL-3.0-only",
"scripts": { "scripts": {