Release/2.0.0

.github/workflows/publish.yml

@@ -72,3 +72,23 @@ jobs:
           track: internal
           mappingFile: composeApp/build/outputs/mapping/release/mapping.txt
           debugSymbols: composeApp/build/intermediates/merged_native_libs/release/mergeReleaseNativeLibs/out/lib
+
+
+      - name: Extract signed APKs
+        run: |
+          curl -L -o bundletool.jar https://github.com/google/bundletool/releases/download/1.18.3/bundletool-all-1.18.3.jar
+          java -jar bundletool.jar build-apks \
+            --bundle=${{ steps.sign_app.outputs.signedReleaseFile }} \
+            --output=composeApp/build/outputs/apk/release/heron.apks \
+            --mode=universal
+
+          unzip -o composeApp/build/outputs/apk/release/heron.apks -d composeApp/build/outputs/apk/release/
+
+      - name: Upload to GitHub releases
+        uses: softprops/action-gh-release@v2
+        with:
+          tag_name: v${{ github.run_number }}
+          name: Heron v${{ github.run_number }}
+          files: composeApp/build/outputs/apk/release/universal.apk
+          draft: true
+          allow_updates: true

build-logic/convention/src/main/kotlin/ext/UiModuleExt.kt

@@ -49,6 +49,9 @@ fun org.gradle.api.Project.configureUiModule(
 
                 api(libs.kotlinx.coroutines.core)
 
+                implementation(libs.navigation.event)
+                implementation(libs.navigation.event.compose)
+
                 api(libs.savedstate.multiplatform.savedstate)
                 api(libs.savedstate.multiplatform.compose)
 

composeApp/build.gradle.kts

@@ -89,6 +89,7 @@ kotlin {
             implementation(project(":feature:edit-profile"))
             implementation(project(":feature:feed"))
             implementation(project(":feature:gallery"))
+            implementation(project(":feature:graze-editor"))
             implementation(project(":feature:home"))
             implementation(project(":feature:list"))
             implementation(project(":feature:messages"))

composeApp/src/commonMain/kotlin/com/tunjid/heron/Platform.kt

@@ -32,6 +32,8 @@ import com.tunjid.heron.feed.di.FeedBindings
 import com.tunjid.heron.feed.di.FeedNavigationBindings
 import com.tunjid.heron.gallery.di.GalleryBindings
 import com.tunjid.heron.gallery.di.GalleryNavigationBindings
+import com.tunjid.heron.graze.editor.di.GrazeEditorBindings
+import com.tunjid.heron.graze.editor.di.GrazeEditorNavigationBindings
 import com.tunjid.heron.home.di.HomeBindings
 import com.tunjid.heron.home.di.HomeNavigationBindings
 import com.tunjid.heron.images.ImageLoader
@@ -97,6 +99,7 @@ fun createAppState(
         feedNavigationBindings = FeedNavigationBindings,
         editProfileNavigationBindings = EditProfileNavigationBindings,
         galleryNavigationBindings = GalleryNavigationBindings,
+        grazeEditorNavigationBindings = GrazeEditorNavigationBindings,
         homeNavigationBindings = HomeNavigationBindings,
         listNavigationBindings = ListNavigationBindings,
         messagesNavigationBindings = MessagesNavigationBindings,
@@ -155,6 +158,10 @@ fun createAppState(
             scaffoldBindings = scaffoldBindings,
             dataBindings = dataBindings,
         ),
+        grazeEditorBindings = GrazeEditorBindings(
+            scaffoldBindings = scaffoldBindings,
+            dataBindings = dataBindings,
+        ),
         homeBindings = HomeBindings(
             scaffoldBindings = scaffoldBindings,
             dataBindings = dataBindings,

composeApp/src/commonMain/kotlin/com/tunjid/heron/di/AppGraph.kt

@@ -26,6 +26,7 @@ import com.tunjid.heron.data.utilities.writequeue.WriteQueue
 import com.tunjid.heron.editprofile.di.EditProfileBindings
 import com.tunjid.heron.feed.di.FeedBindings
 import com.tunjid.heron.gallery.di.GalleryBindings
+import com.tunjid.heron.graze.editor.di.GrazeEditorBindings
 import com.tunjid.heron.home.di.HomeBindings
 import com.tunjid.heron.images.ImageLoader
 import com.tunjid.heron.list.di.ListBindings
@@ -73,6 +74,7 @@ interface AppGraph {
             @Includes editProfileBindings: EditProfileBindings,
             @Includes feedBindings: FeedBindings,
             @Includes galleryBindings: GalleryBindings,
+            @Includes grazeEditorBindings: GrazeEditorBindings,
             @Includes homeBindings: HomeBindings,
             @Includes listBindings: ListBindings,
             @Includes messagesBindings: MessagesBindings,

composeApp/src/commonMain/kotlin/com/tunjid/heron/di/AppNavigationGraph.kt

@@ -21,6 +21,7 @@ import com.tunjid.heron.conversation.di.ConversationNavigationBindings
 import com.tunjid.heron.editprofile.di.EditProfileNavigationBindings
 import com.tunjid.heron.feed.di.FeedNavigationBindings
 import com.tunjid.heron.gallery.di.GalleryNavigationBindings
+import com.tunjid.heron.graze.editor.di.GrazeEditorNavigationBindings
 import com.tunjid.heron.home.di.HomeNavigationBindings
 import com.tunjid.heron.list.di.ListNavigationBindings
 import com.tunjid.heron.messages.di.MessagesNavigationBindings
@@ -55,6 +56,7 @@ interface AppNavigationGraph {
             @Includes editProfileNavigationBindings: EditProfileNavigationBindings,
             @Includes feedNavigationBindings: FeedNavigationBindings,
             @Includes galleryNavigationBindings: GalleryNavigationBindings,
+            @Includes grazeEditorNavigationBindings: GrazeEditorNavigationBindings,
             @Includes homeNavigationBindings: HomeNavigationBindings,
             @Includes listNavigationBindings: ListNavigationBindings,
             @Includes messagesNavigationBindings: MessagesNavigationBindings,

data/core/build.gradle.kts

@@ -31,6 +31,7 @@ kotlin {
         commonMain {
             dependencies {
                 implementation(project(":data:files"))
+                implementation(project(":data:graze"))
                 implementation(project(":data:models"))
                 implementation(project(":data:database"))
                 implementation(project(":data:lexicons"))

data/core/src/commonMain/kotlin/com/tunjid/heron/data/datastore/migrations/SavedStateVersion.kt

@@ -84,6 +84,10 @@ internal data class VersionedSavedState(
             ?.let(profileData::get)
             ?.auth
 
+    override fun profileData(
+        profileId: ProfileId,
+    ): ProfileData? = profileData[profileId]
+
     companion object {
         internal val Initial: VersionedSavedState = VersionedSavedState(
             version = CurrentVersion,

data/core/src/commonMain/kotlin/com/tunjid/heron/data/di/Bindings.kt

@@ -37,6 +37,8 @@ import com.tunjid.heron.data.files.FileManager
 import com.tunjid.heron.data.files.createFileManager
 import com.tunjid.heron.data.network.BlueskyJson
 import com.tunjid.heron.data.network.ConnectivityNetworkMonitor
+import com.tunjid.heron.data.network.FeedCreationService
+import com.tunjid.heron.data.network.GrazeFeedCreationService
 import com.tunjid.heron.data.network.KtorNetworkService
 import com.tunjid.heron.data.network.NetworkConnectionException
 import com.tunjid.heron.data.network.NetworkMonitor
@@ -242,6 +244,12 @@ class DataBindings(
         videoUploadService: SuspendingVideoUploadService,
     ): VideoUploadService = videoUploadService
 
+    @SingleIn(AppScope::class)
+    @Provides
+    internal fun provideFeedCreationService(
+        feedCreationService: GrazeFeedCreationService,
+    ): FeedCreationService = feedCreationService
+
     @SingleIn(AppScope::class)
     @Provides
     fun providePostDao(

data/core/src/commonMain/kotlin/com/tunjid/heron/data/network/FeedCreationService.kt

@@ -0,0 +1,235 @@
+/*
+ *    Copyright 2024 Adetunji Dahunsi
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package com.tunjid.heron.data.network
+
+import com.atproto.server.GetServiceAuthQueryParams
+import com.tunjid.heron.data.InternalEndpoints
+import com.tunjid.heron.data.core.types.RecordKey
+import com.tunjid.heron.data.graze.Filter
+import com.tunjid.heron.data.graze.GrazeDid
+import com.tunjid.heron.data.graze.GrazeFeed
+import com.tunjid.heron.data.logging.LogPriority
+import com.tunjid.heron.data.logging.logcat
+import com.tunjid.heron.data.logging.loggableText
+import com.tunjid.heron.data.repository.SavedStateDataSource
+import com.tunjid.heron.data.repository.expiredSessionResult
+import com.tunjid.heron.data.repository.inCurrentProfileSession
+import com.tunjid.heron.data.utilities.mapCatchingUnlessCancelled
+import dev.zacsweers.metro.Inject
+import io.ktor.client.HttpClient
+import io.ktor.client.call.body
+import io.ktor.client.plugins.DefaultRequest
+import io.ktor.client.plugins.HttpTimeout
+import io.ktor.client.plugins.logging.LogLevel
+import io.ktor.client.plugins.logging.Logger
+import io.ktor.client.plugins.logging.Logging
+import io.ktor.client.request.bearerAuth
+import io.ktor.client.request.post
+import io.ktor.client.request.setBody
+import io.ktor.client.statement.bodyAsText
+import io.ktor.http.ContentType
+import io.ktor.http.HttpStatusCode
+import io.ktor.http.contentType
+import io.ktor.http.isSuccess
+import io.ktor.http.takeFrom
+import kotlin.time.Clock
+import kotlin.time.Duration.Companion.minutes
+import kotlin.time.Duration.Companion.seconds
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import sh.christian.ozone.api.Did
+import sh.christian.ozone.api.Nsid
+
+internal interface FeedCreationService {
+
+    suspend fun updateGrazeFeed(
+        update: GrazeFeed.Update,
+    ): Result<GrazeResponse>
+}
+
+internal class GrazeFeedCreationService @Inject constructor(
+    httpClient: HttpClient,
+    private val networkService: NetworkService,
+    private val savedStateDataSource: SavedStateDataSource,
+) : FeedCreationService {
+
+    private val feedCreationClient = httpClient.config {
+        install(DefaultRequest) {
+            url.takeFrom(InternalEndpoints.HeronEndpoint)
+        }
+        install(Logging) {
+            level = LogLevel.INFO
+            logger = object : Logger {
+                override fun log(message: String) {
+                    logcat(LogPriority.VERBOSE) { message }
+                }
+            }
+        }
+        install(HttpTimeout) {
+            requestTimeoutMillis = 15.seconds.inWholeMilliseconds
+        }
+    }
+
+    override suspend fun updateGrazeFeed(
+        update: GrazeFeed.Update,
+    ): Result<GrazeResponse> =
+        when (update) {
+            is GrazeFeed.Update.Create -> performRequest<GrazeResponse.Created>(
+                call = GrazeCall.Create,
+                body = GrazeRequestBody.Feed(update.feed),
+            )
+            is GrazeFeed.Update.Delete -> performRequest<GrazeResponse.Deleted>(
+                call = (GrazeCall.Delete),
+                body = GrazeRequestBody.Key(
+                    recordKey = update.recordKey,
+                ),
+            )
+
+            is GrazeFeed.Update.Edit -> performRequest<GrazeResponse.Edited>(
+                call = GrazeCall.Edit,
+                body = GrazeRequestBody.Feed(update.feed),
+            )
+            is GrazeFeed.Update.Get -> performRequest<GrazeResponse.Read>(
+                call = GrazeCall.Get,
+                body = GrazeRequestBody.Key(
+                    recordKey = update.recordKey,
+                ),
+            )
+        }
+
+    private suspend inline fun <reified T : GrazeResponse> performRequest(
+        call: GrazeCall,
+        body: GrazeRequestBody,
+    ): Result<GrazeResponse> = savedStateDataSource.inCurrentProfileSession { signedInProfileId ->
+        if (signedInProfileId == null) return@inCurrentProfileSession expiredSessionResult()
+
+        networkService.runCatchingWithMonitoredNetworkRetry {
+            getServiceAuth(
+                GetServiceAuthQueryParams(
+                    aud = Did(GrazeDid.id),
+                    exp = Clock.System.now().epochSeconds + 30.minutes.inWholeSeconds,
+                    lxm = call.lexicon,
+                ),
+            )
+        }.mapCatchingUnlessCancelled { tokenResponse ->
+            val response = feedCreationClient.post(call.path) {
+                setBody(body.body())
+                contentType(ContentType.Application.Json)
+                bearerAuth(tokenResponse.token)
+            }
+
+            if (!response.status.isSuccess()) when (response.status) {
+                HttpStatusCode.NotFound -> return@mapCatchingUnlessCancelled GrazeResponse.Deleted(
+                    rkey = body.recordKey,
+                )
+                else -> throw Exception(response.bodyAsText())
+            }
+            response.body<T>()
+        }
+            .onFailure {
+                logcat(LogPriority.DEBUG) {
+                    "Failed graze call notification for ${call.path}: ${it.loggableText()}"
+                }
+            }
+    } ?: expiredSessionResult()
+}
+
+private enum class GrazeCall(
+    val path: String,
+    val lexicon: Nsid,
+) {
+    Create(
+        path = "/createGrazeFeed",
+        lexicon = Nsid("com.atproto.repo.createRecord"),
+    ),
+    Edit(
+        path = "/editGrazeFeed",
+        lexicon = Nsid("com.atproto.repo.putRecord"),
+    ),
+    Delete(
+        path = "/deleteGrazeFeed",
+        lexicon = Nsid("com.atproto.repo.deleteRecord"),
+    ),
+    Get(
+        path = "/getGrazeFeed",
+        lexicon = Nsid("com.atproto.repo.getRecord"),
+    ),
+}
+
+private sealed interface GrazeRequestBody {
+    val recordKey: RecordKey
+
+    fun body(): Any
+
+    @Serializable
+    data class Key(
+        @SerialName("rkey")
+        override val recordKey: RecordKey,
+    ) : GrazeRequestBody {
+        override fun body(): Any = this
+    }
+
+    data class Feed(
+        val feed: GrazeFeed,
+    ) : GrazeRequestBody {
+        override val recordKey: RecordKey
+            get() = feed.recordKey
+
+        override fun body(): Any = feed
+    }
+}
+
+@Serializable
+internal sealed interface GrazeResponse {
+
+    val rkey: RecordKey
+
+    @Serializable
+    data class Deleted(
+        override val rkey: RecordKey,
+    ) : GrazeResponse
+
+    @Serializable
+    data class Created(
+        override val rkey: RecordKey,
+        val contentMode: String,
+    ) : GrazeResponse
+
+    @Serializable
+    data class Edited(
+        override val rkey: RecordKey,
+        val contentMode: String,
+    ) : GrazeResponse
+
+    @Serializable
+    data class Read(
+        override val rkey: RecordKey,
+        val contentMode: String,
+        val algorithm: Detail,
+    ) : GrazeResponse {
+        @Serializable
+        data class Detail(
+            val order: String,
+            val manifest: Manifest,
+        )
+
+        @Serializable
+        data class Manifest(
+            val filter: Filter.Root,
+        )
+    }
+}