diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9895c962..43b60c42 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,7 +28,6 @@ jobs: - name: -- Step 4 -- Install node dependencies run: yarn install - name: -- Step 5 -- Install native dependencies - if: github.ref != 'refs/heads/main' run: npx pod-install - name: -- Step 6 -- Install ruby dependencies run: bundle install diff --git a/fastlane/.gitignore b/fastlane/.gitignore index 7a4eed9a..15624910 100644 --- a/fastlane/.gitignore +++ b/fastlane/.gitignore @@ -5,5 +5,4 @@ /README.md /report.xml -Preview.html -screenshots \ No newline at end of file +Preview.html \ No newline at end of file diff --git a/fastlane/Deliverfile b/fastlane/Deliverfile new file mode 100644 index 00000000..5723e610 --- /dev/null +++ b/fastlane/Deliverfile @@ -0,0 +1,17 @@ +languages(['zh-Hans']) + +name({ + 'default' => "tooot" +}) +keywords({ + 'default' => "Mastodon,tooot,social,decentralized,长毛象,社交,去中心" +}) +privacy_url({ + 'default' => "https://tooot.app/privacy-policy" +}) +support_url({ + 'default' => "https://tooot.app" +}) + +copyright("#{Time.now.year} ©️ xmflsct") +primary_category("SOCIAL_NETWORKING") \ No newline at end of file diff --git a/fastlane/Fastfile b/fastlane/Fastfile index c1d922ea..3cd565f7 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -57,7 +57,7 @@ private_lane :github_release do |options| description: "No changelog provided", commitish: git_branch, is_prerelease: options[:prerelease], - upload_assets: ["#{File.expand_path('..', Dir.pwd)}/tooot-#{GITHUB_RELEASE}.apk"] + upload_assets: options[:prerelease] ? nil : ["#{File.expand_path('..', Dir.pwd)}/tooot-#{GITHUB_RELEASE}.apk"] ) end @@ -69,6 +69,8 @@ end desc "Build and deploy iOS app" private_lane :build_ios do BUILD_DIRECTORY = "./ios/build" + IPA_FILE = "#{BUILD_DIRECTORY}/tooot.ipa" + DSYM_FILE = "#{BUILD_DIRECTORY}/tooot.app.dSYM.zip" update_expo_ios setup_ci @@ -77,17 +79,39 @@ private_lane :build_ios do when "candidate" prepare_appstore_ios match( type: "appstore", readonly: true ) - build_ios_app( export_method: "app-store", include_symbols: true, include_bitcode: true, silent: true ) + build_ios_app( + export_method: "app-store", + include_symbols: true, + output_directory: BUILD_DIRECTORY, + silent: true + ) + sentry_upload_dsym( + org_slug: ENV["SENTRY_ORGANIZATION"], + project_slug: ENV["SENTRY_PROJECT"], + dsym_path: DSYM_FILE + ) upload_to_testflight( + ipa: IPA_FILE, demo_account_required: true, distribute_external: true, groups: "测试用户", - changelog: "Ready for testing" + changelog: "感谢帮忙测试 tooot 🙏" ) when "release" prepare_appstore_ios match( type: "appstore", readonly: true ) - build_ios_app( export_method: "app-store", include_bitcode: true, silent: true ) + build_ios_app( + export_method: "app-store", + include_bitcode: true, + output_directory: BUILD_DIRECTORY, + silent: true + ) + upload_to_app_store( + force: true, + ipa: IPA_FILE, + submit_for_review: true, + automatic_release: false + ) else if !is_ci match( type: "development", readonly: true ) @@ -126,6 +150,27 @@ private_lane :build_android do skip_upload_images: true, skip_upload_screenshots: true ) + when "release" + prepare_playstore_android + build_android_app( + task: 'clean bundle', + build_type: 'release', + project_dir: "./android", + print_command: false, + print_command_output: false, + properties: { + "expoSDK" => VERSIONS[:expo], + "releaseChannel" => RELEASE_CHANNEL, + "android.injected.signing.store.file" => "#{File.expand_path('..', Dir.pwd)}/android/tooot.jks", + "android.injected.signing.store.password" => ENV["ANDROID_KEYSTORE_PASSWORD"], + "android.injected.signing.key.alias" => ENV["ANDROID_KEYSTORE_ALIAS"], + "android.injected.signing.key.password" => ENV["ANDROID_KEYSTORE_KEY_PASSWORD"], + } + ) + upload_to_play_store( + track: "production", + skip_upload_changelogs: true + ) build_android_app( task: 'assemble', build_type: 'release', @@ -142,7 +187,6 @@ private_lane :build_android do } ) sh "mv #{lane_context[SharedValues::GRADLE_APK_OUTPUT_PATH]} #{File.expand_path('..', Dir.pwd)}/tooot-#{GITHUB_RELEASE}.apk" - when "release" else if !is_ci build_android_app( diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt new file mode 120000 index 00000000..e4a7160c --- /dev/null +++ b/fastlane/metadata/android/en-US/full_description.txt @@ -0,0 +1 @@ +../../default/description.txt \ No newline at end of file diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/0_65.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/0_65.png new file mode 120000 index 00000000..8f9c61cf --- /dev/null +++ b/fastlane/metadata/android/en-US/images/phoneScreenshots/0_65.png @@ -0,0 +1 @@ +../../../../../screenshots/en_US/0_65.png \ No newline at end of file diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/1_65.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/1_65.png new file mode 120000 index 00000000..cadbe517 --- /dev/null +++ b/fastlane/metadata/android/en-US/images/phoneScreenshots/1_65.png @@ -0,0 +1 @@ +../../../../../screenshots/en_US/1_65.png \ No newline at end of file diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/2_65.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/2_65.png new file mode 120000 index 00000000..22a15ecd --- /dev/null +++ b/fastlane/metadata/android/en-US/images/phoneScreenshots/2_65.png @@ -0,0 +1 @@ +../../../../../screenshots/en_US/2_65.png \ No newline at end of file diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/3_65.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/3_65.png new file mode 120000 index 00000000..07332757 --- /dev/null +++ b/fastlane/metadata/android/en-US/images/phoneScreenshots/3_65.png @@ -0,0 +1 @@ +../../../../../screenshots/en_US/3_65.png \ No newline at end of file diff --git a/fastlane/metadata/android/en-US/short_description.txt b/fastlane/metadata/android/en-US/short_description.txt new file mode 120000 index 00000000..6c335e7a --- /dev/null +++ b/fastlane/metadata/android/en-US/short_description.txt @@ -0,0 +1 @@ +../../default/subtitle.txt \ No newline at end of file diff --git a/fastlane/metadata/android/zh-CN/full_description.txt b/fastlane/metadata/android/zh-CN/full_description.txt new file mode 120000 index 00000000..f85eec8f --- /dev/null +++ b/fastlane/metadata/android/zh-CN/full_description.txt @@ -0,0 +1 @@ +../../zh-Hans/description.txt \ No newline at end of file diff --git a/fastlane/metadata/android/zh-CN/images/featureGraphic.png b/fastlane/metadata/android/zh-CN/images/featureGraphic.png new file mode 100644 index 00000000..fff2052b Binary files /dev/null and b/fastlane/metadata/android/zh-CN/images/featureGraphic.png differ diff --git a/fastlane/metadata/android/zh-CN/images/icon.png b/fastlane/metadata/android/zh-CN/images/icon.png new file mode 100644 index 00000000..8e4005d2 Binary files /dev/null and b/fastlane/metadata/android/zh-CN/images/icon.png differ diff --git a/fastlane/metadata/android/zh-CN/images/phoneScreenshots/0_65.png b/fastlane/metadata/android/zh-CN/images/phoneScreenshots/0_65.png new file mode 120000 index 00000000..3bb453a5 --- /dev/null +++ b/fastlane/metadata/android/zh-CN/images/phoneScreenshots/0_65.png @@ -0,0 +1 @@ +../../../../../screenshots/zh-Hans/0_65.png \ No newline at end of file diff --git a/fastlane/metadata/android/zh-CN/images/phoneScreenshots/1_65.png b/fastlane/metadata/android/zh-CN/images/phoneScreenshots/1_65.png new file mode 120000 index 00000000..fc4a3e97 --- /dev/null +++ b/fastlane/metadata/android/zh-CN/images/phoneScreenshots/1_65.png @@ -0,0 +1 @@ +../../../../../screenshots/zh-Hans/1_65.png \ No newline at end of file diff --git a/fastlane/metadata/android/zh-CN/images/phoneScreenshots/2_65.png b/fastlane/metadata/android/zh-CN/images/phoneScreenshots/2_65.png new file mode 120000 index 00000000..50536b32 --- /dev/null +++ b/fastlane/metadata/android/zh-CN/images/phoneScreenshots/2_65.png @@ -0,0 +1 @@ +../../../../../screenshots/zh-Hans/2_65.png \ No newline at end of file diff --git a/fastlane/metadata/android/zh-CN/images/phoneScreenshots/3_65.png b/fastlane/metadata/android/zh-CN/images/phoneScreenshots/3_65.png new file mode 120000 index 00000000..50c7c813 --- /dev/null +++ b/fastlane/metadata/android/zh-CN/images/phoneScreenshots/3_65.png @@ -0,0 +1 @@ +../../../../../screenshots/zh-Hans/3_65.png \ No newline at end of file diff --git a/fastlane/metadata/android/zh-CN/short_description.txt b/fastlane/metadata/android/zh-CN/short_description.txt new file mode 120000 index 00000000..d4c15c7a --- /dev/null +++ b/fastlane/metadata/android/zh-CN/short_description.txt @@ -0,0 +1 @@ +../../zh-Hans/subtitle.txt \ No newline at end of file diff --git a/fastlane/metadata/android/zh-CN/title.txt b/fastlane/metadata/android/zh-CN/title.txt new file mode 100644 index 00000000..bea7f0e1 --- /dev/null +++ b/fastlane/metadata/android/zh-CN/title.txt @@ -0,0 +1 @@ +tooot \ No newline at end of file diff --git a/fastlane/metadata/default/description.txt b/fastlane/metadata/default/description.txt new file mode 100644 index 00000000..9238b9bb --- /dev/null +++ b/fastlane/metadata/default/description.txt @@ -0,0 +1,5 @@ +tooot is an open source, simple yet elegant Mastodon mobile client. + +A Mastodon (https://joinmastodon.org/) account is required to use this app. + +If you have suggestions, please reach out to @tooot@xmflsct.com or support@tooot.ap. \ No newline at end of file diff --git a/fastlane/metadata/default/release_notes.txt b/fastlane/metadata/default/release_notes.txt new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/fastlane/metadata/default/release_notes.txt @@ -0,0 +1 @@ + diff --git a/fastlane/metadata/default/subtitle.txt b/fastlane/metadata/default/subtitle.txt new file mode 100644 index 00000000..41d2c9e8 --- /dev/null +++ b/fastlane/metadata/default/subtitle.txt @@ -0,0 +1 @@ +Open source Mastodon client \ No newline at end of file diff --git a/fastlane/metadata/zh-Hans/description.txt b/fastlane/metadata/zh-Hans/description.txt new file mode 100644 index 00000000..bc36625d --- /dev/null +++ b/fastlane/metadata/zh-Hans/description.txt @@ -0,0 +1,10 @@ +tooot是一个专门为中文用户社区所打造的开源、简洁长毛象客户端。使用此客户端需要已经拥有一个长毛象（https://joinmastodon.org/）账号。 + +tooot支持： +- 多账号登录 +- 黑暗或自适应模式 +- 可调整正文字体大小 +- 消息推送 +等功能。 + +如有使用建议或意见，请联系@tooot@xmflsct.com或者support@tooot.app。 \ No newline at end of file diff --git a/fastlane/metadata/zh-Hans/release_notes.txt b/fastlane/metadata/zh-Hans/release_notes.txt new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/fastlane/metadata/zh-Hans/release_notes.txt @@ -0,0 +1 @@ + diff --git a/fastlane/metadata/zh-Hans/subtitle.txt b/fastlane/metadata/zh-Hans/subtitle.txt new file mode 100644 index 00000000..644b04f2 --- /dev/null +++ b/fastlane/metadata/zh-Hans/subtitle.txt @@ -0,0 +1 @@ +开源长毛象客户端 \ No newline at end of file diff --git a/fastlane/screenshots/en_US/0_55.png b/fastlane/screenshots/en_US/0_55.png new file mode 100644 index 00000000..36ec3d77 Binary files /dev/null and b/fastlane/screenshots/en_US/0_55.png differ diff --git a/fastlane/screenshots/en_US/0_65.png b/fastlane/screenshots/en_US/0_65.png new file mode 100644 index 00000000..9e447553 Binary files /dev/null and b/fastlane/screenshots/en_US/0_65.png differ diff --git a/fastlane/screenshots/en_US/1_55.png b/fastlane/screenshots/en_US/1_55.png new file mode 100644 index 00000000..b172e08c Binary files /dev/null and b/fastlane/screenshots/en_US/1_55.png differ diff --git a/fastlane/screenshots/en_US/1_65.png b/fastlane/screenshots/en_US/1_65.png new file mode 100644 index 00000000..e4550b27 Binary files /dev/null and b/fastlane/screenshots/en_US/1_65.png differ diff --git a/fastlane/screenshots/en_US/2_55.png b/fastlane/screenshots/en_US/2_55.png new file mode 100644 index 00000000..aee9c51c Binary files /dev/null and b/fastlane/screenshots/en_US/2_55.png differ diff --git a/fastlane/screenshots/en_US/2_65.png b/fastlane/screenshots/en_US/2_65.png new file mode 100644 index 00000000..2b6ff59c Binary files /dev/null and b/fastlane/screenshots/en_US/2_65.png differ diff --git a/fastlane/screenshots/en_US/3_55.png b/fastlane/screenshots/en_US/3_55.png new file mode 100644 index 00000000..12239c22 Binary files /dev/null and b/fastlane/screenshots/en_US/3_55.png differ diff --git a/fastlane/screenshots/en_US/3_65.png b/fastlane/screenshots/en_US/3_65.png new file mode 100644 index 00000000..27de14c9 Binary files /dev/null and b/fastlane/screenshots/en_US/3_65.png differ diff --git a/fastlane/screenshots/zh-Hans/0_55.png b/fastlane/screenshots/zh-Hans/0_55.png new file mode 100644 index 00000000..66f53ce4 Binary files /dev/null and b/fastlane/screenshots/zh-Hans/0_55.png differ diff --git a/fastlane/screenshots/zh-Hans/0_65.png b/fastlane/screenshots/zh-Hans/0_65.png new file mode 100644 index 00000000..0c827e05 Binary files /dev/null and b/fastlane/screenshots/zh-Hans/0_65.png differ diff --git a/fastlane/screenshots/zh-Hans/1_55.png b/fastlane/screenshots/zh-Hans/1_55.png new file mode 100644 index 00000000..b4be8b16 Binary files /dev/null and b/fastlane/screenshots/zh-Hans/1_55.png differ diff --git a/fastlane/screenshots/zh-Hans/1_65.png b/fastlane/screenshots/zh-Hans/1_65.png new file mode 100644 index 00000000..ff1fc6b2 Binary files /dev/null and b/fastlane/screenshots/zh-Hans/1_65.png differ diff --git a/fastlane/screenshots/zh-Hans/2_55.png b/fastlane/screenshots/zh-Hans/2_55.png new file mode 100644 index 00000000..3395faf8 Binary files /dev/null and b/fastlane/screenshots/zh-Hans/2_55.png differ diff --git a/fastlane/screenshots/zh-Hans/2_65.png b/fastlane/screenshots/zh-Hans/2_65.png new file mode 100644 index 00000000..f44ecccd Binary files /dev/null and b/fastlane/screenshots/zh-Hans/2_65.png differ diff --git a/fastlane/screenshots/zh-Hans/3_55.png b/fastlane/screenshots/zh-Hans/3_55.png new file mode 100644 index 00000000..a1acc6c5 Binary files /dev/null and b/fastlane/screenshots/zh-Hans/3_55.png differ diff --git a/fastlane/screenshots/zh-Hans/3_65.png b/fastlane/screenshots/zh-Hans/3_65.png new file mode 100644 index 00000000..4a72dbc8 Binary files /dev/null and b/fastlane/screenshots/zh-Hans/3_65.png differ diff --git a/src/screens/Tabs/Shared/sharedScreens.tsx b/src/screens/Tabs/Shared/sharedScreens.tsx index 6470b46a..6de7c7c9 100644 --- a/src/screens/Tabs/Shared/sharedScreens.tsx +++ b/src/screens/Tabs/Shared/sharedScreens.tsx @@ -213,11 +213,11 @@ const sharedScreens = ( } }: SharedUsersProp) => ({ headerLeft: () => navigation.goBack()} />, - headerTitle: t(`sharedUsers:heading.${reference}.${type}`, { count }), + headerTitle: t(`shared.users.${reference}.${type}`, { count }), ...(Platform.OS === 'android' && { headerCenter: () => ( ) })