From 5f01dcd7e920db7fece05fd47e5dfaecd8417aa5 Mon Sep 17 00:00:00 2001
From: Rajarshee Chatterjee <rajarshee.adm@gmail.com>
Date: Tue, 9 Mar 2021 15:13:09 +0530
Subject: [PATCH] Minor cleanup

---
 src/components/common/NovelCover.js           |  4 +--
 src/components/novel/ChapterCard.js           |  6 ++---
 src/components/novel/NovelHeader.js           |  2 +-
 src/screens/ChapterItem.js                    |  2 --
 src/screens/More/About.js                     |  7 +++--
 src/screens/More/More.js                      | 20 +++++---------
 src/screens/NovelItem.js                      | 26 +++----------------
 .../boxnovel/filters/BottomSheet.js           |  2 --
 8 files changed, 21 insertions(+), 48 deletions(-)

diff --git a/src/components/common/NovelCover.js b/src/components/common/NovelCover.js
index 2b190ebb..1ce74808 100644
--- a/src/components/common/NovelCover.js
+++ b/src/components/common/NovelCover.js
@@ -92,8 +92,8 @@ const styles = StyleSheet.create({
         borderRadius: 4,
     },
     opac: {
-        paddingHorizontal: 3,
-        paddingVertical: 3,
+        paddingHorizontal: 3.5,
+        paddingVertical: 3.5,
         borderRadius: 4,
     },
 });
diff --git a/src/components/novel/ChapterCard.js b/src/components/novel/ChapterCard.js
index 533e0e46..c494469a 100644
--- a/src/components/novel/ChapterCard.js
+++ b/src/components/novel/ChapterCard.js
@@ -21,7 +21,7 @@ const ChapterCard = ({
         <TouchableRipple
             style={{
                 paddingHorizontal: 15,
-                paddingVertical: 9,
+                paddingVertical: 7,
                 flexDirection: "row",
                 justifyContent: "space-between",
                 alignItems: "center",
@@ -76,7 +76,7 @@ const ChapterCard = ({
                     downloading.chapterUrl === chapter.chapterUrl ? (
                         <ActivityIndicator
                             color={theme.textColorHintDark}
-                            size={26}
+                            size={25}
                             style={{ margin: 3.5, padding: 5 }}
                         />
                     ) : (
@@ -92,7 +92,7 @@ const ChapterCard = ({
                                     ? theme.textColorPrimaryDark
                                     : theme.textColorHintDark
                             }
-                            size={26}
+                            size={25}
                             onPress={() => {
                                 downloadChapter(
                                     downloaded ? 1 : 0,
diff --git a/src/components/novel/NovelHeader.js b/src/components/novel/NovelHeader.js
index d20a334e..4544ef56 100644
--- a/src/components/novel/NovelHeader.js
+++ b/src/components/novel/NovelHeader.js
@@ -286,7 +286,7 @@ const NovelInfoHeader = ({
                             flexDirection: "row",
                             justifyContent: "space-between",
                             alignItems: "center",
-                            paddingRight: 15,
+                            paddingRight: 12.5,
                         }}
                         onPress={() =>
                             bottomSheetRef.current.show({ velocity: -1.5 })
diff --git a/src/screens/ChapterItem.js b/src/screens/ChapterItem.js
index de8ec4ce..5699b80e 100644
--- a/src/screens/ChapterItem.js
+++ b/src/screens/ChapterItem.js
@@ -309,8 +309,6 @@ export default ChapterItem;
 const styles = StyleSheet.create({
     container: {
         flexGrow: 1,
-        // backgroundColor: "#202125",
-        // backgroundColor: "#000000",
         paddingHorizontal: 10,
         paddingVertical: 10,
     },
diff --git a/src/screens/More/About.js b/src/screens/More/About.js
index dd546aa9..3af37c6f 100644
--- a/src/screens/More/About.js
+++ b/src/screens/More/About.js
@@ -1,8 +1,11 @@
 import React from "react";
-import { List, Divider } from "react-native-paper";
 import * as Linking from "expo-linking";
+import { List, Divider } from "react-native-paper";
+
 import { CustomAppbar } from "../../components/common/Appbar";
+
 import { useSelector } from "react-redux";
+
 const AboutScreen = ({ navigation }) => {
     const theme = useSelector((state) => state.themeReducer.theme);
 
@@ -24,7 +27,7 @@ const AboutScreen = ({ navigation }) => {
                     titleStyle={{ color: theme.textColorPrimaryDark }}
                     title="Version"
                     descriptionStyle={{ color: theme.textColorSecondaryDark }}
-                    description="Stable 1.0.16 (refactor: project structure)"
+                    description="Stable 1.0.17"
                 />
                 <List.Item
                     titleStyle={{ color: theme.textColorPrimaryDark }}
diff --git a/src/screens/More/More.js b/src/screens/More/More.js
index fc3e4f30..4e7d0dea 100644
--- a/src/screens/More/More.js
+++ b/src/screens/More/More.js
@@ -5,9 +5,11 @@ import { List } from "react-native-paper";
 
 import { CustomAppbar } from "../../components/common/Appbar";
 
-import { connect } from "react-redux";
+import { useSelector } from "react-redux";
+
+const MoreScreen = ({ navigation }) => {
+    const theme = useSelector((state) => state.themeReducer.theme);
 
-const MoreScreen = ({ navigation, theme }) => {
     return (
         <>
             <CustomAppbar title="More" />
@@ -46,16 +48,6 @@ const MoreScreen = ({ navigation, theme }) => {
     );
 };
 
-const mapStateToProps = (state) => ({
-    theme: state.themeReducer.theme,
-});
+export default MoreScreen;
 
-export default connect(mapStateToProps)(MoreScreen);
-
-const styles = StyleSheet.create({
-    container: {
-        flex: 1,
-        // backgroundColor: "#202125",
-        backgroundColor: "#000000",
-    },
-});
+const styles = StyleSheet.create({});
diff --git a/src/screens/NovelItem.js b/src/screens/NovelItem.js
index 20041cb4..cbcfa88b 100644
--- a/src/screens/NovelItem.js
+++ b/src/screens/NovelItem.js
@@ -24,10 +24,11 @@ import {
     downloadOrDeleteChapter,
 } from "../services/db";
 
-import { connect } from "react-redux";
+import { useSelector } from "react-redux";
 
-const NovelItem = ({ route, navigation, theme }) => {
+const NovelItem = ({ route, navigation }) => {
     const item = route.params;
+    const theme = useSelector((state) => state.themeReducer.theme);
 
     const {
         extensionId,
@@ -188,21 +189,6 @@ const NovelItem = ({ route, navigation, theme }) => {
 
     return (
         <Provider>
-            {/* <Appbar.Header style={{ backgroundColor: theme.colorDarkPrimary }}>
-                <Appbar.BackAction
-                    onPress={() => {
-                        navigation.goBack();
-                    }}
-                    color={"white"}
-                    size={26}
-                    style={{ marginRight: 0 }}
-                />
-                <Appbar.Content
-                    title={item.novelName}
-                    titleStyle={{ color: theme.textColorPrimaryDark }}
-                />
-            </Appbar.Header> */}
-
             <View
                 style={[
                     styles.container,
@@ -257,11 +243,7 @@ const NovelItem = ({ route, navigation, theme }) => {
     );
 };
 
-const mapStateToProps = (state) => ({
-    theme: state.themeReducer.theme,
-});
-
-export default connect(mapStateToProps)(NovelItem);
+export default NovelItem;
 
 const styles = StyleSheet.create({
     container: {
diff --git a/src/screens/extensions/boxnovel/filters/BottomSheet.js b/src/screens/extensions/boxnovel/filters/BottomSheet.js
index 128555a3..fd83dd27 100644
--- a/src/screens/extensions/boxnovel/filters/BottomSheet.js
+++ b/src/screens/extensions/boxnovel/filters/BottomSheet.js
@@ -181,7 +181,5 @@ export const BottomSheet = ({
 const styles = StyleSheet.create({
     contentContainer: {
         flex: 1,
-        // paddingTop: ,
-        // alignItems: "center",
     },
 });