Repository navigation
Feature/favorites #136
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Feature/favorites #136
Changes from all commits
Commits
Show all changes
22 commits
Select commit
Hold shift + click to select a range
c86a4a9
feat(analytics, premium): implement analytics dashboard and premium s…
Kush-Srigiri 2b249e8
fix(analytics, premium): replace hardcoded colors with useTheme
Kush-Srigiri d41e05b
fix(#14): fix Field import & move to components, start datingInfo lay…
Kush-Srigiri 9ed4870
Merge branch 'dev' into feature/favorites
Kush-Srigiri 82f6317
feat(#67): complete datingInfo screen with categories, tips modal & p…
Kush-Srigiri 8187e94
feat(#67): complete datingInfo screen with categories, tips modal & p…
Kush-Srigiri 4b6baf6
feat: add subscription plans screen and integrate subscription option…
LuisAll12 6e1b664
fix: premium delete
LuisAll12 16a2c37
Merge branch 'dev' into feature/favorites
LuisAll12 ce8c2e2
feat: add expo-image-picker and react-native-keyboard-aware-scroll-vi…
LuisAll12 f2c249a
Merge branch 'feature/subscriptions' into feature/favorites
LuisAll12 59a8b61
feat: update routing to subscriptions for premium features
LuisAll12 a815b66
Merge branch 'dev' into feature/favorites
Kush-Srigiri 8e34f68
feat(favorites): fix light mode text colors, carousel width reactivit…
Kush-Srigiri 605ffba
fix(favorites): resolve lint errors and missing dependencies (#136)
Kush-Srigiri 61cda30
fix(favorites): resolve lint errors and missing dependencies (#136)
Kush-Srigiri b0c7c71
fix(favorites): resolve merge conflicts (#136)
Kush-Srigiri 56e5059
fix(favorites): resolve merge conflicts 2.0 (#136)
Kush-Srigiri faee9e0
fix(favorites): resolve merge conflicts 3.0 (#136)
Kush-Srigiri f745a61
Delete .claude/settings.local.json
Jamie-Poeffel 39186f6
feat: add IdeaDetail and ErrorScreen components; update package.json …
Jamie-Poeffel 0d131b8
feat: implement server status context and connection quality hook; up…
Jamie-Poeffel File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -54,4 +54,5 @@ app-example | |
|
|
||
| .claude | ||
| *.claude | ||
| claude | ||
| claude | ||
| ,claude-* | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||
|---|---|---|---|---|
|
|
@@ -3,7 +3,7 @@ import BackWrapper from "@/components/backwrapper"; | |||
| import { Pressable, Text, View } from "react-native"; | ||||
| import { Image } from "expo-image"; | ||||
| import { BtnText, Button } from "@/components/button"; | ||||
| import { router } from "expo-router"; | ||||
| import { router, Stack } from "expo-router"; | ||||
| import { createT } from "@/i18n"; | ||||
| import * as ImagePicker from "expo-image-picker"; | ||||
| import { useRegisterStore } from "@/utils/registerStore"; | ||||
|
|
@@ -35,44 +35,47 @@ export default function AddProfilePicturePage() { | |||
| }; | ||||
|
|
||||
| return ( | ||||
| <BackWrapper> | ||||
| <Text style={[gs.h1, { marginTop: 35 }]}>{t("title")}</Text> | ||||
| <> | ||||
| <Stack.Screen options={{ headerShown: false }} /> | ||||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||
| <BackWrapper> | ||||
| <Text style={[gs.h1, { marginTop: 35 }]}>{t("title")}</Text> | ||||
|
|
||||
| <Text style={[gs.bodyText, { marginTop: 10, color: theme.base + "54" }]}> | ||||
| {t("makeAttractive")}{" "} | ||||
| <Text style={{ fontWeight: "bold" }}>{t("makeAttractiveBold")}</Text>{" "} | ||||
| {t("makeAttractiveSuffix")} | ||||
| </Text> | ||||
| <Text style={[gs.bodyText, { marginTop: 10, color: theme.base + "54" }]}> | ||||
| {t("makeAttractive")}{" "} | ||||
| <Text style={{ fontWeight: "bold" }}>{t("makeAttractiveBold")}</Text>{" "} | ||||
| {t("makeAttractiveSuffix")} | ||||
| </Text> | ||||
|
|
||||
| <Pressable onPress={pickImage}> | ||||
| <View | ||||
| style={{ | ||||
| flexDirection: "column", | ||||
| justifyContent: "center", | ||||
| alignItems: "center", | ||||
| marginVertical: 32, | ||||
| borderRadius: 16, | ||||
| }} | ||||
| > | ||||
| <Image | ||||
| source={ | ||||
| data.profilePictureUri | ||||
| ? { uri: data.profilePictureUri } | ||||
| : require("@/assets/blank-profile.png") | ||||
| } | ||||
| placeholder="|rF?hV%2WCj[ayj[a|j[az_NaeWBj@ayfRayfQfQM{M|azj[azf6fQfQfQIpWXofj[ayj[j[fQayWCoeoeaya}j[ayfQa{oLj?j[WVj[ayayj[fQoff7azayj[ayj[j[ayofayayayj[fQj[ayayj[ayfjj[j[ayjuayj[" | ||||
| transition={1000} | ||||
| style={{ width: 200, height: 200, borderRadius: 16 }} | ||||
| /> | ||||
| </View> | ||||
| </Pressable> | ||||
| <Pressable onPress={pickImage}> | ||||
| <View | ||||
| style={{ | ||||
| flexDirection: "column", | ||||
| justifyContent: "center", | ||||
| alignItems: "center", | ||||
| marginVertical: 32, | ||||
| borderRadius: 16, | ||||
| }} | ||||
| > | ||||
| <Image | ||||
| source={ | ||||
| data.profilePictureUri | ||||
| ? { uri: data.profilePictureUri } | ||||
| : require("@/assets/blank-profile.png") | ||||
| } | ||||
| placeholder="|rF?hV%2WCj[ayj[a|j[az_NaeWBj@ayfRayfQfQM{M|azj[azf6fQfQfQIpWXofj[ayj[j[fQayWCoeoeaya}j[ayfQa{oLj?j[WVj[ayayj[fQoff7azayj[ayj[j[ayofayayayj[fQj[ayayj[ayfjj[j[ayjuayj[" | ||||
| transition={1000} | ||||
| style={{ width: 200, height: 200, borderRadius: 16 }} | ||||
| /> | ||||
| </View> | ||||
| </Pressable> | ||||
|
|
||||
| <Button | ||||
| onPress={() => router.push("/register/addProfileData")} | ||||
| style={{ marginTop: "auto" }} | ||||
| > | ||||
| <BtnText>{t("continue")}</BtnText> | ||||
| </Button> | ||||
| </BackWrapper> | ||||
| <Button | ||||
| onPress={() => router.push("/register/addProfileData")} | ||||
| style={{ marginTop: "auto" }} | ||||
| > | ||||
| <BtnText>{t("continue")}</BtnText> | ||||
| </Button> | ||||
| </BackWrapper> | ||||
| </> | ||||
| ); | ||||
| } | ||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||
|---|---|---|---|---|
| @@ -1,7 +1,7 @@ | ||||
| import BackWrapper from "@/components/backwrapper"; | ||||
| import { useTheme } from "@/lib/theme/context"; | ||||
| import { BtnText, Button } from "@/components/button"; | ||||
| import { router } from "expo-router"; | ||||
| import { router, Stack } from "expo-router"; | ||||
| import { useState } from "react"; | ||||
| import { Pressable, StyleSheet, Text, View } from "react-native"; | ||||
| import { Mars, Venus } from "lucide-react-native"; | ||||
|
|
@@ -44,44 +44,54 @@ export default function Gender() { | |||
| }; | ||||
|
|
||||
| return ( | ||||
| <BackWrapper> | ||||
| <Text style={[gs.h1, { marginTop: 35 }]}>{t("title")}</Text> | ||||
|
|
||||
| <Text | ||||
| style={[ | ||||
| gs.bodyText, | ||||
| { marginTop: 10, color: theme.base + "54", textAlign: "left" }, | ||||
| ]} | ||||
| > | ||||
| {t("body")} <Text style={{ fontWeight: "bold" }}>{t("bodyBold")}</Text> | ||||
| </Text> | ||||
|
|
||||
| <View style={styles.cardsArea}> | ||||
| <Pressable | ||||
| style={[styles.card, getCardStyle("male")]} | ||||
| onPress={() => setSelected("male")} | ||||
| <> | ||||
| <Stack.Screen options={{ headerShown: false }} /> | ||||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||
| <BackWrapper> | ||||
| <Text style={[gs.h1, { marginTop: 35 }]}>{t("title")}</Text> | ||||
|
|
||||
| <Text | ||||
| style={[ | ||||
| gs.bodyText, | ||||
| { marginTop: 10, color: theme.base + "54", textAlign: "left" }, | ||||
| ]} | ||||
| > | ||||
| <Mars size={36} color={getLabelColor("male")} /> | ||||
| <Text style={[styles.cardText, { color: getLabelColor("male") }]}> | ||||
| {t("male")} | ||||
| </Text> | ||||
| </Pressable> | ||||
|
|
||||
| <Pressable | ||||
| style={[styles.card, getCardStyle("female")]} | ||||
| onPress={() => setSelected("female")} | ||||
| {t("body")}{" "} | ||||
| <Text style={{ fontWeight: "bold" }}>{t("bodyBold")}</Text> | ||||
| </Text> | ||||
|
|
||||
| <View style={styles.cardsArea}> | ||||
| <Pressable | ||||
| style={[styles.card, getCardStyle("male")]} | ||||
| onPress={() => setSelected("male")} | ||||
| > | ||||
| <Mars size={36} color={getLabelColor("male")} /> | ||||
| <Text style={[styles.cardText, { color: getLabelColor("male") }]}> | ||||
| {t("male")} | ||||
| </Text> | ||||
| </Pressable> | ||||
|
|
||||
| <Pressable | ||||
| style={[styles.card, getCardStyle("female")]} | ||||
| onPress={() => setSelected("female")} | ||||
| > | ||||
| <Venus size={36} color={getLabelColor("female")} /> | ||||
| <Text | ||||
| style={[styles.cardText, { color: getLabelColor("female") }]} | ||||
| > | ||||
| {t("female")} | ||||
| </Text> | ||||
| </Pressable> | ||||
| </View> | ||||
|
|
||||
| <Button | ||||
| style={{ marginTop: "auto" }} | ||||
| onPress={onSubmit} | ||||
| disabled={!selected} | ||||
| > | ||||
| <Venus size={36} color={getLabelColor("female")} /> | ||||
| <Text style={[styles.cardText, { color: getLabelColor("female") }]}> | ||||
| {t("female")} | ||||
| </Text> | ||||
| </Pressable> | ||||
| </View> | ||||
|
|
||||
| <Button style={{ marginTop: "auto" }} onPress={onSubmit} disabled={!selected}> | ||||
| <BtnText>{t("continue")}</BtnText> | ||||
| </Button> | ||||
| </BackWrapper> | ||||
| <BtnText>{t("continue")}</BtnText> | ||||
| </Button> | ||||
| </BackWrapper> | ||||
| </> | ||||
| ); | ||||
| } | ||||
|
|
||||
|
|
||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.