Skip to content

Commit

Permalink
Merge pull request #143 from 0x1-company/follow-me
Browse files Browse the repository at this point in the history
feat: 🎸 social account links
  • Loading branch information
tomokisun authored Jan 10, 2024
2 parents 15c44d9 + 9abd54e commit 63f5672
Show file tree
Hide file tree
Showing 2 changed files with 89 additions and 16 deletions.
44 changes: 42 additions & 2 deletions Packages/BeMatch/Sources/SettingsFeature/Localizable.xcstrings
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,16 @@
}
}
},
"FOLLOW ME" : {
"localizations" : {
"ja" : {
"stringUnit" : {
"state" : "translated",
"value" : "フォローしてね"
}
}
}
},
"Help" : {
"localizations" : {
"ja" : {
Expand Down Expand Up @@ -111,6 +121,16 @@
}
}
},
"Instagram" : {
"localizations" : {
"ja" : {
"stringUnit" : {
"state" : "translated",
"value" : "Instagram"
}
}
}
},
"My Profile" : {
"localizations" : {
"ja" : {
Expand Down Expand Up @@ -191,12 +211,32 @@
}
}
},
"Version %@" : {
"TikTok" : {
"localizations" : {
"ja" : {
"stringUnit" : {
"state" : "translated",
"value" : "TikTok"
}
}
}
},
"Version" : {
"localizations" : {
"ja" : {
"stringUnit" : {
"state" : "translated",
"value" : "バージョン"
}
}
}
},
"X" : {
"localizations" : {
"ja" : {
"stringUnit" : {
"state" : "translated",
"value" : "Version %@"
"value" : "X"
}
}
}
Expand Down
61 changes: 47 additions & 14 deletions Packages/BeMatch/Sources/SettingsFeature/Settings.swift
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,37 @@ public struct SettingsView: View {
} header: {
Text("Settings", bundle: .module)
}

Section {
Link(destination: Constants.instagramURL) {
LabeledContent {
Image(systemName: "chevron.right")
} label: {
Text("Instagram", bundle: .module)
.foregroundStyle(Color.primary)
}
}

Link(destination: Constants.tiktokURL) {
LabeledContent {
Image(systemName: "chevron.right")
} label: {
Text("TikTok", bundle: .module)
.foregroundStyle(Color.primary)
}
}

Link(destination: Constants.xURL) {
LabeledContent {
Image(systemName: "chevron.right")
} label: {
Text("X", bundle: .module)
.foregroundStyle(Color.primary)
}
}
} header: {
Text("FOLLOW ME", bundle: .module)
}

Section {
Link(destination: Constants.termsOfUseURL) {
Expand Down Expand Up @@ -280,23 +311,25 @@ public struct SettingsView: View {
.foregroundStyle(Color.primary)
}
}
} header: {
Text("ABOUT", bundle: .module)
} footer: {
VStack(spacing: 0) {
Button {
store.send(.versionButtonTapped, animation: .default)
Button {
store.send(.versionButtonTapped, animation: .default)
} label: {
LabeledContent {
Text(viewStore.bundleShortVersion)
} label: {
Text("Version \(viewStore.bundleShortVersion)", bundle: .module)
.frame(height: 44)
.foregroundStyle(Color.secondary)
Text("Version", bundle: .module)
.foregroundStyle(Color.primary)
}

IfLetStore(
store.scope(state: \.creationDate, action: \.creationDate),
then: CreationDateView.init(store:)
)
}
} header: {
Text("ABOUT", bundle: .module)
} footer: {
IfLetStore(
store.scope(state: \.creationDate, action: \.creationDate),
then: CreationDateView.init(store:)
)
.padding(.bottom, 24)
.frame(maxWidth: .infinity, alignment: .center)
.multilineTextAlignment(.center)
}
Expand Down

0 comments on commit 63f5672

Please sign in to comment.