-
Notifications
You must be signed in to change notification settings - Fork 206
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
[iOS] ♻️ Enabled to use ttf files placed in commonMain on iOS. #1047
Changes from 4 commits
b760f9c
3af8d84
a74e33b
ce479c1
f3bbeeb
912706b
c4bd8e5
233f835
f218bba
1ea98ee
e7d631a
ed22117
13b76aa
a633ae1
9e2c900
9fb81f2
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -37,7 +37,7 @@ public struct AboutView<ContributorView: View, StaffView: View, SponsorView: Vie | |
Assets.Images.aboutKeyVisual.swiftUIImage | ||
Spacer().frame(height: 16) | ||
Text("DroidKaigiはAndroid技術情報の共有とコミュニケーションを目的に開催されるエンジニアが主役のAndroidカンファレンスです。") | ||
.font(Font.system(size: 16)) | ||
.font(Font.custom(FontAssets.Montserrat.medium, size: 16)) | ||
Spacer().frame(height: 12) | ||
VStack(alignment: .leading, spacing: 12) { | ||
InformationRow( | ||
|
@@ -122,14 +122,17 @@ public struct AboutView<ContributorView: View, StaffView: View, SponsorView: Vie | |
.padding(.vertical, 24) | ||
|
||
Text("アプリバージョン") | ||
.font(Font.system(size: 14, weight: .medium)) | ||
.font(Font.custom(FontAssets.Montserrat.medium, size: 14)) | ||
.fontWeight(.medium) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. [Q] There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @tkhs0604 |
||
Spacer().frame(height: 8) | ||
Text(Bundle.main.formattedVersion) | ||
.font(Font.system(size: 14, weight: .medium)) | ||
.font(Font.custom(FontAssets.Montserrat.medium, size: 14)) | ||
.fontWeight(.medium) | ||
Spacer().frame(height: 8) | ||
Text("The Android robot is reproduced or modified from work created and shared by Google and used according to terms described in the Creative Commons 3.0 Attribution License.") | ||
.foregroundStyle(AssetColors.About.androidRobotDescription.swiftUIColor) | ||
.font(Font.system(size: 11, weight: .medium)) | ||
.font(Font.custom(FontAssets.Montserrat.medium, size: 11)) | ||
.fontWeight(.medium) | ||
.multilineTextAlignment(.center) | ||
} | ||
.padding(16) | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -23,6 +23,15 @@ json: | |
enumName: LottieAssets | ||
publicAccess: true | ||
|
||
fonts: | ||
inputs: ../../../../../core/designsystem/src/commonMain/resources/font | ||
outputs: | ||
templateName: swift5 | ||
output: Fonts.swift | ||
params: | ||
enumName: FontAssets | ||
publicAccess: true | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can you introduce font with There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @ry-itto There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Yes 🙏🏼 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @ry-itto |
||
|
||
strings: | ||
inputs: | ||
- Strings/ja.lproj | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,6 @@ | ||
import SwiftUI | ||
import Theme | ||
import Assets | ||
|
||
public struct InformationRow: View { | ||
private let icon: Image | ||
|
@@ -34,16 +35,19 @@ public struct InformationRow: View { | |
icon | ||
HStack(spacing: 12) { | ||
Text(title) | ||
.font(Font.system(size: 14, weight: .semibold)) | ||
.font(Font.custom(FontAssets.Montserrat.medium, size: 14)) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. [Q] |
||
.fontWeight(.semibold) | ||
HStack { | ||
Text(content) | ||
.font(Font.system(size: 14, weight: .semibold)) | ||
.font(Font.custom(FontAssets.Montserrat.medium, size: 14)) | ||
.fontWeight(.semibold) | ||
if let action = action { | ||
Button { | ||
action.action() | ||
} label: { | ||
Text(action.label) | ||
.font(Font.system(size: 14, weight: .semibold)) | ||
.font(Font.custom(FontAssets.Montserrat.medium, size: 14)) | ||
.fontWeight(.semibold) | ||
.underline() | ||
.foregroundStyle( | ||
AssetColors.Primary.primary.swiftUIColor | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please sort import orders 🙏🏼
I think SwiftLint warns this line when build iOS App.