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 9895ca55f..a817751cc 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 @@ -352,9 +352,12 @@ fun Sidebar( icon: String?, content: String?, published: String, - usersActiveMonth: Int, postCount: Int, - commentCount: Int + commentCount: Int, + usersActiveDay: Int, + usersActiveWeek: Int, + usersActiveMonth: Int, + usersActiveHalfYear: Int ) { val listState = rememberLazyListState() @@ -405,7 +408,10 @@ fun Sidebar( published = published ) CommentsAndPosts( + usersActiveDay = usersActiveDay, + usersActiveWeek = usersActiveWeek, usersActiveMonth = usersActiveMonth, + usersActiveHalfYear = usersActiveHalfYear, postCount = postCount, commentCount = commentCount ) @@ -425,16 +431,34 @@ fun Sidebar( @Composable fun CommentsAndPosts( + usersActiveDay: Int, + usersActiveWeek: Int, usersActiveMonth: Int, + usersActiveHalfYear: Int, postCount: Int, commentCount: Int ) { - Row { + FlowRow { + Text( + text = "${siFormat(usersActiveDay)} users / day", + color = MaterialTheme.colors.onBackground.muted + ) + DotSpacer() + Text( + text = "${siFormat(usersActiveWeek)} users / week", + color = MaterialTheme.colors.onBackground.muted + ) + DotSpacer() Text( text = "${siFormat(usersActiveMonth)} users / month", color = MaterialTheme.colors.onBackground.muted ) DotSpacer() + Text( + text = "${siFormat(usersActiveHalfYear)} users / 6 months", + color = MaterialTheme.colors.onBackground.muted + ) + DotSpacer() Text( text = "${siFormat(postCount)} posts", color = MaterialTheme.colors.onBackground.muted diff --git a/app/src/main/java/com/jerboa/ui/components/community/CommunityActivity.kt b/app/src/main/java/com/jerboa/ui/components/community/CommunityActivity.kt index 8f8b405d9..7920fcd87 100644 --- a/app/src/main/java/com/jerboa/ui/components/community/CommunityActivity.kt +++ b/app/src/main/java/com/jerboa/ui/components/community/CommunityActivity.kt @@ -4,11 +4,17 @@ import android.util.Log import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.lazy.rememberLazyListState -import androidx.compose.material.* +import androidx.compose.material.FabPosition +import androidx.compose.material.FloatingActionButton +import androidx.compose.material.Icon +import androidx.compose.material.LinearProgressIndicator +import androidx.compose.material.MaterialTheme +import androidx.compose.material.Scaffold +import androidx.compose.material.Surface import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Add +import androidx.compose.material.rememberScaffoldState import androidx.compose.runtime.Composable -import androidx.compose.runtime.getValue import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext 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 bb52957dc..9d8de554d 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 @@ -1,7 +1,11 @@ package com.jerboa.ui.components.community import androidx.compose.foundation.clickable -import androidx.compose.foundation.layout.* +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding import androidx.compose.material.MaterialTheme import androidx.compose.material.Text import androidx.compose.runtime.Composable @@ -17,7 +21,13 @@ import com.jerboa.datatypes.CommunityView import com.jerboa.datatypes.sampleCommunitySafe import com.jerboa.datatypes.sampleCommunityView import com.jerboa.ui.components.common.CircularIcon -import com.jerboa.ui.theme.* +import com.jerboa.ui.theme.DRAWER_ITEM_SPACING +import com.jerboa.ui.theme.ICON_SIZE +import com.jerboa.ui.theme.ICON_THUMBNAIL_SIZE +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 @Composable fun CommunityName( diff --git a/app/src/main/java/com/jerboa/ui/components/community/CommunityViewModel.kt b/app/src/main/java/com/jerboa/ui/components/community/CommunityViewModel.kt index 2d5079326..2bf989ea1 100644 --- a/app/src/main/java/com/jerboa/ui/components/community/CommunityViewModel.kt +++ b/app/src/main/java/com/jerboa/ui/components/community/CommunityViewModel.kt @@ -13,7 +13,12 @@ import com.jerboa.VoteType import com.jerboa.api.API import com.jerboa.api.followCommunityWrapper import com.jerboa.api.retrofitErrorHandler -import com.jerboa.datatypes.* +import com.jerboa.datatypes.CommunityModeratorView +import com.jerboa.datatypes.CommunityView +import com.jerboa.datatypes.ListingType +import com.jerboa.datatypes.PersonSafe +import com.jerboa.datatypes.PostView +import com.jerboa.datatypes.SortType import com.jerboa.datatypes.api.GetCommunity import com.jerboa.db.Account import com.jerboa.loginFirstToast 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 52ac3d40e..dc59e1fda 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 @@ -5,10 +5,18 @@ import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.foundation.text.KeyboardOptions -import androidx.compose.material.* +import androidx.compose.material.Icon +import androidx.compose.material.IconButton +import androidx.compose.material.MaterialTheme +import androidx.compose.material.Text +import androidx.compose.material.TextField +import androidx.compose.material.TextFieldDefaults +import androidx.compose.material.TopAppBar +import androidx.compose.material.contentColorFor import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Close import androidx.compose.material.icons.filled.MoreVert +import androidx.compose.material.primarySurface import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color diff --git a/app/src/main/java/com/jerboa/ui/components/community/list/CommunityListActivity.kt b/app/src/main/java/com/jerboa/ui/components/community/list/CommunityListActivity.kt index d1f9ff3cb..a4f1933e1 100644 --- a/app/src/main/java/com/jerboa/ui/components/community/list/CommunityListActivity.kt +++ b/app/src/main/java/com/jerboa/ui/components/community/list/CommunityListActivity.kt @@ -7,10 +7,10 @@ import androidx.compose.material.LinearProgressIndicator import androidx.compose.material.MaterialTheme import androidx.compose.material.Scaffold import androidx.compose.material.Surface -import androidx.compose.runtime.* import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier 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 6107fb19b..f2e1766f7 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 @@ -14,7 +14,10 @@ fun CommunitySidebar(communityView: CommunityView) { banner = community.banner, icon = community.icon, published = community.published, + usersActiveDay = counts.users_active_day, + usersActiveWeek = counts.users_active_week, usersActiveMonth = counts.users_active_month, + usersActiveHalfYear = counts.users_active_half_year, postCount = counts.posts, commentCount = counts.comments ) 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 4eda4ce43..5bce71cdd 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 @@ -7,9 +7,17 @@ import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.lazy.LazyListState import androidx.compose.foundation.lazy.rememberLazyListState -import androidx.compose.material.* +import androidx.compose.material.FabPosition +import androidx.compose.material.FloatingActionButton +import androidx.compose.material.Icon +import androidx.compose.material.LinearProgressIndicator +import androidx.compose.material.MaterialTheme +import androidx.compose.material.Scaffold +import androidx.compose.material.ScaffoldState +import androidx.compose.material.Surface import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Add +import androidx.compose.material.rememberScaffoldState import androidx.compose.runtime.Composable import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.ui.Modifier diff --git a/app/src/main/java/com/jerboa/ui/components/home/HomeViewModel.kt b/app/src/main/java/com/jerboa/ui/components/home/HomeViewModel.kt index f9a8dd585..206f79147 100644 --- a/app/src/main/java/com/jerboa/ui/components/home/HomeViewModel.kt +++ b/app/src/main/java/com/jerboa/ui/components/home/HomeViewModel.kt @@ -11,7 +11,13 @@ import androidx.lifecycle.viewModelScope import com.jerboa.VoteType import com.jerboa.api.API import com.jerboa.api.retrofitErrorHandler -import com.jerboa.datatypes.* +import com.jerboa.datatypes.CommentView +import com.jerboa.datatypes.CommunitySafe +import com.jerboa.datatypes.ListingType +import com.jerboa.datatypes.PersonSafe +import com.jerboa.datatypes.PostView +import com.jerboa.datatypes.PrivateMessageView +import com.jerboa.datatypes.SortType import com.jerboa.datatypes.api.GetUnreadCount import com.jerboa.datatypes.api.GetUnreadCountResponse import com.jerboa.db.Account 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 86f2852ad..fc13447f5 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 @@ -12,11 +12,14 @@ fun SiteSidebar(siteView: SiteView) { val counts = siteView.counts Sidebar( title = site.description, - content = site.sidebar, banner = site.banner, icon = site.icon, + content = site.sidebar, published = site.published, + usersActiveDay = counts.users_active_day, + usersActiveWeek = counts.users_active_week, usersActiveMonth = counts.users_active_month, + usersActiveHalfYear = counts.users_active_half_year, postCount = counts.posts, commentCount = counts.comments ) diff --git a/app/src/main/java/com/jerboa/ui/components/inbox/InboxViewModel.kt b/app/src/main/java/com/jerboa/ui/components/inbox/InboxViewModel.kt index 8db74d8d0..889699dea 100644 --- a/app/src/main/java/com/jerboa/ui/components/inbox/InboxViewModel.kt +++ b/app/src/main/java/com/jerboa/ui/components/inbox/InboxViewModel.kt @@ -9,12 +9,24 @@ import androidx.lifecycle.viewModelScope import androidx.navigation.NavController import com.jerboa.VoteType import com.jerboa.api.API -import com.jerboa.datatypes.* +import com.jerboa.datatypes.CommentView +import com.jerboa.datatypes.CommunitySafe +import com.jerboa.datatypes.PersonMentionView +import com.jerboa.datatypes.PersonSafe +import com.jerboa.datatypes.PrivateMessageView +import com.jerboa.datatypes.SortType import com.jerboa.datatypes.api.CreatePrivateMessage import com.jerboa.datatypes.api.MarkAllAsRead import com.jerboa.db.Account import com.jerboa.toastException -import com.jerboa.ui.components.comment.* +import com.jerboa.ui.components.comment.createPrivateMessageRoutine +import com.jerboa.ui.components.comment.deleteCommentRoutine +import com.jerboa.ui.components.comment.fetchPersonMentionsRoutine +import com.jerboa.ui.components.comment.fetchRepliesRoutine +import com.jerboa.ui.components.comment.likeCommentRoutine +import com.jerboa.ui.components.comment.markCommentAsReadRoutine +import com.jerboa.ui.components.comment.markPersonMentionAsReadRoutine +import com.jerboa.ui.components.comment.saveCommentRoutine import com.jerboa.ui.components.community.blockCommunityRoutine import com.jerboa.ui.components.person.blockPersonRoutine import com.jerboa.ui.components.person.fetchPrivateMessagesRoutine diff --git a/app/src/main/java/com/jerboa/ui/components/post/PostActivity.kt b/app/src/main/java/com/jerboa/ui/components/post/PostActivity.kt index 71838e1cc..0e5446884 100644 --- a/app/src/main/java/com/jerboa/ui/components/post/PostActivity.kt +++ b/app/src/main/java/com/jerboa/ui/components/post/PostActivity.kt @@ -10,8 +10,9 @@ import androidx.compose.material.LinearProgressIndicator import androidx.compose.material.MaterialTheme import androidx.compose.material.Scaffold import androidx.compose.material.Surface -import androidx.compose.runtime.* import androidx.compose.runtime.Composable +import androidx.compose.runtime.mutableStateListOf +import androidx.compose.runtime.remember import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.navigation.NavController 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 70d386616..2bbe0e2e3 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 @@ -2,11 +2,39 @@ package com.jerboa.ui.components.post import android.widget.Toast import androidx.compose.foundation.clickable -import androidx.compose.foundation.layout.* -import androidx.compose.material.* +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.material.AlertDialog +import androidx.compose.material.Card +import androidx.compose.material.Divider +import androidx.compose.material.Icon +import androidx.compose.material.MaterialTheme +import androidx.compose.material.Text import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.* -import androidx.compose.runtime.* +import androidx.compose.material.icons.filled.Block +import androidx.compose.material.icons.filled.BookmarkAdd +import androidx.compose.material.icons.filled.BookmarkAdded +import androidx.compose.material.icons.filled.ChatBubble +import androidx.compose.material.icons.filled.Delete +import androidx.compose.material.icons.filled.Edit +import androidx.compose.material.icons.filled.Flag +import androidx.compose.material.icons.filled.Forum +import androidx.compose.material.icons.filled.Link +import androidx.compose.material.icons.filled.Lock +import androidx.compose.material.icons.filled.MoreVert +import androidx.compose.material.icons.filled.PushPin +import androidx.compose.material.icons.filled.Reply +import androidx.compose.material.icons.filled.Restore +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color @@ -18,13 +46,41 @@ import androidx.compose.ui.unit.dp import androidx.navigation.compose.rememberNavController import com.google.accompanist.flowlayout.FlowCrossAxisAlignment import com.google.accompanist.flowlayout.FlowRow -import com.jerboa.* -import com.jerboa.datatypes.* +import com.jerboa.VoteType +import com.jerboa.communityNameShown +import com.jerboa.datatypes.CommunitySafe +import com.jerboa.datatypes.PersonSafe +import com.jerboa.datatypes.Post +import com.jerboa.datatypes.PostView +import com.jerboa.datatypes.sampleImagePostView +import com.jerboa.datatypes.sampleLinkNoThumbnailPostView +import com.jerboa.datatypes.sampleLinkPostView +import com.jerboa.datatypes.samplePostView import com.jerboa.db.Account -import com.jerboa.ui.components.common.* +import com.jerboa.hostName +import com.jerboa.isImage +import com.jerboa.ui.components.common.ActionBarButton +import com.jerboa.ui.components.common.CommentOrPostNodeHeader +import com.jerboa.ui.components.common.DotSpacer +import com.jerboa.ui.components.common.IconAndTextDrawerItem +import com.jerboa.ui.components.common.MyMarkdownText +import com.jerboa.ui.components.common.PictrsThumbnailImage +import com.jerboa.ui.components.common.PictrsUrlImage +import com.jerboa.ui.components.common.PreviewLines +import com.jerboa.ui.components.common.SimpleTopAppBar +import com.jerboa.ui.components.common.TimeAgo +import com.jerboa.ui.components.common.VoteGeneric import com.jerboa.ui.components.community.CommunityLink import com.jerboa.ui.components.person.PersonProfileLink -import com.jerboa.ui.theme.* +import com.jerboa.ui.theme.BODY_ELEVATION +import com.jerboa.ui.theme.LARGE_PADDING +import com.jerboa.ui.theme.LINK_ICON_SIZE +import com.jerboa.ui.theme.MEDIUM_PADDING +import com.jerboa.ui.theme.POST_LINK_PIC_SIZE +import com.jerboa.ui.theme.SMALL_PADDING +import com.jerboa.ui.theme.XL_PADDING +import com.jerboa.ui.theme.XXL_PADDING +import com.jerboa.ui.theme.muted @Composable fun PostHeaderLine( 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 abce31c7f..9c398f5e1 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 @@ -6,7 +6,11 @@ import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.LazyListState import androidx.compose.foundation.lazy.items import androidx.compose.foundation.lazy.rememberLazyListState -import androidx.compose.runtime.* +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.derivedStateOf +import androidx.compose.runtime.getValue +import androidx.compose.runtime.remember import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp diff --git a/app/src/main/java/com/jerboa/ui/components/post/create/CreatePostActivity.kt b/app/src/main/java/com/jerboa/ui/components/post/create/CreatePostActivity.kt index 2920de74d..26d1b092c 100644 --- a/app/src/main/java/com/jerboa/ui/components/post/create/CreatePostActivity.kt +++ b/app/src/main/java/com/jerboa/ui/components/post/create/CreatePostActivity.kt @@ -9,8 +9,13 @@ import androidx.compose.material.LinearProgressIndicator import androidx.compose.material.MaterialTheme import androidx.compose.material.Scaffold import androidx.compose.material.Surface -import androidx.compose.runtime.* +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.saveable.rememberSaveable +import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.text.input.TextFieldValue diff --git a/app/src/main/java/com/jerboa/ui/components/post/edit/PostEditActivity.kt b/app/src/main/java/com/jerboa/ui/components/post/edit/PostEditActivity.kt index f38e90307..d06c871b0 100644 --- a/app/src/main/java/com/jerboa/ui/components/post/edit/PostEditActivity.kt +++ b/app/src/main/java/com/jerboa/ui/components/post/edit/PostEditActivity.kt @@ -8,8 +8,12 @@ import androidx.compose.material.LinearProgressIndicator import androidx.compose.material.MaterialTheme import androidx.compose.material.Scaffold import androidx.compose.material.Surface -import androidx.compose.runtime.* +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.saveable.rememberSaveable +import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.text.input.TextFieldValue 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 896379f83..8291a45e0 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 @@ -1,6 +1,10 @@ package com.jerboa.ui.components.privatemessage -import androidx.compose.foundation.layout.* +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding import androidx.compose.material.MaterialTheme import androidx.compose.material.Text import androidx.compose.material.icons.Icons diff --git a/app/src/main/java/com/jerboa/ui/components/privatemessage/PrivateMessageReplyActivity.kt b/app/src/main/java/com/jerboa/ui/components/privatemessage/PrivateMessageReplyActivity.kt index ac047db67..8bec8ec08 100644 --- a/app/src/main/java/com/jerboa/ui/components/privatemessage/PrivateMessageReplyActivity.kt +++ b/app/src/main/java/com/jerboa/ui/components/privatemessage/PrivateMessageReplyActivity.kt @@ -7,8 +7,11 @@ import androidx.compose.material.LinearProgressIndicator import androidx.compose.material.MaterialTheme import androidx.compose.material.Scaffold import androidx.compose.material.Surface -import androidx.compose.runtime.* +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.saveable.rememberSaveable +import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalFocusManager diff --git a/app/src/main/java/com/jerboa/ui/components/report/comment/CreateCommentReportActivity.kt b/app/src/main/java/com/jerboa/ui/components/report/comment/CreateCommentReportActivity.kt index 3b6e2d103..d8b6537d6 100644 --- a/app/src/main/java/com/jerboa/ui/components/report/comment/CreateCommentReportActivity.kt +++ b/app/src/main/java/com/jerboa/ui/components/report/comment/CreateCommentReportActivity.kt @@ -4,8 +4,11 @@ import android.util.Log import androidx.compose.material.MaterialTheme import androidx.compose.material.Scaffold import androidx.compose.material.Surface -import androidx.compose.runtime.* +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.saveable.rememberSaveable +import androidx.compose.runtime.setValue import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalFocusManager import androidx.compose.ui.text.input.TextFieldValue diff --git a/app/src/main/java/com/jerboa/ui/components/report/post/CreatePostReportActivity.kt b/app/src/main/java/com/jerboa/ui/components/report/post/CreatePostReportActivity.kt index d13ded208..206475c38 100644 --- a/app/src/main/java/com/jerboa/ui/components/report/post/CreatePostReportActivity.kt +++ b/app/src/main/java/com/jerboa/ui/components/report/post/CreatePostReportActivity.kt @@ -4,8 +4,11 @@ import android.util.Log import androidx.compose.material.MaterialTheme import androidx.compose.material.Scaffold import androidx.compose.material.Surface -import androidx.compose.runtime.* +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.saveable.rememberSaveable +import androidx.compose.runtime.setValue import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalFocusManager import androidx.compose.ui.text.input.TextFieldValue