[iOS] ♻️ Enabled to use ttf files placed in commonMain on iOS. #1047

Corvus400 · 2023-09-02T07:31:22Z

Issue

close [iOS] Introduce the new font Montserrat #888

Overview (Required)

Enabled to use ttf files placed in commonMain on iOS.
We initially expected to be able to change the fonts of all child views by specifying them in one place, as in Android.
However, specifying a custom font in RootView as shown below did not seem to change the appearance of the child views.
So we modified all the fonts in the child views.
If this is incorrect, please feel free to point this out to us.

import Navigation
import SwiftUI
import Assets

@main
struct MainApp: App {

    init() {
        FontAssets.registerAllCustomFonts()
    }

    var body: some Scene {
        WindowGroup {
            RootView()
                .font(Font.custom(FontAssets.Montserrat.medium.fontName, size: UIFont.systemFontSize))
        }
    }
}

import Navigation
import SwiftUI
import Assets

@main
struct MainApp: App {
    
    init() {
        FontAssets.registerAllCustomFonts()
    }
    
    var body: some Scene {
        WindowGroup {
            RootView()
                .environment(\.font, FontAssets.Montserrat.medium.swiftUIFont(size: UIFont.systemFontSize))
        }
    }
}

Screenshot

Before	After

Before	After

Before	After

Before	After

Before	After

Before	After

Before	After

Before	After

Before	After

Corvus400 · 2023-09-02T07:34:55Z

...tem/src/iosMain/kotlin/io/github/droidkaigi/confsched2023/designsystem/theme/FontResource.kt

+// FIXME We initially planned to use this implementation on the iOS side.
+//However, when shared.swift is output by XCFramework, methods with Compose annotations are not output.
+//Therefore, this implementation cannot be referenced from the iOS side.


This Actual method cannot be referenced from the iOS side.
In this case, SwiftGen shares the custom font by referencing the ttf file placed in commonMain.
Please let me know if this is wrong and I will try to fix it.

github-actions · 2023-09-02T07:35:47Z

Hi @Corvus400! Codes seem to be unformatted. To resolve this issue, please run ./gradlew detekt --auto-correct and fix the results of ./gradlew lintDebug.. Thank you for your contribution.

github-actions · 2023-09-02T07:41:18Z

Test Results

211 tests 211 ✔️ 7m 32s ⏱️
  11 suites     0 💤
  11 files     0 ❌

Results for commit 9fb81f2.

♻️ This comment has been updated with latest results.

takahirom · 2023-09-02T14:58:39Z

On the Android side, I think it is good. @ry-itto Do you have any opinion on this?

Corvus400 · 2023-09-03T16:27:26Z

@ry-itto
We would appreciate it if you could review this one. 🙇

ry-itto

Almost LGTM! Please check some reviews!

ry-itto · 2023-09-03T18:00:13Z

app-ios/Modules/Sources/Assets/swiftgen.yml

+fonts:
+  inputs: ../../../../../core/designsystem/src/commonMain/resources/font
+  outputs:
+    templateName: swift5
+    output: Fonts.swift
+    params:
+      enumName: FontAssets
+      publicAccess: true


Can you introduce font with Theme module? 👀
I think font is related to theme.

@ry-itto
Sorry if I have made a recognition error. 🙇
I am aware that this is the content of task #889 , is that correct?
I would like to define typography as a theme in task #889 after introducing it to the iOS project.

@ry-itto
Please let me confirm. 🙇
Does this mean you want it defined in Theme/swiftgen.yml instead of Assets/swiftgen.yml?

Does this mean you want it defined in Theme/swiftgen.yml instead of Assets/swiftgen.yml?

Yes 🙏🏼

@ry-itto
Thank you very much for your patience. 🙇
Fixed to have Font resource in Theme.

ry-itto · 2023-09-03T18:01:56Z

app-ios/App/DroidKaigi2023/DroidKaigi2023/App.swift

 import Navigation
 import SwiftUI
+import Assets


Please sort import orders 🙏🏼
I think SwiftLint warns this line when build iOS App.

Corvus400 · 2023-09-05T11:36:32Z

@takahirom @ry-itto
Font files are added to the iOS side so that CI builds can pass.
Please review again. 🙇

…ets/swiftgen.yml.

tkhs0604 · 2023-09-06T17:30:18Z

app-ios/Modules/Sources/About/AboutView.swift

@@ -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)


[Q]
FontAssets.Montserrat.medium seems a medium-sized font, so is this modifier redundant? 👀

@tkhs0604
I was using the original description as is, so I certainly don't need this modifier.
I have removed it!🫡

tkhs0604 · 2023-09-06T17:31:23Z

app-ios/Modules/Sources/Component/InformationRow.swift

@@ -34,16 +34,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))


[Q]
We can embed Montserrat-SemiBold.ttf too, so how about using it instead?

tkhs0604

Thank you for your great contribution on not only Android but also iOS!
LGTM, and @ry-itto's points have also been resolved, so let me merge it!

♻️ Enabled to use ttf files placed in commonMain on iOS.

b760f9c

Corvus400 requested a review from a team as a code owner September 2, 2023 07:31

♻️ Add comment.

3af8d84

Corvus400 requested a review from a team as a code owner September 2, 2023 07:33

Corvus400 requested a review from takahirom September 2, 2023 07:33

Corvus400 commented Sep 2, 2023

View reviewed changes

🔧 ./gradlew detekt --auto-correct

a74e33b

github-actions bot temporarily deployed to deploygate-distribution September 2, 2023 07:37 Inactive

github-actions bot temporarily deployed to deploygate-distribution September 2, 2023 07:40 Inactive

ry-itto changed the title ~~♻️ Enabled to use ttf files placed in commonMain on iOS.~~ [iOS] ♻️ Enabled to use ttf files placed in commonMain on iOS. Sep 3, 2023

Merge branch 'main' into faeture/apply_custom_font_for_ios

ce479c1

github-actions bot temporarily deployed to deploygate-distribution September 3, 2023 16:30 Inactive

ry-itto reviewed Sep 3, 2023

View reviewed changes

Corvus400 added 3 commits September 4, 2023 19:36

🔧 swiftlint --fix --format

f3bbeeb

🔧 Merge master branch.

912706b

Merge branch 'main' into faeture/apply_custom_font_for_ios

c4bd8e5

github-actions bot temporarily deployed to deploygate-distribution September 4, 2023 10:59 Inactive

Corvus400 marked this pull request as draft September 4, 2023 14:40

Corvus400 changed the title ~~[iOS] ♻️ Enabled to use ttf files placed in commonMain on iOS.~~ [WIP][iOS] ♻️ Enabled to use ttf files placed in commonMain on iOS. Sep 4, 2023

Merge branch 'main' into faeture/apply_custom_font_for_ios

233f835

github-actions bot temporarily deployed to deploygate-distribution September 5, 2023 10:34 Inactive

♻️ Font files have been added to the iOS side.

f218bba

github-actions bot temporarily deployed to deploygate-distribution September 5, 2023 11:01 Inactive

Corvus400 changed the title ~~[WIP][iOS] ♻️ Enabled to use ttf files placed in commonMain on iOS.~~ [iOS] ♻️ Enabled to use ttf files placed in commonMain on iOS. Sep 5, 2023

Corvus400 marked this pull request as ready for review September 5, 2023 11:35

Corvus400 requested a review from ry-itto September 5, 2023 11:35

Corvus400 mentioned this pull request Sep 5, 2023

[iOS] Add typography set as a theme #889

Closed

Merge branch 'main' into faeture/apply_custom_font_for_ios

1ea98ee

github-actions bot temporarily deployed to deploygate-distribution September 5, 2023 15:34 Inactive

Merge branch 'main' into faeture/apply_custom_font_for_ios

e7d631a

github-actions bot temporarily deployed to deploygate-distribution September 6, 2023 09:22 Inactive

🔧 Fixed to define font resources in Theme/swiftgen.yml instead of Ass…

ed22117

…ets/swiftgen.yml.

github-actions bot temporarily deployed to deploygate-distribution September 6, 2023 09:58 Inactive

🔧 Added missing imports.

13b76aa

github-actions bot temporarily deployed to deploygate-distribution September 6, 2023 10:28 Inactive

tkhs0604 reviewed Sep 6, 2023

View reviewed changes

Corvus400 added 2 commits September 7, 2023 18:51

Merge branch 'main' into faeture/apply_custom_font_for_ios

a633ae1

🗑️ Removed redundant modifiers.

9e2c900

github-actions bot temporarily deployed to deploygate-distribution September 7, 2023 10:00 Inactive

🔧 Fixed to use semibold font.

9fb81f2

Corvus400 requested a review from tkhs0604 September 7, 2023 10:32

tkhs0604 approved these changes Sep 7, 2023

View reviewed changes

github-actions bot temporarily deployed to deploygate-distribution September 7, 2023 10:36 Inactive

tkhs0604 merged commit 802ac66 into DroidKaigi:main Sep 7, 2023
9 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[iOS] ♻️ Enabled to use ttf files placed in commonMain on iOS. #1047

[iOS] ♻️ Enabled to use ttf files placed in commonMain on iOS. #1047

Corvus400 commented Sep 2, 2023

Corvus400 Sep 2, 2023

github-actions bot commented Sep 2, 2023

github-actions bot commented Sep 2, 2023 •

edited

Loading

takahirom commented Sep 2, 2023

Corvus400 commented Sep 3, 2023

ry-itto left a comment

ry-itto Sep 3, 2023

Corvus400 Sep 4, 2023

Corvus400 Sep 5, 2023

ry-itto Sep 5, 2023

Corvus400 Sep 6, 2023

ry-itto Sep 3, 2023

Corvus400 commented Sep 5, 2023

tkhs0604 Sep 6, 2023

Corvus400 Sep 7, 2023

tkhs0604 Sep 6, 2023

tkhs0604 left a comment

[iOS] ♻️ Enabled to use ttf files placed in commonMain on iOS. #1047

[iOS] ♻️ Enabled to use ttf files placed in commonMain on iOS. #1047

Conversation

Corvus400 commented Sep 2, 2023

Issue

Overview (Required)

Screenshot

Choose a reason for hiding this comment

github-actions bot commented Sep 2, 2023

github-actions bot commented Sep 2, 2023 • edited Loading

Test Results

takahirom commented Sep 2, 2023

Corvus400 commented Sep 3, 2023

ry-itto left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Corvus400 commented Sep 5, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tkhs0604 left a comment

Choose a reason for hiding this comment

github-actions bot commented Sep 2, 2023 •

edited

Loading