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

Share export item #111

Merged
merged 3 commits into from
Oct 16, 2023
Merged

Share export item #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
51dbb66
Relocate save as parameters to actual place they are in-app
soupslurpr Oct 16, 2023
1a3f786
Rename saveAsShown parameter to saveAsDialogShown
soupslurpr Oct 16, 2023
b6f38e9
Add share dropdownmenuitem
soupslurpr Oct 16, 2023
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
248 changes: 151 additions & 97 deletions app/src/main/kotlin/dev/soupslurpr/beautyxt/BeauTyXT.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package dev.soupslurpr.beautyxt

import android.content.Context
import android.content.Intent
import android.os.Build
import android.print.PrintAttributes
import android.print.PrintManager
Expand Down Expand Up @@ -29,6 +30,7 @@ import androidx.compose.material.icons.filled.Delete
import androidx.compose.material.icons.filled.Info
import androidx.compose.material.icons.filled.MoreVert
import androidx.compose.material.icons.filled.Settings
import androidx.compose.material.icons.filled.Share
import androidx.compose.material3.AlertDialog
import androidx.compose.material3.DropdownMenu
import androidx.compose.material3.DropdownMenuItem
Expand Down Expand Up @@ -58,6 +60,7 @@ import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.input.KeyboardType
import androidx.compose.ui.unit.dp
import androidx.core.app.ActivityOptionsCompat
import androidx.core.content.ContextCompat.startActivity
import androidx.navigation.compose.NavHost
import androidx.navigation.compose.composable
import androidx.navigation.compose.currentBackStackEntryAsState
Expand Down Expand Up @@ -115,20 +118,22 @@ fun BeauTyXTAppBar(
onExportDropdownMenuItemClicked: () -> Unit,
onExportDropdownMenuDismissRequest: () -> Unit,

saveAsShown: Boolean,
onSaveAsDialogDismissRequest: () -> Unit,
onSaveAsExportDropdownMenuItemClicked: () -> Unit,
saveAsDialogContent: @Composable () -> Unit,
saveAsDialogConfirmButton: @Composable () -> Unit,
saveAsDialogDismissButton: @Composable () -> Unit,

printOptionsDialogShown: Boolean,
onPrintOptionsDialogDismissRequest: () -> Unit,
onPrintOptionsExportDropdownMenuItemClicked: () -> Unit,
printOptionsDialogContent: @Composable () -> Unit,
printOptionsDialogConfirmButton: @Composable () -> Unit,
printOptionsDialogDismissButton: @Composable () -> Unit,

saveAsDialogShown: Boolean,
onSaveAsDialogDismissRequest: () -> Unit,
onSaveAsExportDropdownMenuItemClicked: () -> Unit,
saveAsDialogContent: @Composable () -> Unit,
saveAsDialogConfirmButton: @Composable () -> Unit,
saveAsDialogDismissButton: @Composable () -> Unit,

onShareExportDropdownMenuItemClicked: () -> Unit,

deleteFileDialogShown: Boolean,
onDeleteFileDialogDismissRequest: () -> Unit,
onDeleteFileDropdownMenuItemClicked: () -> Unit,
Expand All @@ -137,7 +142,7 @@ fun BeauTyXTAppBar(
deleteFileDialogDismissButton: @Composable () -> Unit,

readOnly: Boolean,
mimeType: String?,
mimeType: String,
onPreviewMarkdownRenderedToFullscreenButtonClicked: () -> Unit,
modifier: Modifier
) {
Expand Down Expand Up @@ -267,21 +272,16 @@ fun BeauTyXTAppBar(
Icon(painter = painterResource(R.drawable.baseline_save_as_24), contentDescription = null)
}
)
}
if (saveAsShown) {
AlertDialog(
onDismissRequest = onSaveAsDialogDismissRequest,
confirmButton = saveAsDialogConfirmButton,
dismissButton = saveAsDialogDismissButton,
title = {
DropdownMenuItem(
text = {
Text(
text = stringResource(R.string.save_as),
style = typography.headlineSmall,
modifier = Modifier.align(Alignment.CenterVertically)
text = stringResource(R.string.share),
style = dropDownMenuItemTextStyle
)
},
text = {
saveAsDialogContent()
onClick = { onShareExportDropdownMenuItemClicked() },
leadingIcon = {
Icon(imageVector = Icons.Filled.Share, contentDescription = null)
}
)
}
Expand Down Expand Up @@ -318,6 +318,23 @@ fun BeauTyXTAppBar(
}
)
}
if (saveAsDialogShown) {
AlertDialog(
onDismissRequest = onSaveAsDialogDismissRequest,
confirmButton = saveAsDialogConfirmButton,
dismissButton = saveAsDialogDismissButton,
title = {
Text(
text = stringResource(R.string.save_as),
style = typography.headlineSmall,
modifier = Modifier.align(Alignment.CenterVertically)
)
},
text = {
saveAsDialogContent()
}
)
}
if (deleteFileDialogShown) {
AlertDialog(
onDismissRequest = onDeleteFileDialogDismissRequest,
Expand Down Expand Up @@ -349,7 +366,7 @@ fun FileInfoDialogItem(info: String, value: String) {
}

@Composable
fun SaveAsDialogItem(
fun FileTypeSelectionDialogItem(
fileTypeText: String,
selected: Boolean,
onClickRadioButton: () -> Unit
Expand Down Expand Up @@ -427,10 +444,10 @@ fun BeauTyXTApp(

var exportDropdownMenuShown by rememberSaveable { mutableStateOf(false) }

var saveAsShown by rememberSaveable { mutableStateOf(false) }

var printOptionsDialogShown by rememberSaveable { mutableStateOf(false) }

var saveAsShown by rememberSaveable { mutableStateOf(false) }

var deleteFileDialogShown by rememberSaveable { mutableStateOf(false) }

val saveAsHtmlFileLauncher = rememberLauncherForActivityResult(contract = CreateDocument(mimeTypeHtml)) {
Expand Down Expand Up @@ -541,80 +558,6 @@ fun BeauTyXTApp(
},
onExportDropdownMenuDismissRequest = { exportDropdownMenuShown = false },

saveAsShown = saveAsShown,
onSaveAsDialogDismissRequest = { saveAsShown = false },
onSaveAsExportDropdownMenuItemClicked = {
saveAsSelectedFileType = ""
saveAsShown = !saveAsShown
dropDownMenuShown = false
exportDropdownMenuShown = false
},
saveAsDialogContent = {
Column(
modifier = Modifier
.selectableGroup()
.fillMaxWidth(),
verticalArrangement = Arrangement.spacedBy(24.dp)
) {
if (fileUiState.mimeType.value == mimeTypeMarkdown) {
SaveAsDialogItem(
fileTypeText = stringResource(R.string.html),
selected = saveAsSelectedFileType == mimeTypeHtml,
onClickRadioButton = {
saveAsSelectedFileType = mimeTypeHtml
}
)
}
if ((preferencesUiState.experimentalFeatureExportMarkdownToDocx.second.value and
(fileUiState.mimeType.value == mimeTypeMarkdown)) or
(fileUiState.mimeType.value != mimeTypeMarkdown)
) {
SaveAsDialogItem(
fileTypeText = stringResource(R.string.docx),
selected = saveAsSelectedFileType == mimeTypeDocx,
onClickRadioButton = {
saveAsSelectedFileType = mimeTypeDocx
}
)
}
}

},
saveAsDialogConfirmButton = {
TextButton(
onClick = {
when (saveAsSelectedFileType) {
mimeTypeHtml -> saveAsHtmlFileLauncher.launch(
fileUiState.name.value.substringBeforeLast(".")
)

mimeTypeDocx -> saveAsDocxFileLauncher.launch(
fileUiState.name.value.substringBeforeLast(".")
)
}
saveAsShown = false
},
enabled = saveAsSelectedFileType != "",
content = {
Text(
text = stringResource(R.string.confirm_)
)
}
)
},
saveAsDialogDismissButton = {
TextButton(
onClick = {
saveAsShown = false
},
content = {
Text(
text = stringResource(R.string.cancel)
)
}
)
},

printOptionsDialogShown = printOptionsDialogShown,
onPrintOptionsDialogDismissRequest = { printOptionsDialogShown = false },
onPrintOptionsExportDropdownMenuItemClicked = {
Expand Down Expand Up @@ -851,6 +794,117 @@ ${
)
},

saveAsDialogShown = saveAsShown,
onSaveAsDialogDismissRequest = { saveAsShown = false },
onSaveAsExportDropdownMenuItemClicked = {
saveAsSelectedFileType = ""
saveAsShown = !saveAsShown
dropDownMenuShown = false
exportDropdownMenuShown = false
},
saveAsDialogContent = {
Column(
modifier = Modifier
.selectableGroup()
.fillMaxWidth(),
verticalArrangement = Arrangement.spacedBy(24.dp)
) {
if (fileUiState.mimeType.value == mimeTypeMarkdown) {
FileTypeSelectionDialogItem(
fileTypeText = stringResource(R.string.html),
selected = saveAsSelectedFileType == mimeTypeHtml,
onClickRadioButton = {
saveAsSelectedFileType = mimeTypeHtml
}
)
}
if ((preferencesUiState.experimentalFeatureExportMarkdownToDocx.second.value and
(fileUiState.mimeType.value == mimeTypeMarkdown)) or
(fileUiState.mimeType.value != mimeTypeMarkdown)
) {
FileTypeSelectionDialogItem(
fileTypeText = stringResource(R.string.docx),
selected = saveAsSelectedFileType == mimeTypeDocx,
onClickRadioButton = {
saveAsSelectedFileType = mimeTypeDocx
}
)
}
}
},
saveAsDialogConfirmButton = {
TextButton(
onClick = {
when (saveAsSelectedFileType) {
mimeTypeHtml -> saveAsHtmlFileLauncher.launch(
fileUiState.name.value.substringBeforeLast(".")
)

mimeTypeDocx -> saveAsDocxFileLauncher.launch(
fileUiState.name.value.substringBeforeLast(".")
)
}
saveAsShown = false
},
enabled = saveAsSelectedFileType != "",
content = {
Text(
text = stringResource(R.string.confirm_)
)
}
)
},
saveAsDialogDismissButton = {
TextButton(
onClick = {
saveAsShown = false
},
content = {
Text(
text = stringResource(R.string.cancel)
)
}
)
},

onShareExportDropdownMenuItemClicked = {
var sendIntent = Intent()

sendIntent = when (fileUiState.mimeType.value) {
mimeTypePlainText -> {
sendIntent.apply {
action = Intent.ACTION_SEND
putExtra(Intent.EXTRA_TEXT, fileUiState.content.value)
type = mimeTypePlainText
}
}

mimeTypeMarkdown -> {
sendIntent.apply {
action = Intent.ACTION_SEND
putExtra(Intent.EXTRA_TEXT, fileUiState.content.value)
fileViewModel.setMarkdownToHtml()
putExtra(Intent.EXTRA_HTML_TEXT, fileUiState.contentConvertedToHtml.value)
type = mimeTypeMarkdown
}
}

else -> {
sendIntent.apply {
action = Intent.ACTION_SEND
putExtra(Intent.EXTRA_TEXT, fileUiState.content.value)
type = fileUiState.mimeType.value
}
}
}

val shareIntent = Intent.createChooser(sendIntent, null)
startActivity(context, shareIntent, ActivityOptionsCompat.makeBasic().toBundle())

dropDownMenuShown = false
exportDropdownMenuShown = false
},

deleteFileDialogShown = deleteFileDialogShown,
onDeleteFileDialogDismissRequest = { deleteFileDialogShown = false },
onDeleteFileDropdownMenuItemClicked = {
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,4 +79,5 @@
<string name="delete_file" tools:ignore="MissingTranslation">Delete File</string>
<string name="delete_file_dialog_text" tools:ignore="MissingTranslation">Are you really sure you want to do
this?\nDeleted files are irrecoverable (gone forever!)</string>
<string name="share" tools:ignore="MissingTranslation">Share</string>
</resources>