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

Tweaks picmatch layout #1040

Closed
wants to merge 7 commits into from
Closed
Changes from 4 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
Original file line number Diff line number Diff line change
@@ -5,9 +5,9 @@
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x76",
"green" : "0x2D",
"red" : "0xFD"
"blue" : "0x00",
"green" : "0x00",
"red" : "0x00"
}
},
"idiom" : "universal"
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"images" : [
{
"filename" : "Logo.pdf",
"filename" : "Subtract.pdf",
"idiom" : "universal"
}
],
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -20,21 +20,15 @@ public struct DirectMessageEmptyView: View {
Text("Matched with \(viewStore.displayName)!", bundle: .module)
.font(.system(.title3, weight: .semibold))

Text("Add tenten and send a message!", bundle: .module)
Text("Add Instagram and send a message!", bundle: .module)
}
.multilineTextAlignment(.center)

VStack(spacing: 12) {
PrimaryButton(
String(localized: "Copy tenten’s PIN", bundle: .module)
String(localized: "Add Instagram", bundle: .module)
) {
store.send(.jumpExternalProductButtonTapped)
}

Text("🧷 \(viewStore.tentenPinCode)", bundle: .module)
.foregroundStyle(Color.white)
.font(.system(.caption, weight: .semibold))
}
}
.frame(maxHeight: .infinity)

115 changes: 4 additions & 111 deletions Packages/PicMatch/Sources/DirectMessageFeature/Localizable.xcstrings
Original file line number Diff line number Diff line change
@@ -1,125 +1,18 @@
{
"sourceLanguage" : "en",
"strings" : {
"🧷 %@" : {
"Add Instagram" : {
"localizations" : {
"es" : {
"stringUnit" : {
"state" : "translated",
"value" : "🧷 %@"
}
},
"fr" : {
"stringUnit" : {
"state" : "translated",
"value" : "🧷 %@"
}
},
"ja" : {
"stringUnit" : {
"state" : "translated",
"value" : "🧷 %@"
}
},
"ko" : {
"stringUnit" : {
"state" : "translated",
"value" : "🧷 %@"
}
},
"pl" : {
"stringUnit" : {
"state" : "translated",
"value" : "🧷 %@"
}
},
"vi" : {
"stringUnit" : {
"state" : "translated",
"value" : "🧷 %@"
}
}
}
},
"Add tenten and send a message!" : {
"localizations" : {
"es" : {
"stringUnit" : {
"state" : "translated",
"value" : "¡Agrega tenten y envía un mensaje!"
}
},
"fr" : {
"stringUnit" : {
"state" : "translated",
"value" : "Ajoutez un tenten et envoyez un message !"
}
},
"ja" : {
"stringUnit" : {
"state" : "translated",
"value" : "tentenを追加してメッセージを送ってみよう!"
}
},
"ko" : {
"stringUnit" : {
"state" : "translated",
"value" : "로켓을 추가하고 메시지를 보내세요!"
}
},
"pl" : {
"stringUnit" : {
"state" : "translated",
"value" : "Dodaj tenten i wyślij wiadomość!"
}
},
"vi" : {
"stringUnit" : {
"state" : "translated",
"value" : "Thêm tenten và gửi tin nhắn!"
"value" : "インスタグラムを追加"
}
}
}
},
"Copy tenten’s PIN" : {
"localizations" : {
"es" : {
"stringUnit" : {
"state" : "translated",
"value" : "Copiar el PIN de tenten"
}
},
"fr" : {
"stringUnit" : {
"state" : "translated",
"value" : "Copier le PIN de tenten"
}
},
"ja" : {
"stringUnit" : {
"state" : "translated",
"value" : "tentenのPINをコピー"
}
},
"ko" : {
"stringUnit" : {
"state" : "translated",
"value" : "tenten의 PIN 복사"
}
},
"pl" : {
"stringUnit" : {
"state" : "translated",
"value" : "Skopiuj PIN tenten"
}
},
"vi" : {
"stringUnit" : {
"state" : "translated",
"value" : "Sao chép PIN của tenten"
}
}
}
"Add Instagram and send a message!" : {

},
"Matched with %@!" : {
"localizations" : {
2 changes: 1 addition & 1 deletion Packages/PicMatch/Sources/LaunchFeature/Launch.swift
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ public struct LaunchView: View {
.aspectRatio(contentMode: .fit)
.frame(maxWidth: .infinity, maxHeight: .infinity)
.ignoresSafeArea()
.background(Color(0xFFFF_0000))
.background(Color(0x0000_0000))
.task { await store.send(.onTask).finish() }
.overlay {
if viewStore.isActivityIndicatorVisible {
14 changes: 7 additions & 7 deletions Packages/PicMatch/Sources/MatchedFeature/Localizable.xcstrings
Original file line number Diff line number Diff line change
@@ -41,42 +41,42 @@
}
}
},
"Copy tenten’s PIN" : {
"Add Instagram" : {
"localizations" : {
"es" : {
"stringUnit" : {
"state" : "translated",
"value" : "Copiar el PIN de tenten"
"value" : "Agregar Instagram"
}
},
"fr" : {
"stringUnit" : {
"state" : "translated",
"value" : "Copier le PIN de tenten"
"value" : "Ajouter Instagram"
}
},
"ja" : {
"stringUnit" : {
"state" : "translated",
"value" : "tentenのPINをコピー"
"value" : "Instagramを追加する"
}
},
"ko" : {
"stringUnit" : {
"state" : "translated",
"value" : "tenten의 PIN 복사"
"value" : "Instagram 추가하기"
}
},
"pl" : {
"stringUnit" : {
"state" : "translated",
"value" : "Skopiuj PIN tenten"
"value" : "Dodaj Instagram"
}
},
"vi" : {
"stringUnit" : {
"state" : "translated",
"value" : "Sao chép PIN của tenten"
"value" : "Thêm Instagram"
}
}
}
2 changes: 1 addition & 1 deletion Packages/PicMatch/Sources/MatchedFeature/Matched.swift
Original file line number Diff line number Diff line change
@@ -62,7 +62,7 @@ public struct MatchedView: View {

VStack(spacing: 12) {
PrimaryButton(
String(localized: "Copy tenten’s PIN", bundle: .module)
String(localized: "Add Instagram", bundle: .module)
) {
store.send(.addExternalProductButtonTapped)
}
Original file line number Diff line number Diff line change
@@ -162,6 +162,9 @@
}
}
}
},
"Instagram username" : {

},
"Nick Name" : {
"localizations" : {
@@ -446,6 +449,7 @@
}
},
"tenten PIN" : {
"extractionState" : "stale",
"localizations" : {
"ja" : {
"stringUnit" : {
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@ public struct ProfileEditView: View {
LabeledContent {
Image(systemName: "chevron.right")
} label: {
Text("tenten PIN", bundle: .module)
Text("Instagram username", bundle: .module)
.foregroundStyle(Color.primary)
}
}
Loading