Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Show my created&saved emoji list #118

Merged
merged 1 commit into from
Dec 7, 2023
Merged

Show my created&saved emoji list #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions android/app/src/main/java/com/goliath/emojihub/RootActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,11 +150,19 @@ class RootActivity : ComponentActivity() {
}

composable(NavigationDestination.MyEmojiList) {
CreatedEmojiListView()
val parentEntry = remember(it) {
navController.getBackStackEntry(NavigationDestination.MainPage)
}
val emojiViewModel = hiltViewModel<EmojiViewModel>(parentEntry)
CreatedEmojiListView(emojiViewModel)
}

composable(NavigationDestination.MySavedEmojiList) {
SavedEmojiListView()
val parentEntry = remember(it) {
navController.getBackStackEntry(NavigationDestination.MainPage)
}
val emojiViewModel = hiltViewModel<EmojiViewModel>(parentEntry)
SavedEmojiListView(emojiViewModel)
}
}
}
Expand Down
86 changes: 85 additions & 1 deletion android/app/src/main/java/com/goliath/emojihub/views/components/CreatedEmojiListView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,108 @@
package com.goliath.emojihub.views.components

import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.grid.GridCells
import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
import androidx.compose.material.Button
import androidx.compose.material.ButtonDefaults
import androidx.compose.material.DropdownMenu
import androidx.compose.material.DropdownMenuItem
import androidx.compose.material.Text
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.unit.dp
import androidx.compose.ui.unit.sp
import androidx.paging.compose.collectAsLazyPagingItems
import com.goliath.emojihub.LocalNavController
import com.goliath.emojihub.NavigationDestination
import com.goliath.emojihub.ui.theme.Color
import com.goliath.emojihub.viewmodels.EmojiViewModel

@Composable
fun CreatedEmojiListView(

emojiViewModel: EmojiViewModel
) {
val navController = LocalNavController.current

val emojiList = emojiViewModel.myCreatedEmojiList.collectAsLazyPagingItems()

var dropDownMenuExpanded by remember { mutableStateOf(false) }

Column (
Modifier.background(Color.White)
) {
TopNavigationBar(
title = "내가 만든 이모지",
navigate = { navController.popBackStack() }
)

Column(Modifier.padding(horizontal = 16.dp)) {
Spacer(Modifier.height(16.dp))
Row(
modifier = Modifier.fillMaxWidth(),
verticalAlignment = Alignment.CenterVertically
) {
Spacer(Modifier.weight(1f))
Column {
Button(
onClick = { dropDownMenuExpanded = true },
colors = ButtonDefaults.buttonColors(
backgroundColor = Color.Black,
contentColor = Color.White
)
) {
Text(text = "Sort by", fontSize = 12.sp)
}

DropdownMenu(
expanded = dropDownMenuExpanded,
onDismissRequest = { dropDownMenuExpanded = false }
) {
DropdownMenuItem(onClick = {
emojiViewModel.sortByDate = 1
emojiViewModel.fetchEmojiList()
dropDownMenuExpanded = false
}) {
Text(text = "created date")
}
DropdownMenuItem(onClick = {
emojiViewModel.sortByDate = 0
emojiViewModel.fetchEmojiList()
dropDownMenuExpanded = false
}) {
Text(text = "save count")
}
}
}
}

LazyVerticalGrid(
columns = GridCells.Fixed(2),
modifier = Modifier.padding(top = 18.dp),
horizontalArrangement = Arrangement.spacedBy(4.dp),
verticalArrangement = Arrangement.spacedBy(4.dp),
) {
items(emojiList.itemCount) { index ->
emojiList[index]?.let{
EmojiCell(emoji = it, displayMode = EmojiCellDisplay.VERTICAL) { selectedEmoji ->
emojiViewModel.currentEmoji = selectedEmoji
navController.navigate(NavigationDestination.PlayEmojiVideo)
}
}
}
}
}
}
}
1 change: 0 additions & 1 deletion android/app/src/main/java/com/goliath/emojihub/views/components/CreatedPostListView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ fun CreatedPostListView(

val emojiViewModel = hiltViewModel<EmojiViewModel>()


val pagingPostList = postList.collectAsLazyPagingItems()

Column (Modifier.background(Color.White)) {
Expand Down
86 changes: 85 additions & 1 deletion android/app/src/main/java/com/goliath/emojihub/views/components/SavedEmojiListView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,108 @@
package com.goliath.emojihub.views.components

import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.grid.GridCells
import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
import androidx.compose.material.Button
import androidx.compose.material.ButtonDefaults
import androidx.compose.material.DropdownMenu
import androidx.compose.material.DropdownMenuItem
import androidx.compose.material.Text
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.unit.dp
import androidx.compose.ui.unit.sp
import androidx.paging.compose.collectAsLazyPagingItems
import com.goliath.emojihub.LocalNavController
import com.goliath.emojihub.NavigationDestination
import com.goliath.emojihub.ui.theme.Color
import com.goliath.emojihub.viewmodels.EmojiViewModel

@Composable
fun SavedEmojiListView(

emojiViewModel: EmojiViewModel
) {
val navController = LocalNavController.current

val emojiList = emojiViewModel.mySavedEmojiList.collectAsLazyPagingItems()

var dropDownMenuExpanded by remember { mutableStateOf(false) }

Column (
Modifier.background(Color.White)
) {
TopNavigationBar(
title = "저장된 이모지",
navigate = { navController.popBackStack() }
)

Column(Modifier.padding(horizontal = 16.dp)) {
Spacer(Modifier.height(16.dp))
Row(
modifier = Modifier.fillMaxWidth(),
verticalAlignment = Alignment.CenterVertically
) {
Spacer(Modifier.weight(1f))
Column {
Button(
onClick = { dropDownMenuExpanded = true },
colors = ButtonDefaults.buttonColors(
backgroundColor = Color.Black,
contentColor = Color.White
)
) {
Text(text = "Sort by", fontSize = 12.sp)
}

DropdownMenu(
expanded = dropDownMenuExpanded,
onDismissRequest = { dropDownMenuExpanded = false }
) {
DropdownMenuItem(onClick = {
emojiViewModel.sortByDate = 1
emojiViewModel.fetchEmojiList()
dropDownMenuExpanded = false
}) {
Text(text = "created date")
}
DropdownMenuItem(onClick = {
emojiViewModel.sortByDate = 0
emojiViewModel.fetchEmojiList()
dropDownMenuExpanded = false
}) {
Text(text = "save count")
}
}
}
}

LazyVerticalGrid(
columns = GridCells.Fixed(2),
modifier = Modifier.padding(top = 18.dp),
horizontalArrangement = Arrangement.spacedBy(4.dp),
verticalArrangement = Arrangement.spacedBy(4.dp),
) {
items(emojiList.itemCount) { index ->
emojiList[index]?.let{
EmojiCell(emoji = it, displayMode = EmojiCellDisplay.VERTICAL) { selectedEmoji ->
emojiViewModel.currentEmoji = selectedEmoji
navController.navigate(NavigationDestination.PlayEmojiVideo)
}
}
}
}
}
}
}