reza added some fix

master
Reza_ashrafi 2 years ago
parent 956ef9715c
commit 0505108fa9
  1. 25
      src/components/Header.js
  2. 6
      src/screens/Activation/index.js
  3. BIN
      src/screens/Contact/assets/contact-bg.png
  4. BIN
      src/screens/Contact/assets/contact.png
  5. 14
      src/screens/Contact/index.js
  6. BIN
      src/screens/Faq/assets/bgFaq.png
  7. BIN
      src/screens/Faq/assets/faq.png
  8. 11
      src/screens/Faq/index.js
  9. 7
      src/screens/Home/components/Videos.js
  10. 8
      src/screens/QR/Scan/index.js

@ -1,7 +1,10 @@
import { View, Text, Dimensions, ImageBackground } from "react-native";
import { connect } from "react-redux";
//style
import tw from "tailwind-rn";
import fontSize from "../constants/fontSize";
import Colors from "../constants/Colors";
const height = Dimensions.get("window").height;
@ -10,7 +13,10 @@ function Header({ title, description, background }) {
<View
style={[
tw(`w-full flex items-center pb-7`),
{ height: height / 4.5, backgroundColor: "#E9F0F7" },
{
height: height / 4.5,
backgroundColor: Colors.theme1["light"].greenCF + "0F",
},
]}
>
<ImageBackground
@ -20,14 +26,23 @@ function Header({ title, description, background }) {
></ImageBackground>
<Text
style={[
{ fontSize: fontSize.xl, color: "#196EC0", fontFamily: "bold" },
{
fontSize: fontSize.xl,
color: Colors.theme1["light"].greenCF,
fontFamily: "bold",
},
]}
>
{title}
</Text>
<Text
style={[
{ color: "#86A0B9", fontSize: fontSize.tiny, fontFamily: "regular" },
{
color: Colors.theme1["light"].greenCF,
fontSize: fontSize.sm,
fontFamily: "regular",
marginTop: 5
},
]}
>
{description}
@ -37,7 +52,7 @@ function Header({ title, description, background }) {
}
const mapStateToProps = (state) => ({
mobile: state.publicApi.mobile
})
mobile: state.publicApi.mobile,
});
export default connect(mapStateToProps)(Header);

@ -42,7 +42,7 @@ function Activation({ add, mobile, theme }) {
<View
style={[
tw("flex-1 justify-between flex "),
{ paddingTop: StatusBar.currentHeight },
// { paddingTop: StatusBar.currentHeight },
]}
>
<View>
@ -55,7 +55,7 @@ function Activation({ add, mobile, theme }) {
bookmark: false,
qr: true,
back: true,
backgroundColor: "#E9F0F7",
backgroundColor: Colors.theme1[theme].greenCF + "0F",
}}
/>
<View style={tw("flex w-full")}>
@ -127,7 +127,7 @@ Activation.defaultProps = {
const mapStateToProps = (state) => ({
mobile: state.publicApi.mobile,
theme: state.publicApi.theme
theme: state.publicApi.theme,
});
const mapDispatchToProps = {

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.9 KiB

@ -9,8 +9,12 @@ import {
} from "react-native";
import { connect } from "react-redux";
import { faq } from "../../redux/actions";
//style
import tw from "tailwind-rn";
import Colors from "../../constants/Colors";
//components
import Header from "../../components/Header";
import Navbar from "../../components/Navbar";
import Box from "./Box";
@ -19,11 +23,11 @@ import Box from "./Box";
import onlineSupportIcon from "./assets/online-support.png";
import callIcon from "./assets/call.png";
import addressIcon from "./assets/address.png";
import bgContact from "./assets/contact-bg.png";
import bgContact from "./assets/contact.png";
const { width, height } = Dimensions.get("window");
function Contact({ info }) {
function Contact({ info, theme }) {
return (
<SafeAreaView
style={{
@ -41,7 +45,7 @@ function Contact({ info }) {
bookmark: false,
qr: true,
back: true,
backgroundColor: "#E9F0F7",
backgroundColor: Colors.theme1[theme].greenCF + "0F",
}}
/>
<Header
@ -58,7 +62,9 @@ function Contact({ info }) {
);
}
const mapStateToProps = (state) => ({});
const mapStateToProps = (state) => ({
theme: state.publicApi.theme
});
const mapDispatchToProps = {};

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.1 KiB

@ -9,12 +9,19 @@ import {
} from "react-native";
import { connect } from "react-redux";
import { faq } from "../../redux/actions";
//style
import tw from "tailwind-rn";
import Colors from "../../constants/Colors";
//components
import Header from "../../components/Header";
import Navbar from "../../components/Navbar";
import Search from "../../components/Search";
import Instance from "./components/Instance";
import bgFaq from "./assets/bgFaq.png";
//assets
import bgFaq from "./assets/faq.png";
const width = Dimensions.get("window").width;
@ -40,7 +47,7 @@ function Faq({ list, getFaq, searchResult, search, selectFaq, searchFaq }) {
bookmark: false,
qr: true,
back: true,
backgroundColor: "#E9F0F7",
backgroundColor: Colors.theme1['light'].greenCF + "0F",
}}
/>
<Header

@ -42,16 +42,17 @@ const Video = ({ video, mobile, grades, theme }) => {
<Pressable
style={[
tw(`flex relative ${mobile ? "mr-4" : "ml-5"}`),
{ width: mobile ? 130 : 200, height: mobile ? 280 : 280 },
{ width: mobile ? 200 : 200, height: mobile ? 210 : 210 },
]}
onPress={() => navigation.navigate("Video", { id: video.id })}
>
<Image
source={{ uri: `https://dnvn.ir/api/v1/file/${video.fileIds}` }}
resizeMode="contain"
// resizeMode="contain"
style={[
tw('bg-gray-100'),
{
height: mobile ? 184 : 280,
height: mobile ? 130 : 130,
},
]}
/>

@ -20,7 +20,7 @@ const { width, height } = Dimensions.get("screen");
//assets
import laptopImage from "../assets/laptop.png";
function Scan({}) {
function Scan({theme}) {
const navigation = useNavigation();
const [hasPermission, setHasPermission] = useState(null);
const [scanned, setScanned] = useState(false);
@ -70,19 +70,19 @@ function Scan({}) {
{
width: height / 3.5,
borderWidth: 1,
borderColor: Colors.theme1[colorScheme].greenCF,
borderColor: Colors.theme1[theme].greenCF,
},
]}
>
<Entypo
name="back"
size={width / 27}
style={{ marginRight: 5, color: Colors.theme1[colorScheme].greenCF }}
style={{ marginRight: 5, color: Colors.theme1[theme].greenCF }}
/>
<Text
style={[
{
color: Colors.theme1[colorScheme].greenCF,
color: Colors.theme1[theme].greenCF,
fontSize: width / 27,
fontFamily: "regular",
},

Loading…
Cancel
Save