diff --git a/src/components/Header.js b/src/components/Header.js index da5ba75..f677872 100644 --- a/src/components/Header.js +++ b/src/components/Header.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 }) { {title} {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); diff --git a/src/screens/Activation/index.js b/src/screens/Activation/index.js index 2c00184..fc1b1cc 100644 --- a/src/screens/Activation/index.js +++ b/src/screens/Activation/index.js @@ -42,7 +42,7 @@ function Activation({ add, mobile, theme }) { @@ -55,7 +55,7 @@ function Activation({ add, mobile, theme }) { bookmark: false, qr: true, back: true, - backgroundColor: "#E9F0F7", + backgroundColor: Colors.theme1[theme].greenCF + "0F", }} /> @@ -126,8 +126,8 @@ Activation.defaultProps = { }; const mapStateToProps = (state) => ({ - mobile : state.publicApi.mobile, - theme: state.publicApi.theme + mobile: state.publicApi.mobile, + theme: state.publicApi.theme, }); const mapDispatchToProps = { diff --git a/src/screens/Contact/assets/contact-bg.png b/src/screens/Contact/assets/contact-bg.png deleted file mode 100644 index cbf872e..0000000 Binary files a/src/screens/Contact/assets/contact-bg.png and /dev/null differ diff --git a/src/screens/Contact/assets/contact.png b/src/screens/Contact/assets/contact.png new file mode 100644 index 0000000..c20022e Binary files /dev/null and b/src/screens/Contact/assets/contact.png differ diff --git a/src/screens/Contact/index.js b/src/screens/Contact/index.js index 15ddfc9..7753c4f 100644 --- a/src/screens/Contact/index.js +++ b/src/screens/Contact/index.js @@ -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 (
({}); +const mapStateToProps = (state) => ({ + theme: state.publicApi.theme +}); const mapDispatchToProps = {}; diff --git a/src/screens/Faq/assets/bgFaq.png b/src/screens/Faq/assets/bgFaq.png deleted file mode 100644 index 6380ccd..0000000 Binary files a/src/screens/Faq/assets/bgFaq.png and /dev/null differ diff --git a/src/screens/Faq/assets/faq.png b/src/screens/Faq/assets/faq.png new file mode 100644 index 0000000..10eaa60 Binary files /dev/null and b/src/screens/Faq/assets/faq.png differ diff --git a/src/screens/Faq/index.js b/src/screens/Faq/index.js index f842d45..4093c69 100644 --- a/src/screens/Faq/index.js +++ b/src/screens/Faq/index.js @@ -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", }} />
{ navigation.navigate("Video", { id: video.id })} > diff --git a/src/screens/QR/Scan/index.js b/src/screens/QR/Scan/index.js index 32ec279..4939f2c 100644 --- a/src/screens/QR/Scan/index.js +++ b/src/screens/QR/Scan/index.js @@ -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, }, ]} >