diff --git a/app-android/src/main/java/io/github/droidkaigi/confsched/KaigiApp.kt b/app-android/src/main/java/io/github/droidkaigi/confsched/KaigiApp.kt index dbd401143..1f97cbf46 100644 --- a/app-android/src/main/java/io/github/droidkaigi/confsched/KaigiApp.kt +++ b/app-android/src/main/java/io/github/droidkaigi/confsched/KaigiApp.kt @@ -47,6 +47,9 @@ import io.github.droidkaigi.confsched.model.AboutItem import io.github.droidkaigi.confsched.model.Lang.JAPANESE import io.github.droidkaigi.confsched.model.TimetableItem import io.github.droidkaigi.confsched.model.defaultLang +import io.github.droidkaigi.confsched.profilecard.navigateProfileCardScreen +import io.github.droidkaigi.confsched.profilecard.profileCardScreen +import io.github.droidkaigi.confsched.profilecard.profileCardScreenRoute import io.github.droidkaigi.confsched.sessions.navigateTimetableScreen import io.github.droidkaigi.confsched.sessions.navigateToTimetableItemDetailScreen import io.github.droidkaigi.confsched.sessions.nestedSessionScreens @@ -56,9 +59,6 @@ import io.github.droidkaigi.confsched.share.ShareNavigator import io.github.droidkaigi.confsched.staff.staffScreenRoute import io.github.droidkaigi.confsched.staff.staffScreens import io.github.droidkaigi.confsched.ui.NavHostWithSharedAxisX -import io.github.droidkaigi.confshed.profilecard.navigateProfileCardScreen -import io.github.droidkaigi.confshed.profilecard.profileCardScreen -import io.github.droidkaigi.confshed.profilecard.profileCardScreenRoute import kotlinx.collections.immutable.PersistentList @Composable diff --git a/core/testing/src/main/java/io/github/droidkaigi/confsched/testing/robot/ProfileCardScreenRobot.kt b/core/testing/src/main/java/io/github/droidkaigi/confsched/testing/robot/ProfileCardScreenRobot.kt index 2ca42e743..1e1fda4aa 100644 --- a/core/testing/src/main/java/io/github/droidkaigi/confsched/testing/robot/ProfileCardScreenRobot.kt +++ b/core/testing/src/main/java/io/github/droidkaigi/confsched/testing/robot/ProfileCardScreenRobot.kt @@ -3,10 +3,10 @@ package io.github.droidkaigi.confsched.testing.robot import androidx.compose.ui.test.assertIsDisplayed import androidx.compose.ui.test.hasTestTag import io.github.droidkaigi.confsched.designsystem.theme.KaigiTheme +import io.github.droidkaigi.confsched.profilecard.ProfileCardScreen +import io.github.droidkaigi.confsched.profilecard.ProfileCardTestTag import io.github.droidkaigi.confsched.testing.DefaultScreenRobot import io.github.droidkaigi.confsched.testing.ScreenRobot -import io.github.droidkaigi.confshed.profilecard.ProfileCardScreen -import io.github.droidkaigi.confshed.profilecard.ProfileCardTestTag import javax.inject.Inject class ProfileCardScreenRobot @Inject constructor( diff --git a/feature/profilecard/src/androidUnitTest/kotlin/io/github/droidkaigi/confshed/profilecard/ProfileCardScreenTest.kt b/feature/profilecard/src/androidUnitTest/kotlin/io/github/droidkaigi/confsched/profilecard/ProfileCardScreenTest.kt similarity index 97% rename from feature/profilecard/src/androidUnitTest/kotlin/io/github/droidkaigi/confshed/profilecard/ProfileCardScreenTest.kt rename to feature/profilecard/src/androidUnitTest/kotlin/io/github/droidkaigi/confsched/profilecard/ProfileCardScreenTest.kt index 8f82b5e3f..f1494a66b 100644 --- a/feature/profilecard/src/androidUnitTest/kotlin/io/github/droidkaigi/confshed/profilecard/ProfileCardScreenTest.kt +++ b/feature/profilecard/src/androidUnitTest/kotlin/io/github/droidkaigi/confsched/profilecard/ProfileCardScreenTest.kt @@ -1,4 +1,4 @@ -package io.github.droidkaigi.confshed.profilecard +package io.github.droidkaigi.confsched.profilecard import dagger.hilt.android.testing.BindValue import dagger.hilt.android.testing.HiltAndroidTest diff --git a/feature/profilecard/src/commonMain/kotlin/io/github/droidkaigi/confshed/profilecard/ProfileCardRes.kt b/feature/profilecard/src/commonMain/kotlin/io/github/droidkaigi/confsched/profilecard/ProfileCardRes.kt similarity index 75% rename from feature/profilecard/src/commonMain/kotlin/io/github/droidkaigi/confshed/profilecard/ProfileCardRes.kt rename to feature/profilecard/src/commonMain/kotlin/io/github/droidkaigi/confsched/profilecard/ProfileCardRes.kt index d8dc981c0..1055e240c 100644 --- a/feature/profilecard/src/commonMain/kotlin/io/github/droidkaigi/confshed/profilecard/ProfileCardRes.kt +++ b/feature/profilecard/src/commonMain/kotlin/io/github/droidkaigi/confsched/profilecard/ProfileCardRes.kt @@ -1,4 +1,4 @@ -package io.github.droidkaigi.confshed.profilecard +package io.github.droidkaigi.confsched.profilecard import conference_app_2024.feature.profilecard.generated.resources.Res diff --git a/feature/profilecard/src/commonMain/kotlin/io/github/droidkaigi/confshed/profilecard/ProfileCardScreen.kt b/feature/profilecard/src/commonMain/kotlin/io/github/droidkaigi/confsched/profilecard/ProfileCardScreen.kt similarity index 98% rename from feature/profilecard/src/commonMain/kotlin/io/github/droidkaigi/confshed/profilecard/ProfileCardScreen.kt rename to feature/profilecard/src/commonMain/kotlin/io/github/droidkaigi/confsched/profilecard/ProfileCardScreen.kt index dce8133d2..e2acf902e 100644 --- a/feature/profilecard/src/commonMain/kotlin/io/github/droidkaigi/confshed/profilecard/ProfileCardScreen.kt +++ b/feature/profilecard/src/commonMain/kotlin/io/github/droidkaigi/confsched/profilecard/ProfileCardScreen.kt @@ -1,4 +1,4 @@ -package io.github.droidkaigi.confshed.profilecard +package io.github.droidkaigi.confsched.profilecard import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column @@ -30,9 +30,9 @@ import io.github.droidkaigi.confsched.compose.EventEmitter import io.github.droidkaigi.confsched.compose.rememberEventEmitter import io.github.droidkaigi.confsched.model.ProfileCard import io.github.droidkaigi.confsched.model.ProfileCardTheme +import io.github.droidkaigi.confsched.profilecard.ProfileCardUiState.Edit import io.github.droidkaigi.confsched.ui.SnackbarMessageEffect import io.github.droidkaigi.confsched.ui.UserMessageStateHolder -import io.github.droidkaigi.confshed.profilecard.ProfileCardUiState.Edit const val profileCardScreenRoute = "profilecard" diff --git a/feature/profilecard/src/commonMain/kotlin/io/github/droidkaigi/confshed/profilecard/ProfileCardScreenPresenter.kt b/feature/profilecard/src/commonMain/kotlin/io/github/droidkaigi/confsched/profilecard/ProfileCardScreenPresenter.kt similarity index 97% rename from feature/profilecard/src/commonMain/kotlin/io/github/droidkaigi/confshed/profilecard/ProfileCardScreenPresenter.kt rename to feature/profilecard/src/commonMain/kotlin/io/github/droidkaigi/confsched/profilecard/ProfileCardScreenPresenter.kt index 25afd8e08..140cf346a 100644 --- a/feature/profilecard/src/commonMain/kotlin/io/github/droidkaigi/confshed/profilecard/ProfileCardScreenPresenter.kt +++ b/feature/profilecard/src/commonMain/kotlin/io/github/droidkaigi/confsched/profilecard/ProfileCardScreenPresenter.kt @@ -1,4 +1,4 @@ -package io.github.droidkaigi.confshed.profilecard +package io.github.droidkaigi.confsched.profilecard import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue