Skip to content
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.

Sign up for GitHub

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

Bugfix: Show exercise title #126

Merged
merged 1 commit into from
Nov 29, 2024
Merged

Bugfix: Show exercise title #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
160 changes: 51 additions & 109 deletions ...in/de/tum/informatics/www1/artemis/native_app/feature/exerciseview/home/ExerciseScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,28 +8,23 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.material3.FloatingActionButton
import androidx.compose.material3.Icon
import androidx.compose.material3.Scaffold
import androidx.compose.material3.Surface
import androidx.compose.material3.windowsizeclass.WindowHeightSizeClass
import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass
import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.MutableState
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.compositionLocalOf
import androidx.compose.runtime.derivedStateOf
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.platform.LocalConfiguration
import androidx.compose.ui.unit.dp
import androidx.navigation.NavController
import com.google.accompanist.web.WebViewState
import de.tum.informatics.www1.artemis.native_app.core.data.isSuccess
import de.tum.informatics.www1.artemis.native_app.core.data.orNull
import de.tum.informatics.www1.artemis.native_app.core.model.exercise.ProgrammingExercise
import de.tum.informatics.www1.artemis.native_app.core.model.exercise.latestParticipation
Expand All @@ -42,10 +37,7 @@ import de.tum.informatics.www1.artemis.native_app.feature.exerciseview.getProble
import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.content.MetisContext
import de.tum.informatics.www1.artemis.native_app.feature.metis.ui.canDisplayMetisOnDisplaySide
import kotlinx.coroutines.Deferred
import me.onebone.toolbar.CollapsingToolbarScaffold
import me.onebone.toolbar.ExperimentalToolbarApi
import me.onebone.toolbar.ScrollStrategy
import me.onebone.toolbar.rememberCollapsingToolbarScaffoldState

val LocalExerciseScreenFloatingActionButton =
compositionLocalOf { ExerciseScreenFloatingActionButtonProvider() }
Expand Down Expand Up @@ -126,59 +118,8 @@ internal fun ExerciseScreen(
metisContentRatio = METIS_RATIO
)

// Only collapse toolbar if otherwise too much of the screen would be occupied by it
val isToolbarCollapsible = windowSizeClass.heightSizeClass < WindowHeightSizeClass.Expanded

val isLongToolbar = windowSizeClass.widthSizeClass >= WindowWidthSizeClass.Medium

// Keep state when device configuration changes
val body = @Composable { modifier: Modifier ->
val onParticipateInQuizDelegate = { isPractice: Boolean ->
courseId?.let {
onParticipateInQuiz(it, isPractice)
}
}

val actions = remember(
courseId,
onViewTextExerciseParticipationScreen,
onParticipateInQuizDelegate,
onViewResult,
viewModel
) {
ExerciseActions(
onClickStartTextExercise = {
startExerciseParticipationDeferred = viewModel.startExercise()
},
onClickPracticeQuiz = { onParticipateInQuizDelegate(true) },
onClickOpenQuiz = { onParticipateInQuizDelegate(false) },
onClickStartQuiz = { onParticipateInQuizDelegate(false) },
onClickViewResult = onViewResult,
onClickOpenTextExercise = onViewTextExerciseParticipationScreen,
onClickViewQuizResults = {
courseId?.let {
onClickViewQuizResults(it)
}
}
)
}

ExerciseScreenBody(
modifier = modifier,
exerciseDataState = exerciseDataState,
displayCommunicationOnSide = displayCommunicationOnSide,
navController = navController,
metisContext = metisContext,
actions = actions,
webViewState = webViewState,
setWebView = { savedWebView = it },
webView = savedWebView,
onClickRetry = viewModel::requestReloadExercise,
serverUrl = serverUrl,
authToken = authToken
)
}

val currentExerciseScreenFloatingActionButton =
remember { ExerciseScreenFloatingActionButtonProvider() }

Expand All @@ -197,65 +138,66 @@ internal fun ExerciseScreen(
}
}

if (isToolbarCollapsible) {
val state = rememberCollapsingToolbarScaffoldState()
// On the first load, we need to expand the toolbar, as otherwise content may be hidden
var hasExecutedInitialExpand by rememberSaveable { mutableStateOf(false) }
Scaffold(
modifier = Modifier.fillMaxSize(),
topBar = {
ExerciseScreenTopAppBar(
modifier = Modifier.fillMaxWidth(),
onNavigateBack = onNavigateBack,
exerciseDataState = exerciseDataState,
onRequestReloadExercise = viewModel::requestReloadExercise
)
},
floatingActionButton = floatingActionButton
) { padding ->

LaunchedEffect(exerciseDataState, hasExecutedInitialExpand) {
if (exerciseDataState.isSuccess && !hasExecutedInitialExpand) {
state.toolbarState.expand()
hasExecutedInitialExpand = true
val onParticipateInQuizDelegate = { isPractice: Boolean ->
courseId?.let {
onParticipateInQuiz(it, isPractice)
}
}

Scaffold(
modifier = Modifier.fillMaxSize(),
floatingActionButton = floatingActionButton
) { padding ->
CollapsingToolbarScaffold(
modifier = Modifier
.fillMaxSize()
.padding(padding),
state = state,
toolbar = {
ExerciseScreenCollapsingTopBar(
modifier = Modifier.fillMaxWidth(),
state = state,
exercise = exerciseDataState,
onNavigateBack = onNavigateBack,
onRequestRefresh = viewModel::requestReloadExercise,
isLongToolbar = isLongToolbar
)
val actions = remember(
courseId,
onViewTextExerciseParticipationScreen,
onParticipateInQuizDelegate,
onViewResult,
viewModel
) {
ExerciseActions(
onClickStartTextExercise = {
startExerciseParticipationDeferred = viewModel.startExercise()
},
scrollStrategy = ScrollStrategy.ExitUntilCollapsed,
body = {
Surface(Modifier.fillMaxSize()) {
body(Modifier.fillMaxSize())
onClickPracticeQuiz = { onParticipateInQuizDelegate(true) },
onClickOpenQuiz = { onParticipateInQuizDelegate(false) },
onClickStartQuiz = { onParticipateInQuizDelegate(false) },
onClickViewResult = onViewResult,
onClickOpenTextExercise = onViewTextExerciseParticipationScreen,
onClickViewQuizResults = {
courseId?.let {
onClickViewQuizResults(it)
}
}
)
}
} else {
Scaffold(
modifier = Modifier.fillMaxSize(),
topBar = {
StaticTopAppBar(
modifier = Modifier.fillMaxWidth(),
onNavigateBack = onNavigateBack,
exerciseDataState = exerciseDataState,
isLongToolbar = isLongToolbar,
onRequestReloadExercise = viewModel::requestReloadExercise
)
},
floatingActionButton = floatingActionButton
) { padding ->
body(
Modifier
.fillMaxSize()
.padding(padding)
)
}

ExerciseScreenBody(
modifier = Modifier
.fillMaxSize()
.padding(padding),
exerciseDataState = exerciseDataState,
isLongToolbar = isLongToolbar,
displayCommunicationOnSide = displayCommunicationOnSide,
navController = navController,
metisContext = metisContext,
actions = actions,
webViewState = webViewState,
setWebView = { savedWebView = it },
webView = savedWebView,
onClickRetry = viewModel::requestReloadExercise,
serverUrl = serverUrl,
authToken = authToken
)
}
}
}
Expand Down
3 changes: 3 additions & 0 deletions ...e/tum/informatics/www1/artemis/native_app/feature/exerciseview/home/ExerciseScreenBody.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ const val METIS_RATIO = 0.3f
internal fun ExerciseScreenBody(
modifier: Modifier,
exerciseDataState: DataState<Exercise>,
isLongToolbar: Boolean,
displayCommunicationOnSide: Boolean,
navController: NavController,
metisContext: MetisContext?,
Expand All @@ -60,6 +61,7 @@ internal fun ExerciseScreenBody(
ExerciseOverviewTab(
modifier = modifier,
exercise = exercise,
isLongToolbar = isLongToolbar,
webViewState = webViewState,
setWebView = setWebView,
webView = webView,
Expand All @@ -73,6 +75,7 @@ internal fun ExerciseScreenBody(
Modifier
.fillMaxSize()
.padding(horizontal = 8.dp)
.padding(bottom = 8.dp)
)

// Commented out as we may need that code again once we display communications for exercises
Expand Down
Loading
Loading