diff --git a/app/(tabs)/owner.tsx b/app/(tabs)/owner.tsx
index 7258872..b3f3b76 100644
--- a/app/(tabs)/owner.tsx
+++ b/app/(tabs)/owner.tsx
@@ -129,8 +129,8 @@ export default function OwnerPage() {
{/* 作品数据 */}
- } number={userInfoDetails.stories_count} />
- } number={userInfoDetails.conversations_count} />
+ } number={userInfoDetails.stories_count} />
+ } number={userInfoDetails.conversations_count} />
{/* 排行榜 */}
diff --git a/app/(tabs)/setting.tsx b/app/(tabs)/setting.tsx
index 0888a81..22e9bfa 100644
--- a/app/(tabs)/setting.tsx
+++ b/app/(tabs)/setting.tsx
@@ -221,7 +221,7 @@ const Setting = () => {
{ router.push('/owner') }}>
- {t('generalSetting.allTitle', { ns: 'personal' })}
+ {t('generalSetting.allTitle', { ns: 'personal' })}
×
@@ -269,11 +269,11 @@ const Setting = () => {
*/}
{/* 权限信息 */}
- {t('permission.permissionManagement', { ns: 'personal' })}
+ {t('permission.permissionManagement', { ns: 'personal' })}
{/* 相册权限 */}
- {t('permission.galleryAccess', { ns: 'personal' })}
+ {t('permission.galleryAccess', { ns: 'personal' })}
{
{/* 位置权限 */}
- {t('permission.locationPermission', { ns: 'personal' })}
+ {t('permission.locationPermission', { ns: 'personal' })}
{
- {t('permission.pushNotification', { ns: 'personal' })}
+ {t('permission.pushNotification', { ns: 'personal' })}
{
*/}
{/* 协议 */}
- {t('lcenses.title', { ns: 'personal' })}
+ {t('lcenses.title', { ns: 'personal' })}
{ setModalType('privacy'); setPrivacyModalVisible(true) }} >
- {t('lcenses.privacyPolicy', { ns: 'personal' })}
+ {t('lcenses.privacyPolicy', { ns: 'personal' })}
{ setModalType('terms'); setPrivacyModalVisible(true) }} >
- {t('lcenses.applyPermission', { ns: 'personal' })}
+ {t('lcenses.applyPermission', { ns: 'personal' })}
{ setModalType('user'); setPrivacyModalVisible(true) }} >
- {t('lcenses.userAgreement', { ns: 'personal' })}
+ {t('lcenses.userAgreement', { ns: 'personal' })}
{ setModalType('ai'); setPrivacyModalVisible(true) }} >
- {t('lcenses.aiPolicy', { ns: 'personal' })}
+ {t('lcenses.aiPolicy', { ns: 'personal' })}
{ setLcensesModalVisible(true) }} >
- {t('lcenses.qualification', { ns: 'personal' })}
+ {t('lcenses.qualification', { ns: 'personal' })}
Linking.openURL("https://beian.miit.gov.cn/")} >
- {t('lcenses.ICP', { ns: 'personal' })}沪ICP备2025133004号-2A
+ {t('lcenses.ICP', { ns: 'personal' })}沪ICP备2025133004号-2A
{/* 其他信息 */}
- {t('generalSetting.otherInformation', { ns: 'personal' })}
+ {t('generalSetting.otherInformation', { ns: 'personal' })}
Linking.openURL("https://work.weixin.qq.com/kfid/kfca0ac87f4e05e8bfd")} >
- {t('generalSetting.contactUs', { ns: 'personal' })}
+ {t('generalSetting.contactUs', { ns: 'personal' })}
{/* */}
- {t('generalSetting.version', { ns: 'personal' })}
+ {t('generalSetting.version', { ns: 'personal' })}
{"0.5.0"}
{/* 退出 */}
- {t('generalSetting.logout', { ns: 'personal' })}
+ {t('generalSetting.logout', { ns: 'personal' })}
{/* 注销账号 */}
setDeleteModalVisible(true)}>
- {t('generalSetting.deleteAccount', { ns: 'personal' })}
+ {t('generalSetting.deleteAccount', { ns: 'personal' })}
diff --git a/app/(tabs)/top.tsx b/app/(tabs)/top.tsx
index 8916bde..08b4d30 100644
--- a/app/(tabs)/top.tsx
+++ b/app/(tabs)/top.tsx
@@ -172,7 +172,7 @@ export default function OwnerPage() {
{ router.push('/owner') }} style={{ padding: 16 }}>
-
+
Top Memory Makers
123
diff --git a/components/cascader.tsx b/components/cascader.tsx
index 9e0d8b1..f9e5057 100644
--- a/components/cascader.tsx
+++ b/components/cascader.tsx
@@ -95,6 +95,7 @@ const CascaderComponent: React.FC = ({
textStyle,
isActive && [styles.activeText, activeTextStyle]
]}
+ type='sfPro'
>
{item.name}
diff --git a/components/owner/classify.tsx b/components/owner/classify.tsx
index d2214db..028d2e1 100644
--- a/components/owner/classify.tsx
+++ b/components/owner/classify.tsx
@@ -4,6 +4,7 @@ import { useTranslation } from 'react-i18next';
import { ScrollView, StyleSheet, Text, TouchableOpacity, View } from 'react-native';
import Modal from 'react-native-modal';
import Cascader, { CascaderItem } from '../cascader';
+import { ThemedText } from '../ThemedText';
interface ClassifyModalProps {
modalVisible: boolean;
@@ -39,9 +40,9 @@ const ClassifyModal = (props: ClassifyModalProps) => {
Settings
- {t('generalSetting.classify', { ns: 'personal' })}
+ {t('generalSetting.classify', { ns: 'personal' })}
setModalVisible(false)}>
- ×
+ ×
diff --git a/components/owner/createCount.tsx b/components/owner/createCount.tsx
index 64cdfee..342ce45 100644
--- a/components/owner/createCount.tsx
+++ b/components/owner/createCount.tsx
@@ -20,12 +20,10 @@ const CreateCountComponent = React.memo((props: CreateCountProps) => {
return (
-
- {props.icon}
-
- {props.title}
+ {props.title}
+ {props.icon}
- {props.number}
+ {props.number}
);
});
@@ -35,11 +33,12 @@ const styles = StyleSheet.create({
flex: 1,
display: "flex",
flexDirection: "column",
- alignItems: "center",
+ // alignItems: "center",
justifyContent: "center",
gap: 8,
backgroundColor: "#FAF9F6",
- padding: 16,
+ paddingVertical: 16,
+ paddingRight: 16,
borderRadius: 12,
shadowColor: "#000",
shadowOffset: {
@@ -51,13 +50,12 @@ const styles = StyleSheet.create({
// elevation: 1,
},
header: {
- width: "100%",
+ width: "90%",
display: "flex",
flexDirection: "row",
- alignItems: "center",
paddingHorizontal: 16,
- justifyContent: "center",
- gap: 8,
+ alignItems: "flex-start",
+ gap: 4,
},
title: {
fontSize: 20,
diff --git a/components/owner/podium.tsx b/components/owner/podium.tsx
index 228968b..5630021 100644
--- a/components/owner/podium.tsx
+++ b/components/owner/podium.tsx
@@ -36,6 +36,7 @@ const PodiumComponent = ({ data }: IPodium) => {
numberOfLines={1}
ellipsizeMode="tail"
style={styles.title}
+ type="inter"
>
{data[1]?.user_nick_name}
@@ -65,6 +66,7 @@ const PodiumComponent = ({ data }: IPodium) => {
numberOfLines={2}
ellipsizeMode="tail"
style={styles.title}
+ type="inter"
>
{data[0]?.user_nick_name}
@@ -94,6 +96,7 @@ const PodiumComponent = ({ data }: IPodium) => {
numberOfLines={1}
ellipsizeMode="tail"
style={styles.title}
+ type="inter"
>
{data[2]?.user_nick_name}
diff --git a/components/owner/rankList.tsx b/components/owner/rankList.tsx
index 102f47c..63780b7 100644
--- a/components/owner/rankList.tsx
+++ b/components/owner/rankList.tsx
@@ -15,9 +15,9 @@ const RankList = (props: IRankList) => {
contentContainerStyle={{ flexGrow: 1, paddingHorizontal: 16, marginTop: 16 }}
>
- Rank
- Username
- Profile
+ Rank
+ Username
+ Profile
{props.data?.filter((item, index) => index > 2).map((item, index) => (
{
)}
- {index + 1}
- {item.user_nick_name}
+ {index + 1}
+ {item.user_nick_name}
{(() => {
const [imageError, setImageError] = useState(false);
@@ -66,9 +66,9 @@ const styles = StyleSheet.create({
backgroundColor: 'white',
},
headerText: {
- fontSize: 14,
+ fontSize: 12,
color: "#4C320C",
- fontWeight: "600"
+ fontWeight: "500"
},
item: {
flexDirection: 'row',
@@ -85,7 +85,7 @@ const styles = StyleSheet.create({
fontWeight: "700"
},
itemName: {
- fontSize: 14,
+ fontSize: 12,
color: "#AC7E35",
},
self: {
diff --git a/components/owner/userInfo.tsx b/components/owner/userInfo.tsx
index 985c6dc..c9190d3 100644
--- a/components/owner/userInfo.tsx
+++ b/components/owner/userInfo.tsx
@@ -79,11 +79,11 @@ const UserInfo = (props: UserInfoProps) => {
return (
- {userInfo?.nickname}
- {t('generalSetting.userId', { ns: 'personal' })}{userInfo?.user_id}
+ {userInfo?.nickname}
+ {t('generalSetting.userId', { ns: 'personal' })}{userInfo?.user_id}
-
+
{currentLocation?.country}-{currentLocation?.city}-{currentLocation?.district}
{userInfo?.user_info?.nickname}
@@ -62,6 +66,7 @@ export default function UserInfo({ userInfo }: { userInfo: UserInfoDetails }) {
flexShrink: 1,
flexGrow: 0,
}}
+ type="inter"
numberOfLines={1}
ellipsizeMode="tail"
>
@@ -91,6 +96,7 @@ export default function UserInfo({ userInfo }: { userInfo: UserInfoDetails }) {
maxWidth: 40,
lineHeight: 20
}}
+ type="inter"
numberOfLines={1}
ellipsizeMode="tail"
>
diff --git a/constants/Fonts.ts b/constants/Fonts.ts
index 59f0d2c..ba5036e 100644
--- a/constants/Fonts.ts
+++ b/constants/Fonts.ts
@@ -38,6 +38,6 @@ export const Fonts = {
} as const;
export type FontWeight = keyof Omit;
-export type FontSize = 'xs' | 'sm' | 'base' | 'lg' | 'xl' | '2xl' | '3xl' | '4xl' | '5xl' | 'title';
+export type FontSize = "xxs" | "xs" | "sm" | "base" | "lg" | "xl" | "2xl" | "3xl" | "4xl" | "5xl" | "title";
export type FontColor = 'bgPrimary' | 'bgSecondary' | 'textPrimary' | 'textSecondary' | 'textThird' | 'textWhite';
diff --git a/i18n/locales/en/personal.json b/i18n/locales/en/personal.json
index 06fce5e..82c42fb 100644
--- a/i18n/locales/en/personal.json
+++ b/i18n/locales/en/personal.json
@@ -74,7 +74,7 @@
"confirm": "Confirm",
"location": "Location",
"rank": "Top Memory Makers",
- "userId": "User ID",
+ "userId": "User ID : ",
"usedStorage": "Storage Used",
"remainingPoints": "Points Remaining",
"totalVideo": "Total Videos",