♻️ Add a translate button to the session details screen. #981

Corvus400 · 2023-08-27T06:23:46Z

Issue

None.

Overview (Required)

The i18nDesc item is now used to switch the text in the Description.

Links

(proposal) ✨ Implement Translate Button. #708 (comment)

Screenshot (Optional if screenshot test is present or unrelated to UI)

Before	After

Movie (Optional)

Before	After
---	translate.mp4

github-actions · 2023-08-27T06:26:10Z

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-08-27T06:37:37Z

Snapshot diff report

File name	Image
KaigiAppTest.checkNa vigateToTimetableIte mDetailShot_compare. png
io.github.droidkaigi .confsched2023.sessi ons.component_null_T heme_DescriptionSect ionPreview-DarkMode- 14_15_null_compare.p ng
io.github.droidkaigi .confsched2023.sessi ons.component_null_T heme_DescriptionSect ionPreview-LightMode -14_14_null_compare. png
TimetableItemDetailS creenTest.checkSmall FontScaleShot_compar e.png
TimetableItemDetailS creenTest.checkHugeF ontScaleShot_compare .png
TimetableItemDetailS creenTest.checkReadM oreExpansionShot_com pare.png
TimetableItemDetailS creenTest.checkReadM oreExpansionShot_2_c ompare.png
TimetableItemDetailS creenTest.checkLaunc hShot_compare.png
TimetableItemDetailS creenTest.checkScrol lShot_2_compare.png
TimetableItemDetailS creenTest.checkLarge FontScaleShot_compar e.png
TimetableItemDetailS creenTest.checkScrol lShot_4_compare.png
TimetableItemDetailS creenTest.checkScrol lShot_compare.png
TimetableItemDetailS creenTest.checkScrol lShot_3_compare.png
TimetableItemDetailS creenTest.checkLaunc hAccessibilityShot_c ompare.png
TimetableItemDetailS creenTest.checkBookm arkToggleShot_compar e.png

github-actions · 2023-08-27T06:43:04Z

Test Results

205 tests 205 ✔️ 7m 12s ⏱️
  11 suites     0 💤
  11 files     0 ❌

Results for commit e855387.

♻️ This comment has been updated with latest results.

Corvus400 · 2023-08-27T15:51:12Z

I need to fix the Swift code, but I couldn't fix it with my knowledge.
Can someone please fix the code on the iOS side?🙇‍♂️

woxtu · 2023-08-27T22:01:01Z

diff --git a/app-ios/Modules/Sources/Session/SessionView.swift b/app-ios/Modules/Sources/Session/SessionView.swift
index 87f79e2a..7531d030 100644
--- a/app-ios/Modules/Sources/Session/SessionView.swift
+++ b/app-ios/Modules/Sources/Session/SessionView.swift
@@ -65,12 +65,12 @@ public struct SessionView: View {

                 if let session = viewModel.timetableItem as? TimetableItem.Session {
                     VStack(alignment: .leading, spacing: 16) {
-                        Text(session.description_)
+                        Text(session.description_.currentLangTitle)
                             .textSelection(.enabled)
                             .lineLimit(isDescriptionExpanded ? nil : 5)
                             .background {
                                 ViewThatFits(in: .vertical) {
-                                    Text(session.description_)
+                                    Text(session.description_.currentLangTitle)
                                         .hidden()
                                     // Just for receiving onAppear event if the description exceeds its line limit
                                     Color.clear

DroidKaigi#981 (comment)

Corvus400 · 2023-08-28T02:47:26Z

@woxtu
Thank you very much!
Thanks to you, I can now successfully build iOS!🥳

takahirom · 2023-08-28T03:07:07Z

.../commonMain/kotlin/io/github/droidkaigi/confsched2023/data/sessions/FakeSessionsApiClient.kt

@@ -117,8 +117,14 @@ fun SessionsAllResponse.Companion.fake(): SessionsAllResponse {
                        en = "DroidKaigi App Architecture day$day room${room.name.en} index$index",
                    ),
                    speakers = listOf("1", "2"),
-                    description = "これはディスクリプションです。\nこれはディスクリプションです。\nこれはディスクリプションです。\n" +
-                        "これはディスクリプションです。\nこれはディスクリプションです。\nこれはディスクリプションです。\n",
+                    description = "\"これはディスクリプションです。\\nこれはディスクリプションです。\\nこれはディスクリプションです。\\n\" +\n" +


There may be a little mistake 😄

takahirom · 2023-08-28T14:59:34Z

...ns/src/main/java/io/github/droidkaigi/confsched2023/sessions/TimetableItemDetailViewModel.kt

@@ -52,9 +54,14 @@ class TimetableItemDetailViewModel @Inject constructor(
            )
    private val viewBookmarkListRequestStateFlow =
        MutableStateFlow<ViewBookmarkListRequestState>(ViewBookmarkListRequestState.NotRequested)
+    private val currentDescriptionLanguage = MutableStateFlow(defaultLang())


Initially, I was hoping that the session would be displayed in its original default language. The reason is that it would reflect what the speaker actually wrote. 👀
Maybe you can have userSelectedDescriptionLanguage = MutableStateFlow(null)

…eaker's original language.

takahirom · 2023-08-29T14:53:47Z

.../commonMain/kotlin/io/github/droidkaigi/confsched2023/data/sessions/FakeSessionsApiClient.kt

@@ -119,6 +119,12 @@ fun SessionsAllResponse.Companion.fake(): SessionsAllResponse {
                    speakers = listOf("1", "2"),
                    description = "これはディスクリプションです。\nこれはディスクリプションです。\nこれはディスクリプションです。\n" +
                        "これはディスクリプションです。\nこれはディスクリプションです。\nこれはディスクリプションです。\n",
+                    i18nDesc = LocaledResponse(
+                        ja = "\"これはディスクリプションです。\\nこれはディスクリプションです。\\nこれはディスクリプションです。\\n\" +\n" +


I think \\n should be \n 👀
You can work on this another PR!

takahirom · 2023-08-29T14:57:49Z

...ns/src/main/java/io/github/droidkaigi/confsched2023/sessions/TimetableItemDetailViewModel.kt

@@ -52,18 +53,28 @@ class TimetableItemDetailViewModel @Inject constructor(
            )
    private val viewBookmarkListRequestStateFlow =
        MutableStateFlow<ViewBookmarkListRequestState>(ViewBookmarkListRequestState.NotRequested)
+    private val currentDescriptionLanguageStateFlow: MutableStateFlow<Lang?> =


Could you name this variable selectedDescriptionLanguageStateFlow? I think currentDescriptionLanguageStateFlow is a little wrong name because if it is null, we show the sessions default lang 🙏

takahirom

Looks great! Thank you for your suggestion! We may not have this feature without you!

Corvus400 added 2 commits August 27, 2023 14:40

📝 Changed the description field to MultilangText.

241cbae

🔧 Corresponded when both contents of i18nDesc are null.

582d9fa

github-actions bot temporarily deployed to deploygate-distribution August 27, 2023 06:51 Inactive

Corvus400 added 2 commits August 27, 2023 23:01

Merge branch 'main' into feature/implement_translate_button2

3555bbd

🔧 ./gradlew detekt --auto-correct

ca1e345

github-actions bot temporarily deployed to deploygate-distribution August 27, 2023 14:38 Inactive

✨ A function for switching Description was implemented.

262e5b5

github-actions bot temporarily deployed to deploygate-distribution August 27, 2023 15:17 Inactive

Corvus400 marked this pull request as ready for review August 27, 2023 15:49

Corvus400 requested a review from a team as a code owner August 27, 2023 15:49

Corvus400 requested a review from upon0426 August 27, 2023 15:49

Corvus400 changed the title ~~[WIP] Add a translate button to the session details screen.~~ ♻️ Add a translate button to the session details screen. Aug 27, 2023

Corvus400 changed the title ~~♻️ Add a translate button to the session details screen.~~ [Need help from iOS developers.] ♻️ Add a translate button to the session details screen. Aug 27, 2023

🔧 Fixed Swift code.

8582a70

DroidKaigi#981 (comment)

Corvus400 requested a review from a team as a code owner August 28, 2023 02:13

Corvus400 changed the title ~~[Need help from iOS developers.] ♻️ Add a translate button to the session details screen.~~ ♻️ Add a translate button to the session details screen. Aug 28, 2023

github-actions bot temporarily deployed to deploygate-distribution August 28, 2023 02:46 Inactive

takahirom reviewed Aug 28, 2023

View reviewed changes

🔧 Undo unwanted changes.

31573cb

github-actions bot temporarily deployed to deploygate-distribution August 28, 2023 03:40 Inactive

Corvus400 requested a review from takahirom August 28, 2023 03:58

takahirom reviewed Aug 28, 2023

View reviewed changes

Corvus400 added 2 commits August 29, 2023 11:59

Merge branch 'main' into feature/implement_translate_button2

2e27075

🔧 Initially, we modified it so that the Description appears in the sp…

a137fcc

…eaker's original language.

🔧 ./gradlew detekt --auto-correct

09e293f

github-actions bot temporarily deployed to deploygate-distribution August 29, 2023 03:58 Inactive

Corvus400 requested a review from takahirom August 29, 2023 04:12

takahirom reviewed Aug 29, 2023

View reviewed changes

Corvus400 added 3 commits August 30, 2023 11:59

Merge branch 'main' into feature/implement_translate_button2

ce2aae3

🗑️ Deleted unnecessary /.

b8ee2b4

🔧 Corrected the name of the method.

e855387

Corvus400 requested a review from takahirom August 30, 2023 03:05

github-actions bot temporarily deployed to deploygate-distribution August 30, 2023 03:31 Inactive

takahirom approved these changes Aug 30, 2023

View reviewed changes

takahirom merged commit ec38840 into DroidKaigi:main Aug 30, 2023
9 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

♻️ Add a translate button to the session details screen. #981

♻️ Add a translate button to the session details screen. #981

Corvus400 commented Aug 27, 2023 •

edited

Loading

github-actions bot commented Aug 27, 2023

github-actions bot commented Aug 27, 2023 •

edited

Loading

github-actions bot commented Aug 27, 2023 •

edited

Loading

Corvus400 commented Aug 27, 2023

woxtu commented Aug 27, 2023

Corvus400 commented Aug 28, 2023

takahirom Aug 28, 2023

takahirom Aug 28, 2023

takahirom Aug 29, 2023 •

edited

Loading

takahirom Aug 29, 2023 •

edited

Loading

takahirom left a comment

♻️ Add a translate button to the session details screen. #981

♻️ Add a translate button to the session details screen. #981

Conversation

Corvus400 commented Aug 27, 2023 • edited Loading

Issue

Overview (Required)

Links

Screenshot (Optional if screenshot test is present or unrelated to UI)

Movie (Optional)

github-actions bot commented Aug 27, 2023

github-actions bot commented Aug 27, 2023 • edited Loading

github-actions bot commented Aug 27, 2023 • edited Loading

Test Results

Corvus400 commented Aug 27, 2023

woxtu commented Aug 27, 2023

Corvus400 commented Aug 28, 2023

takahirom Aug 28, 2023

Choose a reason for hiding this comment

takahirom Aug 28, 2023

Choose a reason for hiding this comment

takahirom Aug 29, 2023 • edited Loading

Choose a reason for hiding this comment

takahirom Aug 29, 2023 • edited Loading

Choose a reason for hiding this comment

takahirom left a comment

Choose a reason for hiding this comment

Corvus400 commented Aug 27, 2023 •

edited

Loading

github-actions bot commented Aug 27, 2023 •

edited

Loading

github-actions bot commented Aug 27, 2023 •

edited

Loading

takahirom Aug 29, 2023 •

edited

Loading

takahirom Aug 29, 2023 •

edited

Loading