Skip to content

Commit b881a1d

Browse files
feat: according designer feedback
1 parent abaa25a commit b881a1d

File tree

5 files changed

+12
-20
lines changed

5 files changed

+12
-20
lines changed

app/src/main/java/org/openedx/app/MainFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ class MainFragment : Fragment(R.layout.fragment_main) {
106106
add(R.id.fragmentDownloads to { DownloadsFragment() })
107107
}
108108
if (viewModel.isDatesFragmentEnabled) {
109-
add(R.id.fragmentDates to DatesFragment())
109+
add(R.id.fragmentDates to { DatesFragment() })
110110
}
111111
add(R.id.fragmentProfile to { ProfileFragment() })
112112
}

app/src/main/java/org/openedx/app/room/AppDatabase.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import org.openedx.discovery.data.converter.DiscoveryConverter
2525
import org.openedx.discovery.data.model.room.CourseEntity
2626
import org.openedx.discovery.data.storage.DiscoveryDao
2727

28-
const val DATABASE_VERSION = 5
28+
const val DATABASE_VERSION = 6
2929
const val DATABASE_NAME = "OpenEdX_db"
3030

3131
@Suppress("MagicNumber")
@@ -42,14 +42,14 @@ const val DATABASE_NAME = "OpenEdX_db"
4242
CourseEnrollmentDetailsEntity::class,
4343
CourseDateEntity::class,
4444
VideoProgressEntity::class,
45-
CourseDatesResponseEntity::class,
4645
CourseProgressEntity::class,
4746
],
4847
autoMigrations = [
4948
AutoMigration(1, 2),
5049
AutoMigration(2, 3),
5150
AutoMigration(3, 4),
52-
AutoMigration(4, DATABASE_VERSION),
51+
AutoMigration(4, 5),
52+
AutoMigration(5, DATABASE_VERSION),
5353
],
5454
version = DATABASE_VERSION
5555
)

course/src/main/java/org/openedx/course/data/storage/CourseConverter.kt

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import androidx.room.TypeConverter
44
import com.google.common.reflect.TypeToken
55
import com.google.gson.Gson
66
import org.openedx.core.data.model.room.BlockDb
7-
import org.openedx.core.data.model.room.CourseDateDB
87
import org.openedx.core.data.model.room.GradingPolicyDb
98
import org.openedx.core.data.model.room.SectionScoreDb
109
import org.openedx.core.data.model.room.discovery.CourseDateBlockDb
@@ -84,16 +83,4 @@ class CourseConverter {
8483
@TypeConverter
8584
fun toGradeRangeMap(value: String): Map<String, Float> =
8685
Gson().fromJson(value, object : TypeToken<Map<String, Float>>() {}.type)
87-
88-
@TypeConverter
89-
fun fromListOfCourseDateDB(value: List<CourseDateDB>): String {
90-
val json = Gson().toJson(value)
91-
return json.toString()
92-
}
93-
94-
@TypeConverter
95-
fun toListOfCourseDateDB(value: String): List<CourseDateDB> {
96-
val type = genericType<List<CourseDateDB>>()
97-
return Gson().fromJson(value, type)
98-
}
9986
}

course/src/main/java/org/openedx/course/presentation/dates/CourseDatesScreen.kt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,27 @@ import androidx.compose.foundation.clickable
1515
import androidx.compose.foundation.layout.Arrangement
1616
import androidx.compose.foundation.layout.Box
1717
import androidx.compose.foundation.layout.Column
18+
import androidx.compose.foundation.layout.IntrinsicSize
1819
import androidx.compose.foundation.layout.PaddingValues
1920
import androidx.compose.foundation.layout.Row
2021
import androidx.compose.foundation.layout.Spacer
22+
import androidx.compose.foundation.layout.fillMaxHeight
2123
import androidx.compose.foundation.layout.fillMaxSize
2224
import androidx.compose.foundation.layout.fillMaxWidth
2325
import androidx.compose.foundation.layout.height
2426
import androidx.compose.foundation.layout.padding
2527
import androidx.compose.foundation.layout.size
2628
import androidx.compose.foundation.layout.width
2729
import androidx.compose.foundation.layout.widthIn
30+
import androidx.compose.foundation.layout.wrapContentHeight
2831
import androidx.compose.foundation.lazy.LazyColumn
2932
import androidx.compose.material.Icon
3033
import androidx.compose.material.MaterialTheme
3134
import androidx.compose.material.Scaffold
3235
import androidx.compose.material.Surface
3336
import androidx.compose.material.Text
3437
import androidx.compose.material.icons.Icons
38+
import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight
3539
import androidx.compose.material.icons.filled.KeyboardArrowUp
3640
import androidx.compose.material.rememberScaffoldState
3741
import androidx.compose.runtime.Composable
@@ -47,8 +51,10 @@ import androidx.compose.ui.draw.clip
4751
import androidx.compose.ui.draw.rotate
4852
import androidx.compose.ui.graphics.Color
4953
import androidx.compose.ui.platform.LocalContext
54+
import androidx.compose.ui.res.painterResource
5055
import androidx.compose.ui.res.pluralStringResource
5156
import androidx.compose.ui.res.stringResource
57+
import androidx.compose.ui.text.style.TextOverflow
5258
import androidx.compose.ui.tooling.preview.Devices
5359
import androidx.compose.ui.tooling.preview.Preview
5460
import androidx.compose.ui.unit.Dp
@@ -58,7 +64,6 @@ import org.openedx.core.NoContentScreenType
5864
import org.openedx.core.domain.model.CourseDateBlock
5965
import org.openedx.core.domain.model.DatesSection
6066
import org.openedx.core.presentation.CoreAnalyticsScreen
61-
import org.openedx.core.presentation.course.CourseViewMode
6267
import org.openedx.core.presentation.dates.CourseDateBlockSection
6368
import org.openedx.core.presentation.dialog.alert.ActionDialogFragment
6469
import org.openedx.core.presentation.settings.calendarsync.CalendarSyncState

dates/src/main/java/org/openedx/dates/presentation/dates/DatesScreen.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,8 @@ fun DatesScreen(
134134
LazyColumn(
135135
modifier = contentWidth.fillMaxSize(),
136136
state = scrollState,
137-
contentPadding = PaddingValues(bottom = 48.dp)
137+
contentPadding = PaddingValues(bottom = 48.dp, top = 24.dp),
138+
verticalArrangement = Arrangement.spacedBy(16.dp)
138139
) {
139140
uiState.dates.keys.forEach { sectionKey ->
140141
val dates = uiState.dates[sectionKey].orEmpty()
@@ -144,7 +145,6 @@ fun DatesScreen(
144145
if (isHavePastRelatedDates) {
145146
item {
146147
ShiftDueDatesCard(
147-
modifier = Modifier.padding(top = 12.dp),
148148
isButtonEnabled = !uiState.isShiftDueDatesPressed,
149149
onClick = {
150150
onAction(DatesViewActions.ShiftDueDate)

0 commit comments

Comments
 (0)