v0.3.5: update proguard-rules.pro

app/build.gradle.kts

@@ -24,8 +24,8 @@ android {
  applicationId = "com.hotdeal.alarm"
  minSdk = 31
  targetSdk = 35
-        versionCode = 25
-        versionName = "0.2.5"
+        versionCode = 35
+        versionName = "0.3.5"
 
  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" />
@@ -65,9 +66,28 @@
             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 -->
+        <!-- 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>
+
+        <!-- Widget Receiver -->
         <receiver
             android:name=".widget.HotDealWidget"
             android:exported="true">
@@ -84,11 +104,12 @@
             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>
+    </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
 
@@ -18,11 +20,13 @@ class AppSettings(private val context: Context) {
 
     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 ->
@@ -30,11 +34,72 @@ class AppSettings(private val context: Context) {
         }
 
     /**
-     * 폴� 주기 설정 저장
+     * 폴링 주기 설정 저장
      */
     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) {
     
@@ -28,69 +31,57 @@ class PpomppuScraper(client: OkHttpClient) : BaseScraper(client) {
             val url = getBoardUrl(board)
             Log.d("Ppomppu", "스크래핑 시작: $url")
 
-            // 요청 간격 랜덤화 (2~4초) - 차단 방지
-            val delayTime = Random.nextLong(2000, 4000)
-            Log.d("Ppomppu", "요청 대기: ${delayTime}ms")
+            // 1. 인기글 목록과 일반 게시판을 병렬(async)로 동시에 요청하여 딜레이 최소화
+            val hotPostIdsDeferred = async { fetchHotPostIds(board) }
+            
+            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>()
-
- // 셀렉터로 요소 찾기 - 인기 게시물 감지를 위해 tr 요소 선택
             val rowElements: Elements = doc.select("tr.baseList")
             Log.d("Ppomppu", "찾은 행 요소: ${rowElements.size}개")
 
- // 최대 20개까지만 처리
             var count = 0
             rowElements.forEach { row ->
- if (count >= 20) return@forEach
+                if (count >= 25) return@forEach
 
                 try {
- // 인기 게시물 여부 확인 (hotpop_bg_color 클래스 존재 여부)
- val isPopular = row.hasClass("hotpop_bg_color")
-
- // 제목 링크 찾기
- val titleElement = row.selectFirst("a.baseList-title")
- if (titleElement == null) return@forEach
-
+                    val titleElement = row.selectFirst("a.baseList-title") ?: return@forEach
                     val title = titleElement.text().trim()
                     if (title.isEmpty()) return@forEach
 
                     val href = titleElement.attr("href")
-
- // 공지사항 제외
                     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
                     }
 
+                    // 인기글 판단: hotlist 페이지에 포함되어 있거나 CSS 클래스로 감지
+                    val isPopular = postId in hotPostIds || row.hasClass("hotpop_bg_color")
+
                     val deal = HotDeal(
                         id = HotDeal.generateId(siteName, postId),
                         siteName = siteName,
                         boardName = board,
                         title = title,
- url = dealUrl,
+                        url = resolveUrl(baseUrl, href),
                         createdAt = System.currentTimeMillis(),
                         isPopular = isPopular
                     )
@@ -103,7 +94,7 @@ class PpomppuScraper(client: OkHttpClient) : BaseScraper(client) {
                 }
             }
 
-            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)
@@ -111,6 +102,38 @@ class PpomppuScraper(client: OkHttpClient) : BaseScraper(client) {
         }
     }
 
+    /**
+     * 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/domain/usecase/HotDealScraperManager.kt

@@ -0,0 +1,175 @@
+package com.hotdeal.alarm.domain.usecase
+
+import android.content.Context
+import android.util.Log
+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.HotDealEntity
+import com.hotdeal.alarm.data.local.db.entity.KeywordEntity
+import com.hotdeal.alarm.data.local.db.entity.SiteConfigEntity
+import com.hotdeal.alarm.data.remote.scraper.ScraperFactory
+import com.hotdeal.alarm.domain.model.HotDeal
+import com.hotdeal.alarm.service.NotificationService
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import kotlinx.coroutines.withContext
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/**
+ * 핫딜 스크래핑, DB 저장, 키워드 매칭, 알림 발송을 총괄하는 핵심 매니저
+ * 
+ * 포그라운드(앱 진입/새로고침), 백그라운드(AlarmReceiver), WorkManager 모두에서
+ * 공통으로 직접 호출하여 지연 없이 즉시 수집 및 알림을 발송합니다.
+ */
+@Singleton
+class HotDealScraperManager @Inject constructor(
+    @ApplicationContext private val context: Context,
+    private val scraperFactory: ScraperFactory,
+    private val notificationService: NotificationService,
+    private val dealDao: HotDealDao,
+    private val siteConfigDao: SiteConfigDao,
+    private val keywordDao: KeywordDao
+) {
+    companion object {
+        private const val TAG = "HotDealScraperManager"
+    }
+
+    // 중복 동시 실행 방지 뮤텍스
+    private val mutex = Mutex()
+
+    /**
+     * 핫딜 수집 및 키워드 알림 발송 전체 프로세스 실행
+     * @return 수집된 새로운 핫딜 목록
+     */
+    suspend fun fetchAndProcessDeals(): List<HotDeal> = withContext(Dispatchers.IO) {
+        mutex.withLock {
+            try {
+                Log.d(TAG, "===== 🚀 핫딜 수집 프로세스 시작 =====")
+
+                // 1. 활성화된 사이트 설정 조회
+                val enabledConfigs = siteConfigDao.getEnabledConfigs()
+                Log.d(TAG, "활성화된 사이트 설정: ${enabledConfigs.size}개")
+
+                if (enabledConfigs.isEmpty()) {
+                    Log.w(TAG, "활성화된 사이트 설정이 없습니다.")
+                    return@withContext emptyList()
+                }
+
+                // 2. 활성화된 키워드 조회
+                val keywords = keywordDao.getEnabledKeywords()
+                Log.d(TAG, "활성화된 키워드: ${keywords.size}개 (${keywords.map { it.keyword }})")
+
+                // 3. 각 사이트/게시판 병렬 스크래핑
+                val allDeals = enabledConfigs.map { config ->
+                    async { scrapeSite(config) }
+                }.awaitAll().flatten()
+
+                Log.d(TAG, "스크래핑 완료: 총 ${allDeals.size}개 핫딜 수집됨")
+                if (allDeals.isEmpty()) {
+                    return@withContext emptyList()
+                }
+
+                // 4. 새로운 핫딜 필터링 (기존 DB에 없는 것)
+                val newDeals = filterNewDeals(allDeals)
+                Log.d(TAG, "새로운 핫딜: ${newDeals.size}개")
+
+                // 5. 인기글 상태 일괄 업데이트 (기존 + 신규 모두)
+                val popularDealIds = allDeals.filter { it.isPopular }.map { it.id }
+                if (popularDealIds.isNotEmpty()) {
+                    dealDao.markAsPopular(popularDealIds)
+                    Log.d(TAG, "🔥 인기글 마킹: ${popularDealIds.size}개")
+                }
+
+                if (newDeals.isNotEmpty()) {
+                    // 6. 키워드 매칭
+                    val keywordMatchedDeals = if (keywords.isNotEmpty()) {
+                        filterByKeywords(newDeals, keywords).also {
+                            Log.d(TAG, "⭐ 키워드 매칭 핫딜: ${it.size}개 -> ${it.map { d -> d.title }}")
+                        }
+                    } else {
+                        emptyList()
+                    }
+
+                    // 7. DB에 새 핫딜 저장
+                    var insertedCount = 0
+                    newDeals.forEach { deal ->
+                        try {
+                            val entity = HotDealEntity.fromDomain(deal)
+                            dealDao.insertDeal(entity)
+                            insertedCount++
+                        } catch (e: Exception) {
+                            Log.w(TAG, "핫딜 저장 실패: ${deal.id}")
+                        }
+                    }
+                    Log.d(TAG, "DB 저장 완료: $insertedCount 개")
+
+                    // 8. 키워드 매칭 알림 즉시 발송! (시스템바 노티피케이션)
+                    if (keywordMatchedDeals.isNotEmpty()) {
+                        Log.d(TAG, "🔔 키워드 매칭 알림 발송: ${keywordMatchedDeals.size}개")
+                        notificationService.showKeywordMatchNotification(keywordMatchedDeals)
+                        dealDao.markAsKeywordMatch(keywordMatchedDeals.map { it.id })
+                    }
+
+                    // 9. 알림 발송 상태 업데이트
+                    dealDao.markAsNotified(newDeals.map { it.id })
+                }
+
+                // 10. 오래된 데이터 정리 (3일 이상)
+                val threshold = System.currentTimeMillis() - (3 * 24 * 60 * 60 * 1000L)
+                dealDao.deleteOldDeals(threshold)
+
+                Log.d(TAG, "===== ✅ 핫딜 수집 프로세스 종료 =====")
+                newDeals
+            } catch (e: Exception) {
+                Log.e(TAG, "핫딜 수집 오류: ${e.message}", e)
+                emptyList()
+            }
+        }
+    }
+
+    private suspend fun scrapeSite(config: SiteConfigEntity): List<HotDeal> {
+        val scraper = scraperFactory.getScraper(config.siteName) ?: return emptyList()
+        val result = scraper.scrape(config.boardName)
+
+        result.fold(
+            onSuccess = { deals ->
+                try {
+                    siteConfigDao.updateLastScrapedAt(config.siteBoardKey, System.currentTimeMillis())
+                } catch (e: Exception) {
+                    // 무시
+                }
+            },
+            onFailure = { error ->
+                Log.e(TAG, "${config.siteName}/${config.boardName} 실패: ${error.message}")
+            }
+        )
+
+        return result.getOrElse { emptyList() }
+    }
+
+    private suspend fun filterNewDeals(deals: List<HotDeal>): List<HotDeal> {
+        return deals.filter { deal ->
+            val existingByUrl = dealDao.getDealByUrl(deal.url)
+            if (existingByUrl != null) return@filter false
+
+            val existingById = dealDao.getDealById(deal.id)
+            if (existingById != null) return@filter false
+
+            true
+        }
+    }
+
+    private fun filterByKeywords(deals: List<HotDeal>, keywords: List<KeywordEntity>): List<HotDeal> {
+        return deals.filter { deal ->
+            keywords.any { keyword ->
+                deal.title.contains(keyword.keyword, ignoreCase = true)
+            }
+        }
+    }
+}

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

@@ -2,7 +2,6 @@ package com.hotdeal.alarm.presentation.components
 
 import androidx.compose.animation.core.*
 import androidx.compose.foundation.background
-import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.icons.Icons
@@ -12,7 +11,6 @@ import androidx.compose.material3.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
 import androidx.compose.ui.draw.scale
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
@@ -25,8 +23,8 @@ import com.hotdeal.alarm.ui.theme.*
 import com.hotdeal.alarm.util.ShareHelper
 
 /**
- * One UI 9 & Material 3 Expressive Deal Item Card
- * Text Spotlight 가독성과 Squircle 앰비언트 깊이감을 적용한 프리미엄 핫딜 카드
+ * One UI 9 & Material 3 Expressive Compact Deal Item Card
+ * 화면 공간 낭비를 없애고 가독성과 정보 밀도를 극대화한 슬림 핫딜 카드
  */
 @Composable
 fun DealItem(
@@ -38,35 +36,32 @@ fun DealItem(
     val context = LocalContext.current
     val siteColor = getSiteColor(deal.siteType)
 
-    // 즐겨찾기 하트 펄스 애니메이션
     val favoriteScale by animateFloatAsState(
-        targetValue = if (deal.isFavorite) 1.25f else 1f,
+        targetValue = if (deal.isFavorite) 1.2f else 1f,
         animationSpec = spring(
             dampingRatio = Spring.DampingRatioMediumBouncy,
             stiffness = Spring.StiffnessMedium
         ),
-        label = "favorite_pulse"
+        label = "fav_scale"
     )
 
-    // 제목에서 가격 정보 및 쇼핑몰 태그 추출 (Text Spotlight용)
     val parsedInfo = remember(deal.title) {
         parseDealTitle(deal.title)
     }
 
-    // 카드 테두리 및 배경 톤 설정 (One UI 9 Squircle Depth)
     val (cardBorderColor, cardBorderWidth) = when {
-        deal.isKeywordMatch -> KeywordGold to 1.5.dp
-        deal.isPopular -> HotDealFlameColor.copy(alpha = 0.8f) to 1.2.dp
-        else -> MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.4f) to 0.8.dp
+        deal.isKeywordMatch -> KeywordGold to 1.2.dp
+        deal.isPopular -> HotDealFlameColor.copy(alpha = 0.75f) to 1.dp
+        else -> MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.35f) to 0.8.dp
     }
 
     val cardBgColor = when {
-        deal.isKeywordMatch -> MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.35f)
+        deal.isKeywordMatch -> MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.3f)
         else -> MaterialTheme.colorScheme.surface
     }
 
     SquircleCard(
-        shape = CornerRadius.shapeSquircle,
+        shape = CornerRadius.shapeNormal,
         containerColor = cardBgColor,
         borderColor = cardBorderColor,
         borderWidth = cardBorderWidth,
@@ -77,10 +72,10 @@ fun DealItem(
         Column(
             modifier = Modifier
                 .fillMaxWidth()
-                .padding(horizontal = 16.dp, vertical = 14.dp)
+                .padding(horizontal = 14.dp, vertical = 9.dp)
         ) {
             // ============================================
-            // 1. 상단 메타 바: 사이트 뱃지 + 게시판 + 특수 뱃지 + 액션
+            // 1. 상단 메타 바: 사이트 뱃지 + 게시판 + 쇼핑몰 + 특수 뱃지
             // ============================================
             Row(
                 modifier = Modifier.fillMaxWidth(),
@@ -88,107 +83,107 @@ fun DealItem(
             ) {
                 // 사이트 캡슐 뱃지
                 Surface(
-                    shape = CornerRadius.shapeSmall,
+                    shape = CornerRadius.shapeMicro,
                     color = siteColor.copy(alpha = 0.12f),
-                    modifier = Modifier.height(26.dp)
+                    modifier = Modifier.height(21.dp)
                 ) {
                     Row(
                         verticalAlignment = Alignment.CenterVertically,
-                        horizontalArrangement = Arrangement.spacedBy(5.dp),
-                        modifier = Modifier.padding(horizontal = 8.dp)
+                        horizontalArrangement = Arrangement.spacedBy(4.dp),
+                        modifier = Modifier.padding(horizontal = 6.dp)
                     ) {
                         Box(
                             modifier = Modifier
-                                .size(6.dp)
+                                .size(5.dp)
                                 .background(siteColor, CircleShape)
                         )
                         Text(
                             text = deal.siteType?.displayName ?: deal.siteName,
-                            style = SpotlightTypography.badge,
+                            style = SpotlightTypography.badge.copy(fontSize = 11.sp),
                             color = siteColor
                         )
                     }
                 }
 
-                Spacer(modifier = Modifier.width(6.dp))
+                Spacer(modifier = Modifier.width(5.dp))
 
                 // 게시판 라벨
                 Text(
                     text = deal.boardDisplayName,
-                    style = MaterialTheme.typography.labelSmall,
-                    color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.7f),
+                    style = MaterialTheme.typography.labelSmall.copy(fontSize = 11.sp),
+                    color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.65f),
                     maxLines = 1,
                     overflow = TextOverflow.Ellipsis
                 )
 
-                // 쇼핑몰 태그 (추출된 경우)
+                // 쇼핑몰 태그
                 if (parsedInfo.storeTag.isNotEmpty()) {
-                    Spacer(modifier = Modifier.width(6.dp))
+                    Spacer(modifier = Modifier.width(5.dp))
                     Surface(
                         shape = CornerRadius.shapeMicro,
-                        color = MaterialTheme.colorScheme.secondaryContainer.copy(alpha = 0.7f),
-                        modifier = Modifier.height(20.dp)
+                        color = MaterialTheme.colorScheme.secondaryContainer.copy(alpha = 0.6f),
+                        modifier = Modifier.height(19.dp)
                     ) {
                         Text(
                             text = parsedInfo.storeTag,
-                            style = MaterialTheme.typography.labelSmall.copy(fontSize = 10.5.sp),
+                            style = MaterialTheme.typography.labelSmall.copy(fontSize = 10.sp),
                             color = MaterialTheme.colorScheme.onSecondaryContainer,
-                            modifier = Modifier.padding(horizontal = 6.dp, vertical = 2.dp)
+                            modifier = Modifier.padding(horizontal = 5.dp, vertical = 1.dp)
                         )
                     }
                 }
 
                 Spacer(modifier = Modifier.weight(1f))
 
-                // 키워드 매칭 뱃지 (One UI 9 Amber Gold)
+                // 키워드 매칭 뱃지
                 if (deal.isKeywordMatch) {
                     Surface(
-                        shape = CornerRadius.shapeSmall,
+                        shape = CornerRadius.shapeMicro,
                         color = KeywordGold,
-                        modifier = Modifier.height(24.dp)
+                        modifier = Modifier.height(20.dp)
                     ) {
                         Row(
                             verticalAlignment = Alignment.CenterVertically,
-                            horizontalArrangement = Arrangement.spacedBy(3.dp),
-                            modifier = Modifier.padding(horizontal = 7.dp)
+                            horizontalArrangement = Arrangement.spacedBy(2.dp),
+                            modifier = Modifier.padding(horizontal = 6.dp)
                         ) {
                             Icon(
                                 imageVector = Icons.Filled.Star,
                                 contentDescription = null,
                                 tint = Color.White,
-                                modifier = Modifier.size(11.dp)
+                                modifier = Modifier.size(10.dp)
                             )
                             Text(
                                 text = "내 키워드",
-                                style = SpotlightTypography.badge.copy(fontSize = 11.sp),
+                                style = SpotlightTypography.badge.copy(fontSize = 10.5.sp),
                                 color = Color.White
                             )
                         }
                     }
-                    Spacer(modifier = Modifier.width(4.dp))
+                    Spacer(modifier = Modifier.width(3.dp))
                 }
 
-                // 인기 핫딜 뱃지 (One UI 9 Flame Orange)
+                // 인기 핫딜 뱃지
                 if (deal.isPopular) {
                     Surface(
-                        shape = CornerRadius.shapeSmall,
+                        shape = CornerRadius.shapeMicro,
                         color = HotDealFlameColor,
-                        modifier = Modifier.height(24.dp)
+                        modifier = Modifier.height(20.dp)
                     ) {
                         Row(
                             verticalAlignment = Alignment.CenterVertically,
-                            horizontalArrangement = Arrangement.spacedBy(3.dp),
-                            modifier = Modifier.padding(horizontal = 7.dp)
+                            horizontalArrangement = Arrangement.spacedBy(2.dp),
+                            modifier = Modifier.padding(horizontal = 6.dp)
                         ) {
                             Icon(
                                 imageVector = Icons.Filled.Whatshot,
                                 contentDescription = null,
                                 tint = Color.White,
-                                modifier = Modifier.size(11.dp)
+                                modifier = Modifier.size(10.dp)
                             )
                             Text(
                                 text = "HOT",
-                                style = SpotlightTypography.badge.copy(fontSize = 11.sp),
+                                style = SpotlightTypography.badge.copy(fontSize = 10.5.sp),
                                 color = Color.White
                             )
                         }
@@ -196,84 +191,82 @@ fun DealItem(
                 }
             }
 
-            Spacer(modifier = Modifier.height(10.dp))
+            Spacer(modifier = Modifier.height(6.dp))
 
             // ============================================
-            // 2. 제목 (Clean Spotlight Typography)
+            // 2. 본문 제목 (Slim 2-Line Spotlight)
             // ============================================
             Text(
                 text = parsedInfo.cleanTitle,
-                style = MaterialTheme.typography.titleMedium.copy(
+                style = MaterialTheme.typography.titleSmall.copy(
+                    fontSize = 14.5.sp,
                     fontWeight = if (deal.isKeywordMatch) FontWeight.Bold else FontWeight.SemiBold,
-                    lineHeight = 22.sp
+                    lineHeight = 19.sp
                 ),
                 maxLines = 2,
                 overflow = TextOverflow.Ellipsis,
                 color = MaterialTheme.colorScheme.onSurface
             )
 
-            Spacer(modifier = Modifier.height(12.dp))
+            Spacer(modifier = Modifier.height(6.dp))
 
             // ============================================
-            // 3. 하단 바: 가격(Text Spotlight) + 시간 + 액션 버튼
+            // 3. 하단 바: 가격(Spotlight) + 시간 + 액션 아이콘
             // ============================================
             Row(
                 modifier = Modifier.fillMaxWidth(),
                 verticalAlignment = Alignment.CenterVertically
             ) {
-                // 가격이 추출되었을 경우 볼드 강조, 없을 경우 기본 시간 강조
                 if (parsedInfo.priceText.isNotEmpty()) {
                     Text(
                         text = parsedInfo.priceText,
-                        style = SpotlightTypography.priceLarge,
+                        style = SpotlightTypography.priceLarge.copy(fontSize = 16.sp),
                         color = MaterialTheme.colorScheme.primary
                     )
-                    Spacer(modifier = Modifier.width(8.dp))
+                    Spacer(modifier = Modifier.width(6.dp))
                     Text(
                         text = "•",
                         style = MaterialTheme.typography.bodySmall,
-                        color = MaterialTheme.colorScheme.outline
+                        color = MaterialTheme.colorScheme.outline.copy(alpha = 0.5f)
                     )
-                    Spacer(modifier = Modifier.width(8.dp))
+                    Spacer(modifier = Modifier.width(6.dp))
                 }
 
-                // 작성 상대 시간
                 Text(
                     text = formatRelativeTime(deal.createdAt),
-                    style = MaterialTheme.typography.labelMedium,
-                    color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.7f)
+                    style = MaterialTheme.typography.labelSmall.copy(fontSize = 11.sp),
+                    color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.65f)
                 )
 
                 Spacer(modifier = Modifier.weight(1f))
 
-                // 액션 아이콘들 (공유 & 즐겨찾기)
                 Row(
-                    horizontalArrangement = Arrangement.spacedBy(4.dp),
+                    horizontalArrangement = Arrangement.spacedBy(2.dp),
                     verticalAlignment = Alignment.CenterVertically
                 ) {
                     IconButton(
                         onClick = { ShareHelper.shareDeal(context, deal) },
-                        modifier = Modifier.size(32.dp)
+                        modifier = Modifier.size(28.dp)
                     ) {
                         Icon(
                             imageVector = Icons.Outlined.Share,
                             contentDescription = "공유",
-                            tint = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.65f),
-                            modifier = Modifier.size(17.dp)
+                            tint = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.6f),
+                            modifier = Modifier.size(15.dp)
                         )
                     }
 
                     IconButton(
                         onClick = { onFavoriteToggle(deal.id) },
                         modifier = Modifier
-                            .size(32.dp)
+                            .size(28.dp)
                             .scale(favoriteScale)
                     ) {
                         Icon(
                             imageVector = if (deal.isFavorite) Icons.Filled.Favorite else Icons.Outlined.FavoriteBorder,
                             contentDescription = if (deal.isFavorite) "즐겨찾기 제거" else "즐겨찾기 추가",
-                            tint = if (deal.isFavorite) FavoriteColor else MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.65f),
-                            modifier = Modifier.size(18.dp)
+                            tint = if (deal.isFavorite) FavoriteColor else MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.6f),
+                            modifier = Modifier.size(16.dp)
                         )
                     }
                 }

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

@@ -3,7 +3,6 @@ package com.hotdeal.alarm.presentation.deallist
 import android.content.Intent
 import android.net.Uri
 import androidx.compose.animation.*
-import androidx.compose.animation.core.*
 import androidx.compose.foundation.background
 import androidx.compose.foundation.horizontalScroll
 import androidx.compose.foundation.layout.*
@@ -12,6 +11,8 @@ import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.*
 import androidx.compose.material.icons.outlined.*
@@ -22,10 +23,14 @@ import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.compose.ui.zIndex
@@ -38,8 +43,8 @@ import com.hotdeal.alarm.ui.theme.*
 import kotlinx.coroutines.launch
 
 /**
- * One UI 9 & Material 3 Expressive Deal Feed Screen
- * 실시간 Now 브리핑, 일체형 검색 & Sticky Pill 필터링을 지원하는 메인 핫딜 피드
+ * One UI 9 & Material 3 Expressive Compact Deal Feed Screen
+ * 온디맨드 검색(In-AppBar Search)과 스크롤 반응형 상단바로 화면 시야 및 컨텐츠 노출 수를 극대화한 화면
  */
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -48,13 +53,16 @@ fun DealListScreen(
     onNavigateToSettings: () -> Unit = {}
 ) {
     val uiState by viewModel.uiState.collectAsStateWithLifecycle()
+    val siteOrder by viewModel.siteOrder.collectAsStateWithLifecycle()
     val context = LocalContext.current
+    val focusManager = LocalFocusManager.current
 
-    // Pull to Refresh (초고감도 설정)
-    val pullToRefreshState = rememberPullToRefreshState(
-        positionalThreshold = 40.dp
-    )
-    var isRefreshing by remember { mutableStateOf(false) }
+    // 스크롤 시 상단바 자동 축소/숨김 동작
+    val scrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior(rememberTopAppBarState())
+
+    // Pull to Refresh
+    val pullToRefreshState = rememberPullToRefreshState(positionalThreshold = 40.dp)
+    val isRefreshingByVm by viewModel.isRefreshing.collectAsStateWithLifecycle()
 
     val listState = rememberLazyListState()
     val scope = rememberCoroutineScope()
@@ -62,33 +70,69 @@ fun DealListScreen(
         derivedStateOf { listState.firstVisibleItemIndex > 3 }
     }
 
-    LaunchedEffect(uiState) {
-        if (uiState !is MainUiState.Loading) {
-            isRefreshing = false
+    LaunchedEffect(isRefreshingByVm) {
+        if (!isRefreshingByVm) {
             pullToRefreshState.endRefresh()
         }
     }
 
-    // 필터 상태
+    // 검색 모드 및 필터 상태
+    var isSearchActive by remember { mutableStateOf(false) }
     var searchText by remember { mutableStateOf("") }
+    val searchFocusRequester = remember { FocusRequester() }
+
     var selectedSiteFilter by remember { mutableStateOf<SiteType?>(null) }
     var showFavoritesOnly by remember { mutableStateOf(false) }
     var showPopularOnly by remember { mutableStateOf(false) }
     var showKeywordMatchOnly by remember { mutableStateOf(false) }
 
+    LaunchedEffect(isSearchActive) {
+        if (isSearchActive) {
+            searchFocusRequester.requestFocus()
+        }
+    }
+
     Scaffold(
+        modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
         topBar = {
             TopAppBar(
                 title = {
+                    if (isSearchActive) {
+                        // 검색 모드일 때의 인라인 검색 텍스트 필드
+                        TextField(
+                            value = searchText,
+                            onValueChange = { searchText = it },
+                            placeholder = {
+                                Text(
+                                    text = "키워드, 브랜드, 상품명 검색...",
+                                    style = MaterialTheme.typography.bodyMedium,
+                                    color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.6f)
+                                )
+                            },
+                            singleLine = true,
+                            keyboardOptions = KeyboardOptions(imeAction = ImeAction.Search),
+                            keyboardActions = KeyboardActions(onSearch = { focusManager.clearFocus() }),
+                            colors = TextFieldDefaults.colors(
+                                focusedContainerColor = Color.Transparent,
+                                unfocusedContainerColor = Color.Transparent,
+                                focusedIndicatorColor = Color.Transparent,
+                                unfocusedIndicatorColor = Color.Transparent
+                            ),
+                            textStyle = MaterialTheme.typography.bodyLarge,
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .focusRequester(searchFocusRequester)
+                        )
+                    } else {
+                        // 기본 상단 타이틀
                         Row(
                             verticalAlignment = Alignment.CenterVertically,
-                        horizontalArrangement = Arrangement.spacedBy(10.dp)
+                            horizontalArrangement = Arrangement.spacedBy(8.dp)
                         ) {
-                        // One UI 9 App Logo Icon
                             Box(
                                 modifier = Modifier
-                                .size(36.dp)
-                                .clip(CornerRadius.shapeSmall)
+                                    .size(32.dp)
+                                    .clip(CornerRadius.shapeMicro)
                                     .background(MaterialTheme.colorScheme.primary),
                                 contentAlignment = Alignment.Center
                             ) {
@@ -96,32 +140,55 @@ fun DealListScreen(
                                     imageVector = Icons.Filled.LocalFireDepartment,
                                     contentDescription = null,
                                     tint = MaterialTheme.colorScheme.onPrimary,
-                                modifier = Modifier.size(20.dp)
+                                    modifier = Modifier.size(18.dp)
                                 )
                             }
 
-                        Column {
                             Text(
                                 text = "핫딜 알람",
                                 style = MaterialTheme.typography.titleMedium,
                                 fontWeight = FontWeight.Bold,
-                                letterSpacing = (-0.3).sp
+                                letterSpacing = (-0.2).sp
+                            )
+                        }
+                    }
+                },
+                navigationIcon = {
+                    if (isSearchActive) {
+                        IconButton(onClick = {
+                            isSearchActive = false
+                            searchText = ""
+                        }) {
+                            Icon(
+                                imageVector = Icons.Filled.ArrowBack,
+                                contentDescription = "검색 닫기",
+                                tint = MaterialTheme.colorScheme.onSurface
                             )
                         }
                     }
                 },
                 actions = {
-                    // 실시간 상태 요약 캡슐
-                    if (uiState is MainUiState.Success) {
-                        val activeSitesCount = (uiState as MainUiState.Success).siteConfigs.count { it.isEnabled }
-                        NowStatusPill(
-                            text = if (activeSitesCount > 0) "${activeSitesCount}개 사이트 감시 중" else "모니터링 대기",
-                            isLive = activeSitesCount > 0,
-                            accentColor = MaterialTheme.colorScheme.primary
+                    if (isSearchActive) {
+                        if (searchText.isNotEmpty()) {
+                            IconButton(onClick = { searchText = "" }) {
+                                Icon(
+                                    imageVector = Icons.Filled.Close,
+                                    contentDescription = "검색어 지우기",
+                                    tint = MaterialTheme.colorScheme.onSurfaceVariant
+                                )
+                            }
+                        }
+                    } else {
+                        // 1. 검색 버튼 (누르면 검색 모드로 전환)
+                        IconButton(onClick = { isSearchActive = true }) {
+                            Icon(
+                                imageVector = Icons.Outlined.Search,
+                                contentDescription = "검색",
+                                tint = MaterialTheme.colorScheme.onSurfaceVariant
                             )
-                        Spacer(modifier = Modifier.width(4.dp))
                         }
 
+                        // 2. 새로고침 버튼
                         IconButton(onClick = { viewModel.refresh() }) {
                             Icon(
                                 imageVector = Icons.Outlined.Refresh,
@@ -129,7 +196,9 @@ fun DealListScreen(
                                 tint = MaterialTheme.colorScheme.onSurfaceVariant
                             )
                         }
+                    }
                 },
+                scrollBehavior = scrollBehavior,
                 colors = TopAppBarDefaults.topAppBarColors(
                     containerColor = MaterialTheme.colorScheme.background,
                     scrolledContainerColor = MaterialTheme.colorScheme.surface
@@ -150,11 +219,12 @@ fun DealListScreen(
                     containerColor = MaterialTheme.colorScheme.primary,
                     contentColor = MaterialTheme.colorScheme.onPrimary,
                     shape = CircleShape,
-                    modifier = Modifier.navigationBarsPadding()
+                    modifier = Modifier.size(44.dp).navigationBarsPadding()
                 ) {
                     Icon(
                         imageVector = Icons.Filled.KeyboardArrowUp,
-                        contentDescription = "맨 위로"
+                        contentDescription = "맨 위로",
+                        modifier = Modifier.size(22.dp)
                     )
                 }
             }
@@ -173,64 +243,18 @@ fun DealListScreen(
                     .consumeWindowInsets(paddingValues)
             ) {
                 // ============================================
-                // 1. One UI 9 Seamless Search Field
-                // ============================================
-                OutlinedTextField(
-                    value = searchText,
-                    onValueChange = { searchText = it },
-                    placeholder = {
-                        Text(
-                            text = "키워드, 브랜드, 상품명 검색...",
-                            style = MaterialTheme.typography.bodyMedium,
-                            color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.55f)
-                        )
-                    },
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .padding(horizontal = 16.dp, vertical = 6.dp),
-                    singleLine = true,
-                    shape = CornerRadius.shapeNormal,
-                    leadingIcon = {
-                        Icon(
-                            imageVector = Icons.Outlined.Search,
-                            contentDescription = "검색",
-                            tint = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.7f),
-                            modifier = Modifier.size(20.dp)
-                        )
-                    },
-                    trailingIcon = {
-                        if (searchText.isNotEmpty()) {
-                            IconButton(onClick = { searchText = "" }) {
-                                Icon(
-                                    imageVector = Icons.Filled.Close,
-                                    contentDescription = "지우기",
-                                    tint = MaterialTheme.colorScheme.onSurfaceVariant,
-                                    modifier = Modifier.size(18.dp)
-                                )
-                            }
-                        }
-                    },
-                    colors = OutlinedTextFieldDefaults.colors(
-                        focusedContainerColor = MaterialTheme.colorScheme.surface,
-                        unfocusedContainerColor = MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.4f),
-                        focusedBorderColor = MaterialTheme.colorScheme.primary,
-                        unfocusedBorderColor = MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.35f)
-                    )
-                )
-
-                // ============================================
-                // 2. One UI 9 Sticky Horizontal Pill Filter Bar
+                // 슬림 가로 스크롤 Sticky Pill Filter Bar
                 // ============================================
                 Row(
                     modifier = Modifier
                         .fillMaxWidth()
-                        .padding(vertical = 6.dp)
+                        .padding(vertical = 4.dp)
                         .horizontalScroll(rememberScrollState()),
-                    horizontalArrangement = Arrangement.spacedBy(8.dp)
+                    horizontalArrangement = Arrangement.spacedBy(6.dp),
+                    verticalAlignment = Alignment.CenterVertically
                 ) {
                     Spacer(modifier = Modifier.width(8.dp))
 
-                    // "전체" 필터 칩
                     FilterPillChip(
                         selected = selectedSiteFilter == null && !showFavoritesOnly && !showPopularOnly && !showKeywordMatchOnly,
                         onClick = {
@@ -243,7 +267,6 @@ fun DealListScreen(
                         accentColor = MaterialTheme.colorScheme.primary
                     )
 
-                    // "🔥 HOT 인기" 필터 칩
                     FilterPillChip(
                         selected = showPopularOnly,
                         onClick = {
@@ -257,7 +280,6 @@ fun DealListScreen(
                         accentColor = HotDealFlameColor
                     )
 
-                    // "⭐ 내 키워드" 필터 칩
                     FilterPillChip(
                         selected = showKeywordMatchOnly,
                         onClick = {
@@ -271,7 +293,6 @@ fun DealListScreen(
                         accentColor = KeywordGold
                     )
 
-                    // "❤️ 즐겨찾기" 필터 칩
                     FilterPillChip(
                         selected = showFavoritesOnly,
                         onClick = {
@@ -285,8 +306,7 @@ fun DealListScreen(
                         accentColor = FavoriteColor
                     )
 
-                    // 사이트별 개별 필터 칩들 (뽐뿌, 클리앙, 루리웹, 쿨엔조이, 아카라이브)
-                    SiteType.entries.forEach { siteType ->
+                    siteOrder.forEach { siteType ->
                         val siteColor = getSiteColor(siteType)
                         FilterPillChip(
                             selected = selectedSiteFilter == siteType,
@@ -302,7 +322,7 @@ fun DealListScreen(
                 }
 
                 // ============================================
-                // 3. 핫딜 목록 본문 (List Content)
+                // 핫딜 목록 본문 (List Content)
                 // ============================================
                 when (val state = uiState) {
                     is MainUiState.Loading -> {
@@ -347,35 +367,11 @@ fun DealListScreen(
                                 )
                             }
                         } else {
-                            // 리스트 상단 카운터 바
-                            Row(
-                                modifier = Modifier
-                                    .fillMaxWidth()
-                                    .padding(horizontal = 18.dp, vertical = 6.dp),
-                                verticalAlignment = Alignment.CenterVertically
-                            ) {
-                                Text(
-                                    text = "총 ${filteredDeals.size}개의 핫딜",
-                                    style = MaterialTheme.typography.labelMedium,
-                                    fontWeight = FontWeight.SemiBold,
-                                    color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.8f)
-                                )
-
-                                if (selectedSiteFilter != null) {
-                                    Spacer(modifier = Modifier.width(6.dp))
-                                    Text(
-                                        text = "• ${selectedSiteFilter?.displayName}",
-                                        style = MaterialTheme.typography.labelSmall,
-                                        color = getSiteColor(selectedSiteFilter)
-                                    )
-                                }
-                            }
-
                             LazyColumn(
                                 modifier = Modifier.fillMaxSize(),
                                 state = listState,
-                                contentPadding = PaddingValues(horizontal = 16.dp, vertical = 6.dp),
-                                verticalArrangement = Arrangement.spacedBy(10.dp)
+                                contentPadding = PaddingValues(horizontal = 14.dp, vertical = 4.dp),
+                                verticalArrangement = Arrangement.spacedBy(7.dp)
                             ) {
                                 items(
                                     items = filteredDeals,
@@ -394,7 +390,7 @@ fun DealListScreen(
                                 }
 
                                 item {
-                                    Spacer(modifier = Modifier.height(24.dp))
+                                    Spacer(modifier = Modifier.height(16.dp))
                                 }
                             }
                         }
@@ -409,25 +405,21 @@ fun DealListScreen(
                 }
             }
 
-            // One UI 9 Pull to Refresh 인디케이터
-            val progress = pullToRefreshState.progress
-            val showIndicator = pullToRefreshState.isRefreshing || progress > 0
+            // Pull to Refresh 인디케이터
+            val topPadding = paddingValues.calculateTopPadding()
 
-            if (showIndicator) {
             PullToRefreshContainer(
                 state = pullToRefreshState,
                 modifier = Modifier
                     .align(Alignment.TopCenter)
-                        .padding(top = 90.dp)
+                    .padding(top = topPadding)
                     .zIndex(999f),
                 containerColor = MaterialTheme.colorScheme.surfaceVariant,
                 contentColor = MaterialTheme.colorScheme.primary
             )
-            }
 
             LaunchedEffect(pullToRefreshState.isRefreshing) {
                 if (pullToRefreshState.isRefreshing) {
-                    isRefreshing = true
                     viewModel.refresh()
                 }
             }
@@ -436,7 +428,7 @@ fun DealListScreen(
 }
 
 /**
- * One UI 9 Capsule Pill Filter Chip
+ * One UI 9 Compact Capsule Pill Filter Chip
  */
 @Composable
 private fun FilterPillChip(
@@ -446,7 +438,7 @@ private fun FilterPillChip(
     accentColor: Color
 ) {
     val bgColor = if (selected) {
-        accentColor.copy(alpha = 0.16f)
+        accentColor.copy(alpha = 0.15f)
     } else {
         MaterialTheme.colorScheme.surface
     }
@@ -454,13 +446,13 @@ private fun FilterPillChip(
     val textColor = if (selected) {
         accentColor
     } else {
-        MaterialTheme.colorScheme.onSurfaceVariant
+        MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.8f)
     }
 
     val borderColor = if (selected) {
-        accentColor.copy(alpha = 0.6f)
+        accentColor.copy(alpha = 0.55f)
     } else {
-        MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.35f)
+        MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.3f)
     }
 
     Surface(
@@ -468,17 +460,18 @@ private fun FilterPillChip(
         color = bgColor,
         border = androidx.compose.foundation.BorderStroke(0.8.dp, borderColor),
         modifier = Modifier
-            .height(34.dp)
+            .height(29.dp)
             .elasticPressClickable(onClick = onClick)
     ) {
         Box(
             contentAlignment = Alignment.Center,
-            modifier = Modifier.padding(horizontal = 14.dp, vertical = 6.dp)
+            modifier = Modifier.padding(horizontal = 11.dp, vertical = 4.dp)
         ) {
             Text(
                 text = label,
-                style = MaterialTheme.typography.labelMedium.copy(
-                    fontWeight = if (selected) FontWeight.Bold else FontWeight.Medium
+                style = MaterialTheme.typography.labelSmall.copy(
+                    fontWeight = if (selected) FontWeight.Bold else FontWeight.Medium,
+                    fontSize = 11.5.sp
                 ),
                 color = textColor
             )

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

@@ -40,6 +40,9 @@ class MainActivity : ComponentActivity() {
     @Inject
     lateinit var workerScheduler: WorkerScheduler
 
+    @Inject
+    lateinit var scraperManager: com.hotdeal.alarm.domain.usecase.HotDealScraperManager
+
     private var downloadReceiver: BroadcastReceiver? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -216,7 +219,13 @@ class MainActivity : ComponentActivity() {
     override fun onResume() {
         super.onResume()
         if (isInBackground) {
-            workerScheduler.executeOnce()
+            lifecycleScope.launch {
+                try {
+                    scraperManager.fetchAndProcessDeals()
+                } catch (e: Exception) {
+                    // 무시
+                }
+            }
         }
         isInBackground = false
     }

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

@@ -11,11 +11,13 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.pager.HorizontalPager
 import androidx.compose.foundation.pager.rememberPagerState
+import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.*
 import androidx.compose.material.icons.outlined.*
 import androidx.compose.material3.*
 import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
@@ -24,7 +26,6 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.core.content.ContextCompat
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.hotdeal.alarm.presentation.components.PermissionDialog
 import com.hotdeal.alarm.presentation.components.elasticPressClickable
 import com.hotdeal.alarm.presentation.deallist.DealListScreen
@@ -33,13 +34,12 @@ import com.hotdeal.alarm.ui.theme.CornerRadius
 import kotlinx.coroutines.launch
 
 /**
- * One UI 9 Fluid Navigation Framework
- * 한 손 조작성을 극대화한 하단 캡슐 내비게이션 바 및 화면 전환
+ * One UI 9 Docked Navigation Framework
+ * 바닥까지 완벽하게 밀착된 일체형 네이티브 하단 바
  */
 @Composable
 fun MainScreen(viewModel: MainViewModel) {
     val context = LocalContext.current
-    val uiState by viewModel.uiState.collectAsStateWithLifecycle()
 
     var showPermissionDialog by remember { mutableStateOf(false) }
     val notificationPermissionLauncher = rememberLauncherForActivityResult(
@@ -67,22 +67,23 @@ fun MainScreen(viewModel: MainViewModel) {
 
     Scaffold(
         bottomBar = {
-            // One UI 9 Fluid Bottom Navigation Bar
-            Surface(
+            // One UI 9 Docked Bottom Navigation Bar (바닥과 완벽 일체화)
+            Column(
                 modifier = Modifier
                     .fillMaxWidth()
-                    .navigationBarsPadding(),
-                color = MaterialTheme.colorScheme.surface,
-                tonalElevation = 3.dp,
-                border = androidx.compose.foundation.BorderStroke(
-                    0.8.dp,
-                    MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.25f)
-                )
+                    .background(MaterialTheme.colorScheme.surface)
             ) {
-                NavigationBar(
-                    containerColor = Color.Transparent,
-                    tonalElevation = 0.dp,
-                    modifier = Modifier.height(64.dp)
+                // 상단 초미세 헤어라인 구분선
+                HorizontalDivider(
+                    thickness = 0.6.dp,
+                    color = MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.35f)
+                )
+
+                Row(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .height(48.dp),
+                    verticalAlignment = Alignment.CenterVertically
                 ) {
                     val navItems = listOf(
                         Triple(0, "핫딜 피드", Icons.Filled.LocalFireDepartment to Icons.Outlined.LocalFireDepartment),
@@ -93,40 +94,66 @@ fun MainScreen(viewModel: MainViewModel) {
                         val isSelected = pagerState.currentPage == pageIndex
                         val (selectedIcon, unselectedIcon) = icons
 
-                        NavigationBarItem(
-                            selected = isSelected,
-                            onClick = {
+                        val itemColor = if (isSelected) {
+                            MaterialTheme.colorScheme.primary
+                        } else {
+                            MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.65f)
+                        }
+
+                        Box(
+                            modifier = Modifier
+                                .weight(1f)
+                                .fillMaxHeight()
+                                .elasticPressClickable {
                                     coroutineScope.launch {
                                         pagerState.animateScrollToPage(pageIndex)
                                     }
                                 },
-                            icon = {
+                            contentAlignment = Alignment.Center
+                        ) {
+                            Column(
+                                horizontalAlignment = Alignment.CenterHorizontally,
+                                verticalArrangement = Arrangement.Center
+                            ) {
+                                // 선택 시 상단 미니 캡슐 인디케이터
+                                if (isSelected) {
+                                    Box(
+                                        modifier = Modifier
+                                            .width(18.dp)
+                                            .height(2.5.dp)
+                                            .clip(CornerRadius.shapePill)
+                                            .background(MaterialTheme.colorScheme.primary)
+                                    )
+                                    Spacer(modifier = Modifier.height(2.dp))
+                                } else {
+                                    Spacer(modifier = Modifier.height(4.5.dp))
+                                }
+
                                 Icon(
                                     imageVector = if (isSelected) selectedIcon else unselectedIcon,
                                     contentDescription = label,
-                                    modifier = Modifier.size(24.dp)
+                                    tint = itemColor,
+                                    modifier = Modifier.size(20.dp)
                                 )
-                            },
-                            label = {
+
+                                Spacer(modifier = Modifier.height(1.dp))
+
                                 Text(
                                     text = label,
                                     style = MaterialTheme.typography.labelSmall.copy(
-                                        fontWeight = if (isSelected) FontWeight.Bold else FontWeight.Medium,
-                                        fontSize = 11.sp
-                                    )
-                                )
-                            },
-                            colors = NavigationBarItemDefaults.colors(
-                                selectedIconColor = MaterialTheme.colorScheme.primary,
-                                selectedTextColor = MaterialTheme.colorScheme.primary,
-                                unselectedIconColor = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.7f),
-                                unselectedTextColor = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.7f),
-                                indicatorColor = MaterialTheme.colorScheme.primaryContainer.copy(alpha = 0.6f)
-                            )
+                                        fontSize = 10.5.sp,
+                                        fontWeight = if (isSelected) FontWeight.Bold else FontWeight.Medium
+                                    ),
+                                    color = itemColor
                                 )
                             }
                         }
                     }
+                }
+
+                // 시스템 제스처 네비게이션 바 영역 패딩 (배경색은 일체형으로 유지)
+                Spacer(modifier = Modifier.navigationBarsPadding())
+            }
         },
         contentWindowInsets = WindowInsets(0, 0, 0, 0)
     ) { paddingValues ->

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

@@ -5,15 +5,16 @@ 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.domain.usecase.HotDealScraperManager
 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
@@ -21,6 +22,7 @@ class MainViewModel @Inject constructor(
     private val hotDealDao: HotDealDao,
     private val siteConfigDao: SiteConfigDao,
     private val keywordDao: KeywordDao,
+    private val scraperManager: HotDealScraperManager,
     private val workerScheduler: WorkerScheduler,
     private val appSettings: AppSettings
 ) : ViewModel() {
@@ -28,21 +30,39 @@ class MainViewModel @Inject constructor(
     private val _uiState = MutableStateFlow<MainUiState>(MainUiState.Loading)
     val uiState: StateFlow<MainUiState> = _uiState.asStateFlow()
 
-    // 폴링 주기 (저장된 값 즉시 반영)
+    // 새로고침 진행 상태
+    private val _isRefreshing = MutableStateFlow(false)
+    val isRefreshing: StateFlow<Boolean> = _isRefreshing.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는 지속 실행)
         viewModelScope.launch {
             initializeDefaultSiteConfigs()
             loadState()
-            // 저장된 폴� 주기로 시작
+        }
+
+        // 2. 백그라운드 폴링 등록 + 앱 진입 즉시 직접 1회 스크래핑 실행
+        viewModelScope.launch {
             val savedInterval = appSettings.pollingInterval.first()
-            startPolling(savedInterval.toLong())
+            workerScheduler.schedulePeriodicPolling(savedInterval.toLong())
+            
+            // 지연 없는 직접 스크래핑 실행 -> Room Flow를 통해 메인화면에 즉시 반영됨!
+            refresh()
         }
     }
 
@@ -57,7 +77,7 @@ class MainViewModel @Inject constructor(
                     siteName = site.name,
                     boardName = board.id,
                     displayName = "${site.displayName} - ${board.displayName}",
-                    isEnabled = false
+                    isEnabled = true // 기본 활성화 (설치 즉시 수집 가동)
                 )
             }
         }
@@ -72,12 +92,21 @@ class MainViewModel @Inject constructor(
         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")
@@ -89,58 +118,100 @@ class MainViewModel @Inject constructor(
     fun toggleSiteConfig(siteBoardKey: String, enabled: Boolean) {
         viewModelScope.launch {
             siteConfigDao.updateEnabled(siteBoardKey, enabled)
+            // 사이트 활성화 변경 시 즉시 새 핫딜 갱신
+            if (enabled) {
+                refresh()
+            }
+        }
+    }
+
+    fun reorderSites(fromIndex: Int, toIndex: Int) {
+        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)
+            // 키워드 등록 후 매칭 검사를 위해 즉시 갱신
+            refresh()
         }
     }
 
     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)
+            if (enabled) {
+                refresh()
+            }
+        }
+    }
+
+    fun reorderKeywords(fromIndex: Int, toIndex: Int) {
+        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)
+            _uiState.value = state.copy(keywords = current)
+            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)
         }
     }
 
+    /**
+     * 직접 즉시 스크래핑 실행 (WorkManager 큐 대기 지연 없이 UI 및 DB 즉시 갱신)
+     */
     fun refresh() {
-        workerScheduler.executeOnce()
+        viewModelScope.launch {
+            _isRefreshing.value = true
+            try {
+                scraperManager.fetchAndProcessDeals()
+            } catch (e: Exception) {
+                // 에러 발생 시 무시 (UI는 DB Flow로 유지)
+            } finally {
+                _isRefreshing.value = false
+            }
+        }
     }
 
-    /**
-     * 폴� 시작 (주기 저장)
-     */
     fun startPolling(intervalMinutes: Long = WorkerScheduler.DEFAULT_INTERVAL_MINUTES) {
         viewModelScope.launch {
             appSettings.setPollingInterval(intervalMinutes.toInt())
@@ -152,20 +223,20 @@ class MainViewModel @Inject constructor(
         workerScheduler.cancelPolling()
     }
 
-    // 데이터 파싱 핫딜 데이터 전체 삭제 및 사용자 피드백 트리거
-    private val _toastEvent = MutableSharedFlow<String>(extraBufferCapacity = 1)
-    val toastEvent = _toastEvent.asSharedFlow()
-
     fun deleteAllParsedData() {
         viewModelScope.launch {
+            try {
                 hotDealDao.deleteAllDeals()
-            _toastEvent.emit("파싱 데이터가 삭제되었습니다")
+                _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,71 @@
+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.domain.usecase.HotDealScraperManager
+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
+
+/**
+ * 주기적 알람 수신 시 백그라운드 스크래핑을 즉시 실행하고 다음 알람을 예약하는 리시버
+ * 
+ * goAsync()를 사용하여 WorkManager의 Doze 지연 없이 백그라운드에서 즉시 핫딜을 수집하고 알림을 발송합니다.
+ */
+@AndroidEntryPoint
+class PollingAlarmReceiver : BroadcastReceiver() {
+
+    companion object {
+        private const val TAG = "PollingAlarmReceiver"
+    }
+
+    @Inject
+    lateinit var scraperManager: HotDealScraperManager
+
+    @Inject
+    lateinit var alarmScheduler: AlarmScheduler
+
+    @Inject
+    lateinit var appSettings: AppSettings
+
+    private val receiverScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
+
+    override fun onReceive(context: Context, intent: Intent) {
+        if (intent.action == AlarmScheduler.ACTION_POLL_ALARM) {
+            Log.d(TAG, "⏰ [실시간 알람 수신] 백그라운드 스크래핑 즉시 시작 및 다음 알람 예약")
+
+            val pendingResult = goAsync()
+
+            receiverScope.launch {
+                try {
+                    // 1. 백그라운드에서 직접 스크래핑, DB 저장, 키워드 알림 즉시 발송!
+                    val newDeals = scraperManager.fetchAndProcessDeals()
+                    Log.d(TAG, "⏰ [스크래핑 완료] 신규 핫딜 ${newDeals.size}개 처리됨")
+                } catch (e: Exception) {
+                    Log.e(TAG, "알람 처리 중 오류: ${e.message}", e)
+                } finally {
+                    // 2. 다음 주기 알람 예약 (Self-rescheduling)
+                    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)
+                    }
+
+                    pendingResult.finish()
+                }
+            }
+        }
+    }
+}

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

@@ -6,33 +6,20 @@ import androidx.hilt.work.HiltWorker
 import androidx.work.CoroutineWorker
 import androidx.work.ForegroundInfo
 import androidx.work.WorkerParameters
-import com.hotdeal.alarm.data.local.db.entity.HotDealEntity
-import com.hotdeal.alarm.data.local.db.entity.KeywordEntity
-import com.hotdeal.alarm.data.local.db.entity.SiteConfigEntity
-import com.hotdeal.alarm.data.remote.scraper.ScraperFactory
-import com.hotdeal.alarm.domain.model.HotDeal
+import com.hotdeal.alarm.domain.usecase.HotDealScraperManager
 import com.hotdeal.alarm.service.NotificationService
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.withContext
 
 /**
- * 핫딜 폴� Worker
- * 
- * 키워드 매칭된 핫딜만 알림 발송
+ * 핫딜 폴링 Worker (WorkManager 전용)
  */
 @HiltWorker
 class HotDealPollingWorker @AssistedInject constructor(
     @Assisted private val context: Context,
     @Assisted workerParams: WorkerParameters,
-    private val scraperFactory: ScraperFactory,
-    private val notificationService: NotificationService,
-    private val dealDao: com.hotdeal.alarm.data.local.db.dao.HotDealDao,
-    private val siteConfigDao: com.hotdeal.alarm.data.local.db.dao.SiteConfigDao,
-    private val keywordDao: com.hotdeal.alarm.data.local.db.dao.KeywordDao
+    private val scraperManager: HotDealScraperManager,
+    private val notificationService: NotificationService
 ) : CoroutineWorker(context, workerParams) {
     
     companion object {
@@ -40,146 +27,18 @@ class HotDealPollingWorker @AssistedInject constructor(
         const val TAG = "HotDealPolling"
     }
     
-    override suspend fun doWork(): Result = withContext(Dispatchers.IO) {
-        try {
-            Log.d(TAG, "===== 핫딜 폴� 시작 =====")
-            
-            // 1. 활성화된 사이트 설정 조회
-            val enabledConfigs = siteConfigDao.getEnabledConfigs()
-            Log.d(TAG, "활성화된 사이트 설정: ${enabledConfigs.size}개")
-            
-            if (enabledConfigs.isEmpty()) {
-                Log.w(TAG, "활성화된 사이트 설정이 없습니다.")
-                return@withContext Result.success()
-            }
-
-            // 2. 활성화된 키워드 조회
-            val keywords = keywordDao.getEnabledKeywords()
-            Log.d(TAG, "활성화된 키워드: ${keywords.size}개")
-
-            // 3. 각 사이트/게시판 스크래핑 (병렬)
-            Log.d(TAG, "스크래핑 시작...")
-            val allDeals = enabledConfigs.map { config ->
-                async {
-                    scrapeSite(config)
-                }
-            }.awaitAll().flatten()
-
-            Log.d(TAG, "스크래핑 완료: 총 ${allDeals.size}개 핫딜")
-            
-            if (allDeals.isEmpty()) {
-                Log.w(TAG, "스크래핑된 핫딜이 없습니다.")
-                return@withContext Result.success()
-            }
-
-            // 4. 새로운 핫딜 필터링
-            val newDeals = filterNewDeals(allDeals)
-            Log.d(TAG, "새로운 핫딜: ${newDeals.size}개")
-
-            if (newDeals.isEmpty()) {
-                Log.d(TAG, "새로운 핫딜이 없습니다.")
-                return@withContext Result.success()
-            }
-
-            // 5. 키워드 매칭 (키워드가 있을 때만)
-            val keywordMatchedDeals = if (keywords.isNotEmpty()) {
-                filterByKeywords(newDeals, keywords).also {
-                    Log.d(TAG, "키워드 매칭 핫딜: ${it.size}개")
-                }
-            } else {
-                Log.d(TAG, "키워드가 없어 매칭 체크를 건�뜁니다.")
-                emptyList()
-            }
-
-            // 6. DB 저장
-            var insertedCount = 0
-            newDeals.forEach { deal ->
-                try {
-                    val entity = HotDealEntity.fromDomain(deal)
-                    dealDao.insertDeal(entity)
-                    insertedCount++
-                } catch (e: Exception) {
-                    Log.w(TAG, "핫딜 저장 실패 (무시됨): ${deal.id}")
-                }
-            }
-            Log.d(TAG, "DB 저장 완료: $insertedCount/${newDeals.size}개 저장됨")
-
-            // 7. 키워드 매칭 알림 발송 (키워드 매칭된 것만!)
-            if (keywordMatchedDeals.isNotEmpty()) {
-                Log.d(TAG, "키워드 매칭 알림 발송: ${keywordMatchedDeals.size}개")
-                notificationService.showKeywordMatchNotification(keywordMatchedDeals)
-                dealDao.markAsKeywordMatch(keywordMatchedDeals.map { it.id })
-            } else {
-                Log.d(TAG, "키워드 매칭된 핫딜이 없어 알림을 발송하지 않습니다.")
-            }
-
-            // 8. 알림 발송 상태 업데이트
-            dealDao.markAsNotified(newDeals.map { it.id })
-
- // 9. 오래된 데이터 정리 (3일 이상 - 배터리/데이터 절약)
- val threshold = System.currentTimeMillis() - (3 * 24 * 60 * 60 * 1000L)
- dealDao.deleteOldDeals(threshold)
-
-            Log.d(TAG, "===== 핫딜 폴� 완료 =====")
+    override suspend fun doWork(): Result {
+        Log.d(TAG, "WorkManager HotDealPollingWorker 실행됨")
+        return try {
+            scraperManager.fetchAndProcessDeals()
             Result.success()
         } catch (e: Exception) {
-            Log.e(TAG, "폴� 오류: ${e.message}", e)
-            if (runAttemptCount < 3) {
-                Result.retry()
-            } else {
-                Result.failure()
-            }
+            Log.e(TAG, "Worker 실행 실패: ${e.message}", e)
+            if (runAttemptCount < 3) Result.retry() else Result.failure()
         }
     }
     
     override suspend fun getForegroundInfo(): ForegroundInfo {
         return notificationService.createForegroundInfo()
     }
-    
-    private suspend fun scrapeSite(config: SiteConfigEntity): List<HotDeal> {
-        val scraper = scraperFactory.getScraper(config.siteName)
-        if (scraper == null) {
-            Log.w(TAG, "스크래퍼를 찾을 수 없음: ${config.siteName}")
-            return emptyList()
-        }
-
-        Log.d(TAG, "스크래핑: ${config.siteName}/${config.boardName}")
-        val result = scraper.scrape(config.boardName)
-        
-        result.fold(
-            onSuccess = { deals ->
-                Log.d(TAG, " ${config.siteName}: ${deals.size}개 핫딜 파싱됨")
-                try {
-                    siteConfigDao.updateLastScrapedAt(config.siteBoardKey, System.currentTimeMillis())
-                } catch (e: Exception) {
-                    Log.w(TAG, "lastScrapedAt 업데이트 실패: ${config.siteBoardKey}")
-                }
-            },
-            onFailure = { error ->
-                Log.e(TAG, " ${config.siteName} 스크래핑 실패: ${error.message}")
-            }
-        )
-
-        return result.getOrElse { emptyList() }
-    }
-    
-    private suspend fun filterNewDeals(deals: List<HotDeal>): List<HotDeal> {
-        return deals.filter { deal ->
-            val existingByUrl = dealDao.getDealByUrl(deal.url)
-            if (existingByUrl != null) return@filter false
-            
-            val existingById = dealDao.getDealById(deal.id)
-            if (existingById != null) return@filter false
-            
-            true
-        }
-    }
-    
-    private fun filterByKeywords(deals: List<HotDeal>, keywords: List<KeywordEntity>): List<HotDeal> {
-        return deals.filter { deal ->
-            keywords.any { keyword ->
-                deal.title.contains(keyword.keyword, ignoreCase = true)
-            }
-        }
-    }
 }

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 {
+        return try {
             val workInfos = WorkManager.getInstance(context)
                 .getWorkInfosForUniqueWork(HotDealPollingWorker.WORK_NAME)
                 .get()
             
-        return workInfos.any { 
+            workInfos.any { 
                 it.state == WorkInfo.State.RUNNING || it.state == WorkInfo.State.ENQUEUED 
             }
+        } catch (e: Exception) {
+            false
+        }
     }
 }

version.json

@@ -1,13 +1,10 @@
 {
-  "version": "0.2.5",
-  "versionCode": 25,
-  "updateUrl": "https://git.webpluss.net/sanjeok77/hotdeal_alarm/releases/download/v0.2.5/app-release.apk",
+  "version": "0.3.5",
+  "versionCode": 35,
+  "updateUrl": "https://git.webpluss.net/sanjeok77/hotdeal_alarm/releases/download/v0.3.5/app-release.apk",
   "changelog": [
-    "One UI 9 & Material 3 Expressive 프리미엄 디자인 전면 적용",
-    "실시간 Now Status 브리핑 & 가로 스크롤 Sticky Pill 필터 바",
-    "Squircle 22dp 핫딜 카드, Text Spotlight 가격 강조, 앰버 골드 키워드 글로우",
-    "Bento 그리드 설정 화면 (세그먼트 Pill 탭, 상태 요약 카드, 원터치 주기 선택)",
-    "한 손 조작 최적화 하단 Fluid Navigation Bar 및 OLED Deep Slate 테마",
-    "아카라이브(ArcaLive) 핫딜 채널 추가"
+    "사이트 및 키워드 순서 조절을 터치 드래그 앤 드롭(Drag & Drop) 방식으로 전면 업그레이드",
+    "앱 내 업데이트 시 다운로드 완료 후 설치 화면으로 안 넘어가는 버그 수정",
+    "새 버전 업데이트 안내 다이얼로그 및 진행률 프로그레스 바 연동"
   ]
 }