refactor: project structure adjustment

Author: kid1412621

AGENTS.md

@@ -79,31 +79,42 @@ Configure in `app/build.gradle.kts:58-68`.
 
 #### Dependency Injection (`di/AppModule.kt`)
 Hilt module providing:
-- User preferences repository
-- Room database and DAO
-- History repository
+- Repositories (`UserPreferencesRepository`, `AIProviderConfigRepository`, `HistoryRepository`)
+- Room database and DAOs (`HistoryDao`, `AIProviderConfigDao`)
 - LLM handler
 - Ktor HTTP client with cookies and JSON serialization
 
 #### Data Layer (`data/`)
-- **`AppDatabase.kt`**: Room database definition
-- **`HistoryDao.kt`**: DAO for history operations
-- **`HistoryRepository.kt`**: Repository managing history data
-- **`converters/`**: Type converters for Room (SummaryType, VideoSubtype, SummaryLength)
-
-#### Domain Models (`model/`)
-- `SummaryData.kt`: Core summary data model
-- `HistorySummary.kt`: History entry model
+- **`local/database/`**: Room database, DAOs, entities, and type converters
+  - `AppDatabase.kt`, `HistoryDao.kt`, `AIProviderConfigDao.kt`, `AIProviderConfigEntity.kt`, `converters/`
+- **`local/datastore/`**: User preferences ProtoBuf DataStore and serializer
+  - `UserPreferencesSerializer.kt`
+- **`repository/`**: Single sources of truth for data access
+  - `AIProviderConfigRepository.kt`: AI provider credentials and configurations
+  - `HistoryRepository.kt`: Summarization history repository
+  - `UserPreferencesRepository.kt`: User settings and preferences repository
+
+#### Domain & Data Models (`model/`)
+- `ExtractedContent.kt`: Content extraction model
+- `HistorySummary.kt`: History entry entity/model
+- `ProviderConfig.kt`: AI provider configuration model
+- `SummaryData.kt`: Core summary data model interface
+- `SummaryLength.kt`: Summarization length enum
+- `SummaryOutput.kt`: LLM output model
+- `SummarySource.kt`: Input source model (Video, Article, Text, Document)
 - `SummaryType.kt`: Supported content types (YouTube, BiliBili, article, image, document, text)
+- `UserPreferences.kt`: User preferences state and settings model
 - `VideoSubtype.kt`: Video platform classifications
-- `SummaryException.kt`: Custom exception types
-- `ExtractedContent.kt`: Content extraction model
+
+#### Custom Exceptions (`exception/`)
+- **`SummaryException.kt`**: Custom exception hierarchy with localization support
 
 #### LLM Integration (`llm/`)
 - **`LLMHandler.kt`**: Core handler for LLM interactions, supports multiple providers
-- **`AIProvider.kt`**: Provider definitions (OpenAI, Gemini, Claude, DeepSeek)
+- **`AIProvider.kt`**: Provider definitions (OpenAI, Gemini, Claude, DeepSeek, etc.)
 - **`Prompts.kt`**: Prompt templates for different content types
 - **`CustomModel.kt`**: Custom model configuration
+- **`GeminiSanitizingHttpClientEngine.kt`**: Engine decorator for Google Gemini compatibility
 - **`tools/`**: Extraction tools
   - `YouTubeTranscriptTool.kt`: YouTube transcript extraction
   - `BiliBiliSubtitleTool.kt`: BiliBili subtitle extraction
@@ -119,13 +130,14 @@ Hilt module providing:
 #### UI Layer (`ui/`)
 - **`AppNavigation.kt`**: Navigation graph setup
 - **`Nav.kt`**: Route definitions
-- **`page/`**: Screen composables
+- **`page/`**: Screen composables & page-specific subcomponents
   - `HomeScreen.kt`: Main summary screen
   - `HistoryScreen.kt`: History browser with paging
   - `SettingsScreen.kt`: App configuration
+  - `AdvancedSetupScreen.kt`: Advanced prompt setup
   - `OnboardingScreen.kt`: First-run setup
-  - `BilibiliLoginScreen.kt`: BiliBili authentication
-- **`component/`**: Reusable UI components
+  - `BilibiliLoginScreen.kt`: BiliBili authentication sheet
+- **`component/`**: Global reusable UI components (`SummaryCard`, `LlmSwitcher`, `LlmIndicator`, `LogoIcon`, `ClickablePasteIcon`)
 - **`theme/`**: Material 3 theming (colors, typography, theme)
 
 #### Services
@@ -183,11 +195,13 @@ Release signing keys (not tracked in git)
 - Follow Android best practices
 
 ### Architecture Patterns
-- MVVM (Model-View-ViewModel)
-- Repository pattern for data access
-- Hilt for dependency injection
-- StateFlow for reactive UI state
-- Sealed classes for type-safe navigation and state management
+- **Layered Architecture & UDF**: UI Layer (Compose + ViewModels with StateFlow), Domain/Model Layer (`model/`, `exception/`), and Data Layer (`data/repository/`, `data/local/`).
+- **Repository Pattern**: Repositories act as the Single Source of Truth (SSOT). ViewModels never interact directly with DAOs, DataStores, or raw network clients.
+- **Dependency Inversion**: Models and domain logic are decoupled from UI and ViewModel layers.
+- **Component Placement Conventions**:
+  - **Global Reusable Components**: Place in `ui/component/` (e.g. `SummaryCard`, `LlmSwitcher`, `LlmIndicator`, `LogoIcon`, `ClickablePasteIcon`).
+  - **Page-Specific Components**: Place alongside the screen in `ui/page/` (or `ui/page/<feature>/`) scoped specifically to that screen/feature (e.g. `BilibiliLoginScreen.kt` sheet).
+- **Custom Exceptions**: Centralized in `exception/SummaryException.kt` with string resource localization support.
 
 ### Dependency Injection
 - All major components are Hilt-injectable

README.md

@@ -86,9 +86,21 @@ package previously.
 
 - **History search**
 
+## 🏗️ Architecture
+
+The app follows Google's [official Android Architecture Recommendations](https://developer.android.com/topic/architecture/recommendations) and [Modern Android Development (MAD)](https://developer.android.com/courses/pathways/android-architecture) best practices:
+
+- **Layered Architecture**:
+  - **UI Layer**: Built with Jetpack Compose and Material 3 Expressive, powered by ViewModels exposing reactive `StateFlow` and following Unidirectional Data Flow (UDF).
+  - **Domain & Model Layer (`model/`, `exception/`)**: Pure domain models and centralized custom exceptions decoupled from UI and data layers.
+  - **Data Layer (`data/`)**: Repositories act as the Single Source of Truth (SSOT), encapsulating Room SQLite DB, ProtoBuf DataStore, Ktor network client, and Koog LLM engine.
+- **Dependency Injection**: Powered by Dagger Hilt for loose coupling and testability.
+- **Asynchronous Operations**: Kotlin Coroutines + Flow for reactive, main-safe async streams.
+
 ## 🌟 Credits
 
 - The [original idea](https://github.com/talosross/SummaryYou)
   from [talosross](https://github.com/talosross)
 
 - [Koog](https://koog.ai) for kotlin-based LLM interactions
+

app/src/main/kotlin/me/nanova/summaryexpressive/data/AIProviderConfigEntity.kt

@@ -2,7 +2,7 @@ package me.nanova.summaryexpressive.data
 
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import me.nanova.summaryexpressive.ProviderConfig
+import me.nanova.summaryexpressive.model.ProviderConfig
 import me.nanova.summaryexpressive.util.SecurityUtil
 
 @Entity(tableName = "ai_provider_config")

app/src/main/kotlin/me/nanova/summaryexpressive/data/converters/SummaryLengthConverter.kt

@@ -1,7 +1,7 @@
 package me.nanova.summaryexpressive.data.converters
 
 import androidx.room.TypeConverter
-import me.nanova.summaryexpressive.llm.SummaryLength
+import me.nanova.summaryexpressive.model.SummaryLength
 
 class SummaryLengthConverter {
     @TypeConverter

…yexpressive/UserPreferencesSerializer.kt …l/datastore/UserPreferencesSerializer.ktapp/src/main/kotlin/me/nanova/summaryexpressive/UserPreferencesSerializer.kt renamed to app/src/main/kotlin/me/nanova/summaryexpressive/data/local/datastore/UserPreferencesSerializer.kt app/src/main/kotlin/me/nanova/summaryexpressive/UserPreferencesSerializer.kt renamed to app/src/main/kotlin/me/nanova/summaryexpressive/data/local/datastore/UserPreferencesSerializer.kt

@@ -1,15 +1,24 @@
-package me.nanova.summaryexpressive
+package me.nanova.summaryexpressive.data.local.datastore
 
+import android.content.Context
 import androidx.datastore.core.CorruptionException
+import androidx.datastore.core.DataStore
 import androidx.datastore.core.Serializer
+import androidx.datastore.dataStore
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.SerializationException
 import kotlinx.serialization.protobuf.ProtoBuf
+import me.nanova.summaryexpressive.model.UserPreferences
 import java.io.InputStream
 import java.io.OutputStream
 
+val Context.userPreferencesDataStore: DataStore<UserPreferences> by dataStore(
+    fileName = "user_prefs.pb",
+    serializer = UserPreferencesSerializer
+)
+
 object UserPreferencesSerializer : Serializer<UserPreferences> {
     override val defaultValue: UserPreferences = UserPreferences()
 

app/src/main/kotlin/me/nanova/summaryexpressive/data/repository/AIProviderConfigRepository.kt

@@ -0,0 +1,46 @@
+package me.nanova.summaryexpressive.data.repository
+
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+import me.nanova.summaryexpressive.data.AIProviderConfigDao
+import me.nanova.summaryexpressive.data.AIProviderConfigEntity
+import me.nanova.summaryexpressive.model.ProviderConfig
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class AIProviderConfigRepository @Inject constructor(
+    private val aiProviderConfigDao: AIProviderConfigDao
+) {
+    val providerConfigsFlow: Flow<Map<String, ProviderConfig>> =
+        aiProviderConfigDao.getAllConfigsFlow().map { entities ->
+            entities.associate { it.provider to it.toProviderConfig() }
+        }
+
+    fun getConfigFlow(provider: String): Flow<ProviderConfig?> =
+        aiProviderConfigDao.getConfigFlow(provider).map { it?.toProviderConfig() }
+
+    suspend fun getConfig(provider: String): ProviderConfig? =
+        aiProviderConfigDao.getConfig(provider)?.toProviderConfig()
+
+    suspend fun saveConfig(provider: String, config: ProviderConfig) {
+        aiProviderConfigDao.insertConfig(
+            AIProviderConfigEntity.fromProviderConfig(provider, config)
+        )
+    }
+
+    suspend fun updateApiKey(provider: String, apiKey: String) {
+        val current = getConfig(provider) ?: ProviderConfig()
+        saveConfig(provider, current.copy(apiKey = apiKey))
+    }
+
+    suspend fun updateBaseUrl(provider: String, baseUrl: String) {
+        val current = getConfig(provider) ?: ProviderConfig()
+        saveConfig(provider, current.copy(baseUrl = baseUrl))
+    }
+
+    suspend fun updateModel(provider: String, model: String) {
+        val current = getConfig(provider) ?: ProviderConfig()
+        saveConfig(provider, current.copy(model = model))
+    }
+}

…maryexpressive/data/HistoryRepository.kt …ive/data/repository/HistoryRepository.ktapp/src/main/kotlin/me/nanova/summaryexpressive/data/HistoryRepository.kt renamed to app/src/main/kotlin/me/nanova/summaryexpressive/data/repository/HistoryRepository.kt app/src/main/kotlin/me/nanova/summaryexpressive/data/HistoryRepository.kt renamed to app/src/main/kotlin/me/nanova/summaryexpressive/data/repository/HistoryRepository.kt

@@ -1,9 +1,10 @@
-package me.nanova.summaryexpressive.data
+package me.nanova.summaryexpressive.data.repository
 
 import androidx.paging.Pager
 import androidx.paging.PagingConfig
 import androidx.paging.PagingData
 import kotlinx.coroutines.flow.Flow
+import me.nanova.summaryexpressive.data.HistoryDao
 import me.nanova.summaryexpressive.model.HistorySummary
 import me.nanova.summaryexpressive.model.SummaryType
 import javax.inject.Inject
@@ -30,4 +31,4 @@ class HistoryRepository @Inject constructor(private val historyDao: HistoryDao)
     suspend fun deleteSummary(id: String) {
         historyDao.deleteById(id)
     }
-}
+}

…yexpressive/UserPreferencesRepository.kt …/repository/UserPreferencesRepository.ktapp/src/main/kotlin/me/nanova/summaryexpressive/UserPreferencesRepository.kt renamed to app/src/main/kotlin/me/nanova/summaryexpressive/data/repository/UserPreferencesRepository.kt app/src/main/kotlin/me/nanova/summaryexpressive/UserPreferencesRepository.kt renamed to app/src/main/kotlin/me/nanova/summaryexpressive/data/repository/UserPreferencesRepository.kt

@@ -1,46 +1,20 @@
-package me.nanova.summaryexpressive
+package me.nanova.summaryexpressive.data.repository
 
 import android.content.Context
-import androidx.datastore.core.DataStore
-import androidx.datastore.dataStore
+import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.catch
-import kotlinx.serialization.Serializable
-import me.nanova.summaryexpressive.llm.SummaryLength
+import me.nanova.summaryexpressive.data.local.datastore.userPreferencesDataStore
+import me.nanova.summaryexpressive.model.UserPreferences
 import java.io.IOException
-
-val Context.dataStore: DataStore<UserPreferences> by dataStore(
-    fileName = "user_prefs.pb",
-    serializer = UserPreferencesSerializer
-)
-
-data class ProviderConfig(
-    val apiKey: String = "",
-    val baseUrl: String = "",
-    val model: String = ""
-)
-
-@Serializable
-data class UserPreferences(
-    // state
-    val isOnboarded: Boolean = false,
-    // settings
-    val useOriginalLanguage: Boolean = true,
-    val dynamicColor: Boolean = true,
-    val theme: Int = 0,
-    val aiProvider: String? = null,
-    val showLength: Boolean = true,
-    val summaryLength: String = SummaryLength.MEDIUM.name,
-    val autoExtractUrl: Boolean = true,
-    val sessData: String = "",
-    val sessDataExpires: Long = 0L,
-    val isAppendMode: Boolean = true,
-    val customBasePrompt: String = "",
-    val additionalSystemPrompt: String = ""
-)
-
-class UserPreferencesRepository(private val context: Context) {
-    val preferencesFlow: Flow<UserPreferences> = context.dataStore.data
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class UserPreferencesRepository @Inject constructor(
+    @ApplicationContext private val context: Context
+) {
+    val preferencesFlow: Flow<UserPreferences> = context.userPreferencesDataStore.data
         .catch { exception ->
             if (exception is IOException) {
                 emit(UserPreferences())
@@ -50,7 +24,7 @@ class UserPreferencesRepository(private val context: Context) {
         }
 
     private suspend fun updatePreferences(transform: suspend (UserPreferences) -> UserPreferences) {
-        context.dataStore.updateData { transform(it) }
+        context.userPreferencesDataStore.updateData { transform(it) }
     }
 
     suspend fun setUseOriginalLanguage(value: Boolean) =
@@ -88,4 +62,4 @@ class UserPreferencesRepository(private val context: Context) {
 
     suspend fun setAdditionalSystemPrompt(value: String) =
         updatePreferences { it.copy(additionalSystemPrompt = value) }
-}
+}

app/src/main/kotlin/me/nanova/summaryexpressive/di/AppModule.kt

@@ -15,11 +15,12 @@ import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
 import io.ktor.client.plugins.cookies.AcceptAllCookiesStorage
 import io.ktor.client.plugins.cookies.HttpCookies
 import io.ktor.serialization.kotlinx.json.json
-import me.nanova.summaryexpressive.UserPreferencesRepository
 import me.nanova.summaryexpressive.data.AIProviderConfigDao
 import me.nanova.summaryexpressive.data.AppDatabase
 import me.nanova.summaryexpressive.data.HistoryDao
-import me.nanova.summaryexpressive.data.HistoryRepository
+import me.nanova.summaryexpressive.data.repository.AIProviderConfigRepository
+import me.nanova.summaryexpressive.data.repository.HistoryRepository
+import me.nanova.summaryexpressive.data.repository.UserPreferencesRepository
 import me.nanova.summaryexpressive.llm.LLMHandler
 import javax.inject.Singleton
 
@@ -71,13 +72,20 @@ object AppModule {
         return HistoryRepository(historyDao)
     }
 
+    @Provides
+    @Singleton
+    fun provideAIProviderConfigRepository(aiProviderConfigDao: AIProviderConfigDao): AIProviderConfigRepository {
+        return AIProviderConfigRepository(aiProviderConfigDao)
+    }
+
     @Provides
     @Singleton
     fun provideLLMHandler(
         @ApplicationContext context: Context,
-        httpClient: HttpClient
+        httpClient: HttpClient,
+        userPreferencesRepository: UserPreferencesRepository
     ): LLMHandler {
-        return LLMHandler(context, httpClient)
+        return LLMHandler(context, httpClient, userPreferencesRepository)
     }
 
     @Provides

…maryexpressive/model/SummaryException.kt …expressive/exception/SummaryException.ktapp/src/main/kotlin/me/nanova/summaryexpressive/model/SummaryException.kt renamed to app/src/main/kotlin/me/nanova/summaryexpressive/exception/SummaryException.kt app/src/main/kotlin/me/nanova/summaryexpressive/model/SummaryException.kt renamed to app/src/main/kotlin/me/nanova/summaryexpressive/exception/SummaryException.kt

@@ -1,4 +1,4 @@
-package me.nanova.summaryexpressive.model
+package me.nanova.summaryexpressive.exception
 
 import androidx.annotation.StringRes
 import me.nanova.summaryexpressive.R
@@ -96,4 +96,4 @@ sealed class SummaryException(message: String) : Exception(message) {
             }
         }
     }
-}
+}