reza fixed somethin

master
Reza_ashrafi 2 years ago
parent 8d20dca623
commit df4e25db4c
  1. 4
      src/screens/Address/index.js
  2. 6
      src/screens/DeliveryForm/Address/index.js
  3. 4
      src/screens/DeliveryForm/TransportDate/index.js
  4. 4
      src/screens/DeliveryForm/TransportMethod/index.js
  5. 10
      src/screens/Product/components/Book.js
  6. 12
      src/screens/Product/components/Comments.js
  7. 2
      src/screens/Product/components/LinkBox.js
  8. 8
      src/screens/Profile/components/ProfileAddress/index.js

@ -348,7 +348,7 @@ const Address = ({
<Text <Text
style={{ style={{
fontFamily: "bold", fontFamily: "bold",
fontSize: mobile ? fontSize.lg : fontSize.xl2, fontSize: mobile ? fontSize.lg : fontSize.lg,
color: color:
theme === "light" ? Colors.theme1.gray20 : Colors.theme1.white, theme === "light" ? Colors.theme1.gray20 : Colors.theme1.white,
textAlign: ios ? "right" : "auto", textAlign: ios ? "right" : "auto",
@ -359,7 +359,7 @@ const Address = ({
<Text <Text
style={{ style={{
fontFamily: "regular", fontFamily: "regular",
fontSize: mobile ? fontSize.sm : fontSize.base, fontSize: mobile ? fontSize.sm : fontSize.tiny,
color: color:
theme === "light" theme === "light"
? Colors.theme1.gray20 + "aa" ? Colors.theme1.gray20 + "aa"

@ -87,7 +87,7 @@ const Address = ({
style={[ style={[
{ {
fontFamily: "regular", fontFamily: "regular",
fontSize: mobile ? fontSize.tiny : fontSize.lg, fontSize: mobile ? fontSize.tiny : fontSize.base,
lineHeight: 22, lineHeight: 22,
textAlign: ios ? "right" : "auto", textAlign: ios ? "right" : "auto",
color: active color: active
@ -158,7 +158,7 @@ const Address = ({
{addresses?.length ? ( {addresses?.length ? (
<Text <Text
style={{ style={{
fontSize: mobile ? fontSize.base : fontSize.xl, fontSize: mobile ? fontSize.base : fontSize.base,
fontFamily: "bold", fontFamily: "bold",
color: light ? Colors.theme1.green79 : Colors.theme1.white, color: light ? Colors.theme1.green79 : Colors.theme1.white,
textAlign: ios ? "right" : "auto", textAlign: ios ? "right" : "auto",
@ -194,7 +194,7 @@ const Address = ({
<Text <Text
style={{ style={{
fontFamily: "regular", fontFamily: "regular",
fontSize: mobile ? fontSize.tiny : fontSize.lg, fontSize: mobile ? fontSize.tiny : fontSize.base,
color: light ? Colors.theme1.gray2077 : Colors.theme1.grayE3, color: light ? Colors.theme1.gray2077 : Colors.theme1.grayE3,
}} }}
> >

@ -40,7 +40,7 @@ const TransportDate = ({ transportDate, mobile, theme }) => {
<Text <Text
style={{ style={{
fontFamily: "regular", fontFamily: "regular",
fontSize: mobile ? fontSize.tiny : fontSize.xl, fontSize: mobile ? fontSize.tiny : fontSize.base,
color: active color: active
? light ? light
? Colors.theme1.gray20 ? Colors.theme1.gray20
@ -88,7 +88,7 @@ const TransportDate = ({ transportDate, mobile, theme }) => {
<View style={tw(`w-full`)}> <View style={tw(`w-full`)}>
<Text <Text
style={{ style={{
fontSize: mobile ? fontSize.base : fontSize.xl2, fontSize: mobile ? fontSize.base : fontSize.base,
fontFamily: "bold", fontFamily: "bold",
color: light ? Colors.theme1.green79 : Colors.theme1.white, color: light ? Colors.theme1.green79 : Colors.theme1.white,
textAlign: ios ? "right" : "auto", textAlign: ios ? "right" : "auto",

@ -89,7 +89,7 @@ const TransportMethod = ({
<Text <Text
style={{ style={{
fontFamily: "regular", fontFamily: "regular",
fontSize: mobile ? fontSize.tiny : fontSize.xl2, fontSize: mobile ? fontSize.tiny : fontSize.base,
color: active color: active
? light ? light
? Colors.theme1.gray20 ? Colors.theme1.gray20
@ -143,7 +143,7 @@ const TransportMethod = ({
<View style={tw(`w-full ${mobile ? "mt-4" : "mt-4"}`)}> <View style={tw(`w-full ${mobile ? "mt-4" : "mt-4"}`)}>
<Text <Text
style={{ style={{
fontSize: mobile ? fontSize.base : fontSize.xl, fontSize: mobile ? fontSize.base : fontSize.tiny,
fontFamily: "bold", fontFamily: "bold",
color: light ? Colors.theme1.green79 : Colors.theme1.white, color: light ? Colors.theme1.green79 : Colors.theme1.white,
textAlign: ios ? "right" : "auto", textAlign: ios ? "right" : "auto",

@ -176,7 +176,7 @@ function Book({
theme === "light" theme === "light"
? Colors.theme1.green79 ? Colors.theme1.green79
: Colors.theme1.white, : Colors.theme1.white,
fontSize: mobile ? fontSize.base : fontSize.xl3, fontSize: mobile ? fontSize.base : fontSize.lg,
marginBottom: 5, marginBottom: 5,
fontFamily: "bold", fontFamily: "bold",
textAlign: ios ? "right" : "auto", textAlign: ios ? "right" : "auto",
@ -190,7 +190,7 @@ function Book({
theme === "light" theme === "light"
? Colors.theme1.green79 ? Colors.theme1.green79
: Colors.theme1.white, : Colors.theme1.white,
fontSize: mobile ? fontSize.tiny : fontSize.xl, fontSize: mobile ? fontSize.tiny : fontSize.base,
fontFamily: "regular", fontFamily: "regular",
}} }}
> >
@ -208,7 +208,7 @@ function Book({
color: color:
theme === "light" ? Colors.theme1.green79 : Colors.theme1.white, theme === "light" ? Colors.theme1.green79 : Colors.theme1.white,
textAlign: "center", textAlign: "center",
fontSize: mobile ? fontSize.tiny : fontSize.lg, fontSize: mobile ? fontSize.tiny : fontSize.base,
fontFamily: "regular", fontFamily: "regular",
}} }}
> >
@ -229,7 +229,7 @@ function Book({
color: color:
theme === "light" ? Colors.theme1.green79 : Colors.theme1.white, theme === "light" ? Colors.theme1.green79 : Colors.theme1.white,
textAlign: "center", textAlign: "center",
fontSize: mobile ? fontSize.tiny : fontSize.lg, fontSize: mobile ? fontSize.tiny : fontSize.base,
fontFamily: "regular", fontFamily: "regular",
}} }}
> >
@ -258,7 +258,7 @@ function Book({
color: color:
theme === "light" ? Colors.theme1.green79 : Colors.theme1.white, theme === "light" ? Colors.theme1.green79 : Colors.theme1.white,
textAlign: "center", textAlign: "center",
fontSize: mobile ? fontSize.tiny : fontSize.lg, fontSize: mobile ? fontSize.tiny : fontSize.base,
fontFamily: "regular", fontFamily: "regular",
}} }}
> >

@ -32,6 +32,7 @@ function Commnets({
getFullList, getFullList,
orderFullList, orderFullList,
theme, theme,
mobile,
}) { }) {
React.useEffect(() => { React.useEffect(() => {
if (!orderFullList?.length) { if (!orderFullList?.length) {
@ -50,7 +51,7 @@ function Commnets({
renderItem={({ item }) => <Comment comment={item} theme={theme} />} renderItem={({ item }) => <Comment comment={item} theme={theme} />}
keyExtractor={(item) => item?.id} keyExtractor={(item) => item?.id}
/> />
<AddComment addComment={addComment} productId={productId} theme={theme} /> <AddComment addComment={addComment} productId={productId} theme={theme} mobile={mobile} />
</View> </View>
); );
} }
@ -124,7 +125,7 @@ const Comment = ({ comment, theme }) => {
); );
}; };
const AddComment = ({ addComment, productId, theme, ...props }) => { const AddComment = ({ addComment, productId, theme, mobile, ...props }) => {
const [commentForm, setCommentForm] = React.useState({ const [commentForm, setCommentForm] = React.useState({
title: "", title: "",
text: "", text: "",
@ -132,16 +133,12 @@ const AddComment = ({ addComment, productId, theme, ...props }) => {
productId: null, productId: null,
}); });
const colorScheme = React.useMemo(() => {
return Appearance.getColorScheme();
}, [props.useless]);
return ( return (
<KeyboardAvoidingView <KeyboardAvoidingView
behavior={ios ? "padding" : "height"} behavior={ios ? "padding" : "height"}
style={[tw("flex items-end")]} style={[tw("flex items-end")]}
> >
<Avatar source={null} size={width / 5.5} /> <Avatar source={null} size={mobile ? width / 5.5 : width / 7} />
<TextInput <TextInput
style={[ style={[
tw("w-full mt-4 px-2 rounded-md"), tw("w-full mt-4 px-2 rounded-md"),
@ -217,6 +214,7 @@ const AddComment = ({ addComment, productId, theme, ...props }) => {
const mapStateToProps = (state) => ({ const mapStateToProps = (state) => ({
orderFullList: state.userFactor.fullList, orderFullList: state.userFactor.fullList,
theme: state.publicApi.theme, theme: state.publicApi.theme,
mobile: state.publicApi.mobile,
}); });
const mapDispatchToProps = { const mapDispatchToProps = {

@ -30,7 +30,7 @@ function Description({ title, onPress, mobile, theme }) {
<Text <Text
style={[ style={[
{ {
fontSize: mobile ? fontSize.sm : fontSize.lg, fontSize: mobile ? fontSize.sm : fontSize.sm,
color: color:
theme === "light" ? Colors.theme1.green79 : Colors.theme1.white, theme === "light" ? Colors.theme1.green79 : Colors.theme1.white,
fontFamily: "demi", fontFamily: "demi",

@ -161,7 +161,7 @@ const ProfileAddress = ({
style={[ style={[
{ {
fontFamily: "regular", fontFamily: "regular",
fontSize: mobile ? fontSize.sm : fontSize.lg, fontSize: mobile ? fontSize.sm : fontSize.tiny,
lineHeight: 22, lineHeight: 22,
textAlign: ios ? "right" : "auto", textAlign: ios ? "right" : "auto",
color: color:
@ -180,7 +180,7 @@ const ProfileAddress = ({
{ {
marginTop: mobile ? 4 : 8, marginTop: mobile ? 4 : 8,
fontFamily: "regular", fontFamily: "regular",
fontSize: mobile ? fontSize.sm : fontSize.lg, fontSize: mobile ? fontSize.sm : fontSize.tiny,
lineHeight: 22, lineHeight: 22,
textAlign: ios ? "right" : "auto", textAlign: ios ? "right" : "auto",
color: color:
@ -199,7 +199,7 @@ const ProfileAddress = ({
{ {
marginTop: mobile ? 4 : 8, marginTop: mobile ? 4 : 8,
fontFamily: "regular", fontFamily: "regular",
fontSize: mobile ? fontSize.sm : fontSize.lg, fontSize: mobile ? fontSize.sm : fontSize.tiny,
lineHeight: 22, lineHeight: 22,
textAlign: ios ? "right" : "auto", textAlign: ios ? "right" : "auto",
color: color:
@ -218,7 +218,7 @@ const ProfileAddress = ({
{ {
marginTop: mobile ? 4 : 8, marginTop: mobile ? 4 : 8,
fontFamily: "regular", fontFamily: "regular",
fontSize: mobile ? fontSize.sm : fontSize.lg, fontSize: mobile ? fontSize.sm : fontSize.tiny,
lineHeight: 22, lineHeight: 22,
textAlign: ios ? "right" : "auto", textAlign: ios ? "right" : "auto",
color: color:

Loading…
Cancel
Save