diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 2920594eb..cad46e2da 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -189,7 +189,7 @@ dependencies { implementation("androidx.profileinstaller:profileinstaller") baselineProfile(project(":benchmarks")) - implementation("it.vercruysse.lemmyapi:lemmy-api:0.2.16-SNAPSHOT") + implementation("it.vercruysse.lemmyapi:lemmy-api:0.3.2-SNAPSHOT") implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.1") // For custom logging plugin diff --git a/app/src/main/java/com/jerboa/JerboaAppState.kt b/app/src/main/java/com/jerboa/JerboaAppState.kt index e133efddb..d20c15c3f 100644 --- a/app/src/main/java/com/jerboa/JerboaAppState.kt +++ b/app/src/main/java/com/jerboa/JerboaAppState.kt @@ -24,18 +24,18 @@ import com.jerboa.ui.components.post.edit.PostEditReturn import com.jerboa.ui.components.privatemessage.PrivateMessage import com.jerboa.ui.components.remove.comment.CommentRemoveReturn import com.jerboa.ui.components.remove.post.PostRemoveReturn -import it.vercruysse.lemmyapi.v0x19.datatypes.Comment -import it.vercruysse.lemmyapi.v0x19.datatypes.CommentId -import it.vercruysse.lemmyapi.v0x19.datatypes.CommentView -import it.vercruysse.lemmyapi.v0x19.datatypes.Community -import it.vercruysse.lemmyapi.v0x19.datatypes.CommunityId -import it.vercruysse.lemmyapi.v0x19.datatypes.GetCommunityResponse -import it.vercruysse.lemmyapi.v0x19.datatypes.Person -import it.vercruysse.lemmyapi.v0x19.datatypes.PersonId -import it.vercruysse.lemmyapi.v0x19.datatypes.Post -import it.vercruysse.lemmyapi.v0x19.datatypes.PostId -import it.vercruysse.lemmyapi.v0x19.datatypes.PostView -import it.vercruysse.lemmyapi.v0x19.datatypes.PrivateMessageView +import it.vercruysse.lemmyapi.datatypes.Comment +import it.vercruysse.lemmyapi.datatypes.CommentId +import it.vercruysse.lemmyapi.datatypes.CommentView +import it.vercruysse.lemmyapi.datatypes.Community +import it.vercruysse.lemmyapi.datatypes.CommunityId +import it.vercruysse.lemmyapi.datatypes.GetCommunityResponse +import it.vercruysse.lemmyapi.datatypes.Person +import it.vercruysse.lemmyapi.datatypes.PersonId +import it.vercruysse.lemmyapi.datatypes.Post +import it.vercruysse.lemmyapi.datatypes.PostId +import it.vercruysse.lemmyapi.datatypes.PostView +import it.vercruysse.lemmyapi.datatypes.PrivateMessageView import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/jerboa/Utils.kt b/app/src/main/java/com/jerboa/Utils.kt index 0e57ed494..eee6119df 100644 --- a/app/src/main/java/com/jerboa/Utils.kt +++ b/app/src/main/java/com/jerboa/Utils.kt @@ -59,7 +59,7 @@ import com.jerboa.db.APP_SETTINGS_DEFAULT import com.jerboa.db.entity.AppSettings import com.jerboa.ui.components.common.Route import com.jerboa.ui.theme.SMALL_PADDING -import it.vercruysse.lemmyapi.v0x19.datatypes.* +import it.vercruysse.lemmyapi.datatypes.* import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch import okhttp3.Request diff --git a/app/src/main/java/com/jerboa/api/Http.kt b/app/src/main/java/com/jerboa/api/Http.kt index edfcdc37b..0caa56c47 100644 --- a/app/src/main/java/com/jerboa/api/Http.kt +++ b/app/src/main/java/com/jerboa/api/Http.kt @@ -9,6 +9,7 @@ import io.ktor.client.plugins.UserAgent import io.ktor.client.plugins.logging.* import io.ktor.http.HttpHeaders import it.vercruysse.lemmyapi.LemmyApi +import it.vercruysse.lemmyapi.LemmyApiBaseController import it.vercruysse.lemmyapi.pictrs.datatypes.UploadImage import it.vercruysse.lemmyapi.setDefaultClientConfig import kotlinx.coroutines.CompletableDeferred @@ -21,7 +22,6 @@ import java.io.InputStream import java.net.MalformedURLException import java.net.URL import java.util.concurrent.TimeUnit -import it.vercruysse.lemmyapi.v0x19.LemmyApi as LemmyApiV19 const val DEFAULT_INSTANCE = "lemmy.ml" const val DEFAULT_VERSION = "0.19.0" @@ -30,7 +30,7 @@ object API { private val TEMP_RECOGNISED_AS_LEMMY_INSTANCES = mutableSetOf() private val TEMP_NOT_RECOGNISED_AS_LEMMY_INSTANCES = mutableSetOf() private val initialized = CompletableDeferred() - private lateinit var newApi: LemmyApiV19 + private lateinit var newApi: LemmyApiBaseController // Not super reliable if used during startup // But simplifies a lot of things @@ -80,13 +80,13 @@ object API { } } - suspend fun getInstance(): LemmyApiV19 { + suspend fun getInstance(): LemmyApiBaseController { initialized.await() return newApi } // This use is discouraged, use getInstance() as much as possible - fun getInstanceOrNull(): LemmyApiV19? = + fun getInstanceOrNull(): LemmyApiBaseController? = if (::newApi.isInitialized) { newApi } else { @@ -116,12 +116,12 @@ object API { suspend fun setLemmyInstance( instance: String, auth: String? = null, - ): LemmyApiV19 { + ): LemmyApiBaseController { setLemmyInstance(LemmyApi.getLemmyApi(instance, auth)) return newApi } - fun setLemmyInstance(api: LemmyApiV19) { + fun setLemmyInstance(api: LemmyApiBaseController) { Log.d("setLemmyInstance", "Setting lemmy instance to ${api.baseUrl}") version = api.version.toString() newApi = api @@ -132,7 +132,7 @@ object API { host: String, auth: String? = null, overrideVersion: String = DEFAULT_VERSION, - ): LemmyApiV19 = + ): LemmyApiBaseController = try { createTempInstance(host, auth) } catch (e: Throwable) { @@ -143,13 +143,13 @@ object API { suspend fun createTempInstance( host: String, auth: String? = null, - ): LemmyApiV19 = LemmyApi.getLemmyApi(host, auth) + ): LemmyApiBaseController = LemmyApi.getLemmyApi(host, auth) fun createTempInstanceVersion( host: String, version: String, auth: String? = null, - ): LemmyApiV19 = LemmyApi.getLemmyApi(host, version, auth) + ): LemmyApiBaseController = LemmyApi.getLemmyApi(host, version, auth) suspend fun checkIfLemmyInstance(url: String): Boolean { try { diff --git a/app/src/main/java/com/jerboa/datatypes/Others.kt b/app/src/main/java/com/jerboa/datatypes/Others.kt index 18e9ed78a..9cf6bb142 100644 --- a/app/src/main/java/com/jerboa/datatypes/Others.kt +++ b/app/src/main/java/com/jerboa/datatypes/Others.kt @@ -16,13 +16,13 @@ import androidx.compose.ui.graphics.vector.ImageVector import com.jerboa.R import com.jerboa.UnreadOrAll import com.jerboa.ui.components.person.UserTab +import it.vercruysse.lemmyapi.datatypes.Community +import it.vercruysse.lemmyapi.datatypes.Person +import it.vercruysse.lemmyapi.datatypes.Post import it.vercruysse.lemmyapi.dto.CommentSortType import it.vercruysse.lemmyapi.dto.ListingType import it.vercruysse.lemmyapi.dto.PostFeatureType import it.vercruysse.lemmyapi.dto.SortType -import it.vercruysse.lemmyapi.v0x19.datatypes.Community -import it.vercruysse.lemmyapi.v0x19.datatypes.Person -import it.vercruysse.lemmyapi.v0x19.datatypes.Post import kotlinx.serialization.Serializable data class CommentSortData( diff --git a/app/src/main/java/com/jerboa/datatypes/SampleData.kt b/app/src/main/java/com/jerboa/datatypes/SampleData.kt index 9bb7643b2..27bd335b5 100644 --- a/app/src/main/java/com/jerboa/datatypes/SampleData.kt +++ b/app/src/main/java/com/jerboa/datatypes/SampleData.kt @@ -1,43 +1,44 @@ package com.jerboa.datatypes +import it.vercruysse.lemmyapi.datatypes.Comment +import it.vercruysse.lemmyapi.datatypes.CommentAggregates +import it.vercruysse.lemmyapi.datatypes.CommentReply +import it.vercruysse.lemmyapi.datatypes.CommentReplyView +import it.vercruysse.lemmyapi.datatypes.CommentReport +import it.vercruysse.lemmyapi.datatypes.CommentReportView +import it.vercruysse.lemmyapi.datatypes.CommentView +import it.vercruysse.lemmyapi.datatypes.Community +import it.vercruysse.lemmyapi.datatypes.CommunityAggregates +import it.vercruysse.lemmyapi.datatypes.CommunityView +import it.vercruysse.lemmyapi.datatypes.GetSiteResponse +import it.vercruysse.lemmyapi.datatypes.LocalSite +import it.vercruysse.lemmyapi.datatypes.LocalSiteRateLimit +import it.vercruysse.lemmyapi.datatypes.LocalUser +import it.vercruysse.lemmyapi.datatypes.Person +import it.vercruysse.lemmyapi.datatypes.PersonAggregates +import it.vercruysse.lemmyapi.datatypes.PersonMention +import it.vercruysse.lemmyapi.datatypes.PersonMentionView +import it.vercruysse.lemmyapi.datatypes.PersonView +import it.vercruysse.lemmyapi.datatypes.Post +import it.vercruysse.lemmyapi.datatypes.PostAggregates +import it.vercruysse.lemmyapi.datatypes.PostReport +import it.vercruysse.lemmyapi.datatypes.PostReportView +import it.vercruysse.lemmyapi.datatypes.PostView +import it.vercruysse.lemmyapi.datatypes.PrivateMessage +import it.vercruysse.lemmyapi.datatypes.PrivateMessageReport +import it.vercruysse.lemmyapi.datatypes.PrivateMessageReportView +import it.vercruysse.lemmyapi.datatypes.PrivateMessageView +import it.vercruysse.lemmyapi.datatypes.RegistrationApplication +import it.vercruysse.lemmyapi.datatypes.RegistrationApplicationView +import it.vercruysse.lemmyapi.datatypes.Site +import it.vercruysse.lemmyapi.datatypes.SiteAggregates +import it.vercruysse.lemmyapi.datatypes.SiteView +import it.vercruysse.lemmyapi.dto.CommunityVisibility import it.vercruysse.lemmyapi.dto.ListingType import it.vercruysse.lemmyapi.dto.PostListingMode import it.vercruysse.lemmyapi.dto.RegistrationMode import it.vercruysse.lemmyapi.dto.SortType import it.vercruysse.lemmyapi.dto.SubscribedType -import it.vercruysse.lemmyapi.v0x19.datatypes.Comment -import it.vercruysse.lemmyapi.v0x19.datatypes.CommentAggregates -import it.vercruysse.lemmyapi.v0x19.datatypes.CommentReply -import it.vercruysse.lemmyapi.v0x19.datatypes.CommentReplyView -import it.vercruysse.lemmyapi.v0x19.datatypes.CommentReport -import it.vercruysse.lemmyapi.v0x19.datatypes.CommentReportView -import it.vercruysse.lemmyapi.v0x19.datatypes.CommentView -import it.vercruysse.lemmyapi.v0x19.datatypes.Community -import it.vercruysse.lemmyapi.v0x19.datatypes.CommunityAggregates -import it.vercruysse.lemmyapi.v0x19.datatypes.CommunityView -import it.vercruysse.lemmyapi.v0x19.datatypes.GetSiteResponse -import it.vercruysse.lemmyapi.v0x19.datatypes.LocalSite -import it.vercruysse.lemmyapi.v0x19.datatypes.LocalSiteRateLimit -import it.vercruysse.lemmyapi.v0x19.datatypes.LocalUser -import it.vercruysse.lemmyapi.v0x19.datatypes.Person -import it.vercruysse.lemmyapi.v0x19.datatypes.PersonAggregates -import it.vercruysse.lemmyapi.v0x19.datatypes.PersonMention -import it.vercruysse.lemmyapi.v0x19.datatypes.PersonMentionView -import it.vercruysse.lemmyapi.v0x19.datatypes.PersonView -import it.vercruysse.lemmyapi.v0x19.datatypes.Post -import it.vercruysse.lemmyapi.v0x19.datatypes.PostAggregates -import it.vercruysse.lemmyapi.v0x19.datatypes.PostReport -import it.vercruysse.lemmyapi.v0x19.datatypes.PostReportView -import it.vercruysse.lemmyapi.v0x19.datatypes.PostView -import it.vercruysse.lemmyapi.v0x19.datatypes.PrivateMessage -import it.vercruysse.lemmyapi.v0x19.datatypes.PrivateMessageReport -import it.vercruysse.lemmyapi.v0x19.datatypes.PrivateMessageReportView -import it.vercruysse.lemmyapi.v0x19.datatypes.PrivateMessageView -import it.vercruysse.lemmyapi.v0x19.datatypes.RegistrationApplication -import it.vercruysse.lemmyapi.v0x19.datatypes.RegistrationApplicationView -import it.vercruysse.lemmyapi.v0x19.datatypes.Site -import it.vercruysse.lemmyapi.v0x19.datatypes.SiteAggregates -import it.vercruysse.lemmyapi.v0x19.datatypes.SiteView val samplePost = Post( @@ -271,6 +272,7 @@ val sampleCommunity = instance_id = 0, hidden = false, posting_restricted_to_mods = false, + visibility = CommunityVisibility.Public, ) val sampleCommunityFederated = sampleCommunity.copy(local = false) @@ -283,6 +285,7 @@ val samplePostAggregates = upvotes = 8, downvotes = 0, published = "2022-01-02T04:02:44.592929Z", + newest_comment_time = "2022-01-02T04:02:44.592929Z", ) val samplePostView = @@ -300,6 +303,8 @@ val samplePostView = creator_blocked = false, unread_comments = 1, my_vote = 0, + banned_from_community = false, + hidden = false, ) val sampleLinkPostView = @@ -317,6 +322,8 @@ val sampleLinkPostView = creator_blocked = false, unread_comments = 1, my_vote = 0, + banned_from_community = false, + hidden = false, ) val sampleLinkNoThumbnailPostView = @@ -334,6 +341,8 @@ val sampleLinkNoThumbnailPostView = creator_blocked = false, unread_comments = 1, my_vote = 0, + banned_from_community = false, + hidden = false, ) val sampleImagePostView = @@ -351,6 +360,8 @@ val sampleImagePostView = creator_blocked = false, unread_comments = 1, my_vote = 0, + banned_from_community = false, + hidden = false, ) val sampleMarkdownPostView = @@ -368,6 +379,8 @@ val sampleMarkdownPostView = creator_blocked = false, unread_comments = 1, my_vote = 0, + banned_from_community = false, + hidden = false, ) val sampleComment = @@ -448,6 +461,7 @@ val sampleCommentView = creator_blocked = false, creator_is_moderator = false, creator_is_admin = false, + banned_from_community = false, ) val sampleSecondReplyCommentView = @@ -463,6 +477,7 @@ val sampleSecondReplyCommentView = creator_blocked = false, creator_is_moderator = false, creator_is_admin = false, + banned_from_community = false, ) val sampleReplyCommentView = @@ -478,6 +493,7 @@ val sampleReplyCommentView = creator_blocked = false, creator_is_moderator = false, creator_is_admin = false, + banned_from_community = false, ) val sampleCommentReply = @@ -513,6 +529,7 @@ val sampleCommentReplyView = creator_blocked = false, creator_is_moderator = false, creator_is_admin = false, + banned_from_community = false, ) val samplePersonMentionView = @@ -530,6 +547,7 @@ val samplePersonMentionView = creator_blocked = false, creator_is_moderator = false, creator_is_admin = false, + banned_from_community = false, ) val sampleCommunityAggregates = @@ -552,6 +570,7 @@ val sampleCommunityView = subscribed = SubscribedType.NotSubscribed, blocked = false, counts = sampleCommunityAggregates, + banned_from_community = false, ) val samplePersonAggregates = @@ -631,6 +650,8 @@ val sampleLocalSite = hide_modlog_mod_names = true, federation_signed_fetch = false, reports_email_admins = false, + default_sort_type = SortType.Active, + default_post_listing_mode = PostListingMode.Card, ) val sampleSiteAggregates = @@ -683,6 +704,7 @@ val sampleGetSiteRes = GetSiteResponse( taglines = emptyList(), discussion_languages = emptyList(), version = "0.0.1", + blocked_urls = emptyList(), ) val samplePendingRegistrationApplication = @@ -757,6 +779,14 @@ val samplePostReportView = community = sampleCommunity, counts = samplePostAggregates, creator_banned_from_community = false, + hidden = false, + read = false, + creator_is_admin = false, + subscribed = SubscribedType.NotSubscribed, + creator_is_moderator = false, + saved = false, + creator_blocked = false, + unread_comments = 1, ) val sampleCommentReport = @@ -782,6 +812,11 @@ val sampleCommentReportView = community = sampleCommunity, counts = sampleCommentAggregates, creator_banned_from_community = false, + subscribed = SubscribedType.NotSubscribed, + saved = false, + creator_is_admin = false, + creator_is_moderator = false, + creator_blocked = false, ) val samplePrivateMessageReport = diff --git a/app/src/main/java/com/jerboa/datatypes/Utils.kt b/app/src/main/java/com/jerboa/datatypes/Utils.kt index 0d4bca8e6..9ca964f4c 100644 --- a/app/src/main/java/com/jerboa/datatypes/Utils.kt +++ b/app/src/main/java/com/jerboa/datatypes/Utils.kt @@ -3,8 +3,8 @@ package com.jerboa.datatypes import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource import com.jerboa.R -import it.vercruysse.lemmyapi.v0x19.datatypes.Comment -import it.vercruysse.lemmyapi.v0x19.datatypes.Person +import it.vercruysse.lemmyapi.datatypes.Comment +import it.vercruysse.lemmyapi.datatypes.Person fun Person.getDisplayName(): String = this.display_name ?: this.name diff --git a/app/src/main/java/com/jerboa/feat/AccountVerificationState.kt b/app/src/main/java/com/jerboa/feat/AccountVerificationState.kt index 38ee950f9..ffc154f22 100644 --- a/app/src/main/java/com/jerboa/feat/AccountVerificationState.kt +++ b/app/src/main/java/com/jerboa/feat/AccountVerificationState.kt @@ -22,11 +22,11 @@ import com.jerboa.model.AccountViewModel import com.jerboa.model.SiteViewModel import com.jerboa.toEnum import com.jerboa.ui.components.common.apiErrorToast +import it.vercruysse.lemmyapi.LemmyApiBaseController +import it.vercruysse.lemmyapi.datatypes.GetPersonDetails +import it.vercruysse.lemmyapi.datatypes.GetPersonDetailsResponse +import it.vercruysse.lemmyapi.datatypes.GetSiteResponse import it.vercruysse.lemmyapi.exception.LemmyBadRequestException -import it.vercruysse.lemmyapi.v0x19.LemmyApi -import it.vercruysse.lemmyapi.v0x19.datatypes.GetPersonDetails -import it.vercruysse.lemmyapi.v0x19.datatypes.GetPersonDetailsResponse -import it.vercruysse.lemmyapi.v0x19.datatypes.GetSiteResponse import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch @@ -115,7 +115,7 @@ suspend fun checkInstance(instance: String): CheckState = suspend fun checkIfAccountIsDeleted( account: Account, - api: LemmyApi, + api: LemmyApiBaseController, ): Pair?> { return withContext(Dispatchers.IO) { val res = api.getPersonDetails(GetPersonDetails(person_id = account.id)) @@ -149,7 +149,7 @@ fun checkIfAccountIsBanned(userRes: GetPersonDetailsResponse): CheckState = CheckState.Passed } -suspend fun checkIfJWTValid(api: LemmyApi): CheckState { +suspend fun checkIfJWTValid(api: LemmyApiBaseController): CheckState { return withContext(Dispatchers.IO) { // I could use any API endpoint that correctly checks the auth (there are some that don't ex: /site) val resp = api.validateAuth() @@ -220,7 +220,7 @@ suspend fun Account.checkAccountVerification( ): Pair { Log.d("verification", "Verification started") - lateinit var api: LemmyApi + lateinit var api: LemmyApiBaseController var checkState: CheckState = CheckState.Passed var curVerificationState: Int = diff --git a/app/src/main/java/com/jerboa/feat/Block.kt b/app/src/main/java/com/jerboa/feat/Block.kt index d1343d352..f80d3f53c 100644 --- a/app/src/main/java/com/jerboa/feat/Block.kt +++ b/app/src/main/java/com/jerboa/feat/Block.kt @@ -5,11 +5,11 @@ import android.util.Log import android.widget.Toast import com.jerboa.R import com.jerboa.api.API -import it.vercruysse.lemmyapi.v0x19.datatypes.BlockCommunity -import it.vercruysse.lemmyapi.v0x19.datatypes.BlockCommunityResponse -import it.vercruysse.lemmyapi.v0x19.datatypes.BlockInstanceResponse -import it.vercruysse.lemmyapi.v0x19.datatypes.BlockPerson -import it.vercruysse.lemmyapi.v0x19.datatypes.BlockPersonResponse +import it.vercruysse.lemmyapi.datatypes.BlockCommunity +import it.vercruysse.lemmyapi.datatypes.BlockCommunityResponse +import it.vercruysse.lemmyapi.datatypes.BlockInstanceResponse +import it.vercruysse.lemmyapi.datatypes.BlockPerson +import it.vercruysse.lemmyapi.datatypes.BlockPersonResponse import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/jerboa/feat/BlurNSFW.kt b/app/src/main/java/com/jerboa/feat/BlurNSFW.kt index 819c59cec..f34abc4a7 100644 --- a/app/src/main/java/com/jerboa/feat/BlurNSFW.kt +++ b/app/src/main/java/com/jerboa/feat/BlurNSFW.kt @@ -2,7 +2,7 @@ package com.jerboa.feat import androidx.annotation.StringRes import com.jerboa.R -import it.vercruysse.lemmyapi.v0x19.datatypes.PostView +import it.vercruysse.lemmyapi.datatypes.PostView enum class BlurNSFW( @StringRes val resId: Int, diff --git a/app/src/main/java/com/jerboa/feat/ModActions.kt b/app/src/main/java/com/jerboa/feat/ModActions.kt index 39cc1eae1..ce1ddc528 100644 --- a/app/src/main/java/com/jerboa/feat/ModActions.kt +++ b/app/src/main/java/com/jerboa/feat/ModActions.kt @@ -4,9 +4,9 @@ import android.content.Context import com.jerboa.MainActivity import com.jerboa.db.entity.Account import com.jerboa.findActivity -import it.vercruysse.lemmyapi.v0x19.datatypes.CommunityId -import it.vercruysse.lemmyapi.v0x19.datatypes.PersonId -import it.vercruysse.lemmyapi.v0x19.datatypes.PersonView +import it.vercruysse.lemmyapi.datatypes.CommunityId +import it.vercruysse.lemmyapi.datatypes.PersonId +import it.vercruysse.lemmyapi.datatypes.PersonView import java.time.Instant import java.time.temporal.ChronoUnit diff --git a/app/src/main/java/com/jerboa/feat/Voting.kt b/app/src/main/java/com/jerboa/feat/Voting.kt index 38c654799..15f4eebcd 100644 --- a/app/src/main/java/com/jerboa/feat/Voting.kt +++ b/app/src/main/java/com/jerboa/feat/Voting.kt @@ -1,6 +1,6 @@ package com.jerboa.feat -import it.vercruysse.lemmyapi.v0x19.datatypes.LocalUserVoteDisplayMode +import it.vercruysse.lemmyapi.datatypes.LocalUserVoteDisplayMode enum class VoteType( val value: Int, diff --git a/app/src/main/java/com/jerboa/feed/PaginationController.kt b/app/src/main/java/com/jerboa/feed/PaginationController.kt index 02d751119..4756e3059 100644 --- a/app/src/main/java/com/jerboa/feed/PaginationController.kt +++ b/app/src/main/java/com/jerboa/feed/PaginationController.kt @@ -1,6 +1,6 @@ package com.jerboa.feed -import it.vercruysse.lemmyapi.v0x19.datatypes.PaginationCursor +import it.vercruysse.lemmyapi.datatypes.PaginationCursor class PaginationController( var page: Long = 1, diff --git a/app/src/main/java/com/jerboa/feed/PostController.kt b/app/src/main/java/com/jerboa/feed/PostController.kt index 90a0cf305..eaa84a94a 100644 --- a/app/src/main/java/com/jerboa/feed/PostController.kt +++ b/app/src/main/java/com/jerboa/feed/PostController.kt @@ -1,9 +1,9 @@ package com.jerboa.feed import com.jerboa.datatypes.BanFromCommunityData -import it.vercruysse.lemmyapi.v0x19.datatypes.HidePost -import it.vercruysse.lemmyapi.v0x19.datatypes.Person -import it.vercruysse.lemmyapi.v0x19.datatypes.PostView +import it.vercruysse.lemmyapi.datatypes.HidePost +import it.vercruysse.lemmyapi.datatypes.Person +import it.vercruysse.lemmyapi.datatypes.PostView open class PostController : FeedController() { fun findAndUpdatePost(updatedPostView: PostView) { diff --git a/app/src/main/java/com/jerboa/model/AccountSettingsViewModel.kt b/app/src/main/java/com/jerboa/model/AccountSettingsViewModel.kt index ddcf95b5b..47ee81b3e 100644 --- a/app/src/main/java/com/jerboa/model/AccountSettingsViewModel.kt +++ b/app/src/main/java/com/jerboa/model/AccountSettingsViewModel.kt @@ -16,7 +16,7 @@ import com.jerboa.db.entity.Account import com.jerboa.db.repository.AccountRepository import com.jerboa.jerboaApplication import com.jerboa.ui.components.common.apiErrorToast -import it.vercruysse.lemmyapi.v0x19.datatypes.SaveUserSettings +import it.vercruysse.lemmyapi.datatypes.SaveUserSettings import kotlinx.coroutines.launch @Stable diff --git a/app/src/main/java/com/jerboa/model/BanFromCommunityViewModel.kt b/app/src/main/java/com/jerboa/model/BanFromCommunityViewModel.kt index 6ca6a0082..0368f073c 100644 --- a/app/src/main/java/com/jerboa/model/BanFromCommunityViewModel.kt +++ b/app/src/main/java/com/jerboa/model/BanFromCommunityViewModel.kt @@ -18,10 +18,10 @@ import com.jerboa.datatypes.BanFromCommunityData import com.jerboa.feat.futureDaysToUnixTime import com.jerboa.personNameShown import com.jerboa.ui.components.common.apiErrorToast -import it.vercruysse.lemmyapi.v0x19.datatypes.BanFromCommunity -import it.vercruysse.lemmyapi.v0x19.datatypes.BanFromCommunityResponse -import it.vercruysse.lemmyapi.v0x19.datatypes.Community -import it.vercruysse.lemmyapi.v0x19.datatypes.PersonId +import it.vercruysse.lemmyapi.datatypes.BanFromCommunity +import it.vercruysse.lemmyapi.datatypes.BanFromCommunityResponse +import it.vercruysse.lemmyapi.datatypes.Community +import it.vercruysse.lemmyapi.datatypes.PersonId import kotlinx.coroutines.launch class BanFromCommunityViewModel : ViewModel() { diff --git a/app/src/main/java/com/jerboa/model/BanPersonViewModel.kt b/app/src/main/java/com/jerboa/model/BanPersonViewModel.kt index 1ff82cfb7..ff9ecfd8f 100644 --- a/app/src/main/java/com/jerboa/model/BanPersonViewModel.kt +++ b/app/src/main/java/com/jerboa/model/BanPersonViewModel.kt @@ -16,10 +16,10 @@ import com.jerboa.api.toApiState import com.jerboa.feat.futureDaysToUnixTime import com.jerboa.personNameShown import com.jerboa.ui.components.common.apiErrorToast -import it.vercruysse.lemmyapi.v0x19.datatypes.BanPerson -import it.vercruysse.lemmyapi.v0x19.datatypes.BanPersonResponse -import it.vercruysse.lemmyapi.v0x19.datatypes.PersonId -import it.vercruysse.lemmyapi.v0x19.datatypes.PersonView +import it.vercruysse.lemmyapi.datatypes.BanPerson +import it.vercruysse.lemmyapi.datatypes.BanPersonResponse +import it.vercruysse.lemmyapi.datatypes.PersonId +import it.vercruysse.lemmyapi.datatypes.PersonView import kotlinx.coroutines.launch class BanPersonViewModel : ViewModel() { diff --git a/app/src/main/java/com/jerboa/model/BlockViewModel.kt b/app/src/main/java/com/jerboa/model/BlockViewModel.kt index bda584507..0057fec99 100644 --- a/app/src/main/java/com/jerboa/model/BlockViewModel.kt +++ b/app/src/main/java/com/jerboa/model/BlockViewModel.kt @@ -10,13 +10,13 @@ import com.jerboa.feat.showBlockCommunityToast import com.jerboa.feat.showBlockInstanceToast import com.jerboa.feat.showBlockPersonToast import com.jerboa.feed.ApiActionController -import it.vercruysse.lemmyapi.v0x19.datatypes.BlockCommunity -import it.vercruysse.lemmyapi.v0x19.datatypes.BlockInstance -import it.vercruysse.lemmyapi.v0x19.datatypes.BlockPerson -import it.vercruysse.lemmyapi.v0x19.datatypes.Community -import it.vercruysse.lemmyapi.v0x19.datatypes.Instance -import it.vercruysse.lemmyapi.v0x19.datatypes.MyUserInfo -import it.vercruysse.lemmyapi.v0x19.datatypes.Person +import it.vercruysse.lemmyapi.datatypes.BlockCommunity +import it.vercruysse.lemmyapi.datatypes.BlockInstance +import it.vercruysse.lemmyapi.datatypes.BlockPerson +import it.vercruysse.lemmyapi.datatypes.Community +import it.vercruysse.lemmyapi.datatypes.Instance +import it.vercruysse.lemmyapi.datatypes.MyUserInfo +import it.vercruysse.lemmyapi.datatypes.Person import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext diff --git a/app/src/main/java/com/jerboa/model/CommentEditViewModel.kt b/app/src/main/java/com/jerboa/model/CommentEditViewModel.kt index 425d901cb..5caf344fe 100644 --- a/app/src/main/java/com/jerboa/model/CommentEditViewModel.kt +++ b/app/src/main/java/com/jerboa/model/CommentEditViewModel.kt @@ -9,9 +9,9 @@ import androidx.lifecycle.viewModelScope import com.jerboa.api.API import com.jerboa.api.ApiState import com.jerboa.api.toApiState -import it.vercruysse.lemmyapi.v0x19.datatypes.CommentResponse -import it.vercruysse.lemmyapi.v0x19.datatypes.CommentView -import it.vercruysse.lemmyapi.v0x19.datatypes.EditComment +import it.vercruysse.lemmyapi.datatypes.CommentResponse +import it.vercruysse.lemmyapi.datatypes.CommentView +import it.vercruysse.lemmyapi.datatypes.EditComment import kotlinx.coroutines.launch class CommentEditViewModel : ViewModel() { diff --git a/app/src/main/java/com/jerboa/model/CommentLikesViewModel.kt b/app/src/main/java/com/jerboa/model/CommentLikesViewModel.kt index f198a2a3b..abb0b8bbf 100644 --- a/app/src/main/java/com/jerboa/model/CommentLikesViewModel.kt +++ b/app/src/main/java/com/jerboa/model/CommentLikesViewModel.kt @@ -13,9 +13,9 @@ import com.jerboa.api.API import com.jerboa.api.ApiState import com.jerboa.api.toApiState import com.jerboa.getDeduplicateMerge -import it.vercruysse.lemmyapi.v0x19.datatypes.CommentId -import it.vercruysse.lemmyapi.v0x19.datatypes.ListCommentLikes -import it.vercruysse.lemmyapi.v0x19.datatypes.ListCommentLikesResponse +import it.vercruysse.lemmyapi.datatypes.CommentId +import it.vercruysse.lemmyapi.datatypes.ListCommentLikes +import it.vercruysse.lemmyapi.datatypes.ListCommentLikesResponse import kotlinx.coroutines.launch class CommentLikesViewModel( diff --git a/app/src/main/java/com/jerboa/model/CommentRemoveViewModel.kt b/app/src/main/java/com/jerboa/model/CommentRemoveViewModel.kt index cb3a4525a..9f3ee7995 100644 --- a/app/src/main/java/com/jerboa/model/CommentRemoveViewModel.kt +++ b/app/src/main/java/com/jerboa/model/CommentRemoveViewModel.kt @@ -14,10 +14,10 @@ import com.jerboa.api.API import com.jerboa.api.ApiState import com.jerboa.api.toApiState import com.jerboa.ui.components.common.apiErrorToast -import it.vercruysse.lemmyapi.v0x19.datatypes.CommentId -import it.vercruysse.lemmyapi.v0x19.datatypes.CommentResponse -import it.vercruysse.lemmyapi.v0x19.datatypes.CommentView -import it.vercruysse.lemmyapi.v0x19.datatypes.RemoveComment +import it.vercruysse.lemmyapi.datatypes.CommentId +import it.vercruysse.lemmyapi.datatypes.CommentResponse +import it.vercruysse.lemmyapi.datatypes.CommentView +import it.vercruysse.lemmyapi.datatypes.RemoveComment import kotlinx.coroutines.launch class CommentRemoveViewModel : ViewModel() { diff --git a/app/src/main/java/com/jerboa/model/CommentReplyViewModel.kt b/app/src/main/java/com/jerboa/model/CommentReplyViewModel.kt index 8c6e9762e..aea078d02 100644 --- a/app/src/main/java/com/jerboa/model/CommentReplyViewModel.kt +++ b/app/src/main/java/com/jerboa/model/CommentReplyViewModel.kt @@ -12,12 +12,12 @@ import com.jerboa.api.API import com.jerboa.api.ApiState import com.jerboa.api.toApiState import com.jerboa.ui.components.common.apiErrorToast -import it.vercruysse.lemmyapi.v0x19.datatypes.CommentReplyView -import it.vercruysse.lemmyapi.v0x19.datatypes.CommentResponse -import it.vercruysse.lemmyapi.v0x19.datatypes.CommentView -import it.vercruysse.lemmyapi.v0x19.datatypes.CreateComment -import it.vercruysse.lemmyapi.v0x19.datatypes.PersonMentionView -import it.vercruysse.lemmyapi.v0x19.datatypes.PostView +import it.vercruysse.lemmyapi.datatypes.CommentReplyView +import it.vercruysse.lemmyapi.datatypes.CommentResponse +import it.vercruysse.lemmyapi.datatypes.CommentView +import it.vercruysse.lemmyapi.datatypes.CreateComment +import it.vercruysse.lemmyapi.datatypes.PersonMentionView +import it.vercruysse.lemmyapi.datatypes.PostView import kotlinx.coroutines.launch import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/jerboa/model/CommunityListViewModel.kt b/app/src/main/java/com/jerboa/model/CommunityListViewModel.kt index 84c8e4b35..e6876804e 100644 --- a/app/src/main/java/com/jerboa/model/CommunityListViewModel.kt +++ b/app/src/main/java/com/jerboa/model/CommunityListViewModel.kt @@ -10,13 +10,13 @@ import androidx.lifecycle.viewmodel.CreationExtras import com.jerboa.api.API import com.jerboa.api.ApiState import com.jerboa.api.toApiState +import it.vercruysse.lemmyapi.datatypes.CommunityAggregates +import it.vercruysse.lemmyapi.datatypes.CommunityFollowerView +import it.vercruysse.lemmyapi.datatypes.CommunityView +import it.vercruysse.lemmyapi.datatypes.Search +import it.vercruysse.lemmyapi.datatypes.SearchResponse import it.vercruysse.lemmyapi.dto.SearchType import it.vercruysse.lemmyapi.dto.SubscribedType -import it.vercruysse.lemmyapi.v0x19.datatypes.CommunityAggregates -import it.vercruysse.lemmyapi.v0x19.datatypes.CommunityFollowerView -import it.vercruysse.lemmyapi.v0x19.datatypes.CommunityView -import it.vercruysse.lemmyapi.v0x19.datatypes.Search -import it.vercruysse.lemmyapi.v0x19.datatypes.SearchResponse import kotlinx.coroutines.launch class CommunityListViewModel( @@ -57,6 +57,7 @@ class CommunityListViewModel( users_active_month = 0, users_active_half_year = 0, ), + banned_from_community = false, ) } diff --git a/app/src/main/java/com/jerboa/model/CommunityViewModel.kt b/app/src/main/java/com/jerboa/model/CommunityViewModel.kt index b2d691643..8d6b5acc4 100644 --- a/app/src/main/java/com/jerboa/model/CommunityViewModel.kt +++ b/app/src/main/java/com/jerboa/model/CommunityViewModel.kt @@ -15,14 +15,14 @@ import com.jerboa.api.toApiState import com.jerboa.db.repository.AccountRepository import com.jerboa.feat.showBlockCommunityToast import com.jerboa.jerboaApplication -import it.vercruysse.lemmyapi.v0x19.datatypes.BlockCommunity -import it.vercruysse.lemmyapi.v0x19.datatypes.BlockCommunityResponse -import it.vercruysse.lemmyapi.v0x19.datatypes.CommunityId -import it.vercruysse.lemmyapi.v0x19.datatypes.CommunityResponse -import it.vercruysse.lemmyapi.v0x19.datatypes.FollowCommunity -import it.vercruysse.lemmyapi.v0x19.datatypes.GetCommunity -import it.vercruysse.lemmyapi.v0x19.datatypes.GetCommunityResponse -import it.vercruysse.lemmyapi.v0x19.datatypes.GetPosts +import it.vercruysse.lemmyapi.datatypes.BlockCommunity +import it.vercruysse.lemmyapi.datatypes.BlockCommunityResponse +import it.vercruysse.lemmyapi.datatypes.CommunityId +import it.vercruysse.lemmyapi.datatypes.CommunityResponse +import it.vercruysse.lemmyapi.datatypes.FollowCommunity +import it.vercruysse.lemmyapi.datatypes.GetCommunity +import it.vercruysse.lemmyapi.datatypes.GetCommunityResponse +import it.vercruysse.lemmyapi.datatypes.GetPosts import kotlinx.coroutines.launch class CommunityViewModel( diff --git a/app/src/main/java/com/jerboa/model/CreatePostViewModel.kt b/app/src/main/java/com/jerboa/model/CreatePostViewModel.kt index 1f30786a8..c90c1b754 100644 --- a/app/src/main/java/com/jerboa/model/CreatePostViewModel.kt +++ b/app/src/main/java/com/jerboa/model/CreatePostViewModel.kt @@ -8,11 +8,11 @@ import androidx.lifecycle.viewModelScope import com.jerboa.api.API import com.jerboa.api.ApiState import com.jerboa.api.toApiState -import it.vercruysse.lemmyapi.v0x19.datatypes.CreatePost -import it.vercruysse.lemmyapi.v0x19.datatypes.GetSiteMetadata -import it.vercruysse.lemmyapi.v0x19.datatypes.GetSiteMetadataResponse -import it.vercruysse.lemmyapi.v0x19.datatypes.PostId -import it.vercruysse.lemmyapi.v0x19.datatypes.PostResponse +import it.vercruysse.lemmyapi.datatypes.CreatePost +import it.vercruysse.lemmyapi.datatypes.GetSiteMetadata +import it.vercruysse.lemmyapi.datatypes.GetSiteMetadataResponse +import it.vercruysse.lemmyapi.datatypes.PostId +import it.vercruysse.lemmyapi.datatypes.PostResponse import kotlinx.coroutines.launch class CreatePostViewModel : ViewModel() { diff --git a/app/src/main/java/com/jerboa/model/CreateReportViewModel.kt b/app/src/main/java/com/jerboa/model/CreateReportViewModel.kt index cb4848130..2398fcae5 100644 --- a/app/src/main/java/com/jerboa/model/CreateReportViewModel.kt +++ b/app/src/main/java/com/jerboa/model/CreateReportViewModel.kt @@ -12,12 +12,12 @@ import com.jerboa.R import com.jerboa.api.API import com.jerboa.api.ApiState import com.jerboa.api.toApiState -import it.vercruysse.lemmyapi.v0x19.datatypes.CommentId -import it.vercruysse.lemmyapi.v0x19.datatypes.CommentReportResponse -import it.vercruysse.lemmyapi.v0x19.datatypes.CreateCommentReport -import it.vercruysse.lemmyapi.v0x19.datatypes.CreatePostReport -import it.vercruysse.lemmyapi.v0x19.datatypes.PostId -import it.vercruysse.lemmyapi.v0x19.datatypes.PostReportResponse +import it.vercruysse.lemmyapi.datatypes.CommentId +import it.vercruysse.lemmyapi.datatypes.CommentReportResponse +import it.vercruysse.lemmyapi.datatypes.CreateCommentReport +import it.vercruysse.lemmyapi.datatypes.CreatePostReport +import it.vercruysse.lemmyapi.datatypes.PostId +import it.vercruysse.lemmyapi.datatypes.PostReportResponse import kotlinx.coroutines.launch class CreateReportViewModel : ViewModel() { diff --git a/app/src/main/java/com/jerboa/model/InboxViewModel.kt b/app/src/main/java/com/jerboa/model/InboxViewModel.kt index 4ddf3fccb..a7d00a8de 100644 --- a/app/src/main/java/com/jerboa/model/InboxViewModel.kt +++ b/app/src/main/java/com/jerboa/model/InboxViewModel.kt @@ -20,8 +20,8 @@ import com.jerboa.findAndUpdateMention import com.jerboa.findAndUpdatePersonMention import com.jerboa.findAndUpdatePrivateMessage import com.jerboa.getDeduplicateMerge +import it.vercruysse.lemmyapi.datatypes.* import it.vercruysse.lemmyapi.dto.CommentSortType -import it.vercruysse.lemmyapi.v0x19.datatypes.* import kotlinx.coroutines.launch class InboxViewModel( diff --git a/app/src/main/java/com/jerboa/model/LoginViewModel.kt b/app/src/main/java/com/jerboa/model/LoginViewModel.kt index d2cf2feec..84ec03ace 100644 --- a/app/src/main/java/com/jerboa/model/LoginViewModel.kt +++ b/app/src/main/java/com/jerboa/model/LoginViewModel.kt @@ -15,8 +15,9 @@ import com.jerboa.api.toApiState import com.jerboa.db.entity.Account import com.jerboa.matchLoginErrorMsgToStringRes import it.vercruysse.lemmyapi.LemmyApi +import it.vercruysse.lemmyapi.LemmyApiBaseController +import it.vercruysse.lemmyapi.datatypes.Login import it.vercruysse.lemmyapi.exception.NotSupportedException -import it.vercruysse.lemmyapi.v0x19.datatypes.Login import kotlinx.coroutines.launch import java.net.UnknownHostException @@ -34,7 +35,7 @@ class LoginViewModel : ViewModel() { ) { viewModelScope.launch { loading = true - lateinit var tempInstance: it.vercruysse.lemmyapi.v0x19.LemmyApi + lateinit var tempInstance: LemmyApiBaseController try { val nodeInfo = LemmyApi.getNodeInfo(instance).getOrThrow() diff --git a/app/src/main/java/com/jerboa/model/PersonProfileViewModel.kt b/app/src/main/java/com/jerboa/model/PersonProfileViewModel.kt index 7266b6711..275198a73 100644 --- a/app/src/main/java/com/jerboa/model/PersonProfileViewModel.kt +++ b/app/src/main/java/com/jerboa/model/PersonProfileViewModel.kt @@ -27,8 +27,8 @@ import com.jerboa.findAndUpdatePostCreator import com.jerboa.findAndUpdatePostCreatorBannedFromCommunity import com.jerboa.findAndUpdatePostHidden import com.jerboa.getDeduplicateMerge +import it.vercruysse.lemmyapi.datatypes.* import it.vercruysse.lemmyapi.dto.SortType -import it.vercruysse.lemmyapi.v0x19.datatypes.* import kotlinx.coroutines.launch class PersonProfileViewModel( diff --git a/app/src/main/java/com/jerboa/model/PostEditViewModel.kt b/app/src/main/java/com/jerboa/model/PostEditViewModel.kt index 1d36addb1..0156f2735 100644 --- a/app/src/main/java/com/jerboa/model/PostEditViewModel.kt +++ b/app/src/main/java/com/jerboa/model/PostEditViewModel.kt @@ -8,9 +8,9 @@ import androidx.lifecycle.viewModelScope import com.jerboa.api.API import com.jerboa.api.ApiState import com.jerboa.api.toApiState -import it.vercruysse.lemmyapi.v0x19.datatypes.EditPost -import it.vercruysse.lemmyapi.v0x19.datatypes.PostResponse -import it.vercruysse.lemmyapi.v0x19.datatypes.PostView +import it.vercruysse.lemmyapi.datatypes.EditPost +import it.vercruysse.lemmyapi.datatypes.PostResponse +import it.vercruysse.lemmyapi.datatypes.PostView import kotlinx.coroutines.launch class PostEditViewModel : ViewModel() { diff --git a/app/src/main/java/com/jerboa/model/PostLikesViewModel.kt b/app/src/main/java/com/jerboa/model/PostLikesViewModel.kt index 3f7d66ea7..ac202cfaf 100644 --- a/app/src/main/java/com/jerboa/model/PostLikesViewModel.kt +++ b/app/src/main/java/com/jerboa/model/PostLikesViewModel.kt @@ -13,9 +13,9 @@ import com.jerboa.api.API import com.jerboa.api.ApiState import com.jerboa.api.toApiState import com.jerboa.getDeduplicateMerge -import it.vercruysse.lemmyapi.v0x19.datatypes.ListPostLikes -import it.vercruysse.lemmyapi.v0x19.datatypes.ListPostLikesResponse -import it.vercruysse.lemmyapi.v0x19.datatypes.PostId +import it.vercruysse.lemmyapi.datatypes.ListPostLikes +import it.vercruysse.lemmyapi.datatypes.ListPostLikesResponse +import it.vercruysse.lemmyapi.datatypes.PostId import kotlinx.coroutines.launch class PostLikesViewModel( diff --git a/app/src/main/java/com/jerboa/model/PostRemoveViewModel.kt b/app/src/main/java/com/jerboa/model/PostRemoveViewModel.kt index d14dc3113..f09753e3d 100644 --- a/app/src/main/java/com/jerboa/model/PostRemoveViewModel.kt +++ b/app/src/main/java/com/jerboa/model/PostRemoveViewModel.kt @@ -14,10 +14,10 @@ import com.jerboa.api.API import com.jerboa.api.ApiState import com.jerboa.api.toApiState import com.jerboa.ui.components.common.apiErrorToast -import it.vercruysse.lemmyapi.v0x19.datatypes.PostId -import it.vercruysse.lemmyapi.v0x19.datatypes.PostResponse -import it.vercruysse.lemmyapi.v0x19.datatypes.PostView -import it.vercruysse.lemmyapi.v0x19.datatypes.RemovePost +import it.vercruysse.lemmyapi.datatypes.PostId +import it.vercruysse.lemmyapi.datatypes.PostResponse +import it.vercruysse.lemmyapi.datatypes.PostView +import it.vercruysse.lemmyapi.datatypes.RemovePost import kotlinx.coroutines.launch class PostRemoveViewModel : ViewModel() { diff --git a/app/src/main/java/com/jerboa/model/PostViewModel.kt b/app/src/main/java/com/jerboa/model/PostViewModel.kt index 708e27bdd..d6d5692ad 100644 --- a/app/src/main/java/com/jerboa/model/PostViewModel.kt +++ b/app/src/main/java/com/jerboa/model/PostViewModel.kt @@ -21,31 +21,31 @@ import com.jerboa.feat.showBlockPersonToast import com.jerboa.findAndUpdateComment import com.jerboa.findAndUpdateCommentCreator import com.jerboa.findAndUpdateCommentCreatorBannedFromCommunity +import it.vercruysse.lemmyapi.datatypes.BlockPerson +import it.vercruysse.lemmyapi.datatypes.BlockPersonResponse +import it.vercruysse.lemmyapi.datatypes.CommentId +import it.vercruysse.lemmyapi.datatypes.CommentResponse +import it.vercruysse.lemmyapi.datatypes.CommentView +import it.vercruysse.lemmyapi.datatypes.CreateCommentLike +import it.vercruysse.lemmyapi.datatypes.CreatePostLike +import it.vercruysse.lemmyapi.datatypes.DeleteComment +import it.vercruysse.lemmyapi.datatypes.DeletePost +import it.vercruysse.lemmyapi.datatypes.DistinguishComment +import it.vercruysse.lemmyapi.datatypes.FeaturePost +import it.vercruysse.lemmyapi.datatypes.GetComments +import it.vercruysse.lemmyapi.datatypes.GetCommentsResponse +import it.vercruysse.lemmyapi.datatypes.GetPost +import it.vercruysse.lemmyapi.datatypes.GetPostResponse +import it.vercruysse.lemmyapi.datatypes.HidePost +import it.vercruysse.lemmyapi.datatypes.LockPost +import it.vercruysse.lemmyapi.datatypes.PersonView +import it.vercruysse.lemmyapi.datatypes.PostId +import it.vercruysse.lemmyapi.datatypes.PostResponse +import it.vercruysse.lemmyapi.datatypes.PostView +import it.vercruysse.lemmyapi.datatypes.SaveComment +import it.vercruysse.lemmyapi.datatypes.SavePost import it.vercruysse.lemmyapi.dto.CommentSortType import it.vercruysse.lemmyapi.dto.ListingType -import it.vercruysse.lemmyapi.v0x19.datatypes.BlockPerson -import it.vercruysse.lemmyapi.v0x19.datatypes.BlockPersonResponse -import it.vercruysse.lemmyapi.v0x19.datatypes.CommentId -import it.vercruysse.lemmyapi.v0x19.datatypes.CommentResponse -import it.vercruysse.lemmyapi.v0x19.datatypes.CommentView -import it.vercruysse.lemmyapi.v0x19.datatypes.CreateCommentLike -import it.vercruysse.lemmyapi.v0x19.datatypes.CreatePostLike -import it.vercruysse.lemmyapi.v0x19.datatypes.DeleteComment -import it.vercruysse.lemmyapi.v0x19.datatypes.DeletePost -import it.vercruysse.lemmyapi.v0x19.datatypes.DistinguishComment -import it.vercruysse.lemmyapi.v0x19.datatypes.FeaturePost -import it.vercruysse.lemmyapi.v0x19.datatypes.GetComments -import it.vercruysse.lemmyapi.v0x19.datatypes.GetCommentsResponse -import it.vercruysse.lemmyapi.v0x19.datatypes.GetPost -import it.vercruysse.lemmyapi.v0x19.datatypes.GetPostResponse -import it.vercruysse.lemmyapi.v0x19.datatypes.HidePost -import it.vercruysse.lemmyapi.v0x19.datatypes.LockPost -import it.vercruysse.lemmyapi.v0x19.datatypes.PersonView -import it.vercruysse.lemmyapi.v0x19.datatypes.PostId -import it.vercruysse.lemmyapi.v0x19.datatypes.PostResponse -import it.vercruysse.lemmyapi.v0x19.datatypes.PostView -import it.vercruysse.lemmyapi.v0x19.datatypes.SaveComment -import it.vercruysse.lemmyapi.v0x19.datatypes.SavePost import kotlinx.coroutines.launch class PostViewModel( diff --git a/app/src/main/java/com/jerboa/model/PostsViewModel.kt b/app/src/main/java/com/jerboa/model/PostsViewModel.kt index 6b1bdd0fc..0822e802c 100644 --- a/app/src/main/java/com/jerboa/model/PostsViewModel.kt +++ b/app/src/main/java/com/jerboa/model/PostsViewModel.kt @@ -22,18 +22,18 @@ import com.jerboa.feed.PaginationController import com.jerboa.feed.PostController import com.jerboa.findAndUpdatePostHidden import com.jerboa.toEnumSafe +import it.vercruysse.lemmyapi.datatypes.CreatePostLike +import it.vercruysse.lemmyapi.datatypes.DeletePost +import it.vercruysse.lemmyapi.datatypes.FeaturePost +import it.vercruysse.lemmyapi.datatypes.GetPosts +import it.vercruysse.lemmyapi.datatypes.HidePost +import it.vercruysse.lemmyapi.datatypes.LockPost +import it.vercruysse.lemmyapi.datatypes.MarkPostAsRead +import it.vercruysse.lemmyapi.datatypes.PersonView +import it.vercruysse.lemmyapi.datatypes.PostView +import it.vercruysse.lemmyapi.datatypes.SavePost import it.vercruysse.lemmyapi.dto.ListingType import it.vercruysse.lemmyapi.dto.SortType -import it.vercruysse.lemmyapi.v0x19.datatypes.CreatePostLike -import it.vercruysse.lemmyapi.v0x19.datatypes.DeletePost -import it.vercruysse.lemmyapi.v0x19.datatypes.FeaturePost -import it.vercruysse.lemmyapi.v0x19.datatypes.GetPosts -import it.vercruysse.lemmyapi.v0x19.datatypes.HidePost -import it.vercruysse.lemmyapi.v0x19.datatypes.LockPost -import it.vercruysse.lemmyapi.v0x19.datatypes.MarkPostAsRead -import it.vercruysse.lemmyapi.v0x19.datatypes.PersonView -import it.vercruysse.lemmyapi.v0x19.datatypes.PostView -import it.vercruysse.lemmyapi.v0x19.datatypes.SavePost import kotlinx.coroutines.flow.map import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/jerboa/model/PrivateMessageReplyViewModel.kt b/app/src/main/java/com/jerboa/model/PrivateMessageReplyViewModel.kt index a8cd44704..f59605bb6 100644 --- a/app/src/main/java/com/jerboa/model/PrivateMessageReplyViewModel.kt +++ b/app/src/main/java/com/jerboa/model/PrivateMessageReplyViewModel.kt @@ -9,9 +9,9 @@ import androidx.lifecycle.viewModelScope import com.jerboa.api.API import com.jerboa.api.ApiState import com.jerboa.api.toApiState -import it.vercruysse.lemmyapi.v0x19.datatypes.CreatePrivateMessage -import it.vercruysse.lemmyapi.v0x19.datatypes.PersonId -import it.vercruysse.lemmyapi.v0x19.datatypes.PrivateMessageResponse +import it.vercruysse.lemmyapi.datatypes.CreatePrivateMessage +import it.vercruysse.lemmyapi.datatypes.PersonId +import it.vercruysse.lemmyapi.datatypes.PrivateMessageResponse import kotlinx.coroutines.launch class PrivateMessageReplyViewModel : ViewModel() { diff --git a/app/src/main/java/com/jerboa/model/RegistrationApplicationsViewModel.kt b/app/src/main/java/com/jerboa/model/RegistrationApplicationsViewModel.kt index 6d4e06251..b42812143 100644 --- a/app/src/main/java/com/jerboa/model/RegistrationApplicationsViewModel.kt +++ b/app/src/main/java/com/jerboa/model/RegistrationApplicationsViewModel.kt @@ -15,7 +15,7 @@ import com.jerboa.db.entity.Account import com.jerboa.db.entity.isAnon import com.jerboa.findAndUpdateApplication import com.jerboa.getDeduplicateMerge -import it.vercruysse.lemmyapi.v0x19.datatypes.* +import it.vercruysse.lemmyapi.datatypes.* import kotlinx.coroutines.launch class RegistrationApplicationsViewModel( diff --git a/app/src/main/java/com/jerboa/model/ReportsViewModel.kt b/app/src/main/java/com/jerboa/model/ReportsViewModel.kt index b3179d329..42bc3e830 100644 --- a/app/src/main/java/com/jerboa/model/ReportsViewModel.kt +++ b/app/src/main/java/com/jerboa/model/ReportsViewModel.kt @@ -17,7 +17,7 @@ import com.jerboa.findAndUpdateCommentReport import com.jerboa.findAndUpdatePostReport import com.jerboa.findAndUpdatePrivateMessageReport import com.jerboa.getDeduplicateMerge -import it.vercruysse.lemmyapi.v0x19.datatypes.* +import it.vercruysse.lemmyapi.datatypes.* import kotlinx.coroutines.launch class ReportsViewModel( diff --git a/app/src/main/java/com/jerboa/model/SiteViewModel.kt b/app/src/main/java/com/jerboa/model/SiteViewModel.kt index ce6996b69..599f0c377 100644 --- a/app/src/main/java/com/jerboa/model/SiteViewModel.kt +++ b/app/src/main/java/com/jerboa/model/SiteViewModel.kt @@ -20,16 +20,16 @@ import com.jerboa.db.entity.isAnon import com.jerboa.db.repository.AccountRepository import com.jerboa.feat.default import com.jerboa.jerboaApplication -import it.vercruysse.lemmyapi.v0x19.datatypes.CommunityFollowerView -import it.vercruysse.lemmyapi.v0x19.datatypes.CommunityId -import it.vercruysse.lemmyapi.v0x19.datatypes.GetReportCount -import it.vercruysse.lemmyapi.v0x19.datatypes.GetReportCountResponse -import it.vercruysse.lemmyapi.v0x19.datatypes.GetSiteResponse -import it.vercruysse.lemmyapi.v0x19.datatypes.GetUnreadCountResponse -import it.vercruysse.lemmyapi.v0x19.datatypes.GetUnreadRegistrationApplicationCountResponse -import it.vercruysse.lemmyapi.v0x19.datatypes.LocalUserVoteDisplayMode -import it.vercruysse.lemmyapi.v0x19.datatypes.PersonView -import it.vercruysse.lemmyapi.v0x19.datatypes.SaveUserSettings +import it.vercruysse.lemmyapi.datatypes.CommunityFollowerView +import it.vercruysse.lemmyapi.datatypes.CommunityId +import it.vercruysse.lemmyapi.datatypes.GetReportCount +import it.vercruysse.lemmyapi.datatypes.GetReportCountResponse +import it.vercruysse.lemmyapi.datatypes.GetSiteResponse +import it.vercruysse.lemmyapi.datatypes.GetUnreadCountResponse +import it.vercruysse.lemmyapi.datatypes.GetUnreadRegistrationApplicationCountResponse +import it.vercruysse.lemmyapi.datatypes.LocalUserVoteDisplayMode +import it.vercruysse.lemmyapi.datatypes.PersonView +import it.vercruysse.lemmyapi.datatypes.SaveUserSettings import kotlinx.coroutines.Job import kotlinx.coroutines.flow.map import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/jerboa/ui/components/ban/BanPersonScreen.kt b/app/src/main/java/com/jerboa/ui/components/ban/BanPersonScreen.kt index 713973f5b..695c7563d 100644 --- a/app/src/main/java/com/jerboa/ui/components/ban/BanPersonScreen.kt +++ b/app/src/main/java/com/jerboa/ui/components/ban/BanPersonScreen.kt @@ -23,7 +23,7 @@ import com.jerboa.model.BanPersonViewModel import com.jerboa.personNameShown import com.jerboa.ui.components.common.ActionTopBar import com.jerboa.ui.components.common.getCurrentAccount -import it.vercruysse.lemmyapi.v0x19.datatypes.Person +import it.vercruysse.lemmyapi.datatypes.Person object BanPersonReturn { const val PERSON_VIEW = "ban-person::return(person-view)" diff --git a/app/src/main/java/com/jerboa/ui/components/comment/CommentNode.kt b/app/src/main/java/com/jerboa/ui/components/comment/CommentNode.kt index bcf95ec19..99ca9b82c 100644 --- a/app/src/main/java/com/jerboa/ui/components/comment/CommentNode.kt +++ b/app/src/main/java/com/jerboa/ui/components/comment/CommentNode.kt @@ -83,16 +83,16 @@ import com.jerboa.ui.theme.SMALL_PADDING import com.jerboa.ui.theme.XXL_PADDING import com.jerboa.ui.theme.colorList import com.jerboa.ui.theme.muted -import it.vercruysse.lemmyapi.v0x19.datatypes.Comment -import it.vercruysse.lemmyapi.v0x19.datatypes.CommentId -import it.vercruysse.lemmyapi.v0x19.datatypes.CommentView -import it.vercruysse.lemmyapi.v0x19.datatypes.Community -import it.vercruysse.lemmyapi.v0x19.datatypes.LocalUserVoteDisplayMode -import it.vercruysse.lemmyapi.v0x19.datatypes.Person -import it.vercruysse.lemmyapi.v0x19.datatypes.PersonId -import it.vercruysse.lemmyapi.v0x19.datatypes.PersonView -import it.vercruysse.lemmyapi.v0x19.datatypes.Post -import it.vercruysse.lemmyapi.v0x19.datatypes.PostId +import it.vercruysse.lemmyapi.datatypes.Comment +import it.vercruysse.lemmyapi.datatypes.CommentId +import it.vercruysse.lemmyapi.datatypes.CommentView +import it.vercruysse.lemmyapi.datatypes.Community +import it.vercruysse.lemmyapi.datatypes.LocalUserVoteDisplayMode +import it.vercruysse.lemmyapi.datatypes.Person +import it.vercruysse.lemmyapi.datatypes.PersonId +import it.vercruysse.lemmyapi.datatypes.PersonView +import it.vercruysse.lemmyapi.datatypes.Post +import it.vercruysse.lemmyapi.datatypes.PostId @Composable fun CommentNodeHeader( diff --git a/app/src/main/java/com/jerboa/ui/components/comment/CommentNodes.kt b/app/src/main/java/com/jerboa/ui/components/comment/CommentNodes.kt index 366b169da..1491f140d 100644 --- a/app/src/main/java/com/jerboa/ui/components/comment/CommentNodes.kt +++ b/app/src/main/java/com/jerboa/ui/components/comment/CommentNodes.kt @@ -15,14 +15,14 @@ import com.jerboa.datatypes.BanFromCommunityData import com.jerboa.db.entity.Account import com.jerboa.feat.BlurNSFW import com.jerboa.feat.SwipeToActionPreset -import it.vercruysse.lemmyapi.v0x19.datatypes.CommentId -import it.vercruysse.lemmyapi.v0x19.datatypes.CommentView -import it.vercruysse.lemmyapi.v0x19.datatypes.Community -import it.vercruysse.lemmyapi.v0x19.datatypes.LocalUserVoteDisplayMode -import it.vercruysse.lemmyapi.v0x19.datatypes.Person -import it.vercruysse.lemmyapi.v0x19.datatypes.PersonId -import it.vercruysse.lemmyapi.v0x19.datatypes.PersonView -import it.vercruysse.lemmyapi.v0x19.datatypes.PostId +import it.vercruysse.lemmyapi.datatypes.CommentId +import it.vercruysse.lemmyapi.datatypes.CommentView +import it.vercruysse.lemmyapi.datatypes.Community +import it.vercruysse.lemmyapi.datatypes.LocalUserVoteDisplayMode +import it.vercruysse.lemmyapi.datatypes.Person +import it.vercruysse.lemmyapi.datatypes.PersonId +import it.vercruysse.lemmyapi.datatypes.PersonView +import it.vercruysse.lemmyapi.datatypes.PostId @Composable fun CommentNodes( diff --git a/app/src/main/java/com/jerboa/ui/components/comment/CommentOptionsDropdown.kt b/app/src/main/java/com/jerboa/ui/components/comment/CommentOptionsDropdown.kt index f270cde0f..4beb4d300 100644 --- a/app/src/main/java/com/jerboa/ui/components/comment/CommentOptionsDropdown.kt +++ b/app/src/main/java/com/jerboa/ui/components/comment/CommentOptionsDropdown.kt @@ -33,10 +33,10 @@ import com.jerboa.ui.components.common.BanFromCommunityPopupMenuItem import com.jerboa.ui.components.common.BanPersonPopupMenuItem import com.jerboa.ui.components.common.PopupMenuItem import com.jerboa.util.cascade.CascadeCenteredDropdownMenu -import it.vercruysse.lemmyapi.v0x19.datatypes.CommentId -import it.vercruysse.lemmyapi.v0x19.datatypes.CommentView -import it.vercruysse.lemmyapi.v0x19.datatypes.Person -import it.vercruysse.lemmyapi.v0x19.datatypes.PersonId +import it.vercruysse.lemmyapi.datatypes.CommentId +import it.vercruysse.lemmyapi.datatypes.CommentView +import it.vercruysse.lemmyapi.datatypes.Person +import it.vercruysse.lemmyapi.datatypes.PersonId @Composable fun CommentOptionsDropdown( diff --git a/app/src/main/java/com/jerboa/ui/components/comment/edit/CommentEditScreen.kt b/app/src/main/java/com/jerboa/ui/components/comment/edit/CommentEditScreen.kt index d8fa1a2ac..1fb134b28 100644 --- a/app/src/main/java/com/jerboa/ui/components/comment/edit/CommentEditScreen.kt +++ b/app/src/main/java/com/jerboa/ui/components/comment/edit/CommentEditScreen.kt @@ -26,7 +26,7 @@ import com.jerboa.model.CommentEditViewModel import com.jerboa.ui.components.common.ActionTopBar import com.jerboa.ui.components.common.JerboaSnackbarHost import com.jerboa.ui.components.common.getCurrentAccount -import it.vercruysse.lemmyapi.v0x19.datatypes.CommentView +import it.vercruysse.lemmyapi.datatypes.CommentView object CommentEditReturn { const val COMMENT_VIEW = "comment-edit::return(comment-view)" diff --git a/app/src/main/java/com/jerboa/ui/components/comment/mentionnode/CommentMentionNode.kt b/app/src/main/java/com/jerboa/ui/components/comment/mentionnode/CommentMentionNode.kt index 9d5cae5fc..3139f2b41 100644 --- a/app/src/main/java/com/jerboa/ui/components/comment/mentionnode/CommentMentionNode.kt +++ b/app/src/main/java/com/jerboa/ui/components/comment/mentionnode/CommentMentionNode.kt @@ -43,13 +43,13 @@ import com.jerboa.ui.theme.LARGE_PADDING import com.jerboa.ui.theme.SMALL_PADDING import com.jerboa.ui.theme.XXL_PADDING import com.jerboa.ui.theme.muted -import it.vercruysse.lemmyapi.v0x19.datatypes.Community -import it.vercruysse.lemmyapi.v0x19.datatypes.LocalUserVoteDisplayMode -import it.vercruysse.lemmyapi.v0x19.datatypes.Person -import it.vercruysse.lemmyapi.v0x19.datatypes.PersonId -import it.vercruysse.lemmyapi.v0x19.datatypes.PersonMentionView -import it.vercruysse.lemmyapi.v0x19.datatypes.PersonView -import it.vercruysse.lemmyapi.v0x19.datatypes.PostId +import it.vercruysse.lemmyapi.datatypes.Community +import it.vercruysse.lemmyapi.datatypes.LocalUserVoteDisplayMode +import it.vercruysse.lemmyapi.datatypes.Person +import it.vercruysse.lemmyapi.datatypes.PersonId +import it.vercruysse.lemmyapi.datatypes.PersonMentionView +import it.vercruysse.lemmyapi.datatypes.PersonView +import it.vercruysse.lemmyapi.datatypes.PostId @Composable fun CommentMentionNodeHeader( diff --git a/app/src/main/java/com/jerboa/ui/components/comment/mentionnode/CommentMentionOptionsDropdown.kt b/app/src/main/java/com/jerboa/ui/components/comment/mentionnode/CommentMentionOptionsDropdown.kt index a54765778..7ec64f59e 100644 --- a/app/src/main/java/com/jerboa/ui/components/comment/mentionnode/CommentMentionOptionsDropdown.kt +++ b/app/src/main/java/com/jerboa/ui/components/comment/mentionnode/CommentMentionOptionsDropdown.kt @@ -23,9 +23,9 @@ import com.jerboa.copyToClipboard import com.jerboa.datatypes.getContent import com.jerboa.ui.components.common.PopupMenuItem import com.jerboa.util.cascade.CascadeCenteredDropdownMenu -import it.vercruysse.lemmyapi.v0x19.datatypes.Person -import it.vercruysse.lemmyapi.v0x19.datatypes.PersonId -import it.vercruysse.lemmyapi.v0x19.datatypes.PersonMentionView +import it.vercruysse.lemmyapi.datatypes.Person +import it.vercruysse.lemmyapi.datatypes.PersonId +import it.vercruysse.lemmyapi.datatypes.PersonMentionView @Composable fun CommentMentionsOptionsDropdown( diff --git a/app/src/main/java/com/jerboa/ui/components/comment/reply/CommentReply.kt b/app/src/main/java/com/jerboa/ui/components/comment/reply/CommentReply.kt index 300a47b75..c77185446 100644 --- a/app/src/main/java/com/jerboa/ui/components/comment/reply/CommentReply.kt +++ b/app/src/main/java/com/jerboa/ui/components/comment/reply/CommentReply.kt @@ -27,12 +27,12 @@ import com.jerboa.ui.components.common.MarkdownTextField import com.jerboa.ui.components.post.PostNodeHeader import com.jerboa.ui.theme.LARGE_PADDING import com.jerboa.ui.theme.MEDIUM_PADDING -import it.vercruysse.lemmyapi.v0x19.datatypes.CommentReplyView -import it.vercruysse.lemmyapi.v0x19.datatypes.CommentView -import it.vercruysse.lemmyapi.v0x19.datatypes.LocalUserVoteDisplayMode -import it.vercruysse.lemmyapi.v0x19.datatypes.PersonId -import it.vercruysse.lemmyapi.v0x19.datatypes.PersonMentionView -import it.vercruysse.lemmyapi.v0x19.datatypes.PostView +import it.vercruysse.lemmyapi.datatypes.CommentReplyView +import it.vercruysse.lemmyapi.datatypes.CommentView +import it.vercruysse.lemmyapi.datatypes.LocalUserVoteDisplayMode +import it.vercruysse.lemmyapi.datatypes.PersonId +import it.vercruysse.lemmyapi.datatypes.PersonMentionView +import it.vercruysse.lemmyapi.datatypes.PostView @Composable fun RepliedComment( diff --git a/app/src/main/java/com/jerboa/ui/components/comment/replynode/CommentReplyNode.kt b/app/src/main/java/com/jerboa/ui/components/comment/replynode/CommentReplyNode.kt index c490142e5..28199b504 100644 --- a/app/src/main/java/com/jerboa/ui/components/comment/replynode/CommentReplyNode.kt +++ b/app/src/main/java/com/jerboa/ui/components/comment/replynode/CommentReplyNode.kt @@ -42,12 +42,12 @@ import com.jerboa.ui.theme.LARGE_PADDING import com.jerboa.ui.theme.SMALL_PADDING import com.jerboa.ui.theme.XXL_PADDING import com.jerboa.ui.theme.muted -import it.vercruysse.lemmyapi.v0x19.datatypes.CommentReplyView -import it.vercruysse.lemmyapi.v0x19.datatypes.Community -import it.vercruysse.lemmyapi.v0x19.datatypes.LocalUserVoteDisplayMode -import it.vercruysse.lemmyapi.v0x19.datatypes.Person -import it.vercruysse.lemmyapi.v0x19.datatypes.PersonId -import it.vercruysse.lemmyapi.v0x19.datatypes.PostId +import it.vercruysse.lemmyapi.datatypes.CommentReplyView +import it.vercruysse.lemmyapi.datatypes.Community +import it.vercruysse.lemmyapi.datatypes.LocalUserVoteDisplayMode +import it.vercruysse.lemmyapi.datatypes.Person +import it.vercruysse.lemmyapi.datatypes.PersonId +import it.vercruysse.lemmyapi.datatypes.PostId @Composable fun CommentReplyNodeHeader( diff --git a/app/src/main/java/com/jerboa/ui/components/comment/replynode/CommentReplyOptionsDropdown.kt b/app/src/main/java/com/jerboa/ui/components/comment/replynode/CommentReplyOptionsDropdown.kt index 2d8fcdd25..8442811fc 100644 --- a/app/src/main/java/com/jerboa/ui/components/comment/replynode/CommentReplyOptionsDropdown.kt +++ b/app/src/main/java/com/jerboa/ui/components/comment/replynode/CommentReplyOptionsDropdown.kt @@ -21,9 +21,9 @@ import com.jerboa.copyToClipboard import com.jerboa.datatypes.getContent import com.jerboa.ui.components.common.PopupMenuItem import com.jerboa.util.cascade.CascadeCenteredDropdownMenu -import it.vercruysse.lemmyapi.v0x19.datatypes.CommentReplyView -import it.vercruysse.lemmyapi.v0x19.datatypes.Person -import it.vercruysse.lemmyapi.v0x19.datatypes.PersonId +import it.vercruysse.lemmyapi.datatypes.CommentReplyView +import it.vercruysse.lemmyapi.datatypes.Person +import it.vercruysse.lemmyapi.datatypes.PersonId @Composable fun CommentReplyOptionsDropdown( diff --git a/app/src/main/java/com/jerboa/ui/components/common/AppBars.kt b/app/src/main/java/com/jerboa/ui/components/common/AppBars.kt index a91fc186b..b26052c29 100644 --- a/app/src/main/java/com/jerboa/ui/components/common/AppBars.kt +++ b/app/src/main/java/com/jerboa/ui/components/common/AppBars.kt @@ -63,12 +63,12 @@ import com.jerboa.siFormat import com.jerboa.ui.components.home.NavTab import com.jerboa.ui.components.person.PersonProfileLink import com.jerboa.ui.theme.* +import it.vercruysse.lemmyapi.datatypes.CommunityModeratorView +import it.vercruysse.lemmyapi.datatypes.LocalUserVoteDisplayMode +import it.vercruysse.lemmyapi.datatypes.Person +import it.vercruysse.lemmyapi.datatypes.PersonId +import it.vercruysse.lemmyapi.datatypes.PersonView import it.vercruysse.lemmyapi.dto.SortType -import it.vercruysse.lemmyapi.v0x19.datatypes.CommunityModeratorView -import it.vercruysse.lemmyapi.v0x19.datatypes.LocalUserVoteDisplayMode -import it.vercruysse.lemmyapi.v0x19.datatypes.Person -import it.vercruysse.lemmyapi.v0x19.datatypes.PersonId -import it.vercruysse.lemmyapi.v0x19.datatypes.PersonView import kotlinx.coroutines.CoroutineScope @OptIn(ExperimentalMaterial3Api::class) diff --git a/app/src/main/java/com/jerboa/ui/components/common/PopupItems.kt b/app/src/main/java/com/jerboa/ui/components/common/PopupItems.kt index feaa5f590..8aafe5ec9 100644 --- a/app/src/main/java/com/jerboa/ui/components/common/PopupItems.kt +++ b/app/src/main/java/com/jerboa/ui/components/common/PopupItems.kt @@ -9,7 +9,7 @@ import com.jerboa.R import com.jerboa.communityNameShown import com.jerboa.datatypes.BanFromCommunityData import com.jerboa.personNameShown -import it.vercruysse.lemmyapi.v0x19.datatypes.Person +import it.vercruysse.lemmyapi.datatypes.Person @Composable fun BanPersonPopupMenuItem( diff --git a/app/src/main/java/com/jerboa/ui/components/common/Route.kt b/app/src/main/java/com/jerboa/ui/components/common/Route.kt index 88e284b2d..9fd21916a 100644 --- a/app/src/main/java/com/jerboa/ui/components/common/Route.kt +++ b/app/src/main/java/com/jerboa/ui/components/common/Route.kt @@ -2,10 +2,10 @@ package com.jerboa.ui.components.common import androidx.navigation.NavBackStackEntry import androidx.navigation.NavType -import it.vercruysse.lemmyapi.v0x19.datatypes.CommentId -import it.vercruysse.lemmyapi.v0x19.datatypes.CommunityId -import it.vercruysse.lemmyapi.v0x19.datatypes.PersonId -import it.vercruysse.lemmyapi.v0x19.datatypes.PostId +import it.vercruysse.lemmyapi.datatypes.CommentId +import it.vercruysse.lemmyapi.datatypes.CommunityId +import it.vercruysse.lemmyapi.datatypes.PersonId +import it.vercruysse.lemmyapi.datatypes.PostId object Route { object Graph { diff --git a/app/src/main/java/com/jerboa/ui/components/common/TimeAgo.kt b/app/src/main/java/com/jerboa/ui/components/common/TimeAgo.kt index 59eb1dddc..844901ffa 100644 --- a/app/src/main/java/com/jerboa/ui/components/common/TimeAgo.kt +++ b/app/src/main/java/com/jerboa/ui/components/common/TimeAgo.kt @@ -41,7 +41,7 @@ import com.jerboa.feat.upvotePercent import com.jerboa.formatDuration import com.jerboa.ui.theme.SMALL_PADDING import com.jerboa.ui.theme.muted -import it.vercruysse.lemmyapi.v0x19.datatypes.LocalUserVoteDisplayMode +import it.vercruysse.lemmyapi.datatypes.LocalUserVoteDisplayMode import java.time.Instant import java.time.format.DateTimeParseException import java.util.Date diff --git a/app/src/main/java/com/jerboa/ui/components/community/Community.kt b/app/src/main/java/com/jerboa/ui/components/community/Community.kt index 9e913cd87..28f043506 100644 --- a/app/src/main/java/com/jerboa/ui/components/community/Community.kt +++ b/app/src/main/java/com/jerboa/ui/components/community/Community.kt @@ -56,9 +56,9 @@ import com.jerboa.ui.theme.ACTION_BAR_ICON_SIZE import com.jerboa.ui.theme.DRAWER_BANNER_SIZE import com.jerboa.ui.theme.MEDIUM_PADDING import com.jerboa.ui.theme.muted +import it.vercruysse.lemmyapi.datatypes.CommunityView import it.vercruysse.lemmyapi.dto.SortType import it.vercruysse.lemmyapi.dto.SubscribedType -import it.vercruysse.lemmyapi.v0x19.datatypes.CommunityView import me.saket.cascade.CascadeDropdownMenu @Composable diff --git a/app/src/main/java/com/jerboa/ui/components/community/CommunityLink.kt b/app/src/main/java/com/jerboa/ui/components/community/CommunityLink.kt index cbf149691..5c64e07d2 100644 --- a/app/src/main/java/com/jerboa/ui/components/community/CommunityLink.kt +++ b/app/src/main/java/com/jerboa/ui/components/community/CommunityLink.kt @@ -35,8 +35,8 @@ import com.jerboa.ui.theme.LARGER_ICON_THUMBNAIL_SIZE import com.jerboa.ui.theme.LARGE_PADDING import com.jerboa.ui.theme.LINK_ICON_SIZE import com.jerboa.ui.theme.SMALL_PADDING -import it.vercruysse.lemmyapi.v0x19.datatypes.Community -import it.vercruysse.lemmyapi.v0x19.datatypes.CommunityView +import it.vercruysse.lemmyapi.datatypes.Community +import it.vercruysse.lemmyapi.datatypes.CommunityView @Composable fun CommunityName( diff --git a/app/src/main/java/com/jerboa/ui/components/community/CommunityScreen.kt b/app/src/main/java/com/jerboa/ui/components/community/CommunityScreen.kt index adf98acc8..6b52391b6 100644 --- a/app/src/main/java/com/jerboa/ui/components/community/CommunityScreen.kt +++ b/app/src/main/java/com/jerboa/ui/components/community/CommunityScreen.kt @@ -57,19 +57,19 @@ import com.jerboa.ui.components.post.PostListings import com.jerboa.ui.components.post.PostViewReturn import com.jerboa.ui.components.post.edit.PostEditReturn import com.jerboa.ui.components.remove.post.PostRemoveReturn +import it.vercruysse.lemmyapi.datatypes.BlockCommunity +import it.vercruysse.lemmyapi.datatypes.CommunityId +import it.vercruysse.lemmyapi.datatypes.CreatePostLike +import it.vercruysse.lemmyapi.datatypes.DeletePost +import it.vercruysse.lemmyapi.datatypes.FeaturePost +import it.vercruysse.lemmyapi.datatypes.FollowCommunity +import it.vercruysse.lemmyapi.datatypes.HidePost +import it.vercruysse.lemmyapi.datatypes.LockPost +import it.vercruysse.lemmyapi.datatypes.MarkPostAsRead +import it.vercruysse.lemmyapi.datatypes.PersonView +import it.vercruysse.lemmyapi.datatypes.PostView +import it.vercruysse.lemmyapi.datatypes.SavePost import it.vercruysse.lemmyapi.dto.SubscribedType -import it.vercruysse.lemmyapi.v0x19.datatypes.BlockCommunity -import it.vercruysse.lemmyapi.v0x19.datatypes.CommunityId -import it.vercruysse.lemmyapi.v0x19.datatypes.CreatePostLike -import it.vercruysse.lemmyapi.v0x19.datatypes.DeletePost -import it.vercruysse.lemmyapi.v0x19.datatypes.FeaturePost -import it.vercruysse.lemmyapi.v0x19.datatypes.FollowCommunity -import it.vercruysse.lemmyapi.v0x19.datatypes.HidePost -import it.vercruysse.lemmyapi.v0x19.datatypes.LockPost -import it.vercruysse.lemmyapi.v0x19.datatypes.MarkPostAsRead -import it.vercruysse.lemmyapi.v0x19.datatypes.PersonView -import it.vercruysse.lemmyapi.v0x19.datatypes.PostView -import it.vercruysse.lemmyapi.v0x19.datatypes.SavePost @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/app/src/main/java/com/jerboa/ui/components/community/list/CommunityList.kt b/app/src/main/java/com/jerboa/ui/components/community/list/CommunityList.kt index ec8280d5c..ac58b9945 100644 --- a/app/src/main/java/com/jerboa/ui/components/community/list/CommunityList.kt +++ b/app/src/main/java/com/jerboa/ui/components/community/list/CommunityList.kt @@ -27,7 +27,7 @@ import com.jerboa.feat.BlurNSFW import com.jerboa.ui.components.common.simpleVerticalScrollbar import com.jerboa.ui.components.community.CommunityLinkLarger import com.jerboa.ui.components.community.CommunityLinkLargerWithUserCount -import it.vercruysse.lemmyapi.v0x19.datatypes.* +import it.vercruysse.lemmyapi.datatypes.* @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/app/src/main/java/com/jerboa/ui/components/community/list/CommunityListScreen.kt b/app/src/main/java/com/jerboa/ui/components/community/list/CommunityListScreen.kt index 8d8c6badb..1796819f5 100644 --- a/app/src/main/java/com/jerboa/ui/components/community/list/CommunityListScreen.kt +++ b/app/src/main/java/com/jerboa/ui/components/community/list/CommunityListScreen.kt @@ -27,10 +27,10 @@ import com.jerboa.model.CommunityListViewModel import com.jerboa.ui.components.common.ApiEmptyText import com.jerboa.ui.components.common.ApiErrorText import com.jerboa.ui.components.common.LoadingBar +import it.vercruysse.lemmyapi.datatypes.CommunityFollowerView +import it.vercruysse.lemmyapi.datatypes.Search import it.vercruysse.lemmyapi.dto.SearchType import it.vercruysse.lemmyapi.dto.SortType -import it.vercruysse.lemmyapi.v0x19.datatypes.CommunityFollowerView -import it.vercruysse.lemmyapi.v0x19.datatypes.Search import kotlinx.coroutines.Job import kotlinx.coroutines.delay import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/jerboa/ui/components/community/sidebar/CommunitySidebar.kt b/app/src/main/java/com/jerboa/ui/components/community/sidebar/CommunitySidebar.kt index a11b3a7ff..82f1d39c2 100644 --- a/app/src/main/java/com/jerboa/ui/components/community/sidebar/CommunitySidebar.kt +++ b/app/src/main/java/com/jerboa/ui/components/community/sidebar/CommunitySidebar.kt @@ -2,8 +2,8 @@ package com.jerboa.ui.components.community.sidebar import androidx.compose.runtime.Composable import com.jerboa.ui.components.common.Sidebar -import it.vercruysse.lemmyapi.v0x19.datatypes.GetCommunityResponse -import it.vercruysse.lemmyapi.v0x19.datatypes.PersonId +import it.vercruysse.lemmyapi.datatypes.GetCommunityResponse +import it.vercruysse.lemmyapi.datatypes.PersonId @Composable fun CommunitySidebar( diff --git a/app/src/main/java/com/jerboa/ui/components/community/sidebar/CommunitySidebarScreen.kt b/app/src/main/java/com/jerboa/ui/components/community/sidebar/CommunitySidebarScreen.kt index 5db469548..91d86bb84 100644 --- a/app/src/main/java/com/jerboa/ui/components/community/sidebar/CommunitySidebarScreen.kt +++ b/app/src/main/java/com/jerboa/ui/components/community/sidebar/CommunitySidebarScreen.kt @@ -12,7 +12,7 @@ import com.jerboa.JerboaAppState import com.jerboa.R import com.jerboa.hostName import com.jerboa.ui.components.common.SimpleTopAppBar -import it.vercruysse.lemmyapi.v0x19.datatypes.GetCommunityResponse +import it.vercruysse.lemmyapi.datatypes.GetCommunityResponse object CommunityViewSidebar { const val COMMUNITY_RES = "side-bar::return(community-res)" diff --git a/app/src/main/java/com/jerboa/ui/components/drawer/Drawer.kt b/app/src/main/java/com/jerboa/ui/components/drawer/Drawer.kt index 10ecfdb9b..bd34c52f6 100644 --- a/app/src/main/java/com/jerboa/ui/components/drawer/Drawer.kt +++ b/app/src/main/java/com/jerboa/ui/components/drawer/Drawer.kt @@ -66,11 +66,11 @@ import com.jerboa.ui.theme.LARGE_PADDING import com.jerboa.ui.theme.SMALL_PADDING import com.jerboa.ui.theme.XL_PADDING import com.jerboa.ui.theme.muted +import it.vercruysse.lemmyapi.datatypes.Community +import it.vercruysse.lemmyapi.datatypes.CommunityFollowerView +import it.vercruysse.lemmyapi.datatypes.MyUserInfo +import it.vercruysse.lemmyapi.datatypes.Person import it.vercruysse.lemmyapi.dto.ListingType -import it.vercruysse.lemmyapi.v0x19.datatypes.Community -import it.vercruysse.lemmyapi.v0x19.datatypes.CommunityFollowerView -import it.vercruysse.lemmyapi.v0x19.datatypes.MyUserInfo -import it.vercruysse.lemmyapi.v0x19.datatypes.Person @Composable fun Drawer( diff --git a/app/src/main/java/com/jerboa/ui/components/drawer/MainDrawer.kt b/app/src/main/java/com/jerboa/ui/components/drawer/MainDrawer.kt index 2b857136b..f9f5be330 100644 --- a/app/src/main/java/com/jerboa/ui/components/drawer/MainDrawer.kt +++ b/app/src/main/java/com/jerboa/ui/components/drawer/MainDrawer.kt @@ -14,7 +14,7 @@ import com.jerboa.model.HomeViewModel import com.jerboa.model.SiteViewModel import com.jerboa.ui.components.common.getCurrentAccount import com.jerboa.ui.components.home.NavTab -import it.vercruysse.lemmyapi.v0x19.datatypes.CommunityId +import it.vercruysse.lemmyapi.datatypes.CommunityId import kotlinx.coroutines.CoroutineScope @Composable diff --git a/app/src/main/java/com/jerboa/ui/components/home/Home.kt b/app/src/main/java/com/jerboa/ui/components/home/Home.kt index 4ff67384f..9486211cd 100644 --- a/app/src/main/java/com/jerboa/ui/components/home/Home.kt +++ b/app/src/main/java/com/jerboa/ui/components/home/Home.kt @@ -46,9 +46,9 @@ import com.jerboa.ui.components.common.MenuItem import com.jerboa.ui.components.common.MyMarkdownText import com.jerboa.ui.components.common.SortOptionsDropdown import com.jerboa.ui.theme.LARGE_PADDING +import it.vercruysse.lemmyapi.datatypes.Tagline import it.vercruysse.lemmyapi.dto.ListingType import it.vercruysse.lemmyapi.dto.SortType -import it.vercruysse.lemmyapi.v0x19.datatypes.Tagline import me.saket.cascade.CascadeDropdownMenu @OptIn(ExperimentalMaterial3Api::class) diff --git a/app/src/main/java/com/jerboa/ui/components/home/HomeActivity.kt b/app/src/main/java/com/jerboa/ui/components/home/HomeActivity.kt index 9d72cdfe4..8d7f5340b 100644 --- a/app/src/main/java/com/jerboa/ui/components/home/HomeActivity.kt +++ b/app/src/main/java/com/jerboa/ui/components/home/HomeActivity.kt @@ -64,16 +64,16 @@ import com.jerboa.ui.components.post.PostListings import com.jerboa.ui.components.post.PostViewReturn import com.jerboa.ui.components.post.edit.PostEditReturn import com.jerboa.ui.components.remove.post.PostRemoveReturn -import it.vercruysse.lemmyapi.v0x19.datatypes.CreatePostLike -import it.vercruysse.lemmyapi.v0x19.datatypes.DeletePost -import it.vercruysse.lemmyapi.v0x19.datatypes.FeaturePost -import it.vercruysse.lemmyapi.v0x19.datatypes.HidePost -import it.vercruysse.lemmyapi.v0x19.datatypes.LockPost -import it.vercruysse.lemmyapi.v0x19.datatypes.MarkPostAsRead -import it.vercruysse.lemmyapi.v0x19.datatypes.PersonView -import it.vercruysse.lemmyapi.v0x19.datatypes.PostView -import it.vercruysse.lemmyapi.v0x19.datatypes.SavePost -import it.vercruysse.lemmyapi.v0x19.datatypes.Tagline +import it.vercruysse.lemmyapi.datatypes.CreatePostLike +import it.vercruysse.lemmyapi.datatypes.DeletePost +import it.vercruysse.lemmyapi.datatypes.FeaturePost +import it.vercruysse.lemmyapi.datatypes.HidePost +import it.vercruysse.lemmyapi.datatypes.LockPost +import it.vercruysse.lemmyapi.datatypes.MarkPostAsRead +import it.vercruysse.lemmyapi.datatypes.PersonView +import it.vercruysse.lemmyapi.datatypes.PostView +import it.vercruysse.lemmyapi.datatypes.SavePost +import it.vercruysse.lemmyapi.datatypes.Tagline import kotlinx.coroutines.launch @OptIn(ExperimentalMaterial3Api::class, ExperimentalComposeUiApi::class) diff --git a/app/src/main/java/com/jerboa/ui/components/home/sidebar/SiteSidebar.kt b/app/src/main/java/com/jerboa/ui/components/home/sidebar/SiteSidebar.kt index 01fb9adea..ba3e72f33 100644 --- a/app/src/main/java/com/jerboa/ui/components/home/sidebar/SiteSidebar.kt +++ b/app/src/main/java/com/jerboa/ui/components/home/sidebar/SiteSidebar.kt @@ -4,8 +4,8 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.tooling.preview.Preview import com.jerboa.datatypes.sampleGetSiteRes import com.jerboa.ui.components.common.Sidebar -import it.vercruysse.lemmyapi.v0x19.datatypes.GetSiteResponse -import it.vercruysse.lemmyapi.v0x19.datatypes.PersonId +import it.vercruysse.lemmyapi.datatypes.GetSiteResponse +import it.vercruysse.lemmyapi.datatypes.PersonId @Composable fun SiteSidebar( diff --git a/app/src/main/java/com/jerboa/ui/components/inbox/InboxScreen.kt b/app/src/main/java/com/jerboa/ui/components/inbox/InboxScreen.kt index 41510363d..6729126cf 100644 --- a/app/src/main/java/com/jerboa/ui/components/inbox/InboxScreen.kt +++ b/app/src/main/java/com/jerboa/ui/components/inbox/InboxScreen.kt @@ -58,13 +58,13 @@ import com.jerboa.ui.components.common.isRefreshing import com.jerboa.ui.components.common.simpleVerticalScrollbar import com.jerboa.ui.components.privatemessage.PrivateMessage import com.jerboa.unreadOrAllFromBool -import it.vercruysse.lemmyapi.v0x19.datatypes.BlockPerson -import it.vercruysse.lemmyapi.v0x19.datatypes.CommentReplyView -import it.vercruysse.lemmyapi.v0x19.datatypes.CreateCommentLike -import it.vercruysse.lemmyapi.v0x19.datatypes.MarkCommentReplyAsRead -import it.vercruysse.lemmyapi.v0x19.datatypes.MarkPersonMentionAsRead -import it.vercruysse.lemmyapi.v0x19.datatypes.MarkPrivateMessageAsRead -import it.vercruysse.lemmyapi.v0x19.datatypes.SaveComment +import it.vercruysse.lemmyapi.datatypes.BlockPerson +import it.vercruysse.lemmyapi.datatypes.CommentReplyView +import it.vercruysse.lemmyapi.datatypes.CreateCommentLike +import it.vercruysse.lemmyapi.datatypes.MarkCommentReplyAsRead +import it.vercruysse.lemmyapi.datatypes.MarkPersonMentionAsRead +import it.vercruysse.lemmyapi.datatypes.MarkPrivateMessageAsRead +import it.vercruysse.lemmyapi.datatypes.SaveComment import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/jerboa/ui/components/login/Login.kt b/app/src/main/java/com/jerboa/ui/components/login/Login.kt index f052e7b13..59e49b40a 100644 --- a/app/src/main/java/com/jerboa/ui/components/login/Login.kt +++ b/app/src/main/java/com/jerboa/ui/components/login/Login.kt @@ -53,7 +53,7 @@ import androidx.compose.ui.window.PopupProperties import com.jerboa.DEFAULT_LEMMY_INSTANCES import com.jerboa.R import com.jerboa.ui.components.common.onAutofill -import it.vercruysse.lemmyapi.v0x19.datatypes.Login +import it.vercruysse.lemmyapi.datatypes.Login @OptIn(ExperimentalComposeUiApi::class) @Composable diff --git a/app/src/main/java/com/jerboa/ui/components/person/PersonProfile.kt b/app/src/main/java/com/jerboa/ui/components/person/PersonProfile.kt index 91582213a..e7f10bd8e 100644 --- a/app/src/main/java/com/jerboa/ui/components/person/PersonProfile.kt +++ b/app/src/main/java/com/jerboa/ui/components/person/PersonProfile.kt @@ -55,8 +55,8 @@ import com.jerboa.ui.theme.MARKDOWN_BAR_ICON_SIZE import com.jerboa.ui.theme.MEDIUM_PADDING import com.jerboa.ui.theme.PROFILE_BANNER_SIZE import com.jerboa.ui.theme.muted +import it.vercruysse.lemmyapi.datatypes.PersonView import it.vercruysse.lemmyapi.dto.SortType -import it.vercruysse.lemmyapi.v0x19.datatypes.PersonView @Composable fun PersonProfileTopSection( diff --git a/app/src/main/java/com/jerboa/ui/components/person/PersonProfileLink.kt b/app/src/main/java/com/jerboa/ui/components/person/PersonProfileLink.kt index 8a7576f18..577d3a8d1 100644 --- a/app/src/main/java/com/jerboa/ui/components/person/PersonProfileLink.kt +++ b/app/src/main/java/com/jerboa/ui/components/person/PersonProfileLink.kt @@ -24,8 +24,8 @@ import com.jerboa.ui.components.common.CircularIcon import com.jerboa.ui.components.common.ItemAndInstanceTitle import com.jerboa.ui.components.common.TextBadge import com.jerboa.ui.theme.SMALL_PADDING -import it.vercruysse.lemmyapi.v0x19.datatypes.Person -import it.vercruysse.lemmyapi.v0x19.datatypes.PersonId +import it.vercruysse.lemmyapi.datatypes.Person +import it.vercruysse.lemmyapi.datatypes.PersonId @Composable fun PersonName( diff --git a/app/src/main/java/com/jerboa/ui/components/person/PersonProfileScreen.kt b/app/src/main/java/com/jerboa/ui/components/person/PersonProfileScreen.kt index 0eb922939..010e82fb8 100644 --- a/app/src/main/java/com/jerboa/ui/components/person/PersonProfileScreen.kt +++ b/app/src/main/java/com/jerboa/ui/components/person/PersonProfileScreen.kt @@ -80,25 +80,25 @@ import com.jerboa.ui.components.post.edit.PostEditReturn import com.jerboa.ui.components.remove.comment.CommentRemoveReturn import com.jerboa.ui.components.remove.post.PostRemoveReturn import com.jerboa.ui.theme.MEDIUM_PADDING -import it.vercruysse.lemmyapi.v0x19.datatypes.BlockPerson -import it.vercruysse.lemmyapi.v0x19.datatypes.CommentId -import it.vercruysse.lemmyapi.v0x19.datatypes.CommentView -import it.vercruysse.lemmyapi.v0x19.datatypes.CreateCommentLike -import it.vercruysse.lemmyapi.v0x19.datatypes.CreatePostLike -import it.vercruysse.lemmyapi.v0x19.datatypes.DeleteComment -import it.vercruysse.lemmyapi.v0x19.datatypes.DeletePost -import it.vercruysse.lemmyapi.v0x19.datatypes.DistinguishComment -import it.vercruysse.lemmyapi.v0x19.datatypes.FeaturePost -import it.vercruysse.lemmyapi.v0x19.datatypes.GetPersonDetails -import it.vercruysse.lemmyapi.v0x19.datatypes.HidePost -import it.vercruysse.lemmyapi.v0x19.datatypes.LocalUserVoteDisplayMode -import it.vercruysse.lemmyapi.v0x19.datatypes.LockPost -import it.vercruysse.lemmyapi.v0x19.datatypes.MarkPostAsRead -import it.vercruysse.lemmyapi.v0x19.datatypes.PersonId -import it.vercruysse.lemmyapi.v0x19.datatypes.PersonView -import it.vercruysse.lemmyapi.v0x19.datatypes.PostView -import it.vercruysse.lemmyapi.v0x19.datatypes.SaveComment -import it.vercruysse.lemmyapi.v0x19.datatypes.SavePost +import it.vercruysse.lemmyapi.datatypes.BlockPerson +import it.vercruysse.lemmyapi.datatypes.CommentId +import it.vercruysse.lemmyapi.datatypes.CommentView +import it.vercruysse.lemmyapi.datatypes.CreateCommentLike +import it.vercruysse.lemmyapi.datatypes.CreatePostLike +import it.vercruysse.lemmyapi.datatypes.DeleteComment +import it.vercruysse.lemmyapi.datatypes.DeletePost +import it.vercruysse.lemmyapi.datatypes.DistinguishComment +import it.vercruysse.lemmyapi.datatypes.FeaturePost +import it.vercruysse.lemmyapi.datatypes.GetPersonDetails +import it.vercruysse.lemmyapi.datatypes.HidePost +import it.vercruysse.lemmyapi.datatypes.LocalUserVoteDisplayMode +import it.vercruysse.lemmyapi.datatypes.LockPost +import it.vercruysse.lemmyapi.datatypes.MarkPostAsRead +import it.vercruysse.lemmyapi.datatypes.PersonId +import it.vercruysse.lemmyapi.datatypes.PersonView +import it.vercruysse.lemmyapi.datatypes.PostView +import it.vercruysse.lemmyapi.datatypes.SaveComment +import it.vercruysse.lemmyapi.datatypes.SavePost import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/jerboa/ui/components/post/PostListing.kt b/app/src/main/java/com/jerboa/ui/components/post/PostListing.kt index b97b00d3a..a765e7fd4 100644 --- a/app/src/main/java/com/jerboa/ui/components/post/PostListing.kt +++ b/app/src/main/java/com/jerboa/ui/components/post/PostListing.kt @@ -123,7 +123,7 @@ import com.jerboa.ui.theme.THUMBNAIL_CARET_SIZE import com.jerboa.ui.theme.XXL_PADDING import com.jerboa.ui.theme.jerboaColorScheme import com.jerboa.ui.theme.muted -import it.vercruysse.lemmyapi.v0x19.datatypes.* +import it.vercruysse.lemmyapi.datatypes.* import kotlinx.coroutines.CoroutineScope @Composable diff --git a/app/src/main/java/com/jerboa/ui/components/post/PostListings.kt b/app/src/main/java/com/jerboa/ui/components/post/PostListings.kt index 268aff4cc..f3bb32196 100644 --- a/app/src/main/java/com/jerboa/ui/components/post/PostListings.kt +++ b/app/src/main/java/com/jerboa/ui/components/post/PostListings.kt @@ -25,13 +25,13 @@ import com.jerboa.feat.default import com.jerboa.rememberJerboaAppState import com.jerboa.ui.components.common.RetryLoadingPosts import com.jerboa.ui.components.common.TriggerWhenReachingEnd -import it.vercruysse.lemmyapi.v0x19.datatypes.Community -import it.vercruysse.lemmyapi.v0x19.datatypes.LocalUserVoteDisplayMode -import it.vercruysse.lemmyapi.v0x19.datatypes.Person -import it.vercruysse.lemmyapi.v0x19.datatypes.PersonId -import it.vercruysse.lemmyapi.v0x19.datatypes.PersonView -import it.vercruysse.lemmyapi.v0x19.datatypes.PostId -import it.vercruysse.lemmyapi.v0x19.datatypes.PostView +import it.vercruysse.lemmyapi.datatypes.Community +import it.vercruysse.lemmyapi.datatypes.LocalUserVoteDisplayMode +import it.vercruysse.lemmyapi.datatypes.Person +import it.vercruysse.lemmyapi.datatypes.PersonId +import it.vercruysse.lemmyapi.datatypes.PersonView +import it.vercruysse.lemmyapi.datatypes.PostId +import it.vercruysse.lemmyapi.datatypes.PostView @Composable fun PostListings( diff --git a/app/src/main/java/com/jerboa/ui/components/post/PostScreen.kt b/app/src/main/java/com/jerboa/ui/components/post/PostScreen.kt index 1306c07ed..2a55ff5f5 100644 --- a/app/src/main/java/com/jerboa/ui/components/post/PostScreen.kt +++ b/app/src/main/java/com/jerboa/ui/components/post/PostScreen.kt @@ -87,23 +87,23 @@ import com.jerboa.ui.components.common.isRefreshing import com.jerboa.ui.components.post.edit.PostEditReturn import com.jerboa.ui.components.remove.comment.CommentRemoveReturn import com.jerboa.ui.components.remove.post.PostRemoveReturn +import it.vercruysse.lemmyapi.datatypes.BlockPerson +import it.vercruysse.lemmyapi.datatypes.CommentId +import it.vercruysse.lemmyapi.datatypes.CommentView +import it.vercruysse.lemmyapi.datatypes.CreateCommentLike +import it.vercruysse.lemmyapi.datatypes.CreatePostLike +import it.vercruysse.lemmyapi.datatypes.DeleteComment +import it.vercruysse.lemmyapi.datatypes.DeletePost +import it.vercruysse.lemmyapi.datatypes.DistinguishComment +import it.vercruysse.lemmyapi.datatypes.FeaturePost +import it.vercruysse.lemmyapi.datatypes.HidePost +import it.vercruysse.lemmyapi.datatypes.LockPost +import it.vercruysse.lemmyapi.datatypes.PersonView +import it.vercruysse.lemmyapi.datatypes.PostId +import it.vercruysse.lemmyapi.datatypes.PostView +import it.vercruysse.lemmyapi.datatypes.SaveComment +import it.vercruysse.lemmyapi.datatypes.SavePost import it.vercruysse.lemmyapi.dto.CommentSortType -import it.vercruysse.lemmyapi.v0x19.datatypes.BlockPerson -import it.vercruysse.lemmyapi.v0x19.datatypes.CommentId -import it.vercruysse.lemmyapi.v0x19.datatypes.CommentView -import it.vercruysse.lemmyapi.v0x19.datatypes.CreateCommentLike -import it.vercruysse.lemmyapi.v0x19.datatypes.CreatePostLike -import it.vercruysse.lemmyapi.v0x19.datatypes.DeleteComment -import it.vercruysse.lemmyapi.v0x19.datatypes.DeletePost -import it.vercruysse.lemmyapi.v0x19.datatypes.DistinguishComment -import it.vercruysse.lemmyapi.v0x19.datatypes.FeaturePost -import it.vercruysse.lemmyapi.v0x19.datatypes.HidePost -import it.vercruysse.lemmyapi.v0x19.datatypes.LockPost -import it.vercruysse.lemmyapi.v0x19.datatypes.PersonView -import it.vercruysse.lemmyapi.v0x19.datatypes.PostId -import it.vercruysse.lemmyapi.v0x19.datatypes.PostView -import it.vercruysse.lemmyapi.v0x19.datatypes.SaveComment -import it.vercruysse.lemmyapi.v0x19.datatypes.SavePost object PostViewReturn { const val POST_VIEW = "post-view::return(post-view)" diff --git a/app/src/main/java/com/jerboa/ui/components/post/composables/PostComposables.kt b/app/src/main/java/com/jerboa/ui/components/post/composables/PostComposables.kt index 8948df23f..9d212b297 100644 --- a/app/src/main/java/com/jerboa/ui/components/post/composables/PostComposables.kt +++ b/app/src/main/java/com/jerboa/ui/components/post/composables/PostComposables.kt @@ -45,7 +45,7 @@ import com.jerboa.ui.theme.ICON_SIZE import com.jerboa.ui.theme.MEDIUM_PADDING import com.jerboa.ui.theme.THUMBNAIL_SIZE import com.jerboa.ui.theme.muted -import it.vercruysse.lemmyapi.v0x19.datatypes.Community +import it.vercruysse.lemmyapi.datatypes.Community @Composable fun CreateEditPostBody( diff --git a/app/src/main/java/com/jerboa/ui/components/post/composables/PostOptionsDropdown.kt b/app/src/main/java/com/jerboa/ui/components/post/composables/PostOptionsDropdown.kt index e716de271..c0d54f56a 100644 --- a/app/src/main/java/com/jerboa/ui/components/post/composables/PostOptionsDropdown.kt +++ b/app/src/main/java/com/jerboa/ui/components/post/composables/PostOptionsDropdown.kt @@ -48,15 +48,15 @@ import com.jerboa.ui.components.common.BanFromCommunityPopupMenuItem import com.jerboa.ui.components.common.BanPersonPopupMenuItem import com.jerboa.ui.components.common.PopupMenuItem import com.jerboa.util.cascade.CascadeCenteredDropdownMenu +import it.vercruysse.lemmyapi.datatypes.BlockCommunity +import it.vercruysse.lemmyapi.datatypes.BlockInstance +import it.vercruysse.lemmyapi.datatypes.BlockPerson +import it.vercruysse.lemmyapi.datatypes.Community +import it.vercruysse.lemmyapi.datatypes.Person +import it.vercruysse.lemmyapi.datatypes.PersonId +import it.vercruysse.lemmyapi.datatypes.PostId +import it.vercruysse.lemmyapi.datatypes.PostView import it.vercruysse.lemmyapi.dto.PostFeatureType -import it.vercruysse.lemmyapi.v0x19.datatypes.BlockCommunity -import it.vercruysse.lemmyapi.v0x19.datatypes.BlockInstance -import it.vercruysse.lemmyapi.v0x19.datatypes.BlockPerson -import it.vercruysse.lemmyapi.v0x19.datatypes.Community -import it.vercruysse.lemmyapi.v0x19.datatypes.Person -import it.vercruysse.lemmyapi.v0x19.datatypes.PersonId -import it.vercruysse.lemmyapi.v0x19.datatypes.PostId -import it.vercruysse.lemmyapi.v0x19.datatypes.PostView import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/jerboa/ui/components/post/create/CreatePostScreen.kt b/app/src/main/java/com/jerboa/ui/components/post/create/CreatePostScreen.kt index 5ddf143ae..36f8f5c63 100644 --- a/app/src/main/java/com/jerboa/ui/components/post/create/CreatePostScreen.kt +++ b/app/src/main/java/com/jerboa/ui/components/post/create/CreatePostScreen.kt @@ -40,10 +40,10 @@ import com.jerboa.ui.components.post.composables.CreateEditPostBody import com.jerboa.ui.components.post.composables.PostCommunitySelector import com.jerboa.validatePostName import com.jerboa.validateUrl -import it.vercruysse.lemmyapi.v0x19.datatypes.Community -import it.vercruysse.lemmyapi.v0x19.datatypes.CreatePost -import it.vercruysse.lemmyapi.v0x19.datatypes.GetSiteMetadata -import it.vercruysse.lemmyapi.v0x19.datatypes.PostId +import it.vercruysse.lemmyapi.datatypes.Community +import it.vercruysse.lemmyapi.datatypes.CreatePost +import it.vercruysse.lemmyapi.datatypes.GetSiteMetadata +import it.vercruysse.lemmyapi.datatypes.PostId import kotlinx.coroutines.Job import kotlinx.coroutines.delay import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/jerboa/ui/components/post/edit/PostEditScreen.kt b/app/src/main/java/com/jerboa/ui/components/post/edit/PostEditScreen.kt index 2f2f540c3..9cfbc4a79 100644 --- a/app/src/main/java/com/jerboa/ui/components/post/edit/PostEditScreen.kt +++ b/app/src/main/java/com/jerboa/ui/components/post/edit/PostEditScreen.kt @@ -27,9 +27,9 @@ import com.jerboa.ui.components.common.getCurrentAccount import com.jerboa.ui.components.post.composables.CreateEditPostBody import com.jerboa.validatePostName import com.jerboa.validateUrl -import it.vercruysse.lemmyapi.v0x19.datatypes.EditPost -import it.vercruysse.lemmyapi.v0x19.datatypes.PostId -import it.vercruysse.lemmyapi.v0x19.datatypes.PostView +import it.vercruysse.lemmyapi.datatypes.EditPost +import it.vercruysse.lemmyapi.datatypes.PostId +import it.vercruysse.lemmyapi.datatypes.PostView import kotlinx.coroutines.launch object PostEditReturn { diff --git a/app/src/main/java/com/jerboa/ui/components/privatemessage/CreatePrivateMessageScreen.kt b/app/src/main/java/com/jerboa/ui/components/privatemessage/CreatePrivateMessageScreen.kt index 541a64778..60a68e6ea 100644 --- a/app/src/main/java/com/jerboa/ui/components/privatemessage/CreatePrivateMessageScreen.kt +++ b/app/src/main/java/com/jerboa/ui/components/privatemessage/CreatePrivateMessageScreen.kt @@ -32,9 +32,9 @@ import com.jerboa.model.AccountViewModel import com.jerboa.ui.components.common.ActionTopBar import com.jerboa.ui.components.common.MarkdownTextField import com.jerboa.ui.components.common.getCurrentAccount -import it.vercruysse.lemmyapi.v0x19.datatypes.CreatePrivateMessage -import it.vercruysse.lemmyapi.v0x19.datatypes.PersonId -import it.vercruysse.lemmyapi.v0x19.datatypes.PrivateMessageResponse +import it.vercruysse.lemmyapi.datatypes.CreatePrivateMessage +import it.vercruysse.lemmyapi.datatypes.PersonId +import it.vercruysse.lemmyapi.datatypes.PrivateMessageResponse import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext diff --git a/app/src/main/java/com/jerboa/ui/components/privatemessage/PrivateMessage.kt b/app/src/main/java/com/jerboa/ui/components/privatemessage/PrivateMessage.kt index 36a2f186c..cc48fe2ab 100644 --- a/app/src/main/java/com/jerboa/ui/components/privatemessage/PrivateMessage.kt +++ b/app/src/main/java/com/jerboa/ui/components/privatemessage/PrivateMessage.kt @@ -28,9 +28,9 @@ import com.jerboa.ui.theme.LARGE_PADDING import com.jerboa.ui.theme.SMALL_PADDING import com.jerboa.ui.theme.XXL_PADDING import com.jerboa.ui.theme.muted -import it.vercruysse.lemmyapi.v0x19.datatypes.Person -import it.vercruysse.lemmyapi.v0x19.datatypes.PersonId -import it.vercruysse.lemmyapi.v0x19.datatypes.PrivateMessageView +import it.vercruysse.lemmyapi.datatypes.Person +import it.vercruysse.lemmyapi.datatypes.PersonId +import it.vercruysse.lemmyapi.datatypes.PrivateMessageView @Composable fun PrivateMessageHeader( diff --git a/app/src/main/java/com/jerboa/ui/components/privatemessage/PrivateMessageReply.kt b/app/src/main/java/com/jerboa/ui/components/privatemessage/PrivateMessageReply.kt index fa7779153..9a187195a 100644 --- a/app/src/main/java/com/jerboa/ui/components/privatemessage/PrivateMessageReply.kt +++ b/app/src/main/java/com/jerboa/ui/components/privatemessage/PrivateMessageReply.kt @@ -20,8 +20,8 @@ import com.jerboa.db.entity.Account import com.jerboa.ui.components.common.MarkdownTextField import com.jerboa.ui.theme.LARGE_PADDING import com.jerboa.ui.theme.MEDIUM_PADDING -import it.vercruysse.lemmyapi.v0x19.datatypes.PersonId -import it.vercruysse.lemmyapi.v0x19.datatypes.PrivateMessageView +import it.vercruysse.lemmyapi.datatypes.PersonId +import it.vercruysse.lemmyapi.datatypes.PrivateMessageView @Composable fun RepliedPrivateMessage( diff --git a/app/src/main/java/com/jerboa/ui/components/privatemessage/PrivateMessageReplyScreen.kt b/app/src/main/java/com/jerboa/ui/components/privatemessage/PrivateMessageReplyScreen.kt index 51c8282b0..d341eca65 100644 --- a/app/src/main/java/com/jerboa/ui/components/privatemessage/PrivateMessageReplyScreen.kt +++ b/app/src/main/java/com/jerboa/ui/components/privatemessage/PrivateMessageReplyScreen.kt @@ -28,8 +28,8 @@ import com.jerboa.model.SiteViewModel import com.jerboa.ui.components.common.ActionTopBar import com.jerboa.ui.components.common.LoadingBar import com.jerboa.ui.components.common.getCurrentAccount -import it.vercruysse.lemmyapi.v0x19.datatypes.PostId -import it.vercruysse.lemmyapi.v0x19.datatypes.PrivateMessageView +import it.vercruysse.lemmyapi.datatypes.PostId +import it.vercruysse.lemmyapi.datatypes.PrivateMessageView object PrivateMessage { const val PM_VIEW = "private-message::return(pm-view)" diff --git a/app/src/main/java/com/jerboa/ui/components/registrationapplications/RegistrationApplications.kt b/app/src/main/java/com/jerboa/ui/components/registrationapplications/RegistrationApplications.kt index 88bda77f5..e8d0dd775 100644 --- a/app/src/main/java/com/jerboa/ui/components/registrationapplications/RegistrationApplications.kt +++ b/app/src/main/java/com/jerboa/ui/components/registrationapplications/RegistrationApplications.kt @@ -70,9 +70,9 @@ import com.jerboa.ui.components.common.simpleVerticalScrollbar import com.jerboa.ui.components.person.PersonProfileLink import com.jerboa.ui.theme.MEDIUM_PADDING import com.jerboa.ui.theme.SMALL_PADDING -import it.vercruysse.lemmyapi.v0x19.datatypes.ApproveRegistrationApplication -import it.vercruysse.lemmyapi.v0x19.datatypes.PersonId -import it.vercruysse.lemmyapi.v0x19.datatypes.RegistrationApplicationView +import it.vercruysse.lemmyapi.datatypes.ApproveRegistrationApplication +import it.vercruysse.lemmyapi.datatypes.PersonId +import it.vercruysse.lemmyapi.datatypes.RegistrationApplicationView import kotlinx.coroutines.CoroutineScope @OptIn(ExperimentalMaterial3Api::class) diff --git a/app/src/main/java/com/jerboa/ui/components/remove/comment/CommentRemoveScreen.kt b/app/src/main/java/com/jerboa/ui/components/remove/comment/CommentRemoveScreen.kt index 0046f69ce..0b235c634 100644 --- a/app/src/main/java/com/jerboa/ui/components/remove/comment/CommentRemoveScreen.kt +++ b/app/src/main/java/com/jerboa/ui/components/remove/comment/CommentRemoveScreen.kt @@ -23,7 +23,7 @@ import com.jerboa.model.CommentRemoveViewModel import com.jerboa.ui.components.common.ActionTopBar import com.jerboa.ui.components.common.getCurrentAccount import com.jerboa.ui.components.remove.RemoveItemBody -import it.vercruysse.lemmyapi.v0x19.datatypes.Comment +import it.vercruysse.lemmyapi.datatypes.Comment object CommentRemoveReturn { const val COMMENT_VIEW = "comment-remove::return(comment-view)" diff --git a/app/src/main/java/com/jerboa/ui/components/remove/post/PostRemoveScreen.kt b/app/src/main/java/com/jerboa/ui/components/remove/post/PostRemoveScreen.kt index df35b1d67..5319301db 100644 --- a/app/src/main/java/com/jerboa/ui/components/remove/post/PostRemoveScreen.kt +++ b/app/src/main/java/com/jerboa/ui/components/remove/post/PostRemoveScreen.kt @@ -23,7 +23,7 @@ import com.jerboa.model.PostRemoveViewModel import com.jerboa.ui.components.common.ActionTopBar import com.jerboa.ui.components.common.getCurrentAccount import com.jerboa.ui.components.remove.RemoveItemBody -import it.vercruysse.lemmyapi.v0x19.datatypes.Post +import it.vercruysse.lemmyapi.datatypes.Post object PostRemoveReturn { const val POST_VIEW = "post-edit::return(post-view)" diff --git a/app/src/main/java/com/jerboa/ui/components/report/comment/CreateCommentReportScreen.kt b/app/src/main/java/com/jerboa/ui/components/report/comment/CreateCommentReportScreen.kt index 073631ff6..ebe418ecd 100644 --- a/app/src/main/java/com/jerboa/ui/components/report/comment/CreateCommentReportScreen.kt +++ b/app/src/main/java/com/jerboa/ui/components/report/comment/CreateCommentReportScreen.kt @@ -22,7 +22,7 @@ import com.jerboa.model.CreateReportViewModel import com.jerboa.ui.components.common.ActionTopBar import com.jerboa.ui.components.common.getCurrentAccount import com.jerboa.ui.components.report.CreateReportBody -import it.vercruysse.lemmyapi.v0x19.datatypes.CommentId +import it.vercruysse.lemmyapi.datatypes.CommentId @Composable fun CreateCommentReportScreen( diff --git a/app/src/main/java/com/jerboa/ui/components/report/post/CreatePostReportScreen.kt b/app/src/main/java/com/jerboa/ui/components/report/post/CreatePostReportScreen.kt index aeff25662..710835cb6 100644 --- a/app/src/main/java/com/jerboa/ui/components/report/post/CreatePostReportScreen.kt +++ b/app/src/main/java/com/jerboa/ui/components/report/post/CreatePostReportScreen.kt @@ -23,7 +23,7 @@ import com.jerboa.model.CreateReportViewModel import com.jerboa.ui.components.common.ActionTopBar import com.jerboa.ui.components.common.getCurrentAccount import com.jerboa.ui.components.report.CreateReportBody -import it.vercruysse.lemmyapi.v0x19.datatypes.PostId +import it.vercruysse.lemmyapi.datatypes.PostId @Composable fun CreatePostReportScreen( diff --git a/app/src/main/java/com/jerboa/ui/components/reports/CommentReportItem.kt b/app/src/main/java/com/jerboa/ui/components/reports/CommentReportItem.kt index b407672d4..78b9a9c9f 100644 --- a/app/src/main/java/com/jerboa/ui/components/reports/CommentReportItem.kt +++ b/app/src/main/java/com/jerboa/ui/components/reports/CommentReportItem.kt @@ -14,13 +14,13 @@ import com.jerboa.ui.components.comment.CommentBody import com.jerboa.ui.components.comment.CommentNodeHeader import com.jerboa.ui.theme.MEDIUM_PADDING import com.jerboa.ui.theme.SMALL_PADDING +import it.vercruysse.lemmyapi.datatypes.CommentId +import it.vercruysse.lemmyapi.datatypes.CommentReportView +import it.vercruysse.lemmyapi.datatypes.CommentView +import it.vercruysse.lemmyapi.datatypes.LocalUserVoteDisplayMode +import it.vercruysse.lemmyapi.datatypes.PersonId +import it.vercruysse.lemmyapi.datatypes.ResolveCommentReport import it.vercruysse.lemmyapi.dto.SubscribedType -import it.vercruysse.lemmyapi.v0x19.datatypes.CommentId -import it.vercruysse.lemmyapi.v0x19.datatypes.CommentReportView -import it.vercruysse.lemmyapi.v0x19.datatypes.CommentView -import it.vercruysse.lemmyapi.v0x19.datatypes.LocalUserVoteDisplayMode -import it.vercruysse.lemmyapi.v0x19.datatypes.PersonId -import it.vercruysse.lemmyapi.v0x19.datatypes.ResolveCommentReport @Composable fun CommentReportItem( @@ -51,6 +51,7 @@ fun CommentReportItem( creator_is_admin = false, creator_is_moderator = false, saved = false, + banned_from_community = false, ) Column( diff --git a/app/src/main/java/com/jerboa/ui/components/reports/MessageReportItem.kt b/app/src/main/java/com/jerboa/ui/components/reports/MessageReportItem.kt index b364bcf19..53fed453e 100644 --- a/app/src/main/java/com/jerboa/ui/components/reports/MessageReportItem.kt +++ b/app/src/main/java/com/jerboa/ui/components/reports/MessageReportItem.kt @@ -18,9 +18,9 @@ import com.jerboa.ui.components.common.MyMarkdownText import com.jerboa.ui.components.common.TimeAgo import com.jerboa.ui.theme.MEDIUM_PADDING import com.jerboa.ui.theme.SMALL_PADDING -import it.vercruysse.lemmyapi.v0x19.datatypes.PersonId -import it.vercruysse.lemmyapi.v0x19.datatypes.PrivateMessageReportView -import it.vercruysse.lemmyapi.v0x19.datatypes.ResolvePrivateMessageReport +import it.vercruysse.lemmyapi.datatypes.PersonId +import it.vercruysse.lemmyapi.datatypes.PrivateMessageReportView +import it.vercruysse.lemmyapi.datatypes.ResolvePrivateMessageReport @Composable fun MessageReportItem( diff --git a/app/src/main/java/com/jerboa/ui/components/reports/PostReportItem.kt b/app/src/main/java/com/jerboa/ui/components/reports/PostReportItem.kt index 7aaa2bf37..3924c0d40 100644 --- a/app/src/main/java/com/jerboa/ui/components/reports/PostReportItem.kt +++ b/app/src/main/java/com/jerboa/ui/components/reports/PostReportItem.kt @@ -22,13 +22,13 @@ import com.jerboa.ui.components.post.PostBody import com.jerboa.ui.components.post.PostHeaderLine import com.jerboa.ui.theme.MEDIUM_PADDING import com.jerboa.ui.theme.SMALL_PADDING +import it.vercruysse.lemmyapi.datatypes.Community +import it.vercruysse.lemmyapi.datatypes.LocalUserVoteDisplayMode +import it.vercruysse.lemmyapi.datatypes.PersonId +import it.vercruysse.lemmyapi.datatypes.PostReportView +import it.vercruysse.lemmyapi.datatypes.PostView +import it.vercruysse.lemmyapi.datatypes.ResolvePostReport import it.vercruysse.lemmyapi.dto.SubscribedType -import it.vercruysse.lemmyapi.v0x19.datatypes.Community -import it.vercruysse.lemmyapi.v0x19.datatypes.LocalUserVoteDisplayMode -import it.vercruysse.lemmyapi.v0x19.datatypes.PersonId -import it.vercruysse.lemmyapi.v0x19.datatypes.PostReportView -import it.vercruysse.lemmyapi.v0x19.datatypes.PostView -import it.vercruysse.lemmyapi.v0x19.datatypes.ResolvePostReport @Composable fun PostReportItem( @@ -66,6 +66,8 @@ fun PostReportItem( read = false, saved = false, unread_comments = 0, + banned_from_community = false, + hidden = false, ) Column( diff --git a/app/src/main/java/com/jerboa/ui/components/reports/Reports.kt b/app/src/main/java/com/jerboa/ui/components/reports/Reports.kt index 3e88c1ca7..b06559261 100644 --- a/app/src/main/java/com/jerboa/ui/components/reports/Reports.kt +++ b/app/src/main/java/com/jerboa/ui/components/reports/Reports.kt @@ -35,8 +35,8 @@ import com.jerboa.ui.components.common.MyMarkdownText import com.jerboa.ui.components.common.UnreadOrAllOptionsDropDown import com.jerboa.ui.components.person.PersonProfileLink import com.jerboa.ui.theme.MEDIUM_PADDING -import it.vercruysse.lemmyapi.v0x19.datatypes.Person -import it.vercruysse.lemmyapi.v0x19.datatypes.PersonId +import it.vercruysse.lemmyapi.datatypes.Person +import it.vercruysse.lemmyapi.datatypes.PersonId @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/app/src/main/java/com/jerboa/ui/components/settings/account/AccountSettings.kt b/app/src/main/java/com/jerboa/ui/components/settings/account/AccountSettings.kt index aa779a9b7..83dbd5f26 100644 --- a/app/src/main/java/com/jerboa/ui/components/settings/account/AccountSettings.kt +++ b/app/src/main/java/com/jerboa/ui/components/settings/account/AccountSettings.kt @@ -47,10 +47,10 @@ import com.jerboa.ui.components.common.PickImage import com.jerboa.ui.components.common.PictrsBannerImage import com.jerboa.ui.theme.MEDIUM_PADDING import com.jerboa.ui.theme.muted +import it.vercruysse.lemmyapi.datatypes.SaveUserSettings import it.vercruysse.lemmyapi.dto.ListingType import it.vercruysse.lemmyapi.dto.SortType import it.vercruysse.lemmyapi.dto.getSupportedEntries -import it.vercruysse.lemmyapi.v0x19.datatypes.SaveUserSettings import kotlinx.coroutines.launch import me.zhanghai.compose.preference.ListPreference import me.zhanghai.compose.preference.ListPreferenceType diff --git a/app/src/main/java/com/jerboa/ui/components/settings/block/BlocksScreen.kt b/app/src/main/java/com/jerboa/ui/components/settings/block/BlocksScreen.kt index db153f984..dd548474e 100644 --- a/app/src/main/java/com/jerboa/ui/components/settings/block/BlocksScreen.kt +++ b/app/src/main/java/com/jerboa/ui/components/settings/block/BlocksScreen.kt @@ -50,7 +50,7 @@ import com.jerboa.ui.components.common.SimpleTopAppBar import com.jerboa.ui.components.common.Title import com.jerboa.ui.theme.LARGE_PADDING import com.jerboa.ui.theme.MEDIUM_PADDING -import it.vercruysse.lemmyapi.v0x19.datatypes.MyUserInfo +import it.vercruysse.lemmyapi.datatypes.MyUserInfo @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/app/src/main/java/com/jerboa/ui/components/viewvotes/ViewVotes.kt b/app/src/main/java/com/jerboa/ui/components/viewvotes/ViewVotes.kt index 84976dd3d..83ded5dc1 100644 --- a/app/src/main/java/com/jerboa/ui/components/viewvotes/ViewVotes.kt +++ b/app/src/main/java/com/jerboa/ui/components/viewvotes/ViewVotes.kt @@ -21,8 +21,8 @@ import com.jerboa.R import com.jerboa.ui.components.common.simpleVerticalScrollbar import com.jerboa.ui.components.person.PersonProfileLink import com.jerboa.ui.theme.MEDIUM_PADDING -import it.vercruysse.lemmyapi.v0x19.datatypes.PersonId -import it.vercruysse.lemmyapi.v0x19.datatypes.VoteView +import it.vercruysse.lemmyapi.datatypes.PersonId +import it.vercruysse.lemmyapi.datatypes.VoteView @Composable fun ViewVotesBody( diff --git a/app/src/main/java/com/jerboa/ui/components/viewvotes/comment/CommentLikesScreen.kt b/app/src/main/java/com/jerboa/ui/components/viewvotes/comment/CommentLikesScreen.kt index 65a40057e..25cfb19ed 100644 --- a/app/src/main/java/com/jerboa/ui/components/viewvotes/comment/CommentLikesScreen.kt +++ b/app/src/main/java/com/jerboa/ui/components/viewvotes/comment/CommentLikesScreen.kt @@ -21,7 +21,7 @@ import com.jerboa.ui.components.common.SimpleTopAppBar import com.jerboa.ui.components.common.TriggerWhenReachingEnd import com.jerboa.ui.components.common.isRefreshing import com.jerboa.ui.components.viewvotes.ViewVotesBody -import it.vercruysse.lemmyapi.v0x19.datatypes.CommentId +import it.vercruysse.lemmyapi.datatypes.CommentId @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/app/src/main/java/com/jerboa/ui/components/viewvotes/post/PostLikesScreen.kt b/app/src/main/java/com/jerboa/ui/components/viewvotes/post/PostLikesScreen.kt index 29b86ad89..6eaa9c40a 100644 --- a/app/src/main/java/com/jerboa/ui/components/viewvotes/post/PostLikesScreen.kt +++ b/app/src/main/java/com/jerboa/ui/components/viewvotes/post/PostLikesScreen.kt @@ -21,7 +21,7 @@ import com.jerboa.ui.components.common.SimpleTopAppBar import com.jerboa.ui.components.common.TriggerWhenReachingEnd import com.jerboa.ui.components.common.isRefreshing import com.jerboa.ui.components.viewvotes.ViewVotesBody -import it.vercruysse.lemmyapi.v0x19.datatypes.PostId +import it.vercruysse.lemmyapi.datatypes.PostId @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/app/src/test/java/com/jerboa/ExampleUnitTest.kt b/app/src/test/java/com/jerboa/ExampleUnitTest.kt index 159238fbb..ddce7eec9 100644 --- a/app/src/test/java/com/jerboa/ExampleUnitTest.kt +++ b/app/src/test/java/com/jerboa/ExampleUnitTest.kt @@ -2,10 +2,10 @@ package com.jerboa import com.jerboa.api.API import com.jerboa.api.DEFAULT_INSTANCE +import it.vercruysse.lemmyapi.datatypes.GetPost +import it.vercruysse.lemmyapi.datatypes.GetPosts import it.vercruysse.lemmyapi.dto.ListingType import it.vercruysse.lemmyapi.dto.SortType -import it.vercruysse.lemmyapi.v0x19.datatypes.GetPost -import it.vercruysse.lemmyapi.v0x19.datatypes.GetPosts import kotlinx.coroutines.runBlocking import org.junit.Assert.assertEquals import org.junit.Assert.assertNotNull