Skip to content

Commit 3fd6657

Browse files
feat: added a patch from Omer Habib
1 parent 7ef6b77 commit 3fd6657

File tree

20 files changed

+48
-39
lines changed

20 files changed

+48
-39
lines changed

app/src/main/res/layout/fragment_main.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
android:id="@+id/bottom_nav_view"
1919
android:layout_width="match_parent"
2020
android:layout_height="wrap_content"
21+
android:background="@color/background"
2122
app:itemIconTint="@color/bottom_nav_color"
2223
app:itemTextColor="@color/bottom_nav_color"
23-
android:background="@color/background"
2424
app:labelVisibilityMode="labeled"
2525
app:layout_constraintBottom_toBottomOf="parent"
2626
app:layout_constraintEnd_toEndOf="parent"

core/src/main/java/org/openedx/core/data/model/CourseAssignments.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ data class CourseAssignments(
88
@SerializedName("future_assignments")
99
val futureAssignments: List<CourseDateBlock>?,
1010
@SerializedName("past_assignments")
11-
val pastAssignments: List<CourseDateBlock>?
11+
val pastAssignments: List<CourseDateBlock>?,
1212
) {
1313
fun mapToDomain() = CourseAssignments(
1414
futureAssignments = futureAssignments?.mapNotNull {

core/src/main/java/org/openedx/core/data/model/CourseEnrollments.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ data class CourseEnrollments(
2929
override fun deserialize(
3030
json: JsonElement?,
3131
typeOfT: Type?,
32-
context: JsonDeserializationContext?
32+
context: JsonDeserializationContext?,
3333
): CourseEnrollments {
3434
val enrollments = deserializeEnrollments(json)
3535
val appConfig = deserializeAppConfig(json)

core/src/main/java/org/openedx/core/data/model/CourseStatus.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ data class CourseStatus(
1212
@SerializedName("last_visited_block_id")
1313
val lastVisitedBlockId: String?,
1414
@SerializedName("last_visited_unit_display_name")
15-
val lastVisitedUnitDisplayName: String?
15+
val lastVisitedUnitDisplayName: String?,
1616
) {
1717
fun mapToDomain() = CourseStatus(
1818
lastVisitedModuleId = lastVisitedModuleId ?: "",

core/src/main/java/org/openedx/core/data/model/Progress.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ data class Progress(
88
@SerializedName("assignments_completed")
99
val assignmentsCompleted: Int?,
1010
@SerializedName("total_assignments_count")
11-
val totalAssignmentsCount: Int?
11+
val totalAssignmentsCount: Int?,
1212
) {
1313
fun mapToDomain() = Progress(
1414
assignmentsCompleted = assignmentsCompleted ?: 0,

core/src/main/java/org/openedx/core/data/model/room/discovery/EnrolledCourseEntity.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ data class EnrolledCourseEntity(
4040
@Embedded
4141
val courseStatus: CourseStatusDb?,
4242
@Embedded
43-
val courseAssignments: CourseAssignmentsDb?
43+
val courseAssignments: CourseAssignmentsDb?,
4444
) {
4545

4646
fun mapToDomain(): EnrolledCourse {
@@ -98,7 +98,7 @@ data class EnrolledCourseDataDb(
9898
@ColumnInfo("videoOutline")
9999
val videoOutline: String,
100100
@ColumnInfo("isSelfPaced")
101-
val isSelfPaced: Boolean
101+
val isSelfPaced: Boolean,
102102
) {
103103
fun mapToDomain(): EnrolledCourseData {
104104
return EnrolledCourseData(
@@ -138,7 +138,7 @@ data class CoursewareAccessDb(
138138
@ColumnInfo("additionalContextUserMessage")
139139
val additionalContextUserMessage: String,
140140
@ColumnInfo("userFragment")
141-
val userFragment: String
141+
val userFragment: String,
142142
) {
143143

144144
fun mapToDomain(): CoursewareAccess {
@@ -156,7 +156,7 @@ data class CoursewareAccessDb(
156156

157157
data class CertificateDb(
158158
@ColumnInfo("certificateURL")
159-
val certificateURL: String?
159+
val certificateURL: String?,
160160
) {
161161
fun mapToDomain() = Certificate(certificateURL)
162162
}
@@ -165,7 +165,7 @@ data class CourseSharingUtmParametersDb(
165165
@ColumnInfo("facebook")
166166
val facebook: String,
167167
@ColumnInfo("twitter")
168-
val twitter: String
168+
val twitter: String,
169169
) {
170170
fun mapToDomain() = CourseSharingUtmParameters(
171171
facebook, twitter
@@ -204,7 +204,7 @@ data class CourseAssignmentsDb(
204204
@ColumnInfo("futureAssignments")
205205
val futureAssignments: List<CourseDateBlockDb>?,
206206
@ColumnInfo("pastAssignments")
207-
val pastAssignments: List<CourseDateBlockDb>?
207+
val pastAssignments: List<CourseDateBlockDb>?,
208208
) {
209209
fun mapToDomain() = CourseAssignments(
210210
futureAssignments = futureAssignments?.map { it.mapToDomain() },

core/src/main/java/org/openedx/core/domain/model/CourseStatus.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ data class CourseStatus(
88
val lastVisitedModuleId: String,
99
val lastVisitedModulePath: List<String>,
1010
val lastVisitedBlockId: String,
11-
val lastVisitedUnitDisplayName: String
11+
val lastVisitedUnitDisplayName: String,
1212
) : Parcelable

core/src/main/java/org/openedx/core/module/DownloadWorker.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import java.io.File
2828

2929
class DownloadWorker(
3030
val context: Context,
31-
parameters: WorkerParameters
31+
parameters: WorkerParameters,
3232
) : CoroutineWorker(context, parameters), CoroutineScope {
3333

3434
private val notificationManager =

core/src/main/java/org/openedx/core/module/TranscriptManager.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import java.nio.charset.Charset
1717
import java.util.concurrent.TimeUnit
1818

1919
class TranscriptManager(
20-
val context: Context
20+
val context: Context,
2121
) {
2222

2323
private val transcriptDownloader = object : AbstractDownloader() {
@@ -31,7 +31,9 @@ class TranscriptManager(
3131
val transcriptDir = getTranscriptDir() ?: return false
3232
val hash = Sha1Util.SHA1(url)
3333
val file = File(transcriptDir, hash)
34-
return file.exists() && System.currentTimeMillis() - file.lastModified() < TimeUnit.HOURS.toMillis(5)
34+
return file.exists() && System.currentTimeMillis() - file.lastModified() < TimeUnit.HOURS.toMillis(
35+
5
36+
)
3537
}
3638

3739
fun get(url: String): String? {

course/src/main/java/org/openedx/course/presentation/container/CourseContainerFragment.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -258,12 +258,11 @@ class CourseContainerFragment : Fragment(R.layout.fragment_course_container) {
258258
const val ARG_ENROLLMENT_MODE = "enrollmentMode"
259259
const val ARG_OPEN_TAB = "open_tab"
260260
const val ARG_RESUME_BLOCK = "resume_block"
261-
const val DEFAULT_TAB = "home"
262261
fun newInstance(
263262
courseId: String,
264263
courseTitle: String,
265264
enrollmentMode: String,
266-
openTab: String = DEFAULT_TAB,
265+
openTab: String = CourseContainerTab.HOME.name,
267266
resumeBlockId: String = ""
268267
): CourseContainerFragment {
269268
val fragment = CourseContainerFragment()
@@ -303,7 +302,7 @@ fun CourseDashboard(
303302
val refreshing by viewModel.refreshing.collectAsState(true)
304303
val courseImage by viewModel.courseImage.collectAsState()
305304
val uiMessage by viewModel.uiMessage.collectAsState(null)
306-
val openTab = bundle.getString(CourseContainerFragment.ARG_OPEN_TAB, CourseContainerFragment.DEFAULT_TAB)
305+
val openTab = bundle.getString(CourseContainerFragment.ARG_OPEN_TAB, CourseContainerTab.HOME.name)
307306
val requiredTab = when (openTab.uppercase()) {
308307
CourseContainerTab.HOME.name -> CourseContainerTab.HOME
309308
CourseContainerTab.VIDEOS.name -> CourseContainerTab.VIDEOS

0 commit comments

Comments
 (0)