diff --git a/app/src/main/kotlin/org/cru/godtools/ui/account/AccountLayout.kt b/app/src/main/kotlin/org/cru/godtools/ui/account/AccountLayout.kt index 9edd8f78be..239f787137 100644 --- a/app/src/main/kotlin/org/cru/godtools/ui/account/AccountLayout.kt +++ b/app/src/main/kotlin/org/cru/godtools/ui/account/AccountLayout.kt @@ -44,8 +44,8 @@ import java.time.format.DateTimeFormatter import java.time.format.FormatStyle import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch -import org.ccci.gto.android.common.androidx.compose.foundation.layout.padding import org.ccci.gto.android.common.androidx.compose.material3.ui.tabs.pagerTabIndicatorOffset +import org.ccci.gto.android.common.compose.foundation.layout.padding import org.ccci.gto.android.common.compose.ui.draw.invisibleIf import org.cru.godtools.R import org.cru.godtools.analytics.compose.RecordAnalyticsScreen diff --git a/app/src/main/kotlin/org/cru/godtools/ui/account/activity/AccountActivityLayout.kt b/app/src/main/kotlin/org/cru/godtools/ui/account/activity/AccountActivityLayout.kt index 7fb6af5cb5..b40245be3a 100644 --- a/app/src/main/kotlin/org/cru/godtools/ui/account/activity/AccountActivityLayout.kt +++ b/app/src/main/kotlin/org/cru/godtools/ui/account/activity/AccountActivityLayout.kt @@ -24,8 +24,8 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel -import org.ccci.gto.android.common.androidx.compose.foundation.layout.padding import org.ccci.gto.android.common.androidx.compose.material3.isLight +import org.ccci.gto.android.common.compose.foundation.layout.padding import org.ccci.gto.android.common.util.format import org.cru.godtools.R import org.cru.godtools.shared.common.model.ThemeType diff --git a/app/src/main/kotlin/org/cru/godtools/ui/account/delete/DeleteAccountLayout.kt b/app/src/main/kotlin/org/cru/godtools/ui/account/delete/DeleteAccountLayout.kt index cdca719572..4c1506913b 100644 --- a/app/src/main/kotlin/org/cru/godtools/ui/account/delete/DeleteAccountLayout.kt +++ b/app/src/main/kotlin/org/cru/godtools/ui/account/delete/DeleteAccountLayout.kt @@ -33,7 +33,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import com.slack.circuit.codegen.annotations.CircuitInject import dagger.hilt.components.SingletonComponent -import org.ccci.gto.android.common.androidx.compose.foundation.layout.padding +import org.ccci.gto.android.common.compose.foundation.layout.padding import org.cru.godtools.R import org.cru.godtools.ui.account.delete.DeleteAccountPresenter.UiEvent import org.cru.godtools.ui.account.delete.DeleteAccountPresenter.UiState diff --git a/app/src/main/kotlin/org/cru/godtools/ui/account/globalactivity/GlobalActivityLayout.kt b/app/src/main/kotlin/org/cru/godtools/ui/account/globalactivity/GlobalActivityLayout.kt index 670aa8e95d..202a7c65e3 100644 --- a/app/src/main/kotlin/org/cru/godtools/ui/account/globalactivity/GlobalActivityLayout.kt +++ b/app/src/main/kotlin/org/cru/godtools/ui/account/globalactivity/GlobalActivityLayout.kt @@ -21,10 +21,9 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel -import java.time.Year -import org.ccci.gto.android.common.androidx.compose.foundation.layout.padding import org.ccci.gto.android.common.androidx.compose.material3.ui.card.ElevatedCard import org.ccci.gto.android.common.androidx.compose.ui.text.computeHeightForDefaultText +import org.ccci.gto.android.common.compose.foundation.layout.padding import org.ccci.gto.android.common.util.format import org.cru.godtools.R diff --git a/app/src/main/kotlin/org/cru/godtools/ui/dashboard/tools/ToolsLayout.kt b/app/src/main/kotlin/org/cru/godtools/ui/dashboard/tools/ToolsLayout.kt index c86db27707..32bd33d696 100644 --- a/app/src/main/kotlin/org/cru/godtools/ui/dashboard/tools/ToolsLayout.kt +++ b/app/src/main/kotlin/org/cru/godtools/ui/dashboard/tools/ToolsLayout.kt @@ -21,7 +21,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import com.slack.circuit.codegen.annotations.CircuitInject import dagger.hilt.components.SingletonComponent -import org.ccci.gto.android.common.androidx.compose.foundation.layout.padding +import org.ccci.gto.android.common.compose.foundation.layout.padding import org.cru.godtools.R import org.cru.godtools.ui.banner.Banners import org.cru.godtools.ui.dashboard.tools.ToolsPresenter.UiState diff --git a/app/src/main/kotlin/org/cru/godtools/ui/languages/app/AppLanguageLayout.kt b/app/src/main/kotlin/org/cru/godtools/ui/languages/app/AppLanguageLayout.kt index 87bd282690..d0c9a15972 100644 --- a/app/src/main/kotlin/org/cru/godtools/ui/languages/app/AppLanguageLayout.kt +++ b/app/src/main/kotlin/org/cru/godtools/ui/languages/app/AppLanguageLayout.kt @@ -44,8 +44,8 @@ import androidx.compose.ui.text.withStyle import androidx.compose.ui.unit.dp import com.slack.circuit.codegen.annotations.CircuitInject import dagger.hilt.components.SingletonComponent -import org.ccci.gto.android.common.androidx.compose.foundation.layout.padding import org.ccci.gto.android.common.androidx.compose.ui.text.res.annotatedStringResource +import org.ccci.gto.android.common.compose.foundation.layout.padding import org.ccci.gto.android.common.util.content.localize import org.cru.godtools.R import org.cru.godtools.base.ui.circuit.screen.AppLanguageScreen diff --git a/app/src/main/kotlin/org/cru/godtools/ui/languages/country/CountrySettingsLayout.kt b/app/src/main/kotlin/org/cru/godtools/ui/languages/country/CountrySettingsLayout.kt index b13f909317..88d9c3340e 100644 --- a/app/src/main/kotlin/org/cru/godtools/ui/languages/country/CountrySettingsLayout.kt +++ b/app/src/main/kotlin/org/cru/godtools/ui/languages/country/CountrySettingsLayout.kt @@ -41,7 +41,7 @@ import com.slack.circuit.codegen.annotations.CircuitInject import com.slack.circuit.overlay.LocalOverlayHost import dagger.hilt.components.SingletonComponent import kotlinx.coroutines.launch -import org.ccci.gto.android.common.androidx.compose.foundation.layout.padding +import org.ccci.gto.android.common.compose.foundation.layout.padding import org.cru.godtools.R import org.cru.godtools.base.ui.theme.GodToolsTheme import org.cru.godtools.ui.languages.LocalizedName diff --git a/app/src/main/kotlin/org/cru/godtools/ui/languages/downloadable/DownloadableLanguagesLayout.kt b/app/src/main/kotlin/org/cru/godtools/ui/languages/downloadable/DownloadableLanguagesLayout.kt index 2db6d24caf..91a57cf828 100644 --- a/app/src/main/kotlin/org/cru/godtools/ui/languages/downloadable/DownloadableLanguagesLayout.kt +++ b/app/src/main/kotlin/org/cru/godtools/ui/languages/downloadable/DownloadableLanguagesLayout.kt @@ -41,7 +41,7 @@ import com.slack.circuit.overlay.LocalOverlayHost import dagger.hilt.components.SingletonComponent import kotlinx.coroutines.delay import kotlinx.coroutines.launch -import org.ccci.gto.android.common.androidx.compose.foundation.layout.padding +import org.ccci.gto.android.common.compose.foundation.layout.padding import org.cru.godtools.R import org.cru.godtools.base.ui.theme.GodToolsTheme import org.cru.godtools.ui.languages.LanguageName diff --git a/app/src/main/kotlin/org/cru/godtools/ui/login/LoginLayout.kt b/app/src/main/kotlin/org/cru/godtools/ui/login/LoginLayout.kt index 0cb14acca7..5d2563da9f 100644 --- a/app/src/main/kotlin/org/cru/godtools/ui/login/LoginLayout.kt +++ b/app/src/main/kotlin/org/cru/godtools/ui/login/LoginLayout.kt @@ -37,7 +37,7 @@ import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import org.ccci.gto.android.common.androidx.compose.foundation.layout.padding +import org.ccci.gto.android.common.compose.foundation.layout.padding import org.cru.godtools.R import org.cru.godtools.account.AccountType import org.cru.godtools.account.LoginResponse diff --git a/app/src/main/kotlin/org/cru/godtools/ui/onboarding/OnboardingPageLayout.kt b/app/src/main/kotlin/org/cru/godtools/ui/onboarding/OnboardingPageLayout.kt index 51de092f21..96e2167461 100644 --- a/app/src/main/kotlin/org/cru/godtools/ui/onboarding/OnboardingPageLayout.kt +++ b/app/src/main/kotlin/org/cru/godtools/ui/onboarding/OnboardingPageLayout.kt @@ -23,7 +23,7 @@ import com.airbnb.lottie.compose.LottieCompositionSpec import com.airbnb.lottie.compose.LottieConstants import com.airbnb.lottie.compose.animateLottieCompositionAsState import com.airbnb.lottie.compose.rememberLottieComposition -import org.ccci.gto.android.common.androidx.compose.foundation.layout.padding +import org.ccci.gto.android.common.compose.foundation.layout.padding import org.cru.godtools.R import org.cru.godtools.ui.onboarding.OnboardingPresenter.UiEvent diff --git a/app/src/main/kotlin/org/cru/godtools/ui/onboarding/OnboardingWelcomePageLayout.kt b/app/src/main/kotlin/org/cru/godtools/ui/onboarding/OnboardingWelcomePageLayout.kt index 06de92c0d6..2783488704 100644 --- a/app/src/main/kotlin/org/cru/godtools/ui/onboarding/OnboardingWelcomePageLayout.kt +++ b/app/src/main/kotlin/org/cru/godtools/ui/onboarding/OnboardingWelcomePageLayout.kt @@ -41,7 +41,7 @@ import androidx.compose.ui.unit.dp import com.slack.circuit.overlay.LocalOverlayHost import kotlinx.coroutines.delay import kotlinx.coroutines.launch -import org.ccci.gto.android.common.androidx.compose.foundation.layout.padding +import org.ccci.gto.android.common.compose.foundation.layout.padding import org.cru.godtools.R import org.cru.godtools.tutorial.ui.youtubeplayer.YoutubePlayerOverlay import org.cru.godtools.ui.onboarding.OnboardingPresenter.UiEvent diff --git a/app/src/main/kotlin/org/cru/godtools/ui/tooldetails/ToolDetailsAbout.kt b/app/src/main/kotlin/org/cru/godtools/ui/tooldetails/ToolDetailsAbout.kt index 0eef27cc88..69a67de264 100644 --- a/app/src/main/kotlin/org/cru/godtools/ui/tooldetails/ToolDetailsAbout.kt +++ b/app/src/main/kotlin/org/cru/godtools/ui/tooldetails/ToolDetailsAbout.kt @@ -11,6 +11,7 @@ import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Add import androidx.compose.material.icons.filled.Remove @@ -38,7 +39,6 @@ import androidx.compose.ui.text.LinkAnnotation import androidx.compose.ui.text.LinkInteractionListener import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp -import org.ccci.gto.android.common.androidx.compose.foundation.layout.padding import org.ccci.gto.android.common.androidx.compose.material3.ui.text.addLinks import org.cru.godtools.R import org.cru.godtools.analytics.model.ExitLinkActionEvent diff --git a/app/src/main/kotlin/org/cru/godtools/ui/tooldetails/ToolDetailsLayout.kt b/app/src/main/kotlin/org/cru/godtools/ui/tooldetails/ToolDetailsLayout.kt index a502eef33e..7f7f80e32a 100644 --- a/app/src/main/kotlin/org/cru/godtools/ui/tooldetails/ToolDetailsLayout.kt +++ b/app/src/main/kotlin/org/cru/godtools/ui/tooldetails/ToolDetailsLayout.kt @@ -61,8 +61,8 @@ import com.slack.circuit.codegen.annotations.CircuitInject import com.slack.circuitx.effects.LaunchedImpressionEffect import dagger.hilt.components.SingletonComponent import kotlinx.coroutines.launch -import org.ccci.gto.android.common.androidx.compose.foundation.layout.padding import org.ccci.gto.android.common.androidx.compose.material3.ui.tabs.pagerTabIndicatorOffset +import org.ccci.gto.android.common.compose.foundation.layout.padding import org.cru.godtools.R import org.cru.godtools.analytics.compose.RecordAnalyticsScreen import org.cru.godtools.base.ui.theme.GodToolsTheme diff --git a/app/src/main/kotlin/org/cru/godtools/ui/tools/FavoriteAction.kt b/app/src/main/kotlin/org/cru/godtools/ui/tools/FavoriteAction.kt index 0ae6572745..aa3beffaf2 100644 --- a/app/src/main/kotlin/org/cru/godtools/ui/tools/FavoriteAction.kt +++ b/app/src/main/kotlin/org/cru/godtools/ui/tools/FavoriteAction.kt @@ -21,7 +21,7 @@ import androidx.compose.ui.platform.testTag import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import org.ccci.gto.android.common.androidx.compose.foundation.layout.padding +import org.ccci.gto.android.common.compose.foundation.layout.padding import org.cru.godtools.R import org.cru.godtools.model.getName diff --git a/library/db/src/main/kotlin/org/keynote/godtools/android/db/TranslationFileMapper.kt b/library/db/src/main/kotlin/org/keynote/godtools/android/db/TranslationFileMapper.kt index 13aa27cfcc..c6d56c5c68 100644 --- a/library/db/src/main/kotlin/org/keynote/godtools/android/db/TranslationFileMapper.kt +++ b/library/db/src/main/kotlin/org/keynote/godtools/android/db/TranslationFileMapper.kt @@ -6,12 +6,12 @@ import org.ccci.gto.android.common.db.AbstractMapper import org.ccci.gto.android.common.util.database.getLong import org.ccci.gto.android.common.util.database.getString import org.cru.godtools.model.Base -import org.cru.godtools.model.TranslationFile +import org.cru.godtools.model.DownloadedTranslationFile import org.keynote.godtools.android.db.Contract.TranslationFileTable.COLUMN_FILE import org.keynote.godtools.android.db.Contract.TranslationFileTable.COLUMN_TRANSLATION -internal object TranslationFileMapper : AbstractMapper() { - override fun mapField(values: ContentValues, field: String, file: TranslationFile) { +internal object TranslationFileMapper : AbstractMapper() { + override fun mapField(values: ContentValues, field: String, file: DownloadedTranslationFile) { when (field) { COLUMN_TRANSLATION -> values.put(field, file.translationId) COLUMN_FILE -> values.put(field, file.filename) @@ -19,7 +19,7 @@ internal object TranslationFileMapper : AbstractMapper() { } } - override fun newObject(c: Cursor) = TranslationFile( + override fun newObject(c: Cursor) = DownloadedTranslationFile( translationId = c.getLong(COLUMN_TRANSLATION, Base.INVALID_ID), filename = c.getString(COLUMN_FILE).orEmpty() ) diff --git a/library/model/src/main/kotlin/org/cru/godtools/model/DownloadedTranslationFile.kt b/library/model/src/main/kotlin/org/cru/godtools/model/DownloadedTranslationFile.kt index 38a588d96c..5e1ef236ab 100644 --- a/library/model/src/main/kotlin/org/cru/godtools/model/DownloadedTranslationFile.kt +++ b/library/model/src/main/kotlin/org/cru/godtools/model/DownloadedTranslationFile.kt @@ -3,9 +3,3 @@ package org.cru.godtools.model data class DownloadedTranslationFile(val translationId: Long, val filename: String) { constructor(translation: Translation, filename: String) : this(translation.id, filename) } - -@Deprecated( - "Use DownloadedTranslationFile instead.", - ReplaceWith("DownloadedTranslationFile", "org.cru.godtools.model.DownloadedTranslationFile") -) -typealias TranslationFile = DownloadedTranslationFile diff --git a/library/model/src/main/kotlin/org/cru/godtools/model/Language.kt b/library/model/src/main/kotlin/org/cru/godtools/model/Language.kt index b6b0e604c5..20cac95408 100644 --- a/library/model/src/main/kotlin/org/cru/godtools/model/Language.kt +++ b/library/model/src/main/kotlin/org/cru/godtools/model/Language.kt @@ -34,7 +34,7 @@ data class Language( val JSONAPI_FIELDS = arrayOf(JSON_CODE, JSON_NAME, JSON_FORCE_LANGUAGE_NAME) - val INVALID_CODE = Locale("x", "inv") + val INVALID_CODE = Locale.forLanguageTag("x-inv") fun displayNameComparator(context: Context, displayLocale: Locale = context.appLanguage): Comparator = compareBy(displayLocale.getPrimaryCollator()) { it.getDisplayName(context, displayLocale) } diff --git a/ui/base-tool/src/main/kotlin/org/cru/godtools/base/tool/analytics/model/ShareShareableAnalyticsActionEvent.kt b/ui/base-tool/src/main/kotlin/org/cru/godtools/base/tool/analytics/model/ShareShareableAnalyticsActionEvent.kt index 2d1c8d30ab..8db5823fb3 100644 --- a/ui/base-tool/src/main/kotlin/org/cru/godtools/base/tool/analytics/model/ShareShareableAnalyticsActionEvent.kt +++ b/ui/base-tool/src/main/kotlin/org/cru/godtools/base/tool/analytics/model/ShareShareableAnalyticsActionEvent.kt @@ -25,6 +25,5 @@ class ShareShareableAnalyticsActionEvent(private val shareable: Shareable) : override val userCounterName = when (shareable) { is ShareableImage -> UserCounterNames.IMAGE_SHARED - else -> null } } diff --git a/ui/base-tool/src/main/kotlin/org/cru/godtools/base/tool/ui/controller/BaseController.kt b/ui/base-tool/src/main/kotlin/org/cru/godtools/base/tool/ui/controller/BaseController.kt index 8aed67fe44..a258994def 100644 --- a/ui/base-tool/src/main/kotlin/org/cru/godtools/base/tool/ui/controller/BaseController.kt +++ b/ui/base-tool/src/main/kotlin/org/cru/godtools/base/tool/ui/controller/BaseController.kt @@ -69,12 +69,12 @@ abstract class BaseController protected constructor( protected fun triggerAnalyticsEvents(events: List?) = events.orEmpty().mapNotNull { sendAnalyticsEvent(it) } - private fun sendAnalyticsEvent(event: AnalyticsEvent) = lifecycleOwner?.lifecycleScope?.launch { + private fun sendAnalyticsEvent(event: AnalyticsEvent) = lifecycleOwner.lifecycleScope.launch { if (event.delay > 0) delay(event.delay * 1000L) if (!event.shouldTrigger(toolState)) return@launch eventBus.post(ContentAnalyticsEventAnalyticsActionEvent(event, model?.manifest)) event.recordTriggered(toolState) - }?.takeUnless { it.isCompleted } + }.takeUnless { it.isCompleted } protected fun List.cancelPendingAnalyticsEvents() = forEach { it.cancel() } // endregion AnalyticsEvents diff --git a/ui/base-tool/src/main/kotlin/org/cru/godtools/base/tool/ui/util/InputUtils.kt b/ui/base-tool/src/main/kotlin/org/cru/godtools/base/tool/ui/util/InputUtils.kt deleted file mode 100644 index 5291e8d737..0000000000 --- a/ui/base-tool/src/main/kotlin/org/cru/godtools/base/tool/ui/util/InputUtils.kt +++ /dev/null @@ -1,25 +0,0 @@ -package org.cru.godtools.base.tool.ui.util - -import android.content.Context -import androidx.annotation.StringRes -import java.util.Locale -import org.ccci.gto.android.common.base.Constants.INVALID_STRING_RES -import org.ccci.gto.android.common.util.content.getString -import org.cru.godtools.shared.tool.parser.model.Input -import org.cru.godtools.tool.R - -// TODO: formatArgs doesn't provide good encapsulation. -// The caller needs to know what formatArgs the strings being used internally require. -// This might be a good usage for tool state once that concept is implemented -fun Input.Error?.getMessage(context: Context, locale: Locale?, vararg formatArgs: Any?) = when (this) { - is Input.Error.InvalidEmail, is Input.Error.Required -> context.getString(locale, msgId, *formatArgs) - null -> null - else -> "" -} - -@get:StringRes -private val Input.Error.msgId get() = when (this) { - is Input.Error.Required -> R.string.tract_content_input_error_required - is Input.Error.InvalidEmail -> R.string.tract_content_input_error_invalid_email - else -> INVALID_STRING_RES -} diff --git a/ui/cyoa-renderer/src/main/kotlin/org/cru/godtools/tool/cyoa/ui/controller/PageCollectionPageController.kt b/ui/cyoa-renderer/src/main/kotlin/org/cru/godtools/tool/cyoa/ui/controller/PageCollectionPageController.kt index 8879a4b4ef..ecd15cec20 100644 --- a/ui/cyoa-renderer/src/main/kotlin/org/cru/godtools/tool/cyoa/ui/controller/PageCollectionPageController.kt +++ b/ui/cyoa-renderer/src/main/kotlin/org/cru/godtools/tool/cyoa/ui/controller/PageCollectionPageController.kt @@ -120,8 +120,10 @@ class PageCollectionPageController @AssistedInject constructor( override fun onCreateViewDataBinding(parent: ViewGroup, viewType: Int): ViewDataBinding = DataBindingUtil.inflate(LayoutInflater.from(parent.context), viewType, parent, false) .also { - it.lifecycleOwner = this@PageCollectionPageController.lifecycleOwner - ?.let { ConstrainedStateLifecycleOwner(it, Lifecycle.State.CREATED) } + it.lifecycleOwner = ConstrainedStateLifecycleOwner( + this@PageCollectionPageController.lifecycleOwner, + Lifecycle.State.CREATED + ) when (it) { is CyoaPageContentBinding -> it.bindController( diff --git a/ui/tutorial-renderer/src/main/kotlin/org/cru/godtools/tutorial/layout/features/TutorialFeaturesLayout.kt b/ui/tutorial-renderer/src/main/kotlin/org/cru/godtools/tutorial/layout/features/TutorialFeaturesLayout.kt index 8c21c0e805..84e0d5cd0c 100644 --- a/ui/tutorial-renderer/src/main/kotlin/org/cru/godtools/tutorial/layout/features/TutorialFeaturesLayout.kt +++ b/ui/tutorial-renderer/src/main/kotlin/org/cru/godtools/tutorial/layout/features/TutorialFeaturesLayout.kt @@ -18,8 +18,8 @@ import androidx.compose.ui.unit.dp import androidx.constraintlayout.compose.ChainStyle import androidx.constraintlayout.compose.ConstraintLayout import androidx.constraintlayout.compose.ConstraintLayoutScope -import org.ccci.gto.android.common.androidx.compose.foundation.layout.padding import org.ccci.gto.android.common.androidx.compose.foundation.text.minLinesHeight +import org.ccci.gto.android.common.compose.foundation.layout.padding import org.cru.godtools.tutorial.Page import org.cru.godtools.tutorial.layout.TUTORIAL_PAGE_HORIZONTAL_MARGIN import org.cru.godtools.tutorial.layout.TutorialMedia diff --git a/ui/tutorial-renderer/src/main/kotlin/org/cru/godtools/tutorial/layout/liveshare/TutorialLiveShareLayout.kt b/ui/tutorial-renderer/src/main/kotlin/org/cru/godtools/tutorial/layout/liveshare/TutorialLiveShareLayout.kt index 5e6799d1d1..03ace40712 100644 --- a/ui/tutorial-renderer/src/main/kotlin/org/cru/godtools/tutorial/layout/liveshare/TutorialLiveShareLayout.kt +++ b/ui/tutorial-renderer/src/main/kotlin/org/cru/godtools/tutorial/layout/liveshare/TutorialLiveShareLayout.kt @@ -18,8 +18,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import org.ccci.gto.android.common.androidx.compose.foundation.layout.padding import org.ccci.gto.android.common.androidx.compose.ui.text.computeHeightForDefaultText +import org.ccci.gto.android.common.compose.foundation.layout.padding import org.cru.godtools.tutorial.Page import org.cru.godtools.tutorial.R import org.cru.godtools.tutorial.layout.TUTORIAL_PAGE_HORIZONTAL_MARGIN