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.

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

Communication: Allow users to view and download sent attachments #239

Merged
merged 14 commits into from
Jan 4, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ import de.tum.informatics.www1.artemis.native_app.core.ui.LocalLinkOpener
import de.tum.informatics.www1.artemis.native_app.core.ui.LocalWindowSizeClassProvider
import de.tum.informatics.www1.artemis.native_app.core.ui.WindowSizeClassProvider
import de.tum.informatics.www1.artemis.native_app.core.ui.alert.TextAlertDialog
import de.tum.informatics.www1.artemis.native_app.core.ui.markdown.link_resolving.LocalMarkdownLinkResolver
import de.tum.informatics.www1.artemis.native_app.core.ui.remote_images.LocalArtemisImageProvider
import de.tum.informatics.www1.artemis.native_app.feature.courseregistration.courseRegistration
import de.tum.informatics.www1.artemis.native_app.feature.courseregistration.navigateToCourseRegistration
Expand Down Expand Up @@ -255,7 +256,8 @@ class MainActivity : AppCompatActivity(),
CompositionLocalProvider(
LocalWindowSizeClassProvider provides windowSizeClassProvider,
LocalLinkOpener provides linkOpener,
LocalArtemisImageProvider provides koinInject()
LocalArtemisImageProvider provides koinInject(),
LocalMarkdownLinkResolver provides koinInject()
) {
// Use jetpack compose navigation for the navigation logic.
NavHost(navController = navController, startDestination = startDestination) {
Expand Down
3 changes: 2 additions & 1 deletion core/ui/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,12 @@ dependencies {
debugApi(libs.coil.compose.core)
debugApi(libs.coil.test)
api(libs.accompanist.webview)
api(libs.noties.markwon.core)

implementation(libs.kotlinx.datetime)
implementation(libs.kotlinx.coroutines.android)
implementation(libs.androidx.browser)

implementation(libs.noties.markwon.core)
implementation(libs.noties.markwon.ext.strikethrough)
implementation(libs.noties.markwon.ext.tables)
implementation(libs.noties.markwon.html)
Expand Down
13 changes: 13 additions & 0 deletions core/ui/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<provider
android:name="androidx.core.content.FileProvider"
android:authorities="${applicationId}.fileprovider"
android:exported="false"
android:grantUriPermissions="true">
<meta-data
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/file_paths" />
</provider>
</application>
</manifest>
Original file line number Diff line number Diff line change
@@ -0,0 +1,251 @@
package de.tum.informatics.www1.artemis.native_app.core.ui.compose

import android.widget.Toast
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Download
import androidx.compose.material.icons.filled.MoreHoriz
import androidx.compose.material.icons.filled.Share
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.DropdownMenu
import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material3.FloatingActionButton
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import de.tum.informatics.www1.artemis.native_app.core.ui.R
import de.tum.informatics.www1.artemis.native_app.core.ui.pdf.PdfFile
import de.tum.informatics.www1.artemis.native_app.core.ui.pdf.render.HorizontalPdfView
import de.tum.informatics.www1.artemis.native_app.core.ui.pdf.render.VerticalPdfView
import de.tum.informatics.www1.artemis.native_app.core.ui.pdf.render.state.HorizontalPdfReaderState
import de.tum.informatics.www1.artemis.native_app.core.ui.pdf.render.state.PdfReaderState
import de.tum.informatics.www1.artemis.native_app.core.ui.pdf.render.state.VerticalPdfReaderState
import de.tum.informatics.www1.artemis.native_app.core.ui.pdf.render.state.rememberHorizontalPdfReaderState
import de.tum.informatics.www1.artemis.native_app.core.ui.pdf.render.state.rememberVerticalPdfReaderState
import java.net.UnknownHostException

@Composable
fun ArtemisPdfView(
modifier: Modifier,
pdfFile: PdfFile,
dismiss: () -> Unit
) {
julian-wls marked this conversation as resolved.
Show resolved Hide resolved
val isVertical = remember { mutableStateOf(true) }
val context = LocalContext.current

val verticalPdfState = rememberVerticalPdfReaderState(
pdfFile = pdfFile,
isZoomEnabled = true,
)
val horizontalPdfState = rememberHorizontalPdfReaderState(
pdfFile = pdfFile,
isZoomEnabled = true,
)

var pdfState = if (isVertical.value) verticalPdfState else horizontalPdfState

val showMenu = remember { mutableStateOf(false) }

if (pdfState.mError != null) {
val errorMessage = when (pdfState.mError) {
is UnknownHostException -> {
R.string.pdf_view_error_no_internet
}
else -> {
R.string.pdf_view_error_loading
}
}

Toast.makeText(
LocalContext.current,
stringResource(id = errorMessage),
Toast.LENGTH_LONG
).show()

dismiss()
}

Box(
modifier = modifier.padding(8.dp),
) {
Column {
pdfState.file?.let {
Text(
text = pdfFile.filename ?: it.name,
modifier = Modifier.padding(8.dp),
style = MaterialTheme.typography.titleMedium
)
}
if (isVertical.value) {
VerticalPdfView(
state = pdfState as VerticalPdfReaderState,
modifier = Modifier
.background(color = MaterialTheme.colorScheme.surface)
.fillMaxSize()
)
} else {
HorizontalPdfView(
state = pdfState as HorizontalPdfReaderState,
modifier = Modifier
.fillMaxSize()
.background(
color = MaterialTheme.colorScheme.surface,
shape = MaterialTheme.shapes.medium
)
)
}
}

Column(
modifier = Modifier
.align(Alignment.BottomEnd)
.padding(16.dp)
) {
if (showMenu.value) {
Spacer(modifier = Modifier.height(16.dp))
}

FloatingActionButton(
onClick = { showMenu.value = !showMenu.value },
modifier = Modifier
) {
Icon(imageVector = Icons.Default.MoreHoriz, contentDescription = null)
}

PdfActionDropDownMenu(
modifier = Modifier,
isExpanded = showMenu.value,
onDismissRequest = { showMenu.value = false },
downloadPdf = {
showMenu.value = false
pdfState.file?.let { pdfFile.downloadPdf(context) }
},
sharePdf = {
showMenu.value = false
pdfState.file?.let { pdfFile.sharePdf(context, it) }
},
toggleViewMode = {
showMenu.value = false
pdfState = if (isVertical.value) horizontalPdfState else verticalPdfState
isVertical.value = !isVertical.value
}
)
}

if (!pdfState.isLoaded) {
Box(
modifier = Modifier
.fillMaxSize(),
contentAlignment = Alignment.Center
) {
CircularProgressIndicator(
progress = { pdfState.loadPercent / 100f },
modifier = Modifier.height(48.dp),
color = MaterialTheme.colorScheme.primary
)
}
}

Box(
modifier = Modifier
.fillMaxWidth()
.align(Alignment.TopStart)
.padding(top = 54.dp, end = 4.dp)
.padding(16.dp),
contentAlignment = Alignment.TopEnd
) {
PageCountText(
modifier = Modifier,
pdfState = pdfState
)
}
}
}

@Composable
private fun PageCountText(
modifier: Modifier,
pdfState: PdfReaderState
) {
Box(
modifier = modifier
.background(
color = MaterialTheme.colorScheme.surface.copy(alpha = 0.5f),
shape = MaterialTheme.shapes.medium
)
.padding(8.dp)
) {
Text(
text = stringResource(
R.string.pdf_view_page_count,
pdfState.currentPage,
pdfState.pdfPageCount
),
style = MaterialTheme.typography.bodyMedium
)
}
}

@Composable
private fun PdfActionDropDownMenu(
modifier: Modifier,
isExpanded: Boolean,
onDismissRequest: () -> Unit,
downloadPdf: () -> Unit,
sharePdf: () -> Unit,
toggleViewMode: () -> Unit,
) {
DropdownMenu(
modifier = Modifier,
expanded = isExpanded,
onDismissRequest = onDismissRequest
) {
DropdownMenuItem(
leadingIcon = {
Icon(
imageVector = Icons.Default.Download,
contentDescription = null
)
},
text = { Text(stringResource(R.string.pdf_view_download_menu_item)) },
onClick = downloadPdf
)
DropdownMenuItem(
leadingIcon = {
Icon(
imageVector = Icons.Default.Share,
contentDescription = null
)
},
text = { Text(stringResource(R.string.pdf_view_share_menu_item)) },
onClick = sharePdf
)
DropdownMenuItem(
leadingIcon = {
Icon(
modifier = Modifier.height(19.dp),
painter = painterResource(id = R.drawable.rotate),
contentDescription = null
)
},
text = { Text(stringResource(R.string.pdf_view_rotate_menu_item)) },
onClick = toggleViewMode
)
}
}
Loading
Loading