Skip to content

Commit 3ca1c80

Browse files
[All] Fix PageView annotation visibility and URL issues
- Remove private modifier from mStudentId/mCourseId in StudentContextFragment so @get:PageViewUrlParam is accessible via reflection - Remove private modifier from moduleItemId in ModuleProgressionFragment for the same reason - Use ApiPrefs.fullDomain in EditSyllabusFragment to return a full URL instead of a relative path Co-authored-by: Akos Hermann <hermannakos@users.noreply.github.com>
1 parent 85b59c8 commit 3ca1c80

3 files changed

Lines changed: 5 additions & 4 deletions

File tree

apps/teacher/src/main/java/com/instructure/teacher/adapters/StudentContextFragment.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,9 @@ class StudentContextFragment : PresenterFragment<StudentContextPresenter, Studen
9292
private val binding by viewBinding(FragmentStudentContextBinding::bind)
9393

9494
@get:PageViewUrlParam("userId")
95-
private var mStudentId by LongArg()
95+
var mStudentId by LongArg()
9696
@get:PageViewUrlParam("courseId")
97-
private var mCourseId by LongArg()
97+
var mCourseId by LongArg()
9898

9999
private var mLaunchSubmissions by BooleanArg()
100100
private var needToForceNetwork = false

apps/teacher/src/main/java/com/instructure/teacher/features/modules/progression/ModuleProgressionFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class ModuleProgressionFragment : BaseCanvasFragment() {
5858

5959
private val canvasContext: CanvasContext by ParcelableArg(key = Const.CANVAS_CONTEXT)
6060
@get:PageViewUrlParam("moduleItemId")
61-
private val moduleItemId by LongArg(key = RouterParams.MODULE_ITEM_ID, default = -1L)
61+
val moduleItemId by LongArg(key = RouterParams.MODULE_ITEM_ID, default = -1L)
6262
private val assetType by StringArg(key = ASSET_TYPE)
6363
private val assetId by StringArg(key = ASSET_ID)
6464
private val route: Route by ParcelableArg(key = ROUTE)

apps/teacher/src/main/java/com/instructure/teacher/features/syllabus/edit/EditSyllabusFragment.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import android.os.Bundle
2222
import android.view.LayoutInflater
2323
import android.view.ViewGroup
2424
import com.instructure.canvasapi2.models.Course
25+
import com.instructure.canvasapi2.utils.ApiPrefs
2526
import com.instructure.canvasapi2.utils.pageview.PageView
2627
import com.instructure.canvasapi2.utils.pageview.PageViewUrl
2728
import com.instructure.canvasapi2.utils.pageview.PageViewUrlParam
@@ -46,7 +47,7 @@ class EditSyllabusFragment : MobiusFragment<EditSyllabusModel, EditSyllabusEvent
4647
private val summaryAllowed: Boolean by BooleanArg(key = SUMMARY_ALLOWED)
4748

4849
@PageViewUrl
49-
fun makePageViewUrl(): String = "/courses/${course.id}/syllabus/edit"
50+
fun makePageViewUrl(): String = "${ApiPrefs.fullDomain}/courses/${course.id}/syllabus/edit"
5051

5152
override fun makeEffectHandler(): EffectHandler<EditSyllabusView, EditSyllabusEvent, EditSyllabusEffect> = EditSyllabusEffectHandler()
5253

0 commit comments

Comments
 (0)