v0.3.4: update proguard-rules.pro

app/build.gradle.kts

@@ -24,8 +24,8 @@ android {
  applicationId = "com.hotdeal.alarm"
  minSdk = 31
  targetSdk = 35
-        versionCode = 27
-        versionName = "0.2.7"
+        versionCode = 34
+        versionName = "0.3.4"
 
  testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
  vectorDrawables {

app/proguard-rules.pro

@@ -1,8 +1,40 @@
 # Add project specific ProGuard rules here.
 -keepattributes Signature
 -keepattributes *Annotation*
+
+# Data Entities & Models
 -keep class com.hotdeal.alarm.data.local.db.entity.** { *; }
 -keep class com.hotdeal.alarm.domain.model.** { *; }
+-keep class com.hotdeal.alarm.data.local.preferences.** { *; }
+
+# Room Database & DAOs
+-keep class * extends androidx.room.RoomDatabase
+-keep class com.hotdeal.alarm.data.local.db.dao.** { *; }
+-dontwarn androidx.room.paging.**
+
+# WorkManager & Hilt Worker
+-keep class androidx.work.** { *; }
+-keep class androidx.hilt.work.** { *; }
+-keep class com.hotdeal.alarm.worker.** { *; }
+-keep class * extends androidx.work.ListenableWorker {
+    public <init>(android.content.Context, androidx.work.WorkerParameters);
+}
+-keep class * extends androidx.work.Worker {
+    public <init>(android.content.Context, androidx.work.WorkerParameters);
+}
+-keep class * extends androidx.work.CoroutineWorker {
+    public <init>(android.content.Context, androidx.work.WorkerParameters);
+}
+
+# Dagger & Hilt
+-keep class com.hotdeal.alarm.di.** { *; }
+-keep class * extends android.app.Application
+-keep class * extends android.app.Service
+-keep class * extends android.content.BroadcastReceiver
+-keep class com.hotdeal.alarm.receiver.** { *; }
+
+# Scrapers & Remote Data
+-keep class com.hotdeal.alarm.data.remote.scraper.** { *; }
 
 # OkHttp
 -dontwarn okhttp3.**
@@ -19,4 +51,3 @@
 
 # JSpecify annotations (for Jsoup compatibility)
 -dontwarn org.jspecify.annotations.**
-

app/src/main/AndroidManifest.xml

@@ -14,8 +14,9 @@
     <!-- Notifications (Android 13+) -->
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
-    <!-- Exact Alarms (Android 12+) -->
+    <!-- Exact Alarms (Android 12+, Android 13+) -->
     <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="android.permission.USE_EXACT_ALARM" />
 
     <!-- Boot Completed -->
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
@@ -36,17 +37,17 @@
         android:usesCleartextTraffic="true"
         tools:targetApi="35">
 
- <!-- Disable default WorkManager initializer to use HiltWorkerFactory -->
- <provider
- android:name="androidx.startup.InitializationProvider"
- android:authorities="${applicationId}.androidx-startup"
- android:exported="false"
- tools:node="merge">
- <meta-data
- android:name="androidx.work.WorkManagerInitializer"
- android:value="androidx.startup"
- tools:node="remove" />
- </provider>
+        <!-- Disable default WorkManager initializer to use HiltWorkerFactory -->
+        <provider
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="${applicationId}.androidx-startup"
+            android:exported="false"
+            tools:node="merge">
+            <meta-data
+                android:name="androidx.work.WorkManagerInitializer"
+                android:value="androidx.startup"
+                tools:node="remove" />
+        </provider>
 
         <activity
             android:name=".presentation.main.MainActivity"
@@ -65,30 +66,50 @@
             android:exported="false"
             android:foregroundServiceType="dataSync" />
 
-    <!-- Boot Receiver -->
+        <!-- Polling Alarm Receiver: 정확한 주기 알람 수신 및 핫딜 스크래핑 트리거 -->
+        <receiver
+            android:name=".receiver.PollingAlarmReceiver"
+            android:enabled="true"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="com.hotdeal.alarm.ACTION_POLL_ALARM" />
+            </intent-filter>
+        </receiver>
 
-    <!-- Widget -->
-    <receiver
-        android:name=".widget.HotDealWidget"
-        android:exported="true">
-        <intent-filter>
-            <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-        </intent-filter>
-        <meta-data
-            android:name="android.appwidget.provider"
-            android:resource="@xml/widget_info" />
-    </receiver>
+        <!-- Boot Receiver: 부팅/앱 업데이트 후 백그라운드 폴링 자동 재등록 -->
+        <receiver
+            android:name=".receiver.BootReceiver"
+            android:enabled="true"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+                <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
+            </intent-filter>
+        </receiver>
 
-    <!-- FileProvider for APK installation -->
-    <provider
-        android:name="androidx.core.content.FileProvider"
-        android:authorities="${applicationId}.fileprovider"
-        android:exported="false"
-        android:grantUriPermissions="true">
-        <meta-data
-            android:name="android.support.FILE_PROVIDER_PATHS"
-            android:resource="@xml/file_paths" />
-    </provider>
-</application>
+        <!-- Widget Receiver -->
+        <receiver
+            android:name=".widget.HotDealWidget"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/widget_info" />
+        </receiver>
+
+        <!-- FileProvider for APK installation -->
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.fileprovider"
+            android:exported="false"
+            tools:replace="android:authorities"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_paths" />
+        </provider>
+    </application>
 
 </manifest>

app/src/main/java/com/hotdeal/alarm/HotDealApplication.kt

@@ -1,9 +1,17 @@
 package com.hotdeal.alarm
 
 import android.app.Application
+import android.util.Log
 import androidx.hilt.work.HiltWorkerFactory
 import androidx.work.Configuration
+import com.hotdeal.alarm.data.local.preferences.AppSettings
+import com.hotdeal.alarm.worker.WorkerScheduler
 import dagger.hilt.android.HiltAndroidApp
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @HiltAndroidApp
@@ -12,13 +20,41 @@ class HotDealApplication : Application(), Configuration.Provider {
     @Inject
     lateinit var workerFactory: HiltWorkerFactory
 
+    @Inject
+    lateinit var workerScheduler: WorkerScheduler
+
+    @Inject
+    lateinit var appSettings: AppSettings
+
+    private val applicationScope = CoroutineScope(SupervisorJob() + Dispatchers.Main)
+
     override val workManagerConfiguration: Configuration
         get() = Configuration.Builder()
             .setWorkerFactory(workerFactory)
+            .setMinimumLoggingLevel(Log.DEBUG)
             .build()
 
     override fun onCreate() {
         super.onCreate()
-        // Application initialization
+        // 앱 시작 시 백그라운드 폴링 즉시 등록/갱신
+        ensurePollingScheduled()
+    }
+
+    /**
+     * 앱이 시작될 때마다 백그라운드 폴링이 등록되어 있는지 확인하고,
+     * 없으면 즉시 등록합니다. UPDATE 정책으로 항상 최신 Worker가 동작합니다.
+     */
+    private fun ensurePollingScheduled() {
+        applicationScope.launch {
+            try {
+                val interval = appSettings.pollingInterval.first()
+                Log.d("HotDealApp", "백그라운드 폴링 등록/갱신: ${interval}분 간격")
+                workerScheduler.schedulePeriodicPolling(interval.toLong())
+            } catch (e: Exception) {
+                Log.e("HotDealApp", "폴링 스케줄 등록 실패: ${e.message}", e)
+                // 기본값으로 폴백
+                workerScheduler.schedulePeriodicPolling(WorkerScheduler.DEFAULT_INTERVAL_MINUTES)
+            }
+        }
     }
 }

app/src/main/java/com/hotdeal/alarm/data/local/db/dao/HotDealDao.kt

@@ -121,4 +121,10 @@ interface HotDealDao {
  */
  @Query("UPDATE hot_deals SET isFavorite = :isFavorite WHERE id = :id")
  suspend fun setFavorite(id: String, isFavorite: Boolean)
+
+ /**
+  * 인기글 상태 업데이트 (기존 데이터도 HOT 마킹 가능하도록)
+  */
+ @Query("UPDATE hot_deals SET isPopular = 1 WHERE id IN (:ids)")
+ suspend fun markAsPopular(ids: List<String>)
 }

app/src/main/java/com/hotdeal/alarm/data/local/preferences/AppSettings.kt

@@ -5,7 +5,9 @@ import androidx.datastore.core.DataStore
 import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.core.edit
 import androidx.datastore.preferences.core.intPreferencesKey
+import androidx.datastore.preferences.core.stringPreferencesKey
 import androidx.datastore.preferences.preferencesDataStore
+import com.hotdeal.alarm.domain.model.SiteType
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 
@@ -13,28 +15,91 @@ import kotlinx.coroutines.flow.map
  * 앱 설정 저장 (DataStore)
  */
 class AppSettings(private val context: Context) {
-    
+
     private val Context.dataStore: DataStore<Preferences> by preferencesDataStore(name = "app_settings")
-    
+
     companion object {
         private val POLLING_INTERVAL_KEY = intPreferencesKey("polling_interval_minutes")
+        private val SITE_ORDER_KEY = stringPreferencesKey("site_order_list")
+        private val KEYWORD_ORDER_KEY = stringPreferencesKey("keyword_order_list")
         private const val DEFAULT_INTERVAL = 2
     }
-    
+
     /**
-     * 폴� 주기 (분)
+     * 폴링 주기 (분)
      */
     val pollingInterval: Flow<Int> = context.dataStore.data
         .map { preferences ->
             preferences[POLLING_INTERVAL_KEY] ?: DEFAULT_INTERVAL
         }
-    
+
     /**
-     * 폴� 주기 설정 저장
+     * 폴링 주기 설정 저장
      */
     suspend fun setPollingInterval(minutes: Int) {
         context.dataStore.edit { preferences ->
             preferences[POLLING_INTERVAL_KEY] = minutes
         }
     }
+
+    /**
+     * 사이트 표시 순서 목록
+     */
+    val siteOrder: Flow<List<SiteType>> = context.dataStore.data
+        .map { preferences ->
+            val savedStr = preferences[SITE_ORDER_KEY]
+            if (savedStr.isNullOrBlank()) {
+                SiteType.entries
+            } else {
+                val savedNames = savedStr.split(",")
+                val ordered = mutableListOf<SiteType>()
+                savedNames.forEach { name ->
+                    try {
+                        ordered.add(SiteType.valueOf(name.trim()))
+                    } catch (e: Exception) {
+                        // ignore invalid
+                    }
+                }
+                // 누락된 신규 사이트가 있으면 끝에 추가
+                SiteType.entries.forEach { site ->
+                    if (site !in ordered) {
+                        ordered.add(site)
+                    }
+                }
+                ordered
+            }
+        }
+
+    /**
+     * 사이트 표시 순서 저장
+     */
+    suspend fun setSiteOrder(order: List<SiteType>) {
+        val str = order.joinToString(",") { it.name }
+        context.dataStore.edit { preferences ->
+            preferences[SITE_ORDER_KEY] = str
+        }
+    }
+
+    /**
+     * 키워드 ID 표시 순서 목록
+     */
+    val keywordOrder: Flow<List<Long>> = context.dataStore.data
+        .map { preferences ->
+            val savedStr = preferences[KEYWORD_ORDER_KEY]
+            if (savedStr.isNullOrBlank()) {
+                emptyList()
+            } else {
+                savedStr.split(",").mapNotNull { it.trim().toLongOrNull() }
+            }
+        }
+
+    /**
+     * 키워드 ID 표시 순서 저장
+     */
+    suspend fun setKeywordOrder(order: List<Long>) {
+        val str = order.joinToString(",") { it.toString() }
+        context.dataStore.edit { preferences ->
+            preferences[KEYWORD_ORDER_KEY] = str
+        }
+    }
 }

app/src/main/java/com/hotdeal/alarm/data/remote/scraper/PpomppuScraper.kt

@@ -3,6 +3,7 @@ package com.hotdeal.alarm.data.remote.scraper
 import android.util.Log
 import com.hotdeal.alarm.domain.model.HotDeal
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.withContext
 import okhttp3.OkHttpClient
@@ -13,6 +14,8 @@ import kotlin.random.Random
 
 /**
  * 뽐뿌 스크래퍼
+ * - hotlist_flag=999 페이지와 일반 게시판을 병렬 스크래핑하여 HOT 뱃지 신속 감지
+ * - 기존 hotpop_bg_color CSS 클래스도 폴백으로 감지
  */
 class PpomppuScraper(client: OkHttpClient) : BaseScraper(client) {
     
@@ -27,90 +30,110 @@ class PpomppuScraper(client: OkHttpClient) : BaseScraper(client) {
         try {
             val url = getBoardUrl(board)
             Log.d("Ppomppu", "스크래핑 시작: $url")
+
+            // 1. 인기글 목록과 일반 게시판을 병렬(async)로 동시에 요청하여 딜레이 최소화
+            val hotPostIdsDeferred = async { fetchHotPostIds(board) }
             
-            // 요청 간격 랜덤화 (2~4초) - 차단 방지
-            val delayTime = Random.nextLong(2000, 4000)
-            Log.d("Ppomppu", "요청 대기: ${delayTime}ms")
+            val delayTime = Random.nextLong(500, 1500)
             delay(delayTime)
             
-            // Jsoup으로 직접 연결 (User-Agent 회전)
             val userAgent = getRandomUserAgent()
-            Log.d("Ppomppu", "User-Agent: $userAgent")
-            
             val doc: Document = Jsoup.connect(url)
                 .userAgent(userAgent)
                 .header("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8")
                 .header("Accept-Language", "ko-KR,ko;q=0.9,en-US;q=0.8,en;q=0.7")
                 .header("Accept-Charset", "utf-8,ISO-8859-1")
                 .header("Referer", "https://www.ppomppu.co.kr/")
-                .timeout(30000)
+                .timeout(12000)
                 .followRedirects(true)
                 .get()
-            
-            Log.d("Ppomppu", "문서 파싱 성공, 길이: ${doc.html().length}")
+
+            val hotPostIds = hotPostIdsDeferred.await()
+            Log.d("Ppomppu", "인기글 ID ${hotPostIds.size}개 수집됨: $hotPostIds")
             
             val deals = mutableListOf<HotDeal>()
+            val rowElements: Elements = doc.select("tr.baseList")
+            Log.d("Ppomppu", "찾은 행 요소: ${rowElements.size}개")
 
- // 셀렉터로 요소 찾기 - 인기 게시물 감지를 위해 tr 요소 선택
- val rowElements: Elements = doc.select("tr.baseList")
- Log.d("Ppomppu", "찾은 행 요소: ${rowElements.size}개")
+            var count = 0
+            rowElements.forEach { row ->
+                if (count >= 25) return@forEach
 
- // 최대 20개까지만 처리
- var count = 0
- rowElements.forEach { row ->
- if (count >= 20) return@forEach
+                try {
+                    val titleElement = row.selectFirst("a.baseList-title") ?: return@forEach
+                    val title = titleElement.text().trim()
+                    if (title.isEmpty()) return@forEach
 
- try {
- // 인기 게시물 여부 확인 (hotpop_bg_color 클래스 존재 여부)
- val isPopular = row.hasClass("hotpop_bg_color")
+                    val href = titleElement.attr("href")
+                    if (href.contains("regulation") || href.contains("notice")) return@forEach
 
- // 제목 링크 찾기
- val titleElement = row.selectFirst("a.baseList-title")
- if (titleElement == null) return@forEach
+                    val postId = extractPostId(href)
+                    if (postId.isEmpty()) {
+                        Log.w("Ppomppu", "postId 추출 실패: href=$href")
+                        return@forEach
+                    }
 
- val title = titleElement.text().trim()
- if (title.isEmpty()) return@forEach
+                    // 인기글 판단: hotlist 페이지에 포함되어 있거나 CSS 클래스로 감지
+                    val isPopular = postId in hotPostIds || row.hasClass("hotpop_bg_color")
 
- val href = titleElement.attr("href")
+                    val deal = HotDeal(
+                        id = HotDeal.generateId(siteName, postId),
+                        siteName = siteName,
+                        boardName = board,
+                        title = title,
+                        url = resolveUrl(baseUrl, href),
+                        createdAt = System.currentTimeMillis(),
+                        isPopular = isPopular
+                    )
+                    deals.add(deal)
+                    count++
+                    val popularMark = if (isPopular) " [인기]" else ""
+                    Log.d("Ppomppu", "[$count]$popularMark $title")
+                } catch (e: Exception) {
+                    Log.e("Ppomppu", "파싱 에러: ${e.message}")
+                }
+            }
 
- // 공지사항 제외
- if (href.contains("regulation") || href.contains("notice")) return@forEach
-
- val dealUrl = resolveUrl(baseUrl, href)
-
- // postId 추출
- val postId = extractPostId(href)
- if (postId.isEmpty()) {
- Log.w("Ppomppu", "postId 추출 실패: href=$href")
- return@forEach
- }
-
- val deal = HotDeal(
- id = HotDeal.generateId(siteName, postId),
- siteName = siteName,
- boardName = board,
- title = title,
- url = dealUrl,
- createdAt = System.currentTimeMillis(),
- isPopular = isPopular
- )
- deals.add(deal)
- count++
- val popularMark = if (isPopular) " [인기]" else ""
- Log.d("Ppomppu", "[$count]$popularMark $title")
- } catch (e: Exception) {
- Log.e("Ppomppu", "파싱 에러: ${e.message}")
- }
- }
-
-            Log.d("Ppomppu", "파싱 완료: ${deals.size}개")
+            Log.d("Ppomppu", "파싱 완료: ${deals.size}개 (인기: ${deals.count { it.isPopular }}개)")
             Result.success(deals)
         } catch (e: Exception) {
             Log.e("Ppomppu", "스크래핑 실패: ${e.message}", e)
             Result.failure(e)
         }
     }
-    
+
+    /**
+     * hotlist_flag=999 페이지에서 인기 게시물의 postId 목록을 수집
+     */
+    private suspend fun fetchHotPostIds(board: String): Set<String> {
+        return try {
+            val hotUrl = "${baseUrl}zboard.php?id=$board&hotlist_flag=999"
+            Log.d("Ppomppu", "인기글 페이지 조회: $hotUrl")
+
+            val doc = Jsoup.connect(hotUrl)
+                .userAgent(getRandomUserAgent())
+                .header("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8")
+                .header("Accept-Language", "ko-KR,ko;q=0.9,en-US;q=0.8,en;q=0.7")
+                .header("Referer", "https://www.ppomppu.co.kr/")
+                .timeout(8000)
+                .followRedirects(true)
+                .get()
+
+            val ids = mutableSetOf<String>()
+            doc.select("tr.baseList a.baseList-title").forEach { link ->
+                val href = link.attr("href")
+                val postId = extractPostId(href)
+                if (postId.isNotEmpty()) {
+                    ids.add(postId)
+                }
+            }
+            ids
+        } catch (e: Exception) {
+            Log.w("Ppomppu", "인기글 목록 조회 실패 (폴백으로 계속): ${e.message}")
+            emptySet()
+        }
+    }
+
     private fun extractPostId(href: String): String {
         val afterNo = href.substringAfter("no=", "")
         if (afterNo.isEmpty()) return ""

app/src/main/java/com/hotdeal/alarm/presentation/components/DragDropListState.kt

@@ -0,0 +1,117 @@
+package com.hotdeal.alarm.presentation.components
+
+import androidx.compose.foundation.gestures.detectDragGesturesAfterLongPress
+import androidx.compose.foundation.lazy.LazyListState
+import androidx.compose.runtime.*
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.zIndex
+
+/**
+ * Key 기반 드래그 앤 드롭 Reorder 시스템
+ *
+ * - 각 아이템에 item-level long-press 제스처를 적용하여 드래그 시작
+ * - 드래그 중 다른 아이템의 중심점과 겹치면 swap 실행
+ * - swap 시 delta 보정으로 시각적 점프 방지
+ * - 비드래그 아이템은 animateItemPlacement()로 부드러운 슬라이드
+ */
+@Composable
+fun rememberReorderState(
+    listState: LazyListState,
+    onSwap: (fromListIndex: Int, toListIndex: Int) -> Boolean
+): ReorderState {
+    return remember(listState) {
+        ReorderState(listState, onSwap)
+    }
+}
+
+@Stable
+class ReorderState(
+    val listState: LazyListState,
+    private val onSwap: (Int, Int) -> Boolean
+) {
+    /** 현재 드래그 중인 아이템의 key (null이면 드래그 없음) */
+    var draggedKey by mutableStateOf<Any?>(null)
+        private set
+
+    /** 누적 드래그 Y축 오프셋 */
+    var dragDelta by mutableFloatStateOf(0f)
+        private set
+
+    fun startDrag(key: Any) {
+        draggedKey = key
+        dragDelta = 0f
+    }
+
+    fun updateDrag(delta: Offset) {
+        if (draggedKey == null) return
+        dragDelta += delta.y
+        checkOverlap()
+    }
+
+    fun endDrag() {
+        draggedKey = null
+        dragDelta = 0f
+    }
+
+    private fun checkOverlap() {
+        val dragged = listState.layoutInfo.visibleItemsInfo
+            .firstOrNull { it.key == draggedKey } ?: return
+
+        val draggedMid = dragged.offset + dragged.size / 2f + dragDelta
+
+        val target = listState.layoutInfo.visibleItemsInfo
+            .firstOrNull { item ->
+                item.key != draggedKey &&
+                draggedMid >= item.offset.toFloat() &&
+                draggedMid < (item.offset + item.size).toFloat()
+            } ?: return
+
+        if (dragged.index == target.index) return
+
+        val swapped = onSwap(dragged.index, target.index)
+        if (swapped) {
+            // swap 후 아이템이 새 위치로 이동하므로, 시각적 점프를 막기 위해 delta 보정
+            dragDelta += if (dragged.index < target.index) {
+                -target.size.toFloat()
+            } else {
+                target.size.toFloat()
+            }
+        }
+    }
+}
+
+/**
+ * 개별 아이템에 부착하는 드래그 핸들 + 시각 효과 Modifier
+ * - 길게 누르면 드래그 시작
+ * - 드래그 중 아이템이 떠오르며 그림자 및 스케일업
+ */
+fun Modifier.reorderableItem(
+    state: ReorderState,
+    key: Any
+): Modifier {
+    val isDragged = state.draggedKey == key
+    return this
+        .zIndex(if (isDragged) 10f else 0f)
+        .graphicsLayer {
+            if (isDragged) {
+                translationY = state.dragDelta
+                scaleX = 1.03f
+                scaleY = 1.03f
+                shadowElevation = 16f
+            }
+        }
+        .pointerInput(key) {
+            detectDragGesturesAfterLongPress(
+                onDragStart = { state.startDrag(key) },
+                onDrag = { change, dragAmount ->
+                    change.consume()
+                    state.updateDrag(dragAmount)
+                },
+                onDragEnd = { state.endDrag() },
+                onDragCancel = { state.endDrag() }
+            )
+        }
+}

app/src/main/java/com/hotdeal/alarm/presentation/deallist/DealListScreen.kt

@@ -53,6 +53,7 @@ fun DealListScreen(
     onNavigateToSettings: () -> Unit = {}
 ) {
     val uiState by viewModel.uiState.collectAsStateWithLifecycle()
+    val siteOrder by viewModel.siteOrder.collectAsStateWithLifecycle()
     val context = LocalContext.current
     val focusManager = LocalFocusManager.current
 
@@ -306,7 +307,7 @@ fun DealListScreen(
                         accentColor = FavoriteColor
                     )
 
-                    SiteType.entries.forEach { siteType ->
+                    siteOrder.forEach { siteType ->
                         val siteColor = getSiteColor(siteType)
                         FilterPillChip(
                             selected = selectedSiteFilter == siteType,
@@ -406,20 +407,17 @@ fun DealListScreen(
             }
 
             // Pull to Refresh 인디케이터
-            val progress = pullToRefreshState.progress
-            val showIndicator = pullToRefreshState.isRefreshing || progress > 0
+            val topPadding = paddingValues.calculateTopPadding()
 
-            if (showIndicator) {
-                PullToRefreshContainer(
-                    state = pullToRefreshState,
-                    modifier = Modifier
-                        .align(Alignment.TopCenter)
-                        .padding(top = 50.dp)
-                        .zIndex(999f),
-                    containerColor = MaterialTheme.colorScheme.surfaceVariant,
-                    contentColor = MaterialTheme.colorScheme.primary
-                )
-            }
+            PullToRefreshContainer(
+                state = pullToRefreshState,
+                modifier = Modifier
+                    .align(Alignment.TopCenter)
+                    .padding(top = topPadding)
+                    .zIndex(999f),
+                containerColor = MaterialTheme.colorScheme.surfaceVariant,
+                contentColor = MaterialTheme.colorScheme.primary
+            )
 
             LaunchedEffect(pullToRefreshState.isRefreshing) {
                 if (pullToRefreshState.isRefreshing) {

app/src/main/java/com/hotdeal/alarm/presentation/main/MainScreen.kt

@@ -82,7 +82,7 @@ fun MainScreen(viewModel: MainViewModel) {
                 Row(
                     modifier = Modifier
                         .fillMaxWidth()
-                        .height(54.dp),
+                        .height(48.dp),
                     verticalAlignment = Alignment.CenterVertically
                 ) {
                     val navItems = listOf(
@@ -119,29 +119,29 @@ fun MainScreen(viewModel: MainViewModel) {
                                 if (isSelected) {
                                     Box(
                                         modifier = Modifier
-                                            .width(20.dp)
-                                            .height(3.dp)
+                                            .width(18.dp)
+                                            .height(2.5.dp)
                                             .clip(CornerRadius.shapePill)
                                             .background(MaterialTheme.colorScheme.primary)
                                     )
-                                    Spacer(modifier = Modifier.height(3.dp))
+                                    Spacer(modifier = Modifier.height(2.dp))
                                 } else {
-                                    Spacer(modifier = Modifier.height(6.dp))
+                                    Spacer(modifier = Modifier.height(4.5.dp))
                                 }
 
                                 Icon(
                                     imageVector = if (isSelected) selectedIcon else unselectedIcon,
                                     contentDescription = label,
                                     tint = itemColor,
-                                    modifier = Modifier.size(22.dp)
+                                    modifier = Modifier.size(20.dp)
                                 )
 
-                                Spacer(modifier = Modifier.height(2.dp))
+                                Spacer(modifier = Modifier.height(1.dp))
 
                                 Text(
                                     text = label,
                                     style = MaterialTheme.typography.labelSmall.copy(
-                                        fontSize = 11.sp,
+                                        fontSize = 10.5.sp,
                                         fontWeight = if (isSelected) FontWeight.Bold else FontWeight.Medium
                                     ),
                                     color = itemColor

app/src/main/java/com/hotdeal/alarm/presentation/main/MainViewModel.kt

@@ -5,15 +5,15 @@ import androidx.lifecycle.viewModelScope
 import com.hotdeal.alarm.data.local.db.dao.HotDealDao
 import com.hotdeal.alarm.data.local.db.dao.KeywordDao
 import com.hotdeal.alarm.data.local.db.dao.SiteConfigDao
+import com.hotdeal.alarm.data.local.db.entity.KeywordEntity
 import com.hotdeal.alarm.data.local.db.entity.SiteConfigEntity
 import com.hotdeal.alarm.data.local.preferences.AppSettings
+import com.hotdeal.alarm.domain.model.Keyword
 import com.hotdeal.alarm.domain.model.SiteType
 import com.hotdeal.alarm.worker.WorkerScheduler
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.flow.MutableSharedFlow
-import kotlinx.coroutines.flow.asSharedFlow
 import javax.inject.Inject
 
 @HiltViewModel
@@ -24,28 +24,41 @@ class MainViewModel @Inject constructor(
     private val workerScheduler: WorkerScheduler,
     private val appSettings: AppSettings
 ) : ViewModel() {
-    
+
     private val _uiState = MutableStateFlow<MainUiState>(MainUiState.Loading)
     val uiState: StateFlow<MainUiState> = _uiState.asStateFlow()
-    
-    // 폴링 주기 (저장된 값 즉시 반영)
+
+    // 폴링 주기
     val pollingInterval: StateFlow<Int> = appSettings.pollingInterval
         .stateIn(viewModelScope, SharingStarted.Eagerly, 2)
-    
+
+    // 사이트 표시 순서
+    val siteOrder: StateFlow<List<SiteType>> = appSettings.siteOrder
+        .stateIn(viewModelScope, SharingStarted.Eagerly, SiteType.entries)
+
+    private val _toastEvent = MutableSharedFlow<String>()
+    val toastEvent: SharedFlow<String> = _toastEvent.asSharedFlow()
+
     init {
         initializeApp()
     }
-    
+
     private fun initializeApp() {
+        // 1. 사이트 설정 초기화 후 DB Flow 구독 (별도 코루틴 — collect는 영원히 suspend)
         viewModelScope.launch {
             initializeDefaultSiteConfigs()
-            loadState()
-            // 저장된 폴� 주기로 시작
+            loadState()  // combine().collect — 이 코루틴은 영원히 살아있음
+        }
+
+        // 2. 백그라운드 폴링 등록 + 즉시 1회 스크래핑 (별도 코루틴)
+        viewModelScope.launch {
             val savedInterval = appSettings.pollingInterval.first()
-            startPolling(savedInterval.toLong())
+            workerScheduler.schedulePeriodicPolling(savedInterval.toLong())
+            // 앱 시작 시 즉시 1회 실행하여 최신 데이터 갱신
+            workerScheduler.executeOnce()
         }
     }
-    
+
     private suspend fun initializeDefaultSiteConfigs() {
         val existingConfigs = siteConfigDao.getAllConfigs()
         val existingKeys = existingConfigs.map { it.siteBoardKey }.toSet()
@@ -57,7 +70,7 @@ class MainViewModel @Inject constructor(
                     siteName = site.name,
                     boardName = board.id,
                     displayName = "${site.displayName} - ${board.displayName}",
-                    isEnabled = false
+                    isEnabled = true // 기본값: 활성화 (설치 즉시 수집 작동)
                 )
             }
         }
@@ -67,17 +80,27 @@ class MainViewModel @Inject constructor(
             siteConfigDao.insertConfigs(missingConfigs)
         }
     }
-    
+
     private suspend fun loadState() {
         combine(
             hotDealDao.observeAllDeals(),
             siteConfigDao.observeAllConfigs(),
-            keywordDao.observeAllKeywords()
-        ) { deals, configs, keywords ->
+            keywordDao.observeAllKeywords(),
+            appSettings.keywordOrder
+        ) { deals, configs, keywords, keywordOrder ->
+            // 사용자가 설정한 키워드 순서에 따라 정렬
+            val domainKeywords = keywords.map { it.toDomain() }
+            val sortedKeywords = if (keywordOrder.isEmpty()) {
+                domainKeywords
+            } else {
+                val orderMap = keywordOrder.withIndex().associate { it.value to it.index }
+                domainKeywords.sortedBy { orderMap[it.id] ?: Int.MAX_VALUE }
+            }
+
             MainUiState.Success(
                 deals = deals.map { it.toDomain() },
                 siteConfigs = configs.map { it.toDomain() },
-                keywords = keywords.map { it.toDomain() }
+                keywords = sortedKeywords
             )
         }.catch { e ->
             _uiState.value = MainUiState.Error(e.message ?: "Unknown error")
@@ -85,87 +108,113 @@ class MainViewModel @Inject constructor(
             _uiState.value = state
         }
     }
-    
+
     fun toggleSiteConfig(siteBoardKey: String, enabled: Boolean) {
         viewModelScope.launch {
             siteConfigDao.updateEnabled(siteBoardKey, enabled)
         }
     }
-    
+
+    fun reorderSites(fromIndex: Int, toIndex: Int) {
+        // siteOrder는 appSettings.siteOrder에서 stateIn으로 가져오므로
+        // appSettings를 즉시 저장하고 Flow가 업데이트되도록 함
+        val current = siteOrder.value.toMutableList()
+        if (fromIndex in current.indices && toIndex in current.indices) {
+            val item = current.removeAt(fromIndex)
+            current.add(toIndex, item)
+            viewModelScope.launch {
+                appSettings.setSiteOrder(current)
+            }
+        }
+    }
+
     fun addKeyword(keyword: String) {
         if (keyword.isBlank()) return
         viewModelScope.launch {
-            keywordDao.insertKeyword(
-                com.hotdeal.alarm.data.local.db.entity.KeywordEntity(
+            val newId = keywordDao.insertKeyword(
+                KeywordEntity(
                     keyword = keyword.trim(),
                     isEnabled = true
                 )
             )
+            val currentOrder = appSettings.keywordOrder.first().toMutableList()
+            currentOrder.add(0, newId)
+            appSettings.setKeywordOrder(currentOrder)
         }
     }
-    
+
     fun deleteKeyword(id: Long) {
         viewModelScope.launch {
             keywordDao.deleteKeywordById(id)
+            val currentOrder = appSettings.keywordOrder.first().toMutableList()
+            currentOrder.remove(id)
+            appSettings.setKeywordOrder(currentOrder)
         }
     }
-    
- fun toggleKeyword(id: Long, enabled: Boolean) {
- viewModelScope.launch {
- keywordDao.updateEnabled(id, enabled)
- }
- }
 
- /**
- * 즐겨찾기 토글
- */
- fun toggleFavorite(dealId: String) {
- viewModelScope.launch {
- hotDealDao.toggleFavorite(dealId)
- }
- }
+    fun toggleKeyword(id: Long, enabled: Boolean) {
+        viewModelScope.launch {
+            keywordDao.updateEnabled(id, enabled)
+        }
+    }
+
+    fun reorderKeywords(fromIndex: Int, toIndex: Int) {
+        // uiState를 동기적으로 즉시 업데이트하여 빠른 드래그 시 stale 데이터 방지
+        val state = _uiState.value as? MainUiState.Success ?: return
+        val current = state.keywords.toMutableList()
+        if (fromIndex in current.indices && toIndex in current.indices) {
+            val item = current.removeAt(fromIndex)
+            current.add(toIndex, item)
+            // UI 즉시 갱신
+            _uiState.value = state.copy(keywords = current)
+            // DataStore 비동기 영속화
+            viewModelScope.launch {
+                appSettings.setKeywordOrder(current.map { it.id })
+            }
+        }
+    }
+
+    fun toggleFavorite(dealId: String) {
+        viewModelScope.launch {
+            hotDealDao.toggleFavorite(dealId)
+        }
+    }
+
+    fun setFavorite(dealId: String, isFavorite: Boolean) {
+        viewModelScope.launch {
+            hotDealDao.setFavorite(dealId, isFavorite)
+        }
+    }
 
- /**
- * 즐겨찾기 설정
- */
- fun setFavorite(dealId: String, isFavorite: Boolean) {
- viewModelScope.launch {
- hotDealDao.setFavorite(dealId, isFavorite)
- }
- }
-    
     fun refresh() {
         workerScheduler.executeOnce()
     }
-    
-    /**
-     * 폴� 시작 (주기 저장)
-     */
+
     fun startPolling(intervalMinutes: Long = WorkerScheduler.DEFAULT_INTERVAL_MINUTES) {
         viewModelScope.launch {
             appSettings.setPollingInterval(intervalMinutes.toInt())
             workerScheduler.schedulePeriodicPolling(intervalMinutes)
         }
     }
-    
+
     fun stopPolling() {
         workerScheduler.cancelPolling()
     }
 
-    // 데이터 파싱 핫딜 데이터 전체 삭제 및 사용자 피드백 트리거
-    private val _toastEvent = MutableSharedFlow<String>(extraBufferCapacity = 1)
-    val toastEvent = _toastEvent.asSharedFlow()
-
     fun deleteAllParsedData() {
         viewModelScope.launch {
-            hotDealDao.deleteAllDeals()
-            _toastEvent.emit("파싱 데이터가 삭제되었습니다")
+            try {
+                hotDealDao.deleteAllDeals()
+                _toastEvent.emit("모든 수집 데이터가 삭제되었습니다")
+            } catch (e: Exception) {
+                _toastEvent.emit("데이터 삭제 중 오류가 발생했습니다: ${e.message}")
+            }
         }
     }
 }
 
 sealed class MainUiState {
-    data object Loading : MainUiState()
+    object Loading : MainUiState()
     data class Success(
         val deals: List<com.hotdeal.alarm.domain.model.HotDeal>,
         val siteConfigs: List<com.hotdeal.alarm.domain.model.SiteConfig>,

app/src/main/java/com/hotdeal/alarm/receiver/BootReceiver.kt

@@ -0,0 +1,48 @@
+package com.hotdeal.alarm.receiver
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.util.Log
+import com.hotdeal.alarm.data.local.preferences.AppSettings
+import com.hotdeal.alarm.worker.WorkerScheduler
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+/**
+ * 부팅 완료 시 백그라운드 폴링을 자동으로 재등록하는 리시버
+ */
+@AndroidEntryPoint
+class BootReceiver : BroadcastReceiver() {
+
+    @Inject
+    lateinit var workerScheduler: WorkerScheduler
+
+    @Inject
+    lateinit var appSettings: AppSettings
+
+    private val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
+
+    override fun onReceive(context: Context, intent: Intent) {
+        if (intent.action == Intent.ACTION_BOOT_COMPLETED ||
+            intent.action == Intent.ACTION_MY_PACKAGE_REPLACED
+        ) {
+            Log.d("BootReceiver", "부팅/업데이트 감지 → 백그라운드 폴링 재등록")
+            scope.launch {
+                try {
+                    val interval = appSettings.pollingInterval.first()
+                    workerScheduler.schedulePeriodicPolling(interval.toLong())
+                    Log.d("BootReceiver", "폴링 재등록 완료: ${interval}분 간격")
+                } catch (e: Exception) {
+                    Log.e("BootReceiver", "폴링 재등록 실패: ${e.message}")
+                    workerScheduler.schedulePeriodicPolling(WorkerScheduler.DEFAULT_INTERVAL_MINUTES)
+                }
+            }
+        }
+    }
+}

app/src/main/java/com/hotdeal/alarm/receiver/PollingAlarmReceiver.kt

@@ -0,0 +1,59 @@
+package com.hotdeal.alarm.receiver
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.util.Log
+import com.hotdeal.alarm.data.local.preferences.AppSettings
+import com.hotdeal.alarm.worker.AlarmScheduler
+import com.hotdeal.alarm.worker.WorkerScheduler
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+/**
+ * 주기적 알람 수신 시 백그라운드 스크래핑을 실행하고 다음 알람을 예약하는 리시버
+ */
+@AndroidEntryPoint
+class PollingAlarmReceiver : BroadcastReceiver() {
+
+    companion object {
+        private const val TAG = "PollingAlarmReceiver"
+    }
+
+    @Inject
+    lateinit var workerScheduler: WorkerScheduler
+
+    @Inject
+    lateinit var alarmScheduler: AlarmScheduler
+
+    @Inject
+    lateinit var appSettings: AppSettings
+
+    private val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
+
+    override fun onReceive(context: Context, intent: Intent) {
+        if (intent.action == AlarmScheduler.ACTION_POLL_ALARM) {
+            Log.d(TAG, "⏰ 폴링 알람 수신 -> 핫딜 스크래핑 1회 즉시 실행 및 다음 알람 예약")
+            
+            // 1. 핫딜 스크래핑 실행
+            workerScheduler.executeOnce()
+
+            // 2. 다음 주기 알람 예약 (Self-rescheduling)
+            scope.launch {
+                try {
+                    val interval = appSettings.pollingInterval.first().toLong()
+                    alarmScheduler.scheduleAlarm(interval)
+                    Log.d(TAG, "다음 폴링 알람 예약 완료: ${interval}분 후")
+                } catch (e: Exception) {
+                    Log.e(TAG, "다음 알람 예약 실패: ${e.message}")
+                    alarmScheduler.scheduleAlarm(WorkerScheduler.DEFAULT_INTERVAL_MINUTES)
+                }
+            }
+        }
+    }
+}

app/src/main/java/com/hotdeal/alarm/util/ApkDownloadManager.kt

@@ -25,7 +25,6 @@ object ApkDownloadManager {
     private const val TAG = "ApkDownloadManager"
     private const val APK_FILE_NAME = "hotdeal-alarm-update.apk"
 
-    // 등록된 리시버 추적 (메모리 누수 방지)
     private var registeredReceiver: BroadcastReceiver? = null
 
     /**
@@ -34,31 +33,29 @@ object ApkDownloadManager {
     fun downloadApk(context: Context, updateInfo: UpdateInfo): Long {
         val downloadManager = context.getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
 
-        // 기존 파일 삭제
-        val outputFile = File(context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), APK_FILE_NAME)
+        val outputDir = context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS)
+        if (outputDir != null && !outputDir.exists()) {
+            outputDir.mkdirs()
+        }
+
+        val outputFile = File(outputDir, APK_FILE_NAME)
         if (outputFile.exists()) {
             outputFile.delete()
         }
 
         val request = DownloadManager.Request(Uri.parse(updateInfo.updateUrl)).apply {
             setTitle("핫딜 알람 업데이트")
-            setDescription("버전 ${updateInfo.version} 다운로드 중...")
+            setDescription("v${updateInfo.version} 다운로드 중...")
             setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED)
             setDestinationInExternalFilesDir(context, Environment.DIRECTORY_DOWNLOADS, APK_FILE_NAME)
             setAllowedOverMetered(true)
             setAllowedOverRoaming(true)
             setMimeType("application/vnd.android.package-archive")
-            // Wi-Fi 환경에서 다운로드 우선
             setAllowedNetworkTypes(DownloadManager.Request.NETWORK_WIFI or DownloadManager.Request.NETWORK_MOBILE)
         }
 
         val downloadId = downloadManager.enqueue(request)
-
-        Toast.makeText(
-            context,
-            "업데이트 다운로드 시작...",
-            Toast.LENGTH_SHORT
-        ).show()
+        Log.d(TAG, "다운로드 큐에 추가됨: downloadId=$downloadId, url=${updateInfo.updateUrl}")
 
         return downloadId
     }
@@ -72,14 +69,13 @@ object ApkDownloadManager {
         onComplete: () -> Unit,
         onFailed: () -> Unit
     ): BroadcastReceiver {
-        // 기존 리시버가 있으면 먼저 해제
         unregisterDownloadCompleteReceiver(context)
 
         val receiver = object : BroadcastReceiver() {
-            override fun onReceive(context: Context?, intent: Intent?) {
+            override fun onReceive(receivedContext: Context?, intent: Intent?) {
                 val id = intent?.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1) ?: -1
                 if (id == downloadId) {
-                    val downloadManager = context?.getSystemService(Context.DOWNLOAD_SERVICE) as? DownloadManager
+                    val downloadManager = receivedContext?.getSystemService(Context.DOWNLOAD_SERVICE) as? DownloadManager
                     val query = DownloadManager.Query().setFilterById(downloadId)
                     val cursor = downloadManager?.query(query)
 
@@ -90,16 +86,14 @@ object ApkDownloadManager {
 
                             when (status) {
                                 DownloadManager.STATUS_SUCCESSFUL -> {
-                                    Log.d(TAG, "다운로드 완료, 설치 시작")
+                                    Log.d(TAG, "다운로드 완료 감지, onComplete 호출")
                                     onComplete()
-                                    // 설치 후 리시버 해제
-                                    unregisterDownloadCompleteReceiver(context)
+                                    unregisterDownloadCompleteReceiver(receivedContext ?: context)
                                 }
                                 DownloadManager.STATUS_FAILED -> {
-                                    Log.e(TAG, "다운로드 실패")
+                                    Log.e(TAG, "다운로드 실패 감지")
                                     onFailed()
-                                    // 실패 시 리시버 해제
-                                    unregisterDownloadCompleteReceiver(context)
+                                    unregisterDownloadCompleteReceiver(receivedContext ?: context)
                                 }
                             }
                         }
@@ -108,12 +102,11 @@ object ApkDownloadManager {
             }
         }
 
-        // Android 12+ 에서는 RECEIVER_NOT_EXPORTED 플래그 필요
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
             context.registerReceiver(
                 receiver,
                 IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE),
-                Context.RECEIVER_NOT_EXPORTED
+                Context.RECEIVER_EXPORTED
             )
         } else {
             context.registerReceiver(
@@ -123,29 +116,20 @@ object ApkDownloadManager {
         }
 
         registeredReceiver = receiver
-        Log.d(TAG, "다운로드 리시버 등록됨, downloadId=$downloadId")
-
         return receiver
     }
 
-    /**
-     * 다운로드 완료 리시버 해제
-     */
     fun unregisterDownloadCompleteReceiver(context: Context) {
         registeredReceiver?.let { receiver ->
             try {
                 context.unregisterReceiver(receiver)
-                Log.d(TAG, "다운로드 리시버 해제됨")
             } catch (e: Exception) {
-                Log.w(TAG, "리시버 해제 실패 (이미 해제됨): ${e.message}")
+                Log.w(TAG, "리시버 해제 중 예외: ${e.message}")
             }
             registeredReceiver = null
         }
     }
 
-    /**
-     * 다운로드 상태 확인 (suspend 함수)
-     */
     suspend fun getDownloadStatus(context: Context, downloadId: Long): DownloadStatus =
         withContext(Dispatchers.IO) {
             val downloadManager = context.getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
@@ -161,8 +145,8 @@ object ApkDownloadManager {
                     val bytesTotalIndex = it.getColumnIndex(DownloadManager.COLUMN_TOTAL_SIZE_BYTES)
 
                     val downloadStatus = it.getInt(statusIndex)
-                    val bytesDownloaded = it.getLong(bytesDownloadedIndex)
-                    val bytesTotal = it.getLong(bytesTotalIndex)
+                    val bytesDownloaded = if (bytesDownloadedIndex >= 0) it.getLong(bytesDownloadedIndex) else 0L
+                    val bytesTotal = if (bytesTotalIndex >= 0) it.getLong(bytesTotalIndex) else 0L
 
                     val progress = if (bytesTotal > 0) {
                         ((bytesDownloaded * 100) / bytesTotal).toInt()
@@ -181,26 +165,27 @@ object ApkDownloadManager {
         }
 
     /**
-     * 다운로드 완료 대기 (suspend 함수)
-     */
-    suspend fun waitForDownload(context: Context, downloadId: Long): Boolean {
-        while (true) {
-            val status = getDownloadStatus(context, downloadId)
-            if (status.isComplete) return true
-            if (status.isFailed) return false
-            delay(500)
-        }
-    }
-
-    /**
-     * APK 파일 설치
-     * @return Boolean true if installation started, false if permission denied
+     * APK 파일 설치 화면 실행
      */
     fun installApk(context: Context): Boolean {
+        // Android 8.0 이상에서 알 수 없는 앱 설치 권한 확인
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             if (!context.packageManager.canRequestPackageInstalls()) {
-                Log.w(TAG, "앱 설치 권한 없음")
-                Toast.makeText(context, "설치 권한이 필요합니다. 설정에서 허용해주세요.", Toast.LENGTH_SHORT).show()
+                Log.w(TAG, "앱 설치 권한 없음 -> 설정 화면 이동")
+                Toast.makeText(context, "앱 설치 권한을 허용한 후 다시 시도해주세요.", Toast.LENGTH_LONG).show()
+                try {
+                    val intent = Intent(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES).apply {
+                        data = Uri.parse("package:${context.packageName}")
+                        addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                    }
+                    context.startActivity(intent)
+                } catch (e: Exception) {
+                    val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS).apply {
+                        data = Uri.parse("package:${context.packageName}")
+                        addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                    }
+                    context.startActivity(intent)
+                }
                 return false
             }
         }
@@ -208,7 +193,8 @@ object ApkDownloadManager {
         val apkFile = File(context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), APK_FILE_NAME)
 
         if (!apkFile.exists()) {
-            Toast.makeText(context, "APK 파일을 찾을 수 없습니다", Toast.LENGTH_SHORT).show()
+            Log.e(TAG, "APK 파일이 존재하지 않음: ${apkFile.absolutePath}")
+            Toast.makeText(context, "APK 파일을 찾을 수 없습니다. 다시 다운로드해주세요.", Toast.LENGTH_SHORT).show()
             return false
         }
 
@@ -219,23 +205,23 @@ object ApkDownloadManager {
                 apkFile
             )
 
+            Log.d(TAG, "설치 인텐트 시작: uri=$apkUri")
             val intent = Intent(Intent.ACTION_VIEW).apply {
                 setDataAndType(apkUri, "application/vnd.android.package-archive")
                 addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
                 addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
             }
 
             context.startActivity(intent)
             return true
         } catch (e: Exception) {
-            Toast.makeText(context, "설치를 시작할 수 없습니다: ${e.message}", Toast.LENGTH_SHORT).show()
+            Log.e(TAG, "설치 화면 호출 실패", e)
+            Toast.makeText(context, "설치 화면을 열 수 없습니다: ${e.message}", Toast.LENGTH_LONG).show()
             return false
         }
     }
 
-    /**
-     * 다운로드 상태 데이터 클래스
-     */
     data class DownloadStatus(
         val progress: Int,
         val bytesDownloaded: Long,

app/src/main/java/com/hotdeal/alarm/worker/AlarmScheduler.kt

@@ -0,0 +1,116 @@
+package com.hotdeal.alarm.worker
+
+import android.app.AlarmManager
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.os.Build
+import android.util.Log
+import com.hotdeal.alarm.receiver.PollingAlarmReceiver
+import dagger.hilt.android.qualifiers.ApplicationContext
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/**
+ * 실시간 백그라운드 폴링을 위한 AlarmManager 스케줄러
+ * 
+ * WorkManager PeriodicWork의 15분 주기 제한 및 Doze 모드 지연을 극복하기 위해
+ * AlarmManager (setExactAndAllowWhileIdle / setAndAllowWhileIdle)를 사용하여
+ * 사용자가 설정한 주기(1분, 2분, 5분 등)대로 정확하게 백그라운드 수집을 보장합니다.
+ */
+@Singleton
+class AlarmScheduler @Inject constructor(
+    @ApplicationContext private val context: Context
+) {
+    companion object {
+        private const val TAG = "AlarmScheduler"
+        const val ACTION_POLL_ALARM = "com.hotdeal.alarm.ACTION_POLL_ALARM"
+        private const val REQUEST_CODE = 2001
+    }
+
+    private val alarmManager = context.getSystemService(Context.ALARM_SERVICE) as AlarmManager
+
+    /**
+     * 알람 예약 (Doze mode에서도 정확히 깨어남)
+     * @param intervalMinutes 폴링 간격 (분)
+     */
+    fun scheduleAlarm(intervalMinutes: Long) {
+        val safeInterval = intervalMinutes.coerceAtLeast(1L)
+        val triggerTime = System.currentTimeMillis() + (safeInterval * 60 * 1000L)
+
+        val intent = Intent(context, PollingAlarmReceiver::class.java).apply {
+            action = ACTION_POLL_ALARM
+        }
+        val pendingIntent = PendingIntent.getBroadcast(
+            context,
+            REQUEST_CODE,
+            intent,
+            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+        )
+
+        try {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                if (alarmManager.canScheduleExactAlarms()) {
+                    alarmManager.setExactAndAllowWhileIdle(
+                        AlarmManager.RTC_WAKEUP,
+                        triggerTime,
+                        pendingIntent
+                    )
+                    Log.d(TAG, "Exact Alarm 예약 완료: ${safeInterval}분 후 (${triggerTime})")
+                } else {
+                    alarmManager.setAndAllowWhileIdle(
+                        AlarmManager.RTC_WAKEUP,
+                        triggerTime,
+                        pendingIntent
+                    )
+                    Log.d(TAG, "Inexact Alarm 예약 완료: ${safeInterval}분 후 (권한 없음)")
+                }
+            } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                alarmManager.setExactAndAllowWhileIdle(
+                    AlarmManager.RTC_WAKEUP,
+                    triggerTime,
+                    pendingIntent
+                )
+                Log.d(TAG, "Exact Alarm 예약 완료 (API < 31): ${safeInterval}분 후")
+            } else {
+                alarmManager.setExact(
+                    AlarmManager.RTC_WAKEUP,
+                    triggerTime,
+                    pendingIntent
+                )
+            }
+        } catch (e: Exception) {
+            Log.e(TAG, "Alarm 예약 실패: ${e.message}", e)
+            try {
+                alarmManager.setAndAllowWhileIdle(
+                    AlarmManager.RTC_WAKEUP,
+                    triggerTime,
+                    pendingIntent
+                )
+            } catch (fallbackEx: Exception) {
+                Log.e(TAG, "Alarm 폴백 예약도 실패: ${fallbackEx.message}")
+            }
+        }
+    }
+
+    /**
+     * 알람 취소
+     */
+    fun cancelAlarm() {
+        val intent = Intent(context, PollingAlarmReceiver::class.java).apply {
+            action = ACTION_POLL_ALARM
+        }
+        val pendingIntent = PendingIntent.getBroadcast(
+            context,
+            REQUEST_CODE,
+            intent,
+            PendingIntent.FLAG_NO_CREATE or PendingIntent.FLAG_IMMUTABLE
+        )
+
+        if (pendingIntent != null) {
+            alarmManager.cancel(pendingIntent)
+            pendingIntent.cancel()
+            Log.d(TAG, "Alarm 취소 완료")
+        }
+    }
+}

app/src/main/java/com/hotdeal/alarm/worker/HotDealPollingWorker.kt

@@ -116,11 +116,18 @@ class HotDealPollingWorker @AssistedInject constructor(
             // 8. 알림 발송 상태 업데이트
             dealDao.markAsNotified(newDeals.map { it.id })
 
- // 9. 오래된 데이터 정리 (3일 이상 - 배터리/데이터 절약)
+            // 9. 인기글 상태 업데이트 (신규+기존 딜 모두 HOT 마킹)
+            val popularDealIds = allDeals.filter { it.isPopular }.map { it.id }
+            if (popularDealIds.isNotEmpty()) {
+                dealDao.markAsPopular(popularDealIds)
+                Log.d(TAG, "인기글 마킹: ${popularDealIds.size}개")
+            }
+
+ // 10. 오래된 데이터 정리 (3일 이상 - 배터리/데이터 절약)
  val threshold = System.currentTimeMillis() - (3 * 24 * 60 * 60 * 1000L)
  dealDao.deleteOldDeals(threshold)
 
-            Log.d(TAG, "===== 핫딜 폴� 완료 =====")
+            Log.d(TAG, "===== 핫딜 폴 완료 =====")
             Result.success()
         } catch (e: Exception) {
             Log.e(TAG, "폴� 오류: ${e.message}", e)

app/src/main/java/com/hotdeal/alarm/worker/WorkerScheduler.kt

@@ -1,6 +1,7 @@
 package com.hotdeal.alarm.worker
 
 import android.content.Context
+import android.util.Log
 import androidx.work.*
 import dagger.hilt.android.qualifiers.ApplicationContext
 import java.util.concurrent.TimeUnit
@@ -8,35 +9,40 @@ import javax.inject.Inject
 import javax.inject.Singleton
 
 /**
- * Worker 스케줄러
+ * 실시간 백그라운드 폴링 통합 스케줄러
  * 
- * 기본 폴� 주기: 2분
- * 배터리/데이터 절약을 위해 최소 2분 권장
+ * 1. AlarmManager (AlarmScheduler): Doze Mode에서도 사용자가 지정한 정확한 주기(1분, 2분 등)로 즉시 실행
+ * 2. WorkManager (HotDealPollingWorker): OS 백그라운드 작업 관리 및 백업 실행
  */
 @Singleton
 class WorkerScheduler @Inject constructor(
-    @ApplicationContext private val context: Context
+    @ApplicationContext private val context: Context,
+    private val alarmScheduler: AlarmScheduler
 ) {
     companion object {
+        private const val TAG = "WorkerScheduler"
         const val DEFAULT_INTERVAL_MINUTES = 2L
         const val MIN_INTERVAL_MINUTES = 1L
         const val MAX_INTERVAL_MINUTES = 60L
     }
     
     /**
-     * 주기적 폴� 예약
-     * @param intervalMinutes 폴� 간격 (분) - 기본 2분
+     * 주기적 폴링 예약 (AlarmManager + WorkManager 이중 등록)
+     * @param intervalMinutes 폴링 간격 (분)
      */
     fun schedulePeriodicPolling(intervalMinutes: Long = DEFAULT_INTERVAL_MINUTES) {
-        // 최소/최대 값 제한
         val safeInterval = intervalMinutes.coerceIn(MIN_INTERVAL_MINUTES, MAX_INTERVAL_MINUTES)
+        Log.d(TAG, "주기적 폴링 예약 시작: ${safeInterval}분 간격")
+
+        // 1. AlarmManager 기반 정확한 주기 알람 예약 (Doze mode 관통)
+        alarmScheduler.scheduleAlarm(safeInterval)
         
+        // 2. WorkManager 기반 백업 주기 작업 예약
         val constraints = Constraints.Builder()
             .setRequiredNetworkType(NetworkType.CONNECTED)
             .setRequiresDeviceIdle(false)
             .build()
         
-        // 유연한 실행 시간 (±25%)
         val flexTime = (safeInterval * 0.25).toLong().coerceAtLeast(1)
         
         val workRequest = PeriodicWorkRequestBuilder<HotDealPollingWorker>(
@@ -54,21 +60,23 @@ class WorkerScheduler @Inject constructor(
         
         WorkManager.getInstance(context).enqueueUniquePeriodicWork(
             HotDealPollingWorker.WORK_NAME,
-            ExistingPeriodicWorkPolicy.KEEP,
+            ExistingPeriodicWorkPolicy.UPDATE,
             workRequest
         )
     }
     
     /**
-     * 한 번만 실행
+     * 즉시 1회 실행 (메인화면 진입 / 새로고침 / 알람 수신 시)
      */
     fun executeOnce() {
+        Log.d(TAG, "즉시 1회 스크래핑 요청 (executeOnce)")
         val constraints = Constraints.Builder()
             .setRequiredNetworkType(NetworkType.CONNECTED)
             .build()
         
         val workRequest = OneTimeWorkRequestBuilder<HotDealPollingWorker>()
             .setConstraints(constraints)
+            .setExpedited(OutOfQuotaPolicy.RUN_AS_NON_EXPEDITED_WORK_REQUEST)
             .addTag(HotDealPollingWorker.TAG)
             .build()
         
@@ -76,22 +84,28 @@ class WorkerScheduler @Inject constructor(
     }
     
     /**
-     * 폴� 취소
+     * 폴링 취소
      */
     fun cancelPolling() {
+        Log.d(TAG, "폴링 전체 취소")
+        alarmScheduler.cancelAlarm()
         WorkManager.getInstance(context).cancelUniqueWork(HotDealPollingWorker.WORK_NAME)
     }
     
     /**
-     * 폴� 활성화 여부 확인
+     * 폴링 활성화 여부 확인
      */
     fun isPollingActive(): Boolean {
-        val workInfos = WorkManager.getInstance(context)
-            .getWorkInfosForUniqueWork(HotDealPollingWorker.WORK_NAME)
-            .get()
-        
-        return workInfos.any { 
-            it.state == WorkInfo.State.RUNNING || it.state == WorkInfo.State.ENQUEUED 
+        return try {
+            val workInfos = WorkManager.getInstance(context)
+                .getWorkInfosForUniqueWork(HotDealPollingWorker.WORK_NAME)
+                .get()
+            
+            workInfos.any { 
+                it.state == WorkInfo.State.RUNNING || it.state == WorkInfo.State.ENQUEUED 
+            }
+        } catch (e: Exception) {
+            false
         }
     }
 }

version.json

@@ -1,10 +1,10 @@
 {
-  "version": "0.2.7",
-  "versionCode": 27,
-  "updateUrl": "https://git.webpluss.net/sanjeok77/hotdeal_alarm/releases/download/v0.2.7/app-release.apk",
+  "version": "0.3.4",
+  "versionCode": 34,
+  "updateUrl": "https://git.webpluss.net/sanjeok77/hotdeal_alarm/releases/download/v0.3.4/app-release.apk",
   "changelog": [
-    "하단 고정 메뉴 일체형(Docked) 디자인 개선 (떠 있는 이질감 완전 제거)",
-    "시스템 내비게이션 바닥까지 끊김 없는 배경 처리 및 0.6dp 헤어라인 구분선",
-    "상단 미니 캡슐 인디케이터와 One UI 9 네이티브 탭 전환 감각 적용"
+    "사이트 및 키워드 순서 조절을 터치 드래그 앤 드롭(Drag & Drop) 방식으로 전면 업그레이드",
+    "앱 내 업데이트 시 다운로드 완료 후 설치 화면으로 안 넘어가는 버그 수정",
+    "새 버전 업데이트 안내 다이얼로그 및 진행률 프로그레스 바 연동"
   ]
 }