diff --git a/src/components/Searchbar/Searchbar.js b/src/components/Searchbar/Searchbar.js index a7bdbaf1..d6a25457 100644 --- a/src/components/Searchbar/Searchbar.js +++ b/src/components/Searchbar/Searchbar.js @@ -83,11 +83,10 @@ const styles = StyleSheet.create({ flexDirection: "row", alignItems: "center", paddingHorizontal: 16, - marginBottom: 12, + marginBottom: 8, borderRadius: 8, marginHorizontal: 12, elevation: 2, - backgroundColor: "white", }, container: { flex: 1, diff --git a/src/redux/settings/settings.reducer.js b/src/redux/settings/settings.reducer.js index 2d5efef8..ba1ea64b 100644 --- a/src/redux/settings/settings.reducer.js +++ b/src/redux/settings/settings.reducer.js @@ -14,8 +14,10 @@ import { midnightDuskTheme, greenAppleTheme, irisBlueTheme, - hotPinkTheme, strawberryDaiquiri, + takoTheme, + yinYangTheme, + springBlossomTheme, } from "../../theme/theme"; const themes = { @@ -25,8 +27,10 @@ const themes = { 3: midnightDuskTheme, 4: greenAppleTheme, 5: irisBlueTheme, - 6: hotPinkTheme, 7: strawberryDaiquiri, + 8: takoTheme, + 9: yinYangTheme, + 10: springBlossomTheme, }; /** @@ -105,6 +109,7 @@ const settingsReducer = (state = initialState, action) => { ...themes[0], colorAccent: state.theme.colorAccent, rippleColor: state.theme.rippleColor, + colorButtonText: state.theme.colorButtonText, id: state.theme.id, name: state.theme.name, } diff --git a/src/screens/Library/components/LibraryFilterSheet.js b/src/screens/Library/components/LibraryFilterSheet.js index 0aec6ebd..5a8300bc 100644 --- a/src/screens/Library/components/LibraryFilterSheet.js +++ b/src/screens/Library/components/LibraryFilterSheet.js @@ -251,7 +251,7 @@ const LibraryFilterSheet = ({ indicatorStyle={{ backgroundColor: theme.colorAccent }} style={{ backgroundColor: theme.colorPrimary }} renderLabel={({ route, focused, color }) => ( - {route.title} + {route.title} )} inactiveColor={theme.textColorSecondary} activeColor={theme.colorAccent} diff --git a/src/screens/More/AdvancedSettings.js b/src/screens/More/AdvancedSettings.js index b5950781..7de3ac01 100644 --- a/src/screens/More/AdvancedSettings.js +++ b/src/screens/More/AdvancedSettings.js @@ -13,11 +13,6 @@ import { Button, Dialog, Portal } from "react-native-paper"; const AdvancedSettings = ({ navigation }) => { const theme = useTheme(); - const dispatch = useDispatch(); - - const [visible, setVisible] = useState(false); - const showDialog = () => setVisible(true); - const hideDialog = () => setVisible(false); /** * Confirm Clear Database Dialog @@ -37,51 +32,8 @@ const AdvancedSettings = ({ navigation }) => { onPress={showClearDatabaseDialog} theme={theme} /> - - - - Are you sure? All history will be lost. - - - - - - { > Preset Themes - - - {presetThemes.map((theme) => ( - - ))} - - + + + + {presetThemes.map((theme) => ( + + ))} + + + Reader { { id: 4, name: "Green Apple" }, { id: 5, name: "Iris Blue" }, { id: 7, name: "Strawberry Daiquiri" }, + { id: 8, name: "Tako" }, + { id: 9, name: "Yin & Yang" }, + { id: 10, name: "Spring Blossom" }, ]; const renderThemeCheckboxes = () => diff --git a/src/screens/Novel/components/ChaptersSettingsSheet.js b/src/screens/Novel/components/ChaptersSettingsSheet.js index 015f34bd..ea40cb6a 100644 --- a/src/screens/Novel/components/ChaptersSettingsSheet.js +++ b/src/screens/Novel/components/ChaptersSettingsSheet.js @@ -156,7 +156,7 @@ const ChaptersSettingsSheet = ({ indicatorStyle={{ backgroundColor: theme.colorAccent }} style={{ backgroundColor: theme.colorPrimary }} renderLabel={({ route, focused, color }) => ( - {route.title} + {route.title} )} inactiveColor={theme.textColorSecondary} activeColor={theme.colorAccent} @@ -174,7 +174,7 @@ const ChaptersSettingsSheet = ({