Skip to content

Introduce riverpod - complete #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Feb 26, 2025
Merged

Introduce riverpod - complete #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3e546de
Updated to flutter 3.27.0
tomkad99 Feb 17, 2025
51e75f0
Migrated login to provider
tmaxxdd Feb 17, 2025
b3330b7
Added other providers
tmaxxdd Feb 17, 2025
2ff0855
Handled providers in pages
tmaxxdd Feb 17, 2025
3ed7131
Migrate to new pigeon (#29)
tmaxxdd Feb 26, 2025
5c2ddac
Merge branch 'develop' into feature/introduce-riverpod
tmaxxdd Feb 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2,526 changes: 0 additions & 2,526 deletions app/src/main/java/dev/snipme/snipmeapp/bridge/Bridge.java
View file
Open in desktop

This file was deleted.

97 changes: 43 additions & 54 deletions app/src/main/java/dev/snipme/snipmeapp/bridge/ModelPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,13 @@ import org.koin.core.component.KoinComponent
import dev.snipme.snipmeapp.domain.reaction.UserReaction
import dev.snipme.snipmeapp.domain.snippets.*
import java.util.*

/*
flutter pub run pigeon \
--input bridge/main_model.dart \
--dart_out lib/model/main_model.dart \
--java_out ../app/src/main/java/dev/snipme/snipmeapp/bridge/Bridge.java \
--java_package "dev.snipme.snipmeapp.bridge"
*/
import dev.snipme.snipmeapp.channel.Snippet as ChannelSnippet
import dev.snipme.snipmeapp.channel.SnippetCode as ChannelSnippetCode
import dev.snipme.snipmeapp.channel.SnippetLanguage as ChannelSnippetLanguage
import dev.snipme.snipmeapp.channel.SnippetLanguageType as ChannelSnippetLanguageType
import dev.snipme.snipmeapp.channel.UserReaction as ChannelUserReaction
import dev.snipme.snipmeapp.channel.SyntaxToken as ChannelSyntaxToken
import dev.snipme.snipmeapp.channel.Owner as ChannelOwner

abstract class ModelPlugin<T> : FlutterPlugin, KoinComponent {

Expand All @@ -32,58 +31,49 @@ abstract class ModelPlugin<T> : FlutterPlugin, KoinComponent {
}
}

fun Snippet.toModelData(): Bridge.Snippet {
val it = this
return Bridge.Snippet().apply {
uuid = it.uuid
title = it.title
code = it.code.toModelSnippetCode()
language = it.language.toModelSnippetLanguage()
owner = it.owner.toModelOwner()
isOwner = it.isOwner
voteResult = (it.numberOfLikes - it.numberOfDislikes).toLong()
userReaction = it.userReaction.toModelUserReaction()
isLiked = it.userReaction.toModelReactionState(UserReaction.LIKE)
isDisliked = it.userReaction.toModelReactionState(UserReaction.DISLIKE)
isPrivate = it.visibility == SnippetVisibility.PRIVATE
isSaved = calculateSavedState(it.isOwner, it.visibility)
isToDelete = it.isOwner
fun Snippet.toModelData(): ChannelSnippet =
ChannelSnippet(
uuid = uuid,
title = title,
code = code.toModelSnippetCode(),
language = language.toModelSnippetLanguage(),
owner = owner.toModelOwner(),
isOwner = isOwner,
voteResult = (numberOfLikes - numberOfDislikes).toLong(),
userReaction = userReaction.toModelUserReaction(),
isLiked = userReaction.toModelReactionState(UserReaction.LIKE),
isDisliked = userReaction.toModelReactionState(UserReaction.DISLIKE),
isPrivate = visibility == SnippetVisibility.PRIVATE,
isSaved = calculateSavedState(isOwner, visibility),
isToDelete = isOwner,
timeAgo = DateUtils.getRelativeTimeSpanString(
it.modifiedAt.time,
modifiedAt.time,
Date().time,
DateUtils.SECOND_IN_MILLIS
).toString()
}
}
)

private fun Owner.toModelOwner() =
Bridge.Owner().let {
it.id = id.toLong()
it.login = login
it
}
private fun Owner.toModelOwner() = ChannelOwner(id = id.toLong(), login = login)

private fun SnippetCode.toModelSnippetCode() =
Bridge.SnippetCode().let {
it.raw = raw
it.tokens = highlighted.getSpans<ForegroundColorSpan>().map { span ->
ChannelSnippetCode(
raw = raw,
tokens = highlighted.getSpans<ForegroundColorSpan>().map { span ->
span.toSyntaxToken(highlighted)
}
it
}
},
)

private fun SnippetLanguage.toModelSnippetLanguage() =
Bridge.SnippetLanguage().let {
it.raw = raw
it.type = Bridge.SnippetLanguageType.valueOf(type.name)
it
}
ChannelSnippetLanguage(
raw = raw,
type = ChannelSnippetLanguageType.valueOf(type.name),
)

private fun UserReaction.toModelUserReaction(): Bridge.UserReaction =
private fun UserReaction.toModelUserReaction(): ChannelUserReaction =
when (this) {
UserReaction.LIKE -> Bridge.UserReaction.LIKE
UserReaction.DISLIKE -> Bridge.UserReaction.DISLIKE
else -> Bridge.UserReaction.NONE
UserReaction.LIKE -> ChannelUserReaction.LIKE
UserReaction.DISLIKE -> ChannelUserReaction.DISLIKE
else -> ChannelUserReaction.NONE
}

private fun UserReaction.toModelReactionState(reaction: UserReaction) =
Expand All @@ -98,9 +88,8 @@ private fun calculateSavedState(
}

private fun ForegroundColorSpan.toSyntaxToken(spannable: Spanned) =
Bridge.SyntaxToken().let {
it.start = spannable.getSpanStart(this).toLong()
it.end = spannable.getSpanEnd(this).toLong()
it.color = foregroundColor.toLong()
it
}
ChannelSyntaxToken(
start = spannable.getSpanStart(this).toLong(),
end = spannable.getSpanEnd(this).toLong(),
color = foregroundColor.toLong(),
)
58 changes: 31 additions & 27 deletions app/src/main/java/dev/snipme/snipmeapp/bridge/detail/DetailModelPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,29 @@ package dev.snipme.snipmeapp.bridge.detail

import io.flutter.plugin.common.BinaryMessenger
import org.koin.core.component.inject
import dev.snipme.snipmeapp.bridge.Bridge
import dev.snipme.snipmeapp.bridge.ModelPlugin
import dev.snipme.snipmeapp.bridge.toModelData
import dev.snipme.snipmeapp.channel.DetailModelBridge as ChannelDetailModelBridge
import dev.snipme.snipmeapp.channel.ModelState as ChannelModelState
import dev.snipme.snipmeapp.channel.DetailModelStateData as ChannelDetailModelStateData
import dev.snipme.snipmeapp.channel.DetailModelEvent as ChannelDetailModelEvent
import dev.snipme.snipmeapp.channel.DetailModelEventData as ChannelDetailModelEventData

class DetailModelPlugin : ModelPlugin<Bridge.DetailModelBridge>(), Bridge.DetailModelBridge {
class DetailModelPlugin : ModelPlugin<ChannelDetailModelBridge>(), ChannelDetailModelBridge {
private val model: DetailModel by inject()
private var oldEvent: DetailEvent? = null
private var oldState: DetailViewState? = null

override fun getState(): Bridge.DetailModelStateData = getData(model.state.value)
override fun getState(): ChannelDetailModelStateData = getData(model.state.value)

override fun getEvent(): Bridge.DetailModelEventData = getEvent(model.event.value)
override fun getEvent(): ChannelDetailModelEventData = getEvent(model.event.value)

override fun resetEvent() {
model.event.value = Idle
}

override fun onSetup(messenger: BinaryMessenger, bridge: Bridge.DetailModelBridge?) {
Bridge.DetailModelBridge.setUp(messenger, bridge)
override fun onSetup(messenger: BinaryMessenger, bridge: ChannelDetailModelBridge?) {
ChannelDetailModelBridge.setUp(messenger, bridge)
}

override fun load(uuid: String) {
Expand Down Expand Up @@ -51,40 +55,40 @@ class DetailModelPlugin : ModelPlugin<Bridge.DetailModelBridge>(), Bridge.Detail
model.delete()
}

private fun getData(viewState: DetailViewState): Bridge.DetailModelStateData {
return Bridge.DetailModelStateData().apply {
state = viewState.toModelState()
isLoading = viewState is Loading
data = (viewState as? Loaded)?.snippet?.toModelData()
oldHash = oldState?.hashCode()?.toLong()
newHash = viewState.hashCode().toLong()
}.also {
private fun getData(viewState: DetailViewState): ChannelDetailModelStateData {
return ChannelDetailModelStateData(
state = viewState.toModelState(),
isLoading = viewState is Loading,
data = (viewState as? Loaded)?.snippet?.toModelData(),
oldHash = oldState?.hashCode()?.toLong(),
newHash = viewState.hashCode().toLong(),
).also {
oldState = viewState
}
}

private fun getEvent(detailEvent: DetailEvent): Bridge.DetailModelEventData {
return Bridge.DetailModelEventData().apply {
event = detailEvent.toModelEvent()
value = (detailEvent as? Saved)?.snippetId.toString()
oldHash = oldEvent?.hashCode()?.toLong()
newHash = detailEvent.hashCode().toLong()
}.also {
private fun getEvent(detailEvent: DetailEvent): ChannelDetailModelEventData {
return ChannelDetailModelEventData(
event = detailEvent.toModelEvent(),
value = (detailEvent as? Saved)?.snippetId.toString(),
oldHash = oldEvent?.hashCode()?.toLong(),
newHash = detailEvent.hashCode().toLong(),
).also {
oldEvent = detailEvent
}
}

private fun DetailViewState.toModelState() =
when (this) {
Loading -> Bridge.ModelState.LOADING
is Loaded -> Bridge.ModelState.LOADED
else -> Bridge.ModelState.ERROR
Loading -> ChannelModelState.LOADING
is Loaded -> ChannelModelState.LOADED
else -> ChannelModelState.ERROR
}

private fun DetailEvent.toModelEvent() =
when (this) {
is Saved -> Bridge.DetailModelEvent.SAVED
is Deleted -> Bridge.DetailModelEvent.DELETED
else -> Bridge.DetailModelEvent.NONE
is Saved -> ChannelDetailModelEvent.SAVED
is Deleted -> ChannelDetailModelEvent.DELETED
else -> ChannelDetailModelEvent.NONE
}
}
48 changes: 26 additions & 22 deletions app/src/main/java/dev/snipme/snipmeapp/bridge/login/LoginModelPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,28 @@ package dev.snipme.snipmeapp.bridge.login

import io.flutter.plugin.common.BinaryMessenger
import org.koin.core.component.inject
import dev.snipme.snipmeapp.bridge.Bridge
import dev.snipme.snipmeapp.bridge.ModelPlugin
import dev.snipme.snipmeapp.channel.LoginModelBridge as ChannelLoginModelBridge
import dev.snipme.snipmeapp.channel.ModelState as ChannelModelState
import dev.snipme.snipmeapp.channel.LoginModelStateData as ChannelLoginModelStateData
import dev.snipme.snipmeapp.channel.LoginModelEvent as ChannelLoginModelEvent
import dev.snipme.snipmeapp.channel.LoginModelEventData as ChannelLoginModelEventData

class LoginModelPlugin : ModelPlugin<Bridge.LoginModelBridge>(), Bridge.LoginModelBridge {
class LoginModelPlugin : ModelPlugin<ChannelLoginModelBridge>(), ChannelLoginModelBridge {
private var oldEvent: LoginEvent? = null
private var oldState: LoginState? = null
private val model: LoginModel by inject()

override fun getState(): Bridge.LoginModelStateData = getModelState(model.state.value)
override fun getState(): ChannelLoginModelStateData = getModelState(model.state.value)

override fun getEvent(): Bridge.LoginModelEventData = getModelEvent(model.event.value)
override fun getEvent(): ChannelLoginModelEventData = getModelEvent(model.event.value)

override fun resetEvent() {
model.event.value = Idle
}

override fun onSetup(messenger: BinaryMessenger, bridge: Bridge.LoginModelBridge?) {
Bridge.LoginModelBridge.setUp(messenger, bridge)
override fun onSetup(messenger: BinaryMessenger, bridge: ChannelLoginModelBridge?) {
ChannelLoginModelBridge.setUp(messenger, bridge)
}

override fun checkLoginState() {
Expand All @@ -30,35 +34,35 @@ class LoginModelPlugin : ModelPlugin<Bridge.LoginModelBridge>(), Bridge.LoginMod
model.loginOrRegister(email, password)
}

private fun getModelEvent(loginEvent: LoginEvent): Bridge.LoginModelEventData {
return Bridge.LoginModelEventData().apply {
event = loginEvent.toModelLoginEvent()
oldHash = oldEvent?.hashCode()?.toLong() ?: 0
newHash = loginEvent.hashCode().toLong()
}.also {
private fun getModelEvent(loginEvent: LoginEvent): ChannelLoginModelEventData {
return ChannelLoginModelEventData(
event = loginEvent.toModelLoginEvent(),
oldHash = oldEvent?.hashCode()?.toLong() ?: 0,
newHash = loginEvent.hashCode().toLong(),
).also {
oldEvent = loginEvent
}
}

private fun getModelState(loginState: LoginState): Bridge.LoginModelStateData {
return Bridge.LoginModelStateData().apply {
state = loginState.toModelLoginState()
oldHash = oldState?.hashCode()?.toLong() ?: 0
newHash = loginState.hashCode().toLong()
}.also {
private fun getModelState(loginState: LoginState): ChannelLoginModelStateData {
return ChannelLoginModelStateData(
state = loginState.toModelLoginState(),
oldHash = oldState?.hashCode()?.toLong() ?: 0,
newHash = loginState.hashCode().toLong(),
).also {
oldState = loginState
}
}

private fun LoginState.toModelLoginState() =
when (this) {
Loaded -> Bridge.ModelState.LOADED
else -> Bridge.ModelState.LOADING
Loaded -> ChannelModelState.LOADED
else -> ChannelModelState.LOADING
}

private fun LoginEvent.toModelLoginEvent() =
when (this) {
Logged -> Bridge.LoginModelEvent.LOGGED
else -> Bridge.LoginModelEvent.NONE
Logged -> ChannelLoginModelEvent.LOGGED
else -> ChannelLoginModelEvent.NONE
}
}
Loading