Jannex
/
expo-app
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

better margin in edit actions

main
alex 2023-08-15 10:59:03 +00:00
parent ed3b92fafb
commit 92d44ec406
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Components/ColorPicker/index.js
View File

@ -323,6 +323,7 @@ export function MyColorPickerV2({
gap: 10, gap: 10,
justifyContent: "center", justifyContent: "center",
marginTop: 10, marginTop: 10,
marginBottom: 10,
}} }}
> >
{appContext.userColorSwatchesFavorites.map((color, i) => ( {appContext.userColorSwatchesFavorites.map((color, i) => (

2
src/Components/Slider/index.js
View File

@ -104,7 +104,7 @@ export function MyTwoThumbsSlider({
<MyIcon name={iconName} size={24} /> <MyIcon name={iconName} size={24} />
<View style={{ flex: 1 }}>{renderChildren()}</View> <View style={{ flex: 1 }}>{renderChildren()}</View>
<View style={{ width: 62, alignItems: "center" }}> <View style={{ width: 70, alignItems: "center" }}>
<Text style={{ color: appContext.appTheme.text }}> <Text style={{ color: appContext.appTheme.text }}>
{Array.isArray(value) ? value.join(" - ") : value} {Array.isArray(value) ? value.join(" - ") : value}
{unitOfMeasurement} {unitOfMeasurement}

19
src/Screens/Device/modals/EditActions/index.js
View File

@ -2,6 +2,7 @@ import { FlatList, Text, View } from "react-native";
import { import {
AppContext, AppContext,
AppStyles, AppStyles,
Constants,
IsPlatformIos, IsPlatformIos,
ModalContainer, ModalContainer,
} from "../../../../utils"; } from "../../../../utils";
@ -53,7 +54,12 @@ export function EditActionAnimationsCardContent({
<MyDropdown <MyDropdown
disabled={disabled} disabled={disabled}
style={{ marginTop: 2 }} style={[
{ marginTop: 2 },
selectedLightAnimationOut !== Constants.defaultAnimationId && {
marginBottom: 6,
},
]}
label={t( label={t(
"screens.device.scenes.editActions.editActionAnimationsCardContent.dropdownAnimationIn.label" "screens.device.scenes.editActions.editActionAnimationsCardContent.dropdownAnimationIn.label"
)} )}
@ -92,7 +98,12 @@ export function EditActionAnimationsCardContent({
<MyDropdown <MyDropdown
disabled={disabled} disabled={disabled}
style={{ marginTop: 2 }} style={[
{ marginTop: 2 },
selectedLightAnimationOut !== Constants.defaultAnimationId && {
marginBottom: 6,
},
]}
label={t( label={t(
"screens.device.scenes.editActions.editActionAnimationsCardContent.dropdownAnimationOut.label" "screens.device.scenes.editActions.editActionAnimationsCardContent.dropdownAnimationOut.label"
)} )}
@ -270,7 +281,7 @@ function EditActionSliderAdjustment({ action, adjustmentType, adjustment }) {
); );
return ( return (
<> <View>
<Text <Text
style={[AppStyles.typography14, { color: appContext.appTheme.text }]} style={[AppStyles.typography14, { color: appContext.appTheme.text }]}
> >
@ -310,7 +321,7 @@ function EditActionSliderAdjustment({ action, adjustmentType, adjustment }) {
</Text> </Text>
</View> </View>
</View> </View>
</> </View>
); );
} }