From d657813b31e6497e9f2692cf0525036f82c183c1 Mon Sep 17 00:00:00 2001
From: Reza_ashrafi <ashrafimiireza98@gmail.com>
Date: Mon, 2 May 2022 15:20:11 +0430
Subject: [PATCH] reza fixed blog

---
 src/screens/Blog/index.js              |  6 ++----
 src/screens/Blogs/index.js             |  5 +++--
 src/screens/Home/components/MyBooks.js | 11 +++++++----
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/screens/Blog/index.js b/src/screens/Blog/index.js
index e6b5ca4..12695e9 100644
--- a/src/screens/Blog/index.js
+++ b/src/screens/Blog/index.js
@@ -17,7 +17,6 @@ import { LinearGradient } from "expo-linear-gradient";
 import HTMLView from "react-native-htmlview";
 
 //components
-import Hashtags from "../Blogs/layouts/Hashtags";
 import Header from "../Blogs/layouts/Header";
 import New from "../Blogs/layouts/New";
 import Navbar from "../../components/Navbar";
@@ -76,7 +75,6 @@ export const Blog = ({ getInfo, blog, getList, blogs, route, theme }) => {
         style={[styles.container, tw("flex")]}
       >
         <View style={tw("flex px-4 pb-24")}>
-          <Hashtags />
           <View
             style={[
               tw("w-full rounded-sm overflow-hidden relative"),
@@ -184,7 +182,7 @@ export const Blog = ({ getInfo, blog, getList, blogs, route, theme }) => {
                 stylesheet={{
                   p: {
                     color:
-                      theme === "bold"
+                      theme === "light"
                         ? Colors.theme1.gray20
                         : Colors.theme1.grayF9,
                     textAlign: "right",
@@ -223,7 +221,7 @@ export const Blog = ({ getInfo, blog, getList, blogs, route, theme }) => {
               horizontal={true}
               inverted={true}
               style={[tw("flex flex-row mt-3 pb-3")]}
-              data={blogs}
+              data={blogs.filter((blog) => blog.id !== route.params.id)}
               renderItem={({ item }) => <New blog={item} />}
               keyExtractor={(item, index) => {
                 return item.id;
diff --git a/src/screens/Blogs/index.js b/src/screens/Blogs/index.js
index ab32a63..ee13895 100644
--- a/src/screens/Blogs/index.js
+++ b/src/screens/Blogs/index.js
@@ -15,7 +15,7 @@ import { blog } from "../../redux/actions";
 //components
 import Navbar from "../../components/Navbar";
 import Drawer from "../../components/Drawer";
-import Hashtags from "./layouts/Hashtags";
+// import Hashtags from "./layouts/Hashtags";
 import Header from "./layouts/Header";
 import Single from "./layouts/Single";
 import New from "./layouts/New";
@@ -60,7 +60,7 @@ function Blogs({ getList, blogs }) {
         contentContainerStyle={styles.contentContainerStyle}
         style={[styles.container, tw("flex px-4")]}
       >
-        <Hashtags />
+        {/* <Hashtags /> */}
         <Single />
         <Header title={"تازه‌ترین‌ها از وبلاگ"} />
         <FlatList
@@ -102,6 +102,7 @@ export default connect(mapStateToProps, mapDispatchToProps)(Blogs);
 const styles = StyleSheet.create({
   contentContainerStyle: {
     paddingBottom: 100,
+    paddingTop : 30
   },
   container: {
     paddingVertical: 0,
diff --git a/src/screens/Home/components/MyBooks.js b/src/screens/Home/components/MyBooks.js
index 9e47e18..d8ef8cc 100644
--- a/src/screens/Home/components/MyBooks.js
+++ b/src/screens/Home/components/MyBooks.js
@@ -12,15 +12,18 @@ import fontSize from "../../../constants/fontSize";
 const ios = Platform.OS === "ios";
 
 function MyBooks({ books, grades, theme }) {
-  console.log(books);
   return books?.filter((book) => book.condition >= 2).length ? (
     <View style={[tw("flex w-full mb-5")]}>
       <View
         style={[
           tw(`w-full flex  rounded-md pt-3 overflow-hidden`),
           {
-            backgroundColor: theme === 'light' ? Colors.theme1.greenCF + "0F" : Colors.theme1.greenCF + '11',
-            borderColor:  Colors.theme1.greenD9 + (theme === 'light' ? "" : "77"),
+            backgroundColor:
+              theme === "light"
+                ? Colors.theme1.greenCF + "0F"
+                : Colors.theme1.greenCF + "11",
+            borderColor:
+              Colors.theme1.greenD9 + (theme === "light" ? "" : "77"),
             borderWidth: 1,
           },
         ]}
@@ -38,7 +41,7 @@ function MyBooks({ books, grades, theme }) {
         >
           کتابهای من
         </Text>
-        
+
         <FlatList
           showsHorizontalScrollIndicator={false}
           style={[tw("py-3")]}