Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 11 additions & 17 deletions .github/workflows/sync-develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,33 +5,27 @@ on:
workflows: ["Deploy to Play Store"]
types:
- completed
workflow_dispatch:

permissions:
contents: write
pull-requests: write

jobs:
sync_develop:
name: Sync Main -> Develop
runs-on: ubuntu-latest
if: ${{ github.event.workflow_run.conclusion == 'success' }}
if: ${{ github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success' }}
steps:
- name: Checkout repository
uses: actions/checkout@v6
with:
fetch-depth: 0
token: ${{ secrets.GITHUB_TOKEN }}

- name: Merge Main to Develop
- name: Sync Main to Develop (Create PR)
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
git config --global user.name "github-actions[bot]"
git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"

# Checkout develop branch
git checkout develop
git pull origin develop --rebase

# Merge main into develop
git merge origin/main --no-edit -m "[CHORE] Sync main to develop [skip ci]"

# Push changes
git push origin develop
echo "Creating sync PR..."
gh pr create --base develop --head main \
--title "[CHORE] Sync main to develop" \
--body "🚀 **Release deployed successfully!**\n\nPlease approve and merge this PR to sync `main` changes back to `develop`." \
|| echo "PR already exists or creation failed."
3 changes: 3 additions & 0 deletions app/src/main/res/raw/keep.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools"
tools:keep="@raw/aboutlibraries" />
5,279 changes: 2,281 additions & 2,998 deletions app/src/release/generated/baselineProfiles/baseline-prof.txt

Large diffs are not rendered by default.

5,279 changes: 2,281 additions & 2,998 deletions app/src/release/generated/baselineProfiles/startup-prof.txt

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions fastlane/metadata/android/ko-KR/changelogs/default.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
• 온보딩 화면이 추가되었어요.
• 알림 기능이 개선되었어요.
• 오픈소스 화면 진입시 발생하던 문제를 수정했어요.
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ androidGradlePlugin = "9.0.1"
spotless = "8.2.1"

# App version
versionCode = "2030000"
versionName = "2.3.0"
versionCode = "2030100"
versionName = "2.3.1"

# Kotlin
kotlin = "2.3.10"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,6 @@ internal fun FeedRoute(
onUnpublishClick = viewModel::diaryUnpublish,
onReportClick = { context.launchCustomTabs(UrlConstant.FEEDBACK_REPORT) },
readAllFeed = viewModel::readAllFeed,
isScrollingDown = viewModel::isScrollingDown
)
}
}
Expand All @@ -185,7 +184,6 @@ private fun FeedScreen(
onReportClick: () -> Unit,
readAllFeed: () -> Unit,
onFeedRefresh: (FeedTab) -> Unit,
isScrollingDown: (FeedScrollState?, FeedScrollState) -> Boolean,
modifier: Modifier = Modifier
) {
val coroutineScope = rememberCoroutineScope()
Expand Down Expand Up @@ -239,14 +237,14 @@ private fun FeedScreen(
LaunchedEffect(pagerState.currentPage) {
snapshotFlow {
FeedScrollState(
firstVisibleItemIndex = currentListState.firstVisibleItemIndex,
firstVisibleItemScrollOffset = currentListState.firstVisibleItemScrollOffset
itemIndex = currentListState.firstVisibleItemIndex,
scrollOffset = currentListState.firstVisibleItemScrollOffset
)
}
.pairwise()
.collect { (previous, current) ->
if (currentListState.isScrollInProgress &&
isScrollingDown(previous, current) &&
current.isScrollingDownFrom(previous) &&
isAtBottom
) {
latestReadAllFeed()
Expand Down Expand Up @@ -349,8 +347,18 @@ private fun FeedScreenPreview() {
hasFollowing = false,
recommendRefreshing = false,
followingRefreshing = false,
onFeedRefresh = {},
isScrollingDown = { _, _ -> false }
onFeedRefresh = {}
)
}
}

private data class FeedScrollState(
val itemIndex: Int,
val scrollOffset: Int
) {
fun isScrollingDownFrom(previous: FeedScrollState?): Boolean {
if (previous == null) return false
return itemIndex > previous.itemIndex ||
(itemIndex == previous.itemIndex && scrollOffset > previous.scrollOffset)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -188,16 +188,6 @@ internal class FeedViewModel @Inject constructor(
}
}

fun isScrollingDown(previous: FeedScrollState?, current: FeedScrollState): Boolean {
if (previous == null) return false

return current.firstVisibleItemIndex > previous.firstVisibleItemIndex ||
(
current.firstVisibleItemIndex == previous.firstVisibleItemIndex &&
current.firstVisibleItemScrollOffset > previous.firstVisibleItemScrollOffset
)
}

private fun UiState<ImmutableList<FeedItemUiModel>>.updateIfSuccess(
transform: (ImmutableList<FeedItemUiModel>) -> ImmutableList<FeedItemUiModel>
): UiState<ImmutableList<FeedItemUiModel>> {
Expand Down Expand Up @@ -246,11 +236,6 @@ internal class FeedViewModel @Inject constructor(
}
}

internal data class FeedScrollState(
val firstVisibleItemIndex: Int,
val firstVisibleItemScrollOffset: Int
)

sealed interface FeedSideEffect {
data class ShowErrorDialog(val onRetry: () -> Unit) : FeedSideEffect

Expand Down