diff --git a/app.config.ts b/app.config.ts index 5ee1889b..9acee5b0 100644 --- a/app.config.ts +++ b/app.config.ts @@ -1,41 +1,39 @@ import { ExpoConfig } from '@expo/config' export default (): ExpoConfig => ({ - name: 'mastodon-app', - description: 'This is a description', - slug: 'mastodon-app', + name: 'tooot', + description: 'tooot for mastodon', + slug: 'tooot', privacy: 'hidden', + sdkVersion: '40.0.0', version: '0.1.0', - platforms: ['ios'], + platforms: ['ios', 'android'], orientation: 'portrait', userInterfaceStyle: 'automatic', icon: './assets/icon.png', - developmentClient: { silentLaunch: true }, - scheme: 'mastodonct', + splash: { + backgroundColor: '#FAFAFA', + image: './assets/splash.png' + }, + scheme: 'tooot', ios: { - bundleIdentifier: 'com.xmflsct.app.mastodon', + bundleIdentifier: 'com.xmflsct.app.tooot', + googleServicesFile: './configs/GoogleService-Info.plist', infoPlist: { CFBundleAllowMixedLocalizations: true - }, - splash: { - image: './assets/splash.png', - resizeMode: 'contain', - backgroundColor: '#ffffff' - }, - googleServicesFile: './configs/GoogleService-Info.plist' + } }, android: { - package: 'com.xmflsct.app.mastodon', - googleServicesFile: './configs/google-services.json' + package: 'com.xmflsct.app.tooot', + googleServicesFile: './configs/google-services.json', + permissions: ['CAMERA', 'VIBRATE'] + }, + locales: { + zh: './src/i18n/zh/app.json', + en: { + CFBundleDisplayName: 'tooot' + } }, - // locales: { - // zh: { - // CFBundleDisplayName: '我的嘟嘟' - // }, - // en: { - // CFBundleDisplayName: 'My Toots' - // } - // }, assetBundlePatterns: ['assets/*'], hooks: { postPublish: [ diff --git a/assets/icon.png b/assets/icon.png index 6eaf3029..e49527bd 100644 Binary files a/assets/icon.png and b/assets/icon.png differ diff --git a/assets/splash.png b/assets/splash.png index cc94f379..0b63c114 100644 Binary files a/assets/splash.png and b/assets/splash.png differ diff --git a/package.json b/package.json index 32a029f9..c7125373 100644 --- a/package.json +++ b/package.json @@ -87,7 +87,6 @@ "@types/gl-react-expo": "^3.16.2", "@types/jest": "^26.0.19", "@types/lodash": "^4.14.164", - "@types/node": "^14.14.7", "@types/react": "~16.9.35", "@types/react-dom": "~16.9.8", "@types/react-native": "~0.63.2", diff --git a/src/components/Instance.tsx b/src/components/Instance.tsx index cae3990d..695c79da 100644 --- a/src/components/Instance.tsx +++ b/src/components/Instance.tsx @@ -185,7 +185,7 @@ const ComponentInstance: React.FC = ({ content={buttonContent} onPress={processUpdate} disabled={!instanceQuery.data?.uri} - loading={instanceQuery.isLoading || applicationQuery.isLoading} + loading={instanceQuery.isFetching || applicationQuery.isFetching} /> diff --git a/src/i18n/zh/app.json b/src/i18n/zh/app.json new file mode 100644 index 00000000..c909f5f2 --- /dev/null +++ b/src/i18n/zh/app.json @@ -0,0 +1,5 @@ +{ + "CFBundleDisplayName": "嘟嘟嘟", + "NSCameraUsageDescription": "允许嘟嘟嘟用相机上传照片", + "NSPhotoLibraryUsageDescription": "允许嘟嘟嘟用相册上传照片" +} \ No newline at end of file