Skip to content

Commit

Permalink
render the dashboard home UI using Circuit
Browse files Browse the repository at this point in the history
  • Loading branch information
@frett
frett committed Nov 26, 2024
1 parent fede62f commit b2ca1c8
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 160 deletions.
28 changes: 10 additions & 18 deletions app/src/main/kotlin/org/cru/godtools/ui/dashboard/DashboardLayout.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,7 @@ import org.cru.godtools.base.ui.theme.GodToolsTheme
import org.cru.godtools.model.Tool
import org.cru.godtools.shared.analytics.AnalyticsScreenNames
import org.cru.godtools.ui.dashboard.home.AllFavoritesScreen
import org.cru.godtools.ui.dashboard.home.DashboardHomeEvent
import org.cru.godtools.ui.dashboard.home.HomeContent
import org.cru.godtools.ui.dashboard.home.HomeScreen
import org.cru.godtools.ui.dashboard.lessons.DashboardLessonsEvent
import org.cru.godtools.ui.dashboard.lessons.LessonsLayout
import org.cru.godtools.ui.dashboard.tools.ToolsScreen
Expand Down Expand Up @@ -130,33 +129,23 @@ internal fun DashboardLayout(onEvent: (DashboardEvent) -> Unit, viewModel: Dashb
},
)

Page.HOME -> HomeContent(
onEvent = {
when (it) {
DashboardHomeEvent.ViewAllFavorites -> {
saveableStateHolder.removeState(Page.FAVORITE_TOOLS)
viewModel.updateCurrentPage(Page.FAVORITE_TOOLS, false)
}
DashboardHomeEvent.ViewAllTools -> viewModel.updateCurrentPage(Page.ALL_TOOLS)
is DashboardHomeEvent.OpenTool ->
onEvent(DashboardEvent.OpenTool(it.tool, it.type, it.lang1, it.lang2))
is DashboardHomeEvent.OpenToolDetails ->
onEvent(DashboardEvent.OpenToolDetails(it.tool))
}
}
)

Page.HOME,
Page.FAVORITE_TOOLS,
Page.ALL_TOOLS -> {
CircuitContent(
screen = when (page) {
Page.HOME -> HomeScreen
Page.FAVORITE_TOOLS -> AllFavoritesScreen
Page.ALL_TOOLS -> ToolsScreen
else -> error("Page $page is not converted to Circuit yet")
},
onNavEvent = {
when (it) {
is NavEvent.GoTo -> when (val screen = it.screen) {
AllFavoritesScreen -> {
saveableStateHolder.removeState(Page.FAVORITE_TOOLS)
viewModel.updateCurrentPage(Page.FAVORITE_TOOLS, false)
}
is IntentScreen -> onEvent(DashboardEvent.OpenIntent(screen.intent))
is ToolDetailsScreen -> onEvent(
DashboardEvent.OpenToolDetails(
Expand All @@ -165,6 +154,9 @@ internal fun DashboardLayout(onEvent: (DashboardEvent) -> Unit, viewModel: Dashb
)
)
}
is NavEvent.ResetRoot -> when (it.newRoot) {
ToolsScreen -> viewModel.updateCurrentPage(Page.ALL_TOOLS)
}
else -> Unit
}
},
Expand Down
100 changes: 3 additions & 97 deletions app/src/main/kotlin/org/cru/godtools/ui/dashboard/home/HomeLayout.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,121 +21,27 @@ import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.runtime.key
import androidx.compose.runtime.rememberUpdatedState
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.RectangleShape
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import androidx.lifecycle.viewmodel.compose.viewModel
import java.util.Locale
import org.cru.godtools.BuildConfig
import com.slack.circuit.codegen.annotations.CircuitInject
import dagger.hilt.components.SingletonComponent
import org.cru.godtools.R
import org.cru.godtools.analytics.model.OpenAnalyticsActionEvent.Companion.ACTION_OPEN_LESSON
import org.cru.godtools.analytics.model.OpenAnalyticsActionEvent.Companion.ACTION_OPEN_TOOL
import org.cru.godtools.analytics.model.OpenAnalyticsActionEvent.Companion.ACTION_OPEN_TOOL_DETAILS
import org.cru.godtools.analytics.model.OpenAnalyticsActionEvent.Companion.SOURCE_FAVORITE
import org.cru.godtools.analytics.model.OpenAnalyticsActionEvent.Companion.SOURCE_FEATURED
import org.cru.godtools.model.Tool
import org.cru.godtools.ui.banner.Banners
import org.cru.godtools.ui.dashboard.home.HomeScreen.UiEvent
import org.cru.godtools.ui.dashboard.home.HomeScreen.UiState
import org.cru.godtools.ui.tools.LessonToolCard
import org.cru.godtools.ui.tools.SquareToolCard
import org.cru.godtools.ui.tools.ToolCard
import org.cru.godtools.ui.tools.ToolCardEvent
import org.cru.godtools.ui.tools.toolViewModels

private val PADDING_HORIZONTAL = 16.dp

internal sealed interface DashboardHomeEvent {
open class OpenTool(val tool: String?, val type: Tool.Type?, val lang1: Locale?, val lang2: Locale? = null) :
DashboardHomeEvent {
constructor(event: ToolCardEvent) : this(event.tool, event.toolType, event.lang1, event.lang2)
}
open class OpenToolDetails(val tool: String?) : DashboardHomeEvent {
constructor(event: ToolCardEvent.OpenToolDetails) : this(event.tool)
}
class OpenLesson(event: ToolCardEvent) : OpenTool(event.tool, Tool.Type.LESSON, event.lang1)
data object ViewAllFavorites : DashboardHomeEvent
data object ViewAllTools : DashboardHomeEvent
}

@Composable
internal fun HomeContent(onEvent: (DashboardHomeEvent) -> Unit, viewModel: HomeViewModel = viewModel()) {
val favoriteTools by viewModel.favoriteTools.collectAsState()

val state = UiState(
banner = viewModel.banner.collectAsState().value,
spotlightLessons = viewModel.spotlightLessons.collectAsState().value.mapNotNull { lesson ->
key(lesson) {
lateinit var lessonState: ToolCard.State
lessonState = toolViewModels[lesson.code ?: return@mapNotNull null, lesson].toState {
when (it) {
ToolCard.Event.Click -> {
viewModel.recordOpenClickInAnalytics(ACTION_OPEN_LESSON, lesson.code, SOURCE_FEATURED)
onEvent(
DashboardHomeEvent.OpenLesson(
ToolCardEvent.Click(
lessonState.tool?.code,
lessonState.tool?.type,
lessonState.translation?.languageCode
)
)
)
}

else -> if (BuildConfig.DEBUG) error("$it is currently unsupported for Lesson Cards")
}
}
lessonState
}
},
favoriteTools = favoriteTools.orEmpty().take(5).mapNotNull { tool ->
key(tool.code) {
val toolViewModel = toolViewModels[tool.code ?: return@mapNotNull null, tool]
lateinit var toolState: ToolCard.State
toolState = toolViewModel.toState {
when (it) {
ToolCard.Event.Click, ToolCard.Event.OpenTool -> {
viewModel.recordOpenClickInAnalytics(ACTION_OPEN_TOOL, tool.code, SOURCE_FAVORITE)
onEvent(
DashboardHomeEvent.OpenTool(
ToolCardEvent.Click(
tool = tool.code,
type = tool.type,
lang1 = toolState.translation?.languageCode,
)
)
)
}
ToolCard.Event.OpenToolDetails -> {
viewModel.recordOpenClickInAnalytics(ACTION_OPEN_TOOL_DETAILS, tool.code, SOURCE_FAVORITE)
onEvent(DashboardHomeEvent.OpenToolDetails(tool.code))
}
ToolCard.Event.PinTool -> toolViewModel.pinTool()
ToolCard.Event.UnpinTool -> toolViewModel.unpinTool()
}
}
toolState
}
},
favoriteToolsLoaded = favoriteTools != null,
) {
when (it) {
UiEvent.ViewAllFavorites -> onEvent(DashboardHomeEvent.ViewAllFavorites)
UiEvent.ViewAllTools -> onEvent(DashboardHomeEvent.ViewAllTools)
}
}

HomeLayout(state)
}

@Composable
@CircuitInject(HomeScreen::class, SingletonComponent::class)
internal fun HomeLayout(state: UiState, modifier: Modifier = Modifier) {
val banner by rememberUpdatedState(state.banner)
val favoriteToolsLoaded by rememberUpdatedState(state.favoriteToolsLoaded)
Expand Down
45 changes: 0 additions & 45 deletions app/src/main/kotlin/org/cru/godtools/ui/dashboard/home/HomeViewModel.kt
View file

This file was deleted.

0 comments on commit b2ca1c8

Please sign in to comment.