Benature/omnivore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2939 from remychantenay/android-show-url-in-open-link-view

Browse Source 
Android: Show URL in OpenLinkView
This commit is contained in:
Jackson Harper
2023-10-17 16:29:43 +08:00
committed by GitHub
parent d6e5472509 f1a71ae86c
commit 76fecc90bf
2 changed files with 59 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/OpenLinkView.kt Normal file
View File

@ -0,0 +1,59 @@
package app.omnivore.omnivore.ui.reader
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.Button
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import app.omnivore.omnivore.R
@Composable
fun OpenLinkView(webReaderViewModel: WebReaderViewModel) {
val context = LocalContext.current
Column(modifier = Modifier
.padding(top = 25.dp)
.padding(horizontal = 50.dp), verticalArrangement = Arrangement.spacedBy(20.dp)) {
Row {
Text(webReaderViewModel.currentLink.toString(),
fontWeight = FontWeight.Light,
color = Color.DarkGray,
fontSize = 12.sp,
maxLines = 2,
overflow = TextOverflow.Ellipsis,
)
}
Row(modifier = Modifier.padding(top = 25.dp)) {
Button(onClick = { webReaderViewModel.openCurrentLink(context) }, modifier = Modifier.fillMaxWidth()) {
Text(text = stringResource(R.string.open_link_view_action_open_in_browser))
}
}
Row {
Button(onClick = { webReaderViewModel.saveCurrentLink(context) }, modifier = Modifier.fillMaxWidth()) {
Text(text = stringResource(R.string.open_link_view_action_save_to_omnivore))
}
}
Row {
Button(onClick = {webReaderViewModel.copyCurrentLink(context) }, modifier = Modifier.fillMaxWidth()) {
Text(text = stringResource(R.string.open_link_view_action_copy_link))
}
}
Row {
Button(onClick = {webReaderViewModel.resetBottomSheet() }, modifier = Modifier.fillMaxWidth()) {
Text(text = stringResource(R.string.open_link_view_action_cancel))
}
}
}
}

36
android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/WebReaderLoadingContainer.kt
View File

@ -42,7 +42,6 @@ import com.google.accompanist.systemuicontroller.rememberSystemUiController
import dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.launch
import kotlin.math.roundToInt
import androidx.compose.material3.Button
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import app.omnivore.omnivore.ui.components.LabelsViewModel
@ -450,38 +449,3 @@ fun BottomSheetUI(title: String?, content: @Composable () -> Unit) {
}
}
}
@OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterialApi::class)
@Composable
fun OpenLinkView(webReaderViewModel: WebReaderViewModel) {
val context = LocalContext.current
Column(modifier = Modifier
.padding(top = 50.dp)
.padding(horizontal = 50.dp), verticalArrangement = Arrangement.spacedBy(20.dp)) {
Row {
Button(onClick = { webReaderViewModel.openCurrentLink(context) }, modifier = Modifier.fillMaxWidth()) {
Text(text = stringResource(R.string.open_link_view_action_open_in_browser))
}
}
Row() {
Button(onClick = { webReaderViewModel.saveCurrentLink(context) }, modifier = Modifier.fillMaxWidth()) {
Text(text = stringResource(R.string.open_link_view_action_save_to_omnivore))
}
}
Row() {
Button(onClick = {webReaderViewModel.copyCurrentLink(context) }, modifier = Modifier.fillMaxWidth()) {
Text(text = stringResource(R.string.open_link_view_action_copy_link))
}
}
Row {
Button(onClick = {webReaderViewModel.resetBottomSheet() }, modifier = Modifier.fillMaxWidth()) {
Text(text = stringResource(R.string.open_link_view_action_cancel))
}
}
}
}