Update Image Loader and Implement Naive content templating #109

digitalbuddha · 2022-12-21T14:53:32Z

📑 What does this PR do?

Adds an image loading library
Adds a html parsing library
displays the avatar
parses content html and displays as annotated string with links in blue

✅ Checklist

My pull request adheres to the code style of this project
My code requires changes to the documentation
I have updated the documentation as required
All the tests have passed

🧪 How can this PR been tested?

🧾 Tasks Remaining: (List of tasks remaining to be implemented)

What is remaining to be implemented in this PR? Mention a list of them

🖼️ Screenshots (if applicable):

…twork/MastodonApiKtor.kt Co-authored-by: Omid Ghenatnevi <O.Ghenatnevi@gmail.com>

…/repository/timeline/HomeTimelineRepository.kt Co-authored-by: Omid Ghenatnevi <O.Ghenatnevi@gmail.com>

Co-authored-by: Omid Ghenatnevi <O.Ghenatnevi@gmail.com>

…n/DefaultRootComponent.kt Co-authored-by: Omid Ghenatnevi <O.Ghenatnevi@gmail.com>

…imelineContent.kt Co-authored-by: Omid Ghenatnevi <O.Ghenatnevi@gmail.com>

…composables/SignedInRootContent.kt Co-authored-by: Omid Ghenatnevi <O.Ghenatnevi@gmail.com>

…imelineContent.kt Co-authored-by: Omid Ghenatnevi <O.Ghenatnevi@gmail.com>

…twork/MastodonApiKtor.kt Co-authored-by: Omid Ghenatnevi <O.Ghenatnevi@gmail.com>

digitalbuddha · 2022-12-21T14:53:49Z

this is stacked on my other diff

crocsandcoffee

Just did a quick early review for it..

This looks really good! I think you should be able to remove the platform specific logic for loading urls now, I didn't see that code delete in this PR.

ui/signed-out/src/commonMain/kotlin/social/androiddev/signedout/landing/LandingContent.kt

ui/common/src/commonMain/kotlin/social/androiddev/common/utils/HtmlParser.kt

ui/common/src/commonMain/kotlin/social/androiddev/common/utils/AsyncImage.kt

crocsandcoffee · 2022-12-21T15:15:03Z

ui/common/src/commonMain/kotlin/social/androiddev/common/utils/AsyncImage.kt

-            modifier = modifier
-        )
-    }
+    KamelImage(


Is this truly KMP support or just JVM?

just jvm, but ios has native support afaik

Cool, we should follow-up on this and change this to an expect/actual

crocsandcoffee · 2022-12-21T15:15:35Z

ui/common/src/commonMain/kotlin/social/androiddev/common/composables/UserAvatar.kt

        contentDescription = "User avatar",
-        modifier = modifier.width(48.dp).clip(RoundedCornerShape(5.dp))
+        modifier = modifier.width(48.dp).height(48.dp).clip(RoundedCornerShape(5.dp))


modifier.size(48.dp) should already set it for both dimensions

for some reason it was not rendering the avatars after switching to the new library. We can play with it later but yeah it never assumed a height

crocsandcoffee · 2022-12-21T15:17:41Z

ui/common/build.gradle.kts

@@ -45,6 +48,9 @@ kotlin {
                implementation(compose.material)
                api(libs.com.arkivanov.decompose)
                api(libs.com.arkivanov.decompose.extensions.compose.jetbrains)
+                implementation("com.alialbaali.kamel:kamel-image:0.4.0")
+                implementation("it.skrape:skrapeit:1.2.2")


Is this also JVM only? Maybe we can use this as a resource and roll our own purely kotlin parser which also supports iOS

yup yup jvm only. I think this gets us off the ground and agree we would need something more robust in future

crocsandcoffee · 2022-12-21T15:18:19Z

app-android/build.gradle.kts

@@ -26,6 +26,13 @@ android {
        targetCompatibility = JavaVersion.VERSION_11
    }

+    packagingOptions {
+        exclude ("META-INF/DEPENDENCIES")


I've always wondering what this stuff is for? Is this generated or you had to add manually to fix a build issue?

Manually to fix a build issue. My naive understanding is that multiple libraries have the same metadata file name and clash

# Conflicts: # app-android/build.gradle.kts # data/network/build.gradle.kts # data/network/src/commonMain/kotlin/social/androiddev/common/network/model/Status.kt # data/persistence/build.gradle.kts # data/repository/build.gradle.kts # data/repository/src/commonMain/kotlin/social/androiddev/common/repository/timeline/ModelMappers.kt # data/repository/src/commonMain/kotlin/social/androiddev/common/repository/timeline/RealHomeTimelineRepository.kt # data/repository/src/commonMain/kotlin/social/androiddev/common/repository/timeline/TimelineFetcher.kt # data/repository/src/commonMain/kotlin/social/androiddev/common/repository/timeline/TimelineSourceOfTruth.kt # data/repository/src/commonTest/kotlin/social/androiddev/common/repository/timeline/RealHomeTimelineRepositoryTest.kt # data/repository/src/commonTest/kotlin/social/androiddev/common/repository/timeline/fixtures/TestFixtures.kt # di/build.gradle.kts # domain/authentication/build.gradle.kts # domain/timeline/build.gradle.kts # domain/timeline/src/commonMain/kotlin/social/androiddev/domain/timeline/model/StatusLocal.kt # gradle/libs.versions.toml # ui/common/build.gradle.kts # ui/signed-in/build.gradle.kts # ui/timeline/build.gradle.kts # ui/timeline/src/commonMain/kotlin/social/androiddev/timeline/TootContent.kt # ui/timeline/src/commonMain/kotlin/social/androiddev/timeline/navigation/TimelineViewModel.kt

digitalbuddha · 2022-12-21T17:59:49Z

ui/common/src/commonMain/kotlin/social/androiddev/common/utils/HtmlParser.kt

+
+    val content = htmlDocument(newlineReplace)
+
+    val body = content.body {


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

crocsandcoffee

🎉

...onTest/kotlin/social/androiddev/common/repository/timeline/RealHomeTimelineRepositoryTest.kt

crocsandcoffee · 2022-12-22T15:10:17Z

ui/common/build.gradle.kts

+            dependencies {
+                implementation(kotlin("test"))
+                implementation(libs.org.jetbrains.kotlin.test.common)
+                implementation(libs.org.jetbrains.kotlin.test.annotations.common)


Formatting here looks off, but it could be because I'm on my phone

ran spotless apply just in case

crocsandcoffee · 2022-12-22T15:11:34Z

ui/common/src/commonMain/kotlin/social/androiddev/common/utils/AsyncImage.kt

-            modifier = modifier
-        )
-    }
+    KamelImage(


Cool, we should follow-up on this and change this to an expect/actual

crocsandcoffee · 2022-12-22T15:14:31Z

ui/common/src/commonMain/kotlin/social/androiddev/common/utils/HtmlParser.kt

+ * Takes a String reciever of html text
+ * converts it to an annotated string of text and links
+ */
+fun String.renderHtml(): AnnotatedString {


This probably should be either moved to the ViewModel itself and not a public API, or renamed to something that is more descriptive. something like

fun String.extractTootContentFromHtml()

renamed to extractContentFromMicroFormat
When looking at Tusky, I noticed there are a few places where we get this type of text (profile and server about is another)

Going to leave as a utility for now

mboukadir · 2022-12-22T16:32:38Z

ui/signed-in/build.gradle.kts

+                implementation(projects.data.persistence)
+                implementation(projects.data.repository)
+                implementation(projects.domain.timeline)
+                implementation(libs.io.insert.koin.core)


The koin dependency is already added at line 19.

ui/common/build.gradle.kts

ui/timeline/build.gradle.kts

…/repository/timeline/RealHomeTimelineRepositoryTest.kt Co-authored-by: Omid Ghenatnevi <O.Ghenatnevi@gmail.com>

…odoForMastodon into miken/feedUI

digitalbuddha and others added 20 commits December 20, 2022 10:31

feed data flow

5258902

feed data flow

c11a9a5

feed data flow

d59e1c8

pr feedback and more data modeling

4c0bbe5

Update data/network/src/commonMain/kotlin/social/androiddev/common/ne…

9c5edfb

…twork/MastodonApiKtor.kt Co-authored-by: Omid Ghenatnevi <O.Ghenatnevi@gmail.com>

Update data/repository/src/commonMain/kotlin/social/androiddev/common…

146f20c

…/repository/timeline/HomeTimelineRepository.kt Co-authored-by: Omid Ghenatnevi <O.Ghenatnevi@gmail.com>

Update gradle/libs.versions.toml

42c9a89

Co-authored-by: Omid Ghenatnevi <O.Ghenatnevi@gmail.com>

Update ui/root/src/commonMain/kotlin/social/androiddev/root/navigatio…

a6bac8e

…n/DefaultRootComponent.kt Co-authored-by: Omid Ghenatnevi <O.Ghenatnevi@gmail.com>

Update ui/timeline/src/commonMain/kotlin/social/androiddev/timeline/T…

324fcdd

…imelineContent.kt Co-authored-by: Omid Ghenatnevi <O.Ghenatnevi@gmail.com>

Update ui/timeline/src/commonMain/kotlin/social/androiddev/timeline/T…

1201e83

…imelineContent.kt Co-authored-by: Omid Ghenatnevi <O.Ghenatnevi@gmail.com>

Update ui/signed-in/src/commonMain/kotlin/social/androiddev/signedin/…

2308c25

…composables/SignedInRootContent.kt Co-authored-by: Omid Ghenatnevi <O.Ghenatnevi@gmail.com>

Update ui/timeline/src/commonMain/kotlin/social/androiddev/timeline/T…

f5a4c93

…imelineContent.kt Co-authored-by: Omid Ghenatnevi <O.Ghenatnevi@gmail.com>

Update data/network/src/commonMain/kotlin/social/androiddev/common/ne…

cb895a5

…twork/MastodonApiKtor.kt Co-authored-by: Omid Ghenatnevi <O.Ghenatnevi@gmail.com>

split timelineRepoModule into delegates

2c82f3b

pr comments

36ce08a

start of tests

ee77e1b

spotless

5476f65

spotless

70ea9c6

image loading + wip parsing

d156b69

parse html into annotated strings

5d52624

digitalbuddha requested review from thebino and crocsandcoffee as code owners December 21, 2022 14:53

digitalbuddha marked this pull request as draft December 21, 2022 14:53

crocsandcoffee reviewed Dec 21, 2022

View reviewed changes

digitalbuddha force-pushed the miken/feedData branch from 20026c0 to 3efb36e Compare December 21, 2022 17:05

Base automatically changed from miken/feedData to main December 21, 2022 17:11

digitalbuddha changed the title ~~Miken/feed UI~~ Update Image Loader and Implement Naive content templating Dec 21, 2022

rebase

41e597f

digitalbuddha marked this pull request as ready for review December 21, 2022 17:57

spotless

f9a53d8

digitalbuddha commented Dec 21, 2022

View reviewed changes

add test dependency

41b5549

crocsandcoffee approved these changes Dec 22, 2022

View reviewed changes

mboukadir reviewed Dec 22, 2022

View reviewed changes

digitalbuddha and others added 9 commits December 23, 2022 08:25

Update data/repository/src/commonTest/kotlin/social/androiddev/common…

a865d14

…/repository/timeline/RealHomeTimelineRepositoryTest.kt Co-authored-by: Omid Ghenatnevi <O.Ghenatnevi@gmail.com>

pr comments

3c9a5f4

Merge branch 'miken/feedUI' of https://github.com/AndroidDev-social/D…

ad7f6d9

…odoForMastodon into miken/feedUI

Merge branch 'main' into miken/feedUI

f7e7ed2

merging

d419760

rebase on detekt changes

2e582d5

detekt fixes

e96e7b6

Merge branch 'main' into miken/feedUI

2396112

rebase

47f6962

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update Image Loader and Implement Naive content templating #109

Update Image Loader and Implement Naive content templating #109

digitalbuddha commented Dec 21, 2022 •

edited

Loading

digitalbuddha commented Dec 21, 2022

crocsandcoffee left a comment

crocsandcoffee Dec 21, 2022

digitalbuddha Dec 21, 2022

crocsandcoffee Dec 22, 2022

crocsandcoffee Dec 21, 2022

digitalbuddha Dec 21, 2022

crocsandcoffee Dec 21, 2022

digitalbuddha Dec 21, 2022

crocsandcoffee Dec 21, 2022

digitalbuddha Dec 21, 2022

digitalbuddha Dec 21, 2022

crocsandcoffee left a comment

crocsandcoffee Dec 22, 2022

digitalbuddha Dec 23, 2022

crocsandcoffee Dec 22, 2022

crocsandcoffee Dec 22, 2022

digitalbuddha Dec 23, 2022

mboukadir Dec 22, 2022


		val content = htmlDocument(newlineReplace)

		val body = content.body {

Update Image Loader and Implement Naive content templating #109

Are you sure you want to change the base?

Update Image Loader and Implement Naive content templating #109

Conversation

digitalbuddha commented Dec 21, 2022 • edited Loading

📑 What does this PR do?

✅ Checklist

🧪 How can this PR been tested?

🧾 Tasks Remaining: (List of tasks remaining to be implemented)

🖼️ Screenshots (if applicable):

digitalbuddha commented Dec 21, 2022

crocsandcoffee left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

crocsandcoffee left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

digitalbuddha commented Dec 21, 2022 •

edited

Loading