Skip to content
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

feat: newmatch #1154

Merged
merged 3 commits into from
Dec 25, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions App/TapMatch/Multiplatform/App.swift
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ final class AppDelegate: NSObject, UIApplicationDelegate {
let apolloClient = ApolloClient(
appVersion: appVersion,
endpoint: endpoint,
product: "TapMatch"
product: "NewMatch"
)
$0.api = APIClient.live(apolloClient: apolloClient)
$0.environment = EnvironmentClient.live(
Expand Down Expand Up @@ -134,7 +134,7 @@ final class AppDelegate: NSObject, UIApplicationDelegate {
}

@main
struct TapMatchApp: App {
struct NewMatchApp: App {
@UIApplicationDelegateAdaptor(AppDelegate.self) private var appDelegate

var body: some Scene {
Expand Down
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"images" : [
{
"filename" : "AppIcon__TapMatch.png",
"filename" : "AppIcon__TikMatch.jpg",
"idiom" : "universal",
"platform" : "ios",
"size" : "1024x1024"
Expand Down
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"images" : [
{
"filename" : "AppIcon__TapMatch.png",
"filename" : "AppIcon__TikMatch.jpg",
"idiom" : "universal",
"platform" : "ios",
"size" : "1024x1024"
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"images" : [
{
"filename" : "Container.pdf",
"filename" : "Splash.pdf",
"idiom" : "universal"
}
],
Expand Down
Binary file not shown.
16 changes: 8 additions & 8 deletions App/TapMatch/Multiplatform/InfoPlist.xcstrings
Original file line number Diff line number Diff line change
Expand Up @@ -164,49 +164,49 @@
"en" : {
"stringUnit" : {
"state" : "new",
"value" : "TapMatch"
"value" : "NewMatch"
}
},
"es" : {
"stringUnit" : {
"state" : "needs_review",
"value" : "TapMatch"
"value" : "NewMatch"
}
},
"fr" : {
"stringUnit" : {
"state" : "needs_review",
"value" : "TapMatch"
"value" : "NewMatch"
}
},
"ja" : {
"stringUnit" : {
"state" : "needs_review",
"value" : "TapMatch"
"value" : "NewMatch"
}
},
"ko" : {
"stringUnit" : {
"state" : "needs_review",
"value" : "TapMatch"
"value" : "NewMatch"
}
},
"pl" : {
"stringUnit" : {
"state" : "needs_review",
"value" : "TapMatch"
"value" : "NewMatch"
}
},
"pt-BR" : {
"stringUnit" : {
"state" : "needs_review",
"value" : "TapMatch"
"value" : "NewMatch"
}
},
"vi" : {
"stringUnit" : {
"state" : "needs_review",
"value" : "TapMatch"
"value" : "NewMatch"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion App/TapMatch/Multiplatform/Production/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<string>vi</string>
</array>
<key>CFBundleName</key>
<string>TapMatch</string>
<string>NewMatch</string>
<key>CFBundlePackageType</key>
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
<key>CFBundleShortVersionString</key>
Expand Down
2 changes: 1 addition & 1 deletion App/TapMatch/Multiplatform/Staging/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<string>vi</string>
</array>
<key>CFBundleName</key>
<string>TapMatch</string>
<string>NewMatch</string>
<key>CFBundlePackageType</key>
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
<key>CFBundleShortVersionString</key>
Expand Down
4 changes: 2 additions & 2 deletions App/TapMatch/Production.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = NO;
INFOPLIST_FILE = Multiplatform/Production/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = TapMatch;
INFOPLIST_KEY_CFBundleDisplayName = NewMatch;
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.puzzle-games";
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
Expand Down Expand Up @@ -384,7 +384,7 @@
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = NO;
INFOPLIST_FILE = Multiplatform/Production/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = TapMatch;
INFOPLIST_KEY_CFBundleDisplayName = NewMatch;
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.puzzle-games";
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
Expand Down
4 changes: 2 additions & 2 deletions App/TapMatch/Staging.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = NO;
INFOPLIST_FILE = Multiplatform/Staging/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = TapMatch;
INFOPLIST_KEY_CFBundleDisplayName = NewMatch;
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchScreen_Generation = YES;
Expand Down Expand Up @@ -383,7 +383,7 @@
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = NO;
INFOPLIST_FILE = Multiplatform/Staging/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = TapMatch;
INFOPLIST_KEY_CFBundleDisplayName = NewMatch;
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchScreen_Generation = YES;
Expand Down
2 changes: 1 addition & 1 deletion Packages/MatchCore/Sources/EnvironmentClient/Client.swift
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public struct EnvironmentClient {
case .picmatch:
return "PicMatch"
case .tapmatch:
return "TapMatch"
return "NewMatch"
case .tenmatch:
return "TenMatch"
case .trinket:
Expand Down
2 changes: 1 addition & 1 deletion Packages/TapMatch/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import PackageDescription

let package = Package(
name: "TapMatch",
name: "NewMatch",
defaultLocalization: "en",
platforms: [
.iOS("17.0"),
Expand Down
6 changes: 3 additions & 3 deletions Packages/TapMatch/Sources/BannedFeature/Banned.swift
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ public struct BannedView: View {
VStack(spacing: 24) {
Spacer()

Text("Your account has been banned from TapMatch.", bundle: .module)
Text("Your account has been banned from NewMatch.", bundle: .module)
.font(.system(.headline, weight: .semibold))

Text("It's important to us that TapMatch is a welcoming and safe space for everyone.\nUnfortunately, we found that you violated our [Terms of Use](https://docs.tapmatch.jp/terms-of-use) and so we've made the decision to remove you from the TapMatch Platform.", bundle: .module)
Text("It's important to us that NewMatch is a welcoming and safe space for everyone.\nUnfortunately, we found that you violated our [Terms of Use](https://docs.tapmatch.jp/terms-of-use) and so we've made the decision to remove you from the NewMatch Platform.", bundle: .module)
.font(.system(.body, weight: .semibold))
.foregroundStyle(Color.secondary)

Text("You will no longer be able to access your TapMatch account or create new accounts in the future.", bundle: .module)
Text("You will no longer be able to access your NewMatch account or create new accounts in the future.", bundle: .module)
.font(.system(.body, weight: .semibold))
.foregroundStyle(Color.secondary)

Expand Down
12 changes: 6 additions & 6 deletions Packages/TapMatch/Sources/BannedFeature/Localizable.xcstrings
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
}
}
},
"It's important to us that TapMatch is a welcoming and safe space for everyone.\nUnfortunately, we found that you violated our [Terms of Use](https://docs.tapmatch.jp/terms-of-use) and so we've made the decision to remove you from the TapMatch Platform." : {
"It's important to us that NewMatch is a welcoming and safe space for everyone.\nUnfortunately, we found that you violated our [Terms of Use](https://docs.tapmatch.jp/terms-of-use) and so we've made the decision to remove you from the NewMatch Platform." : {
"localizations" : {
"ja" : {
"stringUnit" : {
"state" : "translated",
"value" : "TapMatchでは、すべての人にとって安心で安全な場所であることを重視しています。残念ながらあなたの行為が[利用規約](https://docs.tapmatch.jp/terms-of-use)に違反したことが判明したため、当社はあなたをTapMatchのプラットフォームから削除することを決定しました。"
"value" : "NewMatchでは、すべての人にとって安心で安全な場所であることを重視しています。残念ながらあなたの行為が[利用規約](https://docs.tapmatch.jp/terms-of-use)に違反したことが判明したため、当社はあなたをNewMatchのプラットフォームから削除することを決定しました。"
}
}
}
Expand All @@ -31,22 +31,22 @@
}
}
},
"You will no longer be able to access your TapMatch account or create new accounts in the future." : {
"You will no longer be able to access your NewMatch account or create new accounts in the future." : {
"localizations" : {
"ja" : {
"stringUnit" : {
"state" : "translated",
"value" : "あなたは今後、TapMatchのアカウントにアクセスしたり、新しいアカウントを作成することは出来ません。"
"value" : "あなたは今後、NewMatchのアカウントにアクセスしたり、新しいアカウントを作成することは出来ません。"
}
}
}
},
"Your account has been banned from TapMatch." : {
"Your account has been banned from NewMatch." : {
"localizations" : {
"ja" : {
"stringUnit" : {
"state" : "translated",
"value" : "あなたのTapMatchアカウントは利用停止されました。"
"value" : "あなたのNewMatchアカウントは利用停止されました。"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion Packages/TapMatch/Sources/BannerFeature/Banner.swift
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public struct BannerView: View {
_dataDict: DataDict(
data: [
"id": "id",
"title": "TapMatchの社長と話そう",
"title": "NewMatchの社長と話そう",
"description": "アプリの改善策や不具合などあれば教えてください。",
"buttonTitle": "開く",
"url": "https://tapmatch.jp",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public struct ForceUpdateView: View {
Text("Notice", bundle: .module)
.font(.system(.title, weight: .semibold))

Text("... Oh? ! ! Looks like TapMatch...! \nPlease update to the latest version.", bundle: .module)
Text("... Oh? ! ! Looks like NewMatch...! \nPlease update to the latest version.", bundle: .module)
.font(.system(.body, weight: .semibold))

PrimaryButton(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"sourceLanguage" : "en",
"strings" : {
"... Oh? ! ! Looks like TapMatch...! \nPlease update to the latest version." : {
"... Oh? ! ! Looks like NewMatch...! \nPlease update to the latest version." : {
"localizations" : {
"ja" : {
"stringUnit" : {
"state" : "translated",
"value" : "...おや?!TapMatchのようすが...!\n最新バージョンへのアップデートをお願いします。"
"value" : "...おや?!NewMatchのようすが...!\n最新バージョンへのアップデートをお願いします。"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion Packages/TapMatch/Sources/FreezedFeature/Freezed.swift
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public struct FreezedView: View {
Text("Currently unable to re-register", bundle: .module)
.font(.system(.title3, weight: .semibold))

Text("Once you have deleted your TapMatch account, you will not be able to register again for a certain period of time after the deletion.", bundle: .module)
Text("Once you have deleted your NewMatch account, you will not be able to register again for a certain period of time after the deletion.", bundle: .module)

Text("Please answer our simple questionnaire to help us improve our service.", bundle: .module)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@
}
}
},
"Once you have deleted your TapMatch account, you will not be able to register again for a certain period of time after the deletion." : {
"Once you have deleted your NewMatch account, you will not be able to register again for a certain period of time after the deletion." : {
"localizations" : {
"ja" : {
"stringUnit" : {
"state" : "translated",
"value" : "一度TapMatchのアカウント削除をされた方は、削除してから一定期間は再登録していただくことができません。"
"value" : "一度NewMatchのアカウント削除をされた方は、削除してから一定期間は再登録していただくことができません。"
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
}
}
},
"Too much swiping...\nPlease help us share TapMatch... 🙏" : {
"Too much swiping...\nPlease help us share NewMatch... 🙏" : {
"localizations" : {
"ja" : {
"stringUnit" : {
"state" : "translated",
"value" : "ちょっと...スワイプしすぎです...。TapMatchのシェアに協力してください... 🙏"
"value" : "ちょっと...スワイプしすぎです...。NewMatchのシェアに協力してください... 🙏"
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public struct RecommendationEmptyView: View {
.padding(.horizontal, 2)

VStack(spacing: 16) {
Text("Too much swiping...\nPlease help us share TapMatch... 🙏", bundle: .module)
Text("Too much swiping...\nPlease help us share NewMatch... 🙏", bundle: .module)
.font(.system(.subheadline, weight: .semibold))
.foregroundStyle(Color.white)
.multilineTextAlignment(.center)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
}
}
},
"Report a TapMatch" : {
"Report a NewMatch" : {
"localizations" : {
"ja" : {
"stringUnit" : {
Expand Down
2 changes: 1 addition & 1 deletion Packages/TapMatch/Sources/ReportFeature/Report.swift
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public struct ReportView: View {
}
}
}
.navigationTitle(String(localized: "Report a TapMatch", bundle: .module))
.navigationTitle(String(localized: "Report a NewMatch", bundle: .module))
.navigationBarTitleDisplayMode(.inline)
.toolbar {
ToolbarItem(placement: .topBarLeading) {
Expand Down
2 changes: 1 addition & 1 deletion Packages/TapMatch/Sources/ReportFeature/ReportReason.swift
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public struct ReportReasonView: View {
.padding(.vertical, 24)
.padding(.horizontal, 16)
.formStyle(ColumnsFormStyle())
.navigationTitle(Text("Report a TapMatch", bundle: .module))
.navigationTitle(Text("Report a NewMatch", bundle: .module))
.navigationBarTitleDisplayMode(.inline)
.task { await store.send(.onTask).finish() }
.bind($store.focus, to: $focus)
Expand Down
Loading
Loading