Mirrors/notesnook
1
0
Fork 0
mirror of https://github.com/streetwriters/notesnook.git synced 2025-12-23 15:09:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

mobile: allow users to change plan

Browse Source
This commit is contained in:
Ammar Ahmed
2025-09-24 10:23:00 +05:00
committed by Abdullah Atta
parent a49bc92a13
commit fb7d8b0893
8 changed files with 134 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
apps/mobile/app/components/paywall/index.tsx
View File

@@ -63,7 +63,7 @@ import usePricingPlans, {
import Navigation, { NavigationProps } from "../../services/navigation";
import { getElevationStyle } from "../../utils/elevation";
import { openLinkInBrowser } from "../../utils/functions";
import { AppFontSize } from "../../utils/size";
import { AppFontSize, defaultBorderRadius } from "../../utils/size";
import { DefaultAppStyles } from "../../utils/styles";
import { AuthMode } from "../auth/common";
import { Header } from "../header";
@@ -236,7 +236,6 @@ const PayWall = (props: NavigationProps<"PayWall">) => {
gap: 5
}}
>
{/* <Icon name="crown" size={30} color={colors.static.orange} /> */}
<Heading
key="heading"
size={AppFontSize.xl}
@@ -244,10 +243,17 @@ const PayWall = (props: NavigationProps<"PayWall">) => {
alignSelf: "center"
}}
>
{strings.notesnookPlans[0]()}{" "}
<Heading size={AppFontSize.xl} color={colors.primary.accent}>
{pricingPlans.isSubscribed()
? strings.changePlan()
: strings.notesnookPlans[0]() + " "}
{pricingPlans.isSubscribed() ? null : (
<Heading
size={AppFontSize.xl}
color={colors.primary.accent}
>
{strings.notesnookPlans[1]()}
</Heading>
)}
</Heading>
</View>
@@ -562,7 +568,7 @@ After trying all the privacy security oriented note taking apps, for the price a
<View
style={{
alignSelf: "center",
alignSelf: isTablet ? "center" : "flex-start",
flexShrink: 1
}}
>
@@ -748,7 +754,7 @@ const ComparePlans = React.memo(
<ScrollView
horizontal
style={{
width: "100%"
width: isTablet ? "100%" : undefined
}}
contentContainerStyle={{
flexDirection: "column"
@@ -988,6 +994,11 @@ const PricingPlanCard = ({
});
}, [pricingPlans, plan, product, WebPlan]);
console.log(
pricingPlans?.user?.subscription.productId,
pricingPlans?.currentPlan?.id
);
return (
<TouchableOpacity
activeOpacity={0.8}
@@ -1014,7 +1025,7 @@ const PricingPlanCard = ({
<View
style={{
backgroundColor: colors.static.red,
borderRadius: 100,
borderRadius: defaultBorderRadius,
paddingHorizontal: 6,
alignItems: "center",
justifyContent: "center",
@@ -1028,6 +1039,26 @@ const PricingPlanCard = ({
</View>
) : null}
{product?.productId &&
pricingPlans?.user?.subscription.productId.includes(plan.id) &&
pricingPlans.isSubscribed() ? (
<View
style={{
backgroundColor: colors.primary.accent,
borderRadius: defaultBorderRadius,
paddingHorizontal: 6,
alignItems: "center",
justifyContent: "center",
height: 25,
alignSelf: "flex-start"
}}
>
<Heading color={colors.static.white} size={AppFontSize.xs}>
{strings.currentPlan()}
</Heading>
</View>
) : null}
<View>
<Heading size={AppFontSize.md}>
{plan.name}{" "}

25
apps/mobile/app/components/sheets/buy-plan/index.tsx
View File

@@ -114,7 +114,7 @@ export const BuyPlan = (props: {
Config.GITHUB_RELEASE === "true"
? "monthly"
: `notesnook.${props.planId}.monthly`,
...(props.planId === "essential"
...(props.planId === "essential" || pricingPlans.isSubscribed()
? []
: [
Config.GITHUB_RELEASE === "true"
@@ -349,6 +349,11 @@ const ProductItem = (props: {
: (product as RNIap.Product)?.productId
)?.includes("5");
const isSubscribed =
props.pricingPlans.isSubscribed() &&
(props.pricingPlans.user?.subscription.productId ===
(product as RNIap.Subscription).productId ||
props.pricingPlans.user?.subscription.productId === (product as Plan).id);
return (
<TouchableOpacity
style={{
@@ -390,7 +395,7 @@ const ProductItem = (props: {
<View
style={{
backgroundColor: colors.static.red,
borderRadius: 100,
borderRadius: defaultBorderRadius,
paddingHorizontal: 6,
alignItems: "center",
justifyContent: "center"
@@ -410,6 +415,22 @@ const ProductItem = (props: {
</Heading>
</View>
) : null}
{isSubscribed ? (
<View
style={{
backgroundColor: colors.primary.accent,
borderRadius: defaultBorderRadius,
paddingHorizontal: 6,
alignItems: "center",
justifyContent: "center"
}}
>
<Heading color={colors.static.white} size={AppFontSize.xs}>
{strings.currentPlan()}
</Heading>
</View>
) : null}
</View>
<Paragraph size={AppFontSize.md}>

10
apps/mobile/app/hooks/use-pricing-plans.ts
View File

@@ -16,7 +16,12 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
import { Plan, SKUResponse, SubscriptionPlanId } from "@notesnook/core";
import {
Plan,
SKUResponse,
SubscriptionPlan,
SubscriptionPlanId
} from "@notesnook/core";
import { useEffect, useState } from "react";
import { Platform } from "react-native";
import Config from "react-native-config";
@@ -776,7 +781,8 @@ const usePricingPlans = (options?: PricingPlansOptions) => {
},
regionalDiscount,
getRegionalDiscount,
isGithubRelease: isGithubRelease
isGithubRelease: isGithubRelease,
isSubscribed: () => user?.subscription.plan !== SubscriptionPlan.FREE
};
};

30
apps/mobile/app/screens/settings/user-section.jsx
View File

@@ -18,7 +18,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
import { formatBytes } from "@notesnook/common";
import { SubscriptionPlan, SubscriptionStatus } from "@notesnook/core";
import {
SubscriptionPlan,
SubscriptionProvider,
SubscriptionStatus
} from "@notesnook/core";
import { strings } from "@notesnook/intl";
import { useThemeColors } from "@notesnook/theme";
import { useNetInfo } from "@react-native-community/netinfo";
@@ -34,7 +38,7 @@ import AppIcon from "../../components/ui/AppIcon";
import { Button } from "../../components/ui/button";
import { TimeSince } from "../../components/ui/time-since";
import Paragraph from "../../components/ui/typography/paragraph";
import { presentSheet } from "../../services/event-manager";
import { presentSheet, ToastManager } from "../../services/event-manager";
import Navigation from "../../services/navigation";
import { useThemeStore } from "../../stores/use-theme-store";
import { SyncStatus, useUserStore } from "../../stores/use-user-store";
@@ -364,9 +368,28 @@ const SettingsUserSection = ({ item }) => {
</Paragraph>
</TouchableOpacity>
{user.subscription.provider === SubscriptionProvider.PADDLE ||
user.subscription.provider ===
SubscriptionProvider.STREETWRITERS ? null : (
<Button
title={strings.upgradePlan()}
title={
user.subscription.plan !== SubscriptionPlan.FREE
? strings.changePlan()
: strings.upgradePlan()
}
onPress={() => {
// if (
// user.subscription.plan !== SubscriptionPlan.FREE &&
// user.subscription.productId.includes("5year")
// ) {
// ToastManager.show({
// message:
// "You have made a one time purchase. To change your plan please contact support.",
// type: "info"
// });
// return;
// }
Navigation.navigate("PayWall", {
context: "logged-in",
canGoBack: true
@@ -380,6 +403,7 @@ const SettingsUserSection = ({ item }) => {
paddingVertical: DefaultAppStyles.GAP_SMALL
}}
/>
)}
</View>
</View>
</View>

2
apps/mobile/app/stores/use-navigation-store.ts
View File

@@ -111,7 +111,7 @@ export interface RouteParams extends ParamListBase {
Intro: GenericRouteParam;
PayWall: {
canGoBack?: boolean;
context: "signup" | "logged-in" | "logged-out";
context: "signup" | "logged-in" | "logged-out" | "subscribed";
state?: BillingState;
};
}

8
packages/intl/locale/en.po
View File

@@ -1362,6 +1362,10 @@ msgstr "Change notification sound"
msgid "Change password"
msgstr "Change password"
#: src/strings.ts:2584
msgid "Change plan"
msgstr "Change plan"
#: src/strings.ts:1817
msgid "Change profile picture"
msgstr "Change profile picture"
@@ -7234,6 +7238,10 @@ msgstr "You have been logged out from all other devices."
msgid "You have been logged out."
msgstr "You have been logged out."
#: src/strings.ts:2586
msgid "You have made a one time purchase. To change your plan please contact support."
msgstr "You have made a one time purchase. To change your plan please contact support."
#: src/strings.ts:963
msgid "You have not added any notebooks yet"
msgstr "You have not added any notebooks yet"

8
packages/intl/locale/pseudo-LOCALE.po
View File

@@ -1362,6 +1362,10 @@ msgstr ""
msgid "Change password"
msgstr ""
#: src/strings.ts:2584
msgid "Change plan"
msgstr ""
#: src/strings.ts:1817
msgid "Change profile picture"
msgstr ""
@@ -7180,6 +7184,10 @@ msgstr ""
msgid "You have been logged out."
msgstr ""
#: src/strings.ts:2586
msgid "You have made a one time purchase. To change your plan please contact support."
msgstr ""
#: src/strings.ts:963
msgid "You have not added any notebooks yet"
msgstr ""

5
packages/intl/src/strings.ts
View File

@@ -2580,5 +2580,8 @@ Use this if changes from other devices are not appearing on this device. This wi
fiveYearPlan: () => t`5 year plan (One time purchase)`,
educationPlan: () => t`Education plan`,
welcomeToPlan: (plan: string) => t`Welcome to Notesnook ${plan}`,
thankYouForPurchase: () => t`Thank you for the purchase`
thankYouForPurchase: () => t`Thank you for the purchase`,
changePlan: () => t`Change plan`,
contactSupportToChangePlan: () =>
t`You have made a one time purchase. To change your plan please contact support.`
};