From d37d6114d05a7b53f39e11678a0ebfb409a62ce2 Mon Sep 17 00:00:00 2001 From: Yuhei Kawakami Date: Fri, 5 Mar 2021 04:20:34 +0900 Subject: [PATCH 1/2] Move package from staff to about --- .../github/droidkaigi/feeder/{staff => about}/AboutThisApp.kt | 2 +- .../main/java/io/github/droidkaigi/feeder/other/OtherScreen.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename uicomponent-compose/other/src/main/java/io/github/droidkaigi/feeder/{staff => about}/AboutThisApp.kt (97%) diff --git a/uicomponent-compose/other/src/main/java/io/github/droidkaigi/feeder/staff/AboutThisApp.kt b/uicomponent-compose/other/src/main/java/io/github/droidkaigi/feeder/about/AboutThisApp.kt similarity index 97% rename from uicomponent-compose/other/src/main/java/io/github/droidkaigi/feeder/staff/AboutThisApp.kt rename to uicomponent-compose/other/src/main/java/io/github/droidkaigi/feeder/about/AboutThisApp.kt index e2fd739f6..f5c2ca54d 100644 --- a/uicomponent-compose/other/src/main/java/io/github/droidkaigi/feeder/staff/AboutThisApp.kt +++ b/uicomponent-compose/other/src/main/java/io/github/droidkaigi/feeder/about/AboutThisApp.kt @@ -1,4 +1,4 @@ -package io.github.droidkaigi.feeder.staff +package io.github.droidkaigi.feeder.about import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Column diff --git a/uicomponent-compose/other/src/main/java/io/github/droidkaigi/feeder/other/OtherScreen.kt b/uicomponent-compose/other/src/main/java/io/github/droidkaigi/feeder/other/OtherScreen.kt index 1dd4eb48e..c968a7f20 100644 --- a/uicomponent-compose/other/src/main/java/io/github/droidkaigi/feeder/other/OtherScreen.kt +++ b/uicomponent-compose/other/src/main/java/io/github/droidkaigi/feeder/other/OtherScreen.kt @@ -35,7 +35,7 @@ import androidx.compose.ui.unit.dp import dev.chrisbanes.accompanist.insets.LocalWindowInsets import dev.chrisbanes.accompanist.insets.statusBarsPadding import io.github.droidkaigi.feeder.core.theme.ConferenceAppFeederTheme -import io.github.droidkaigi.feeder.staff.AboutThisApp +import io.github.droidkaigi.feeder.about.AboutThisApp import io.github.droidkaigi.feeder.staff.StaffList sealed class OtherTabs(val name: String, val routePath: String) { From feb5c1cd412dceb7185e33b65e2b511db30865c4 Mon Sep 17 00:00:00 2001 From: Yuhei Kawakami Date: Fri, 5 Mar 2021 04:57:45 +0900 Subject: [PATCH 2/2] Fix format violations --- .../main/java/io/github/droidkaigi/feeder/other/OtherScreen.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uicomponent-compose/other/src/main/java/io/github/droidkaigi/feeder/other/OtherScreen.kt b/uicomponent-compose/other/src/main/java/io/github/droidkaigi/feeder/other/OtherScreen.kt index c968a7f20..3c3545ff8 100644 --- a/uicomponent-compose/other/src/main/java/io/github/droidkaigi/feeder/other/OtherScreen.kt +++ b/uicomponent-compose/other/src/main/java/io/github/droidkaigi/feeder/other/OtherScreen.kt @@ -34,8 +34,8 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import dev.chrisbanes.accompanist.insets.LocalWindowInsets import dev.chrisbanes.accompanist.insets.statusBarsPadding -import io.github.droidkaigi.feeder.core.theme.ConferenceAppFeederTheme import io.github.droidkaigi.feeder.about.AboutThisApp +import io.github.droidkaigi.feeder.core.theme.ConferenceAppFeederTheme import io.github.droidkaigi.feeder.staff.StaffList sealed class OtherTabs(val name: String, val routePath: String) {