Skip to content

A fully open source & end-to-end encrypted note taking alternative to Evernote.

mobile: fix theme loading

Ammar Ahmed2dd6f94f4160
diff --git a/apps/mobile/app/screens/settings/theme-selector.tsx b/apps/mobile/app/screens/settings/theme-selector.tsx
index 8193b40c6..10e01bce0 100644
--- a/apps/mobile/app/screens/settings/theme-selector.tsx
+++ b/apps/mobile/app/screens/settings/theme-selector.tsx
@@ -86,11 +86,13 @@ function ThemeSelector() {
const { colors } = useThemeColors();
const themeColors = colors;
const [searchQuery, setSearchQuery] = useState<string>();
- const [colorScheme, setColorScheme] = useState<string>();
+ const [colorScheme, setColorScheme] = useState<"all" | "dark" | "light">(
+ "all"
+ );
const filters = [];
if (searchQuery) filters.push({ type: "term" as const, value: searchQuery });
- if (colorScheme)
+ if (colorScheme !== "all")
filters.push({ type: "colorScheme" as const, value: colorScheme });
const themes = trpc.themes.useInfiniteQuery(
@@ -105,6 +107,14 @@ function ThemeSelector() {
}
);
+ if (themes?.isError) {
+ DatabaseLogger.error(
+ new Error(themes.error.message),
+ "themes loading error",
+ themes.error?.data || undefined
+ );
+ }
+
const select = (item: Partial<ThemeMetadata>, fromFile?: boolean) => {
presentSheet({
context: "theme-details",
@@ -114,204 +124,209 @@ function ThemeSelector() {
});
};
- const renderItem = ({
- item,
- index
- }: {
- item: ThemeMetadata;
- index: number;
- }) => {
- const colors =
- item.previewColors ||
- getPreviewColors(item as unknown as ThemeDefinition);
+ const renderItem = React.useCallback(
+ ({ item, index }: { item: ThemeMetadata; index: number }) => {
+ const colors =
+ item.previewColors ||
+ getPreviewColors(item as unknown as ThemeDefinition);
- return (
- <>
- <TouchableOpacity
- activeOpacity={0.9}
- style={{
- borderRadius: 10,
- padding: DefaultAppStyles.GAP_SMALL,
- marginBottom: DefaultAppStyles.GAP_VERTICAL,
- flexShrink: 1,
- marginHorizontal: 10
- }}
- onPress={() => select(item)}
- >
- <View
+ return (
+ <>
+ <TouchableOpacity
+ activeOpacity={0.9}
style={{
- backgroundColor: colors?.background,
- height: 200,
- width: "100%",
borderRadius: 10,
+ padding: DefaultAppStyles.GAP_SMALL,
marginBottom: DefaultAppStyles.GAP_VERTICAL,
- overflow: "hidden",
- flexDirection: "row",
- justifyContent: "space-between",
- ...getElevationStyle(3)
+ flexShrink: 1,
+ marginHorizontal: 10
}}
+ onPress={() => select(item)}
>
<View
style={{
- height: "100%",
- width: "49.5%",
- backgroundColor: colors.navigationMenu.background,
- padding: DefaultAppStyles.GAP_SMALL,
- paddingVertical: 3,
- borderRadius: defaultBorderRadius
+ backgroundColor: colors?.background,
+ height: 200,
+ width: "100%",
+ borderRadius: 10,
+ marginBottom: DefaultAppStyles.GAP_VERTICAL,
+ overflow: "hidden",
+ flexDirection: "row",
+ justifyContent: "space-between",
+ ...getElevationStyle(3)
}}
>
- {MenuItemsList.map((item, index) => (
- <View
- key={item.id}
- style={{
- height: 12,
- width: "100%",
- backgroundColor:
- index === 0
- ? colors.navigationMenu.accent + 40
- : colors.navigationMenu.background,
- borderRadius: 2,
- paddingHorizontal: 3,
- flexDirection: "row",
- alignItems: "center",
- marginBottom: 4
- }}
- >
- <Icon
- size={8}
- name={item.icon}
- color={
- index === 0
- ? colors.navigationMenu.accent
- : colors.navigationMenu.icon
- }
- />
-
+ <View
+ style={{
+ height: "100%",
+ width: "49.5%",
+ backgroundColor: colors.navigationMenu.background,
+ padding: DefaultAppStyles.GAP_SMALL,
+ paddingVertical: 3,
+ borderRadius: defaultBorderRadius
+ }}
+ >
+ {MenuItemsList.map((item, index) => (
<View
+ key={item.id}
style={{
- height: 3,
- width: "40%",
+ height: 12,
+ width: "100%",
backgroundColor:
index === 0
- ? colors.navigationMenu.accent
- : colors.paragraph,
+ ? colors.navigationMenu.accent + 40
+ : colors.navigationMenu.background,
borderRadius: 2,
- marginLeft: 3
+ paddingHorizontal: 3,
+ flexDirection: "row",
+ alignItems: "center",
+ marginBottom: 4
}}
- ></View>
- </View>
- ))}
- </View>
+ >
+ <Icon
+ size={8}
+ name={item.icon}
+ color={
+ index === 0
+ ? colors.navigationMenu.accent
+ : colors.navigationMenu.icon
+ }
+ />
+
+ <View
+ style={{
+ height: 3,
+ width: "40%",
+ backgroundColor:
+ index === 0
+ ? colors.navigationMenu.accent
+ : colors.paragraph,
+ borderRadius: 2,
+ marginLeft: 3
+ }}
+ ></View>
+ </View>
+ ))}
+ </View>
- <View
- style={{
- height: "100%",
- width: "49.5%",
- backgroundColor: colors.list.background,
- borderRadius: defaultBorderRadius,
- paddingHorizontal: 2,
- paddingRight: 6
- }}
- >
<View
style={{
- height: 12,
- width: "100%",
- flexDirection: "row",
- justifyContent: "space-between",
- alignItems: "center",
- marginTop: 3
+ height: "100%",
+ width: "49.5%",
+ backgroundColor: colors.list.background,
+ borderRadius: defaultBorderRadius,
+ paddingHorizontal: 2,
+ paddingRight: 6
}}
>
<View
style={{
+ height: 12,
+ width: "100%",
flexDirection: "row",
- alignItems: "center"
+ justifyContent: "space-between",
+ alignItems: "center",
+ marginTop: 3
}}
>
- <Icon size={8} color={colors.list.heading} name="menu" />
- <Heading
+ <View
style={{
- marginLeft: 3
+ flexDirection: "row",
+ alignItems: "center"
}}
- color={colors.list.heading}
- size={7}
>
- {strings.dataTypesPluralCamelCase.note()}
- </Heading>
- </View>
+ <Icon size={8} color={colors.list.heading} name="menu" />
+ <Heading
+ style={{
+ marginLeft: 3
+ }}
+ color={colors.list.heading}
+ size={7}
+ >
+ {strings.dataTypesPluralCamelCase.note()}
+ </Heading>
+ </View>
- <Icon name="magnify" color={colors.list.heading} size={7} />
+ <Icon name="magnify" color={colors.list.heading} size={7} />
+ </View>
</View>
- </View>
- <View
- style={{
- width: "100%",
- alignItems: "flex-end",
- justifyContent: "flex-end",
- marginTop: DefaultAppStyles.GAP_VERTICAL_SMALL,
- position: "absolute",
- bottom: 6,
- right: 6,
- flexDirection: "row",
- gap: 10
- }}
- >
- {darkTheme.id === item.id || lightTheme.id === item.id ? (
- <IconButton
- name="check"
- type="plain"
+ <View
+ style={{
+ width: "100%",
+ alignItems: "flex-end",
+ justifyContent: "flex-end",
+ marginTop: DefaultAppStyles.GAP_VERTICAL_SMALL,
+ position: "absolute",
+ bottom: 6,
+ right: 6,
+ flexDirection: "row",
+ gap: 10
+ }}
+ >
+ {darkTheme.id === item.id || lightTheme.id === item.id ? (
+ <IconButton
+ name="check"
+ type="plain"
+ style={{
+ borderRadius: 100,
+ paddingHorizontal: 6,
+ alignSelf: "flex-end",
+ width: 25,
+ height: 25
+ }}
+ color={colors.accent}
+ size={16}
+ />
+ ) : null}
+
+ <Button
+ title={
+ item.colorScheme === "dark"
+ ? strings.dark()
+ : strings.light()
+ }
+ type="secondaryAccented"
+ height={25}
+ buttonType={{
+ color: item.colorScheme === "dark" ? "black" : "#f0f0f060",
+ text: colors.accent
+ }}
style={{
borderRadius: 100,
- paddingHorizontal: 6,
+ paddingHorizontal: DefaultAppStyles.GAP,
alignSelf: "flex-end",
- width: 25,
- height: 25
+ borderColor:
+ item.colorScheme === "dark"
+ ? getColorLinearShade("#000000", 0.1, true)
+ : getColorLinearShade("#f0f0f0", 0.1, true)
}}
- color={colors.accent}
- size={16}
+ fontSize={AppFontSize.xxs}
/>
- ) : null}
-
- <Button
- title={
- item.colorScheme === "dark" ? strings.dark() : strings.light()
- }
- type="secondaryAccented"
- height={25}
- buttonType={{
- color: item.colorScheme === "dark" ? "black" : "#f0f0f060",
- text: colors.accent
- }}
- style={{
- borderRadius: 100,
- paddingHorizontal: DefaultAppStyles.GAP,
- alignSelf: "flex-end",
- borderColor:
- item.colorScheme === "dark"
- ? getColorLinearShade("#000000", 0.1, true)
- : getColorLinearShade("#f0f0f0", 0.1, true)
- }}
- fontSize={AppFontSize.xxs}
- />
+ </View>
</View>
- </View>
- <Heading size={AppFontSize.sm} color={themeColors.primary.heading}>
- {item.name}
- </Heading>
- <Paragraph
- size={AppFontSize.xs}
- color={themeColors.secondary?.paragraph}
- >
- {strings.by()} {item.authors?.[0].name}
- </Paragraph>
- </TouchableOpacity>
- </>
- );
- };
+ <Heading size={AppFontSize.sm} color={themeColors.primary.heading}>
+ {item.name}
+ </Heading>
+ <Paragraph
+ size={AppFontSize.xs}
+ color={themeColors.secondary?.paragraph}
+ >
+ {strings.by()} {item.authors?.[0].name}
+ </Paragraph>
+ </TouchableOpacity>
+ </>
+ );
+ },
+ [
+ darkTheme.id,
+ lightTheme.id,
+ themeColors.primary.heading,
+ themeColors.secondary?.paragraph
+ ]
+ );
+
let resetTimer: NodeJS.Timeout;
const onSearch = (text: string) => {
clearTimeout(resetTimer as NodeJS.Timeout);
@@ -331,11 +346,14 @@ function ThemeSelector() {
.flat()
.filter((theme) =>
searchQuery && searchQuery !== ""
- ? true
- : darkTheme.id !== theme.id && lightTheme.id !== theme.id
+ ? colorScheme === "all" || colorScheme === theme.colorScheme
+ : darkTheme.id !== theme.id &&
+ lightTheme.id !== theme.id &&
+ (colorScheme === "all" || colorScheme === theme.colorScheme)
) || []
);
}
+
return (
<>
<SheetProvider context="theme-details" />
@@ -373,12 +391,12 @@ function ThemeSelector() {
paddingHorizontal: DefaultAppStyles.GAP_SMALL
}}
type={
- colorScheme === "" || !colorScheme ? "accent" : "secondary"
+ colorScheme === "all" || !colorScheme ? "accent" : "secondary"
}
title={strings.all()}
fontSize={AppFontSize.xs}
onPress={() => {
- setColorScheme("");
+ setColorScheme("all");
}}
/>
<Button
@@ -501,15 +519,21 @@ function ThemeSelector() {
<LegendList
numColumns={2}
- data={[
- ...(colorScheme === "dark" || (searchQuery && searchQuery !== "")
- ? []
- : [lightTheme as unknown as ThemeMetadata]),
- ...(colorScheme === "light" || (searchQuery && searchQuery !== "")
+ data={
+ themes.isLoading || themes.isError
? []
- : [darkTheme as unknown as ThemeMetadata]),
- ...getThemes()
- ]}
+ : [
+ ...(colorScheme === "dark" ||
+ (searchQuery && searchQuery !== "")
+ ? []
+ : [lightTheme as unknown as ThemeMetadata]),
+ ...(colorScheme === "light" ||
+ (searchQuery && searchQuery !== "")
+ ? []
+ : [darkTheme as unknown as ThemeMetadata]),
+ ...getThemes()
+ ]
+ }
ListEmptyComponent={
<View
style={{
@@ -531,20 +555,23 @@ function ThemeSelector() {
</View>
}
ListFooterComponent={
- themes.isError ? (
- <View
- style={{
- height: 100,
- width: "100%",
- justifyContent: "center",
- alignItems: "center"
- }}
- >
+ <View
+ style={{
+ height: 100,
+ width: "100%",
+ justifyContent: "center",
+ alignItems: "center"
+ }}
+ >
+ {themes.isError ? (
<Paragraph color={colors.error.paragraph}>
{strings.errorLoadingThemes()}. {themes.error.message}.
</Paragraph>
- </View>
- ) : null
+ ) : (themes.isLoading || themes.isFetching) &&
+ getThemes().length ? (
+ <ActivityIndicator color={colors.primary.accent} />
+ ) : null}
+ </View>
}
estimatedItemSize={200}
renderItem={renderItem}
diff --git a/apps/mobile/package-lock.json b/apps/mobile/package-lock.json
index f2051c38d..32fc67010 100644
--- a/apps/mobile/package-lock.json
+++ b/apps/mobile/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "@notesnook/mobile",
- "version": "3.3.25",
+ "version": "3.3.27",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "@notesnook/mobile",
- "version": "3.3.25",
+ "version": "3.3.27",
"hasInstallScript": true,
"license": "GPL-3.0-or-later",
"dependencies": {