From e9df9c2718601c178044899d2a86c4312ee6cb02 Mon Sep 17 00:00:00 2001 From: Rui Kowase Date: Fri, 7 Oct 2022 15:23:31 +0900 Subject: [PATCH 1/2] [Refactoring] Remove redundant qualifier names --- .../io/github/droidkaigi/confsched2022/model/Timetable.kt | 2 +- .../io/github/droidkaigi/confsched2022/model/TimetableItem.kt | 2 +- .../io/github/droidkaigi/confsched2022/strings/Strings.kt | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/model/src/commonMain/kotlin/io/github/droidkaigi/confsched2022/model/Timetable.kt b/core/model/src/commonMain/kotlin/io/github/droidkaigi/confsched2022/model/Timetable.kt index 15d052d68..90c337e2c 100644 --- a/core/model/src/commonMain/kotlin/io/github/droidkaigi/confsched2022/model/Timetable.kt +++ b/core/model/src/commonMain/kotlin/io/github/droidkaigi/confsched2022/model/Timetable.kt @@ -135,7 +135,7 @@ public fun Timetable.Companion.fake(): Timetable { TimeZone.of("UTC+9") ) - val fake = TimetableItem.Session.fake() + val fake = Session.fake() add( fake .copy( diff --git a/core/model/src/commonMain/kotlin/io/github/droidkaigi/confsched2022/model/TimetableItem.kt b/core/model/src/commonMain/kotlin/io/github/droidkaigi/confsched2022/model/TimetableItem.kt index d0d639b06..93c95d237 100644 --- a/core/model/src/commonMain/kotlin/io/github/droidkaigi/confsched2022/model/TimetableItem.kt +++ b/core/model/src/commonMain/kotlin/io/github/droidkaigi/confsched2022/model/TimetableItem.kt @@ -76,7 +76,7 @@ public sealed class TimetableItem { } } -public fun TimetableItem.Session.Companion.fake(): Session { +public fun Session.Companion.fake(): Session { return Session( id = TimetableItemId("2"), title = MultiLangText("DroidKaigiのアプリのアーキテクチャ", "DroidKaigi App Architecture"), diff --git a/core/model/src/commonMain/kotlin/io/github/droidkaigi/confsched2022/strings/Strings.kt b/core/model/src/commonMain/kotlin/io/github/droidkaigi/confsched2022/strings/Strings.kt index ea2c3731a..745368f6d 100644 --- a/core/model/src/commonMain/kotlin/io/github/droidkaigi/confsched2022/strings/Strings.kt +++ b/core/model/src/commonMain/kotlin/io/github/droidkaigi/confsched2022/strings/Strings.kt @@ -4,9 +4,9 @@ import io.github.droidkaigi.confsched2022.model.Res import io.github.droidkaigi.confsched2022.model.Res.strings public val Strings: strings - get() = Res.strings + get() = strings // For iOS usage @Suppress("unused") public val shared: strings - get() = Res.strings + get() = strings From ea35e49cfd04e87ee479381dddf62632a639ccc7 Mon Sep 17 00:00:00 2001 From: Rui Kowase Date: Tue, 11 Oct 2022 09:57:17 +0900 Subject: [PATCH 2/2] Optimize import --- .../kotlin/io/github/droidkaigi/confsched2022/strings/Strings.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/core/model/src/commonMain/kotlin/io/github/droidkaigi/confsched2022/strings/Strings.kt b/core/model/src/commonMain/kotlin/io/github/droidkaigi/confsched2022/strings/Strings.kt index 745368f6d..68865f972 100644 --- a/core/model/src/commonMain/kotlin/io/github/droidkaigi/confsched2022/strings/Strings.kt +++ b/core/model/src/commonMain/kotlin/io/github/droidkaigi/confsched2022/strings/Strings.kt @@ -1,6 +1,5 @@ package io.github.droidkaigi.confsched2022.strings -import io.github.droidkaigi.confsched2022.model.Res import io.github.droidkaigi.confsched2022.model.Res.strings public val Strings: strings