Skip to content

⚡️⚡️⚡️ Self-hosted collaborative bookmark manager to collect, read, annotate, and fully preserve what matters, all in one place.

fix(mobile): bugs fixed

daniel31x131e1bd8f3339f
diff --git a/apps/mobile/android/app/src/main/res/values/styles.xml b/apps/mobile/android/app/src/main/res/values/styles.xml
index 6bc01705..d8e877b2 100644
--- a/apps/mobile/android/app/src/main/res/values/styles.xml
+++ b/apps/mobile/android/app/src/main/res/values/styles.xml
@@ -5,6 +5,7 @@
<item name="android:editTextBackground">@drawable/rn_edit_text_material</item>
<item name="colorPrimary">@color/colorPrimary</item>
<item name="android:statusBarColor">#ffffff</item>
+ <item name="android:navigationBarColor">@android:color/transparent</item>
</style>
<style name="ResetEditText" parent="@android:style/Widget.EditText">
<item name="android:padding">0dp</item>
diff --git a/apps/mobile/app/(tabs)/dashboard/_layout.tsx b/apps/mobile/app/(tabs)/dashboard/_layout.tsx
index 30e0b0ac..63a074a6 100644
--- a/apps/mobile/app/(tabs)/dashboard/_layout.tsx
+++ b/apps/mobile/app/(tabs)/dashboard/_layout.tsx
@@ -22,6 +22,14 @@ export default function RootLayout() {
headerLargeStyle: {
backgroundColor: rawTheme[colorScheme as ThemeName]["base-100"],
},
+ headerStyle: {
+ backgroundColor:
+ Platform.OS === "ios"
+ ? "transparent"
+ : colorScheme === "dark"
+ ? rawTheme["dark"]["base-100"]
+ : "white",
+ },
}}
>
<Stack.Screen
@@ -73,6 +81,7 @@ export default function RootLayout() {
headerSearchBarOptions: {
placeholder: "Search",
autoCapitalize: "none",
+ headerIconColor: colorScheme === "dark" ? "white" : "black",
onChangeText: (e) => {
router.setParams({
search: encodeURIComponent(e.nativeEvent.text),
diff --git a/apps/mobile/app/(tabs)/links/_layout.tsx b/apps/mobile/app/(tabs)/links/_layout.tsx
index 714c24e6..aaf48bb4 100644
--- a/apps/mobile/app/(tabs)/links/_layout.tsx
+++ b/apps/mobile/app/(tabs)/links/_layout.tsx
@@ -25,10 +25,19 @@ export default function RootLayout() {
search: encodeURIComponent(e.nativeEvent.text),
});
},
+ headerIconColor: colorScheme === "dark" ? "white" : "black",
},
headerLargeStyle: {
backgroundColor: rawTheme[colorScheme as ThemeName]["base-100"],
},
+ headerStyle: {
+ backgroundColor:
+ Platform.OS === "ios"
+ ? "transparent"
+ : colorScheme === "dark"
+ ? rawTheme["dark"]["base-100"]
+ : "white",
+ },
}}
/>
);
diff --git a/apps/mobile/app/(tabs)/settings/_layout.tsx b/apps/mobile/app/(tabs)/settings/_layout.tsx
index d5195cdd..fef1f05a 100644
--- a/apps/mobile/app/(tabs)/settings/_layout.tsx
+++ b/apps/mobile/app/(tabs)/settings/_layout.tsx
@@ -19,6 +19,14 @@ export default function RootLayout() {
headerLargeStyle: {
backgroundColor: rawTheme[colorScheme as ThemeName]["base-100"],
},
+ headerStyle: {
+ backgroundColor:
+ Platform.OS === "ios"
+ ? "transparent"
+ : colorScheme === "dark"
+ ? rawTheme["dark"]["base-100"]
+ : "white",
+ },
}}
/>
);
diff --git a/apps/mobile/app/(tabs)/settings/index.tsx b/apps/mobile/app/(tabs)/settings/index.tsx
index 7ea78899..463c84a9 100644
--- a/apps/mobile/app/(tabs)/settings/index.tsx
+++ b/apps/mobile/app/(tabs)/settings/index.tsx
@@ -8,6 +8,7 @@ import {
TouchableOpacity,
Platform,
Alert,
+ Appearance,
} from "react-native";
import { nativeApplicationVersion } from "expo-application";
import { useColorScheme } from "nativewind";
@@ -20,10 +21,11 @@ export default function SettingsScreen() {
const { data: user } = useUser(auth);
const { colorScheme, setColorScheme } = useColorScheme();
const [override, setOverride] = useState<"light" | "dark" | "system">(
- "system"
+ Appearance.getColorScheme() || "system"
);
useEffect(() => {
+ console.log(colorScheme);
setColorScheme(override);
}, [override]);
diff --git a/apps/mobile/app/_layout.tsx b/apps/mobile/app/_layout.tsx
index 2bb7d283..dea0d59f 100644
--- a/apps/mobile/app/_layout.tsx
+++ b/apps/mobile/app/_layout.tsx
@@ -8,7 +8,7 @@ import { SheetProvider } from "react-native-actions-sheet";
import "@/components/ActionSheets/Sheets";
import { useColorScheme } from "nativewind";
import { lightTheme, darkTheme } from "../lib/theme";
-import { View } from "react-native";
+import { Platform, View } from "react-native";
import { rawTheme, ThemeName } from "@/lib/colors";
const queryClient = new QueryClient({
@@ -44,11 +44,8 @@ export default function RootLayout() {
screenOptions={{
navigationBarColor:
rawTheme[colorScheme as ThemeName]["base-200"],
+ statusBarStyle: Platform.OS === "android" ? "dark" : undefined,
headerShown: false,
- headerStyle: {
- backgroundColor:
- rawTheme[colorScheme as ThemeName]["base-200"],
- },
contentStyle: {
backgroundColor:
rawTheme[colorScheme as ThemeName]["base-100"],
diff --git a/apps/mobile/components/LinkListing.tsx b/apps/mobile/components/LinkListing.tsx
index a3d4c03c..839158c1 100644
--- a/apps/mobile/components/LinkListing.tsx
+++ b/apps/mobile/components/LinkListing.tsx
@@ -54,7 +54,10 @@ const LinkListing = ({ link, dashboard }: Props) => {
)}
onLongPress={() => {}}
onPress={() => router.push(`/links/${link.id}`)}
- android_ripple={{ color: "#ddd", borderless: false }}
+ android_ripple={{
+ color: colorScheme === "dark" ? "rgba(255,255,255,0.2)" : "#ddd",
+ borderless: false,
+ }}
>
<View
className={cn(