Update Image Loader and Implement Naive content templating #109
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| /* | ||
| * This file is part of Dodo. | ||
| * | ||
| * Dodo is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as | ||
| * published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. | ||
| * | ||
| * Dodo is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty | ||
| * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License along with Dodo. | ||
| * If not, see <https://www.gnu.org/licenses/>. | ||
| */ | ||
| package social.androiddev.common.utils | ||
|
|
||
| import androidx.compose.ui.graphics.Color | ||
| import androidx.compose.ui.text.AnnotatedString | ||
| import androidx.compose.ui.text.SpanStyle | ||
| import androidx.compose.ui.text.buildAnnotatedString | ||
| import androidx.compose.ui.text.font.FontWeight | ||
| import androidx.compose.ui.text.withStyle | ||
| import it.skrape.core.htmlDocument | ||
| import it.skrape.selects.eachLink | ||
| import it.skrape.selects.eachText | ||
| import it.skrape.selects.html5.a | ||
| import it.skrape.selects.html5.body | ||
|
|
||
| /** | ||
| * Takes a String reciever of html text | ||
| * converts it to an annotated string of text and links | ||
| */ | ||
| @Suppress("ReturnCount") | ||
| fun String.extractContentFromMicroFormat(): AnnotatedString { | ||
| val newlineReplace = this.replace("<br>", "\n") | ||
|
|
||
| if (newlineReplace.contains("<p>").not()) return buildAnnotatedString { } | ||
|
|
||
| val content = htmlDocument(newlineReplace) | ||
|
|
||
| val body = content.body { | ||
|
There was a problem hiding this comment. At this point, the only thing we are using skrape for is to get the paragraph body without any other tags and then for getting the list of links. We can hand roll that logic ourselves and target ios |
||
| findAll { | ||
| eachText | ||
| } | ||
| } | ||
| val paragraph = body | ||
|
|
||
| @Suppress("SwallowedException") | ||
| val links = try { | ||
| content.a { findAll { eachLink } } | ||
| } catch (exception: Exception) { | ||
| emptyMap() | ||
| } | ||
|
|
||
| val plainText = paragraph.joinToString("\n") | ||
| if (links.isNullOrEmpty()) { | ||
| buildAnnotatedString { | ||
| append(plainText) | ||
| } | ||
| } | ||
| return buildAnnotatedString { | ||
| // everything before first link | ||
| append(plainText.substringBefore(links.keys.first())) | ||
|
|
||
| withStyle(style = SpanStyle(color = Color.Blue, fontWeight = FontWeight.Bold)) { | ||
| appendLink(links.keys.first(), links.values.first()) | ||
| } | ||
| val restOfLinks = links.entries.drop(1) | ||
| var restOfPlainText = plainText.substringAfter(links.keys.first()) | ||
| restOfLinks.forEach { | ||
| val (key, value) = it | ||
| val segment = restOfPlainText.substringBefore(key) | ||
| append(segment) | ||
| withStyle(style = SpanStyle(color = Color.Blue, fontWeight = FontWeight.Bold)) { | ||
| appendLink(key, value) | ||
| } | ||
| restOfPlainText = restOfPlainText.substringAfter(key) | ||
| } | ||
| append(restOfPlainText) | ||
| } | ||
| } | ||
|
|
||
| private fun AnnotatedString.Builder.appendLink(linkText: String, linkUrl: String) { | ||
| pushStringAnnotation(tag = linkUrl, annotation = linkUrl) | ||
| append(linkText) | ||
| pop() | ||
| } | ||
|
|
||
| // private fun AnnotatedString.onLinkClick(offset: Int, onClick: (String) -> Unit) { | ||
| // getStringAnnotations(start = offset, end = offset).firstOrNull()?.let { | ||
| // onClick(it.item) | ||
| // } | ||
| // } | ||
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,29 @@ | ||
| /* | ||
| * This file is part of Dodo. | ||
| * | ||
| * Dodo is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as | ||
| * published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. | ||
| * | ||
| * Dodo is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty | ||
| * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License along with Dodo. | ||
| * If not, see <https://www.gnu.org/licenses/>. | ||
| */ | ||
| package social.androiddev.common.utils | ||
| import org.junit.Test | ||
| import kotlin.test.assertTrue | ||
|
|
||
| class HtmlParserKtTest { | ||
|
|
||
| @Test | ||
| fun renderHtml() { | ||
| val result = """ | ||
| <p>Been debating for a few days, and I think its time to open the <a href="https://eggy.app/tags/relay" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#<span>relay</span></a> to anyone. If you're looking for a general Relay please feel free to add <a href="https://relay.eggy.app/inbox" rel="nofollow noopener noreferrer" target="_blank"><span class="invisible">https://</span><span class="">relay.eggy.app/inbox</span><span class="invisible"></span></a> to your instances. More information can be found <a href="https://relay.eggy.app" rel="nofollow noopener noreferrer" target="_blank"><span class="invisible">https://</span><span class="">relay.eggy.app</span><span class="invisible"></span></a>, but Its a general open relay for anybody to use. <a href="https://eggy.app/tags/mastoadmin" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#<span>mastoadmin</span></a> Only thing I'm missing is a metrics tracking type page.. Hoping to have something soon.</p> | ||
| """.extractContentFromMicroFormat() | ||
|
|
||
| assertTrue { result.spanStyles.size == 4 } | ||
| assertTrue { result.paragraphStyles.isEmpty() } | ||
| assertTrue { result.length == 393 } | ||
| } | ||
| } |
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.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've always wondering what this stuff is for? Is this generated or you had to add manually to fix a build issue?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Manually to fix a build issue. My naive understanding is that multiple libraries have the same metadata file name and clash