forked from openedx/openedx-app-android
-
Notifications
You must be signed in to change notification settings - Fork 0
Feature prerequisite info #17
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
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
e3c01d8
implement handler for locked content due to prerequisite
yogeshbhagatcode ae99ac4
add navigation to prerequisite subsection from locked unit
yogeshbhagatcode 86e03ae
add lock icon in course outline for locked section due to prerequisite
yogeshbhagatcode 5411285
hide navigation buttons for locked units
yogeshbhagatcode 6140233
check prerequisite completion when viewing locked content
yogeshbhagatcode 2c8e5d6
fix browser redirect issue after prerequisite is locked due to incorr…
yogeshbhagatcode File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
35 changes: 35 additions & 0 deletions
35
core/src/main/java/org/openedx/core/data/model/GatedContent.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| package org.openedx.core.data.model | ||
|
|
||
| import com.google.gson.annotations.SerializedName | ||
| import org.openedx.core.data.model.room.GatedContentDb | ||
| import org.openedx.core.domain.model.GatedContent as DomainGatedContent | ||
|
|
||
| data class GatedContent( | ||
| @SerializedName("prereq_id") | ||
| val prereqId: String?, | ||
| @SerializedName("prereq_section_name") | ||
| val prereqSectionName: String?, | ||
| @SerializedName("gated") | ||
| val gated: Boolean?, | ||
| @SerializedName("gated_section_name") | ||
| val gatedSectionName: String?, | ||
| @SerializedName("prereq_url") | ||
| val prereqUrl: String? | ||
| ) { | ||
| fun mapToDomain() = DomainGatedContent( | ||
| prereqId = prereqId.orEmpty(), | ||
| prereqSectionName = prereqSectionName.orEmpty(), | ||
| gated = gated ?: false, | ||
| gatedSectionName = gatedSectionName.orEmpty(), | ||
| prereqUrl = prereqUrl.orEmpty() | ||
| ) | ||
|
|
||
| fun mapToRoomEntity() = GatedContentDb( | ||
| prereqId = prereqId, | ||
| prereqSectionName = prereqSectionName, | ||
| gated = gated, | ||
| gatedSectionName = gatedSectionName, | ||
| prereqUrl = prereqUrl | ||
| ) | ||
| } | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
14 changes: 14 additions & 0 deletions
14
core/src/main/java/org/openedx/core/domain/model/GatedContent.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| package org.openedx.core.domain.model | ||
|
|
||
| import android.os.Parcelable | ||
| import kotlinx.parcelize.Parcelize | ||
|
|
||
| @Parcelize | ||
| data class GatedContent( | ||
| val prereqId: String, | ||
| val prereqSectionName: String, | ||
| val gated: Boolean, | ||
| val gatedSectionName: String, | ||
| val prereqUrl: String | ||
| ) : Parcelable | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
163 changes: 163 additions & 0 deletions
163
course/src/main/java/org/openedx/course/presentation/unit/PrerequisiteLockedFragment.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,163 @@ | ||
| package org.openedx.course.presentation.unit | ||
|
|
||
| import android.content.res.Configuration.UI_MODE_NIGHT_NO | ||
| import android.content.res.Configuration.UI_MODE_NIGHT_YES | ||
| import android.os.Bundle | ||
| import android.view.LayoutInflater | ||
| import android.view.ViewGroup | ||
| import androidx.compose.foundation.layout.* | ||
Check warningCode scanning / detekt Detects wildcard imports Warning
Wildcard import
Check warningCode scanning / detekt Wildcard imports should be replaced with imports using fully qualified class names. Wildcard imports can lead to naming conflicts. A library update can introduce naming clashes with your classes which results in compilation errors. Warning
androidx.compose.foundation.layout.* is a wildcard import. Replace it with fully qualified imports.
|
||
| import androidx.compose.foundation.rememberScrollState | ||
| import androidx.compose.foundation.verticalScroll | ||
| import androidx.compose.material.* | ||
Check warningCode scanning / detekt Detects wildcard imports Warning
Wildcard import
Check warningCode scanning / detekt Wildcard imports should be replaced with imports using fully qualified class names. Wildcard imports can lead to naming conflicts. A library update can introduce naming clashes with your classes which results in compilation errors. Warning
androidx.compose.material.* is a wildcard import. Replace it with fully qualified imports.
|
||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.platform.ComposeView | ||
| import androidx.compose.ui.platform.ViewCompositionStrategy | ||
| import androidx.compose.ui.res.painterResource | ||
| import androidx.compose.ui.res.stringResource | ||
| import androidx.compose.ui.text.style.TextAlign | ||
| import androidx.compose.ui.tooling.preview.Preview | ||
| import androidx.compose.ui.unit.dp | ||
| import androidx.fragment.app.Fragment | ||
| import org.koin.android.ext.android.inject | ||
| import org.openedx.core.presentation.course.CourseViewMode | ||
| import org.openedx.core.ui.OpenEdXButton | ||
| import org.openedx.core.ui.theme.OpenEdXTheme | ||
| import org.openedx.core.ui.theme.appColors | ||
| import org.openedx.core.ui.theme.appTypography | ||
| import org.openedx.course.presentation.CourseRouter | ||
| import org.openedx.foundation.extension.parcelable | ||
| import org.openedx.course.R as courseR | ||
|
|
||
| class PrerequisiteLockedFragment : Fragment() { | ||
|
|
||
| private val router by inject<CourseRouter>() | ||
|
|
||
| override fun onCreateView( | ||
| inflater: LayoutInflater, | ||
| container: ViewGroup?, | ||
| savedInstanceState: Bundle? | ||
| ) = ComposeView(requireContext()).apply { | ||
| setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed) | ||
| setContent { | ||
| OpenEdXTheme { | ||
| val prereqData = arguments?.parcelable<PrerequisiteData>(ARG_PREREQUISITE_DATA) | ||
|
|
||
| PrerequisiteLockedScreen( | ||
| prereqSectionName = prereqData?.prereqSectionName ?: "", | ||
| onNavigateToPrerequisite = { | ||
| prereqData?.let { data -> | ||
| router.navigateToCourseSubsections( | ||
| fm = requireActivity().supportFragmentManager, | ||
| courseId = data.courseId, | ||
| subSectionId = data.prereqId, | ||
| unitId = "", | ||
| componentId = "", | ||
| mode = data.mode | ||
| ) | ||
| } | ||
| } | ||
| ) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| companion object { | ||
| private const val ARG_PREREQUISITE_DATA = "prerequisite_data" | ||
|
|
||
| fun newInstance( | ||
| courseId: String, | ||
| prereqId: String, | ||
| prereqSectionName: String, | ||
| mode: CourseViewMode | ||
| ): PrerequisiteLockedFragment { | ||
| val fragment = PrerequisiteLockedFragment() | ||
| fragment.arguments = Bundle().apply { | ||
| putParcelable( | ||
| ARG_PREREQUISITE_DATA, | ||
| PrerequisiteData(courseId, prereqId, prereqSectionName, mode) | ||
| ) | ||
| } | ||
| return fragment | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @kotlinx.parcelize.Parcelize | ||
| data class PrerequisiteData( | ||
| val courseId: String, | ||
| val prereqId: String, | ||
| val prereqSectionName: String, | ||
| val mode: CourseViewMode | ||
| ) : android.os.Parcelable | ||
|
|
||
| @Composable | ||
| private fun PrerequisiteLockedScreen( | ||
| prereqSectionName: String, | ||
| onNavigateToPrerequisite: () -> Unit | ||
| ) { | ||
| Surface( | ||
| modifier = Modifier.fillMaxSize(), | ||
| color = MaterialTheme.appColors.background | ||
| ) { | ||
| Column( | ||
| modifier = Modifier | ||
| .fillMaxSize() | ||
| .verticalScroll(rememberScrollState()) | ||
| .padding(horizontal = 24.dp, vertical = 32.dp), | ||
| horizontalAlignment = Alignment.CenterHorizontally, | ||
| verticalArrangement = Arrangement.Center | ||
| ) { | ||
| Icon( | ||
| painter = painterResource(id = courseR.drawable.ic_lock), | ||
| contentDescription = null, | ||
| tint = MaterialTheme.appColors.textPrimary, | ||
| modifier = Modifier.size(100.dp) | ||
| ) | ||
|
|
||
| Spacer(modifier = Modifier.height(24.dp)) | ||
|
|
||
| Text( | ||
| text = stringResource(id = courseR.string.course_content_locked), | ||
| style = MaterialTheme.appTypography.titleLarge, | ||
| color = MaterialTheme.appColors.textPrimary, | ||
| textAlign = TextAlign.Center | ||
| ) | ||
|
|
||
| Spacer(modifier = Modifier.height(16.dp)) | ||
|
|
||
| Text( | ||
| text = stringResource( | ||
| id = courseR.string.course_must_complete_prerequisite, | ||
| prereqSectionName | ||
| ), | ||
| style = MaterialTheme.appTypography.bodyMedium, | ||
| color = MaterialTheme.appColors.textPrimary, | ||
| textAlign = TextAlign.Center | ||
| ) | ||
|
|
||
| Spacer(modifier = Modifier.height(32.dp)) | ||
|
|
||
| OpenEdXButton( | ||
| text = stringResource(id = courseR.string.course_go_to_prerequisite_section), | ||
| onClick = onNavigateToPrerequisite, | ||
| modifier = Modifier | ||
| .fillMaxWidth() | ||
| .height(48.dp) | ||
| ) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Preview(uiMode = UI_MODE_NIGHT_NO) | ||
| @Preview(uiMode = UI_MODE_NIGHT_YES) | ||
| @Composable | ||
| private fun PrerequisiteLockedScreenPreview() { | ||
| OpenEdXTheme { | ||
| PrerequisiteLockedScreen( | ||
| prereqSectionName = "Introduction to Programming", | ||
| onNavigateToPrerequisite = {} | ||
| ) | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Check warning
Code scanning / detekt
Reports lines with exceeded length Warning