Skip to content

Commit

Permalink
Merge pull request #120 from snuhcs-course/fix/android-remove-sort
Browse files Browse the repository at this point in the history 
Remove sorting option from my created&saved emojis
  • Loading branch information
@thisisWooyeol
thisisWooyeol authored Dec 7, 2023
2 parents 0d42047 + 6f0e4db commit 15c7e50
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 112 deletions.
56 changes: 0 additions & 56 deletions android/app/src/main/java/com/goliath/emojihub/views/components/CreatedEmojiListView.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,12 @@ 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
Expand All @@ -38,8 +23,6 @@ fun CreatedEmojiListView(

val emojiList = emojiViewModel.myCreatedEmojiList.collectAsLazyPagingItems()

var dropDownMenuExpanded by remember { mutableStateOf(false) }

Column (
Modifier.background(Color.White)
) {
Expand All @@ -49,45 +32,6 @@ fun CreatedEmojiListView(
)

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),
Expand Down
56 changes: 0 additions & 56 deletions android/app/src/main/java/com/goliath/emojihub/views/components/SavedEmojiListView.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,12 @@ 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
Expand All @@ -38,8 +23,6 @@ fun SavedEmojiListView(

val emojiList = emojiViewModel.mySavedEmojiList.collectAsLazyPagingItems()

var dropDownMenuExpanded by remember { mutableStateOf(false) }

Column (
Modifier.background(Color.White)
) {
Expand All @@ -49,45 +32,6 @@ fun SavedEmojiListView(
)

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),
Expand Down

0 comments on commit 15c7e50

Please sign in to comment.