Merge pull request #885 from rkowase/refactor/remove_redundant_qualif…

…ier_name [Refactoring] Remove redundant qualifier names
DroidKaigi · Oct 12, 2022 · 929b193 · 929b193
2 parents 881dec2 + 5ac5304
commit 929b193
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 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
@@ -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
@@ -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
@@ -1,12 +1,11 @@
 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
-    get() = Res.strings
+    get() = strings
 
 // For iOS usage
 @Suppress("unused")
 public val shared: strings
-    get() = Res.strings
+    get() = strings
-Original file line number
+Diff line change
@@ Expand Up / @@ -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(
@@ Expand Down @@