Skip to content

Commit

Permalink
[FIX/#220] 충돌 해결
Browse files Browse the repository at this point in the history
  • Loading branch information
boiledEgg-s committed Sep 9, 2024
1 parent d933afe commit dc62afd
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ import com.terning.core.designsystem.theme.TerningTheme
import com.terning.core.extension.addFocusCleaner
import com.terning.core.extension.noRippleClickable
import com.terning.core.extension.toast
import com.terning.domain.entity.response.InternInfoModel
import com.terning.domain.entity.intern.InternInfo
import com.terning.feature.R
import com.terning.feature.dialog.cancel.ScrapCancelDialog
import com.terning.feature.dialog.detail.ScrapDialog
Expand Down Expand Up @@ -111,7 +111,7 @@ fun SearchProcessScreen(
onDismissCancelDialog: (Boolean) -> Unit,
onDismissScrapDialog: () -> Unit,
onClickCancelButton: (Long) -> Unit,
onClickScrapButton: (InternInfoModel) -> Unit,
onClickScrapButton: (InternInfo) -> Unit,
) {
val state by viewModel.state.collectAsStateWithLifecycle()
var sheetState by remember { mutableStateOf(false) }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import androidx.compose.ui.graphics.Color
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.terning.domain.entity.calendar.CalendarScrapRequest
import com.terning.domain.entity.response.InternInfoModel
import com.terning.domain.entity.intern.InternInfo
import com.terning.domain.entity.search.SearchResult
import com.terning.domain.repository.ScrapRepository
import com.terning.domain.repository.SearchRepository
Expand Down

0 comments on commit dc62afd

Please sign in to comment.