-
Notifications
You must be signed in to change notification settings - Fork 107
[CLX-2863][Horizon] Lti tools #3249
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
4 commits
Select commit
Hold shift + click to select a range
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
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
32 changes: 32 additions & 0 deletions
32
...on/src/main/java/com/instructure/horizon/features/learn/course/CourseDetailsRepository.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,32 @@ | ||
| /* | ||
| * Copyright (C) 2025 - present Instructure, Inc. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.instructure.horizon.features.learn.course | ||
|
|
||
| import com.instructure.canvasapi2.apis.ExternalToolAPI | ||
| import com.instructure.canvasapi2.builders.RestParams | ||
| import com.instructure.canvasapi2.models.CanvasContext | ||
| import javax.inject.Inject | ||
|
|
||
| class CourseDetailsRepository @Inject constructor( | ||
| private val externalToolApi: ExternalToolAPI.ExternalToolInterface | ||
| ) { | ||
| suspend fun hasExternalTools(courseId: Long, forceNetwork: Boolean): Boolean { | ||
| return externalToolApi.getExternalToolsForCourses( | ||
| listOf(CanvasContext.emptyCourseContext(courseId).contextId), | ||
| RestParams(isForceReadFromNetwork = forceNetwork) | ||
| ).dataOrNull.orEmpty().isNotEmpty() | ||
| } | ||
| } |
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
54 changes: 54 additions & 0 deletions
54
...zon/src/main/java/com/instructure/horizon/features/learn/course/CourseDetailsViewModel.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,54 @@ | ||
| /* | ||
| * Copyright (C) 2025 - present Instructure, Inc. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.instructure.horizon.features.learn.course | ||
|
|
||
| import androidx.lifecycle.ViewModel | ||
| import androidx.lifecycle.viewModelScope | ||
| import com.instructure.canvasapi2.managers.CourseWithProgress | ||
| import dagger.hilt.android.lifecycle.HiltViewModel | ||
| import kotlinx.coroutines.flow.MutableStateFlow | ||
| import kotlinx.coroutines.flow.asStateFlow | ||
| import kotlinx.coroutines.flow.update | ||
| import kotlinx.coroutines.launch | ||
| import javax.inject.Inject | ||
|
|
||
| @HiltViewModel | ||
| class CourseDetailsViewModel @Inject constructor( | ||
| private val repository: CourseDetailsRepository | ||
| ) : ViewModel() { | ||
|
|
||
| private val _uiState = MutableStateFlow(CourseDetailsUiState()) | ||
| val state = _uiState.asStateFlow() | ||
|
|
||
| fun loadState(courseWithProgress: CourseWithProgress) { | ||
| viewModelScope.launch { | ||
| _uiState.update { | ||
| it.copy( | ||
| selectedCourse = courseWithProgress, | ||
| availableTabs = it.availableTabs.minus(CourseDetailsTab.Tools) | ||
| ) | ||
| } | ||
|
|
||
| val hasTools = repository.hasExternalTools(courseWithProgress.courseId, false) | ||
|
|
||
| _uiState.update { | ||
| it.copy( | ||
| availableTabs = if (hasTools) CourseDetailsTab.entries else it.availableTabs | ||
| ) | ||
| } | ||
| } | ||
| } | ||
| } |
33 changes: 33 additions & 0 deletions
33
.../src/main/java/com/instructure/horizon/features/learn/course/lti/CourseToolsRepository.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,33 @@ | ||
| /* | ||
| * Copyright (C) 2025 - present Instructure, Inc. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.instructure.horizon.features.learn.course.lti | ||
|
|
||
| import com.instructure.canvasapi2.apis.ExternalToolAPI | ||
| import com.instructure.canvasapi2.builders.RestParams | ||
| import com.instructure.canvasapi2.models.CanvasContext | ||
| import com.instructure.canvasapi2.models.LTITool | ||
| import javax.inject.Inject | ||
|
|
||
| class CourseToolsRepository @Inject constructor( | ||
| private val externalToolApi: ExternalToolAPI.ExternalToolInterface | ||
| ) { | ||
| suspend fun getExternalTools(courseId: Long, forceNetwork: Boolean): List<LTITool> { | ||
| return externalToolApi.getExternalToolsForCourses( | ||
| listOf(CanvasContext.emptyCourseContext(courseId).contextId), | ||
| RestParams(isForceReadFromNetwork = forceNetwork) | ||
| ).dataOrThrow | ||
| } | ||
| } |
147 changes: 147 additions & 0 deletions
147
...izon/src/main/java/com/instructure/horizon/features/learn/course/lti/CourseToolsScreen.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,147 @@ | ||
| /* | ||
| * Copyright (C) 2025 - present Instructure, Inc. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.instructure.horizon.features.learn.course.lti | ||
|
|
||
| import androidx.compose.foundation.background | ||
| import androidx.compose.foundation.clickable | ||
| import androidx.compose.foundation.layout.PaddingValues | ||
| import androidx.compose.foundation.layout.Row | ||
| import androidx.compose.foundation.layout.defaultMinSize | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.foundation.layout.size | ||
| import androidx.compose.foundation.lazy.LazyColumn | ||
| import androidx.compose.foundation.lazy.items | ||
| import androidx.compose.foundation.shape.CircleShape | ||
| import androidx.compose.material3.ExperimentalMaterial3Api | ||
| import androidx.compose.material3.Icon | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.runtime.LaunchedEffect | ||
| import androidx.compose.runtime.collectAsState | ||
| import androidx.compose.runtime.getValue | ||
| import androidx.compose.runtime.mutableStateOf | ||
| import androidx.compose.runtime.saveable.rememberSaveable | ||
| import androidx.compose.runtime.setValue | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.draw.clip | ||
| import androidx.compose.ui.layout.ContentScale | ||
| import androidx.compose.ui.platform.LocalContext | ||
| import androidx.compose.ui.res.painterResource | ||
| import androidx.compose.ui.tooling.preview.Preview | ||
| import androidx.compose.ui.unit.dp | ||
| import androidx.hilt.navigation.compose.hiltViewModel | ||
| import com.bumptech.glide.integration.compose.ExperimentalGlideComposeApi | ||
| import com.bumptech.glide.integration.compose.GlideImage | ||
| import com.instructure.horizon.R | ||
| import com.instructure.horizon.horizonui.foundation.HorizonColors | ||
| import com.instructure.horizon.horizonui.foundation.HorizonCornerRadius | ||
| import com.instructure.horizon.horizonui.foundation.HorizonElevation | ||
| import com.instructure.horizon.horizonui.foundation.HorizonSpace | ||
| import com.instructure.horizon.horizonui.foundation.HorizonTypography | ||
| import com.instructure.horizon.horizonui.foundation.SpaceSize | ||
| import com.instructure.horizon.horizonui.foundation.horizonShadow | ||
| import com.instructure.horizon.horizonui.platform.LoadingStateWrapper | ||
| import com.instructure.pandautils.utils.ThemePrefs | ||
| import com.instructure.pandautils.utils.getActivityOrNull | ||
| import com.instructure.pandautils.utils.launchCustomTab | ||
|
|
||
| @OptIn(ExperimentalMaterial3Api::class) | ||
| @Composable | ||
| fun CourseToolsScreen( | ||
| courseId: Long, | ||
| modifier: Modifier = Modifier, | ||
| viewModel: CourseToolsViewModel = hiltViewModel() | ||
| ) { | ||
| val state by viewModel.uiState.collectAsState() | ||
| var previousCourseId: Long? by rememberSaveable { mutableStateOf(null) } | ||
| LaunchedEffect(courseId) { | ||
| if (courseId != previousCourseId) { | ||
| previousCourseId = courseId | ||
| viewModel.loadState(courseId) | ||
| } | ||
| } | ||
|
|
||
| LoadingStateWrapper(state.screenState, modifier = modifier.padding(horizontal = 8.dp)) { | ||
| CourseToolsContent(state) | ||
| } | ||
| } | ||
|
|
||
| @Composable | ||
| private fun CourseToolsContent(uiState: CourseToolsUiState, modifier: Modifier = Modifier) { | ||
| LazyColumn(contentPadding = PaddingValues(top = 8.dp), modifier = modifier) { | ||
| items(uiState.ltiTools) { ltiTool -> | ||
| LtiToolItem(ltiTool) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @OptIn(ExperimentalGlideComposeApi::class) | ||
| @Composable | ||
| private fun LtiToolItem( | ||
| ltiTool: LtiToolItem, | ||
| modifier: Modifier = Modifier | ||
| ) { | ||
| val activity = LocalContext.current.getActivityOrNull() | ||
| Row( | ||
| verticalAlignment = Alignment.CenterVertically, | ||
| modifier = modifier | ||
| .padding(bottom = 16.dp, start = 8.dp, end = 8.dp) | ||
| .defaultMinSize(minHeight = 64.dp) | ||
| .horizonShadow(HorizonElevation.level4, shape = HorizonCornerRadius.level6, clip = false) | ||
| .background(HorizonColors.Surface.pageSecondary(), shape = HorizonCornerRadius.level6) | ||
| .clip(HorizonCornerRadius.level6) | ||
| .clickable { | ||
| activity?.launchCustomTab(ltiTool.url, ThemePrefs.brandColor) | ||
| } | ||
| .padding(vertical = 8.dp, horizontal = 12.dp) | ||
| ) { | ||
| GlideImage( | ||
| model = ltiTool.iconUrl, | ||
| contentDescription = ltiTool.title, | ||
| modifier = Modifier | ||
| .size(32.dp) | ||
| .clip(CircleShape), | ||
| contentScale = ContentScale.Crop | ||
| ) | ||
| HorizonSpace(SpaceSize.SPACE_8) | ||
| Text( | ||
| text = ltiTool.title, | ||
| style = HorizonTypography.p2, | ||
| modifier = Modifier.weight(1f) | ||
| ) | ||
| Icon( | ||
| painterResource(R.drawable.open_in_new), | ||
| contentDescription = null, | ||
| tint = HorizonColors.Icon.default(), | ||
| modifier = Modifier.size(20.dp) | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| @Preview | ||
| @Composable | ||
| private fun CourseToolsScreenPreview() { | ||
| CourseToolsContent( | ||
| uiState = CourseToolsUiState( | ||
| ltiTools = listOf( | ||
| LtiToolItem("Tool 1", "https://tool1.com/icon.png", "https://tool1.com/launch"), | ||
| LtiToolItem("Tool 2", "https://tool2.com/icon.png", "https://tool2.com/launch"), | ||
| LtiToolItem("Tool 3", "https://tool3.com/icon.png", "https://tool3.com/launch"), | ||
| ) | ||
| ) | ||
| ) | ||
| } | ||
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.
Uh oh!
There was an error while loading. Please reload this page.