Skip to content

Commit 251d7a3

Browse files
ernstmulernstmul
committed
Align design as close as possible to other web based platforms
1 parent 61be446 commit 251d7a3

File tree

15 files changed

+251
-82
lines changed

15 files changed

+251
-82
lines changed

‎app.json‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"web": {
2121
"bundler": "metro",
2222
"output": "static",
23-
"favicon": "./assets/images/favicon.png"
23+
"favicon": "./assets/images/appwrite-logo.png"
2424
},
2525
"plugins": [
2626
"expo-router",
@@ -32,6 +32,12 @@
3232
"resizeMode": "contain",
3333
"backgroundColor": "#ffffff"
3434
}
35+
],
36+
[
37+
"expo-font",
38+
{
39+
"fonts": ["node_modules/@expo-google-fonts/poppins/300Light/Poppins_300Light.ttf"]
40+
}
3541
]
3642
],
3743
"experiments": {

‎app/_layout.tsx‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,22 @@
11
import { Slot } from "expo-router";
2-
import { View } from "react-native";
2+
import { Platform, View } from "react-native";
3+
import { Poppins_300Light, useFonts } from "@expo-google-fonts/poppins";
4+
import { Inter_400Regular, Inter_300Light } from "@expo-google-fonts/inter";
5+
import Head from "expo-router/head";
36

47
export default function HomeLayout() {
8+
const [loaded, error] = useFonts({
9+
Poppins_300Light,
10+
Inter_400Regular,
11+
Inter_300Light,
12+
});
513
return (
614
<View style={{ flex: 1, backgroundColor: "#FAFAFB" }}>
15+
{Platform.OS === "web" && (
16+
<Head>
17+
<title>Appwrite + React Native</title>
18+
</Head>
19+
)}
720
<Slot />
821
</View>
922
);

‎app/index.tsx‎

Lines changed: 33 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
1-
import { Platform, ScrollView, StyleSheet, Text, View } from "react-native";
1+
import {
2+
Dimensions,
3+
Platform,
4+
ScrollView,
5+
StyleSheet,
6+
Text,
7+
View,
8+
} from "react-native";
29
import { Header } from "@/components/Header";
3-
import { useRef, useState } from "react";
10+
import { useMemo, useRef, useState } from "react";
411
import { Card } from "@/components/Card";
512
import { fontStyles } from "@/styles/font";
613
import { IconArrowSmRight } from "@/assets/images/IconArrowSmRight";
@@ -22,6 +29,7 @@ export default function HomeScreen() {
2229
const bottomSheetRef = useRef<BottomSheet>(null);
2330
const [currentSnapIndex, setCurrentSnapIndex] = useState<number>(0);
2431
const [logs, setLogs] = useState<Array<Log>>([]);
32+
const [cardPadding, setCardPadding] = useState<number>(0);
2533

2634
const doPing = async () => {
2735
setConnectionState("loading");
@@ -57,7 +65,22 @@ export default function HomeScreen() {
5765
}
5866
};
5967

68+
const snapPoints = useMemo(
69+
() => [Platform.OS === "android" ? 50 : 70, "50%", "90%"],
70+
[],
71+
);
72+
73+
const resolveSnapPoint = (point: string | number): number => {
74+
if (typeof point === "number") return point;
75+
if (point.endsWith("%")) {
76+
const percent = parseFloat(point.replace("%", ""));
77+
return (percent / 100) * Dimensions.get("window").height;
78+
}
79+
return 0;
80+
};
81+
6082
const handleSnapChange = (index: number) => {
83+
setCardPadding(resolveSnapPoint(snapPoints[index]) + 48);
6184
setCurrentSnapIndex(index);
6285
};
6386

@@ -66,17 +89,18 @@ export default function HomeScreen() {
6689
<GestureHandlerRootView>
6790
<ScrollView>
6891
<Header pingFunction={doPing} state={connectionState} />
69-
<View style={styles.cardContainer}>
92+
<View
93+
style={{ ...styles.cardContainer, paddingBlockEnd: cardPadding }}
94+
>
7095
<Card>
7196
<View style={styles.cardHeader}>
7297
<Text style={fontStyles.titleM}>Edit your app</Text>
7398
</View>
7499
<Text>
75100
<Code variant={"secondary"}>Edit </Code>
76101
<Code variant={"primary"}>app/index.tsx</Code>
77-
<Code variant={"secondary"}> to get started with building</Code>
78102
<Code variant={"secondary"}>
79-
your app and many more to come
103+
to get started with building your app
80104
</Code>
81105
</Text>
82106
</Card>
@@ -104,7 +128,7 @@ export default function HomeScreen() {
104128
</ScrollView>
105129
<BottomSheet
106130
index={0}
107-
snapPoints={[Platform.OS === "android" ? 50 : 70, "50%", "90%"]}
131+
snapPoints={snapPoints}
108132
enablePanDownToClose={false}
109133
handleComponent={null}
110134
ref={bottomSheetRef}
@@ -133,7 +157,9 @@ const styles = StyleSheet.create({
133157
cardContainer: {
134158
paddingInline: 20,
135159
display: "flex",
136-
gap: 16,
160+
flexDirection: Dimensions.get("window").width < 1024 ? "column" : "row",
161+
justifyContent: "center",
162+
gap: 28,
137163
},
138164
scrollview: {
139165
height: 200,

‎assets/images/appwrite-logo.png‎

2.35 KB
Loading

‎assets/images/appwrite.tsx‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import Svg, { Path } from "react-native-svg";
2+
3+
export default function AppwriteLogo() {
4+
return (
5+
<Svg width="56" height="56" viewBox="0 0 24 24" fill="none">
6+
<Path
7+
d="M24.4429 16.4322V21.9096H10.7519C6.76318 21.9096 3.28044 19.7067 1.4171 16.4322C1.14622 15.9561 0.909137 15.4567 0.710264 14.9383C0.319864 13.9225 0.0744552 12.8325 0 11.6952V10.2143C0.0161646 9.96089 0.0416361 9.70942 0.0749451 9.46095C0.143032 8.95105 0.245898 8.45211 0.381093 7.96711C1.66006 3.36909 5.81877 0 10.7519 0C15.6851 0 19.8433 3.36909 21.1223 7.96711H15.2682C14.3072 6.4683 12.6437 5.4774 10.7519 5.4774C8.86017 5.4774 7.19668 6.4683 6.23562 7.96711C5.9427 8.42274 5.71542 8.92516 5.56651 9.46095C5.43425 9.93599 5.36371 10.4369 5.36371 10.9548C5.36371 12.5248 6.01324 13.94 7.05463 14.9383C8.01961 15.865 9.32061 16.4322 10.7519 16.4322H24.4429Z"
8+
fill="#FD366E"
9+
/>
10+
<Path
11+
d="M24.4429 9.46094V14.9383H14.4492C15.4906 13.94 16.1401 12.5248 16.1401 10.9548C16.1401 10.4369 16.0696 9.93598 15.9373 9.46094H24.4429Z"
12+
fill="#FD366E"
13+
/>
14+
</Svg>
15+
);
16+
}

‎assets/images/grid-desktop.png‎

347 KB
Loading

‎assets/images/react.tsx‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
import Svg, { Path } from "react-native-svg";
2+
3+
export default function ReactLogo() {
4+
return (
5+
<Svg
6+
role="img"
7+
width="56"
8+
height="56"
9+
preserveAspectRatio="xMidYMid meet"
10+
viewBox="0 0 256 228"
11+
>
12+
<Path
13+
fill="#00D8FF"
14+
d="M210.483 73.824a171.49 171.49 0 0 0-8.24-2.597c.465-1.9.893-3.777 1.273-5.621c6.238-30.281 2.16-54.676-11.769-62.708c-13.355-7.7-35.196.329-57.254 19.526a171.23 171.23 0 0 0-6.375 5.848a155.866 155.866 0 0 0-4.241-3.917C100.759 3.829 77.587-4.822 63.673 3.233C50.33 10.957 46.379 33.89 51.995 62.588a170.974 170.974 0 0 0 1.892 8.48c-3.28.932-6.445 1.924-9.474 2.98C17.309 83.498 0 98.307 0 113.668c0 15.865 18.582 31.778 46.812 41.427a145.52 145.52 0 0 0 6.921 2.165a167.467 167.467 0 0 0-2.01 9.138c-5.354 28.2-1.173 50.591 12.134 58.266c13.744 7.926 36.812-.22 59.273-19.855a145.567 145.567 0 0 0 5.342-4.923a168.064 168.064 0 0 0 6.92 6.314c21.758 18.722 43.246 26.282 56.54 18.586c13.731-7.949 18.194-32.003 12.4-61.268a145.016 145.016 0 0 0-1.535-6.842c1.62-.48 3.21-.974 4.76-1.488c29.348-9.723 48.443-25.443 48.443-41.52c0-15.417-17.868-30.326-45.517-39.844Zm-6.365 70.984c-1.4.463-2.836.91-4.3 1.345c-3.24-10.257-7.612-21.163-12.963-32.432c5.106-11 9.31-21.767 12.459-31.957c2.619.758 5.16 1.557 7.61 2.4c23.69 8.156 38.14 20.213 38.14 29.504c0 9.896-15.606 22.743-40.946 31.14Zm-10.514 20.834c2.562 12.94 2.927 24.64 1.23 33.787c-1.524 8.219-4.59 13.698-8.382 15.893c-8.067 4.67-25.32-1.4-43.927-17.412a156.726 156.726 0 0 1-6.437-5.87c7.214-7.889 14.423-17.06 21.459-27.246c12.376-1.098 24.068-2.894 34.671-5.345a134.17 134.17 0 0 1 1.386 6.193ZM87.276 214.515c-7.882 2.783-14.16 2.863-17.955.675c-8.075-4.657-11.432-22.636-6.853-46.752a156.923 156.923 0 0 1 1.869-8.499c10.486 2.32 22.093 3.988 34.498 4.994c7.084 9.967 14.501 19.128 21.976 27.15a134.668 134.668 0 0 1-4.877 4.492c-9.933 8.682-19.886 14.842-28.658 17.94ZM50.35 144.747c-12.483-4.267-22.792-9.812-29.858-15.863c-6.35-5.437-9.555-10.836-9.555-15.216c0-9.322 13.897-21.212 37.076-29.293c2.813-.98 5.757-1.905 8.812-2.773c3.204 10.42 7.406 21.315 12.477 32.332c-5.137 11.18-9.399 22.249-12.634 32.792a134.718 134.718 0 0 1-6.318-1.979Zm12.378-84.26c-4.811-24.587-1.616-43.134 6.425-47.789c8.564-4.958 27.502 2.111 47.463 19.835a144.318 144.318 0 0 1 3.841 3.545c-7.438 7.987-14.787 17.08-21.808 26.988c-12.04 1.116-23.565 2.908-34.161 5.309a160.342 160.342 0 0 1-1.76-7.887Zm110.427 27.268a347.8 347.8 0 0 0-7.785-12.803c8.168 1.033 15.994 2.404 23.343 4.08c-2.206 7.072-4.956 14.465-8.193 22.045a381.151 381.151 0 0 0-7.365-13.322Zm-45.032-43.861c5.044 5.465 10.096 11.566 15.065 18.186a322.04 322.04 0 0 0-30.257-.006c4.974-6.559 10.069-12.652 15.192-18.18ZM82.802 87.83a323.167 323.167 0 0 0-7.227 13.238c-3.184-7.553-5.909-14.98-8.134-22.152c7.304-1.634 15.093-2.97 23.209-3.984a321.524 321.524 0 0 0-7.848 12.897Zm8.081 65.352c-8.385-.936-16.291-2.203-23.593-3.793c2.26-7.3 5.045-14.885 8.298-22.6a321.187 321.187 0 0 0 7.257 13.246c2.594 4.48 5.28 8.868 8.038 13.147Zm37.542 31.03c-5.184-5.592-10.354-11.779-15.403-18.433c4.902.192 9.899.29 14.978.29c5.218 0 10.376-.117 15.453-.343c-4.985 6.774-10.018 12.97-15.028 18.486Zm52.198-57.817c3.422 7.8 6.306 15.345 8.596 22.52c-7.422 1.694-15.436 3.058-23.88 4.071a382.417 382.417 0 0 0 7.859-13.026a347.403 347.403 0 0 0 7.425-13.565Zm-16.898 8.101a358.557 358.557 0 0 1-12.281 19.815a329.4 329.4 0 0 1-23.444.823c-7.967 0-15.716-.248-23.178-.732a310.202 310.202 0 0 1-12.513-19.846h.001a307.41 307.41 0 0 1-10.923-20.627a310.278 310.278 0 0 1 10.89-20.637l-.001.001a307.318 307.318 0 0 1 12.413-19.761c7.613-.576 15.42-.876 23.31-.876H128c7.926 0 15.743.303 23.354.883a329.357 329.357 0 0 1 12.335 19.695a358.489 358.489 0 0 1 11.036 20.54a329.472 329.472 0 0 1-11 20.722Zm22.56-122.124c8.572 4.944 11.906 24.881 6.52 51.026c-.344 1.668-.73 3.367-1.15 5.09c-10.622-2.452-22.155-4.275-34.23-5.408c-7.034-10.017-14.323-19.124-21.64-27.008a160.789 160.789 0 0 1 5.888-5.4c18.9-16.447 36.564-22.941 44.612-18.3ZM128 90.808c12.625 0 22.86 10.235 22.86 22.86s-10.235 22.86-22.86 22.86s-22.86-10.235-22.86-22.86s10.235-22.86 22.86-22.86Z"
15+
></Path>
16+
</Svg>
17+
);
18+
}

‎components/Button.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ export const Button = ({ text, onPress }: ButtonProps) => {
1818
const styles = StyleSheet.create({
1919
container: {
2020
backgroundColor: "#FD366E",
21-
paddingBlock: 10,
22-
paddingHorizontal: 12,
23-
borderRadius: 8,
21+
paddingBlock: 6,
22+
paddingHorizontal: 10,
23+
borderRadius: 6,
2424
},
2525
text: {
2626
color: "#FFF",

‎components/Card.tsx‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
import { ReactNode } from "react";
2-
import { Linking, StyleSheet, TouchableOpacity, View } from "react-native";
2+
import {
3+
Dimensions,
4+
Linking,
5+
Platform,
6+
StyleSheet,
7+
TouchableOpacity,
8+
View,
9+
} from "react-native";
310

411
interface CardProps {
512
children: ReactNode;
@@ -29,5 +36,9 @@ const styles = StyleSheet.create({
2936
borderWidth: 1,
3037
borderRadius: 8,
3138
padding: 16,
39+
maxWidth:
40+
Platform.OS === "web" && Dimensions.get("window").width >= 1024
41+
? 288
42+
: "auto",
3243
},
3344
});

‎components/Code.tsx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,7 @@ const styles = StyleSheet.create({
3333
codeContainerSecondary: {},
3434
code: {
3535
fontSize: 14,
36+
fontFamily: "Inter_400Regular",
37+
lineHeight: 20,
3638
},
3739
});

0 commit comments

Comments
 (0)