Skip to content

Commit c6f54ea

Browse files
subhajitxyzsubhajitxyz
authored
Merge branch 'oppia:develop' into develop
2 parents d819e70 + d2db9df commit c6f54ea

File tree

9 files changed

+343
-38
lines changed

9 files changed

+343
-38
lines changed

‎app/src/main/java/org/oppia/android/app/classroom/ClassroomListFragmentPresenter.kt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import androidx.fragment.app.Fragment
3030
import androidx.lifecycle.Observer
3131
import org.oppia.android.R
3232
import org.oppia.android.app.classroom.classroomlist.ClassroomList
33+
import org.oppia.android.app.classroom.promotedlist.ComingSoonTopicList
3334
import org.oppia.android.app.classroom.promotedlist.PromotedStoryList
3435
import org.oppia.android.app.classroom.topiclist.AllTopicsHeaderText
3536
import org.oppia.android.app.classroom.topiclist.TopicCard
@@ -38,6 +39,7 @@ import org.oppia.android.app.home.HomeItemViewModel
3839
import org.oppia.android.app.home.RouteToTopicPlayStoryListener
3940
import org.oppia.android.app.home.WelcomeViewModel
4041
import org.oppia.android.app.home.classroomlist.ClassroomSummaryViewModel
42+
import org.oppia.android.app.home.promotedlist.ComingSoonTopicListViewModel
4143
import org.oppia.android.app.home.promotedlist.PromotedStoryListViewModel
4244
import org.oppia.android.app.home.topiclist.AllTopicsViewModel
4345
import org.oppia.android.app.home.topiclist.TopicSummaryViewModel
@@ -213,6 +215,14 @@ class ClassroomListFragmentPresenter @Inject constructor(
213215
)
214216
}
215217
}
218+
ComingSoonTopicListViewModel::class -> items.forEach { item ->
219+
item {
220+
ComingSoonTopicList(
221+
comingSoonTopicListViewModel = item as ComingSoonTopicListViewModel,
222+
machineLocale = machineLocale,
223+
)
224+
}
225+
}
216226
ClassroomSummaryViewModel::class -> stickyHeader {
217227
ClassroomList(
218228
classroomSummaryList = items.map { it as ClassroomSummaryViewModel },

‎app/src/main/java/org/oppia/android/app/classroom/promotedlist/ComingSoonTopicList.kt

Lines changed: 181 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,181 @@
1+
package org.oppia.android.app.classroom.promotedlist
2+
3+
import androidx.compose.foundation.Image
4+
import androidx.compose.foundation.background
5+
import androidx.compose.foundation.layout.Arrangement
6+
import androidx.compose.foundation.layout.Box
7+
import androidx.compose.foundation.layout.Column
8+
import androidx.compose.foundation.layout.PaddingValues
9+
import androidx.compose.foundation.layout.aspectRatio
10+
import androidx.compose.foundation.layout.fillMaxWidth
11+
import androidx.compose.foundation.layout.padding
12+
import androidx.compose.foundation.layout.width
13+
import androidx.compose.foundation.lazy.LazyRow
14+
import androidx.compose.foundation.lazy.items
15+
import androidx.compose.foundation.shape.RoundedCornerShape
16+
import androidx.compose.material.Card
17+
import androidx.compose.material.Text
18+
import androidx.compose.runtime.Composable
19+
import androidx.compose.ui.Alignment
20+
import androidx.compose.ui.Modifier
21+
import androidx.compose.ui.graphics.Color
22+
import androidx.compose.ui.platform.testTag
23+
import androidx.compose.ui.res.colorResource
24+
import androidx.compose.ui.res.dimensionResource
25+
import androidx.compose.ui.res.painterResource
26+
import androidx.compose.ui.res.stringResource
27+
import androidx.compose.ui.text.font.FontFamily
28+
import androidx.compose.ui.text.font.FontWeight
29+
import androidx.compose.ui.text.style.TextAlign
30+
import androidx.compose.ui.text.style.TextOverflow
31+
import androidx.compose.ui.unit.dp
32+
import androidx.compose.ui.unit.sp
33+
import org.oppia.android.R
34+
import org.oppia.android.app.classroom.getDrawableResource
35+
import org.oppia.android.app.home.promotedlist.ComingSoonTopicListViewModel
36+
import org.oppia.android.app.home.promotedlist.ComingSoonTopicsViewModel
37+
import org.oppia.android.util.locale.OppiaLocale
38+
39+
/** Test tag for the header of the promoted story list. */
40+
const val COMING_SOON_TOPIC_LIST_HEADER_TEST_TAG = "TEST_TAG.coming_soon_topic_list_header"
41+
42+
/** Test tag for the promoted story list. */
43+
const val COMING_SOON_TOPIC_LIST_TEST_TAG = "TEST_TAG.coming_soon_topic_list"
44+
45+
/** Displays a list of topics to be published soon. */
46+
@Composable
47+
fun ComingSoonTopicList(
48+
comingSoonTopicListViewModel: ComingSoonTopicListViewModel,
49+
machineLocale: OppiaLocale.MachineLocale,
50+
) {
51+
Text(
52+
text = stringResource(id = R.string.coming_soon),
53+
color = colorResource(id = R.color.component_color_shared_primary_text_color),
54+
fontFamily = FontFamily.SansSerif,
55+
fontWeight = FontWeight.Medium,
56+
fontSize = dimensionResource(id = R.dimen.coming_soon_topic_list_header_text_size).value.sp,
57+
modifier = Modifier
58+
.padding(
59+
start = dimensionResource(id = R.dimen.coming_soon_topic_list_layout_margin_start),
60+
top = dimensionResource(id = R.dimen.coming_soon_topic_list_layout_margin_top),
61+
end = dimensionResource(id = R.dimen.coming_soon_topic_list_layout_margin_end),
62+
)
63+
.testTag(COMING_SOON_TOPIC_LIST_HEADER_TEST_TAG),
64+
)
65+
LazyRow(
66+
modifier = Modifier
67+
.padding(
68+
top = dimensionResource(id = R.dimen.coming_soon_topic_list_padding)
69+
)
70+
.testTag(COMING_SOON_TOPIC_LIST_TEST_TAG),
71+
contentPadding = PaddingValues(
72+
start = dimensionResource(id = R.dimen.coming_soon_topic_list_layout_margin_start),
73+
end = dimensionResource(id = R.dimen.home_padding_end),
74+
),
75+
) {
76+
items(comingSoonTopicListViewModel.comingSoonTopicList) {
77+
ComingSoonTopicCard(
78+
comingSoonTopicsViewModel = it,
79+
machineLocale = machineLocale,
80+
)
81+
}
82+
}
83+
}
84+
85+
/** Displays a card with the coming soon topic summary information. */
86+
@Composable
87+
fun ComingSoonTopicCard(
88+
comingSoonTopicsViewModel: ComingSoonTopicsViewModel,
89+
machineLocale: OppiaLocale.MachineLocale,
90+
) {
91+
Card(
92+
modifier = Modifier
93+
.width(dimensionResource(id = R.dimen.coming_soon_topic_card_width))
94+
.padding(
95+
start = dimensionResource(id = R.dimen.coming_soon_topic_card_layout_margin_start),
96+
end = dimensionResource(id = R.dimen.coming_soon_topic_card_layout_margin_end),
97+
bottom = dimensionResource(id = R.dimen.coming_soon_topic_card_layout_margin_bottom),
98+
),
99+
elevation = dimensionResource(id = R.dimen.topic_card_elevation),
100+
) {
101+
Box(
102+
contentAlignment = Alignment.TopEnd
103+
) {
104+
Column(
105+
verticalArrangement = Arrangement.Center,
106+
) {
107+
Image(
108+
painter = painterResource(
109+
id = comingSoonTopicsViewModel.topicSummary.lessonThumbnail.getDrawableResource()
110+
),
111+
contentDescription = "Picture of a " +
112+
"${comingSoonTopicsViewModel.topicSummary.lessonThumbnail.thumbnailGraphic.name}.",
113+
modifier = Modifier
114+
.aspectRatio(4f / 3f)
115+
.background(
116+
Color(
117+
(
118+
0xff000000L or
119+
comingSoonTopicsViewModel
120+
.topicSummary.lessonThumbnail.backgroundColorRgb.toLong()
121+
).toInt()
122+
)
123+
)
124+
)
125+
ComingSoonTopicCardTextSection(comingSoonTopicsViewModel)
126+
}
127+
Text(
128+
text = machineLocale
129+
.run { stringResource(id = R.string.coming_soon).toMachineUpperCase() },
130+
modifier = Modifier
131+
.background(
132+
color = colorResource(
133+
id = R.color.component_color_coming_soon_rect_background_start_color
134+
),
135+
shape = RoundedCornerShape(topEnd = 4.dp, bottomStart = 12.dp),
136+
)
137+
.padding(
138+
horizontal = dimensionResource(id = R.dimen.coming_soon_text_padding_horizontal),
139+
vertical = dimensionResource(id = R.dimen.coming_soon_text_padding_vertical),
140+
),
141+
fontSize = 12.sp,
142+
color = colorResource(id = R.color.component_color_shared_secondary_4_text_color),
143+
fontFamily = FontFamily.SansSerif,
144+
textAlign = TextAlign.End,
145+
)
146+
}
147+
}
148+
}
149+
150+
/** Displays the topic title. */
151+
@Composable
152+
fun ComingSoonTopicCardTextSection(comingSoonTopicsViewModel: ComingSoonTopicsViewModel) {
153+
Column(
154+
modifier = Modifier
155+
.fillMaxWidth()
156+
.background(
157+
color = colorResource(
158+
id = R.color.component_color_shared_topic_card_item_background_color
159+
)
160+
),
161+
verticalArrangement = Arrangement.SpaceBetween,
162+
) {
163+
Text(
164+
text = comingSoonTopicsViewModel.topicTitle,
165+
modifier = Modifier
166+
.fillMaxWidth()
167+
.padding(
168+
start = dimensionResource(id = R.dimen.coming_soon_topic_card_text_padding),
169+
top = dimensionResource(id = R.dimen.coming_soon_topic_card_text_padding),
170+
end = dimensionResource(id = R.dimen.coming_soon_topic_card_text_padding),
171+
bottom = dimensionResource(id = R.dimen.coming_soon_topic_card_text_padding_bottom),
172+
),
173+
color = colorResource(id = R.color.component_color_shared_secondary_4_text_color),
174+
fontFamily = FontFamily.SansSerif,
175+
fontSize = dimensionResource(id = R.dimen.topic_list_item_text_size).value.sp,
176+
textAlign = TextAlign.Start,
177+
maxLines = 1,
178+
overflow = TextOverflow.Ellipsis,
179+
)
180+
}
181+
}

‎app/src/main/java/org/oppia/android/app/classroom/promotedlist/PromotedList.kt renamed to ‎app/src/main/java/org/oppia/android/app/classroom/promotedlist/PromotedStoryList.kt

File renamed without changes.

‎app/src/main/res/values-land/dimens.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,10 @@
281281
<dimen name="coming_soon_topic_promoted_list_view_margin_top">16dp</dimen>
282282
<dimen name="coming_soon_topic_promoted_list_view_padding_start">0dp</dimen>
283283
<dimen name="coming_soon_topic_Promoted_list_view_padding_end">0dp</dimen>
284+
<dimen name="coming_soon_topic_list_layout_margin_start">72dp</dimen>
285+
<dimen name="coming_soon_topic_list_layout_margin_end">72dp</dimen>
286+
<dimen name="coming_soon_topic_card_layout_margin_start">8dp</dimen>
287+
<dimen name="coming_soon_topic_card_layout_margin_end">8dp</dimen>
284288

285289
<!-- Completed Story Item -->
286290
<dimen name="completed_story_item_topic_container_margin_start">16dp</dimen>

‎app/src/main/res/values-sw600dp-land/dimens.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,10 @@
290290
<dimen name="coming_soon_topic_promoted_list_view_margin_top">20dp</dimen>
291291
<dimen name="coming_soon_topic_promoted_list_view_padding_start">0dp</dimen>
292292
<dimen name="coming_soon_topic_Promoted_list_view_padding_end">0dp</dimen>
293+
<dimen name="coming_soon_topic_list_layout_margin_start">72dp</dimen>
294+
<dimen name="coming_soon_topic_list_layout_margin_end">72dp</dimen>
295+
<dimen name="coming_soon_topic_card_layout_margin_start">0dp</dimen>
296+
<dimen name="coming_soon_topic_card_layout_margin_end">32dp</dimen>
293297

294298
<!-- Topic Practice Footer View -->
295299
<dimen name="topic_practice_footer_view_margin_top">24dp</dimen>

‎app/src/main/res/values-sw600dp-port/dimens.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,10 @@
295295
<dimen name="coming_soon_topic_promoted_list_view_margin_top">12dp</dimen>
296296
<dimen name="coming_soon_topic_promoted_list_view_padding_start">0dp</dimen>
297297
<dimen name="coming_soon_topic_Promoted_list_view_padding_end">0dp</dimen>
298+
<dimen name="coming_soon_topic_list_layout_margin_start">60dp</dimen>
299+
<dimen name="coming_soon_topic_list_layout_margin_end">60dp</dimen>
300+
<dimen name="coming_soon_topic_card_layout_margin_start">8dp</dimen>
301+
<dimen name="coming_soon_topic_card_layout_margin_end">24dp</dimen>
298302

299303
<!-- Topic Practice Footer View -->
300304
<dimen name="topic_practice_footer_view_margin_top">24dp</dimen>

‎app/src/main/res/values/dimens.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -468,6 +468,19 @@
468468
<dimen name="coming_soon_topic_promoted_list_view_margin_top">4dp</dimen>
469469
<dimen name="coming_soon_topic_promoted_list_view_padding_start">28dp</dimen>
470470
<dimen name="coming_soon_topic_Promoted_list_view_padding_end">28dp</dimen>
471+
<dimen name="coming_soon_topic_list_header_text_size">18sp</dimen>
472+
<dimen name="coming_soon_topic_list_layout_margin_start">28dp</dimen>
473+
<dimen name="coming_soon_topic_list_layout_margin_top">24dp</dimen>
474+
<dimen name="coming_soon_topic_list_layout_margin_end">28dp</dimen>
475+
<dimen name="coming_soon_topic_list_padding">12dp</dimen>
476+
<dimen name="coming_soon_topic_card_layout_margin_start">8dp</dimen>
477+
<dimen name="coming_soon_topic_card_layout_margin_end">8dp</dimen>
478+
<dimen name="coming_soon_topic_card_layout_margin_bottom">8dp</dimen>
479+
<dimen name="coming_soon_topic_card_width">160dp</dimen>
480+
<dimen name="coming_soon_topic_card_text_padding">8dp</dimen>
481+
<dimen name="coming_soon_topic_card_text_padding_bottom">30dp</dimen>
482+
<dimen name="coming_soon_text_padding_horizontal">6dp</dimen>
483+
<dimen name="coming_soon_text_padding_vertical">12dp</dimen>
471484

472485
<!-- Topic Practice -->
473486
<dimen name="topic_practice_footer_view_margin_top">36dp</dimen>

0 commit comments

Comments
 (0)