Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix part of #5344: Add coming soon topic list UI & fix recommendation logic tests #5460

Merged
merged 10 commits into from
Jul 24, 2024
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import androidx.fragment.app.Fragment
import androidx.lifecycle.Observer
import org.oppia.android.R
import org.oppia.android.app.classroom.classroomlist.ClassroomList
import org.oppia.android.app.classroom.promotedlist.ComingSoonTopicList
import org.oppia.android.app.classroom.promotedlist.PromotedStoryList
import org.oppia.android.app.classroom.topiclist.AllTopicsHeaderText
import org.oppia.android.app.classroom.topiclist.TopicCard
Expand All @@ -38,6 +39,7 @@ import org.oppia.android.app.home.HomeItemViewModel
import org.oppia.android.app.home.RouteToTopicPlayStoryListener
import org.oppia.android.app.home.WelcomeViewModel
import org.oppia.android.app.home.classroomlist.ClassroomSummaryViewModel
import org.oppia.android.app.home.promotedlist.ComingSoonTopicListViewModel
import org.oppia.android.app.home.promotedlist.PromotedStoryListViewModel
import org.oppia.android.app.home.topiclist.AllTopicsViewModel
import org.oppia.android.app.home.topiclist.TopicSummaryViewModel
Expand Down Expand Up @@ -213,6 +215,14 @@ class ClassroomListFragmentPresenter @Inject constructor(
)
}
}
ComingSoonTopicListViewModel::class -> items.forEach { item ->
item {
ComingSoonTopicList(
comingSoonTopicListViewModel = item as ComingSoonTopicListViewModel,
machineLocale = machineLocale,
)
}
}
ClassroomSummaryViewModel::class -> stickyHeader {
ClassroomList(
classroomSummaryList = items.map { it as ClassroomSummaryViewModel },
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,181 @@
package org.oppia.android.app.classroom.promotedlist

import androidx.compose.foundation.Image
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.aspectRatio
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.lazy.LazyRow
import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.Card
import androidx.compose.material.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.testTag
import androidx.compose.ui.res.colorResource
import androidx.compose.ui.res.dimensionResource
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import org.oppia.android.R
import org.oppia.android.app.classroom.getDrawableResource
import org.oppia.android.app.home.promotedlist.ComingSoonTopicListViewModel
import org.oppia.android.app.home.promotedlist.ComingSoonTopicsViewModel
import org.oppia.android.util.locale.OppiaLocale

/** Test tag for the header of the promoted story list. */
const val COMING_SOON_TOPIC_LIST_HEADER_TEST_TAG = "TEST_TAG.coming_soon_topic_list_header"

/** Test tag for the promoted story list. */
const val COMING_SOON_TOPIC_LIST_TEST_TAG = "TEST_TAG.coming_soon_topic_list"

/** Displays a list of coming soon topics. */
adhiamboperes marked this conversation as resolved.
Show resolved Hide resolved
@Composable
fun ComingSoonTopicList(
comingSoonTopicListViewModel: ComingSoonTopicListViewModel,
machineLocale: OppiaLocale.MachineLocale,
) {
Text(
text = stringResource(id = R.string.coming_soon),
color = colorResource(id = R.color.component_color_shared_primary_text_color),
fontFamily = FontFamily.SansSerif,
fontWeight = FontWeight.Medium,
fontSize = dimensionResource(id = R.dimen.coming_soon_topic_list_header_text_size).value.sp,
modifier = Modifier
.padding(
start = dimensionResource(id = R.dimen.coming_soon_topic_list_layout_margin_start),
top = dimensionResource(id = R.dimen.coming_soon_topic_list_layout_margin_top),
end = dimensionResource(id = R.dimen.coming_soon_topic_list_layout_margin_end),
)
.testTag(COMING_SOON_TOPIC_LIST_HEADER_TEST_TAG),
)
LazyRow(
modifier = Modifier
.padding(
top = dimensionResource(id = R.dimen.coming_soon_topic_list_padding)
)
.testTag(COMING_SOON_TOPIC_LIST_TEST_TAG),
contentPadding = PaddingValues(
start = dimensionResource(id = R.dimen.coming_soon_topic_list_layout_margin_start),
end = dimensionResource(id = R.dimen.home_padding_end),
),
) {
items(comingSoonTopicListViewModel.comingSoonTopicList) {
ComingSoonTopicCard(
comingSoonTopicsViewModel = it,
machineLocale = machineLocale,
)
}
}
}

/** Displays a card with the coming soon topic summary information. */
@Composable
fun ComingSoonTopicCard(
comingSoonTopicsViewModel: ComingSoonTopicsViewModel,
machineLocale: OppiaLocale.MachineLocale,
) {
Card(
modifier = Modifier
.width(dimensionResource(id = R.dimen.coming_soon_topic_card_width))
.padding(
start = dimensionResource(id = R.dimen.coming_soon_topic_card_layout_margin_start),
end = dimensionResource(id = R.dimen.coming_soon_topic_card_layout_margin_end),
bottom = dimensionResource(id = R.dimen.coming_soon_topic_card_layout_margin_bottom),
),
elevation = dimensionResource(id = R.dimen.topic_card_elevation),
) {
Box(
contentAlignment = Alignment.TopEnd
) {
Column(
verticalArrangement = Arrangement.Center,
) {
Image(
painter = painterResource(
id = comingSoonTopicsViewModel.topicSummary.lessonThumbnail.getDrawableResource()
),
contentDescription = "Picture of a " +
"${comingSoonTopicsViewModel.topicSummary.lessonThumbnail.thumbnailGraphic.name}.",
modifier = Modifier
.aspectRatio(4f / 3f)
.background(
Color(
(
0xff000000L or
comingSoonTopicsViewModel
.topicSummary.lessonThumbnail.backgroundColorRgb.toLong()
).toInt()
)
)
)
ComingSoonTopicCardTextSection(comingSoonTopicsViewModel)
}
Text(
text = machineLocale
.run { stringResource(id = R.string.coming_soon).toMachineUpperCase() },
modifier = Modifier
.background(
color = colorResource(
id = R.color.component_color_coming_soon_rect_background_start_color
),
shape = RoundedCornerShape(topEnd = 4.dp, bottomStart = 12.dp),
)
.padding(
horizontal = dimensionResource(id = R.dimen.coming_soon_text_padding_horizontal),
vertical = dimensionResource(id = R.dimen.coming_soon_text_padding_vertical),
),
fontSize = 12.sp,
color = colorResource(id = R.color.component_color_shared_secondary_4_text_color),
fontFamily = FontFamily.SansSerif,
textAlign = TextAlign.End,
)
}
}
}

/** Displays text section of the coming soon topic card. */
adhiamboperes marked this conversation as resolved.
Show resolved Hide resolved
@Composable
fun ComingSoonTopicCardTextSection(comingSoonTopicsViewModel: ComingSoonTopicsViewModel) {
Column(
modifier = Modifier
.fillMaxWidth()
.background(
color = colorResource(
id = R.color.component_color_shared_topic_card_item_background_color
)
),
verticalArrangement = Arrangement.SpaceBetween,
) {
Text(
text = comingSoonTopicsViewModel.topicTitle,
modifier = Modifier
.fillMaxWidth()
.padding(
start = dimensionResource(id = R.dimen.coming_soon_topic_card_text_padding),
top = dimensionResource(id = R.dimen.coming_soon_topic_card_text_padding),
end = dimensionResource(id = R.dimen.coming_soon_topic_card_text_padding),
bottom = dimensionResource(id = R.dimen.coming_soon_topic_card_text_padding_bottom),
),
color = colorResource(id = R.color.component_color_shared_secondary_4_text_color),
fontFamily = FontFamily.SansSerif,
fontSize = dimensionResource(id = R.dimen.topic_list_item_text_size).value.sp,
textAlign = TextAlign.Start,
maxLines = 1,
overflow = TextOverflow.Ellipsis,
)
}
}
4 changes: 4 additions & 0 deletions app/src/main/res/values-land/dimens.xml
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,10 @@
<dimen name="coming_soon_topic_promoted_list_view_margin_top">16dp</dimen>
<dimen name="coming_soon_topic_promoted_list_view_padding_start">0dp</dimen>
<dimen name="coming_soon_topic_Promoted_list_view_padding_end">0dp</dimen>
<dimen name="coming_soon_topic_list_layout_margin_start">72dp</dimen>
<dimen name="coming_soon_topic_list_layout_margin_end">72dp</dimen>
<dimen name="coming_soon_topic_card_layout_margin_start">8dp</dimen>
<dimen name="coming_soon_topic_card_layout_margin_end">8dp</dimen>

<!-- Completed Story Item -->
<dimen name="completed_story_item_topic_container_margin_start">16dp</dimen>
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/res/values-sw600dp-land/dimens.xml
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,10 @@
<dimen name="coming_soon_topic_promoted_list_view_margin_top">20dp</dimen>
<dimen name="coming_soon_topic_promoted_list_view_padding_start">0dp</dimen>
<dimen name="coming_soon_topic_Promoted_list_view_padding_end">0dp</dimen>
<dimen name="coming_soon_topic_list_layout_margin_start">72dp</dimen>
<dimen name="coming_soon_topic_list_layout_margin_end">72dp</dimen>
<dimen name="coming_soon_topic_card_layout_margin_start">0dp</dimen>
<dimen name="coming_soon_topic_card_layout_margin_end">32dp</dimen>

<!-- Topic Practice Footer View -->
<dimen name="topic_practice_footer_view_margin_top">24dp</dimen>
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/res/values-sw600dp-port/dimens.xml
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,10 @@
<dimen name="coming_soon_topic_promoted_list_view_margin_top">12dp</dimen>
<dimen name="coming_soon_topic_promoted_list_view_padding_start">0dp</dimen>
<dimen name="coming_soon_topic_Promoted_list_view_padding_end">0dp</dimen>
<dimen name="coming_soon_topic_list_layout_margin_start">60dp</dimen>
<dimen name="coming_soon_topic_list_layout_margin_end">60dp</dimen>
<dimen name="coming_soon_topic_card_layout_margin_start">8dp</dimen>
<dimen name="coming_soon_topic_card_layout_margin_end">24dp</dimen>

<!-- Topic Practice Footer View -->
<dimen name="topic_practice_footer_view_margin_top">24dp</dimen>
Expand Down
13 changes: 13 additions & 0 deletions app/src/main/res/values/dimens.xml
Original file line number Diff line number Diff line change
Expand Up @@ -468,6 +468,19 @@
<dimen name="coming_soon_topic_promoted_list_view_margin_top">4dp</dimen>
<dimen name="coming_soon_topic_promoted_list_view_padding_start">28dp</dimen>
<dimen name="coming_soon_topic_Promoted_list_view_padding_end">28dp</dimen>
<dimen name="coming_soon_topic_list_header_text_size">18sp</dimen>
<dimen name="coming_soon_topic_list_layout_margin_start">28dp</dimen>
<dimen name="coming_soon_topic_list_layout_margin_top">24dp</dimen>
<dimen name="coming_soon_topic_list_layout_margin_end">28dp</dimen>
<dimen name="coming_soon_topic_list_padding">12dp</dimen>
<dimen name="coming_soon_topic_card_layout_margin_start">8dp</dimen>
<dimen name="coming_soon_topic_card_layout_margin_end">8dp</dimen>
<dimen name="coming_soon_topic_card_layout_margin_bottom">8dp</dimen>
<dimen name="coming_soon_topic_card_width">160dp</dimen>
<dimen name="coming_soon_topic_card_text_padding">8dp</dimen>
<dimen name="coming_soon_topic_card_text_padding_bottom">30dp</dimen>
<dimen name="coming_soon_text_padding_horizontal">6dp</dimen>
<dimen name="coming_soon_text_padding_vertical">12dp</dimen>

<!-- Topic Practice -->
<dimen name="topic_practice_footer_view_margin_top">36dp</dimen>
Expand Down
Loading
Loading