-
-
Notifications
You must be signed in to change notification settings - Fork 216
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(freshrss): support fresh rss api
- Loading branch information
Showing
12 changed files
with
468 additions
and
19 deletions.
There are no files selected for viewing
22 changes: 22 additions & 0 deletions
22
app/src/main/java/me/ash/reader/domain/model/account/security/FreshRSSSecurityKey.kt
This file contains 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,22 @@ | ||
| package me.ash.reader.domain.model.account.security | ||
|
|
||
| class FreshRSSSecurityKey private constructor() : SecurityKey() { | ||
|
|
||
| var serverUrl: String? = null | ||
| var username: String? = null | ||
| var password: String? = null | ||
|
|
||
| constructor(serverUrl: String?, username: String?, password: String?) : this() { | ||
| this.serverUrl = serverUrl | ||
| this.username = username | ||
| this.password = password | ||
| } | ||
|
|
||
| constructor(value: String? = DESUtils.empty) : this() { | ||
| decode(value, FreshRSSSecurityKey::class.java).let { | ||
| serverUrl = it.serverUrl | ||
| username = it.username | ||
| password = it.password | ||
| } | ||
| } | ||
| } |
This file contains 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 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 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 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
149 changes: 149 additions & 0 deletions
149
...rc/main/java/me/ash/reader/ui/page/settings/accounts/addition/AddFreshRSSAccountDialog.kt
This file contains 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,149 @@ | ||
| package me.ash.reader.ui.page.settings.accounts.addition | ||
|
|
||
| import androidx.compose.foundation.layout.* | ||
| import androidx.compose.foundation.rememberScrollState | ||
| import androidx.compose.foundation.text.KeyboardOptions | ||
| import androidx.compose.foundation.verticalScroll | ||
| import androidx.compose.material3.Icon | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.material3.TextButton | ||
| import androidx.compose.runtime.Composable | ||
| 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.Modifier | ||
| import androidx.compose.ui.platform.LocalContext | ||
| import androidx.compose.ui.platform.LocalFocusManager | ||
| import androidx.compose.ui.res.painterResource | ||
| import androidx.compose.ui.res.stringResource | ||
| import androidx.compose.ui.text.input.KeyboardType | ||
| import androidx.compose.ui.text.style.TextOverflow | ||
| import androidx.compose.ui.unit.dp | ||
| import androidx.compose.ui.window.DialogProperties | ||
| import androidx.hilt.navigation.compose.hiltViewModel | ||
| import androidx.navigation.NavHostController | ||
| import me.ash.reader.R | ||
| import me.ash.reader.domain.model.account.Account | ||
| import me.ash.reader.domain.model.account.AccountType | ||
| import me.ash.reader.domain.model.account.security.FreshRSSSecurityKey | ||
| import me.ash.reader.ui.component.base.RYDialog | ||
| import me.ash.reader.ui.component.base.RYOutlineTextField | ||
| import me.ash.reader.ui.ext.collectAsStateValue | ||
| import me.ash.reader.ui.ext.showToast | ||
| import me.ash.reader.ui.page.common.RouteName | ||
| import me.ash.reader.ui.page.settings.accounts.AccountViewModel | ||
|
|
||
| @OptIn(androidx.compose.ui.ExperimentalComposeUiApi::class) | ||
| @Composable | ||
| fun AddFreshRSSAccountDialog( | ||
| navController: NavHostController, | ||
| viewModel: AdditionViewModel = hiltViewModel(), | ||
| accountViewModel: AccountViewModel = hiltViewModel(), | ||
| ) { | ||
| val context = LocalContext.current | ||
| val focusManager = LocalFocusManager.current | ||
| val uiState = viewModel.additionUiState.collectAsStateValue() | ||
|
|
||
| var freshRSSServerUrl by rememberSaveable { mutableStateOf("") } | ||
| var freshRSSUsername by rememberSaveable { mutableStateOf("") } | ||
| var freshRSSPassword by rememberSaveable { mutableStateOf("") } | ||
|
|
||
| RYDialog( | ||
| modifier = Modifier.padding(horizontal = 44.dp), | ||
| visible = uiState.addFreshRSSAccountDialogVisible, | ||
| properties = DialogProperties(usePlatformDefaultWidth = false), | ||
| onDismissRequest = { | ||
| focusManager.clearFocus() | ||
| viewModel.hideAddFreshRSSAccountDialog() | ||
| }, | ||
| icon = { | ||
| Icon( | ||
| modifier = Modifier.size(24.dp), | ||
| painter = painterResource(id = R.drawable.ic_freshrss), | ||
| contentDescription = stringResource(R.string.fresh_rss), | ||
| ) | ||
| }, | ||
| title = { | ||
| Text( | ||
| text = stringResource(R.string.fresh_rss), | ||
| maxLines = 1, | ||
| overflow = TextOverflow.Ellipsis, | ||
| ) | ||
| }, | ||
| text = { | ||
| Column( | ||
| modifier = Modifier.verticalScroll(rememberScrollState()) | ||
| ) { | ||
| Spacer(modifier = Modifier.height(10.dp)) | ||
| RYOutlineTextField( | ||
| value = freshRSSServerUrl, | ||
| onValueChange = { freshRSSServerUrl = it }, | ||
| label = stringResource(R.string.server_url), | ||
| placeholder = "https://demo.freshrss.org/api/greader.php", | ||
| keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Uri), | ||
| ) | ||
| Spacer(modifier = Modifier.height(10.dp)) | ||
| RYOutlineTextField( | ||
| value = freshRSSUsername, | ||
| onValueChange = { freshRSSUsername = it }, | ||
| label = stringResource(R.string.username), | ||
| placeholder = "demo", | ||
| keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Email), | ||
| ) | ||
| Spacer(modifier = Modifier.height(10.dp)) | ||
| RYOutlineTextField( | ||
| value = freshRSSPassword, | ||
| onValueChange = { freshRSSPassword = it }, | ||
| isPassword = true, | ||
| label = stringResource(R.string.password), | ||
| placeholder = "demodemo", | ||
| keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password), | ||
| ) | ||
| Spacer(modifier = Modifier.height(10.dp)) | ||
| } | ||
| }, | ||
| confirmButton = { | ||
| TextButton( | ||
| enabled = freshRSSServerUrl.isNotBlank() && freshRSSUsername.isNotEmpty() && freshRSSPassword.isNotEmpty(), | ||
| onClick = { | ||
| focusManager.clearFocus() | ||
| if (!freshRSSServerUrl.endsWith("/")) { | ||
| freshRSSServerUrl += "/" | ||
| } | ||
| accountViewModel.addAccount(Account( | ||
| type = AccountType.FreshRSS, | ||
| name = context.getString(R.string.fresh_rss), | ||
| securityKey = FreshRSSSecurityKey( | ||
| serverUrl = freshRSSServerUrl, | ||
| username = freshRSSUsername, | ||
| password = freshRSSPassword, | ||
| ).toString(), | ||
| )) { account, exception -> | ||
| if (account == null) { | ||
| context.showToast(exception?.message ?: "Not valid credentials") | ||
| } else { | ||
| viewModel.hideAddFreshRSSAccountDialog() | ||
| navController.popBackStack() | ||
| navController.navigate("${RouteName.ACCOUNT_DETAILS}/${account.id}") { | ||
| launchSingleTop = true | ||
| } | ||
| } | ||
| } | ||
| } | ||
| ) { | ||
| Text(stringResource(R.string.add)) | ||
| } | ||
| }, | ||
| dismissButton = { | ||
| TextButton( | ||
| onClick = { | ||
| focusManager.clearFocus() | ||
| viewModel.hideAddFreshRSSAccountDialog() | ||
| } | ||
| ) { | ||
| Text(stringResource(R.string.cancel)) | ||
| } | ||
| }, | ||
| ) | ||
| } |
This file contains 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 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 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 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
Oops, something went wrong.