From 72d2185ef98bfd0ca9ca6a81a84b7713dd5b81d4 Mon Sep 17 00:00:00 2001
From: JackEblan <jackeblan115@gmail.com>
Date: Mon, 11 Nov 2024 19:33:55 +0800
Subject: [PATCH 1/7] I no longer follow google's recommended app architecture.
 It solved my previous problem. I realized now how beautiful applying clean
 architecture. Now, in my domain module, I can actually see the purpose of the
 app.

---
 .idea/deploymentTargetSelector.xml            |  4 +-
 README.md                                     |  4 -
 app/build.gradle.kts                          | 10 ++-
 .../kotlin/com/android/geto/MainActivity.kt   |  4 +-
 .../com/android/geto/MainActivityUiState.kt   |  2 +-
 .../com/android/geto/MainActivityViewModel.kt |  2 +-
 broadcast-receiver/build.gradle.kts           |  7 --
 .../consumer-proguard-rules.pro               |  0
 .../src/main/AndroidManifest.xml              |  2 +-
 .../BroadcastReceiverModule.kt                |  6 ++
 .../DefaultBroadcastReceiverController.kt     |  7 +-
 ...DefaultRevertSettingsBroadcastReceiver.kt} | 10 ++-
 core/data-test/build.gradle.kts               |  2 +-
 .../geto/core/data/test/TestDataModule.kt     | 10 +--
 .../repository/FakeAppSettingsRepository.kt   |  9 ++-
 .../test/repository/FakePackageRepository.kt  |  7 +-
 .../FakeSecureSettingsRepository.kt           | 11 +--
 .../test/repository/FakeShortcutRepository.kt |  7 +-
 .../test/repository/FakeUserDataRepository.kt | 11 +--
 core/data/build.gradle.kts                    |  7 +-
 .../android/geto/core/data/di/DataModule.kt   | 10 +--
 .../DefaultAppSettingsRepository.kt           |  4 +-
 .../repository/DefaultPackageRepository.kt    |  6 +-
 .../DefaultSecureSettingsRepository.kt        | 10 +--
 .../repository/DefaultShortcutRepository.kt   |  6 +-
 .../repository/DefaultUserDataRepository.kt   |  8 +-
 core/database/build.gradle.kts                |  2 +-
 .../core/database/dao/AppSettingsDaoTest.kt   |  2 +-
 .../core/database/model/AppSettingEntity.kt   |  4 +-
 core/datastore/build.gradle.kts               |  2 +-
 .../datastore/GetoPreferencesDataSource.kt    |  6 +-
 .../GetoPreferencesDataSourceTest.kt          |  4 +-
 core/domain/build.gradle.kts                  |  5 --
 .../BroadcastReceiverController.kt            |  2 +-
 .../RevertSettingsBroadcastReceiver.kt        | 20 +++++
 .../UsageStatsForegroundServiceManager.kt     |  8 +-
 .../domain/framework}/AssetManagerWrapper.kt  |  4 +-
 .../framework}/ClipboardManagerWrapper.kt     |  2 +-
 .../framework}/NotificationManagerWrapper.kt  |  2 +-
 .../framework}/PackageManagerWrapper.kt       |  4 +-
 .../framework}/SecureSettingsWrapper.kt       |  6 +-
 .../ShortcutManagerCompatWrapper.kt           |  4 +-
 .../framework}/UsageStatsManagerWrapper.kt    |  4 +-
 .../core/domain}/model/AddAppSettingResult.kt |  2 +-
 .../geto/core/domain}/model/AppSetting.kt     |  2 +-
 .../core/domain}/model/AppSettingTemplate.kt  |  2 +-
 .../core/domain}/model/AppSettingsResult.kt   |  2 +-
 .../core/domain}/model/DarkThemeConfig.kt     |  2 +-
 .../ForegroundServiceAppSettingsResult.kt     |  2 +-
 .../core/domain}/model/GetoApplicationInfo.kt |  2 +-
 .../domain}/model/GetoShortcutInfoCompat.kt   |  2 +-
 .../geto/core/domain}/model/GetoUsageEvent.kt |  2 +-
 .../domain}/model/RequestPinShortcutResult.kt |  2 +-
 .../geto/core/domain}/model/SecureSetting.kt  |  2 +-
 .../geto/core/domain}/model/ThemeBrand.kt     |  2 +-
 .../geto/core/domain}/model/UserData.kt       |  2 +-
 .../repository/AppSettingsRepository.kt       |  4 +-
 .../domain}/repository/PackageRepository.kt   |  4 +-
 .../repository/SecureSettingsRepository.kt    |  8 +-
 .../domain}/repository/ShortcutRepository.kt  |  4 +-
 .../domain}/repository/UserDataRepository.kt  |  8 +-
 .../{ => usecase}/AddAppSettingUseCase.kt     | 12 +--
 .../{ => usecase}/ApplyAppSettingsUseCase.kt  | 20 ++---
 .../domain/{ => usecase}/AutoLaunchUseCase.kt | 18 ++---
 .../{ => usecase}/CleanAppSettingsUseCase.kt  |  6 +-
 .../ForegroundServiceAppSettingsUseCase.kt    | 12 +--
 .../RequestPinShortcutUseCase.kt              | 18 ++---
 .../{ => usecase}/RevertAppSettingsUseCase.kt | 20 ++---
 ...pdateUsageStatsForegroundServiceUseCase.kt | 43 ++++++++++
 .../{ => usecase}/AddAppSettingUseCaseTest.kt |  8 +-
 .../ApplyAppSettingsUseCaseTest.kt            | 20 ++---
 .../{ => usecase}/AutoLaunchUseCaseTest.kt    | 24 +++---
 ...ForegroundServiceAppSettingsUseCaseTest.kt | 12 +--
 .../RequestPinShortcutUseCaseTest.kt          | 12 +--
 .../RevertAppSettingsUseCaseTest.kt           | 18 ++---
 ...eUsageStatsForegroundServiceUseCaseTest.kt | 80 +++++++++++++++++++
 core/model/.gitignore                         |  1 -
 core/model/consumer-proguard-rules.pro        |  1 -
 core/model/src/main/AndroidManifest.xml       | 20 -----
 core/testing/build.gradle.kts                 | 10 +--
 .../framework/DummyClipboardManagerWrapper.kt |  2 +-
 .../DummyNotificationManagerWrapper.kt        |  2 +-
 .../framework/FakeAssetManagerWrapper.kt      |  4 +-
 ...FakeUsageStatsForegroundServiceManager.kt} | 10 +--
 .../framework/FakeUsageStatsManagerWrapper.kt |  4 +-
 .../repository/TestAppSettingsRepository.kt   |  4 +-
 .../repository/TestPackageRepository.kt       |  4 +-
 .../TestSecureSettingsRepository.kt           |  8 +-
 .../repository/TestShortcutRepository.kt      |  4 +-
 .../repository/TestUserDataRepository.kt      |  8 +-
 core/ui/build.gradle.kts                      |  2 +-
 .../ui/AppSettingsPreviewParameterProvider.kt |  4 +-
 ...ApplicationInfoPreviewParameterProvider.kt |  2 +-
 feature/app-settings/build.gradle.kts         |  7 --
 .../AppSettingsScreenDialogsTest.kt           |  2 +-
 .../AppSettingsScreenSnackbarTest.kt          |  6 +-
 .../appsettings/AppSettingsScreenTest.kt      |  4 +-
 .../dialog/appsetting/AppSettingDialogTest.kt |  4 +-
 .../feature/appsettings/AppSettingsEvent.kt   |  6 +-
 .../feature/appsettings/AppSettingsScreen.kt  | 40 +++++-----
 .../feature/appsettings/AppSettingsUiState.kt |  2 +-
 .../appsettings/AppSettingsViewModel.kt       | 41 +++++-----
 .../dialog/appsetting/AppSettingDialog.kt     |  4 +-
 .../appsetting/AppSettingDialogState.kt       |  6 +-
 .../dialog/shortcut/ShortcutDialog.kt         |  2 +-
 .../dialog/shortcut/ShortcutDialogState.kt    |  2 +-
 .../dialog/template/TemplateDialog.kt         |  4 +-
 .../dialog/template/TemplateDialogState.kt    |  4 +-
 .../dialog/template/TemplateDialogUiState.kt  |  2 +-
 .../AppSettingsScreenScreenshotTest.kt        |  4 +-
 ...AppSettingsScreenSnackbarScreenshotTest.kt |  4 +-
 .../appsettings/AppSettingsViewModelTest.kt   | 36 ++++-----
 .../appsetting/AppSettingsDialogStateTest.kt  |  4 +-
 .../template/TemplateDialogScreenshotTest.kt  |  4 +-
 feature/apps/build.gradle.kts                 |  2 +-
 .../geto/feature/apps/AppsScreenTest.kt       |  2 +-
 .../android/geto/feature/apps/AppsScreen.kt   |  2 +-
 .../android/geto/feature/apps/AppsUiState.kt  |  2 +-
 .../geto/feature/apps/AppsViewModel.kt        |  2 +-
 .../feature/apps/AppsScreenScreenshotTest.kt  |  2 +-
 .../geto/feature/apps/AppsViewModelTest.kt    |  2 +-
 feature/service/build.gradle.kts              |  4 -
 .../geto/feature/service/ServiceScreen.kt     |  9 ++-
 .../geto/feature/service/ServiceUiState.kt    |  2 +-
 .../geto/feature/service/ServiceViewModel.kt  | 34 +++-----
 .../service/ServiceScreenScreenshotTest.kt    |  9 ++-
 .../feature/service/ServiceViewModelTest.kt   | 52 +++++++-----
 feature/settings/build.gradle.kts             |  1 -
 .../settings/SettingsScreenDialogsTest.kt     |  6 +-
 .../feature/settings/SettingsScreenTest.kt    |  6 +-
 .../geto/feature/settings/SettingsEvent.kt    |  4 +-
 .../geto/feature/settings/SettingsScreen.kt   |  4 +-
 .../geto/feature/settings/SettingsUiState.kt  |  2 +-
 .../feature/settings/SettingsViewModel.kt     |  8 +-
 .../settings/dialog/dark/DarkDialog.kt        |  2 +-
 .../settings/dialog/theme/ThemeDialog.kt      |  2 +-
 .../settings/SettingsScreenScreenshotTest.kt  |  6 +-
 .../feature/settings/SettingsViewModelTest.kt |  6 +-
 foreground-service/build.gradle.kts           |  3 -
 ...roidUsageStatsForegroundServiceManager.kt} | 11 ++-
 .../ForegroundServiceModule.kt                |  3 +-
 .../foregroundservice/UsageStatsService.kt    | 22 +++--
 framework/asset-manager/build.gradle.kts      |  2 +-
 .../AndroidAssetManagerWrapper.kt             |  7 +-
 .../assetmanager/AssetManagerModule.kt        |  1 +
 framework/clipboard-manager/build.gradle.kts  |  4 +
 .../AndroidClipboardManagerWrapper.kt         |  2 +-
 .../ClipboardManagerModule.kt                 |  2 +-
 .../notification-manager/build.gradle.kts     |  2 +
 .../AndroidNotificationManagerWrapper.kt      |  7 +-
 .../NotificationManagerModule.kt              |  1 +
 framework/package-manager/build.gradle.kts    |  2 +-
 .../AndroidPackageManagerWrapper.kt           |  3 +-
 .../packagemanager/PackageManagerModule.kt    |  1 +
 .../mapper/AndroidApplicationInfoMapper.kt    |  2 +-
 framework/secure-settings/build.gradle.kts    |  2 +-
 .../AndroidSecureSettingsWrapper.kt           | 11 +--
 .../securesettings/SecureSettingsModule.kt    |  1 +
 framework/shortcut-manager/build.gradle.kts   |  2 +-
 .../AndroidShortcutManagerCompatWrapper.kt    |  3 +-
 .../shortcutmanager/ShortcutManagerModule.kt  |  1 +
 .../mapper/ShortcutInfoCompat.kt              |  2 +-
 .../usage-stats-manager/build.gradle.kts      |  2 +-
 .../AndroidUsageStatsManagerWrapper.kt        |  5 +-
 .../UsageStatsManagerModule.kt                |  1 +
 settings.gradle.kts                           |  1 -
 166 files changed, 649 insertions(+), 530 deletions(-)
 delete mode 100644 broadcast-receiver/consumer-proguard-rules.pro
 rename broadcast-receiver/src/main/kotlin/com/android/geto/broadcastreceiver/{RevertSettingsBroadcastReceiver.kt => DefaultRevertSettingsBroadcastReceiver.kt} (72%)
 rename {broadcast-receiver/src/main/kotlin/com/android/geto => core/domain/src/main/kotlin/com/android/geto/core/domain}/broadcastreceiver/BroadcastReceiverController.kt (93%)
 create mode 100644 core/domain/src/main/kotlin/com/android/geto/core/domain/broadcastreceiver/RevertSettingsBroadcastReceiver.kt
 rename foreground-service/src/main/kotlin/com/android/geto/foregroundservice/ForegroundServiceManager.kt => core/domain/src/main/kotlin/com/android/geto/core/domain/foregroundservice/UsageStatsForegroundServiceManager.kt (84%)
 rename {framework/asset-manager/src/main/kotlin/com/android/geto/framework/assetmanager => core/domain/src/main/kotlin/com/android/geto/core/domain/framework}/AssetManagerWrapper.kt (87%)
 rename {framework/clipboard-manager/src/main/kotlin/com/android/geto/framework/clipboardmanager => core/domain/src/main/kotlin/com/android/geto/core/domain/framework}/ClipboardManagerWrapper.kt (93%)
 rename {framework/notification-manager/src/main/kotlin/com/android/geto/framework/notificationmanager => core/domain/src/main/kotlin/com/android/geto/core/domain/framework}/NotificationManagerWrapper.kt (96%)
 rename {framework/package-manager/src/main/kotlin/com/android/geto/framework/packagemanager => core/domain/src/main/kotlin/com/android/geto/core/domain/framework}/PackageManagerWrapper.kt (89%)
 rename {framework/secure-settings/src/main/kotlin/com/android/geto/framework/securesettings => core/domain/src/main/kotlin/com/android/geto/core/domain/framework}/SecureSettingsWrapper.kt (84%)
 rename {framework/shortcut-manager/src/main/kotlin/com/android/geto/framework/shortcutmanager => core/domain/src/main/kotlin/com/android/geto/core/domain/framework}/ShortcutManagerCompatWrapper.kt (90%)
 rename {framework/usage-stats-manager/src/main/kotlin/com/android/geto/framework/usagestatsmanager => core/domain/src/main/kotlin/com/android/geto/core/domain/framework}/UsageStatsManagerWrapper.kt (88%)
 rename core/{model/src/main/kotlin/com/android/geto/core => domain/src/main/kotlin/com/android/geto/core/domain}/model/AddAppSettingResult.kt (94%)
 rename core/{model/src/main/kotlin/com/android/geto/core => domain/src/main/kotlin/com/android/geto/core/domain}/model/AppSetting.kt (95%)
 rename core/{model/src/main/kotlin/com/android/geto/core => domain/src/main/kotlin/com/android/geto/core/domain}/model/AppSettingTemplate.kt (94%)
 rename core/{model/src/main/kotlin/com/android/geto/core => domain/src/main/kotlin/com/android/geto/core/domain}/model/AppSettingsResult.kt (94%)
 rename core/{model/src/main/kotlin/com/android/geto/core => domain/src/main/kotlin/com/android/geto/core/domain}/model/DarkThemeConfig.kt (94%)
 rename core/{model/src/main/kotlin/com/android/geto/core => domain/src/main/kotlin/com/android/geto/core/domain}/model/ForegroundServiceAppSettingsResult.kt (97%)
 rename core/{model/src/main/kotlin/com/android/geto/core => domain/src/main/kotlin/com/android/geto/core/domain}/model/GetoApplicationInfo.kt (94%)
 rename core/{model/src/main/kotlin/com/android/geto/core => domain/src/main/kotlin/com/android/geto/core/domain}/model/GetoShortcutInfoCompat.kt (94%)
 rename core/{model/src/main/kotlin/com/android/geto/core => domain/src/main/kotlin/com/android/geto/core/domain}/model/GetoUsageEvent.kt (94%)
 rename core/{model/src/main/kotlin/com/android/geto/core => domain/src/main/kotlin/com/android/geto/core/domain}/model/RequestPinShortcutResult.kt (94%)
 rename core/{model/src/main/kotlin/com/android/geto/core => domain/src/main/kotlin/com/android/geto/core/domain}/model/SecureSetting.kt (94%)
 rename core/{model/src/main/kotlin/com/android/geto/core => domain/src/main/kotlin/com/android/geto/core/domain}/model/ThemeBrand.kt (94%)
 rename core/{model/src/main/kotlin/com/android/geto/core => domain/src/main/kotlin/com/android/geto/core/domain}/model/UserData.kt (94%)
 rename core/{data/src/main/kotlin/com/android/geto/core/data => domain/src/main/kotlin/com/android/geto/core/domain}/repository/AppSettingsRepository.kt (90%)
 rename core/{data/src/main/kotlin/com/android/geto/core/data => domain/src/main/kotlin/com/android/geto/core/domain}/repository/PackageRepository.kt (88%)
 rename core/{data/src/main/kotlin/com/android/geto/core/data => domain/src/main/kotlin/com/android/geto/core/domain}/repository/SecureSettingsRepository.kt (81%)
 rename core/{data/src/main/kotlin/com/android/geto/core/data => domain/src/main/kotlin/com/android/geto/core/domain}/repository/ShortcutRepository.kt (91%)
 rename core/{data/src/main/kotlin/com/android/geto/core/data => domain/src/main/kotlin/com/android/geto/core/domain}/repository/UserDataRepository.kt (82%)
 rename core/domain/src/main/kotlin/com/android/geto/core/domain/{ => usecase}/AddAppSettingUseCase.kt (77%)
 rename core/domain/src/main/kotlin/com/android/geto/core/domain/{ => usecase}/ApplyAppSettingsUseCase.kt (69%)
 rename core/domain/src/main/kotlin/com/android/geto/core/domain/{ => usecase}/AutoLaunchUseCase.kt (73%)
 rename core/domain/src/main/kotlin/com/android/geto/core/domain/{ => usecase}/CleanAppSettingsUseCase.kt (88%)
 rename core/domain/src/main/kotlin/com/android/geto/core/domain/{ => usecase}/ForegroundServiceAppSettingsUseCase.kt (84%)
 rename core/domain/src/main/kotlin/com/android/geto/core/domain/{ => usecase}/RequestPinShortcutUseCase.kt (80%)
 rename core/domain/src/main/kotlin/com/android/geto/core/domain/{ => usecase}/RevertAppSettingsUseCase.kt (68%)
 create mode 100644 core/domain/src/main/kotlin/com/android/geto/core/domain/usecase/UpdateUsageStatsForegroundServiceUseCase.kt
 rename core/domain/src/test/kotlin/com/android/geto/core/domain/{ => usecase}/AddAppSettingUseCaseTest.kt (93%)
 rename core/domain/src/test/kotlin/com/android/geto/core/domain/{ => usecase}/ApplyAppSettingsUseCaseTest.kt (89%)
 rename core/domain/src/test/kotlin/com/android/geto/core/domain/{ => usecase}/AutoLaunchUseCaseTest.kt (92%)
 rename core/domain/src/test/kotlin/com/android/geto/core/domain/{ => usecase}/ForegroundServiceAppSettingsUseCaseTest.kt (92%)
 rename core/domain/src/test/kotlin/com/android/geto/core/domain/{ => usecase}/RequestPinShortcutUseCaseTest.kt (90%)
 rename core/domain/src/test/kotlin/com/android/geto/core/domain/{ => usecase}/RevertAppSettingsUseCaseTest.kt (90%)
 create mode 100644 core/domain/src/test/kotlin/com/android/geto/core/domain/usecase/UpdateUsageStatsForegroundServiceUseCaseTest.kt
 delete mode 100644 core/model/.gitignore
 delete mode 100644 core/model/consumer-proguard-rules.pro
 delete mode 100644 core/model/src/main/AndroidManifest.xml
 rename core/testing/src/main/kotlin/com/android/geto/core/testing/framework/{FakeForegroundServiceManager.kt => FakeUsageStatsForegroundServiceManager.kt} (81%)
 rename foreground-service/src/main/kotlin/com/android/geto/foregroundservice/{AndroidForegroundServiceManager.kt => AndroidUsageStatsForegroundServiceManager.kt} (85%)

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index 2dfa2cba1..6d756725c 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2024-10-18T22:52:32.855486500Z">
+        <DropdownSelection timestamp="2024-11-10T07:54:20.694748900Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="PhysicalDevice" identifier="serial=07314251BG101942" />
+              <DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\User\.android\avd\Pixel_8_Pro_API_34.avd" />
             </handle>
           </Target>
         </DropdownSelection>
diff --git a/README.md b/README.md
index 8ada06782..b0159ccbb 100644
--- a/README.md
+++ b/README.md
@@ -18,10 +18,6 @@ Apply custom settings to your apps
 About The Project
 ==================
 
-The architecture and modularization of this project are inspired
-from [Now in Android](https://github.com/android/nowinandroid) and my goal is to apply the modern
-architectures and principles of programming to this project.
-
 The only reason I created this app is to turn off that damn Developer Options when using a banking
 app. The only annoying thing about it is you have to go to the Settings app. When you turn off that
 switch button, your Developer Options configurations will be reset to default. The good thing is
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 91a1d84da..38a04899f 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -64,7 +64,7 @@ android {
 dependencies {
     implementation(projects.core.data)
     implementation(projects.core.designSystem)
-    implementation(projects.core.model)
+    implementation(projects.core.domain)
 
     implementation(projects.feature.apps)
     implementation(projects.feature.appSettings)
@@ -73,6 +73,14 @@ dependencies {
     implementation(projects.feature.settings)
 
     implementation(projects.broadcastReceiver)
+    implementation(projects.foregroundService)
+    implementation(projects.framework.assetManager)
+    implementation(projects.framework.clipboardManager)
+    implementation(projects.framework.notificationManager)
+    implementation(projects.framework.packageManager)
+    implementation(projects.framework.secureSettings)
+    implementation(projects.framework.shortcutManager)
+    implementation(projects.framework.usageStatsManager)
 
     implementation(libs.accompanist.permissions)
     implementation(libs.androidx.activity.ktx)
diff --git a/app/src/main/kotlin/com/android/geto/MainActivity.kt b/app/src/main/kotlin/com/android/geto/MainActivity.kt
index 740c2d08d..a511307d3 100644
--- a/app/src/main/kotlin/com/android/geto/MainActivity.kt
+++ b/app/src/main/kotlin/com/android/geto/MainActivity.kt
@@ -35,8 +35,8 @@ import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import androidx.navigation.compose.rememberNavController
 import com.android.geto.core.designsystem.theme.GetoTheme
-import com.android.geto.core.model.DarkThemeConfig
-import com.android.geto.core.model.ThemeBrand
+import com.android.geto.core.domain.model.DarkThemeConfig
+import com.android.geto.core.domain.model.ThemeBrand
 import com.android.geto.navigation.GetoNavHost
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.flow.collect
diff --git a/app/src/main/kotlin/com/android/geto/MainActivityUiState.kt b/app/src/main/kotlin/com/android/geto/MainActivityUiState.kt
index 105e6ade3..efadb9b4d 100644
--- a/app/src/main/kotlin/com/android/geto/MainActivityUiState.kt
+++ b/app/src/main/kotlin/com/android/geto/MainActivityUiState.kt
@@ -17,7 +17,7 @@
  */
 package com.android.geto
 
-import com.android.geto.core.model.UserData
+import com.android.geto.core.domain.model.UserData
 
 sealed interface MainActivityUiState {
     data object Loading : MainActivityUiState
diff --git a/app/src/main/kotlin/com/android/geto/MainActivityViewModel.kt b/app/src/main/kotlin/com/android/geto/MainActivityViewModel.kt
index 21d8f20e7..a86cffc5f 100644
--- a/app/src/main/kotlin/com/android/geto/MainActivityViewModel.kt
+++ b/app/src/main/kotlin/com/android/geto/MainActivityViewModel.kt
@@ -19,7 +19,7 @@ package com.android.geto
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.android.geto.core.data.repository.UserDataRepository
+import com.android.geto.core.domain.repository.UserDataRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
diff --git a/broadcast-receiver/build.gradle.kts b/broadcast-receiver/build.gradle.kts
index 279c683a3..e5cf6cec5 100644
--- a/broadcast-receiver/build.gradle.kts
+++ b/broadcast-receiver/build.gradle.kts
@@ -23,17 +23,10 @@ plugins {
 
 android {
     namespace = "com.android.geto.broadcastreceiver"
-
-    defaultConfig {
-        consumerProguardFiles("consumer-proguard-rules.pro")
-    }
 }
 
 dependencies {
     implementation(libs.androidx.core.ktx)
     implementation(projects.core.common)
     implementation(projects.core.domain)
-    implementation(projects.core.model)
-
-    implementation(projects.framework.notificationManager)
 }
\ No newline at end of file
diff --git a/broadcast-receiver/consumer-proguard-rules.pro b/broadcast-receiver/consumer-proguard-rules.pro
deleted file mode 100644
index e69de29bb..000000000
diff --git a/broadcast-receiver/src/main/AndroidManifest.xml b/broadcast-receiver/src/main/AndroidManifest.xml
index 3f9a6d054..e11a2fd99 100644
--- a/broadcast-receiver/src/main/AndroidManifest.xml
+++ b/broadcast-receiver/src/main/AndroidManifest.xml
@@ -19,7 +19,7 @@
 
     <application>
         <receiver
-            android:name=".RevertSettingsBroadcastReceiver"
+            android:name=".DefaultRevertSettingsBroadcastReceiver"
             android:exported="false">
             <intent-filter>
                 <action android:name="ACTION_REVERT_SETTINGS" />
diff --git a/broadcast-receiver/src/main/kotlin/com/android/geto/broadcastreceiver/BroadcastReceiverModule.kt b/broadcast-receiver/src/main/kotlin/com/android/geto/broadcastreceiver/BroadcastReceiverModule.kt
index 18bda85c4..a5100d54c 100644
--- a/broadcast-receiver/src/main/kotlin/com/android/geto/broadcastreceiver/BroadcastReceiverModule.kt
+++ b/broadcast-receiver/src/main/kotlin/com/android/geto/broadcastreceiver/BroadcastReceiverModule.kt
@@ -17,6 +17,8 @@
  */
 package com.android.geto.broadcastreceiver
 
+import com.android.geto.core.domain.broadcastreceiver.BroadcastReceiverController
+import com.android.geto.core.domain.broadcastreceiver.RevertSettingsBroadcastReceiver
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
@@ -30,4 +32,8 @@ internal interface BroadcastReceiverModule {
     @Binds
     @Singleton
     fun broadcastReceiverController(impl: DefaultBroadcastReceiverController): BroadcastReceiverController
+
+    @Binds
+    @Singleton
+    fun revertSettingsBroadcastReceiver(impl: DefaultRevertSettingsBroadcastReceiver): RevertSettingsBroadcastReceiver
 }
diff --git a/broadcast-receiver/src/main/kotlin/com/android/geto/broadcastreceiver/DefaultBroadcastReceiverController.kt b/broadcast-receiver/src/main/kotlin/com/android/geto/broadcastreceiver/DefaultBroadcastReceiverController.kt
index d9d130577..2eb88298a 100644
--- a/broadcast-receiver/src/main/kotlin/com/android/geto/broadcastreceiver/DefaultBroadcastReceiverController.kt
+++ b/broadcast-receiver/src/main/kotlin/com/android/geto/broadcastreceiver/DefaultBroadcastReceiverController.kt
@@ -19,9 +19,10 @@ package com.android.geto.broadcastreceiver
 
 import com.android.geto.core.common.Dispatcher
 import com.android.geto.core.common.GetoDispatchers.IO
-import com.android.geto.core.domain.RevertAppSettingsUseCase
-import com.android.geto.core.model.AppSettingsResult
-import com.android.geto.framework.notificationmanager.NotificationManagerWrapper
+import com.android.geto.core.domain.broadcastreceiver.BroadcastReceiverController
+import com.android.geto.core.domain.framework.NotificationManagerWrapper
+import com.android.geto.core.domain.model.AppSettingsResult
+import com.android.geto.core.domain.usecase.RevertAppSettingsUseCase
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
diff --git a/broadcast-receiver/src/main/kotlin/com/android/geto/broadcastreceiver/RevertSettingsBroadcastReceiver.kt b/broadcast-receiver/src/main/kotlin/com/android/geto/broadcastreceiver/DefaultRevertSettingsBroadcastReceiver.kt
similarity index 72%
rename from broadcast-receiver/src/main/kotlin/com/android/geto/broadcastreceiver/RevertSettingsBroadcastReceiver.kt
rename to broadcast-receiver/src/main/kotlin/com/android/geto/broadcastreceiver/DefaultRevertSettingsBroadcastReceiver.kt
index c8682d327..e8ff0a963 100644
--- a/broadcast-receiver/src/main/kotlin/com/android/geto/broadcastreceiver/RevertSettingsBroadcastReceiver.kt
+++ b/broadcast-receiver/src/main/kotlin/com/android/geto/broadcastreceiver/DefaultRevertSettingsBroadcastReceiver.kt
@@ -20,13 +20,17 @@ package com.android.geto.broadcastreceiver
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import com.android.geto.framework.notificationmanager.NotificationManagerWrapper.Companion.EXTRA_NOTIFICATION_ID
-import com.android.geto.framework.notificationmanager.NotificationManagerWrapper.Companion.EXTRA_PACKAGE_NAME
+import com.android.geto.core.domain.broadcastreceiver.BroadcastReceiverController
+import com.android.geto.core.domain.broadcastreceiver.RevertSettingsBroadcastReceiver
+import com.android.geto.core.domain.framework.NotificationManagerWrapper.Companion.EXTRA_NOTIFICATION_ID
+import com.android.geto.core.domain.framework.NotificationManagerWrapper.Companion.EXTRA_PACKAGE_NAME
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 
 @AndroidEntryPoint
-class RevertSettingsBroadcastReceiver : BroadcastReceiver() {
+class DefaultRevertSettingsBroadcastReceiver @Inject constructor() :
+    BroadcastReceiver(),
+    RevertSettingsBroadcastReceiver {
     @Inject
     lateinit var broadcastReceiverController: BroadcastReceiverController
 
diff --git a/core/data-test/build.gradle.kts b/core/data-test/build.gradle.kts
index 12e19906f..fe71ff313 100644
--- a/core/data-test/build.gradle.kts
+++ b/core/data-test/build.gradle.kts
@@ -28,7 +28,7 @@ android {
 
 dependencies {
     implementation(projects.core.data)
-    implementation(projects.core.model)
+    implementation(projects.core.domain)
 
     implementation(libs.hilt.android.testing)
 }
\ No newline at end of file
diff --git a/core/data-test/src/main/kotlin/com/android/geto/core/data/test/TestDataModule.kt b/core/data-test/src/main/kotlin/com/android/geto/core/data/test/TestDataModule.kt
index 93054604e..48fc13493 100644
--- a/core/data-test/src/main/kotlin/com/android/geto/core/data/test/TestDataModule.kt
+++ b/core/data-test/src/main/kotlin/com/android/geto/core/data/test/TestDataModule.kt
@@ -18,16 +18,16 @@
 package com.android.geto.core.data.test
 
 import com.android.geto.core.data.di.DataModule
-import com.android.geto.core.data.repository.AppSettingsRepository
-import com.android.geto.core.data.repository.PackageRepository
-import com.android.geto.core.data.repository.SecureSettingsRepository
-import com.android.geto.core.data.repository.ShortcutRepository
-import com.android.geto.core.data.repository.UserDataRepository
 import com.android.geto.core.data.test.repository.FakeAppSettingsRepository
 import com.android.geto.core.data.test.repository.FakePackageRepository
 import com.android.geto.core.data.test.repository.FakeSecureSettingsRepository
 import com.android.geto.core.data.test.repository.FakeShortcutRepository
 import com.android.geto.core.data.test.repository.FakeUserDataRepository
+import com.android.geto.core.domain.repository.AppSettingsRepository
+import com.android.geto.core.domain.repository.PackageRepository
+import com.android.geto.core.domain.repository.SecureSettingsRepository
+import com.android.geto.core.domain.repository.ShortcutRepository
+import com.android.geto.core.domain.repository.UserDataRepository
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.components.SingletonComponent
diff --git a/core/data-test/src/main/kotlin/com/android/geto/core/data/test/repository/FakeAppSettingsRepository.kt b/core/data-test/src/main/kotlin/com/android/geto/core/data/test/repository/FakeAppSettingsRepository.kt
index cdd82f9f3..3d4a21f24 100644
--- a/core/data-test/src/main/kotlin/com/android/geto/core/data/test/repository/FakeAppSettingsRepository.kt
+++ b/core/data-test/src/main/kotlin/com/android/geto/core/data/test/repository/FakeAppSettingsRepository.kt
@@ -17,15 +17,16 @@
  */
 package com.android.geto.core.data.test.repository
 
-import com.android.geto.core.data.repository.AppSettingsRepository
-import com.android.geto.core.model.AppSetting
-import com.android.geto.core.model.SettingType
+import com.android.geto.core.domain.model.AppSetting
+import com.android.geto.core.domain.model.SettingType
+import com.android.geto.core.domain.repository.AppSettingsRepository
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.emptyFlow
 import kotlinx.coroutines.flow.flowOf
 import javax.inject.Inject
 
-class FakeAppSettingsRepository @Inject constructor() : AppSettingsRepository {
+class FakeAppSettingsRepository @Inject constructor() :
+    AppSettingsRepository {
     override val appSettings: Flow<List<AppSetting>> = emptyFlow()
 
     override suspend fun upsertAppSetting(appSetting: AppSetting) {}
diff --git a/core/data-test/src/main/kotlin/com/android/geto/core/data/test/repository/FakePackageRepository.kt b/core/data-test/src/main/kotlin/com/android/geto/core/data/test/repository/FakePackageRepository.kt
index 4059a75b2..52b066823 100644
--- a/core/data-test/src/main/kotlin/com/android/geto/core/data/test/repository/FakePackageRepository.kt
+++ b/core/data-test/src/main/kotlin/com/android/geto/core/data/test/repository/FakePackageRepository.kt
@@ -18,11 +18,12 @@
 package com.android.geto.core.data.test.repository
 
 import android.graphics.drawable.Drawable
-import com.android.geto.core.data.repository.PackageRepository
-import com.android.geto.core.model.GetoApplicationInfo
+import com.android.geto.core.domain.model.GetoApplicationInfo
+import com.android.geto.core.domain.repository.PackageRepository
 import javax.inject.Inject
 
-class FakePackageRepository @Inject constructor() : PackageRepository {
+class FakePackageRepository @Inject constructor() :
+    PackageRepository {
     override suspend fun queryIntentActivities(): List<GetoApplicationInfo> {
         return List(20) { index ->
             GetoApplicationInfo(
diff --git a/core/data-test/src/main/kotlin/com/android/geto/core/data/test/repository/FakeSecureSettingsRepository.kt b/core/data-test/src/main/kotlin/com/android/geto/core/data/test/repository/FakeSecureSettingsRepository.kt
index bbc2e16e4..3a309b931 100644
--- a/core/data-test/src/main/kotlin/com/android/geto/core/data/test/repository/FakeSecureSettingsRepository.kt
+++ b/core/data-test/src/main/kotlin/com/android/geto/core/data/test/repository/FakeSecureSettingsRepository.kt
@@ -17,13 +17,14 @@
  */
 package com.android.geto.core.data.test.repository
 
-import com.android.geto.core.data.repository.SecureSettingsRepository
-import com.android.geto.core.model.AppSetting
-import com.android.geto.core.model.SecureSetting
-import com.android.geto.core.model.SettingType
+import com.android.geto.core.domain.model.AppSetting
+import com.android.geto.core.domain.model.SecureSetting
+import com.android.geto.core.domain.model.SettingType
+import com.android.geto.core.domain.repository.SecureSettingsRepository
 import javax.inject.Inject
 
-class FakeSecureSettingsRepository @Inject constructor() : SecureSettingsRepository {
+class FakeSecureSettingsRepository @Inject constructor() :
+    SecureSettingsRepository {
     override suspend fun applySecureSettings(appSettings: List<AppSetting>): Boolean {
         return true
     }
diff --git a/core/data-test/src/main/kotlin/com/android/geto/core/data/test/repository/FakeShortcutRepository.kt b/core/data-test/src/main/kotlin/com/android/geto/core/data/test/repository/FakeShortcutRepository.kt
index 2799bf7b1..4d51013c3 100644
--- a/core/data-test/src/main/kotlin/com/android/geto/core/data/test/repository/FakeShortcutRepository.kt
+++ b/core/data-test/src/main/kotlin/com/android/geto/core/data/test/repository/FakeShortcutRepository.kt
@@ -17,11 +17,12 @@
  */
 package com.android.geto.core.data.test.repository
 
-import com.android.geto.core.data.repository.ShortcutRepository
-import com.android.geto.core.model.GetoShortcutInfoCompat
+import com.android.geto.core.domain.model.GetoShortcutInfoCompat
+import com.android.geto.core.domain.repository.ShortcutRepository
 import javax.inject.Inject
 
-class FakeShortcutRepository @Inject constructor() : ShortcutRepository {
+class FakeShortcutRepository @Inject constructor() :
+    ShortcutRepository {
 
     override fun isRequestPinShortcutSupported(): Boolean {
         return false
diff --git a/core/data-test/src/main/kotlin/com/android/geto/core/data/test/repository/FakeUserDataRepository.kt b/core/data-test/src/main/kotlin/com/android/geto/core/data/test/repository/FakeUserDataRepository.kt
index a719efd55..5c711306a 100644
--- a/core/data-test/src/main/kotlin/com/android/geto/core/data/test/repository/FakeUserDataRepository.kt
+++ b/core/data-test/src/main/kotlin/com/android/geto/core/data/test/repository/FakeUserDataRepository.kt
@@ -17,15 +17,16 @@
  */
 package com.android.geto.core.data.test.repository
 
-import com.android.geto.core.data.repository.UserDataRepository
-import com.android.geto.core.model.DarkThemeConfig
-import com.android.geto.core.model.ThemeBrand
-import com.android.geto.core.model.UserData
+import com.android.geto.core.domain.model.DarkThemeConfig
+import com.android.geto.core.domain.model.ThemeBrand
+import com.android.geto.core.domain.model.UserData
+import com.android.geto.core.domain.repository.UserDataRepository
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flowOf
 import javax.inject.Inject
 
-class FakeUserDataRepository @Inject constructor() : UserDataRepository {
+class FakeUserDataRepository @Inject constructor() :
+    UserDataRepository {
 
     override val userData: Flow<UserData> = flowOf(
         UserData(
diff --git a/core/data/build.gradle.kts b/core/data/build.gradle.kts
index e529fd78b..9c63761ff 100644
--- a/core/data/build.gradle.kts
+++ b/core/data/build.gradle.kts
@@ -36,12 +36,7 @@ dependencies {
     implementation(projects.core.common)
     implementation(projects.core.database)
     implementation(projects.core.datastore)
-    implementation(projects.core.model)
-
-    implementation(projects.framework.clipboardManager)
-    implementation(projects.framework.packageManager)
-    implementation(projects.framework.secureSettings)
-    implementation(projects.framework.shortcutManager)
+    implementation(projects.core.domain)
 
     testImplementation(libs.kotlinx.coroutines.test)
     testImplementation(projects.core.datastoreTest)
diff --git a/core/data/src/main/kotlin/com/android/geto/core/data/di/DataModule.kt b/core/data/src/main/kotlin/com/android/geto/core/data/di/DataModule.kt
index ea3be8ac4..5cce655c0 100644
--- a/core/data/src/main/kotlin/com/android/geto/core/data/di/DataModule.kt
+++ b/core/data/src/main/kotlin/com/android/geto/core/data/di/DataModule.kt
@@ -17,16 +17,16 @@
  */
 package com.android.geto.core.data.di
 
-import com.android.geto.core.data.repository.AppSettingsRepository
 import com.android.geto.core.data.repository.DefaultAppSettingsRepository
 import com.android.geto.core.data.repository.DefaultPackageRepository
 import com.android.geto.core.data.repository.DefaultSecureSettingsRepository
 import com.android.geto.core.data.repository.DefaultShortcutRepository
 import com.android.geto.core.data.repository.DefaultUserDataRepository
-import com.android.geto.core.data.repository.PackageRepository
-import com.android.geto.core.data.repository.SecureSettingsRepository
-import com.android.geto.core.data.repository.ShortcutRepository
-import com.android.geto.core.data.repository.UserDataRepository
+import com.android.geto.core.domain.repository.AppSettingsRepository
+import com.android.geto.core.domain.repository.PackageRepository
+import com.android.geto.core.domain.repository.SecureSettingsRepository
+import com.android.geto.core.domain.repository.ShortcutRepository
+import com.android.geto.core.domain.repository.UserDataRepository
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
diff --git a/core/data/src/main/kotlin/com/android/geto/core/data/repository/DefaultAppSettingsRepository.kt b/core/data/src/main/kotlin/com/android/geto/core/data/repository/DefaultAppSettingsRepository.kt
index 91f3f7c9a..ba3bc1aee 100644
--- a/core/data/src/main/kotlin/com/android/geto/core/data/repository/DefaultAppSettingsRepository.kt
+++ b/core/data/src/main/kotlin/com/android/geto/core/data/repository/DefaultAppSettingsRepository.kt
@@ -21,7 +21,7 @@ import com.android.geto.core.database.dao.AppSettingsDao
 import com.android.geto.core.database.model.AppSettingEntity
 import com.android.geto.core.database.model.asEntity
 import com.android.geto.core.database.model.asExternalModel
-import com.android.geto.core.model.AppSetting
+import com.android.geto.core.domain.model.AppSetting
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.map
@@ -29,7 +29,7 @@ import javax.inject.Inject
 
 internal class DefaultAppSettingsRepository @Inject constructor(
     private val appSettingsDao: AppSettingsDao,
-) : AppSettingsRepository {
+) : com.android.geto.core.domain.repository.AppSettingsRepository {
 
     override val appSettings: Flow<List<AppSetting>> =
         appSettingsDao.getAppSettingEntities().distinctUntilChanged().map { entities ->
diff --git a/core/data/src/main/kotlin/com/android/geto/core/data/repository/DefaultPackageRepository.kt b/core/data/src/main/kotlin/com/android/geto/core/data/repository/DefaultPackageRepository.kt
index c4deb6fb1..b2d04d7ef 100644
--- a/core/data/src/main/kotlin/com/android/geto/core/data/repository/DefaultPackageRepository.kt
+++ b/core/data/src/main/kotlin/com/android/geto/core/data/repository/DefaultPackageRepository.kt
@@ -18,13 +18,13 @@
 package com.android.geto.core.data.repository
 
 import android.graphics.drawable.Drawable
-import com.android.geto.core.model.GetoApplicationInfo
-import com.android.geto.framework.packagemanager.PackageManagerWrapper
+import com.android.geto.core.domain.framework.PackageManagerWrapper
+import com.android.geto.core.domain.model.GetoApplicationInfo
 import javax.inject.Inject
 
 internal class DefaultPackageRepository @Inject constructor(
     private val packageManagerWrapper: PackageManagerWrapper,
-) : PackageRepository {
+) : com.android.geto.core.domain.repository.PackageRepository {
 
     override suspend fun queryIntentActivities(): List<GetoApplicationInfo> {
         return packageManagerWrapper.queryIntentActivities()
diff --git a/core/data/src/main/kotlin/com/android/geto/core/data/repository/DefaultSecureSettingsRepository.kt b/core/data/src/main/kotlin/com/android/geto/core/data/repository/DefaultSecureSettingsRepository.kt
index 3d23c343a..a0b9e0ceb 100644
--- a/core/data/src/main/kotlin/com/android/geto/core/data/repository/DefaultSecureSettingsRepository.kt
+++ b/core/data/src/main/kotlin/com/android/geto/core/data/repository/DefaultSecureSettingsRepository.kt
@@ -19,10 +19,10 @@ package com.android.geto.core.data.repository
 
 import com.android.geto.core.common.Dispatcher
 import com.android.geto.core.common.GetoDispatchers.Default
-import com.android.geto.core.model.AppSetting
-import com.android.geto.core.model.SecureSetting
-import com.android.geto.core.model.SettingType
-import com.android.geto.framework.securesettings.SecureSettingsWrapper
+import com.android.geto.core.domain.framework.SecureSettingsWrapper
+import com.android.geto.core.domain.model.AppSetting
+import com.android.geto.core.domain.model.SecureSetting
+import com.android.geto.core.domain.model.SettingType
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext
 import javax.inject.Inject
@@ -30,7 +30,7 @@ import javax.inject.Inject
 internal class DefaultSecureSettingsRepository @Inject constructor(
     @Dispatcher(Default) private val defaultDispatcher: CoroutineDispatcher,
     private val secureSettingsWrapper: SecureSettingsWrapper,
-) : SecureSettingsRepository {
+) : com.android.geto.core.domain.repository.SecureSettingsRepository {
     override suspend fun applySecureSettings(appSettings: List<AppSetting>): Boolean {
         return appSettings.all { appSetting ->
             secureSettingsWrapper.canWriteSecureSettings(
diff --git a/core/data/src/main/kotlin/com/android/geto/core/data/repository/DefaultShortcutRepository.kt b/core/data/src/main/kotlin/com/android/geto/core/data/repository/DefaultShortcutRepository.kt
index cb879be95..74fef2503 100644
--- a/core/data/src/main/kotlin/com/android/geto/core/data/repository/DefaultShortcutRepository.kt
+++ b/core/data/src/main/kotlin/com/android/geto/core/data/repository/DefaultShortcutRepository.kt
@@ -19,8 +19,8 @@ package com.android.geto.core.data.repository
 
 import com.android.geto.core.common.Dispatcher
 import com.android.geto.core.common.GetoDispatchers.Default
-import com.android.geto.core.model.GetoShortcutInfoCompat
-import com.android.geto.framework.shortcutmanager.ShortcutManagerCompatWrapper
+import com.android.geto.core.domain.framework.ShortcutManagerCompatWrapper
+import com.android.geto.core.domain.model.GetoShortcutInfoCompat
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext
 import javax.inject.Inject
@@ -28,7 +28,7 @@ import javax.inject.Inject
 internal class DefaultShortcutRepository @Inject constructor(
     @Dispatcher(Default) private val defaultDispatcher: CoroutineDispatcher,
     private val shortcutManagerCompatWrapper: ShortcutManagerCompatWrapper,
-) : ShortcutRepository {
+) : com.android.geto.core.domain.repository.ShortcutRepository {
 
     override fun isRequestPinShortcutSupported(): Boolean {
         return shortcutManagerCompatWrapper.isRequestPinShortcutSupported()
diff --git a/core/data/src/main/kotlin/com/android/geto/core/data/repository/DefaultUserDataRepository.kt b/core/data/src/main/kotlin/com/android/geto/core/data/repository/DefaultUserDataRepository.kt
index f6bb27c5a..f986a7df8 100644
--- a/core/data/src/main/kotlin/com/android/geto/core/data/repository/DefaultUserDataRepository.kt
+++ b/core/data/src/main/kotlin/com/android/geto/core/data/repository/DefaultUserDataRepository.kt
@@ -17,16 +17,16 @@
  */
 package com.android.geto.core.data.repository
 
-import com.android.geto.core.model.DarkThemeConfig
-import com.android.geto.core.model.ThemeBrand
-import com.android.geto.core.model.UserData
+import com.android.geto.core.domain.model.DarkThemeConfig
+import com.android.geto.core.domain.model.ThemeBrand
+import com.android.geto.core.domain.model.UserData
 import com.android.geto.datastore.GetoPreferencesDataSource
 import kotlinx.coroutines.flow.Flow
 import javax.inject.Inject
 
 internal class DefaultUserDataRepository @Inject constructor(
     private val getoPreferencesDataSource: GetoPreferencesDataSource,
-) : UserDataRepository {
+) : com.android.geto.core.domain.repository.UserDataRepository {
 
     override val userData: Flow<UserData> = getoPreferencesDataSource.userData
 
diff --git a/core/database/build.gradle.kts b/core/database/build.gradle.kts
index b119fadd0..f544f20bd 100644
--- a/core/database/build.gradle.kts
+++ b/core/database/build.gradle.kts
@@ -36,7 +36,7 @@ android {
 }
 
 dependencies {
-    implementation(projects.core.model)
+    implementation(projects.core.domain)
 
     androidTestImplementation(libs.room.testing)
     androidTestImplementation(projects.core.testing)
diff --git a/core/database/src/androidTest/kotlin/com/android/geto/core/database/dao/AppSettingsDaoTest.kt b/core/database/src/androidTest/kotlin/com/android/geto/core/database/dao/AppSettingsDaoTest.kt
index 7ea88417c..3d5db73c7 100644
--- a/core/database/src/androidTest/kotlin/com/android/geto/core/database/dao/AppSettingsDaoTest.kt
+++ b/core/database/src/androidTest/kotlin/com/android/geto/core/database/dao/AppSettingsDaoTest.kt
@@ -22,7 +22,7 @@ import androidx.room.Room
 import androidx.test.core.app.ApplicationProvider
 import com.android.geto.core.database.AppDatabase
 import com.android.geto.core.database.model.AppSettingEntity
-import com.android.geto.core.model.SettingType
+import com.android.geto.core.domain.model.SettingType
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.test.runTest
 import org.junit.After
diff --git a/core/database/src/main/kotlin/com/android/geto/core/database/model/AppSettingEntity.kt b/core/database/src/main/kotlin/com/android/geto/core/database/model/AppSettingEntity.kt
index d57079af9..342494f48 100644
--- a/core/database/src/main/kotlin/com/android/geto/core/database/model/AppSettingEntity.kt
+++ b/core/database/src/main/kotlin/com/android/geto/core/database/model/AppSettingEntity.kt
@@ -19,8 +19,8 @@ package com.android.geto.core.database.model
 
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import com.android.geto.core.model.AppSetting
-import com.android.geto.core.model.SettingType
+import com.android.geto.core.domain.model.AppSetting
+import com.android.geto.core.domain.model.SettingType
 
 @Entity
 data class AppSettingEntity(
diff --git a/core/datastore/build.gradle.kts b/core/datastore/build.gradle.kts
index aff9d2a8b..bed4bb6b1 100644
--- a/core/datastore/build.gradle.kts
+++ b/core/datastore/build.gradle.kts
@@ -41,7 +41,7 @@ dependencies {
     api(projects.core.datastoreProto)
 
     implementation(projects.core.common)
-    implementation(projects.core.model)
+    implementation(projects.core.domain)
 
     testImplementation(projects.core.datastoreTest)
     testImplementation(libs.kotlinx.coroutines.test)
diff --git a/core/datastore/src/main/kotlin/com/android/geto/datastore/GetoPreferencesDataSource.kt b/core/datastore/src/main/kotlin/com/android/geto/datastore/GetoPreferencesDataSource.kt
index af7f8eef7..d1ddc9c6f 100644
--- a/core/datastore/src/main/kotlin/com/android/geto/datastore/GetoPreferencesDataSource.kt
+++ b/core/datastore/src/main/kotlin/com/android/geto/datastore/GetoPreferencesDataSource.kt
@@ -22,9 +22,9 @@ import com.android.geto.core.datastore.proto.DarkThemeConfigProto
 import com.android.geto.core.datastore.proto.ThemeBrandProto
 import com.android.geto.core.datastore.proto.UserPreferences
 import com.android.geto.core.datastore.proto.copy
-import com.android.geto.core.model.DarkThemeConfig
-import com.android.geto.core.model.ThemeBrand
-import com.android.geto.core.model.UserData
+import com.android.geto.core.domain.model.DarkThemeConfig
+import com.android.geto.core.domain.model.ThemeBrand
+import com.android.geto.core.domain.model.UserData
 import kotlinx.coroutines.flow.map
 import javax.inject.Inject
 
diff --git a/core/datastore/src/test/kotlin/com/android/geto/datastore/GetoPreferencesDataSourceTest.kt b/core/datastore/src/test/kotlin/com/android/geto/datastore/GetoPreferencesDataSourceTest.kt
index f0b8f9022..c35058859 100644
--- a/core/datastore/src/test/kotlin/com/android/geto/datastore/GetoPreferencesDataSourceTest.kt
+++ b/core/datastore/src/test/kotlin/com/android/geto/datastore/GetoPreferencesDataSourceTest.kt
@@ -18,8 +18,8 @@
 package com.android.geto.datastore
 
 import com.android.geto.core.datastore.test.testUserPreferencesDataStore
-import com.android.geto.core.model.DarkThemeConfig
-import com.android.geto.core.model.ThemeBrand
+import com.android.geto.core.domain.model.DarkThemeConfig
+import com.android.geto.core.domain.model.ThemeBrand
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.UnconfinedTestDispatcher
diff --git a/core/domain/build.gradle.kts b/core/domain/build.gradle.kts
index 4c44d8061..026fbea5b 100644
--- a/core/domain/build.gradle.kts
+++ b/core/domain/build.gradle.kts
@@ -27,11 +27,6 @@ android {
 }
 
 dependencies {
-    implementation(projects.core.data)
-    implementation(projects.core.model)
-
-    implementation(projects.framework.usageStatsManager)
-
     testImplementation(libs.kotlinx.coroutines.test)
     testImplementation(projects.core.testing)
 }
\ No newline at end of file
diff --git a/broadcast-receiver/src/main/kotlin/com/android/geto/broadcastreceiver/BroadcastReceiverController.kt b/core/domain/src/main/kotlin/com/android/geto/core/domain/broadcastreceiver/BroadcastReceiverController.kt
similarity index 93%
rename from broadcast-receiver/src/main/kotlin/com/android/geto/broadcastreceiver/BroadcastReceiverController.kt
rename to core/domain/src/main/kotlin/com/android/geto/core/domain/broadcastreceiver/BroadcastReceiverController.kt
index 9a500e505..5767e295c 100644
--- a/broadcast-receiver/src/main/kotlin/com/android/geto/broadcastreceiver/BroadcastReceiverController.kt
+++ b/core/domain/src/main/kotlin/com/android/geto/core/domain/broadcastreceiver/BroadcastReceiverController.kt
@@ -15,7 +15,7 @@
  *   limitations under the License.
  *
  */
-package com.android.geto.broadcastreceiver
+package com.android.geto.core.domain.broadcastreceiver
 
 interface BroadcastReceiverController {
     fun revertSettings(packageName: String?, notificationId: Int?)
diff --git a/core/domain/src/main/kotlin/com/android/geto/core/domain/broadcastreceiver/RevertSettingsBroadcastReceiver.kt b/core/domain/src/main/kotlin/com/android/geto/core/domain/broadcastreceiver/RevertSettingsBroadcastReceiver.kt
new file mode 100644
index 000000000..4b602159b
--- /dev/null
+++ b/core/domain/src/main/kotlin/com/android/geto/core/domain/broadcastreceiver/RevertSettingsBroadcastReceiver.kt
@@ -0,0 +1,20 @@
+/*
+ *
+ *   Copyright 2023 Einstein Blanco
+ *
+ *   Licensed under the GNU General Public License v3.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       https://www.gnu.org/licenses/gpl-3.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *
+ */
+package com.android.geto.core.domain.broadcastreceiver
+
+interface RevertSettingsBroadcastReceiver
diff --git a/foreground-service/src/main/kotlin/com/android/geto/foregroundservice/ForegroundServiceManager.kt b/core/domain/src/main/kotlin/com/android/geto/core/domain/foregroundservice/UsageStatsForegroundServiceManager.kt
similarity index 84%
rename from foreground-service/src/main/kotlin/com/android/geto/foregroundservice/ForegroundServiceManager.kt
rename to core/domain/src/main/kotlin/com/android/geto/core/domain/foregroundservice/UsageStatsForegroundServiceManager.kt
index d9d0782ee..d7accf333 100644
--- a/foreground-service/src/main/kotlin/com/android/geto/foregroundservice/ForegroundServiceManager.kt
+++ b/core/domain/src/main/kotlin/com/android/geto/core/domain/foregroundservice/UsageStatsForegroundServiceManager.kt
@@ -15,12 +15,12 @@
  *   limitations under the License.
  *
  */
-package com.android.geto.foregroundservice
+package com.android.geto.core.domain.foregroundservice
+
+interface UsageStatsForegroundServiceManager {
+    val isActive: Boolean
 
-interface ForegroundServiceManager {
     fun startForegroundService()
 
     fun stopForegroundService()
-
-    fun isActive(): Boolean
 }
diff --git a/framework/asset-manager/src/main/kotlin/com/android/geto/framework/assetmanager/AssetManagerWrapper.kt b/core/domain/src/main/kotlin/com/android/geto/core/domain/framework/AssetManagerWrapper.kt
similarity index 87%
rename from framework/asset-manager/src/main/kotlin/com/android/geto/framework/assetmanager/AssetManagerWrapper.kt
rename to core/domain/src/main/kotlin/com/android/geto/core/domain/framework/AssetManagerWrapper.kt
index 2e6b766a0..193880639 100644
--- a/framework/asset-manager/src/main/kotlin/com/android/geto/framework/assetmanager/AssetManagerWrapper.kt
+++ b/core/domain/src/main/kotlin/com/android/geto/core/domain/framework/AssetManagerWrapper.kt
@@ -15,9 +15,9 @@
  *   limitations under the License.
  *
  */
-package com.android.geto.framework.assetmanager
+package com.android.geto.core.domain.framework
 
-import com.android.geto.core.model.AppSettingTemplate
+import com.android.geto.core.domain.model.AppSettingTemplate
 
 interface AssetManagerWrapper {
     suspend fun getAppSettingTemplates(): List<AppSettingTemplate>
diff --git a/framework/clipboard-manager/src/main/kotlin/com/android/geto/framework/clipboardmanager/ClipboardManagerWrapper.kt b/core/domain/src/main/kotlin/com/android/geto/core/domain/framework/ClipboardManagerWrapper.kt
similarity index 93%
rename from framework/clipboard-manager/src/main/kotlin/com/android/geto/framework/clipboardmanager/ClipboardManagerWrapper.kt
rename to core/domain/src/main/kotlin/com/android/geto/core/domain/framework/ClipboardManagerWrapper.kt
index 49a16ed9d..a185b6d67 100644
--- a/framework/clipboard-manager/src/main/kotlin/com/android/geto/framework/clipboardmanager/ClipboardManagerWrapper.kt
+++ b/core/domain/src/main/kotlin/com/android/geto/core/domain/framework/ClipboardManagerWrapper.kt
@@ -15,7 +15,7 @@
  *   limitations under the License.
  *
  */
-package com.android.geto.framework.clipboardmanager
+package com.android.geto.core.domain.framework
 
 interface ClipboardManagerWrapper {
     fun setPrimaryClip(label: String, text: String): Boolean
diff --git a/framework/notification-manager/src/main/kotlin/com/android/geto/framework/notificationmanager/NotificationManagerWrapper.kt b/core/domain/src/main/kotlin/com/android/geto/core/domain/framework/NotificationManagerWrapper.kt
similarity index 96%
rename from framework/notification-manager/src/main/kotlin/com/android/geto/framework/notificationmanager/NotificationManagerWrapper.kt
rename to core/domain/src/main/kotlin/com/android/geto/core/domain/framework/NotificationManagerWrapper.kt
index 737f12bbb..a53212a56 100644
--- a/framework/notification-manager/src/main/kotlin/com/android/geto/framework/notificationmanager/NotificationManagerWrapper.kt
+++ b/core/domain/src/main/kotlin/com/android/geto/core/domain/framework/NotificationManagerWrapper.kt
@@ -15,7 +15,7 @@
  *   limitations under the License.
  *
  */
-package com.android.geto.framework.notificationmanager
+package com.android.geto.core.domain.framework
 
 import android.app.Notification
 import android.graphics.drawable.Drawable
diff --git a/framework/package-manager/src/main/kotlin/com/android/geto/framework/packagemanager/PackageManagerWrapper.kt b/core/domain/src/main/kotlin/com/android/geto/core/domain/framework/PackageManagerWrapper.kt
similarity index 89%
rename from framework/package-manager/src/main/kotlin/com/android/geto/framework/packagemanager/PackageManagerWrapper.kt
rename to core/domain/src/main/kotlin/com/android/geto/core/domain/framework/PackageManagerWrapper.kt
index fe5d56dcb..8e76ff661 100644
--- a/framework/package-manager/src/main/kotlin/com/android/geto/framework/packagemanager/PackageManagerWrapper.kt
+++ b/core/domain/src/main/kotlin/com/android/geto/core/domain/framework/PackageManagerWrapper.kt
@@ -15,10 +15,10 @@
  *   limitations under the License.
  *
  */
-package com.android.geto.framework.packagemanager
+package com.android.geto.core.domain.framework
 
 import android.graphics.drawable.Drawable
-import com.android.geto.core.model.GetoApplicationInfo
+import com.android.geto.core.domain.model.GetoApplicationInfo
 
 interface PackageManagerWrapper {
     suspend fun queryIntentActivities(): List<GetoApplicationInfo>
diff --git a/framework/secure-settings/src/main/kotlin/com/android/geto/framework/securesettings/SecureSettingsWrapper.kt b/core/domain/src/main/kotlin/com/android/geto/core/domain/framework/SecureSettingsWrapper.kt
similarity index 84%
rename from framework/secure-settings/src/main/kotlin/com/android/geto/framework/securesettings/SecureSettingsWrapper.kt
rename to core/domain/src/main/kotlin/com/android/geto/core/domain/framework/SecureSettingsWrapper.kt
index 427a3c4e8..2a0540665 100644
--- a/framework/secure-settings/src/main/kotlin/com/android/geto/framework/securesettings/SecureSettingsWrapper.kt
+++ b/core/domain/src/main/kotlin/com/android/geto/core/domain/framework/SecureSettingsWrapper.kt
@@ -15,10 +15,10 @@
  *   limitations under the License.
  *
  */
-package com.android.geto.framework.securesettings
+package com.android.geto.core.domain.framework
 
-import com.android.geto.core.model.SecureSetting
-import com.android.geto.core.model.SettingType
+import com.android.geto.core.domain.model.SecureSetting
+import com.android.geto.core.domain.model.SettingType
 
 interface SecureSettingsWrapper {
     suspend fun canWriteSecureSettings(
diff --git a/framework/shortcut-manager/src/main/kotlin/com/android/geto/framework/shortcutmanager/ShortcutManagerCompatWrapper.kt b/core/domain/src/main/kotlin/com/android/geto/core/domain/framework/ShortcutManagerCompatWrapper.kt
similarity index 90%
rename from framework/shortcut-manager/src/main/kotlin/com/android/geto/framework/shortcutmanager/ShortcutManagerCompatWrapper.kt
rename to core/domain/src/main/kotlin/com/android/geto/core/domain/framework/ShortcutManagerCompatWrapper.kt
index 19c635aa4..a695e4172 100644
--- a/framework/shortcut-manager/src/main/kotlin/com/android/geto/framework/shortcutmanager/ShortcutManagerCompatWrapper.kt
+++ b/core/domain/src/main/kotlin/com/android/geto/core/domain/framework/ShortcutManagerCompatWrapper.kt
@@ -15,9 +15,9 @@
  *   limitations under the License.
  *
  */
-package com.android.geto.framework.shortcutmanager
+package com.android.geto.core.domain.framework
 
-import com.android.geto.core.model.GetoShortcutInfoCompat
+import com.android.geto.core.domain.model.GetoShortcutInfoCompat
 
 interface ShortcutManagerCompatWrapper {
 
diff --git a/framework/usage-stats-manager/src/main/kotlin/com/android/geto/framework/usagestatsmanager/UsageStatsManagerWrapper.kt b/core/domain/src/main/kotlin/com/android/geto/core/domain/framework/UsageStatsManagerWrapper.kt
similarity index 88%
rename from framework/usage-stats-manager/src/main/kotlin/com/android/geto/framework/usagestatsmanager/UsageStatsManagerWrapper.kt
rename to core/domain/src/main/kotlin/com/android/geto/core/domain/framework/UsageStatsManagerWrapper.kt
index f3f3aa4a0..227855307 100644
--- a/framework/usage-stats-manager/src/main/kotlin/com/android/geto/framework/usagestatsmanager/UsageStatsManagerWrapper.kt
+++ b/core/domain/src/main/kotlin/com/android/geto/core/domain/framework/UsageStatsManagerWrapper.kt
@@ -15,9 +15,9 @@
  *   limitations under the License.
  *
  */
-package com.android.geto.framework.usagestatsmanager
+package com.android.geto.core.domain.framework
 
-import com.android.geto.core.model.GetoUsageEvent
+import com.android.geto.core.domain.model.GetoUsageEvent
 import kotlinx.coroutines.flow.Flow
 
 interface UsageStatsManagerWrapper {
diff --git a/core/model/src/main/kotlin/com/android/geto/core/model/AddAppSettingResult.kt b/core/domain/src/main/kotlin/com/android/geto/core/domain/model/AddAppSettingResult.kt
similarity index 94%
rename from core/model/src/main/kotlin/com/android/geto/core/model/AddAppSettingResult.kt
rename to core/domain/src/main/kotlin/com/android/geto/core/domain/model/AddAppSettingResult.kt
index d8fe97261..829393918 100644
--- a/core/model/src/main/kotlin/com/android/geto/core/model/AddAppSettingResult.kt
+++ b/core/domain/src/main/kotlin/com/android/geto/core/domain/model/AddAppSettingResult.kt
@@ -15,7 +15,7 @@
  *   limitations under the License.
  *
  */
-package com.android.geto.core.model
+package com.android.geto.core.domain.model
 
 enum class AddAppSettingResult {
     SUCCESS,
diff --git a/core/model/src/main/kotlin/com/android/geto/core/model/AppSetting.kt b/core/domain/src/main/kotlin/com/android/geto/core/domain/model/AppSetting.kt
similarity index 95%
rename from core/model/src/main/kotlin/com/android/geto/core/model/AppSetting.kt
rename to core/domain/src/main/kotlin/com/android/geto/core/domain/model/AppSetting.kt
index db33b1dcd..6c0a58f23 100644
--- a/core/model/src/main/kotlin/com/android/geto/core/model/AppSetting.kt
+++ b/core/domain/src/main/kotlin/com/android/geto/core/domain/model/AppSetting.kt
@@ -15,7 +15,7 @@
  *   limitations under the License.
  *
  */
-package com.android.geto.core.model
+package com.android.geto.core.domain.model
 
 data class AppSetting(
     val id: Int? = null,
diff --git a/core/model/src/main/kotlin/com/android/geto/core/model/AppSettingTemplate.kt b/core/domain/src/main/kotlin/com/android/geto/core/domain/model/AppSettingTemplate.kt
similarity index 94%
rename from core/model/src/main/kotlin/com/android/geto/core/model/AppSettingTemplate.kt
rename to core/domain/src/main/kotlin/com/android/geto/core/domain/model/AppSettingTemplate.kt
index 728942824..2f1b246b4 100644
--- a/core/model/src/main/kotlin/com/android/geto/core/model/AppSettingTemplate.kt
+++ b/core/domain/src/main/kotlin/com/android/geto/core/domain/model/AppSettingTemplate.kt
@@ -15,7 +15,7 @@
  *   limitations under the License.
  *
  */
-package com.android.geto.core.model
+package com.android.geto.core.domain.model
 
 data class AppSettingTemplate(
     val settingType: SettingType,
diff --git a/core/model/src/main/kotlin/com/android/geto/core/model/AppSettingsResult.kt b/core/domain/src/main/kotlin/com/android/geto/core/domain/model/AppSettingsResult.kt
similarity index 94%
rename from core/model/src/main/kotlin/com/android/geto/core/model/AppSettingsResult.kt
rename to core/domain/src/main/kotlin/com/android/geto/core/domain/model/AppSettingsResult.kt
index c0784db1d..7d0182bba 100644
--- a/core/model/src/main/kotlin/com/android/geto/core/model/AppSettingsResult.kt
+++ b/core/domain/src/main/kotlin/com/android/geto/core/domain/model/AppSettingsResult.kt
@@ -15,7 +15,7 @@
  *   limitations under the License.
  *
  */
-package com.android.geto.core.model
+package com.android.geto.core.domain.model
 
 enum class AppSettingsResult {
     Success,
diff --git a/core/model/src/main/kotlin/com/android/geto/core/model/DarkThemeConfig.kt b/core/domain/src/main/kotlin/com/android/geto/core/domain/model/DarkThemeConfig.kt
similarity index 94%
rename from core/model/src/main/kotlin/com/android/geto/core/model/DarkThemeConfig.kt
rename to core/domain/src/main/kotlin/com/android/geto/core/domain/model/DarkThemeConfig.kt
index b58e8d2af..884fa1ef9 100644
--- a/core/model/src/main/kotlin/com/android/geto/core/model/DarkThemeConfig.kt
+++ b/core/domain/src/main/kotlin/com/android/geto/core/domain/model/DarkThemeConfig.kt
@@ -15,7 +15,7 @@
  *   limitations under the License.
  *
  */
-package com.android.geto.core.model
+package com.android.geto.core.domain.model
 
 enum class DarkThemeConfig(val title: String) {
     FOLLOW_SYSTEM("Follow System"),
diff --git a/core/model/src/main/kotlin/com/android/geto/core/model/ForegroundServiceAppSettingsResult.kt b/core/domain/src/main/kotlin/com/android/geto/core/domain/model/ForegroundServiceAppSettingsResult.kt
similarity index 97%
rename from core/model/src/main/kotlin/com/android/geto/core/model/ForegroundServiceAppSettingsResult.kt
rename to core/domain/src/main/kotlin/com/android/geto/core/domain/model/ForegroundServiceAppSettingsResult.kt
index 7cdd216c3..2a7ce5e85 100644
--- a/core/model/src/main/kotlin/com/android/geto/core/model/ForegroundServiceAppSettingsResult.kt
+++ b/core/domain/src/main/kotlin/com/android/geto/core/domain/model/ForegroundServiceAppSettingsResult.kt
@@ -15,7 +15,7 @@
  *   limitations under the License.
  *
  */
-package com.android.geto.core.model
+package com.android.geto.core.domain.model
 
 sealed interface ForegroundServiceAppSettingsResult {
     data class Success(val packageName: String) : ForegroundServiceAppSettingsResult
diff --git a/core/model/src/main/kotlin/com/android/geto/core/model/GetoApplicationInfo.kt b/core/domain/src/main/kotlin/com/android/geto/core/domain/model/GetoApplicationInfo.kt
similarity index 94%
rename from core/model/src/main/kotlin/com/android/geto/core/model/GetoApplicationInfo.kt
rename to core/domain/src/main/kotlin/com/android/geto/core/domain/model/GetoApplicationInfo.kt
index 7949e8b20..d16e932c8 100644
--- a/core/model/src/main/kotlin/com/android/geto/core/model/GetoApplicationInfo.kt
+++ b/core/domain/src/main/kotlin/com/android/geto/core/domain/model/GetoApplicationInfo.kt
@@ -15,7 +15,7 @@
  *   limitations under the License.
  *
  */
-package com.android.geto.core.model
+package com.android.geto.core.domain.model
 
 import android.graphics.Bitmap
 
diff --git a/core/model/src/main/kotlin/com/android/geto/core/model/GetoShortcutInfoCompat.kt b/core/domain/src/main/kotlin/com/android/geto/core/domain/model/GetoShortcutInfoCompat.kt
similarity index 94%
rename from core/model/src/main/kotlin/com/android/geto/core/model/GetoShortcutInfoCompat.kt
rename to core/domain/src/main/kotlin/com/android/geto/core/domain/model/GetoShortcutInfoCompat.kt
index fe43c327a..4b9e62295 100644
--- a/core/model/src/main/kotlin/com/android/geto/core/model/GetoShortcutInfoCompat.kt
+++ b/core/domain/src/main/kotlin/com/android/geto/core/domain/model/GetoShortcutInfoCompat.kt
@@ -15,7 +15,7 @@
  *   limitations under the License.
  *
  */
-package com.android.geto.core.model
+package com.android.geto.core.domain.model
 
 import android.graphics.drawable.Drawable
 
diff --git a/core/model/src/main/kotlin/com/android/geto/core/model/GetoUsageEvent.kt b/core/domain/src/main/kotlin/com/android/geto/core/domain/model/GetoUsageEvent.kt
similarity index 94%
rename from core/model/src/main/kotlin/com/android/geto/core/model/GetoUsageEvent.kt
rename to core/domain/src/main/kotlin/com/android/geto/core/domain/model/GetoUsageEvent.kt
index 5f54a06dd..5556c7b9a 100644
--- a/core/model/src/main/kotlin/com/android/geto/core/model/GetoUsageEvent.kt
+++ b/core/domain/src/main/kotlin/com/android/geto/core/domain/model/GetoUsageEvent.kt
@@ -15,7 +15,7 @@
  *   limitations under the License.
  *
  */
-package com.android.geto.core.model
+package com.android.geto.core.domain.model
 
 data class GetoUsageEvent(val packageName: String, val getoLifeCycle: GetoLifeCycle)
 
diff --git a/core/model/src/main/kotlin/com/android/geto/core/model/RequestPinShortcutResult.kt b/core/domain/src/main/kotlin/com/android/geto/core/domain/model/RequestPinShortcutResult.kt
similarity index 94%
rename from core/model/src/main/kotlin/com/android/geto/core/model/RequestPinShortcutResult.kt
rename to core/domain/src/main/kotlin/com/android/geto/core/domain/model/RequestPinShortcutResult.kt
index dc0a782c2..901a743d3 100644
--- a/core/model/src/main/kotlin/com/android/geto/core/model/RequestPinShortcutResult.kt
+++ b/core/domain/src/main/kotlin/com/android/geto/core/domain/model/RequestPinShortcutResult.kt
@@ -15,7 +15,7 @@
  *   limitations under the License.
  *
  */
-package com.android.geto.core.model
+package com.android.geto.core.domain.model
 
 enum class RequestPinShortcutResult {
     UnsupportedLauncher,
diff --git a/core/model/src/main/kotlin/com/android/geto/core/model/SecureSetting.kt b/core/domain/src/main/kotlin/com/android/geto/core/domain/model/SecureSetting.kt
similarity index 94%
rename from core/model/src/main/kotlin/com/android/geto/core/model/SecureSetting.kt
rename to core/domain/src/main/kotlin/com/android/geto/core/domain/model/SecureSetting.kt
index 1dfcf6c51..a0f053162 100644
--- a/core/model/src/main/kotlin/com/android/geto/core/model/SecureSetting.kt
+++ b/core/domain/src/main/kotlin/com/android/geto/core/domain/model/SecureSetting.kt
@@ -15,7 +15,7 @@
  *   limitations under the License.
  *
  */
-package com.android.geto.core.model
+package com.android.geto.core.domain.model
 
 data class SecureSetting(
     val settingType: SettingType,
diff --git a/core/model/src/main/kotlin/com/android/geto/core/model/ThemeBrand.kt b/core/domain/src/main/kotlin/com/android/geto/core/domain/model/ThemeBrand.kt
similarity index 94%
rename from core/model/src/main/kotlin/com/android/geto/core/model/ThemeBrand.kt
rename to core/domain/src/main/kotlin/com/android/geto/core/domain/model/ThemeBrand.kt
index d40b94e89..afaaa57b6 100644
--- a/core/model/src/main/kotlin/com/android/geto/core/model/ThemeBrand.kt
+++ b/core/domain/src/main/kotlin/com/android/geto/core/domain/model/ThemeBrand.kt
@@ -15,7 +15,7 @@
  *   limitations under the License.
  *
  */
-package com.android.geto.core.model
+package com.android.geto.core.domain.model
 
 enum class ThemeBrand(val title: String) {
     GREEN("Green"),
diff --git a/core/model/src/main/kotlin/com/android/geto/core/model/UserData.kt b/core/domain/src/main/kotlin/com/android/geto/core/domain/model/UserData.kt
similarity index 94%
rename from core/model/src/main/kotlin/com/android/geto/core/model/UserData.kt
rename to core/domain/src/main/kotlin/com/android/geto/core/domain/model/UserData.kt
index df176c168..e7f1de5be 100644
--- a/core/model/src/main/kotlin/com/android/geto/core/model/UserData.kt
+++ b/core/domain/src/main/kotlin/com/android/geto/core/domain/model/UserData.kt
@@ -15,7 +15,7 @@
  *   limitations under the License.
  *
  */
-package com.android.geto.core.model
+package com.android.geto.core.domain.model
 
 data class UserData(
     val themeBrand: ThemeBrand,
diff --git a/core/data/src/main/kotlin/com/android/geto/core/data/repository/AppSettingsRepository.kt b/core/domain/src/main/kotlin/com/android/geto/core/domain/repository/AppSettingsRepository.kt
similarity index 90%
rename from core/data/src/main/kotlin/com/android/geto/core/data/repository/AppSettingsRepository.kt
rename to core/domain/src/main/kotlin/com/android/geto/core/domain/repository/AppSettingsRepository.kt
index 54564ee38..545c5371b 100644
--- a/core/data/src/main/kotlin/com/android/geto/core/data/repository/AppSettingsRepository.kt
+++ b/core/domain/src/main/kotlin/com/android/geto/core/domain/repository/AppSettingsRepository.kt
@@ -15,9 +15,9 @@
  *   limitations under the License.
  *
  */
-package com.android.geto.core.data.repository
+package com.android.geto.core.domain.repository
 
-import com.android.geto.core.model.AppSetting
+import com.android.geto.core.domain.model.AppSetting
 import kotlinx.coroutines.flow.Flow
 
 interface AppSettingsRepository {
diff --git a/core/data/src/main/kotlin/com/android/geto/core/data/repository/PackageRepository.kt b/core/domain/src/main/kotlin/com/android/geto/core/domain/repository/PackageRepository.kt
similarity index 88%
rename from core/data/src/main/kotlin/com/android/geto/core/data/repository/PackageRepository.kt
rename to core/domain/src/main/kotlin/com/android/geto/core/domain/repository/PackageRepository.kt
index 2f57829a2..055c7a99b 100644
--- a/core/data/src/main/kotlin/com/android/geto/core/data/repository/PackageRepository.kt
+++ b/core/domain/src/main/kotlin/com/android/geto/core/domain/repository/PackageRepository.kt
@@ -15,10 +15,10 @@
  *   limitations under the License.
  *
  */
-package com.android.geto.core.data.repository
+package com.android.geto.core.domain.repository
 
 import android.graphics.drawable.Drawable
-import com.android.geto.core.model.GetoApplicationInfo
+import com.android.geto.core.domain.model.GetoApplicationInfo
 
 interface PackageRepository {
     suspend fun queryIntentActivities(): List<GetoApplicationInfo>
diff --git a/core/data/src/main/kotlin/com/android/geto/core/data/repository/SecureSettingsRepository.kt b/core/domain/src/main/kotlin/com/android/geto/core/domain/repository/SecureSettingsRepository.kt
similarity index 81%
rename from core/data/src/main/kotlin/com/android/geto/core/data/repository/SecureSettingsRepository.kt
rename to core/domain/src/main/kotlin/com/android/geto/core/domain/repository/SecureSettingsRepository.kt
index e6a70d663..f19395558 100644
--- a/core/data/src/main/kotlin/com/android/geto/core/data/repository/SecureSettingsRepository.kt
+++ b/core/domain/src/main/kotlin/com/android/geto/core/domain/repository/SecureSettingsRepository.kt
@@ -15,11 +15,11 @@
  *   limitations under the License.
  *
  */
-package com.android.geto.core.data.repository
+package com.android.geto.core.domain.repository
 
-import com.android.geto.core.model.AppSetting
-import com.android.geto.core.model.SecureSetting
-import com.android.geto.core.model.SettingType
+import com.android.geto.core.domain.model.AppSetting
+import com.android.geto.core.domain.model.SecureSetting
+import com.android.geto.core.domain.model.SettingType
 
 interface SecureSettingsRepository {
 
diff --git a/core/data/src/main/kotlin/com/android/geto/core/data/repository/ShortcutRepository.kt b/core/domain/src/main/kotlin/com/android/geto/core/domain/repository/ShortcutRepository.kt
similarity index 91%
rename from core/data/src/main/kotlin/com/android/geto/core/data/repository/ShortcutRepository.kt
rename to core/domain/src/main/kotlin/com/android/geto/core/domain/repository/ShortcutRepository.kt
index ab5adfebb..be47440a7 100644
--- a/core/data/src/main/kotlin/com/android/geto/core/data/repository/ShortcutRepository.kt
+++ b/core/domain/src/main/kotlin/com/android/geto/core/domain/repository/ShortcutRepository.kt
@@ -15,9 +15,9 @@
  *   limitations under the License.
  *
  */
-package com.android.geto.core.data.repository
+package com.android.geto.core.domain.repository
 
-import com.android.geto.core.model.GetoShortcutInfoCompat
+import com.android.geto.core.domain.model.GetoShortcutInfoCompat
 
 interface ShortcutRepository {
 
diff --git a/core/data/src/main/kotlin/com/android/geto/core/data/repository/UserDataRepository.kt b/core/domain/src/main/kotlin/com/android/geto/core/domain/repository/UserDataRepository.kt
similarity index 82%
rename from core/data/src/main/kotlin/com/android/geto/core/data/repository/UserDataRepository.kt
rename to core/domain/src/main/kotlin/com/android/geto/core/domain/repository/UserDataRepository.kt
index c7253b658..68094f6a1 100644
--- a/core/data/src/main/kotlin/com/android/geto/core/data/repository/UserDataRepository.kt
+++ b/core/domain/src/main/kotlin/com/android/geto/core/domain/repository/UserDataRepository.kt
@@ -15,11 +15,11 @@
  *   limitations under the License.
  *
  */
-package com.android.geto.core.data.repository
+package com.android.geto.core.domain.repository
 
-import com.android.geto.core.model.DarkThemeConfig
-import com.android.geto.core.model.ThemeBrand
-import com.android.geto.core.model.UserData
+import com.android.geto.core.domain.model.DarkThemeConfig
+import com.android.geto.core.domain.model.ThemeBrand
+import com.android.geto.core.domain.model.UserData
 import kotlinx.coroutines.flow.Flow
 
 interface UserDataRepository {
diff --git a/core/domain/src/main/kotlin/com/android/geto/core/domain/AddAppSettingUseCase.kt b/core/domain/src/main/kotlin/com/android/geto/core/domain/usecase/AddAppSettingUseCase.kt
similarity index 77%
rename from core/domain/src/main/kotlin/com/android/geto/core/domain/AddAppSettingUseCase.kt
rename to core/domain/src/main/kotlin/com/android/geto/core/domain/usecase/AddAppSettingUseCase.kt
index 1e56fcd51..e73786fc2 100644
--- a/core/domain/src/main/kotlin/com/android/geto/core/domain/AddAppSettingUseCase.kt
+++ b/core/domain/src/main/kotlin/com/android/geto/core/domain/usecase/AddAppSettingUseCase.kt
@@ -15,13 +15,13 @@
  *   limitations under the License.
  *
  */
-package com.android.geto.core.domain
+package com.android.geto.core.domain.usecase
 
-import com.android.geto.core.data.repository.AppSettingsRepository
-import com.android.geto.core.model.AddAppSettingResult
-import com.android.geto.core.model.AddAppSettingResult.FAILED
-import com.android.geto.core.model.AddAppSettingResult.SUCCESS
-import com.android.geto.core.model.AppSetting
+import com.android.geto.core.domain.model.AddAppSettingResult
+import com.android.geto.core.domain.model.AddAppSettingResult.FAILED
+import com.android.geto.core.domain.model.AddAppSettingResult.SUCCESS
+import com.android.geto.core.domain.model.AppSetting
+import com.android.geto.core.domain.repository.AppSettingsRepository
 import kotlinx.coroutines.flow.first
 import javax.inject.Inject
 
diff --git a/core/domain/src/main/kotlin/com/android/geto/core/domain/ApplyAppSettingsUseCase.kt b/core/domain/src/main/kotlin/com/android/geto/core/domain/usecase/ApplyAppSettingsUseCase.kt
similarity index 69%
rename from core/domain/src/main/kotlin/com/android/geto/core/domain/ApplyAppSettingsUseCase.kt
rename to core/domain/src/main/kotlin/com/android/geto/core/domain/usecase/ApplyAppSettingsUseCase.kt
index 16cb4ea8f..920d4d3a5 100644
--- a/core/domain/src/main/kotlin/com/android/geto/core/domain/ApplyAppSettingsUseCase.kt
+++ b/core/domain/src/main/kotlin/com/android/geto/core/domain/usecase/ApplyAppSettingsUseCase.kt
@@ -15,17 +15,17 @@
  *   limitations under the License.
  *
  */
-package com.android.geto.core.domain
+package com.android.geto.core.domain.usecase
 
-import com.android.geto.core.data.repository.AppSettingsRepository
-import com.android.geto.core.data.repository.SecureSettingsRepository
-import com.android.geto.core.model.AppSettingsResult
-import com.android.geto.core.model.AppSettingsResult.DisabledAppSettings
-import com.android.geto.core.model.AppSettingsResult.EmptyAppSettings
-import com.android.geto.core.model.AppSettingsResult.Failure
-import com.android.geto.core.model.AppSettingsResult.InvalidValues
-import com.android.geto.core.model.AppSettingsResult.NoPermission
-import com.android.geto.core.model.AppSettingsResult.Success
+import com.android.geto.core.domain.model.AppSettingsResult
+import com.android.geto.core.domain.model.AppSettingsResult.DisabledAppSettings
+import com.android.geto.core.domain.model.AppSettingsResult.EmptyAppSettings
+import com.android.geto.core.domain.model.AppSettingsResult.Failure
+import com.android.geto.core.domain.model.AppSettingsResult.InvalidValues
+import com.android.geto.core.domain.model.AppSettingsResult.NoPermission
+import com.android.geto.core.domain.model.AppSettingsResult.Success
+import com.android.geto.core.domain.repository.AppSettingsRepository
+import com.android.geto.core.domain.repository.SecureSettingsRepository
 import kotlinx.coroutines.flow.first
 import javax.inject.Inject
 
diff --git a/core/domain/src/main/kotlin/com/android/geto/core/domain/AutoLaunchUseCase.kt b/core/domain/src/main/kotlin/com/android/geto/core/domain/usecase/AutoLaunchUseCase.kt
similarity index 73%
rename from core/domain/src/main/kotlin/com/android/geto/core/domain/AutoLaunchUseCase.kt
rename to core/domain/src/main/kotlin/com/android/geto/core/domain/usecase/AutoLaunchUseCase.kt
index 5450f1bca..878cb3f5e 100644
--- a/core/domain/src/main/kotlin/com/android/geto/core/domain/AutoLaunchUseCase.kt
+++ b/core/domain/src/main/kotlin/com/android/geto/core/domain/usecase/AutoLaunchUseCase.kt
@@ -15,16 +15,16 @@
  *   limitations under the License.
  *
  */
-package com.android.geto.core.domain
+package com.android.geto.core.domain.usecase
 
-import com.android.geto.core.data.repository.AppSettingsRepository
-import com.android.geto.core.data.repository.SecureSettingsRepository
-import com.android.geto.core.data.repository.UserDataRepository
-import com.android.geto.core.model.AppSettingsResult
-import com.android.geto.core.model.AppSettingsResult.Failure
-import com.android.geto.core.model.AppSettingsResult.InvalidValues
-import com.android.geto.core.model.AppSettingsResult.NoPermission
-import com.android.geto.core.model.AppSettingsResult.Success
+import com.android.geto.core.domain.model.AppSettingsResult
+import com.android.geto.core.domain.model.AppSettingsResult.Failure
+import com.android.geto.core.domain.model.AppSettingsResult.InvalidValues
+import com.android.geto.core.domain.model.AppSettingsResult.NoPermission
+import com.android.geto.core.domain.model.AppSettingsResult.Success
+import com.android.geto.core.domain.repository.AppSettingsRepository
+import com.android.geto.core.domain.repository.SecureSettingsRepository
+import com.android.geto.core.domain.repository.UserDataRepository
 import kotlinx.coroutines.flow.first
 import javax.inject.Inject
 
diff --git a/core/domain/src/main/kotlin/com/android/geto/core/domain/CleanAppSettingsUseCase.kt b/core/domain/src/main/kotlin/com/android/geto/core/domain/usecase/CleanAppSettingsUseCase.kt
similarity index 88%
rename from core/domain/src/main/kotlin/com/android/geto/core/domain/CleanAppSettingsUseCase.kt
rename to core/domain/src/main/kotlin/com/android/geto/core/domain/usecase/CleanAppSettingsUseCase.kt
index 4820e5bce..87863871e 100644
--- a/core/domain/src/main/kotlin/com/android/geto/core/domain/CleanAppSettingsUseCase.kt
+++ b/core/domain/src/main/kotlin/com/android/geto/core/domain/usecase/CleanAppSettingsUseCase.kt
@@ -15,10 +15,10 @@
  *   limitations under the License.
  *
  */
-package com.android.geto.core.domain
+package com.android.geto.core.domain.usecase
 
-import com.android.geto.core.data.repository.AppSettingsRepository
-import com.android.geto.core.data.repository.PackageRepository
+import com.android.geto.core.domain.repository.AppSettingsRepository
+import com.android.geto.core.domain.repository.PackageRepository
 import kotlinx.coroutines.flow.first
 import javax.inject.Inject
 
diff --git a/core/domain/src/main/kotlin/com/android/geto/core/domain/ForegroundServiceAppSettingsUseCase.kt b/core/domain/src/main/kotlin/com/android/geto/core/domain/usecase/ForegroundServiceAppSettingsUseCase.kt
similarity index 84%
rename from core/domain/src/main/kotlin/com/android/geto/core/domain/ForegroundServiceAppSettingsUseCase.kt
rename to core/domain/src/main/kotlin/com/android/geto/core/domain/usecase/ForegroundServiceAppSettingsUseCase.kt
index b10e654e8..a7fea18ee 100644
--- a/core/domain/src/main/kotlin/com/android/geto/core/domain/ForegroundServiceAppSettingsUseCase.kt
+++ b/core/domain/src/main/kotlin/com/android/geto/core/domain/usecase/ForegroundServiceAppSettingsUseCase.kt
@@ -15,13 +15,13 @@
  *   limitations under the License.
  *
  */
-package com.android.geto.core.domain
+package com.android.geto.core.domain.usecase
 
-import com.android.geto.core.model.AppSettingsResult
-import com.android.geto.core.model.ForegroundServiceAppSettingsResult
-import com.android.geto.core.model.GetoLifeCycle
-import com.android.geto.core.model.toForegroundServiceAppSettingsResult
-import com.android.geto.framework.usagestatsmanager.UsageStatsManagerWrapper
+import com.android.geto.core.domain.framework.UsageStatsManagerWrapper
+import com.android.geto.core.domain.model.AppSettingsResult
+import com.android.geto.core.domain.model.ForegroundServiceAppSettingsResult
+import com.android.geto.core.domain.model.GetoLifeCycle
+import com.android.geto.core.domain.model.toForegroundServiceAppSettingsResult
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import javax.inject.Inject
diff --git a/core/domain/src/main/kotlin/com/android/geto/core/domain/RequestPinShortcutUseCase.kt b/core/domain/src/main/kotlin/com/android/geto/core/domain/usecase/RequestPinShortcutUseCase.kt
similarity index 80%
rename from core/domain/src/main/kotlin/com/android/geto/core/domain/RequestPinShortcutUseCase.kt
rename to core/domain/src/main/kotlin/com/android/geto/core/domain/usecase/RequestPinShortcutUseCase.kt
index 658919111..0d92ecdb9 100644
--- a/core/domain/src/main/kotlin/com/android/geto/core/domain/RequestPinShortcutUseCase.kt
+++ b/core/domain/src/main/kotlin/com/android/geto/core/domain/usecase/RequestPinShortcutUseCase.kt
@@ -15,16 +15,16 @@
  *   limitations under the License.
  *
  */
-package com.android.geto.core.domain
+package com.android.geto.core.domain.usecase
 
-import com.android.geto.core.data.repository.ShortcutRepository
-import com.android.geto.core.model.GetoShortcutInfoCompat
-import com.android.geto.core.model.RequestPinShortcutResult
-import com.android.geto.core.model.RequestPinShortcutResult.SupportedLauncher
-import com.android.geto.core.model.RequestPinShortcutResult.UnsupportedLauncher
-import com.android.geto.core.model.RequestPinShortcutResult.UpdateFailure
-import com.android.geto.core.model.RequestPinShortcutResult.UpdateImmutableShortcuts
-import com.android.geto.core.model.RequestPinShortcutResult.UpdateSuccess
+import com.android.geto.core.domain.model.GetoShortcutInfoCompat
+import com.android.geto.core.domain.model.RequestPinShortcutResult
+import com.android.geto.core.domain.model.RequestPinShortcutResult.SupportedLauncher
+import com.android.geto.core.domain.model.RequestPinShortcutResult.UnsupportedLauncher
+import com.android.geto.core.domain.model.RequestPinShortcutResult.UpdateFailure
+import com.android.geto.core.domain.model.RequestPinShortcutResult.UpdateImmutableShortcuts
+import com.android.geto.core.domain.model.RequestPinShortcutResult.UpdateSuccess
+import com.android.geto.core.domain.repository.ShortcutRepository
 import javax.inject.Inject
 
 class RequestPinShortcutUseCase @Inject constructor(
diff --git a/core/domain/src/main/kotlin/com/android/geto/core/domain/RevertAppSettingsUseCase.kt b/core/domain/src/main/kotlin/com/android/geto/core/domain/usecase/RevertAppSettingsUseCase.kt
similarity index 68%
rename from core/domain/src/main/kotlin/com/android/geto/core/domain/RevertAppSettingsUseCase.kt
rename to core/domain/src/main/kotlin/com/android/geto/core/domain/usecase/RevertAppSettingsUseCase.kt
index 668278ed1..9e740dd52 100644
--- a/core/domain/src/main/kotlin/com/android/geto/core/domain/RevertAppSettingsUseCase.kt
+++ b/core/domain/src/main/kotlin/com/android/geto/core/domain/usecase/RevertAppSettingsUseCase.kt
@@ -15,17 +15,17 @@
  *   limitations under the License.
  *
  */
-package com.android.geto.core.domain
+package com.android.geto.core.domain.usecase
 
-import com.android.geto.core.data.repository.AppSettingsRepository
-import com.android.geto.core.data.repository.SecureSettingsRepository
-import com.android.geto.core.model.AppSettingsResult
-import com.android.geto.core.model.AppSettingsResult.DisabledAppSettings
-import com.android.geto.core.model.AppSettingsResult.EmptyAppSettings
-import com.android.geto.core.model.AppSettingsResult.Failure
-import com.android.geto.core.model.AppSettingsResult.InvalidValues
-import com.android.geto.core.model.AppSettingsResult.NoPermission
-import com.android.geto.core.model.AppSettingsResult.Success
+import com.android.geto.core.domain.model.AppSettingsResult
+import com.android.geto.core.domain.model.AppSettingsResult.DisabledAppSettings
+import com.android.geto.core.domain.model.AppSettingsResult.EmptyAppSettings
+import com.android.geto.core.domain.model.AppSettingsResult.Failure
+import com.android.geto.core.domain.model.AppSettingsResult.InvalidValues
+import com.android.geto.core.domain.model.AppSettingsResult.NoPermission
+import com.android.geto.core.domain.model.AppSettingsResult.Success
+import com.android.geto.core.domain.repository.AppSettingsRepository
+import com.android.geto.core.domain.repository.SecureSettingsRepository
 import kotlinx.coroutines.flow.first
 import javax.inject.Inject
 
diff --git a/core/domain/src/main/kotlin/com/android/geto/core/domain/usecase/UpdateUsageStatsForegroundServiceUseCase.kt b/core/domain/src/main/kotlin/com/android/geto/core/domain/usecase/UpdateUsageStatsForegroundServiceUseCase.kt
new file mode 100644
index 000000000..963345f5e
--- /dev/null
+++ b/core/domain/src/main/kotlin/com/android/geto/core/domain/usecase/UpdateUsageStatsForegroundServiceUseCase.kt
@@ -0,0 +1,43 @@
+/*
+ *
+ *   Copyright 2023 Einstein Blanco
+ *
+ *   Licensed under the GNU General Public License v3.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       https://www.gnu.org/licenses/gpl-3.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *
+ */
+package com.android.geto.core.domain.usecase
+
+import com.android.geto.core.domain.foregroundservice.UsageStatsForegroundServiceManager
+import com.android.geto.core.domain.framework.UsageStatsManagerWrapper
+import com.android.geto.core.domain.model.UpdateUsageStatsForegroundServiceResult
+import javax.inject.Inject
+
+class UpdateUsageStatsForegroundServiceUseCase @Inject constructor(
+    private val usageStatsForegroundServiceManager: UsageStatsForegroundServiceManager,
+    private val usageStatsManagerWrapper: UsageStatsManagerWrapper,
+) {
+    operator fun invoke(): UpdateUsageStatsForegroundServiceResult {
+        if (usageStatsManagerWrapper.isUsageStatsPermissionGranted().not()) {
+            usageStatsManagerWrapper.requestUsageStatsPermission()
+            return UpdateUsageStatsForegroundServiceResult.RequestPermission
+        }
+
+        return if (usageStatsForegroundServiceManager.isActive) {
+            usageStatsForegroundServiceManager.stopForegroundService()
+            UpdateUsageStatsForegroundServiceResult.Stop
+        } else {
+            usageStatsForegroundServiceManager.startForegroundService()
+            UpdateUsageStatsForegroundServiceResult.Start
+        }
+    }
+}
diff --git a/core/domain/src/test/kotlin/com/android/geto/core/domain/AddAppSettingUseCaseTest.kt b/core/domain/src/test/kotlin/com/android/geto/core/domain/usecase/AddAppSettingUseCaseTest.kt
similarity index 93%
rename from core/domain/src/test/kotlin/com/android/geto/core/domain/AddAppSettingUseCaseTest.kt
rename to core/domain/src/test/kotlin/com/android/geto/core/domain/usecase/AddAppSettingUseCaseTest.kt
index 0eb29d7e6..3645ae20c 100644
--- a/core/domain/src/test/kotlin/com/android/geto/core/domain/AddAppSettingUseCaseTest.kt
+++ b/core/domain/src/test/kotlin/com/android/geto/core/domain/usecase/AddAppSettingUseCaseTest.kt
@@ -15,11 +15,11 @@
  *   limitations under the License.
  *
  */
-package com.android.geto.core.domain
+package com.android.geto.core.domain.usecase
 
-import com.android.geto.core.model.AddAppSettingResult
-import com.android.geto.core.model.AppSetting
-import com.android.geto.core.model.SettingType
+import com.android.geto.core.domain.model.AddAppSettingResult
+import com.android.geto.core.domain.model.AppSetting
+import com.android.geto.core.domain.model.SettingType
 import com.android.geto.core.testing.repository.TestAppSettingsRepository
 import kotlinx.coroutines.test.runTest
 import org.junit.Before
diff --git a/core/domain/src/test/kotlin/com/android/geto/core/domain/ApplyAppSettingsUseCaseTest.kt b/core/domain/src/test/kotlin/com/android/geto/core/domain/usecase/ApplyAppSettingsUseCaseTest.kt
similarity index 89%
rename from core/domain/src/test/kotlin/com/android/geto/core/domain/ApplyAppSettingsUseCaseTest.kt
rename to core/domain/src/test/kotlin/com/android/geto/core/domain/usecase/ApplyAppSettingsUseCaseTest.kt
index 88006dae0..9a7300f16 100644
--- a/core/domain/src/test/kotlin/com/android/geto/core/domain/ApplyAppSettingsUseCaseTest.kt
+++ b/core/domain/src/test/kotlin/com/android/geto/core/domain/usecase/ApplyAppSettingsUseCaseTest.kt
@@ -15,16 +15,16 @@
  *   limitations under the License.
  *
  */
-package com.android.geto.core.domain
-
-import com.android.geto.core.model.AppSetting
-import com.android.geto.core.model.AppSettingsResult.DisabledAppSettings
-import com.android.geto.core.model.AppSettingsResult.EmptyAppSettings
-import com.android.geto.core.model.AppSettingsResult.InvalidValues
-import com.android.geto.core.model.AppSettingsResult.NoPermission
-import com.android.geto.core.model.AppSettingsResult.Success
-import com.android.geto.core.model.GetoApplicationInfo
-import com.android.geto.core.model.SettingType
+package com.android.geto.core.domain.usecase
+
+import com.android.geto.core.domain.model.AppSetting
+import com.android.geto.core.domain.model.AppSettingsResult.DisabledAppSettings
+import com.android.geto.core.domain.model.AppSettingsResult.EmptyAppSettings
+import com.android.geto.core.domain.model.AppSettingsResult.InvalidValues
+import com.android.geto.core.domain.model.AppSettingsResult.NoPermission
+import com.android.geto.core.domain.model.AppSettingsResult.Success
+import com.android.geto.core.domain.model.GetoApplicationInfo
+import com.android.geto.core.domain.model.SettingType
 import com.android.geto.core.testing.repository.TestAppSettingsRepository
 import com.android.geto.core.testing.repository.TestPackageRepository
 import com.android.geto.core.testing.repository.TestSecureSettingsRepository
diff --git a/core/domain/src/test/kotlin/com/android/geto/core/domain/AutoLaunchUseCaseTest.kt b/core/domain/src/test/kotlin/com/android/geto/core/domain/usecase/AutoLaunchUseCaseTest.kt
similarity index 92%
rename from core/domain/src/test/kotlin/com/android/geto/core/domain/AutoLaunchUseCaseTest.kt
rename to core/domain/src/test/kotlin/com/android/geto/core/domain/usecase/AutoLaunchUseCaseTest.kt
index bc4e1feb4..b367ef01a 100644
--- a/core/domain/src/test/kotlin/com/android/geto/core/domain/AutoLaunchUseCaseTest.kt
+++ b/core/domain/src/test/kotlin/com/android/geto/core/domain/usecase/AutoLaunchUseCaseTest.kt
@@ -15,18 +15,18 @@
  *   limitations under the License.
  *
  */
-package com.android.geto.core.domain
-
-import com.android.geto.core.model.AppSetting
-import com.android.geto.core.model.AppSettingsResult.Failure
-import com.android.geto.core.model.AppSettingsResult.InvalidValues
-import com.android.geto.core.model.AppSettingsResult.NoPermission
-import com.android.geto.core.model.AppSettingsResult.Success
-import com.android.geto.core.model.DarkThemeConfig
-import com.android.geto.core.model.GetoApplicationInfo
-import com.android.geto.core.model.SettingType
-import com.android.geto.core.model.ThemeBrand
-import com.android.geto.core.model.UserData
+package com.android.geto.core.domain.usecase
+
+import com.android.geto.core.domain.model.AppSetting
+import com.android.geto.core.domain.model.AppSettingsResult.Failure
+import com.android.geto.core.domain.model.AppSettingsResult.InvalidValues
+import com.android.geto.core.domain.model.AppSettingsResult.NoPermission
+import com.android.geto.core.domain.model.AppSettingsResult.Success
+import com.android.geto.core.domain.model.DarkThemeConfig
+import com.android.geto.core.domain.model.GetoApplicationInfo
+import com.android.geto.core.domain.model.SettingType
+import com.android.geto.core.domain.model.ThemeBrand
+import com.android.geto.core.domain.model.UserData
 import com.android.geto.core.testing.repository.TestAppSettingsRepository
 import com.android.geto.core.testing.repository.TestPackageRepository
 import com.android.geto.core.testing.repository.TestSecureSettingsRepository
diff --git a/core/domain/src/test/kotlin/com/android/geto/core/domain/ForegroundServiceAppSettingsUseCaseTest.kt b/core/domain/src/test/kotlin/com/android/geto/core/domain/usecase/ForegroundServiceAppSettingsUseCaseTest.kt
similarity index 92%
rename from core/domain/src/test/kotlin/com/android/geto/core/domain/ForegroundServiceAppSettingsUseCaseTest.kt
rename to core/domain/src/test/kotlin/com/android/geto/core/domain/usecase/ForegroundServiceAppSettingsUseCaseTest.kt
index 9c67cad4f..27070706d 100644
--- a/core/domain/src/test/kotlin/com/android/geto/core/domain/ForegroundServiceAppSettingsUseCaseTest.kt
+++ b/core/domain/src/test/kotlin/com/android/geto/core/domain/usecase/ForegroundServiceAppSettingsUseCaseTest.kt
@@ -15,13 +15,13 @@
  *   limitations under the License.
  *
  */
-package com.android.geto.core.domain
+package com.android.geto.core.domain.usecase
 
-import com.android.geto.core.model.AppSetting
-import com.android.geto.core.model.ForegroundServiceAppSettingsResult
-import com.android.geto.core.model.GetoLifeCycle
-import com.android.geto.core.model.GetoUsageEvent
-import com.android.geto.core.model.SettingType
+import com.android.geto.core.domain.model.AppSetting
+import com.android.geto.core.domain.model.ForegroundServiceAppSettingsResult
+import com.android.geto.core.domain.model.GetoLifeCycle
+import com.android.geto.core.domain.model.GetoUsageEvent
+import com.android.geto.core.domain.model.SettingType
 import com.android.geto.core.testing.framework.FakeUsageStatsManagerWrapper
 import com.android.geto.core.testing.repository.TestAppSettingsRepository
 import com.android.geto.core.testing.repository.TestSecureSettingsRepository
diff --git a/core/domain/src/test/kotlin/com/android/geto/core/domain/RequestPinShortcutUseCaseTest.kt b/core/domain/src/test/kotlin/com/android/geto/core/domain/usecase/RequestPinShortcutUseCaseTest.kt
similarity index 90%
rename from core/domain/src/test/kotlin/com/android/geto/core/domain/RequestPinShortcutUseCaseTest.kt
rename to core/domain/src/test/kotlin/com/android/geto/core/domain/usecase/RequestPinShortcutUseCaseTest.kt
index dc57cbae4..34c10effe 100644
--- a/core/domain/src/test/kotlin/com/android/geto/core/domain/RequestPinShortcutUseCaseTest.kt
+++ b/core/domain/src/test/kotlin/com/android/geto/core/domain/usecase/RequestPinShortcutUseCaseTest.kt
@@ -15,13 +15,13 @@
  *   limitations under the License.
  *
  */
-package com.android.geto.core.domain
+package com.android.geto.core.domain.usecase
 
-import com.android.geto.core.model.GetoShortcutInfoCompat
-import com.android.geto.core.model.RequestPinShortcutResult.SupportedLauncher
-import com.android.geto.core.model.RequestPinShortcutResult.UnsupportedLauncher
-import com.android.geto.core.model.RequestPinShortcutResult.UpdateImmutableShortcuts
-import com.android.geto.core.model.RequestPinShortcutResult.UpdateSuccess
+import com.android.geto.core.domain.model.GetoShortcutInfoCompat
+import com.android.geto.core.domain.model.RequestPinShortcutResult.SupportedLauncher
+import com.android.geto.core.domain.model.RequestPinShortcutResult.UnsupportedLauncher
+import com.android.geto.core.domain.model.RequestPinShortcutResult.UpdateImmutableShortcuts
+import com.android.geto.core.domain.model.RequestPinShortcutResult.UpdateSuccess
 import com.android.geto.core.testing.repository.TestShortcutRepository
 import kotlinx.coroutines.test.runTest
 import org.junit.Before
diff --git a/core/domain/src/test/kotlin/com/android/geto/core/domain/RevertAppSettingsUseCaseTest.kt b/core/domain/src/test/kotlin/com/android/geto/core/domain/usecase/RevertAppSettingsUseCaseTest.kt
similarity index 90%
rename from core/domain/src/test/kotlin/com/android/geto/core/domain/RevertAppSettingsUseCaseTest.kt
rename to core/domain/src/test/kotlin/com/android/geto/core/domain/usecase/RevertAppSettingsUseCaseTest.kt
index 24d9c29cb..c3a0a96b5 100644
--- a/core/domain/src/test/kotlin/com/android/geto/core/domain/RevertAppSettingsUseCaseTest.kt
+++ b/core/domain/src/test/kotlin/com/android/geto/core/domain/usecase/RevertAppSettingsUseCaseTest.kt
@@ -15,15 +15,15 @@
  *   limitations under the License.
  *
  */
-package com.android.geto.core.domain
-
-import com.android.geto.core.model.AppSetting
-import com.android.geto.core.model.AppSettingsResult.DisabledAppSettings
-import com.android.geto.core.model.AppSettingsResult.EmptyAppSettings
-import com.android.geto.core.model.AppSettingsResult.InvalidValues
-import com.android.geto.core.model.AppSettingsResult.NoPermission
-import com.android.geto.core.model.AppSettingsResult.Success
-import com.android.geto.core.model.SettingType
+package com.android.geto.core.domain.usecase
+
+import com.android.geto.core.domain.model.AppSetting
+import com.android.geto.core.domain.model.AppSettingsResult.DisabledAppSettings
+import com.android.geto.core.domain.model.AppSettingsResult.EmptyAppSettings
+import com.android.geto.core.domain.model.AppSettingsResult.InvalidValues
+import com.android.geto.core.domain.model.AppSettingsResult.NoPermission
+import com.android.geto.core.domain.model.AppSettingsResult.Success
+import com.android.geto.core.domain.model.SettingType
 import com.android.geto.core.testing.repository.TestAppSettingsRepository
 import com.android.geto.core.testing.repository.TestSecureSettingsRepository
 import kotlinx.coroutines.test.runTest
diff --git a/core/domain/src/test/kotlin/com/android/geto/core/domain/usecase/UpdateUsageStatsForegroundServiceUseCaseTest.kt b/core/domain/src/test/kotlin/com/android/geto/core/domain/usecase/UpdateUsageStatsForegroundServiceUseCaseTest.kt
new file mode 100644
index 000000000..a9fe1b4c1
--- /dev/null
+++ b/core/domain/src/test/kotlin/com/android/geto/core/domain/usecase/UpdateUsageStatsForegroundServiceUseCaseTest.kt
@@ -0,0 +1,80 @@
+/*
+ *
+ *   Copyright 2023 Einstein Blanco
+ *
+ *   Licensed under the GNU General Public License v3.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       https://www.gnu.org/licenses/gpl-3.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *
+ */
+package com.android.geto.core.domain.usecase
+
+import com.android.geto.core.domain.model.UpdateUsageStatsForegroundServiceResult
+import com.android.geto.core.testing.framework.FakeUsageStatsForegroundServiceManager
+import com.android.geto.core.testing.framework.FakeUsageStatsManagerWrapper
+import kotlinx.coroutines.test.runTest
+import org.junit.Before
+import org.junit.Test
+import kotlin.test.assertEquals
+
+class UpdateUsageStatsForegroundServiceUseCaseTest {
+    private lateinit var usageStatsForegroundServiceManager: FakeUsageStatsForegroundServiceManager
+
+    private lateinit var usageStatsManagerWrapper: FakeUsageStatsManagerWrapper
+
+    private lateinit var updateUsageStatsForegroundServiceUseCase: UpdateUsageStatsForegroundServiceUseCase
+
+    @Before
+    fun setup() {
+        usageStatsForegroundServiceManager = FakeUsageStatsForegroundServiceManager()
+
+        usageStatsManagerWrapper = FakeUsageStatsManagerWrapper()
+
+        updateUsageStatsForegroundServiceUseCase = UpdateUsageStatsForegroundServiceUseCase(
+            usageStatsForegroundServiceManager = usageStatsForegroundServiceManager,
+            usageStatsManagerWrapper = usageStatsManagerWrapper,
+        )
+    }
+
+    @Test
+    fun updateUsageStatsForegroundServiceUseCase_requestPermission() = runTest {
+        usageStatsManagerWrapper.setUsageStatsPermissionGranted(false)
+
+        assertEquals(
+            expected = UpdateUsageStatsForegroundServiceResult.RequestPermission,
+            actual = updateUsageStatsForegroundServiceUseCase(),
+        )
+    }
+
+    @Test
+    fun updateUsageStatsForegroundServiceUseCase_start() = runTest {
+        usageStatsForegroundServiceManager.setActive(false)
+
+        usageStatsManagerWrapper.setUsageStatsPermissionGranted(true)
+
+        assertEquals(
+            expected = UpdateUsageStatsForegroundServiceResult.Start,
+            actual = updateUsageStatsForegroundServiceUseCase(),
+        )
+    }
+
+    @Test
+    fun updateUsageStatsForegroundServiceUseCase_stop() = runTest {
+        usageStatsForegroundServiceManager.setActive(true)
+
+        usageStatsManagerWrapper.setUsageStatsPermissionGranted(true)
+
+        assertEquals(
+            expected = UpdateUsageStatsForegroundServiceResult.Stop,
+            actual = updateUsageStatsForegroundServiceUseCase(),
+        )
+    }
+}
diff --git a/core/model/.gitignore b/core/model/.gitignore
deleted file mode 100644
index 42afabfd2..000000000
--- a/core/model/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
\ No newline at end of file
diff --git a/core/model/consumer-proguard-rules.pro b/core/model/consumer-proguard-rules.pro
deleted file mode 100644
index 7cfcb2ae4..000000000
--- a/core/model/consumer-proguard-rules.pro
+++ /dev/null
@@ -1 +0,0 @@
--keep class com.android.geto.core.model.** { *; }
\ No newline at end of file
diff --git a/core/model/src/main/AndroidManifest.xml b/core/model/src/main/AndroidManifest.xml
deleted file mode 100644
index 57f8df3ef..000000000
--- a/core/model/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~
-  ~   Copyright 2023 Einstein Blanco
-  ~
-  ~   Licensed under the GNU General Public License v3.0 (the "License");
-  ~   you may not use this file except in compliance with the License.
-  ~   You may obtain a copy of the License at
-  ~
-  ~       https://www.gnu.org/licenses/gpl-3.0
-  ~
-  ~   Unless required by applicable law or agreed to in writing, software
-  ~   distributed under the License is distributed on an "AS IS" BASIS,
-  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~   See the License for the specific language governing permissions and
-  ~   limitations under the License.
-  ~
-  -->
-<manifest>
-
-</manifest>
\ No newline at end of file
diff --git a/core/testing/build.gradle.kts b/core/testing/build.gradle.kts
index ce8a55497..780dab5bd 100644
--- a/core/testing/build.gradle.kts
+++ b/core/testing/build.gradle.kts
@@ -29,7 +29,6 @@ android {
 dependencies {
     api(kotlin("test"))
     api(libs.androidx.compose.ui.test)
-    api(projects.core.data)
 
     debugApi(libs.androidx.compose.ui.test.manifest)
 
@@ -38,12 +37,5 @@ dependencies {
     implementation(libs.kotlinx.coroutines.test)
 
     implementation(projects.core.common)
-    implementation(projects.core.model)
-
-    implementation(projects.foregroundService)
-
-    implementation(projects.framework.assetManager)
-    implementation(projects.framework.clipboardManager)
-    implementation(projects.framework.notificationManager)
-    implementation(projects.framework.usageStatsManager)
+    implementation(projects.core.domain)
 }
diff --git a/core/testing/src/main/kotlin/com/android/geto/core/testing/framework/DummyClipboardManagerWrapper.kt b/core/testing/src/main/kotlin/com/android/geto/core/testing/framework/DummyClipboardManagerWrapper.kt
index 4dc0328ee..299da1891 100644
--- a/core/testing/src/main/kotlin/com/android/geto/core/testing/framework/DummyClipboardManagerWrapper.kt
+++ b/core/testing/src/main/kotlin/com/android/geto/core/testing/framework/DummyClipboardManagerWrapper.kt
@@ -17,7 +17,7 @@
  */
 package com.android.geto.core.testing.framework
 
-import com.android.geto.framework.clipboardmanager.ClipboardManagerWrapper
+import com.android.geto.core.domain.framework.ClipboardManagerWrapper
 
 class DummyClipboardManagerWrapper : ClipboardManagerWrapper {
     private var sdkInt = 0
diff --git a/core/testing/src/main/kotlin/com/android/geto/core/testing/framework/DummyNotificationManagerWrapper.kt b/core/testing/src/main/kotlin/com/android/geto/core/testing/framework/DummyNotificationManagerWrapper.kt
index c08453e61..544783e54 100644
--- a/core/testing/src/main/kotlin/com/android/geto/core/testing/framework/DummyNotificationManagerWrapper.kt
+++ b/core/testing/src/main/kotlin/com/android/geto/core/testing/framework/DummyNotificationManagerWrapper.kt
@@ -19,7 +19,7 @@ package com.android.geto.core.testing.framework
 
 import android.app.Notification
 import android.graphics.drawable.Drawable
-import com.android.geto.framework.notificationmanager.NotificationManagerWrapper
+import com.android.geto.core.domain.framework.NotificationManagerWrapper
 
 class DummyNotificationManagerWrapper : NotificationManagerWrapper {
     override fun notify(notificationId: Int, notification: Notification) {
diff --git a/core/testing/src/main/kotlin/com/android/geto/core/testing/framework/FakeAssetManagerWrapper.kt b/core/testing/src/main/kotlin/com/android/geto/core/testing/framework/FakeAssetManagerWrapper.kt
index a7ec99b75..8d4c2436f 100644
--- a/core/testing/src/main/kotlin/com/android/geto/core/testing/framework/FakeAssetManagerWrapper.kt
+++ b/core/testing/src/main/kotlin/com/android/geto/core/testing/framework/FakeAssetManagerWrapper.kt
@@ -17,8 +17,8 @@
  */
 package com.android.geto.core.testing.framework
 
-import com.android.geto.core.model.AppSettingTemplate
-import com.android.geto.framework.assetmanager.AssetManagerWrapper
+import com.android.geto.core.domain.framework.AssetManagerWrapper
+import com.android.geto.core.domain.model.AppSettingTemplate
 
 class FakeAssetManagerWrapper : AssetManagerWrapper {
     private var appSettingTemplates = emptyList<AppSettingTemplate>()
diff --git a/core/testing/src/main/kotlin/com/android/geto/core/testing/framework/FakeForegroundServiceManager.kt b/core/testing/src/main/kotlin/com/android/geto/core/testing/framework/FakeUsageStatsForegroundServiceManager.kt
similarity index 81%
rename from core/testing/src/main/kotlin/com/android/geto/core/testing/framework/FakeForegroundServiceManager.kt
rename to core/testing/src/main/kotlin/com/android/geto/core/testing/framework/FakeUsageStatsForegroundServiceManager.kt
index 4ce32692c..df128887c 100644
--- a/core/testing/src/main/kotlin/com/android/geto/core/testing/framework/FakeForegroundServiceManager.kt
+++ b/core/testing/src/main/kotlin/com/android/geto/core/testing/framework/FakeUsageStatsForegroundServiceManager.kt
@@ -17,11 +17,13 @@
  */
 package com.android.geto.core.testing.framework
 
-import com.android.geto.foregroundservice.ForegroundServiceManager
+import com.android.geto.core.domain.foregroundservice.UsageStatsForegroundServiceManager
 
-class FakeForegroundServiceManager : ForegroundServiceManager {
+class FakeUsageStatsForegroundServiceManager : UsageStatsForegroundServiceManager {
     private var _isActive = false
 
+    override val isActive get() = _isActive
+
     override fun startForegroundService() {
         _isActive = true
     }
@@ -30,10 +32,6 @@ class FakeForegroundServiceManager : ForegroundServiceManager {
         _isActive = false
     }
 
-    override fun isActive(): Boolean {
-        return _isActive
-    }
-
     fun setActive(value: Boolean) {
         _isActive = value
     }
diff --git a/core/testing/src/main/kotlin/com/android/geto/core/testing/framework/FakeUsageStatsManagerWrapper.kt b/core/testing/src/main/kotlin/com/android/geto/core/testing/framework/FakeUsageStatsManagerWrapper.kt
index 094f69aef..2a6f2147b 100644
--- a/core/testing/src/main/kotlin/com/android/geto/core/testing/framework/FakeUsageStatsManagerWrapper.kt
+++ b/core/testing/src/main/kotlin/com/android/geto/core/testing/framework/FakeUsageStatsManagerWrapper.kt
@@ -17,8 +17,8 @@
  */
 package com.android.geto.core.testing.framework
 
-import com.android.geto.core.model.GetoUsageEvent
-import com.android.geto.framework.usagestatsmanager.UsageStatsManagerWrapper
+import com.android.geto.core.domain.framework.UsageStatsManagerWrapper
+import com.android.geto.core.domain.model.GetoUsageEvent
 import kotlinx.coroutines.channels.BufferOverflow
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableSharedFlow
diff --git a/core/testing/src/main/kotlin/com/android/geto/core/testing/repository/TestAppSettingsRepository.kt b/core/testing/src/main/kotlin/com/android/geto/core/testing/repository/TestAppSettingsRepository.kt
index dc6f7351d..cdf147347 100644
--- a/core/testing/src/main/kotlin/com/android/geto/core/testing/repository/TestAppSettingsRepository.kt
+++ b/core/testing/src/main/kotlin/com/android/geto/core/testing/repository/TestAppSettingsRepository.kt
@@ -17,8 +17,8 @@
  */
 package com.android.geto.core.testing.repository
 
-import com.android.geto.core.data.repository.AppSettingsRepository
-import com.android.geto.core.model.AppSetting
+import com.android.geto.core.domain.model.AppSetting
+import com.android.geto.core.domain.repository.AppSettingsRepository
 import kotlinx.coroutines.channels.BufferOverflow
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableSharedFlow
diff --git a/core/testing/src/main/kotlin/com/android/geto/core/testing/repository/TestPackageRepository.kt b/core/testing/src/main/kotlin/com/android/geto/core/testing/repository/TestPackageRepository.kt
index f5ff867cc..9c8b6260f 100644
--- a/core/testing/src/main/kotlin/com/android/geto/core/testing/repository/TestPackageRepository.kt
+++ b/core/testing/src/main/kotlin/com/android/geto/core/testing/repository/TestPackageRepository.kt
@@ -19,8 +19,8 @@ package com.android.geto.core.testing.repository
 
 import android.graphics.drawable.Drawable
 import android.graphics.drawable.ShapeDrawable
-import com.android.geto.core.data.repository.PackageRepository
-import com.android.geto.core.model.GetoApplicationInfo
+import com.android.geto.core.domain.model.GetoApplicationInfo
+import com.android.geto.core.domain.repository.PackageRepository
 
 class TestPackageRepository : PackageRepository {
     private var getoApplicationInfos = listOf<GetoApplicationInfo>()
diff --git a/core/testing/src/main/kotlin/com/android/geto/core/testing/repository/TestSecureSettingsRepository.kt b/core/testing/src/main/kotlin/com/android/geto/core/testing/repository/TestSecureSettingsRepository.kt
index a416e7e54..1ca625d75 100644
--- a/core/testing/src/main/kotlin/com/android/geto/core/testing/repository/TestSecureSettingsRepository.kt
+++ b/core/testing/src/main/kotlin/com/android/geto/core/testing/repository/TestSecureSettingsRepository.kt
@@ -17,10 +17,10 @@
  */
 package com.android.geto.core.testing.repository
 
-import com.android.geto.core.data.repository.SecureSettingsRepository
-import com.android.geto.core.model.AppSetting
-import com.android.geto.core.model.SecureSetting
-import com.android.geto.core.model.SettingType
+import com.android.geto.core.domain.model.AppSetting
+import com.android.geto.core.domain.model.SecureSetting
+import com.android.geto.core.domain.model.SettingType
+import com.android.geto.core.domain.repository.SecureSettingsRepository
 
 class TestSecureSettingsRepository : SecureSettingsRepository {
     private var writeSecureSettings = false
diff --git a/core/testing/src/main/kotlin/com/android/geto/core/testing/repository/TestShortcutRepository.kt b/core/testing/src/main/kotlin/com/android/geto/core/testing/repository/TestShortcutRepository.kt
index e0ded163c..fcb70718f 100644
--- a/core/testing/src/main/kotlin/com/android/geto/core/testing/repository/TestShortcutRepository.kt
+++ b/core/testing/src/main/kotlin/com/android/geto/core/testing/repository/TestShortcutRepository.kt
@@ -17,8 +17,8 @@
  */
 package com.android.geto.core.testing.repository
 
-import com.android.geto.core.data.repository.ShortcutRepository
-import com.android.geto.core.model.GetoShortcutInfoCompat
+import com.android.geto.core.domain.model.GetoShortcutInfoCompat
+import com.android.geto.core.domain.repository.ShortcutRepository
 
 class TestShortcutRepository : ShortcutRepository {
 
diff --git a/core/testing/src/main/kotlin/com/android/geto/core/testing/repository/TestUserDataRepository.kt b/core/testing/src/main/kotlin/com/android/geto/core/testing/repository/TestUserDataRepository.kt
index b31b7cb6c..4524ea13a 100644
--- a/core/testing/src/main/kotlin/com/android/geto/core/testing/repository/TestUserDataRepository.kt
+++ b/core/testing/src/main/kotlin/com/android/geto/core/testing/repository/TestUserDataRepository.kt
@@ -17,10 +17,10 @@
  */
 package com.android.geto.core.testing.repository
 
-import com.android.geto.core.data.repository.UserDataRepository
-import com.android.geto.core.model.DarkThemeConfig
-import com.android.geto.core.model.ThemeBrand
-import com.android.geto.core.model.UserData
+import com.android.geto.core.domain.model.DarkThemeConfig
+import com.android.geto.core.domain.model.ThemeBrand
+import com.android.geto.core.domain.model.UserData
+import com.android.geto.core.domain.repository.UserDataRepository
 import kotlinx.coroutines.channels.BufferOverflow.DROP_OLDEST
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableSharedFlow
diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts
index 3e54edcc0..eca09a207 100644
--- a/core/ui/build.gradle.kts
+++ b/core/ui/build.gradle.kts
@@ -32,7 +32,7 @@ android {
 
 dependencies {
     api(projects.core.designSystem)
-    api(projects.core.model)
+    api(projects.core.domain)
 
     implementation(libs.androidx.core.ktx)
 
diff --git a/core/ui/src/main/kotlin/com/android/geto/core/ui/AppSettingsPreviewParameterProvider.kt b/core/ui/src/main/kotlin/com/android/geto/core/ui/AppSettingsPreviewParameterProvider.kt
index f9ed643d5..1c19e0e76 100644
--- a/core/ui/src/main/kotlin/com/android/geto/core/ui/AppSettingsPreviewParameterProvider.kt
+++ b/core/ui/src/main/kotlin/com/android/geto/core/ui/AppSettingsPreviewParameterProvider.kt
@@ -18,8 +18,8 @@
 package com.android.geto.core.ui
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
-import com.android.geto.core.model.AppSetting
-import com.android.geto.core.model.SettingType
+import com.android.geto.core.domain.model.AppSetting
+import com.android.geto.core.domain.model.SettingType
 import com.android.geto.core.ui.AppSettingsPreviewParameterData.appSettings
 
 class AppSettingsPreviewParameterProvider : PreviewParameterProvider<List<AppSetting>> {
diff --git a/core/ui/src/main/kotlin/com/android/geto/core/ui/ApplicationInfoPreviewParameterProvider.kt b/core/ui/src/main/kotlin/com/android/geto/core/ui/ApplicationInfoPreviewParameterProvider.kt
index 549be544f..9935d2f02 100644
--- a/core/ui/src/main/kotlin/com/android/geto/core/ui/ApplicationInfoPreviewParameterProvider.kt
+++ b/core/ui/src/main/kotlin/com/android/geto/core/ui/ApplicationInfoPreviewParameterProvider.kt
@@ -18,7 +18,7 @@
 package com.android.geto.core.ui
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
-import com.android.geto.core.model.GetoApplicationInfo
+import com.android.geto.core.domain.model.GetoApplicationInfo
 import com.android.geto.core.ui.MappedApplicationInfoPreviewParameterData.mappedGetoApplicationInfos
 
 class ApplicationInfoPreviewParameterProvider :
diff --git a/feature/app-settings/build.gradle.kts b/feature/app-settings/build.gradle.kts
index 69af7f6ac..9184e7660 100644
--- a/feature/app-settings/build.gradle.kts
+++ b/feature/app-settings/build.gradle.kts
@@ -29,15 +29,8 @@ android {
 
 dependencies {
     implementation(projects.core.common)
-    implementation(projects.core.data)
     implementation(projects.core.domain)
 
-    implementation(projects.broadcastReceiver)
-
-    implementation(projects.framework.assetManager)
-    implementation(projects.framework.clipboardManager)
-    implementation(projects.framework.notificationManager)
-
     testImplementation(libs.hilt.android.testing)
     testImplementation(libs.robolectric)
     testImplementation(projects.core.testing)
diff --git a/feature/app-settings/src/androidTest/kotlin/com/android/geto/feature/appsettings/AppSettingsScreenDialogsTest.kt b/feature/app-settings/src/androidTest/kotlin/com/android/geto/feature/appsettings/AppSettingsScreenDialogsTest.kt
index 7a3a9520c..7e03e96ff 100644
--- a/feature/app-settings/src/androidTest/kotlin/com/android/geto/feature/appsettings/AppSettingsScreenDialogsTest.kt
+++ b/feature/app-settings/src/androidTest/kotlin/com/android/geto/feature/appsettings/AppSettingsScreenDialogsTest.kt
@@ -35,7 +35,7 @@ import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
 import androidx.compose.ui.test.performScrollTo
 import androidx.compose.ui.test.performTextInput
-import com.android.geto.core.model.AppSettingsResult
+import com.android.geto.core.domain.model.AppSettingsResult
 import com.android.geto.feature.appsettings.dialog.template.TemplateDialogUiState
 import org.junit.Rule
 import org.junit.Test
diff --git a/feature/app-settings/src/androidTest/kotlin/com/android/geto/feature/appsettings/AppSettingsScreenSnackbarTest.kt b/feature/app-settings/src/androidTest/kotlin/com/android/geto/feature/appsettings/AppSettingsScreenSnackbarTest.kt
index df56e85d4..88bd6ff8e 100644
--- a/feature/app-settings/src/androidTest/kotlin/com/android/geto/feature/appsettings/AppSettingsScreenSnackbarTest.kt
+++ b/feature/app-settings/src/androidTest/kotlin/com/android/geto/feature/appsettings/AppSettingsScreenSnackbarTest.kt
@@ -25,9 +25,9 @@ import androidx.compose.ui.test.hasTestTag
 import androidx.compose.ui.test.hasText
 import androidx.compose.ui.test.junit4.AndroidComposeTestRule
 import androidx.compose.ui.test.junit4.createAndroidComposeRule
-import com.android.geto.core.model.AddAppSettingResult
-import com.android.geto.core.model.AppSettingsResult
-import com.android.geto.core.model.RequestPinShortcutResult
+import com.android.geto.core.domain.model.AddAppSettingResult
+import com.android.geto.core.domain.model.AppSettingsResult
+import com.android.geto.core.domain.model.RequestPinShortcutResult
 import com.android.geto.feature.appsettings.dialog.template.TemplateDialogUiState
 import org.junit.Rule
 import org.junit.Test
diff --git a/feature/app-settings/src/androidTest/kotlin/com/android/geto/feature/appsettings/AppSettingsScreenTest.kt b/feature/app-settings/src/androidTest/kotlin/com/android/geto/feature/appsettings/AppSettingsScreenTest.kt
index ff0f652de..bc56392a6 100644
--- a/feature/app-settings/src/androidTest/kotlin/com/android/geto/feature/appsettings/AppSettingsScreenTest.kt
+++ b/feature/app-settings/src/androidTest/kotlin/com/android/geto/feature/appsettings/AppSettingsScreenTest.kt
@@ -23,8 +23,8 @@ import androidx.compose.ui.test.assertIsDisplayed
 import androidx.compose.ui.test.junit4.createAndroidComposeRule
 import androidx.compose.ui.test.onNodeWithContentDescription
 import androidx.compose.ui.test.onNodeWithTag
-import com.android.geto.core.model.AppSetting
-import com.android.geto.core.model.SettingType
+import com.android.geto.core.domain.model.AppSetting
+import com.android.geto.core.domain.model.SettingType
 import com.android.geto.feature.appsettings.dialog.template.TemplateDialogUiState
 import org.junit.Rule
 import org.junit.Test
diff --git a/feature/app-settings/src/androidTest/kotlin/com/android/geto/feature/appsettings/dialog/appsetting/AppSettingDialogTest.kt b/feature/app-settings/src/androidTest/kotlin/com/android/geto/feature/appsettings/dialog/appsetting/AppSettingDialogTest.kt
index 3f88e478c..aac4fca88 100644
--- a/feature/app-settings/src/androidTest/kotlin/com/android/geto/feature/appsettings/dialog/appsetting/AppSettingDialogTest.kt
+++ b/feature/app-settings/src/androidTest/kotlin/com/android/geto/feature/appsettings/dialog/appsetting/AppSettingDialogTest.kt
@@ -25,8 +25,8 @@ import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
 import androidx.compose.ui.test.performScrollTo
-import com.android.geto.core.model.SecureSetting
-import com.android.geto.core.model.SettingType
+import com.android.geto.core.domain.model.SecureSetting
+import com.android.geto.core.domain.model.SettingType
 import org.junit.Rule
 import org.junit.Test
 import kotlin.test.assertFalse
diff --git a/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/AppSettingsEvent.kt b/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/AppSettingsEvent.kt
index f15662875..d1a73472e 100644
--- a/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/AppSettingsEvent.kt
+++ b/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/AppSettingsEvent.kt
@@ -18,9 +18,9 @@
 package com.android.geto.feature.appsettings
 
 import android.graphics.drawable.Drawable
-import com.android.geto.core.model.AppSetting
-import com.android.geto.core.model.GetoShortcutInfoCompat
-import com.android.geto.core.model.SettingType
+import com.android.geto.core.domain.model.AppSetting
+import com.android.geto.core.domain.model.GetoShortcutInfoCompat
+import com.android.geto.core.domain.model.SettingType
 
 sealed interface AppSettingsEvent {
     data object ApplyAppSettings : AppSettingsEvent
diff --git a/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/AppSettingsScreen.kt b/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/AppSettingsScreen.kt
index f80e3152c..479603228 100644
--- a/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/AppSettingsScreen.kt
+++ b/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/AppSettingsScreen.kt
@@ -62,26 +62,26 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.android.geto.core.designsystem.component.GetoLoadingWheel
 import com.android.geto.core.designsystem.icon.GetoIcons
-import com.android.geto.core.model.AddAppSettingResult
-import com.android.geto.core.model.AddAppSettingResult.FAILED
-import com.android.geto.core.model.AddAppSettingResult.SUCCESS
-import com.android.geto.core.model.AppSetting
-import com.android.geto.core.model.AppSettingsResult
-import com.android.geto.core.model.AppSettingsResult.DisabledAppSettings
-import com.android.geto.core.model.AppSettingsResult.EmptyAppSettings
-import com.android.geto.core.model.AppSettingsResult.Failure
-import com.android.geto.core.model.AppSettingsResult.InvalidValues
-import com.android.geto.core.model.AppSettingsResult.NoPermission
-import com.android.geto.core.model.AppSettingsResult.Success
-import com.android.geto.core.model.GetoShortcutInfoCompat
-import com.android.geto.core.model.RequestPinShortcutResult
-import com.android.geto.core.model.RequestPinShortcutResult.SupportedLauncher
-import com.android.geto.core.model.RequestPinShortcutResult.UnsupportedLauncher
-import com.android.geto.core.model.RequestPinShortcutResult.UpdateFailure
-import com.android.geto.core.model.RequestPinShortcutResult.UpdateImmutableShortcuts
-import com.android.geto.core.model.RequestPinShortcutResult.UpdateSuccess
-import com.android.geto.core.model.SecureSetting
-import com.android.geto.core.model.SettingType
+import com.android.geto.core.domain.model.AddAppSettingResult
+import com.android.geto.core.domain.model.AddAppSettingResult.FAILED
+import com.android.geto.core.domain.model.AddAppSettingResult.SUCCESS
+import com.android.geto.core.domain.model.AppSetting
+import com.android.geto.core.domain.model.AppSettingsResult
+import com.android.geto.core.domain.model.AppSettingsResult.DisabledAppSettings
+import com.android.geto.core.domain.model.AppSettingsResult.EmptyAppSettings
+import com.android.geto.core.domain.model.AppSettingsResult.Failure
+import com.android.geto.core.domain.model.AppSettingsResult.InvalidValues
+import com.android.geto.core.domain.model.AppSettingsResult.NoPermission
+import com.android.geto.core.domain.model.AppSettingsResult.Success
+import com.android.geto.core.domain.model.GetoShortcutInfoCompat
+import com.android.geto.core.domain.model.RequestPinShortcutResult
+import com.android.geto.core.domain.model.RequestPinShortcutResult.SupportedLauncher
+import com.android.geto.core.domain.model.RequestPinShortcutResult.UnsupportedLauncher
+import com.android.geto.core.domain.model.RequestPinShortcutResult.UpdateFailure
+import com.android.geto.core.domain.model.RequestPinShortcutResult.UpdateImmutableShortcuts
+import com.android.geto.core.domain.model.RequestPinShortcutResult.UpdateSuccess
+import com.android.geto.core.domain.model.SecureSetting
+import com.android.geto.core.domain.model.SettingType
 import com.android.geto.feature.appsettings.AppSettingsEvent.AddAppSetting
 import com.android.geto.feature.appsettings.AppSettingsEvent.ApplyAppSettings
 import com.android.geto.feature.appsettings.AppSettingsEvent.CheckAppSetting
diff --git a/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/AppSettingsUiState.kt b/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/AppSettingsUiState.kt
index b01ef5233..cecfb9b76 100644
--- a/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/AppSettingsUiState.kt
+++ b/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/AppSettingsUiState.kt
@@ -17,7 +17,7 @@
  */
 package com.android.geto.feature.appsettings
 
-import com.android.geto.core.model.AppSetting
+import com.android.geto.core.domain.model.AppSetting
 
 sealed interface AppSettingsUiState {
     data class Success(val appSettings: List<AppSetting>) : AppSettingsUiState
diff --git a/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/AppSettingsViewModel.kt b/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/AppSettingsViewModel.kt
index 224031303..f7aafd275 100644
--- a/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/AppSettingsViewModel.kt
+++ b/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/AppSettingsViewModel.kt
@@ -22,22 +22,25 @@ import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import androidx.navigation.toRoute
-import com.android.geto.broadcastreceiver.RevertSettingsBroadcastReceiver
-import com.android.geto.core.data.repository.AppSettingsRepository
-import com.android.geto.core.data.repository.PackageRepository
-import com.android.geto.core.data.repository.SecureSettingsRepository
-import com.android.geto.core.domain.AddAppSettingUseCase
-import com.android.geto.core.domain.ApplyAppSettingsUseCase
-import com.android.geto.core.domain.AutoLaunchUseCase
-import com.android.geto.core.domain.RequestPinShortcutUseCase
-import com.android.geto.core.domain.RevertAppSettingsUseCase
-import com.android.geto.core.model.AddAppSettingResult
-import com.android.geto.core.model.AppSetting
-import com.android.geto.core.model.AppSettingsResult
-import com.android.geto.core.model.GetoShortcutInfoCompat
-import com.android.geto.core.model.RequestPinShortcutResult
-import com.android.geto.core.model.SecureSetting
-import com.android.geto.core.model.SettingType
+import com.android.geto.core.domain.broadcastreceiver.RevertSettingsBroadcastReceiver
+import com.android.geto.core.domain.framework.AssetManagerWrapper
+import com.android.geto.core.domain.framework.ClipboardManagerWrapper
+import com.android.geto.core.domain.framework.NotificationManagerWrapper
+import com.android.geto.core.domain.model.AddAppSettingResult
+import com.android.geto.core.domain.model.AppSetting
+import com.android.geto.core.domain.model.AppSettingsResult
+import com.android.geto.core.domain.model.GetoShortcutInfoCompat
+import com.android.geto.core.domain.model.RequestPinShortcutResult
+import com.android.geto.core.domain.model.SecureSetting
+import com.android.geto.core.domain.model.SettingType
+import com.android.geto.core.domain.repository.AppSettingsRepository
+import com.android.geto.core.domain.repository.PackageRepository
+import com.android.geto.core.domain.repository.SecureSettingsRepository
+import com.android.geto.core.domain.usecase.AddAppSettingUseCase
+import com.android.geto.core.domain.usecase.ApplyAppSettingsUseCase
+import com.android.geto.core.domain.usecase.AutoLaunchUseCase
+import com.android.geto.core.domain.usecase.RequestPinShortcutUseCase
+import com.android.geto.core.domain.usecase.RevertAppSettingsUseCase
 import com.android.geto.feature.appsettings.AppSettingsEvent.AddAppSetting
 import com.android.geto.feature.appsettings.AppSettingsEvent.ApplyAppSettings
 import com.android.geto.feature.appsettings.AppSettingsEvent.AutoLaunchApp
@@ -57,9 +60,6 @@ import com.android.geto.feature.appsettings.AppSettingsEvent.ResetSetPrimaryClip
 import com.android.geto.feature.appsettings.AppSettingsEvent.RevertAppSettings
 import com.android.geto.feature.appsettings.dialog.template.TemplateDialogUiState
 import com.android.geto.feature.appsettings.navigation.AppSettingsRouteData
-import com.android.geto.framework.assetmanager.AssetManagerWrapper
-import com.android.geto.framework.clipboardmanager.ClipboardManagerWrapper
-import com.android.geto.framework.notificationmanager.NotificationManagerWrapper
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
@@ -85,6 +85,7 @@ class AppSettingsViewModel @Inject constructor(
     private val addAppSettingUseCase: AddAppSettingUseCase,
     private val notificationManagerWrapper: NotificationManagerWrapper,
     private val assetManagerWrapper: AssetManagerWrapper,
+    private val revertSettingsBroadcastReceiver: RevertSettingsBroadcastReceiver,
 ) : ViewModel() {
     private val appSettingsRouteData = savedStateHandle.toRoute<AppSettingsRouteData>()
 
@@ -318,7 +319,7 @@ class AppSettingsViewModel @Inject constructor(
         notificationManagerWrapper.notify(
             notificationId = notificationId,
             notification = notificationManagerWrapper.getRevertNotification(
-                cls = RevertSettingsBroadcastReceiver::class.java,
+                cls = revertSettingsBroadcastReceiver::class.java,
                 packageName = packageName,
                 icon = icon,
                 contentTitle = contentTitle,
diff --git a/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/dialog/appsetting/AppSettingDialog.kt b/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/dialog/appsetting/AppSettingDialog.kt
index 3f7ffa2eb..34fd76be4 100644
--- a/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/dialog/appsetting/AppSettingDialog.kt
+++ b/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/dialog/appsetting/AppSettingDialog.kt
@@ -51,8 +51,8 @@ import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.unit.dp
 import com.android.geto.core.designsystem.component.DialogContainer
-import com.android.geto.core.model.AppSetting
-import com.android.geto.core.model.SettingType
+import com.android.geto.core.domain.model.AppSetting
+import com.android.geto.core.domain.model.SettingType
 import com.android.geto.feature.appsettings.R
 
 @Composable
diff --git a/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/dialog/appsetting/AppSettingDialogState.kt b/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/dialog/appsetting/AppSettingDialogState.kt
index 01db9fa54..2ab5c0adb 100644
--- a/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/dialog/appsetting/AppSettingDialogState.kt
+++ b/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/dialog/appsetting/AppSettingDialogState.kt
@@ -25,9 +25,9 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.saveable.listSaver
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
-import com.android.geto.core.model.AppSetting
-import com.android.geto.core.model.SecureSetting
-import com.android.geto.core.model.SettingType
+import com.android.geto.core.domain.model.AppSetting
+import com.android.geto.core.domain.model.SecureSetting
+import com.android.geto.core.domain.model.SettingType
 
 @Composable
 internal fun rememberAppSettingDialogState(): AppSettingDialogState {
diff --git a/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/dialog/shortcut/ShortcutDialog.kt b/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/dialog/shortcut/ShortcutDialog.kt
index 621442ec7..bd4fc43ce 100644
--- a/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/dialog/shortcut/ShortcutDialog.kt
+++ b/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/dialog/shortcut/ShortcutDialog.kt
@@ -45,7 +45,7 @@ import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.unit.dp
 import com.android.geto.core.designsystem.component.DialogContainer
 import com.android.geto.core.designsystem.component.ShimmerImage
-import com.android.geto.core.model.GetoShortcutInfoCompat
+import com.android.geto.core.domain.model.GetoShortcutInfoCompat
 import com.android.geto.feature.appsettings.R
 
 @Composable
diff --git a/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/dialog/shortcut/ShortcutDialogState.kt b/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/dialog/shortcut/ShortcutDialogState.kt
index 9decbe5eb..4e277b7d3 100644
--- a/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/dialog/shortcut/ShortcutDialogState.kt
+++ b/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/dialog/shortcut/ShortcutDialogState.kt
@@ -25,7 +25,7 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.saveable.listSaver
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
-import com.android.geto.core.model.GetoShortcutInfoCompat
+import com.android.geto.core.domain.model.GetoShortcutInfoCompat
 
 @Composable
 internal fun rememberShortcutDialogState(): ShortcutDialogState {
diff --git a/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/dialog/template/TemplateDialog.kt b/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/dialog/template/TemplateDialog.kt
index 2ad80e09e..2b4cb4d6b 100644
--- a/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/dialog/template/TemplateDialog.kt
+++ b/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/dialog/template/TemplateDialog.kt
@@ -39,8 +39,8 @@ import androidx.compose.ui.unit.dp
 import com.android.geto.core.designsystem.component.DialogContainer
 import com.android.geto.core.designsystem.component.GetoLoadingWheel
 import com.android.geto.core.designsystem.icon.GetoIcons
-import com.android.geto.core.model.AppSetting
-import com.android.geto.core.model.AppSettingTemplate
+import com.android.geto.core.domain.model.AppSetting
+import com.android.geto.core.domain.model.AppSettingTemplate
 import com.android.geto.feature.appsettings.R
 
 @Composable
diff --git a/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/dialog/template/TemplateDialogState.kt b/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/dialog/template/TemplateDialogState.kt
index ec23e9ee5..20033ec61 100644
--- a/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/dialog/template/TemplateDialogState.kt
+++ b/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/dialog/template/TemplateDialogState.kt
@@ -24,8 +24,8 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.saveable.listSaver
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
-import com.android.geto.core.model.AppSetting
-import com.android.geto.core.model.AppSettingTemplate
+import com.android.geto.core.domain.model.AppSetting
+import com.android.geto.core.domain.model.AppSettingTemplate
 
 @Composable
 internal fun rememberTemplateDialogState(): TemplateDialogState {
diff --git a/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/dialog/template/TemplateDialogUiState.kt b/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/dialog/template/TemplateDialogUiState.kt
index 89620ffdc..d583221ed 100644
--- a/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/dialog/template/TemplateDialogUiState.kt
+++ b/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/dialog/template/TemplateDialogUiState.kt
@@ -17,7 +17,7 @@
  */
 package com.android.geto.feature.appsettings.dialog.template
 
-import com.android.geto.core.model.AppSettingTemplate
+import com.android.geto.core.domain.model.AppSettingTemplate
 
 sealed interface TemplateDialogUiState {
     data class Success(val appSettingTemplates: List<AppSettingTemplate>) : TemplateDialogUiState
diff --git a/feature/app-settings/src/test/kotlin/com/android/geto/feature/appsettings/AppSettingsScreenScreenshotTest.kt b/feature/app-settings/src/test/kotlin/com/android/geto/feature/appsettings/AppSettingsScreenScreenshotTest.kt
index 23087d751..a796050e0 100644
--- a/feature/app-settings/src/test/kotlin/com/android/geto/feature/appsettings/AppSettingsScreenScreenshotTest.kt
+++ b/feature/app-settings/src/test/kotlin/com/android/geto/feature/appsettings/AppSettingsScreenScreenshotTest.kt
@@ -22,8 +22,8 @@ import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.Surface
 import androidx.compose.ui.test.junit4.createAndroidComposeRule
 import com.android.geto.core.designsystem.theme.GetoTheme
-import com.android.geto.core.model.AppSetting
-import com.android.geto.core.model.SettingType
+import com.android.geto.core.domain.model.AppSetting
+import com.android.geto.core.domain.model.SettingType
 import com.android.geto.core.screenshottesting.util.DefaultTestDevices
 import com.android.geto.core.screenshottesting.util.captureScreenForDevice
 import com.android.geto.core.screenshottesting.util.captureScreenForMultiDevice
diff --git a/feature/app-settings/src/test/kotlin/com/android/geto/feature/appsettings/AppSettingsScreenSnackbarScreenshotTest.kt b/feature/app-settings/src/test/kotlin/com/android/geto/feature/appsettings/AppSettingsScreenSnackbarScreenshotTest.kt
index 3c67afca0..f3a05dd2b 100644
--- a/feature/app-settings/src/test/kotlin/com/android/geto/feature/appsettings/AppSettingsScreenSnackbarScreenshotTest.kt
+++ b/feature/app-settings/src/test/kotlin/com/android/geto/feature/appsettings/AppSettingsScreenSnackbarScreenshotTest.kt
@@ -21,8 +21,8 @@ import androidx.activity.ComponentActivity
 import androidx.compose.material3.SnackbarHostState
 import androidx.compose.ui.test.junit4.createAndroidComposeRule
 import com.android.geto.core.designsystem.theme.GetoTheme
-import com.android.geto.core.model.AppSetting
-import com.android.geto.core.model.SettingType
+import com.android.geto.core.domain.model.AppSetting
+import com.android.geto.core.domain.model.SettingType
 import com.android.geto.core.screenshottesting.util.captureSnackbarForMultiDevice
 import com.android.geto.core.testing.util.MainDispatcherRule
 import com.android.geto.feature.appsettings.dialog.template.TemplateDialogUiState
diff --git a/feature/app-settings/src/test/kotlin/com/android/geto/feature/appsettings/AppSettingsViewModelTest.kt b/feature/app-settings/src/test/kotlin/com/android/geto/feature/appsettings/AppSettingsViewModelTest.kt
index 516e41493..2666dee8e 100644
--- a/feature/app-settings/src/test/kotlin/com/android/geto/feature/appsettings/AppSettingsViewModelTest.kt
+++ b/feature/app-settings/src/test/kotlin/com/android/geto/feature/appsettings/AppSettingsViewModelTest.kt
@@ -19,24 +19,24 @@ package com.android.geto.feature.appsettings
 
 import androidx.lifecycle.SavedStateHandle
 import androidx.navigation.testing.invoke
-import com.android.geto.core.domain.AddAppSettingUseCase
-import com.android.geto.core.domain.ApplyAppSettingsUseCase
-import com.android.geto.core.domain.AutoLaunchUseCase
-import com.android.geto.core.domain.RequestPinShortcutUseCase
-import com.android.geto.core.domain.RevertAppSettingsUseCase
-import com.android.geto.core.model.AddAppSettingResult
-import com.android.geto.core.model.AppSetting
-import com.android.geto.core.model.AppSettingTemplate
-import com.android.geto.core.model.AppSettingsResult.DisabledAppSettings
-import com.android.geto.core.model.AppSettingsResult.EmptyAppSettings
-import com.android.geto.core.model.AppSettingsResult.InvalidValues
-import com.android.geto.core.model.AppSettingsResult.NoPermission
-import com.android.geto.core.model.AppSettingsResult.Success
-import com.android.geto.core.model.GetoApplicationInfo
-import com.android.geto.core.model.GetoShortcutInfoCompat
-import com.android.geto.core.model.RequestPinShortcutResult
-import com.android.geto.core.model.SecureSetting
-import com.android.geto.core.model.SettingType
+import com.android.geto.core.domain.model.AddAppSettingResult
+import com.android.geto.core.domain.model.AppSetting
+import com.android.geto.core.domain.model.AppSettingTemplate
+import com.android.geto.core.domain.model.AppSettingsResult.DisabledAppSettings
+import com.android.geto.core.domain.model.AppSettingsResult.EmptyAppSettings
+import com.android.geto.core.domain.model.AppSettingsResult.InvalidValues
+import com.android.geto.core.domain.model.AppSettingsResult.NoPermission
+import com.android.geto.core.domain.model.AppSettingsResult.Success
+import com.android.geto.core.domain.model.GetoApplicationInfo
+import com.android.geto.core.domain.model.GetoShortcutInfoCompat
+import com.android.geto.core.domain.model.RequestPinShortcutResult
+import com.android.geto.core.domain.model.SecureSetting
+import com.android.geto.core.domain.model.SettingType
+import com.android.geto.core.domain.usecase.AddAppSettingUseCase
+import com.android.geto.core.domain.usecase.ApplyAppSettingsUseCase
+import com.android.geto.core.domain.usecase.AutoLaunchUseCase
+import com.android.geto.core.domain.usecase.RequestPinShortcutUseCase
+import com.android.geto.core.domain.usecase.RevertAppSettingsUseCase
 import com.android.geto.core.testing.framework.DummyClipboardManagerWrapper
 import com.android.geto.core.testing.framework.DummyNotificationManagerWrapper
 import com.android.geto.core.testing.framework.FakeAssetManagerWrapper
diff --git a/feature/app-settings/src/test/kotlin/com/android/geto/feature/appsettings/dialog/appsetting/AppSettingsDialogStateTest.kt b/feature/app-settings/src/test/kotlin/com/android/geto/feature/appsettings/dialog/appsetting/AppSettingsDialogStateTest.kt
index bcbaa413a..22caeb32f 100644
--- a/feature/app-settings/src/test/kotlin/com/android/geto/feature/appsettings/dialog/appsetting/AppSettingsDialogStateTest.kt
+++ b/feature/app-settings/src/test/kotlin/com/android/geto/feature/appsettings/dialog/appsetting/AppSettingsDialogStateTest.kt
@@ -17,8 +17,8 @@
  */
 package com.android.geto.feature.appsettings.dialog.appsetting
 
-import com.android.geto.core.model.SecureSetting
-import com.android.geto.core.model.SettingType
+import com.android.geto.core.domain.model.SecureSetting
+import com.android.geto.core.domain.model.SettingType
 import org.junit.Before
 import org.junit.Test
 import kotlin.test.assertFalse
diff --git a/feature/app-settings/src/test/kotlin/com/android/geto/feature/appsettings/dialog/template/TemplateDialogScreenshotTest.kt b/feature/app-settings/src/test/kotlin/com/android/geto/feature/appsettings/dialog/template/TemplateDialogScreenshotTest.kt
index 721c6755b..06e3c6bdc 100644
--- a/feature/app-settings/src/test/kotlin/com/android/geto/feature/appsettings/dialog/template/TemplateDialogScreenshotTest.kt
+++ b/feature/app-settings/src/test/kotlin/com/android/geto/feature/appsettings/dialog/template/TemplateDialogScreenshotTest.kt
@@ -21,8 +21,8 @@ import androidx.activity.ComponentActivity
 import androidx.compose.material3.Surface
 import androidx.compose.ui.test.junit4.createAndroidComposeRule
 import com.android.geto.core.designsystem.theme.GetoTheme
-import com.android.geto.core.model.AppSettingTemplate
-import com.android.geto.core.model.SettingType
+import com.android.geto.core.domain.model.AppSettingTemplate
+import com.android.geto.core.domain.model.SettingType
 import com.android.geto.core.screenshottesting.util.DefaultTestDevices
 import com.android.geto.core.screenshottesting.util.captureDialogForDevice
 import dagger.hilt.android.testing.HiltAndroidTest
diff --git a/feature/apps/build.gradle.kts b/feature/apps/build.gradle.kts
index da949c600..8aee4a8aa 100644
--- a/feature/apps/build.gradle.kts
+++ b/feature/apps/build.gradle.kts
@@ -28,7 +28,7 @@ android {
 }
 
 dependencies {
-    implementation(projects.core.data)
+    implementation(projects.core.domain)
 
     testImplementation(libs.hilt.android.testing)
     testImplementation(libs.robolectric)
diff --git a/feature/apps/src/androidTest/kotlin/com/android/geto/feature/apps/AppsScreenTest.kt b/feature/apps/src/androidTest/kotlin/com/android/geto/feature/apps/AppsScreenTest.kt
index 65a422f4e..7d1abc765 100644
--- a/feature/apps/src/androidTest/kotlin/com/android/geto/feature/apps/AppsScreenTest.kt
+++ b/feature/apps/src/androidTest/kotlin/com/android/geto/feature/apps/AppsScreenTest.kt
@@ -22,7 +22,7 @@ import androidx.compose.ui.test.assertIsDisplayed
 import androidx.compose.ui.test.junit4.createAndroidComposeRule
 import androidx.compose.ui.test.onNodeWithContentDescription
 import androidx.compose.ui.test.onNodeWithTag
-import com.android.geto.core.model.GetoApplicationInfo
+import com.android.geto.core.domain.model.GetoApplicationInfo
 import org.junit.Rule
 import org.junit.Test
 
diff --git a/feature/apps/src/main/kotlin/com/android/geto/feature/apps/AppsScreen.kt b/feature/apps/src/main/kotlin/com/android/geto/feature/apps/AppsScreen.kt
index 68593e97b..a8f357475 100644
--- a/feature/apps/src/main/kotlin/com/android/geto/feature/apps/AppsScreen.kt
+++ b/feature/apps/src/main/kotlin/com/android/geto/feature/apps/AppsScreen.kt
@@ -48,7 +48,7 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.android.geto.core.designsystem.component.GetoLoadingWheel
 import com.android.geto.core.designsystem.component.ShimmerImage
-import com.android.geto.core.model.GetoApplicationInfo
+import com.android.geto.core.domain.model.GetoApplicationInfo
 
 @Composable
 internal fun AppsRoute(
diff --git a/feature/apps/src/main/kotlin/com/android/geto/feature/apps/AppsUiState.kt b/feature/apps/src/main/kotlin/com/android/geto/feature/apps/AppsUiState.kt
index 0e0b4135e..2d7fbd5c3 100644
--- a/feature/apps/src/main/kotlin/com/android/geto/feature/apps/AppsUiState.kt
+++ b/feature/apps/src/main/kotlin/com/android/geto/feature/apps/AppsUiState.kt
@@ -17,7 +17,7 @@
  */
 package com.android.geto.feature.apps
 
-import com.android.geto.core.model.GetoApplicationInfo
+import com.android.geto.core.domain.model.GetoApplicationInfo
 
 sealed interface AppsUiState {
     data class Success(val getoApplicationInfos: List<GetoApplicationInfo>) : AppsUiState
diff --git a/feature/apps/src/main/kotlin/com/android/geto/feature/apps/AppsViewModel.kt b/feature/apps/src/main/kotlin/com/android/geto/feature/apps/AppsViewModel.kt
index bd611858d..bdd155479 100644
--- a/feature/apps/src/main/kotlin/com/android/geto/feature/apps/AppsViewModel.kt
+++ b/feature/apps/src/main/kotlin/com/android/geto/feature/apps/AppsViewModel.kt
@@ -19,7 +19,7 @@ package com.android.geto.feature.apps
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.android.geto.core.data.repository.PackageRepository
+import com.android.geto.core.domain.repository.PackageRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
diff --git a/feature/apps/src/test/kotlin/com/android/geto/feature/apps/AppsScreenScreenshotTest.kt b/feature/apps/src/test/kotlin/com/android/geto/feature/apps/AppsScreenScreenshotTest.kt
index 5d7998757..92f47e5e7 100644
--- a/feature/apps/src/test/kotlin/com/android/geto/feature/apps/AppsScreenScreenshotTest.kt
+++ b/feature/apps/src/test/kotlin/com/android/geto/feature/apps/AppsScreenScreenshotTest.kt
@@ -21,7 +21,7 @@ import androidx.activity.ComponentActivity
 import androidx.compose.material3.Surface
 import androidx.compose.ui.test.junit4.createAndroidComposeRule
 import com.android.geto.core.designsystem.theme.GetoTheme
-import com.android.geto.core.model.GetoApplicationInfo
+import com.android.geto.core.domain.model.GetoApplicationInfo
 import com.android.geto.core.screenshottesting.util.DefaultTestDevices
 import com.android.geto.core.screenshottesting.util.captureScreenForDevice
 import com.android.geto.core.screenshottesting.util.captureScreenForMultiDevice
diff --git a/feature/apps/src/test/kotlin/com/android/geto/feature/apps/AppsViewModelTest.kt b/feature/apps/src/test/kotlin/com/android/geto/feature/apps/AppsViewModelTest.kt
index 1190db309..ea55a7199 100644
--- a/feature/apps/src/test/kotlin/com/android/geto/feature/apps/AppsViewModelTest.kt
+++ b/feature/apps/src/test/kotlin/com/android/geto/feature/apps/AppsViewModelTest.kt
@@ -17,7 +17,7 @@
  */
 package com.android.geto.feature.apps
 
-import com.android.geto.core.model.GetoApplicationInfo
+import com.android.geto.core.domain.model.GetoApplicationInfo
 import com.android.geto.core.testing.repository.TestPackageRepository
 import com.android.geto.core.testing.util.MainDispatcherRule
 import kotlinx.coroutines.flow.collect
diff --git a/feature/service/build.gradle.kts b/feature/service/build.gradle.kts
index 831188ec9..a559a8c50 100644
--- a/feature/service/build.gradle.kts
+++ b/feature/service/build.gradle.kts
@@ -28,12 +28,8 @@ android {
 }
 
 dependencies {
-    implementation(projects.core.data)
     implementation(projects.core.domain)
 
-    implementation(projects.framework.usageStatsManager)
-    implementation(projects.foregroundService)
-
     testImplementation(libs.hilt.android.testing)
     testImplementation(libs.robolectric)
     testImplementation(projects.core.testing)
diff --git a/feature/service/src/main/kotlin/com/android/geto/feature/service/ServiceScreen.kt b/feature/service/src/main/kotlin/com/android/geto/feature/service/ServiceScreen.kt
index 1b1fbc157..6d368b910 100644
--- a/feature/service/src/main/kotlin/com/android/geto/feature/service/ServiceScreen.kt
+++ b/feature/service/src/main/kotlin/com/android/geto/feature/service/ServiceScreen.kt
@@ -24,17 +24,18 @@ import androidx.compose.ui.Modifier
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.android.geto.core.designsystem.component.WavyCircle
+import com.android.geto.core.domain.model.UpdateUsageStatsForegroundServiceResult
 
 @Composable
 internal fun ServiceRoute(
     modifier: Modifier = Modifier,
     viewModel: ServiceViewModel = hiltViewModel(),
 ) {
-    val isUsageStatsActive by viewModel.isUsageStatsActive.collectAsStateWithLifecycle()
+    val updateUsageStatsForegroundServiceResult by viewModel.updateUsageStatsForegroundServiceResult.collectAsStateWithLifecycle()
 
     ServiceScreen(
         modifier = modifier,
-        isUsageStatsActive = isUsageStatsActive,
+        updateUsageStatsForegroundServiceResult = updateUsageStatsForegroundServiceResult,
         onEvent = viewModel::onEvent,
     )
 }
@@ -42,12 +43,12 @@ internal fun ServiceRoute(
 @Composable
 internal fun ServiceScreen(
     modifier: Modifier = Modifier,
-    isUsageStatsActive: Boolean,
+    updateUsageStatsForegroundServiceResult: UpdateUsageStatsForegroundServiceResult,
     onEvent: (ServiceEvent) -> Unit,
 ) {
     WavyCircle(
         modifier = modifier.fillMaxSize(),
-        active = isUsageStatsActive,
+        active = updateUsageStatsForegroundServiceResult == UpdateUsageStatsForegroundServiceResult.Start,
         onClick = {
             onEvent(ServiceEvent.UpdateUsageStatsForegroundService)
         },
diff --git a/feature/service/src/main/kotlin/com/android/geto/feature/service/ServiceUiState.kt b/feature/service/src/main/kotlin/com/android/geto/feature/service/ServiceUiState.kt
index f947f137d..b19acaa89 100644
--- a/feature/service/src/main/kotlin/com/android/geto/feature/service/ServiceUiState.kt
+++ b/feature/service/src/main/kotlin/com/android/geto/feature/service/ServiceUiState.kt
@@ -17,7 +17,7 @@
  */
 package com.android.geto.feature.service
 
-import com.android.geto.core.model.UserData
+import com.android.geto.core.domain.model.UserData
 
 sealed interface ServiceUiState {
     data object Loading : ServiceUiState
diff --git a/feature/service/src/main/kotlin/com/android/geto/feature/service/ServiceViewModel.kt b/feature/service/src/main/kotlin/com/android/geto/feature/service/ServiceViewModel.kt
index 7d837eb3e..049a85bee 100644
--- a/feature/service/src/main/kotlin/com/android/geto/feature/service/ServiceViewModel.kt
+++ b/feature/service/src/main/kotlin/com/android/geto/feature/service/ServiceViewModel.kt
@@ -18,8 +18,7 @@
 package com.android.geto.feature.service
 
 import androidx.lifecycle.ViewModel
-import com.android.geto.foregroundservice.ForegroundServiceManager
-import com.android.geto.framework.usagestatsmanager.UsageStatsManagerWrapper
+import com.android.geto.core.domain.usecase.UpdateUsageStatsForegroundServiceUseCase
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
@@ -28,34 +27,21 @@ import javax.inject.Inject
 
 @HiltViewModel
 class ServiceViewModel @Inject constructor(
-    private val foregroundServiceManager: ForegroundServiceManager,
-    private val usageStatsManagerWrapper: UsageStatsManagerWrapper,
+    private val updateUsageStatsForegroundServiceUseCase: UpdateUsageStatsForegroundServiceUseCase,
 ) : ViewModel() {
-    private val _isUsageStatsActive = MutableStateFlow(foregroundServiceManager.isActive())
-    val isUsageStatsActive = _isUsageStatsActive.asStateFlow()
+    private val _updateUsageStatsForegroundServiceResult =
+        MutableStateFlow(updateUsageStatsForegroundServiceUseCase())
+
+    val updateUsageStatsForegroundServiceResult =
+        _updateUsageStatsForegroundServiceResult.asStateFlow()
 
     fun onEvent(event: ServiceEvent) {
         when (event) {
             ServiceEvent.UpdateUsageStatsForegroundService -> {
-                updateUsageForegroundService()
+                _updateUsageStatsForegroundServiceResult.update {
+                    updateUsageStatsForegroundServiceUseCase()
+                }
             }
         }
     }
-
-    private fun updateUsageForegroundService() {
-        if (usageStatsManagerWrapper.isUsageStatsPermissionGranted().not()) {
-            usageStatsManagerWrapper.requestUsageStatsPermission()
-            return
-        }
-
-        _isUsageStatsActive.update {
-            foregroundServiceManager.isActive().not()
-        }
-
-        if (foregroundServiceManager.isActive()) {
-            foregroundServiceManager.stopForegroundService()
-        } else {
-            foregroundServiceManager.startForegroundService()
-        }
-    }
 }
diff --git a/feature/service/src/test/kotlin/com/android/geto/feature/service/ServiceScreenScreenshotTest.kt b/feature/service/src/test/kotlin/com/android/geto/feature/service/ServiceScreenScreenshotTest.kt
index 4e4ae0ba7..ad816e02b 100644
--- a/feature/service/src/test/kotlin/com/android/geto/feature/service/ServiceScreenScreenshotTest.kt
+++ b/feature/service/src/test/kotlin/com/android/geto/feature/service/ServiceScreenScreenshotTest.kt
@@ -21,6 +21,7 @@ import androidx.activity.ComponentActivity
 import androidx.compose.material3.Surface
 import androidx.compose.ui.test.junit4.createAndroidComposeRule
 import com.android.geto.core.designsystem.theme.GetoTheme
+import com.android.geto.core.domain.model.UpdateUsageStatsForegroundServiceResult
 import com.android.geto.core.screenshottesting.util.DefaultTestDevices
 import com.android.geto.core.screenshottesting.util.captureScreenForDevice
 import com.android.geto.core.screenshottesting.util.captureScreenForMultiDevice
@@ -47,7 +48,7 @@ class ServiceScreenScreenshotTest {
         composeTestRule.captureScreenForMultiDevice("ServiceScreenInActive") {
             GetoTheme {
                 ServiceScreen(
-                    isUsageStatsActive = false,
+                    updateUsageStatsForegroundServiceResult = UpdateUsageStatsForegroundServiceResult.Stop,
                     onEvent = {},
                 )
             }
@@ -59,7 +60,7 @@ class ServiceScreenScreenshotTest {
         composeTestRule.captureScreenForMultiDevice("ServiceScreenActive") {
             GetoTheme {
                 ServiceScreen(
-                    isUsageStatsActive = true,
+                    updateUsageStatsForegroundServiceResult = UpdateUsageStatsForegroundServiceResult.Start,
                     onEvent = {},
                 )
             }
@@ -77,7 +78,7 @@ class ServiceScreenScreenshotTest {
             GetoTheme {
                 Surface {
                     ServiceScreen(
-                        isUsageStatsActive = false,
+                        updateUsageStatsForegroundServiceResult = UpdateUsageStatsForegroundServiceResult.Stop,
                         onEvent = {},
                     )
                 }
@@ -96,7 +97,7 @@ class ServiceScreenScreenshotTest {
             GetoTheme {
                 Surface {
                     ServiceScreen(
-                        isUsageStatsActive = true,
+                        updateUsageStatsForegroundServiceResult = UpdateUsageStatsForegroundServiceResult.Start,
                         onEvent = {},
                     )
                 }
diff --git a/feature/service/src/test/kotlin/com/android/geto/feature/service/ServiceViewModelTest.kt b/feature/service/src/test/kotlin/com/android/geto/feature/service/ServiceViewModelTest.kt
index b2031bace..7dc6c1b86 100644
--- a/feature/service/src/test/kotlin/com/android/geto/feature/service/ServiceViewModelTest.kt
+++ b/feature/service/src/test/kotlin/com/android/geto/feature/service/ServiceViewModelTest.kt
@@ -17,7 +17,9 @@
  */
 package com.android.geto.feature.service
 
-import com.android.geto.core.testing.framework.FakeForegroundServiceManager
+import com.android.geto.core.domain.model.UpdateUsageStatsForegroundServiceResult
+import com.android.geto.core.domain.usecase.UpdateUsageStatsForegroundServiceUseCase
+import com.android.geto.core.testing.framework.FakeUsageStatsForegroundServiceManager
 import com.android.geto.core.testing.framework.FakeUsageStatsManagerWrapper
 import com.android.geto.core.testing.util.MainDispatcherRule
 import kotlinx.coroutines.flow.collect
@@ -27,71 +29,85 @@ import kotlinx.coroutines.test.runTest
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
-import kotlin.test.assertFalse
-import kotlin.test.assertTrue
+import kotlin.test.assertEquals
 
 class ServiceViewModelTest {
     @get:Rule
     val mainDispatcherRule = MainDispatcherRule()
 
-    private lateinit var foregroundServiceManager: FakeForegroundServiceManager
+    private lateinit var usageStatsForegroundServiceManager: FakeUsageStatsForegroundServiceManager
 
     private lateinit var usageStatsManagerWrapper: FakeUsageStatsManagerWrapper
 
+    private lateinit var updateUsageStatsForegroundServiceUseCase: UpdateUsageStatsForegroundServiceUseCase
+
     private lateinit var viewModel: ServiceViewModel
 
     @Before
     fun setup() {
-        foregroundServiceManager = FakeForegroundServiceManager()
+        usageStatsForegroundServiceManager = FakeUsageStatsForegroundServiceManager()
 
         usageStatsManagerWrapper = FakeUsageStatsManagerWrapper()
 
-        viewModel = ServiceViewModel(
-            foregroundServiceManager = foregroundServiceManager,
+        updateUsageStatsForegroundServiceUseCase = UpdateUsageStatsForegroundServiceUseCase(
+            usageStatsForegroundServiceManager = usageStatsForegroundServiceManager,
             usageStatsManagerWrapper = usageStatsManagerWrapper,
         )
+
+        viewModel = ServiceViewModel(
+            updateUsageStatsForegroundServiceUseCase = updateUsageStatsForegroundServiceUseCase,
+        )
     }
 
     @Test
-    fun foregroundService_inActive_noPermission() = runTest {
+    fun updateUsageStatsForegroundService_requestPermission() = runTest {
         backgroundScope.launch(UnconfinedTestDispatcher()) {
-            viewModel.isUsageStatsActive.collect()
+            viewModel.updateUsageStatsForegroundServiceResult.collect()
         }
 
         usageStatsManagerWrapper.setUsageStatsPermissionGranted(false)
 
         viewModel.onEvent(event = ServiceEvent.UpdateUsageStatsForegroundService)
 
-        assertFalse(viewModel.isUsageStatsActive.value)
+        assertEquals(
+            expected = UpdateUsageStatsForegroundServiceResult.RequestPermission,
+            actual = viewModel.updateUsageStatsForegroundServiceResult.value,
+        )
     }
 
     @Test
-    fun foregroundService_fromActive_to_inActive() = runTest {
+    fun foregroundService_start() = runTest {
         backgroundScope.launch(UnconfinedTestDispatcher()) {
-            viewModel.isUsageStatsActive.collect()
+            viewModel.updateUsageStatsForegroundServiceResult.collect()
         }
 
-        foregroundServiceManager.setActive(true)
+        usageStatsForegroundServiceManager.setActive(false)
 
         usageStatsManagerWrapper.setUsageStatsPermissionGranted(true)
 
         viewModel.onEvent(event = ServiceEvent.UpdateUsageStatsForegroundService)
 
-        assertFalse(viewModel.isUsageStatsActive.value)
+        assertEquals(
+            expected = UpdateUsageStatsForegroundServiceResult.Start,
+            actual = viewModel.updateUsageStatsForegroundServiceResult.value,
+        )
     }
 
     @Test
-    fun foregroundService_fromInActive_to_active() = runTest {
+    fun foregroundService_stop() = runTest {
         backgroundScope.launch(UnconfinedTestDispatcher()) {
-            viewModel.isUsageStatsActive.collect()
+            viewModel.updateUsageStatsForegroundServiceResult.collect()
         }
 
-        foregroundServiceManager.setActive(false)
+        usageStatsForegroundServiceManager.setActive(true)
 
         usageStatsManagerWrapper.setUsageStatsPermissionGranted(true)
 
         viewModel.onEvent(event = ServiceEvent.UpdateUsageStatsForegroundService)
 
-        assertTrue(viewModel.isUsageStatsActive.value)
+        assertEquals(
+            expected = UpdateUsageStatsForegroundServiceResult.Stop,
+            actual = viewModel.updateUsageStatsForegroundServiceResult.value,
+        )
     }
 }
diff --git a/feature/settings/build.gradle.kts b/feature/settings/build.gradle.kts
index 52452230a..70818be26 100644
--- a/feature/settings/build.gradle.kts
+++ b/feature/settings/build.gradle.kts
@@ -28,7 +28,6 @@ android {
 }
 
 dependencies {
-    implementation(projects.core.data)
     implementation(projects.core.domain)
 
     testImplementation(libs.hilt.android.testing)
diff --git a/feature/settings/src/androidTest/kotlin/com/android/geto/feature/settings/SettingsScreenDialogsTest.kt b/feature/settings/src/androidTest/kotlin/com/android/geto/feature/settings/SettingsScreenDialogsTest.kt
index cbe46ef48..61aec4df8 100644
--- a/feature/settings/src/androidTest/kotlin/com/android/geto/feature/settings/SettingsScreenDialogsTest.kt
+++ b/feature/settings/src/androidTest/kotlin/com/android/geto/feature/settings/SettingsScreenDialogsTest.kt
@@ -26,9 +26,9 @@ import androidx.compose.ui.test.onNodeWithContentDescription
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
-import com.android.geto.core.model.DarkThemeConfig
-import com.android.geto.core.model.ThemeBrand
-import com.android.geto.core.model.UserData
+import com.android.geto.core.domain.model.DarkThemeConfig
+import com.android.geto.core.domain.model.ThemeBrand
+import com.android.geto.core.domain.model.UserData
 import org.junit.Rule
 import org.junit.Test
 
diff --git a/feature/settings/src/androidTest/kotlin/com/android/geto/feature/settings/SettingsScreenTest.kt b/feature/settings/src/androidTest/kotlin/com/android/geto/feature/settings/SettingsScreenTest.kt
index 9a467fb98..50a9a37ef 100644
--- a/feature/settings/src/androidTest/kotlin/com/android/geto/feature/settings/SettingsScreenTest.kt
+++ b/feature/settings/src/androidTest/kotlin/com/android/geto/feature/settings/SettingsScreenTest.kt
@@ -25,9 +25,9 @@ import androidx.compose.ui.test.assertIsOn
 import androidx.compose.ui.test.junit4.createAndroidComposeRule
 import androidx.compose.ui.test.onNodeWithContentDescription
 import androidx.compose.ui.test.onNodeWithTag
-import com.android.geto.core.model.DarkThemeConfig
-import com.android.geto.core.model.ThemeBrand
-import com.android.geto.core.model.UserData
+import com.android.geto.core.domain.model.DarkThemeConfig
+import com.android.geto.core.domain.model.ThemeBrand
+import com.android.geto.core.domain.model.UserData
 import org.junit.Rule
 import org.junit.Test
 
diff --git a/feature/settings/src/main/kotlin/com/android/geto/feature/settings/SettingsEvent.kt b/feature/settings/src/main/kotlin/com/android/geto/feature/settings/SettingsEvent.kt
index 5061d955b..505ce5cba 100644
--- a/feature/settings/src/main/kotlin/com/android/geto/feature/settings/SettingsEvent.kt
+++ b/feature/settings/src/main/kotlin/com/android/geto/feature/settings/SettingsEvent.kt
@@ -17,8 +17,8 @@
  */
 package com.android.geto.feature.settings
 
-import com.android.geto.core.model.DarkThemeConfig
-import com.android.geto.core.model.ThemeBrand
+import com.android.geto.core.domain.model.DarkThemeConfig
+import com.android.geto.core.domain.model.ThemeBrand
 
 sealed interface SettingsEvent {
     data class UpdateThemeBrand(val themeBrand: ThemeBrand) : SettingsEvent
diff --git a/feature/settings/src/main/kotlin/com/android/geto/feature/settings/SettingsScreen.kt b/feature/settings/src/main/kotlin/com/android/geto/feature/settings/SettingsScreen.kt
index 454b68674..ddebb6c35 100644
--- a/feature/settings/src/main/kotlin/com/android/geto/feature/settings/SettingsScreen.kt
+++ b/feature/settings/src/main/kotlin/com/android/geto/feature/settings/SettingsScreen.kt
@@ -50,8 +50,8 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.android.geto.core.designsystem.component.GetoLoadingWheel
 import com.android.geto.core.designsystem.theme.supportsDynamicTheming
-import com.android.geto.core.model.DarkThemeConfig
-import com.android.geto.core.model.ThemeBrand
+import com.android.geto.core.domain.model.DarkThemeConfig
+import com.android.geto.core.domain.model.ThemeBrand
 import com.android.geto.feature.settings.SettingsEvent.CleanAppSettings
 import com.android.geto.feature.settings.SettingsEvent.UpdateAutoLaunch
 import com.android.geto.feature.settings.SettingsEvent.UpdateDarkThemeConfig
diff --git a/feature/settings/src/main/kotlin/com/android/geto/feature/settings/SettingsUiState.kt b/feature/settings/src/main/kotlin/com/android/geto/feature/settings/SettingsUiState.kt
index 585732115..68f4569e9 100644
--- a/feature/settings/src/main/kotlin/com/android/geto/feature/settings/SettingsUiState.kt
+++ b/feature/settings/src/main/kotlin/com/android/geto/feature/settings/SettingsUiState.kt
@@ -17,7 +17,7 @@
  */
 package com.android.geto.feature.settings
 
-import com.android.geto.core.model.UserData
+import com.android.geto.core.domain.model.UserData
 
 sealed interface SettingsUiState {
     data object Loading : SettingsUiState
diff --git a/feature/settings/src/main/kotlin/com/android/geto/feature/settings/SettingsViewModel.kt b/feature/settings/src/main/kotlin/com/android/geto/feature/settings/SettingsViewModel.kt
index 363da8a1d..b128314e7 100644
--- a/feature/settings/src/main/kotlin/com/android/geto/feature/settings/SettingsViewModel.kt
+++ b/feature/settings/src/main/kotlin/com/android/geto/feature/settings/SettingsViewModel.kt
@@ -19,10 +19,10 @@ package com.android.geto.feature.settings
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.android.geto.core.data.repository.UserDataRepository
-import com.android.geto.core.domain.CleanAppSettingsUseCase
-import com.android.geto.core.model.DarkThemeConfig
-import com.android.geto.core.model.ThemeBrand
+import com.android.geto.core.domain.model.DarkThemeConfig
+import com.android.geto.core.domain.model.ThemeBrand
+import com.android.geto.core.domain.repository.UserDataRepository
+import com.android.geto.core.domain.usecase.CleanAppSettingsUseCase
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.SharingStarted.Companion.WhileSubscribed
 import kotlinx.coroutines.flow.map
diff --git a/feature/settings/src/main/kotlin/com/android/geto/feature/settings/dialog/dark/DarkDialog.kt b/feature/settings/src/main/kotlin/com/android/geto/feature/settings/dialog/dark/DarkDialog.kt
index 1467eb864..4f59c76c0 100644
--- a/feature/settings/src/main/kotlin/com/android/geto/feature/settings/dialog/dark/DarkDialog.kt
+++ b/feature/settings/src/main/kotlin/com/android/geto/feature/settings/dialog/dark/DarkDialog.kt
@@ -39,7 +39,7 @@ import androidx.compose.ui.semantics.contentDescription
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.unit.dp
 import com.android.geto.core.designsystem.component.DialogContainer
-import com.android.geto.core.model.DarkThemeConfig
+import com.android.geto.core.domain.model.DarkThemeConfig
 import com.android.geto.feature.settings.R
 
 @Composable
diff --git a/feature/settings/src/main/kotlin/com/android/geto/feature/settings/dialog/theme/ThemeDialog.kt b/feature/settings/src/main/kotlin/com/android/geto/feature/settings/dialog/theme/ThemeDialog.kt
index e1e741328..83f7919c4 100644
--- a/feature/settings/src/main/kotlin/com/android/geto/feature/settings/dialog/theme/ThemeDialog.kt
+++ b/feature/settings/src/main/kotlin/com/android/geto/feature/settings/dialog/theme/ThemeDialog.kt
@@ -39,7 +39,7 @@ import androidx.compose.ui.semantics.contentDescription
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.unit.dp
 import com.android.geto.core.designsystem.component.DialogContainer
-import com.android.geto.core.model.ThemeBrand
+import com.android.geto.core.domain.model.ThemeBrand
 import com.android.geto.feature.settings.R
 
 @Composable
diff --git a/feature/settings/src/test/kotlin/com/android/geto/feature/settings/SettingsScreenScreenshotTest.kt b/feature/settings/src/test/kotlin/com/android/geto/feature/settings/SettingsScreenScreenshotTest.kt
index 03d41ef66..75d86da78 100644
--- a/feature/settings/src/test/kotlin/com/android/geto/feature/settings/SettingsScreenScreenshotTest.kt
+++ b/feature/settings/src/test/kotlin/com/android/geto/feature/settings/SettingsScreenScreenshotTest.kt
@@ -21,9 +21,9 @@ import androidx.activity.ComponentActivity
 import androidx.compose.material3.Surface
 import androidx.compose.ui.test.junit4.createAndroidComposeRule
 import com.android.geto.core.designsystem.theme.GetoTheme
-import com.android.geto.core.model.DarkThemeConfig
-import com.android.geto.core.model.ThemeBrand
-import com.android.geto.core.model.UserData
+import com.android.geto.core.domain.model.DarkThemeConfig
+import com.android.geto.core.domain.model.ThemeBrand
+import com.android.geto.core.domain.model.UserData
 import com.android.geto.core.screenshottesting.util.DefaultTestDevices
 import com.android.geto.core.screenshottesting.util.captureScreenForDevice
 import dagger.hilt.android.testing.HiltTestApplication
diff --git a/feature/settings/src/test/kotlin/com/android/geto/feature/settings/SettingsViewModelTest.kt b/feature/settings/src/test/kotlin/com/android/geto/feature/settings/SettingsViewModelTest.kt
index 6c7bca0a8..5851a5f49 100644
--- a/feature/settings/src/test/kotlin/com/android/geto/feature/settings/SettingsViewModelTest.kt
+++ b/feature/settings/src/test/kotlin/com/android/geto/feature/settings/SettingsViewModelTest.kt
@@ -17,9 +17,9 @@
  */
 package com.android.geto.feature.settings
 
-import com.android.geto.core.domain.CleanAppSettingsUseCase
-import com.android.geto.core.model.DarkThemeConfig
-import com.android.geto.core.model.ThemeBrand
+import com.android.geto.core.domain.model.DarkThemeConfig
+import com.android.geto.core.domain.model.ThemeBrand
+import com.android.geto.core.domain.usecase.CleanAppSettingsUseCase
 import com.android.geto.core.testing.repository.TestAppSettingsRepository
 import com.android.geto.core.testing.repository.TestPackageRepository
 import com.android.geto.core.testing.repository.TestUserDataRepository
diff --git a/foreground-service/build.gradle.kts b/foreground-service/build.gradle.kts
index a8bc531ca..ce900fc82 100644
--- a/foreground-service/build.gradle.kts
+++ b/foreground-service/build.gradle.kts
@@ -29,7 +29,4 @@ dependencies {
     implementation(libs.androidx.core.ktx)
     implementation(projects.core.common)
     implementation(projects.core.domain)
-    implementation(projects.core.model)
-
-    implementation(projects.framework.notificationManager)
 }
\ No newline at end of file
diff --git a/foreground-service/src/main/kotlin/com/android/geto/foregroundservice/AndroidForegroundServiceManager.kt b/foreground-service/src/main/kotlin/com/android/geto/foregroundservice/AndroidUsageStatsForegroundServiceManager.kt
similarity index 85%
rename from foreground-service/src/main/kotlin/com/android/geto/foregroundservice/AndroidForegroundServiceManager.kt
rename to foreground-service/src/main/kotlin/com/android/geto/foregroundservice/AndroidUsageStatsForegroundServiceManager.kt
index a398df08b..f83aeacb6 100644
--- a/foreground-service/src/main/kotlin/com/android/geto/foregroundservice/AndroidForegroundServiceManager.kt
+++ b/foreground-service/src/main/kotlin/com/android/geto/foregroundservice/AndroidUsageStatsForegroundServiceManager.kt
@@ -23,17 +23,20 @@ import android.content.Intent
 import android.content.ServiceConnection
 import android.os.IBinder
 import androidx.core.content.ContextCompat
+import com.android.geto.core.domain.foregroundservice.UsageStatsForegroundServiceManager
 import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 
-class AndroidForegroundServiceManager @Inject constructor(@ApplicationContext private val context: Context) :
-    ForegroundServiceManager {
+class AndroidUsageStatsForegroundServiceManager @Inject constructor(@ApplicationContext private val context: Context) :
+    UsageStatsForegroundServiceManager {
     private val usageStatsServiceIntent = Intent(context, UsageStatsService::class.java)
 
     private lateinit var usageStatsService: UsageStatsService
 
     private var mBound: Boolean = false
 
+    override val isActive get() = mBound && usageStatsService.isActive
+
     private val connection = object : ServiceConnection {
         override fun onServiceConnected(className: ComponentName, service: IBinder) {
             val binder = service as UsageStatsService.UsageStatsBinder
@@ -59,8 +62,4 @@ class AndroidForegroundServiceManager @Inject constructor(@ApplicationContext pr
 
         context.stopService(usageStatsServiceIntent)
     }
-
-    override fun isActive(): Boolean {
-        return mBound && usageStatsService.isActive()
-    }
 }
diff --git a/foreground-service/src/main/kotlin/com/android/geto/foregroundservice/ForegroundServiceModule.kt b/foreground-service/src/main/kotlin/com/android/geto/foregroundservice/ForegroundServiceModule.kt
index d2579e9ed..98c8d89e4 100644
--- a/foreground-service/src/main/kotlin/com/android/geto/foregroundservice/ForegroundServiceModule.kt
+++ b/foreground-service/src/main/kotlin/com/android/geto/foregroundservice/ForegroundServiceModule.kt
@@ -17,6 +17,7 @@
  */
 package com.android.geto.foregroundservice
 
+import com.android.geto.core.domain.foregroundservice.UsageStatsForegroundServiceManager
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
@@ -29,5 +30,5 @@ internal interface ForegroundServiceModule {
 
     @Binds
     @Singleton
-    fun foregroundServiceManager(impl: AndroidForegroundServiceManager): ForegroundServiceManager
+    fun usageStatsForegroundServiceManager(impl: AndroidUsageStatsForegroundServiceManager): UsageStatsForegroundServiceManager
 }
diff --git a/foreground-service/src/main/kotlin/com/android/geto/foregroundservice/UsageStatsService.kt b/foreground-service/src/main/kotlin/com/android/geto/foregroundservice/UsageStatsService.kt
index da6acaa23..35d9f8ac7 100644
--- a/foreground-service/src/main/kotlin/com/android/geto/foregroundservice/UsageStatsService.kt
+++ b/foreground-service/src/main/kotlin/com/android/geto/foregroundservice/UsageStatsService.kt
@@ -25,11 +25,11 @@ import android.os.Build
 import android.os.IBinder
 import androidx.annotation.RequiresApi
 import androidx.core.app.ServiceCompat
-import com.android.geto.core.domain.ForegroundServiceAppSettingsUseCase
-import com.android.geto.core.model.ForegroundServiceAppSettingsResult
-import com.android.geto.core.model.ForegroundServiceAppSettingsResult.Ignore
-import com.android.geto.core.model.ForegroundServiceAppSettingsResult.Success
-import com.android.geto.framework.notificationmanager.NotificationManagerWrapper
+import com.android.geto.core.domain.framework.NotificationManagerWrapper
+import com.android.geto.core.domain.model.ForegroundServiceAppSettingsResult
+import com.android.geto.core.domain.model.ForegroundServiceAppSettingsResult.Ignore
+import com.android.geto.core.domain.model.ForegroundServiceAppSettingsResult.Success
+import com.android.geto.core.domain.usecase.ForegroundServiceAppSettingsUseCase
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -53,7 +53,9 @@ class UsageStatsService : Service() {
 
     private val usageStatsBinder = UsageStatsBinder()
 
-    private var isActive = false
+    private var _isActive = false
+
+    val isActive get() = _isActive
 
     override fun onBind(intent: Intent?): IBinder {
         return usageStatsBinder
@@ -61,7 +63,7 @@ class UsageStatsService : Service() {
 
     @RequiresApi(Build.VERSION_CODES.UPSIDE_DOWN_CAKE)
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-        isActive = true
+        _isActive = true
 
         ServiceCompat.startForeground(
             this,
@@ -109,15 +111,11 @@ class UsageStatsService : Service() {
     override fun onDestroy() {
         super.onDestroy()
 
-        isActive = false
+        _isActive = false
 
         serviceScope.cancel()
     }
 
-    fun isActive(): Boolean {
-        return isActive
-    }
-
     inner class UsageStatsBinder : Binder() {
         fun getService(): UsageStatsService = this@UsageStatsService
     }
diff --git a/framework/asset-manager/build.gradle.kts b/framework/asset-manager/build.gradle.kts
index f23abf148..559999376 100644
--- a/framework/asset-manager/build.gradle.kts
+++ b/framework/asset-manager/build.gradle.kts
@@ -29,5 +29,5 @@ dependencies {
     implementation(libs.gson)
 
     implementation(projects.core.common)
-    implementation(projects.core.model)
+    implementation(projects.core.domain)
 }
\ No newline at end of file
diff --git a/framework/asset-manager/src/main/kotlin/com/android/geto/framework/assetmanager/AndroidAssetManagerWrapper.kt b/framework/asset-manager/src/main/kotlin/com/android/geto/framework/assetmanager/AndroidAssetManagerWrapper.kt
index 87ee78994..6ee75f183 100644
--- a/framework/asset-manager/src/main/kotlin/com/android/geto/framework/assetmanager/AndroidAssetManagerWrapper.kt
+++ b/framework/asset-manager/src/main/kotlin/com/android/geto/framework/assetmanager/AndroidAssetManagerWrapper.kt
@@ -20,7 +20,8 @@ package com.android.geto.framework.assetmanager
 import android.content.Context
 import com.android.geto.core.common.Dispatcher
 import com.android.geto.core.common.GetoDispatchers.IO
-import com.android.geto.core.model.AppSettingTemplate
+import com.android.geto.core.domain.framework.AssetManagerWrapper
+import com.android.geto.core.domain.model.AppSettingTemplate
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
 import dagger.hilt.android.qualifiers.ApplicationContext
@@ -35,12 +36,12 @@ internal class AndroidAssetManagerWrapper @Inject constructor(
 ) : AssetManagerWrapper {
     private val appSettingsType = object : TypeToken<List<AppSettingTemplate>>() {}.type
 
-    private val appSettingTemplates = "AppSettingTemplates.json"
+    private val appSettingTemplatesJson = "AppSettingTemplates.json"
 
     override suspend fun getAppSettingTemplates(): List<AppSettingTemplate> {
         val jsonString = withContext(ioDispatcher) {
             try {
-                context.assets.open(appSettingTemplates).bufferedReader().use { it.readText() }
+                context.assets.open(appSettingTemplatesJson).bufferedReader().use { it.readText() }
             } catch (ex: IOException) {
                 null
             }
diff --git a/framework/asset-manager/src/main/kotlin/com/android/geto/framework/assetmanager/AssetManagerModule.kt b/framework/asset-manager/src/main/kotlin/com/android/geto/framework/assetmanager/AssetManagerModule.kt
index 8360172ea..66e51d1e9 100644
--- a/framework/asset-manager/src/main/kotlin/com/android/geto/framework/assetmanager/AssetManagerModule.kt
+++ b/framework/asset-manager/src/main/kotlin/com/android/geto/framework/assetmanager/AssetManagerModule.kt
@@ -17,6 +17,7 @@
  */
 package com.android.geto.framework.assetmanager
 
+import com.android.geto.core.domain.framework.AssetManagerWrapper
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
diff --git a/framework/clipboard-manager/build.gradle.kts b/framework/clipboard-manager/build.gradle.kts
index cbe138aa4..914cc7d3b 100644
--- a/framework/clipboard-manager/build.gradle.kts
+++ b/framework/clipboard-manager/build.gradle.kts
@@ -23,4 +23,8 @@ plugins {
 
 android {
     namespace = "com.android.geto.framework.clipboardmanager"
+}
+
+dependencies {
+    implementation(projects.core.domain)
 }
\ No newline at end of file
diff --git a/framework/clipboard-manager/src/main/kotlin/com/android/geto/framework/clipboardmanager/AndroidClipboardManagerWrapper.kt b/framework/clipboard-manager/src/main/kotlin/com/android/geto/framework/clipboardmanager/AndroidClipboardManagerWrapper.kt
index a80b414c9..779ceee0f 100644
--- a/framework/clipboard-manager/src/main/kotlin/com/android/geto/framework/clipboardmanager/AndroidClipboardManagerWrapper.kt
+++ b/framework/clipboard-manager/src/main/kotlin/com/android/geto/framework/clipboardmanager/AndroidClipboardManagerWrapper.kt
@@ -27,7 +27,7 @@ import javax.inject.Inject
 
 internal class AndroidClipboardManagerWrapper @Inject constructor(
     @ApplicationContext private val context: Context,
-) : ClipboardManagerWrapper {
+) : com.android.geto.core.domain.framework.ClipboardManagerWrapper {
 
     private val clipboardManager = context.getSystemService<ClipboardManager>()
 
diff --git a/framework/clipboard-manager/src/main/kotlin/com/android/geto/framework/clipboardmanager/ClipboardManagerModule.kt b/framework/clipboard-manager/src/main/kotlin/com/android/geto/framework/clipboardmanager/ClipboardManagerModule.kt
index 7921d246f..47edfcefc 100644
--- a/framework/clipboard-manager/src/main/kotlin/com/android/geto/framework/clipboardmanager/ClipboardManagerModule.kt
+++ b/framework/clipboard-manager/src/main/kotlin/com/android/geto/framework/clipboardmanager/ClipboardManagerModule.kt
@@ -29,5 +29,5 @@ internal interface ClipboardManagerModule {
 
     @Binds
     @Singleton
-    fun clipboardManagerWrapper(impl: AndroidClipboardManagerWrapper): ClipboardManagerWrapper
+    fun clipboardManagerWrapper(impl: AndroidClipboardManagerWrapper): com.android.geto.core.domain.framework.ClipboardManagerWrapper
 }
diff --git a/framework/notification-manager/build.gradle.kts b/framework/notification-manager/build.gradle.kts
index 3e8759994..fd468880c 100644
--- a/framework/notification-manager/build.gradle.kts
+++ b/framework/notification-manager/build.gradle.kts
@@ -27,4 +27,6 @@ android {
 
 dependencies {
     implementation(libs.androidx.core.ktx)
+
+    implementation(projects.core.domain)
 }
\ No newline at end of file
diff --git a/framework/notification-manager/src/main/kotlin/com/android/geto/framework/notificationmanager/AndroidNotificationManagerWrapper.kt b/framework/notification-manager/src/main/kotlin/com/android/geto/framework/notificationmanager/AndroidNotificationManagerWrapper.kt
index 07b375656..534620c71 100644
--- a/framework/notification-manager/src/main/kotlin/com/android/geto/framework/notificationmanager/AndroidNotificationManagerWrapper.kt
+++ b/framework/notification-manager/src/main/kotlin/com/android/geto/framework/notificationmanager/AndroidNotificationManagerWrapper.kt
@@ -34,9 +34,10 @@ import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.toBitmap
-import com.android.geto.framework.notificationmanager.NotificationManagerWrapper.Companion.ACTION_REVERT_SETTINGS
-import com.android.geto.framework.notificationmanager.NotificationManagerWrapper.Companion.EXTRA_NOTIFICATION_ID
-import com.android.geto.framework.notificationmanager.NotificationManagerWrapper.Companion.EXTRA_PACKAGE_NAME
+import com.android.geto.core.domain.framework.NotificationManagerWrapper
+import com.android.geto.core.domain.framework.NotificationManagerWrapper.Companion.ACTION_REVERT_SETTINGS
+import com.android.geto.core.domain.framework.NotificationManagerWrapper.Companion.EXTRA_NOTIFICATION_ID
+import com.android.geto.core.domain.framework.NotificationManagerWrapper.Companion.EXTRA_PACKAGE_NAME
 import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 
diff --git a/framework/notification-manager/src/main/kotlin/com/android/geto/framework/notificationmanager/NotificationManagerModule.kt b/framework/notification-manager/src/main/kotlin/com/android/geto/framework/notificationmanager/NotificationManagerModule.kt
index 6aa6c8905..630765549 100644
--- a/framework/notification-manager/src/main/kotlin/com/android/geto/framework/notificationmanager/NotificationManagerModule.kt
+++ b/framework/notification-manager/src/main/kotlin/com/android/geto/framework/notificationmanager/NotificationManagerModule.kt
@@ -17,6 +17,7 @@
  */
 package com.android.geto.framework.notificationmanager
 
+import com.android.geto.core.domain.framework.NotificationManagerWrapper
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
diff --git a/framework/package-manager/build.gradle.kts b/framework/package-manager/build.gradle.kts
index b3fdc1758..d7dfe0f1f 100644
--- a/framework/package-manager/build.gradle.kts
+++ b/framework/package-manager/build.gradle.kts
@@ -28,5 +28,5 @@ android {
 
 dependencies {
     implementation(projects.core.common)
-    implementation(projects.core.model)
+    implementation(projects.core.domain)
 }
\ No newline at end of file
diff --git a/framework/package-manager/src/main/kotlin/com/android/geto/framework/packagemanager/AndroidPackageManagerWrapper.kt b/framework/package-manager/src/main/kotlin/com/android/geto/framework/packagemanager/AndroidPackageManagerWrapper.kt
index 517e845f1..fab23c09c 100644
--- a/framework/package-manager/src/main/kotlin/com/android/geto/framework/packagemanager/AndroidPackageManagerWrapper.kt
+++ b/framework/package-manager/src/main/kotlin/com/android/geto/framework/packagemanager/AndroidPackageManagerWrapper.kt
@@ -25,7 +25,8 @@ import android.content.pm.PackageManager
 import android.graphics.drawable.Drawable
 import com.android.geto.core.common.Dispatcher
 import com.android.geto.core.common.GetoDispatchers.Default
-import com.android.geto.core.model.GetoApplicationInfo
+import com.android.geto.core.domain.framework.PackageManagerWrapper
+import com.android.geto.core.domain.model.GetoApplicationInfo
 import com.android.geto.framework.packagemanager.mapper.toApplicationInfo
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.CoroutineDispatcher
diff --git a/framework/package-manager/src/main/kotlin/com/android/geto/framework/packagemanager/PackageManagerModule.kt b/framework/package-manager/src/main/kotlin/com/android/geto/framework/packagemanager/PackageManagerModule.kt
index a86b58171..9175251e6 100644
--- a/framework/package-manager/src/main/kotlin/com/android/geto/framework/packagemanager/PackageManagerModule.kt
+++ b/framework/package-manager/src/main/kotlin/com/android/geto/framework/packagemanager/PackageManagerModule.kt
@@ -17,6 +17,7 @@
  */
 package com.android.geto.framework.packagemanager
 
+import com.android.geto.core.domain.framework.PackageManagerWrapper
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
diff --git a/framework/package-manager/src/main/kotlin/com/android/geto/framework/packagemanager/mapper/AndroidApplicationInfoMapper.kt b/framework/package-manager/src/main/kotlin/com/android/geto/framework/packagemanager/mapper/AndroidApplicationInfoMapper.kt
index 116517f53..348d069c4 100644
--- a/framework/package-manager/src/main/kotlin/com/android/geto/framework/packagemanager/mapper/AndroidApplicationInfoMapper.kt
+++ b/framework/package-manager/src/main/kotlin/com/android/geto/framework/packagemanager/mapper/AndroidApplicationInfoMapper.kt
@@ -20,7 +20,7 @@ package com.android.geto.framework.packagemanager.mapper
 import android.content.pm.ApplicationInfo
 import android.content.pm.PackageManager
 import androidx.core.graphics.drawable.toBitmap
-import com.android.geto.core.model.GetoApplicationInfo
+import com.android.geto.core.domain.model.GetoApplicationInfo
 
 internal fun ApplicationInfo.toApplicationInfo(packageManager: PackageManager): GetoApplicationInfo {
     return GetoApplicationInfo(
diff --git a/framework/secure-settings/build.gradle.kts b/framework/secure-settings/build.gradle.kts
index f385aeaa5..ec60cf916 100644
--- a/framework/secure-settings/build.gradle.kts
+++ b/framework/secure-settings/build.gradle.kts
@@ -28,5 +28,5 @@ android {
 
 dependencies {
     implementation(projects.core.common)
-    implementation(projects.core.model)
+    implementation(projects.core.domain)
 }
\ No newline at end of file
diff --git a/framework/secure-settings/src/main/kotlin/com/android/geto/framework/securesettings/AndroidSecureSettingsWrapper.kt b/framework/secure-settings/src/main/kotlin/com/android/geto/framework/securesettings/AndroidSecureSettingsWrapper.kt
index f4da37dc5..a25d31340 100644
--- a/framework/secure-settings/src/main/kotlin/com/android/geto/framework/securesettings/AndroidSecureSettingsWrapper.kt
+++ b/framework/secure-settings/src/main/kotlin/com/android/geto/framework/securesettings/AndroidSecureSettingsWrapper.kt
@@ -23,11 +23,12 @@ import androidx.core.database.getLongOrNull
 import androidx.core.database.getStringOrNull
 import com.android.geto.core.common.Dispatcher
 import com.android.geto.core.common.GetoDispatchers.IO
-import com.android.geto.core.model.SecureSetting
-import com.android.geto.core.model.SettingType
-import com.android.geto.core.model.SettingType.GLOBAL
-import com.android.geto.core.model.SettingType.SECURE
-import com.android.geto.core.model.SettingType.SYSTEM
+import com.android.geto.core.domain.framework.SecureSettingsWrapper
+import com.android.geto.core.domain.model.SecureSetting
+import com.android.geto.core.domain.model.SettingType
+import com.android.geto.core.domain.model.SettingType.GLOBAL
+import com.android.geto.core.domain.model.SettingType.SECURE
+import com.android.geto.core.domain.model.SettingType.SYSTEM
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext
diff --git a/framework/secure-settings/src/main/kotlin/com/android/geto/framework/securesettings/SecureSettingsModule.kt b/framework/secure-settings/src/main/kotlin/com/android/geto/framework/securesettings/SecureSettingsModule.kt
index b318c1e86..ef185a965 100644
--- a/framework/secure-settings/src/main/kotlin/com/android/geto/framework/securesettings/SecureSettingsModule.kt
+++ b/framework/secure-settings/src/main/kotlin/com/android/geto/framework/securesettings/SecureSettingsModule.kt
@@ -17,6 +17,7 @@
  */
 package com.android.geto.framework.securesettings
 
+import com.android.geto.core.domain.framework.SecureSettingsWrapper
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
diff --git a/framework/shortcut-manager/build.gradle.kts b/framework/shortcut-manager/build.gradle.kts
index edb393668..be3ca4db3 100644
--- a/framework/shortcut-manager/build.gradle.kts
+++ b/framework/shortcut-manager/build.gradle.kts
@@ -28,5 +28,5 @@ android {
 
 dependencies {
     implementation(projects.core.common)
-    implementation(projects.core.model)
+    implementation(projects.core.domain)
 }
\ No newline at end of file
diff --git a/framework/shortcut-manager/src/main/kotlin/com/android/geto/framework/shortcutmanager/AndroidShortcutManagerCompatWrapper.kt b/framework/shortcut-manager/src/main/kotlin/com/android/geto/framework/shortcutmanager/AndroidShortcutManagerCompatWrapper.kt
index 13ba8a1f3..35514ddee 100644
--- a/framework/shortcut-manager/src/main/kotlin/com/android/geto/framework/shortcutmanager/AndroidShortcutManagerCompatWrapper.kt
+++ b/framework/shortcut-manager/src/main/kotlin/com/android/geto/framework/shortcutmanager/AndroidShortcutManagerCompatWrapper.kt
@@ -21,7 +21,8 @@ import android.content.Context
 import androidx.core.content.pm.ShortcutManagerCompat
 import com.android.geto.core.common.Dispatcher
 import com.android.geto.core.common.GetoDispatchers.Default
-import com.android.geto.core.model.GetoShortcutInfoCompat
+import com.android.geto.core.domain.framework.ShortcutManagerCompatWrapper
+import com.android.geto.core.domain.model.GetoShortcutInfoCompat
 import com.android.geto.framework.shortcutmanager.mapper.asGetoShortcutInfoCompat
 import com.android.geto.framework.shortcutmanager.mapper.asShortcutInfoCompat
 import dagger.hilt.android.qualifiers.ApplicationContext
diff --git a/framework/shortcut-manager/src/main/kotlin/com/android/geto/framework/shortcutmanager/ShortcutManagerModule.kt b/framework/shortcut-manager/src/main/kotlin/com/android/geto/framework/shortcutmanager/ShortcutManagerModule.kt
index 5e8485969..76766797d 100644
--- a/framework/shortcut-manager/src/main/kotlin/com/android/geto/framework/shortcutmanager/ShortcutManagerModule.kt
+++ b/framework/shortcut-manager/src/main/kotlin/com/android/geto/framework/shortcutmanager/ShortcutManagerModule.kt
@@ -17,6 +17,7 @@
  */
 package com.android.geto.framework.shortcutmanager
 
+import com.android.geto.core.domain.framework.ShortcutManagerCompatWrapper
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
diff --git a/framework/shortcut-manager/src/main/kotlin/com/android/geto/framework/shortcutmanager/mapper/ShortcutInfoCompat.kt b/framework/shortcut-manager/src/main/kotlin/com/android/geto/framework/shortcutmanager/mapper/ShortcutInfoCompat.kt
index 9d2581706..7d2502476 100644
--- a/framework/shortcut-manager/src/main/kotlin/com/android/geto/framework/shortcutmanager/mapper/ShortcutInfoCompat.kt
+++ b/framework/shortcut-manager/src/main/kotlin/com/android/geto/framework/shortcutmanager/mapper/ShortcutInfoCompat.kt
@@ -23,7 +23,7 @@ import androidx.core.content.pm.ShortcutInfoCompat
 import androidx.core.graphics.drawable.IconCompat
 import androidx.core.graphics.drawable.toBitmap
 import androidx.core.net.toUri
-import com.android.geto.core.model.GetoShortcutInfoCompat
+import com.android.geto.core.domain.model.GetoShortcutInfoCompat
 
 internal fun ShortcutInfoCompat.asGetoShortcutInfoCompat(): GetoShortcutInfoCompat {
     return GetoShortcutInfoCompat(
diff --git a/framework/usage-stats-manager/build.gradle.kts b/framework/usage-stats-manager/build.gradle.kts
index 5d53a9402..156534954 100644
--- a/framework/usage-stats-manager/build.gradle.kts
+++ b/framework/usage-stats-manager/build.gradle.kts
@@ -28,5 +28,5 @@ android {
 
 dependencies {
     implementation(projects.core.common)
-    implementation(projects.core.model)
+    implementation(projects.core.domain)
 }
\ No newline at end of file
diff --git a/framework/usage-stats-manager/src/main/kotlin/com/android/geto/framework/usagestatsmanager/AndroidUsageStatsManagerWrapper.kt b/framework/usage-stats-manager/src/main/kotlin/com/android/geto/framework/usagestatsmanager/AndroidUsageStatsManagerWrapper.kt
index 714339792..66fbaaf56 100644
--- a/framework/usage-stats-manager/src/main/kotlin/com/android/geto/framework/usagestatsmanager/AndroidUsageStatsManagerWrapper.kt
+++ b/framework/usage-stats-manager/src/main/kotlin/com/android/geto/framework/usagestatsmanager/AndroidUsageStatsManagerWrapper.kt
@@ -28,8 +28,9 @@ import android.provider.Settings
 import androidx.core.content.getSystemService
 import com.android.geto.core.common.Dispatcher
 import com.android.geto.core.common.GetoDispatchers.Default
-import com.android.geto.core.model.GetoLifeCycle
-import com.android.geto.core.model.GetoUsageEvent
+import com.android.geto.core.domain.framework.UsageStatsManagerWrapper
+import com.android.geto.core.domain.model.GetoLifeCycle
+import com.android.geto.core.domain.model.GetoUsageEvent
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.delay
diff --git a/framework/usage-stats-manager/src/main/kotlin/com/android/geto/framework/usagestatsmanager/UsageStatsManagerModule.kt b/framework/usage-stats-manager/src/main/kotlin/com/android/geto/framework/usagestatsmanager/UsageStatsManagerModule.kt
index 46c158ccd..8e7c0bb9f 100644
--- a/framework/usage-stats-manager/src/main/kotlin/com/android/geto/framework/usagestatsmanager/UsageStatsManagerModule.kt
+++ b/framework/usage-stats-manager/src/main/kotlin/com/android/geto/framework/usagestatsmanager/UsageStatsManagerModule.kt
@@ -17,6 +17,7 @@
  */
 package com.android.geto.framework.usagestatsmanager
 
+import com.android.geto.core.domain.framework.UsageStatsManagerWrapper
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
diff --git a/settings.gradle.kts b/settings.gradle.kts
index cd87cb817..970b6c71c 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -46,7 +46,6 @@ include(":core:datastore-proto")
 include(":core:datastore-test")
 include(":core:design-system")
 include(":core:domain")
-include(":core:model")
 include(":core:screenshot-testing")
 include(":core:testing")
 include(":core:ui")

From ae682297db7d15291495474e7cc39251293a0e09 Mon Sep 17 00:00:00 2001
From: JackEblan <jackeblan115@gmail.com>
Date: Tue, 12 Nov 2024 05:16:48 +0800
Subject: [PATCH 2/7] Rename

---
 ...UpdateUsageStatsForegroundServiceResult.kt |  24 ++++++++
 .../AppSettingsScreenDialogsTest.kt           |  24 +++++---
 .../feature/appsettings/AppSettingsScreen.kt  |  43 ++++++-------
 .../permission/PermissionDialogState.kt       |  58 ------------------
 .../WriteSecureSettingsPermissionDialog.kt}   |  16 ++---
 ...SettingsPermissionDialogScreenshotTest.kt} |  20 +++---
 ...cureSettingsPermissionDialog_foldable.png} | Bin
 ...ettingsPermissionDialog_foldable_dark.png} | Bin
 8 files changed, 77 insertions(+), 108 deletions(-)
 create mode 100644 core/domain/src/main/kotlin/com/android/geto/core/domain/model/UpdateUsageStatsForegroundServiceResult.kt
 delete mode 100644 feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/dialog/permission/PermissionDialogState.kt
 rename feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/dialog/{permission/PermissionDialog.kt => writesecuresettingspermission/WriteSecureSettingsPermissionDialog.kt} (89%)
 rename feature/app-settings/src/test/kotlin/com/android/geto/feature/appsettings/dialog/{permission/PermissionDialogScreenshotTest.kt => writesecuresettingspermission/WriteSecureSettingsPermissionDialogScreenshotTest.kt} (83%)
 rename feature/app-settings/src/test/screenshots/{PermissionDialog_foldable.png => WriteSecureSettingsPermissionDialog_foldable.png} (100%)
 rename feature/app-settings/src/test/screenshots/{PermissionDialog_foldable_dark.png => WriteSecureSettingsPermissionDialog_foldable_dark.png} (100%)

diff --git a/core/domain/src/main/kotlin/com/android/geto/core/domain/model/UpdateUsageStatsForegroundServiceResult.kt b/core/domain/src/main/kotlin/com/android/geto/core/domain/model/UpdateUsageStatsForegroundServiceResult.kt
new file mode 100644
index 000000000..ebc87977f
--- /dev/null
+++ b/core/domain/src/main/kotlin/com/android/geto/core/domain/model/UpdateUsageStatsForegroundServiceResult.kt
@@ -0,0 +1,24 @@
+/*
+ *
+ *   Copyright 2023 Einstein Blanco
+ *
+ *   Licensed under the GNU General Public License v3.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       https://www.gnu.org/licenses/gpl-3.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *
+ */
+package com.android.geto.core.domain.model
+
+enum class UpdateUsageStatsForegroundServiceResult {
+    RequestPermission,
+    Start,
+    Stop,
+}
diff --git a/feature/app-settings/src/androidTest/kotlin/com/android/geto/feature/appsettings/AppSettingsScreenDialogsTest.kt b/feature/app-settings/src/androidTest/kotlin/com/android/geto/feature/appsettings/AppSettingsScreenDialogsTest.kt
index 7e03e96ff..f75e7be88 100644
--- a/feature/app-settings/src/androidTest/kotlin/com/android/geto/feature/appsettings/AppSettingsScreenDialogsTest.kt
+++ b/feature/app-settings/src/androidTest/kotlin/com/android/geto/feature/appsettings/AppSettingsScreenDialogsTest.kt
@@ -80,7 +80,7 @@ class AppSettingsScreenDialogsTest {
     }
 
     @Test
-    fun permissionDialog_isDisplayed_whenApplyAppSettingsResult_isNoPermission_thenDismissed() {
+    fun writeSecureSettingsPermissionDialog_isDisplayed_whenApplyAppSettingsResult_isNoPermission_thenDismissed() {
         composeTestRule.setContent {
             AppSettingsScreen(
                 packageName = "com.android.geto",
@@ -101,15 +101,17 @@ class AppSettingsScreenDialogsTest {
             )
         }
 
-        composeTestRule.onNodeWithContentDescription("Permission Dialog").assertIsDisplayed()
+        composeTestRule.onNodeWithContentDescription("Write Secure Settings Permission Dialog")
+            .assertIsDisplayed()
 
         composeTestRule.onNodeWithText("Cancel").performClick()
 
-        composeTestRule.onNodeWithContentDescription("Permission Dialog").assertIsNotDisplayed()
+        composeTestRule.onNodeWithContentDescription("Write Secure Settings Permission Dialog")
+            .assertIsNotDisplayed()
     }
 
     @Test
-    fun permissionDialog_isDisplayed_whenRevertAppSettingsResult_isNoPermission_thenDismissed() {
+    fun writeSecureSettingsPermissionDialog_isDisplayed_whenRevertAppSettingsResult_isNoPermission_thenDismissed() {
         composeTestRule.setContent {
             AppSettingsScreen(
                 packageName = "com.android.geto",
@@ -130,15 +132,17 @@ class AppSettingsScreenDialogsTest {
             )
         }
 
-        composeTestRule.onNodeWithContentDescription("Permission Dialog").assertIsDisplayed()
+        composeTestRule.onNodeWithContentDescription("Write Secure Settings Permission Dialog")
+            .assertIsDisplayed()
 
         composeTestRule.onNodeWithText("Cancel").performClick()
 
-        composeTestRule.onNodeWithContentDescription("Permission Dialog").assertIsNotDisplayed()
+        composeTestRule.onNodeWithContentDescription("Write Secure Settings Permission Dialog")
+            .assertIsNotDisplayed()
     }
 
     @Test
-    fun permissionDialog_isDisplayed_whenAutoLaunchResult_isNoPermission_thenDismissed() {
+    fun writeSecureSettingsPermissionDialog_isDisplayed_whenAutoLaunchResult_isNoPermission_thenDismissed() {
         composeTestRule.setContent {
             AppSettingsScreen(
                 packageName = "com.android.geto",
@@ -159,11 +163,13 @@ class AppSettingsScreenDialogsTest {
             )
         }
 
-        composeTestRule.onNodeWithContentDescription("Permission Dialog").assertIsDisplayed()
+        composeTestRule.onNodeWithContentDescription("Write Secure Settings Permission Dialog")
+            .assertIsDisplayed()
 
         composeTestRule.onNodeWithText("Cancel").performClick()
 
-        composeTestRule.onNodeWithContentDescription("Permission Dialog").assertIsNotDisplayed()
+        composeTestRule.onNodeWithContentDescription("Write Secure Settings Permission Dialog")
+            .assertIsNotDisplayed()
     }
 
     @Test
diff --git a/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/AppSettingsScreen.kt b/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/AppSettingsScreen.kt
index 479603228..d0d45284c 100644
--- a/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/AppSettingsScreen.kt
+++ b/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/AppSettingsScreen.kt
@@ -51,7 +51,10 @@ import androidx.compose.material3.TopAppBar
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
 import androidx.compose.runtime.snapshotFlow
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -101,9 +104,6 @@ import com.android.geto.feature.appsettings.AppSettingsEvent.RevertAppSettings
 import com.android.geto.feature.appsettings.dialog.appsetting.AppSettingDialog
 import com.android.geto.feature.appsettings.dialog.appsetting.AppSettingDialogState
 import com.android.geto.feature.appsettings.dialog.appsetting.rememberAppSettingDialogState
-import com.android.geto.feature.appsettings.dialog.permission.PermissionDialog
-import com.android.geto.feature.appsettings.dialog.permission.PermissionDialogState
-import com.android.geto.feature.appsettings.dialog.permission.rememberPermissionDialogState
 import com.android.geto.feature.appsettings.dialog.shortcut.ShortcutDialog
 import com.android.geto.feature.appsettings.dialog.shortcut.ShortcutDialogState
 import com.android.geto.feature.appsettings.dialog.shortcut.rememberShortcutDialogState
@@ -111,6 +111,7 @@ import com.android.geto.feature.appsettings.dialog.template.TemplateDialog
 import com.android.geto.feature.appsettings.dialog.template.TemplateDialogState
 import com.android.geto.feature.appsettings.dialog.template.TemplateDialogUiState
 import com.android.geto.feature.appsettings.dialog.template.rememberTemplateDialogState
+import com.android.geto.feature.appsettings.dialog.writesecuresettingspermission.WriteSecureSettingsPermissionDialog
 import com.android.geto.feature.appsettings.navigation.AppSettingsRouteData
 import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.flow.collect
@@ -189,7 +190,7 @@ internal fun AppSettingsScreen(
     onNavigationIconClick: () -> Unit,
     onEvent: (AppSettingsEvent) -> Unit,
 ) {
-    val permissionDialogState = rememberPermissionDialogState()
+    var showPermissionDialog by rememberSaveable { mutableStateOf(false) }
 
     val appSettingDialogState = rememberAppSettingDialogState()
 
@@ -199,7 +200,6 @@ internal fun AppSettingsScreen(
 
     AppSettingsLaunchedEffects(
         snackbarHostState = snackbarHostState,
-        permissionDialogState = permissionDialogState,
         appSettingDialogState = appSettingDialogState,
         shortcutDialogState = shortcutDialogState,
         applicationIcon = applicationIcon,
@@ -210,6 +210,9 @@ internal fun AppSettingsScreen(
         autoLaunchResult = autoLaunchResult,
         requestPinShortcutResult = requestPinShortcutResult,
         setPrimaryClipResult = setPrimaryClipResult,
+        onShowPermissionDialog = {
+            showPermissionDialog = true
+        },
         onResetApplyAppSettingsResult = { onEvent(ResetApplyAppSettingsResult) },
         onResetRevertAppSettingsResult = { onEvent(ResetRevertAppSettingsResult) },
         onResetAutoLaunchResult = { onEvent(ResetAutoLaunchResult) },
@@ -237,7 +240,7 @@ internal fun AppSettingsScreen(
     )
 
     AppSettingsDialogs(
-        permissionDialogState = permissionDialogState,
+        showPermissionDialog = showPermissionDialog,
         appSettingDialogState = appSettingDialogState,
         shortcutDialogState = shortcutDialogState,
         templateDialogUiState = templateDialogUiState,
@@ -253,6 +256,9 @@ internal fun AppSettingsScreen(
             )
         },
         onAddShortcut = { onEvent(RequestPinShortcut(it)) },
+        onPermissionDialogDismissRequest = {
+            showPermissionDialog = false
+        },
     )
 
     Scaffold(
@@ -318,7 +324,6 @@ internal fun AppSettingsScreen(
 @Composable
 private fun AppSettingsLaunchedEffects(
     snackbarHostState: SnackbarHostState,
-    permissionDialogState: PermissionDialogState,
     appSettingDialogState: AppSettingDialogState,
     shortcutDialogState: ShortcutDialogState,
     applicationIcon: Drawable?,
@@ -329,6 +334,7 @@ private fun AppSettingsLaunchedEffects(
     autoLaunchResult: AppSettingsResult?,
     requestPinShortcutResult: RequestPinShortcutResult?,
     setPrimaryClipResult: Boolean,
+    onShowPermissionDialog: () -> Unit,
     onResetApplyAppSettingsResult: () -> Unit,
     onResetRevertAppSettingsResult: () -> Unit,
     onResetAutoLaunchResult: () -> Unit,
@@ -393,9 +399,7 @@ private fun AppSettingsLaunchedEffects(
             }
 
             NoPermission -> {
-                permissionDialogState.updateShowDialog(
-                    true,
-                )
+                onShowPermissionDialog()
             }
 
             Success -> {
@@ -433,9 +437,7 @@ private fun AppSettingsLaunchedEffects(
             }
 
             NoPermission -> {
-                permissionDialogState.updateShowDialog(
-                    true,
-                )
+                onShowPermissionDialog()
             }
 
             Success -> {
@@ -459,9 +461,7 @@ private fun AppSettingsLaunchedEffects(
     LaunchedEffect(key1 = autoLaunchResult) {
         when (autoLaunchResult) {
             NoPermission -> {
-                permissionDialogState.updateShowDialog(
-                    true,
-                )
+                onShowPermissionDialog()
             }
 
             Success -> {
@@ -588,7 +588,7 @@ private fun AppSettingsLaunchedEffects(
 
 @Composable
 private fun AppSettingsDialogs(
-    permissionDialogState: PermissionDialogState,
+    showPermissionDialog: Boolean,
     appSettingDialogState: AppSettingDialogState,
     shortcutDialogState: ShortcutDialogState,
     templateDialogUiState: TemplateDialogUiState,
@@ -597,6 +597,7 @@ private fun AppSettingsDialogs(
     onAddAppSetting: (AppSetting) -> Unit,
     onCopyPermissionCommand: (String, String) -> Unit,
     onAddShortcut: (GetoShortcutInfoCompat) -> Unit,
+    onPermissionDialogDismissRequest: () -> Unit,
 ) {
     if (appSettingDialogState.showDialog) {
         AppSettingDialog(
@@ -607,11 +608,11 @@ private fun AppSettingsDialogs(
         )
     }
 
-    if (permissionDialogState.showDialog) {
-        PermissionDialog(
-            permissionDialogState = permissionDialogState,
+    if (showPermissionDialog) {
+        WriteSecureSettingsPermissionDialog(
             onCopyClick = onCopyPermissionCommand,
-            contentDescription = "Permission Dialog",
+            contentDescription = "Write Secure Settings Permission Dialog",
+            onDismissRequest = onPermissionDialogDismissRequest,
         )
     }
 
diff --git a/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/dialog/permission/PermissionDialogState.kt b/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/dialog/permission/PermissionDialogState.kt
deleted file mode 100644
index c49d50db7..000000000
--- a/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/dialog/permission/PermissionDialogState.kt
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- *
- *   Copyright 2023 Einstein Blanco
- *
- *   Licensed under the GNU General Public License v3.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *       https://www.gnu.org/licenses/gpl-3.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- *
- */
-package com.android.geto.feature.appsettings.dialog.permission
-
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.Stable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.saveable.listSaver
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.runtime.setValue
-
-@Composable
-internal fun rememberPermissionDialogState(): PermissionDialogState {
-    return rememberSaveable(saver = PermissionDialogState.Saver) {
-        PermissionDialogState()
-    }
-}
-
-@Stable
-internal class PermissionDialogState {
-    var showDialog by mutableStateOf(false)
-        private set
-
-    fun updateShowDialog(value: Boolean) {
-        showDialog = value
-    }
-
-    companion object {
-        val Saver = listSaver<PermissionDialogState, Any>(
-            save = { state ->
-                listOf(
-                    state.showDialog,
-                )
-            },
-            restore = {
-                PermissionDialogState().apply {
-                    showDialog = it[0] as Boolean
-                }
-            },
-        )
-    }
-}
diff --git a/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/dialog/permission/PermissionDialog.kt b/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/dialog/writesecuresettingspermission/WriteSecureSettingsPermissionDialog.kt
similarity index 89%
rename from feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/dialog/permission/PermissionDialog.kt
rename to feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/dialog/writesecuresettingspermission/WriteSecureSettingsPermissionDialog.kt
index 8246bf1c7..ed135dd8a 100644
--- a/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/dialog/permission/PermissionDialog.kt
+++ b/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/dialog/writesecuresettingspermission/WriteSecureSettingsPermissionDialog.kt
@@ -15,7 +15,7 @@
  *   limitations under the License.
  *
  */
-package com.android.geto.feature.appsettings.dialog.permission
+package com.android.geto.feature.appsettings.dialog.writesecuresettingspermission
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -37,11 +37,11 @@ import com.android.geto.core.designsystem.component.DialogContainer
 import com.android.geto.feature.appsettings.R
 
 @Composable
-internal fun PermissionDialog(
+internal fun WriteSecureSettingsPermissionDialog(
     modifier: Modifier = Modifier,
-    permissionDialogState: PermissionDialogState,
     contentDescription: String,
     onCopyClick: (String, String) -> Unit,
+    onDismissRequest: () -> Unit,
 ) {
     val commandLabel = stringResource(R.string.command_label)
     val command = stringResource(R.string.command)
@@ -50,9 +50,7 @@ internal fun PermissionDialog(
         modifier = modifier
             .padding(16.dp)
             .semantics { this.contentDescription = contentDescription },
-        onDismissRequest = {
-            permissionDialogState.updateShowDialog(false)
-        },
+        onDismissRequest = onDismissRequest,
     ) {
         Column(
             modifier = Modifier.fillMaxWidth(),
@@ -62,13 +60,11 @@ internal fun PermissionDialog(
             PermissionDialogContent()
 
             PermissionDialogButtons(
-                onCancelClick = {
-                    permissionDialogState.updateShowDialog(false)
-                },
+                onCancelClick = onDismissRequest,
                 onCopyClick = {
                     onCopyClick(commandLabel, command)
 
-                    permissionDialogState.updateShowDialog(false)
+                    onDismissRequest()
                 },
             )
         }
diff --git a/feature/app-settings/src/test/kotlin/com/android/geto/feature/appsettings/dialog/permission/PermissionDialogScreenshotTest.kt b/feature/app-settings/src/test/kotlin/com/android/geto/feature/appsettings/dialog/writesecuresettingspermission/WriteSecureSettingsPermissionDialogScreenshotTest.kt
similarity index 83%
rename from feature/app-settings/src/test/kotlin/com/android/geto/feature/appsettings/dialog/permission/PermissionDialogScreenshotTest.kt
rename to feature/app-settings/src/test/kotlin/com/android/geto/feature/appsettings/dialog/writesecuresettingspermission/WriteSecureSettingsPermissionDialogScreenshotTest.kt
index 734accad9..93f11263a 100644
--- a/feature/app-settings/src/test/kotlin/com/android/geto/feature/appsettings/dialog/permission/PermissionDialogScreenshotTest.kt
+++ b/feature/app-settings/src/test/kotlin/com/android/geto/feature/appsettings/dialog/writesecuresettingspermission/WriteSecureSettingsPermissionDialogScreenshotTest.kt
@@ -15,7 +15,7 @@
  *   limitations under the License.
  *
  */
-package com.android.geto.feature.appsettings.dialog.permission
+package com.android.geto.feature.appsettings.dialog.writesecuresettingspermission
 
 import androidx.activity.ComponentActivity
 import androidx.compose.material3.Surface
@@ -38,7 +38,7 @@ import kotlin.test.Test
 @GraphicsMode(GraphicsMode.Mode.NATIVE)
 @Config(application = HiltTestApplication::class)
 @LooperMode(LooperMode.Mode.PAUSED)
-class PermissionDialogScreenshotTest {
+class WriteSecureSettingsPermissionDialogScreenshotTest {
 
     @get:Rule
     val composeTestRule = createAndroidComposeRule<ComponentActivity>()
@@ -46,15 +46,15 @@ class PermissionDialogScreenshotTest {
     @Test
     fun permissionDialog() {
         composeTestRule.captureDialogForDevice(
-            fileName = "PermissionDialog",
+            fileName = "WriteSecureSettingsPermissionDialog",
             deviceName = "foldable",
             deviceSpec = DefaultTestDevices.FOLDABLE.spec,
         ) {
             GetoTheme {
-                PermissionDialog(
-                    permissionDialogState = rememberPermissionDialogState(),
-                    onCopyClick = { _, _ -> },
+                WriteSecureSettingsPermissionDialog(
                     contentDescription = "",
+                    onCopyClick = { _, _ -> },
+                    onDismissRequest = {},
                 )
             }
         }
@@ -63,17 +63,17 @@ class PermissionDialogScreenshotTest {
     @Test
     fun permissionDialog_dark() {
         composeTestRule.captureDialogForDevice(
-            fileName = "PermissionDialog",
+            fileName = "WriteSecureSettingsPermissionDialog",
             deviceName = "foldable_dark",
             deviceSpec = DefaultTestDevices.FOLDABLE.spec,
             darkMode = true,
         ) {
             GetoTheme {
                 Surface {
-                    PermissionDialog(
-                        permissionDialogState = rememberPermissionDialogState(),
-                        onCopyClick = { _, _ -> },
+                    WriteSecureSettingsPermissionDialog(
                         contentDescription = "",
+                        onCopyClick = { _, _ -> },
+                        onDismissRequest = {},
                     )
                 }
             }
diff --git a/feature/app-settings/src/test/screenshots/PermissionDialog_foldable.png b/feature/app-settings/src/test/screenshots/WriteSecureSettingsPermissionDialog_foldable.png
similarity index 100%
rename from feature/app-settings/src/test/screenshots/PermissionDialog_foldable.png
rename to feature/app-settings/src/test/screenshots/WriteSecureSettingsPermissionDialog_foldable.png
diff --git a/feature/app-settings/src/test/screenshots/PermissionDialog_foldable_dark.png b/feature/app-settings/src/test/screenshots/WriteSecureSettingsPermissionDialog_foldable_dark.png
similarity index 100%
rename from feature/app-settings/src/test/screenshots/PermissionDialog_foldable_dark.png
rename to feature/app-settings/src/test/screenshots/WriteSecureSettingsPermissionDialog_foldable_dark.png

From 4d5bea58030fd07fe81bcfc3ca440cf6bcd39d48 Mon Sep 17 00:00:00 2001
From: JackEblan <jackeblan115@gmail.com>
Date: Tue, 12 Nov 2024 06:27:11 +0800
Subject: [PATCH 3/7] Fixed failed tests

---
 .idea/gradle.xml                              |  1 -
 .../UsageStatsForegroundServiceManager.kt     |  4 +-
 ...pdateUsageStatsForegroundServiceUseCase.kt |  9 +--
 ...eUsageStatsForegroundServiceUseCaseTest.kt | 80 -------------------
 core/model/build.gradle.kts                   | 29 -------
 .../FakeUsageStatsForegroundServiceManager.kt | 16 ++--
 .../geto/feature/service/ServiceScreen.kt     |  9 +--
 .../geto/feature/service/ServiceViewModel.kt  | 24 +++---
 .../service/ServiceScreenScreenshotTest.kt    |  9 +--
 .../feature/service/ServiceViewModelTest.kt   | 39 ++-------
 ...droidUsageStatsForegroundServiceManager.kt | 14 ++--
 11 files changed, 53 insertions(+), 181 deletions(-)
 delete mode 100644 core/domain/src/test/kotlin/com/android/geto/core/domain/usecase/UpdateUsageStatsForegroundServiceUseCaseTest.kt
 delete mode 100644 core/model/build.gradle.kts

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 859d9c749..19d4374f5 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -37,7 +37,6 @@
             <option value="$PROJECT_DIR$/core/datastore-test" />
             <option value="$PROJECT_DIR$/core/design-system" />
             <option value="$PROJECT_DIR$/core/domain" />
-            <option value="$PROJECT_DIR$/core/model" />
             <option value="$PROJECT_DIR$/core/screenshot-testing" />
             <option value="$PROJECT_DIR$/core/testing" />
             <option value="$PROJECT_DIR$/core/ui" />
diff --git a/core/domain/src/main/kotlin/com/android/geto/core/domain/foregroundservice/UsageStatsForegroundServiceManager.kt b/core/domain/src/main/kotlin/com/android/geto/core/domain/foregroundservice/UsageStatsForegroundServiceManager.kt
index d7accf333..ff045e3a3 100644
--- a/core/domain/src/main/kotlin/com/android/geto/core/domain/foregroundservice/UsageStatsForegroundServiceManager.kt
+++ b/core/domain/src/main/kotlin/com/android/geto/core/domain/foregroundservice/UsageStatsForegroundServiceManager.kt
@@ -17,8 +17,10 @@
  */
 package com.android.geto.core.domain.foregroundservice
 
+import kotlinx.coroutines.flow.Flow
+
 interface UsageStatsForegroundServiceManager {
-    val isActive: Boolean
+    val isActive: Flow<Boolean>
 
     fun startForegroundService()
 
diff --git a/core/domain/src/main/kotlin/com/android/geto/core/domain/usecase/UpdateUsageStatsForegroundServiceUseCase.kt b/core/domain/src/main/kotlin/com/android/geto/core/domain/usecase/UpdateUsageStatsForegroundServiceUseCase.kt
index 963345f5e..9fef8b292 100644
--- a/core/domain/src/main/kotlin/com/android/geto/core/domain/usecase/UpdateUsageStatsForegroundServiceUseCase.kt
+++ b/core/domain/src/main/kotlin/com/android/geto/core/domain/usecase/UpdateUsageStatsForegroundServiceUseCase.kt
@@ -19,25 +19,22 @@ package com.android.geto.core.domain.usecase
 
 import com.android.geto.core.domain.foregroundservice.UsageStatsForegroundServiceManager
 import com.android.geto.core.domain.framework.UsageStatsManagerWrapper
-import com.android.geto.core.domain.model.UpdateUsageStatsForegroundServiceResult
 import javax.inject.Inject
 
 class UpdateUsageStatsForegroundServiceUseCase @Inject constructor(
     private val usageStatsForegroundServiceManager: UsageStatsForegroundServiceManager,
     private val usageStatsManagerWrapper: UsageStatsManagerWrapper,
 ) {
-    operator fun invoke(): UpdateUsageStatsForegroundServiceResult {
+    operator fun invoke(isActive: Boolean) {
         if (usageStatsManagerWrapper.isUsageStatsPermissionGranted().not()) {
             usageStatsManagerWrapper.requestUsageStatsPermission()
-            return UpdateUsageStatsForegroundServiceResult.RequestPermission
+            return
         }
 
-        return if (usageStatsForegroundServiceManager.isActive) {
+        return if (isActive) {
             usageStatsForegroundServiceManager.stopForegroundService()
-            UpdateUsageStatsForegroundServiceResult.Stop
         } else {
             usageStatsForegroundServiceManager.startForegroundService()
-            UpdateUsageStatsForegroundServiceResult.Start
         }
     }
 }
diff --git a/core/domain/src/test/kotlin/com/android/geto/core/domain/usecase/UpdateUsageStatsForegroundServiceUseCaseTest.kt b/core/domain/src/test/kotlin/com/android/geto/core/domain/usecase/UpdateUsageStatsForegroundServiceUseCaseTest.kt
deleted file mode 100644
index a9fe1b4c1..000000000
--- a/core/domain/src/test/kotlin/com/android/geto/core/domain/usecase/UpdateUsageStatsForegroundServiceUseCaseTest.kt
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- *
- *   Copyright 2023 Einstein Blanco
- *
- *   Licensed under the GNU General Public License v3.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *       https://www.gnu.org/licenses/gpl-3.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- *
- */
-package com.android.geto.core.domain.usecase
-
-import com.android.geto.core.domain.model.UpdateUsageStatsForegroundServiceResult
-import com.android.geto.core.testing.framework.FakeUsageStatsForegroundServiceManager
-import com.android.geto.core.testing.framework.FakeUsageStatsManagerWrapper
-import kotlinx.coroutines.test.runTest
-import org.junit.Before
-import org.junit.Test
-import kotlin.test.assertEquals
-
-class UpdateUsageStatsForegroundServiceUseCaseTest {
-    private lateinit var usageStatsForegroundServiceManager: FakeUsageStatsForegroundServiceManager
-
-    private lateinit var usageStatsManagerWrapper: FakeUsageStatsManagerWrapper
-
-    private lateinit var updateUsageStatsForegroundServiceUseCase: UpdateUsageStatsForegroundServiceUseCase
-
-    @Before
-    fun setup() {
-        usageStatsForegroundServiceManager = FakeUsageStatsForegroundServiceManager()
-
-        usageStatsManagerWrapper = FakeUsageStatsManagerWrapper()
-
-        updateUsageStatsForegroundServiceUseCase = UpdateUsageStatsForegroundServiceUseCase(
-            usageStatsForegroundServiceManager = usageStatsForegroundServiceManager,
-            usageStatsManagerWrapper = usageStatsManagerWrapper,
-        )
-    }
-
-    @Test
-    fun updateUsageStatsForegroundServiceUseCase_requestPermission() = runTest {
-        usageStatsManagerWrapper.setUsageStatsPermissionGranted(false)
-
-        assertEquals(
-            expected = UpdateUsageStatsForegroundServiceResult.RequestPermission,
-            actual = updateUsageStatsForegroundServiceUseCase(),
-        )
-    }
-
-    @Test
-    fun updateUsageStatsForegroundServiceUseCase_start() = runTest {
-        usageStatsForegroundServiceManager.setActive(false)
-
-        usageStatsManagerWrapper.setUsageStatsPermissionGranted(true)
-
-        assertEquals(
-            expected = UpdateUsageStatsForegroundServiceResult.Start,
-            actual = updateUsageStatsForegroundServiceUseCase(),
-        )
-    }
-
-    @Test
-    fun updateUsageStatsForegroundServiceUseCase_stop() = runTest {
-        usageStatsForegroundServiceManager.setActive(true)
-
-        usageStatsManagerWrapper.setUsageStatsPermissionGranted(true)
-
-        assertEquals(
-            expected = UpdateUsageStatsForegroundServiceResult.Stop,
-            actual = updateUsageStatsForegroundServiceUseCase(),
-        )
-    }
-}
diff --git a/core/model/build.gradle.kts b/core/model/build.gradle.kts
deleted file mode 100644
index 7ee80a132..000000000
--- a/core/model/build.gradle.kts
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *
- *   Copyright 2023 Einstein Blanco
- *
- *   Licensed under the GNU General Public License v3.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *       https://www.gnu.org/licenses/gpl-3.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- *
- */
-
-plugins {
-    alias(libs.plugins.com.android.geto.library)
-}
-
-android {
-    namespace = "com.android.geto.core.model"
-
-    defaultConfig {
-        consumerProguardFiles("consumer-proguard-rules.pro")
-    }
-}
\ No newline at end of file
diff --git a/core/testing/src/main/kotlin/com/android/geto/core/testing/framework/FakeUsageStatsForegroundServiceManager.kt b/core/testing/src/main/kotlin/com/android/geto/core/testing/framework/FakeUsageStatsForegroundServiceManager.kt
index df128887c..cab45f02e 100644
--- a/core/testing/src/main/kotlin/com/android/geto/core/testing/framework/FakeUsageStatsForegroundServiceManager.kt
+++ b/core/testing/src/main/kotlin/com/android/geto/core/testing/framework/FakeUsageStatsForegroundServiceManager.kt
@@ -18,21 +18,21 @@
 package com.android.geto.core.testing.framework
 
 import com.android.geto.core.domain.foregroundservice.UsageStatsForegroundServiceManager
+import kotlinx.coroutines.channels.BufferOverflow
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.asSharedFlow
 
 class FakeUsageStatsForegroundServiceManager : UsageStatsForegroundServiceManager {
-    private var _isActive = false
+    private val _isActive =
+        MutableSharedFlow<Boolean>(replay = 1, onBufferOverflow = BufferOverflow.DROP_OLDEST)
 
-    override val isActive get() = _isActive
+    override val isActive = _isActive.asSharedFlow()
 
     override fun startForegroundService() {
-        _isActive = true
+        _isActive.tryEmit(true)
     }
 
     override fun stopForegroundService() {
-        _isActive = false
-    }
-
-    fun setActive(value: Boolean) {
-        _isActive = value
+        _isActive.tryEmit(false)
     }
 }
diff --git a/feature/service/src/main/kotlin/com/android/geto/feature/service/ServiceScreen.kt b/feature/service/src/main/kotlin/com/android/geto/feature/service/ServiceScreen.kt
index 6d368b910..91c1896a6 100644
--- a/feature/service/src/main/kotlin/com/android/geto/feature/service/ServiceScreen.kt
+++ b/feature/service/src/main/kotlin/com/android/geto/feature/service/ServiceScreen.kt
@@ -24,18 +24,17 @@ import androidx.compose.ui.Modifier
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.android.geto.core.designsystem.component.WavyCircle
-import com.android.geto.core.domain.model.UpdateUsageStatsForegroundServiceResult
 
 @Composable
 internal fun ServiceRoute(
     modifier: Modifier = Modifier,
     viewModel: ServiceViewModel = hiltViewModel(),
 ) {
-    val updateUsageStatsForegroundServiceResult by viewModel.updateUsageStatsForegroundServiceResult.collectAsStateWithLifecycle()
+    val usageStatsForegroundServiceActive by viewModel.usageStatsForegroundServiceActive.collectAsStateWithLifecycle()
 
     ServiceScreen(
         modifier = modifier,
-        updateUsageStatsForegroundServiceResult = updateUsageStatsForegroundServiceResult,
+        usageStatsForegroundServiceActive = usageStatsForegroundServiceActive,
         onEvent = viewModel::onEvent,
     )
 }
@@ -43,12 +42,12 @@ internal fun ServiceRoute(
 @Composable
 internal fun ServiceScreen(
     modifier: Modifier = Modifier,
-    updateUsageStatsForegroundServiceResult: UpdateUsageStatsForegroundServiceResult,
+    usageStatsForegroundServiceActive: Boolean,
     onEvent: (ServiceEvent) -> Unit,
 ) {
     WavyCircle(
         modifier = modifier.fillMaxSize(),
-        active = updateUsageStatsForegroundServiceResult == UpdateUsageStatsForegroundServiceResult.Start,
+        active = usageStatsForegroundServiceActive,
         onClick = {
             onEvent(ServiceEvent.UpdateUsageStatsForegroundService)
         },
diff --git a/feature/service/src/main/kotlin/com/android/geto/feature/service/ServiceViewModel.kt b/feature/service/src/main/kotlin/com/android/geto/feature/service/ServiceViewModel.kt
index 049a85bee..7288956b2 100644
--- a/feature/service/src/main/kotlin/com/android/geto/feature/service/ServiceViewModel.kt
+++ b/feature/service/src/main/kotlin/com/android/geto/feature/service/ServiceViewModel.kt
@@ -18,28 +18,32 @@
 package com.android.geto.feature.service
 
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.android.geto.core.domain.foregroundservice.UsageStatsForegroundServiceManager
 import com.android.geto.core.domain.usecase.UpdateUsageStatsForegroundServiceUseCase
 import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @HiltViewModel
 class ServiceViewModel @Inject constructor(
+    usageStatsForegroundServiceManager: UsageStatsForegroundServiceManager,
     private val updateUsageStatsForegroundServiceUseCase: UpdateUsageStatsForegroundServiceUseCase,
 ) : ViewModel() {
-    private val _updateUsageStatsForegroundServiceResult =
-        MutableStateFlow(updateUsageStatsForegroundServiceUseCase())
 
-    val updateUsageStatsForegroundServiceResult =
-        _updateUsageStatsForegroundServiceResult.asStateFlow()
+    val usageStatsForegroundServiceActive = usageStatsForegroundServiceManager.isActive.stateIn(
+        scope = viewModelScope,
+        started = SharingStarted.WhileSubscribed(5_000),
+        initialValue = false,
+    )
 
     fun onEvent(event: ServiceEvent) {
         when (event) {
-            ServiceEvent.UpdateUsageStatsForegroundService -> {
-                _updateUsageStatsForegroundServiceResult.update {
-                    updateUsageStatsForegroundServiceUseCase()
+            is ServiceEvent.UpdateUsageStatsForegroundService -> {
+                viewModelScope.launch {
+                    updateUsageStatsForegroundServiceUseCase(isActive = usageStatsForegroundServiceActive.value)
                 }
             }
         }
diff --git a/feature/service/src/test/kotlin/com/android/geto/feature/service/ServiceScreenScreenshotTest.kt b/feature/service/src/test/kotlin/com/android/geto/feature/service/ServiceScreenScreenshotTest.kt
index ad816e02b..ec4c70188 100644
--- a/feature/service/src/test/kotlin/com/android/geto/feature/service/ServiceScreenScreenshotTest.kt
+++ b/feature/service/src/test/kotlin/com/android/geto/feature/service/ServiceScreenScreenshotTest.kt
@@ -21,7 +21,6 @@ import androidx.activity.ComponentActivity
 import androidx.compose.material3.Surface
 import androidx.compose.ui.test.junit4.createAndroidComposeRule
 import com.android.geto.core.designsystem.theme.GetoTheme
-import com.android.geto.core.domain.model.UpdateUsageStatsForegroundServiceResult
 import com.android.geto.core.screenshottesting.util.DefaultTestDevices
 import com.android.geto.core.screenshottesting.util.captureScreenForDevice
 import com.android.geto.core.screenshottesting.util.captureScreenForMultiDevice
@@ -48,7 +47,7 @@ class ServiceScreenScreenshotTest {
         composeTestRule.captureScreenForMultiDevice("ServiceScreenInActive") {
             GetoTheme {
                 ServiceScreen(
-                    updateUsageStatsForegroundServiceResult = UpdateUsageStatsForegroundServiceResult.Stop,
+                    usageStatsForegroundServiceActive = false,
                     onEvent = {},
                 )
             }
@@ -60,7 +59,7 @@ class ServiceScreenScreenshotTest {
         composeTestRule.captureScreenForMultiDevice("ServiceScreenActive") {
             GetoTheme {
                 ServiceScreen(
-                    updateUsageStatsForegroundServiceResult = UpdateUsageStatsForegroundServiceResult.Start,
+                    usageStatsForegroundServiceActive = true,
                     onEvent = {},
                 )
             }
@@ -78,7 +77,7 @@ class ServiceScreenScreenshotTest {
             GetoTheme {
                 Surface {
                     ServiceScreen(
-                        updateUsageStatsForegroundServiceResult = UpdateUsageStatsForegroundServiceResult.Stop,
+                        usageStatsForegroundServiceActive = false,
                         onEvent = {},
                     )
                 }
@@ -97,7 +96,7 @@ class ServiceScreenScreenshotTest {
             GetoTheme {
                 Surface {
                     ServiceScreen(
-                        updateUsageStatsForegroundServiceResult = UpdateUsageStatsForegroundServiceResult.Start,
+                        usageStatsForegroundServiceActive = true,
                         onEvent = {},
                     )
                 }
diff --git a/feature/service/src/test/kotlin/com/android/geto/feature/service/ServiceViewModelTest.kt b/feature/service/src/test/kotlin/com/android/geto/feature/service/ServiceViewModelTest.kt
index 7dc6c1b86..bf417dadc 100644
--- a/feature/service/src/test/kotlin/com/android/geto/feature/service/ServiceViewModelTest.kt
+++ b/feature/service/src/test/kotlin/com/android/geto/feature/service/ServiceViewModelTest.kt
@@ -17,7 +17,6 @@
  */
 package com.android.geto.feature.service
 
-import com.android.geto.core.domain.model.UpdateUsageStatsForegroundServiceResult
 import com.android.geto.core.domain.usecase.UpdateUsageStatsForegroundServiceUseCase
 import com.android.geto.core.testing.framework.FakeUsageStatsForegroundServiceManager
 import com.android.geto.core.testing.framework.FakeUsageStatsManagerWrapper
@@ -29,7 +28,8 @@ import kotlinx.coroutines.test.runTest
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
-import kotlin.test.assertEquals
+import kotlin.test.assertFalse
+import kotlin.test.assertTrue
 
 class ServiceViewModelTest {
     @get:Rule
@@ -55,59 +55,36 @@ class ServiceViewModelTest {
         )
 
         viewModel = ServiceViewModel(
+            usageStatsForegroundServiceManager = usageStatsForegroundServiceManager,
             updateUsageStatsForegroundServiceUseCase = updateUsageStatsForegroundServiceUseCase,
         )
     }
 
-    @Test
-    fun updateUsageStatsForegroundService_requestPermission() = runTest {
-        backgroundScope.launch(UnconfinedTestDispatcher()) {
-            viewModel.updateUsageStatsForegroundServiceResult.collect()
-        }
-
-        usageStatsManagerWrapper.setUsageStatsPermissionGranted(false)
-
-        viewModel.onEvent(event = ServiceEvent.UpdateUsageStatsForegroundService)
-
-        assertEquals(
-            expected = UpdateUsageStatsForegroundServiceResult.RequestPermission,
-            actual = viewModel.updateUsageStatsForegroundServiceResult.value,
-        )
-    }
-
     @Test
     fun foregroundService_start() = runTest {
         backgroundScope.launch(UnconfinedTestDispatcher()) {
-            viewModel.updateUsageStatsForegroundServiceResult.collect()
+            viewModel.usageStatsForegroundServiceActive.collect()
         }
 
-        usageStatsForegroundServiceManager.setActive(false)
-
         usageStatsManagerWrapper.setUsageStatsPermissionGranted(true)
 
         viewModel.onEvent(event = ServiceEvent.UpdateUsageStatsForegroundService)
 
-        assertEquals(
-            expected = UpdateUsageStatsForegroundServiceResult.Start,
-            actual = viewModel.updateUsageStatsForegroundServiceResult.value,
-        )
+        assertTrue(viewModel.usageStatsForegroundServiceActive.value)
     }
 
     @Test
     fun foregroundService_stop() = runTest {
         backgroundScope.launch(UnconfinedTestDispatcher()) {
-            viewModel.updateUsageStatsForegroundServiceResult.collect()
+            viewModel.usageStatsForegroundServiceActive.collect()
         }
 
-        usageStatsForegroundServiceManager.setActive(true)
+        usageStatsForegroundServiceManager.startForegroundService()
 
         usageStatsManagerWrapper.setUsageStatsPermissionGranted(true)
 
         viewModel.onEvent(event = ServiceEvent.UpdateUsageStatsForegroundService)
 
-        assertEquals(
-            expected = UpdateUsageStatsForegroundServiceResult.Stop,
-            actual = viewModel.updateUsageStatsForegroundServiceResult.value,
-        )
+        assertFalse(viewModel.usageStatsForegroundServiceActive.value)
     }
 }
diff --git a/foreground-service/src/main/kotlin/com/android/geto/foregroundservice/AndroidUsageStatsForegroundServiceManager.kt b/foreground-service/src/main/kotlin/com/android/geto/foregroundservice/AndroidUsageStatsForegroundServiceManager.kt
index f83aeacb6..be75928cb 100644
--- a/foreground-service/src/main/kotlin/com/android/geto/foregroundservice/AndroidUsageStatsForegroundServiceManager.kt
+++ b/foreground-service/src/main/kotlin/com/android/geto/foregroundservice/AndroidUsageStatsForegroundServiceManager.kt
@@ -25,6 +25,9 @@ import android.os.IBinder
 import androidx.core.content.ContextCompat
 import com.android.geto.core.domain.foregroundservice.UsageStatsForegroundServiceManager
 import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.channels.BufferOverflow
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.asSharedFlow
 import javax.inject.Inject
 
 class AndroidUsageStatsForegroundServiceManager @Inject constructor(@ApplicationContext private val context: Context) :
@@ -33,9 +36,10 @@ class AndroidUsageStatsForegroundServiceManager @Inject constructor(@Application
 
     private lateinit var usageStatsService: UsageStatsService
 
-    private var mBound: Boolean = false
+    private val _isActive =
+        MutableSharedFlow<Boolean>(replay = 1, onBufferOverflow = BufferOverflow.DROP_OLDEST)
 
-    override val isActive get() = mBound && usageStatsService.isActive
+    override val isActive = _isActive.asSharedFlow()
 
     private val connection = object : ServiceConnection {
         override fun onServiceConnected(className: ComponentName, service: IBinder) {
@@ -43,11 +47,11 @@ class AndroidUsageStatsForegroundServiceManager @Inject constructor(@Application
 
             usageStatsService = binder.getService()
 
-            mBound = true
+            _isActive.tryEmit(true)
         }
 
         override fun onServiceDisconnected(arg0: ComponentName) {
-            mBound = false
+            _isActive.tryEmit(false)
         }
     }
 
@@ -60,6 +64,6 @@ class AndroidUsageStatsForegroundServiceManager @Inject constructor(@Application
     override fun stopForegroundService() {
         context.unbindService(connection)
 
-        context.stopService(usageStatsServiceIntent)
+        _isActive.tryEmit(context.stopService(usageStatsServiceIntent).not())
     }
 }

From 0eefe642dd1f7cfb9c92d48c690256f79f95c116 Mon Sep 17 00:00:00 2001
From: JackEblan <jackeblan115@gmail.com>
Date: Tue, 12 Nov 2024 06:36:17 +0800
Subject: [PATCH 4/7] Renamed bruh

---
 .../RevertSettingsBroadcastReceiver.kt        |  9 +++++++-
 .../framework/NotificationManagerWrapper.kt   |  9 ++------
 .../DummyRevertSettingsBroadcastReceiver.kt   | 23 +++++++++++++++++++
 .../appsettings/AppSettingsViewModel.kt       |  2 +-
 .../appsettings/AppSettingsViewModelTest.kt   |  7 ++++++
 .../foregroundservice/UsageStatsService.kt    |  8 -------
 .../AndroidNotificationManagerWrapper.kt      | 11 +++++----
 7 files changed, 47 insertions(+), 22 deletions(-)
 create mode 100644 core/testing/src/main/kotlin/com/android/geto/core/testing/broadcastreceiver/DummyRevertSettingsBroadcastReceiver.kt

diff --git a/core/domain/src/main/kotlin/com/android/geto/core/domain/broadcastreceiver/RevertSettingsBroadcastReceiver.kt b/core/domain/src/main/kotlin/com/android/geto/core/domain/broadcastreceiver/RevertSettingsBroadcastReceiver.kt
index 4b602159b..a74dca902 100644
--- a/core/domain/src/main/kotlin/com/android/geto/core/domain/broadcastreceiver/RevertSettingsBroadcastReceiver.kt
+++ b/core/domain/src/main/kotlin/com/android/geto/core/domain/broadcastreceiver/RevertSettingsBroadcastReceiver.kt
@@ -17,4 +17,11 @@
  */
 package com.android.geto.core.domain.broadcastreceiver
 
-interface RevertSettingsBroadcastReceiver
+interface RevertSettingsBroadcastReceiver {
+
+    companion object {
+        const val ACTION_REVERT_SETTINGS = "ACTION_REVERT_SETTINGS"
+        const val EXTRA_PACKAGE_NAME = "package_name"
+        const val EXTRA_NOTIFICATION_ID = "notification_id"
+    }
+}
diff --git a/core/domain/src/main/kotlin/com/android/geto/core/domain/framework/NotificationManagerWrapper.kt b/core/domain/src/main/kotlin/com/android/geto/core/domain/framework/NotificationManagerWrapper.kt
index a53212a56..31d9a9010 100644
--- a/core/domain/src/main/kotlin/com/android/geto/core/domain/framework/NotificationManagerWrapper.kt
+++ b/core/domain/src/main/kotlin/com/android/geto/core/domain/framework/NotificationManagerWrapper.kt
@@ -20,6 +20,7 @@ package com.android.geto.core.domain.framework
 import android.app.Notification
 import android.graphics.drawable.Drawable
 import androidx.annotation.RequiresPermission
+import com.android.geto.core.domain.broadcastreceiver.RevertSettingsBroadcastReceiver
 
 interface NotificationManagerWrapper {
     @RequiresPermission("android.permission.POST_NOTIFICATIONS")
@@ -31,7 +32,7 @@ interface NotificationManagerWrapper {
     ): Notification
 
     fun getRevertNotification(
-        cls: Class<*>,
+        revertSettingsBroadcastReceiver: RevertSettingsBroadcastReceiver,
         packageName: String,
         icon: Drawable?,
         contentTitle: String,
@@ -39,10 +40,4 @@ interface NotificationManagerWrapper {
     ): Notification
 
     fun cancel(id: Int)
-
-    companion object {
-        const val ACTION_REVERT_SETTINGS = "ACTION_REVERT_SETTINGS"
-        const val EXTRA_PACKAGE_NAME = "package_name"
-        const val EXTRA_NOTIFICATION_ID = "notification_id"
-    }
 }
diff --git a/core/testing/src/main/kotlin/com/android/geto/core/testing/broadcastreceiver/DummyRevertSettingsBroadcastReceiver.kt b/core/testing/src/main/kotlin/com/android/geto/core/testing/broadcastreceiver/DummyRevertSettingsBroadcastReceiver.kt
new file mode 100644
index 000000000..77793a8a3
--- /dev/null
+++ b/core/testing/src/main/kotlin/com/android/geto/core/testing/broadcastreceiver/DummyRevertSettingsBroadcastReceiver.kt
@@ -0,0 +1,23 @@
+/*
+ *
+ *   Copyright 2023 Einstein Blanco
+ *
+ *   Licensed under the GNU General Public License v3.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       https://www.gnu.org/licenses/gpl-3.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *
+ */
+
+package com.android.geto.core.testing.broadcastreceiver
+
+import com.android.geto.core.domain.broadcastreceiver.RevertSettingsBroadcastReceiver
+
+class DummyRevertSettingsBroadcastReceiver: RevertSettingsBroadcastReceiver {}
\ No newline at end of file
diff --git a/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/AppSettingsViewModel.kt b/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/AppSettingsViewModel.kt
index f7aafd275..157e5481c 100644
--- a/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/AppSettingsViewModel.kt
+++ b/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/AppSettingsViewModel.kt
@@ -319,7 +319,7 @@ class AppSettingsViewModel @Inject constructor(
         notificationManagerWrapper.notify(
             notificationId = notificationId,
             notification = notificationManagerWrapper.getRevertNotification(
-                cls = revertSettingsBroadcastReceiver::class.java,
+                revertSettingsBroadcastReceiver = revertSettingsBroadcastReceiver,
                 packageName = packageName,
                 icon = icon,
                 contentTitle = contentTitle,
diff --git a/feature/app-settings/src/test/kotlin/com/android/geto/feature/appsettings/AppSettingsViewModelTest.kt b/feature/app-settings/src/test/kotlin/com/android/geto/feature/appsettings/AppSettingsViewModelTest.kt
index 2666dee8e..adf4319b6 100644
--- a/feature/app-settings/src/test/kotlin/com/android/geto/feature/appsettings/AppSettingsViewModelTest.kt
+++ b/feature/app-settings/src/test/kotlin/com/android/geto/feature/appsettings/AppSettingsViewModelTest.kt
@@ -19,6 +19,7 @@ package com.android.geto.feature.appsettings
 
 import androidx.lifecycle.SavedStateHandle
 import androidx.navigation.testing.invoke
+import com.android.geto.core.domain.broadcastreceiver.RevertSettingsBroadcastReceiver
 import com.android.geto.core.domain.model.AddAppSettingResult
 import com.android.geto.core.domain.model.AppSetting
 import com.android.geto.core.domain.model.AppSettingTemplate
@@ -37,6 +38,7 @@ import com.android.geto.core.domain.usecase.ApplyAppSettingsUseCase
 import com.android.geto.core.domain.usecase.AutoLaunchUseCase
 import com.android.geto.core.domain.usecase.RequestPinShortcutUseCase
 import com.android.geto.core.domain.usecase.RevertAppSettingsUseCase
+import com.android.geto.core.testing.broadcastreceiver.DummyRevertSettingsBroadcastReceiver
 import com.android.geto.core.testing.framework.DummyClipboardManagerWrapper
 import com.android.geto.core.testing.framework.DummyNotificationManagerWrapper
 import com.android.geto.core.testing.framework.FakeAssetManagerWrapper
@@ -97,6 +99,8 @@ class AppSettingsViewModelTest {
 
     private lateinit var requestPinShortcutUseCase: RequestPinShortcutUseCase
 
+    private lateinit var revertSettingsBroadcastReceiver: RevertSettingsBroadcastReceiver
+
     private lateinit var savedStateHandle: SavedStateHandle
 
     private lateinit var viewModel: AppSettingsViewModel
@@ -153,6 +157,8 @@ class AppSettingsViewModelTest {
 
         assetManagerWrapper = FakeAssetManagerWrapper()
 
+        revertSettingsBroadcastReceiver = DummyRevertSettingsBroadcastReceiver()
+
         viewModel = AppSettingsViewModel(
             savedStateHandle = savedStateHandle,
             appSettingsRepository = appSettingsRepository,
@@ -166,6 +172,7 @@ class AppSettingsViewModelTest {
             addAppSettingUseCase = addAppSettingUseCase,
             notificationManagerWrapper = notificationManagerWrapper,
             assetManagerWrapper = assetManagerWrapper,
+            revertSettingsBroadcastReceiver = revertSettingsBroadcastReceiver,
         )
     }
 
diff --git a/foreground-service/src/main/kotlin/com/android/geto/foregroundservice/UsageStatsService.kt b/foreground-service/src/main/kotlin/com/android/geto/foregroundservice/UsageStatsService.kt
index 35d9f8ac7..1460e923b 100644
--- a/foreground-service/src/main/kotlin/com/android/geto/foregroundservice/UsageStatsService.kt
+++ b/foreground-service/src/main/kotlin/com/android/geto/foregroundservice/UsageStatsService.kt
@@ -53,18 +53,12 @@ class UsageStatsService : Service() {
 
     private val usageStatsBinder = UsageStatsBinder()
 
-    private var _isActive = false
-
-    val isActive get() = _isActive
-
     override fun onBind(intent: Intent?): IBinder {
         return usageStatsBinder
     }
 
     @RequiresApi(Build.VERSION_CODES.UPSIDE_DOWN_CAKE)
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-        _isActive = true
-
         ServiceCompat.startForeground(
             this,
             notificationId,
@@ -111,8 +105,6 @@ class UsageStatsService : Service() {
     override fun onDestroy() {
         super.onDestroy()
 
-        _isActive = false
-
         serviceScope.cancel()
     }
 
diff --git a/framework/notification-manager/src/main/kotlin/com/android/geto/framework/notificationmanager/AndroidNotificationManagerWrapper.kt b/framework/notification-manager/src/main/kotlin/com/android/geto/framework/notificationmanager/AndroidNotificationManagerWrapper.kt
index 534620c71..247b157cf 100644
--- a/framework/notification-manager/src/main/kotlin/com/android/geto/framework/notificationmanager/AndroidNotificationManagerWrapper.kt
+++ b/framework/notification-manager/src/main/kotlin/com/android/geto/framework/notificationmanager/AndroidNotificationManagerWrapper.kt
@@ -34,10 +34,11 @@ import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.toBitmap
+import com.android.geto.core.domain.broadcastreceiver.RevertSettingsBroadcastReceiver
+import com.android.geto.core.domain.broadcastreceiver.RevertSettingsBroadcastReceiver.Companion.ACTION_REVERT_SETTINGS
+import com.android.geto.core.domain.broadcastreceiver.RevertSettingsBroadcastReceiver.Companion.EXTRA_NOTIFICATION_ID
+import com.android.geto.core.domain.broadcastreceiver.RevertSettingsBroadcastReceiver.Companion.EXTRA_PACKAGE_NAME
 import com.android.geto.core.domain.framework.NotificationManagerWrapper
-import com.android.geto.core.domain.framework.NotificationManagerWrapper.Companion.ACTION_REVERT_SETTINGS
-import com.android.geto.core.domain.framework.NotificationManagerWrapper.Companion.EXTRA_NOTIFICATION_ID
-import com.android.geto.core.domain.framework.NotificationManagerWrapper.Companion.EXTRA_PACKAGE_NAME
 import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 
@@ -59,7 +60,7 @@ internal class AndroidNotificationManagerWrapper @Inject constructor(@Applicatio
     }
 
     override fun getRevertNotification(
-        cls: Class<*>,
+        revertSettingsBroadcastReceiver: RevertSettingsBroadcastReceiver,
         packageName: String,
         icon: Drawable?,
         contentTitle: String,
@@ -69,7 +70,7 @@ internal class AndroidNotificationManagerWrapper @Inject constructor(@Applicatio
 
         val notificationId = packageName.hashCode()
 
-        val revertIntent = Intent(context, cls).apply {
+        val revertIntent = Intent(context, revertSettingsBroadcastReceiver::class.java).apply {
             action = ACTION_REVERT_SETTINGS
             putExtra(EXTRA_PACKAGE_NAME, packageName)
             putExtra(EXTRA_NOTIFICATION_ID, notificationId)

From 10b7275549d9abf977f94087e2d84bc535645ab1 Mon Sep 17 00:00:00 2001
From: JackEblan <jackeblan115@gmail.com>
Date: Tue, 12 Nov 2024 06:48:35 +0800
Subject: [PATCH 5/7] I am so terrible naming things

---
 .../DefaultRevertSettingsBroadcastReceiver.kt |   7 +++--
 .../DummyRevertSettingsBroadcastReceiver.kt   |   3 +--
 .../AppSettingsScreenDialogsTest.kt           |  24 +++++++-----------
 .../feature/appsettings/AppSettingsEvent.kt   |   2 +-
 .../feature/appsettings/AppSettingsScreen.kt  |  16 ++++++------
 .../appsettings/AppSettingsViewModel.kt       |   8 +++---
 .../CommandDialog.kt}                         |  16 ++++++------
 .../appsettings/AppSettingsViewModelTest.kt   |   8 +++---
 .../CommandDialogScreenshotTest.kt}           |  12 ++++-----
 ...oldable.png => CommandDialog_foldable.png} | Bin
 ...rk.png => CommandDialog_foldable_dark.png} | Bin
 11 files changed, 44 insertions(+), 52 deletions(-)
 rename feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/dialog/{writesecuresettingspermission/WriteSecureSettingsPermissionDialog.kt => command/CommandDialog.kt} (89%)
 rename feature/app-settings/src/test/kotlin/com/android/geto/feature/appsettings/dialog/{writesecuresettingspermission/WriteSecureSettingsPermissionDialogScreenshotTest.kt => command/CommandDialogScreenshotTest.kt} (87%)
 rename feature/app-settings/src/test/screenshots/{WriteSecureSettingsPermissionDialog_foldable.png => CommandDialog_foldable.png} (100%)
 rename feature/app-settings/src/test/screenshots/{WriteSecureSettingsPermissionDialog_foldable_dark.png => CommandDialog_foldable_dark.png} (100%)

diff --git a/broadcast-receiver/src/main/kotlin/com/android/geto/broadcastreceiver/DefaultRevertSettingsBroadcastReceiver.kt b/broadcast-receiver/src/main/kotlin/com/android/geto/broadcastreceiver/DefaultRevertSettingsBroadcastReceiver.kt
index e8ff0a963..a1099bcb8 100644
--- a/broadcast-receiver/src/main/kotlin/com/android/geto/broadcastreceiver/DefaultRevertSettingsBroadcastReceiver.kt
+++ b/broadcast-receiver/src/main/kotlin/com/android/geto/broadcastreceiver/DefaultRevertSettingsBroadcastReceiver.kt
@@ -22,14 +22,13 @@ import android.content.Context
 import android.content.Intent
 import com.android.geto.core.domain.broadcastreceiver.BroadcastReceiverController
 import com.android.geto.core.domain.broadcastreceiver.RevertSettingsBroadcastReceiver
-import com.android.geto.core.domain.framework.NotificationManagerWrapper.Companion.EXTRA_NOTIFICATION_ID
-import com.android.geto.core.domain.framework.NotificationManagerWrapper.Companion.EXTRA_PACKAGE_NAME
+import com.android.geto.core.domain.broadcastreceiver.RevertSettingsBroadcastReceiver.Companion.EXTRA_NOTIFICATION_ID
+import com.android.geto.core.domain.broadcastreceiver.RevertSettingsBroadcastReceiver.Companion.EXTRA_PACKAGE_NAME
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 
 @AndroidEntryPoint
-class DefaultRevertSettingsBroadcastReceiver @Inject constructor() :
-    BroadcastReceiver(),
+class DefaultRevertSettingsBroadcastReceiver @Inject constructor() : BroadcastReceiver(),
     RevertSettingsBroadcastReceiver {
     @Inject
     lateinit var broadcastReceiverController: BroadcastReceiverController
diff --git a/core/testing/src/main/kotlin/com/android/geto/core/testing/broadcastreceiver/DummyRevertSettingsBroadcastReceiver.kt b/core/testing/src/main/kotlin/com/android/geto/core/testing/broadcastreceiver/DummyRevertSettingsBroadcastReceiver.kt
index 77793a8a3..52f083c4f 100644
--- a/core/testing/src/main/kotlin/com/android/geto/core/testing/broadcastreceiver/DummyRevertSettingsBroadcastReceiver.kt
+++ b/core/testing/src/main/kotlin/com/android/geto/core/testing/broadcastreceiver/DummyRevertSettingsBroadcastReceiver.kt
@@ -15,9 +15,8 @@
  *   limitations under the License.
  *
  */
-
 package com.android.geto.core.testing.broadcastreceiver
 
 import com.android.geto.core.domain.broadcastreceiver.RevertSettingsBroadcastReceiver
 
-class DummyRevertSettingsBroadcastReceiver: RevertSettingsBroadcastReceiver {}
\ No newline at end of file
+class DummyRevertSettingsBroadcastReceiver : RevertSettingsBroadcastReceiver
diff --git a/feature/app-settings/src/androidTest/kotlin/com/android/geto/feature/appsettings/AppSettingsScreenDialogsTest.kt b/feature/app-settings/src/androidTest/kotlin/com/android/geto/feature/appsettings/AppSettingsScreenDialogsTest.kt
index f75e7be88..ccd4058a7 100644
--- a/feature/app-settings/src/androidTest/kotlin/com/android/geto/feature/appsettings/AppSettingsScreenDialogsTest.kt
+++ b/feature/app-settings/src/androidTest/kotlin/com/android/geto/feature/appsettings/AppSettingsScreenDialogsTest.kt
@@ -80,7 +80,7 @@ class AppSettingsScreenDialogsTest {
     }
 
     @Test
-    fun writeSecureSettingsPermissionDialog_isDisplayed_whenApplyAppSettingsResult_isNoPermission_thenDismissed() {
+    fun commandDialog_isDisplayed_whenApplyAppSettingsResult_isNoPermission_thenDismissed() {
         composeTestRule.setContent {
             AppSettingsScreen(
                 packageName = "com.android.geto",
@@ -101,17 +101,15 @@ class AppSettingsScreenDialogsTest {
             )
         }
 
-        composeTestRule.onNodeWithContentDescription("Write Secure Settings Permission Dialog")
-            .assertIsDisplayed()
+        composeTestRule.onNodeWithContentDescription("Command Dialog").assertIsDisplayed()
 
         composeTestRule.onNodeWithText("Cancel").performClick()
 
-        composeTestRule.onNodeWithContentDescription("Write Secure Settings Permission Dialog")
-            .assertIsNotDisplayed()
+        composeTestRule.onNodeWithContentDescription("Command Dialog").assertIsNotDisplayed()
     }
 
     @Test
-    fun writeSecureSettingsPermissionDialog_isDisplayed_whenRevertAppSettingsResult_isNoPermission_thenDismissed() {
+    fun commandDialog_isDisplayed_whenRevertAppSettingsResult_isNoPermission_thenDismissed() {
         composeTestRule.setContent {
             AppSettingsScreen(
                 packageName = "com.android.geto",
@@ -132,17 +130,15 @@ class AppSettingsScreenDialogsTest {
             )
         }
 
-        composeTestRule.onNodeWithContentDescription("Write Secure Settings Permission Dialog")
-            .assertIsDisplayed()
+        composeTestRule.onNodeWithContentDescription("Command Dialog").assertIsDisplayed()
 
         composeTestRule.onNodeWithText("Cancel").performClick()
 
-        composeTestRule.onNodeWithContentDescription("Write Secure Settings Permission Dialog")
-            .assertIsNotDisplayed()
+        composeTestRule.onNodeWithContentDescription("Command Dialog").assertIsNotDisplayed()
     }
 
     @Test
-    fun writeSecureSettingsPermissionDialog_isDisplayed_whenAutoLaunchResult_isNoPermission_thenDismissed() {
+    fun commandDialog_isDisplayed_whenAutoLaunchResult_isNoPermission_thenDismissed() {
         composeTestRule.setContent {
             AppSettingsScreen(
                 packageName = "com.android.geto",
@@ -163,13 +159,11 @@ class AppSettingsScreenDialogsTest {
             )
         }
 
-        composeTestRule.onNodeWithContentDescription("Write Secure Settings Permission Dialog")
-            .assertIsDisplayed()
+        composeTestRule.onNodeWithContentDescription("Command Dialog").assertIsDisplayed()
 
         composeTestRule.onNodeWithText("Cancel").performClick()
 
-        composeTestRule.onNodeWithContentDescription("Write Secure Settings Permission Dialog")
-            .assertIsNotDisplayed()
+        composeTestRule.onNodeWithContentDescription("Command Dialog").assertIsNotDisplayed()
     }
 
     @Test
diff --git a/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/AppSettingsEvent.kt b/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/AppSettingsEvent.kt
index d1a73472e..4689fd2bb 100644
--- a/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/AppSettingsEvent.kt
+++ b/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/AppSettingsEvent.kt
@@ -33,7 +33,7 @@ sealed interface AppSettingsEvent {
 
     data class AddAppSetting(val appSetting: AppSetting) : AppSettingsEvent
 
-    data class CopyPermissionCommand(val label: String, val text: String) : AppSettingsEvent
+    data class CopyCommand(val label: String, val text: String) : AppSettingsEvent
 
     data object RevertAppSettings : AppSettingsEvent
 
diff --git a/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/AppSettingsScreen.kt b/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/AppSettingsScreen.kt
index d0d45284c..bb2e9f798 100644
--- a/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/AppSettingsScreen.kt
+++ b/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/AppSettingsScreen.kt
@@ -88,7 +88,7 @@ import com.android.geto.core.domain.model.SettingType
 import com.android.geto.feature.appsettings.AppSettingsEvent.AddAppSetting
 import com.android.geto.feature.appsettings.AppSettingsEvent.ApplyAppSettings
 import com.android.geto.feature.appsettings.AppSettingsEvent.CheckAppSetting
-import com.android.geto.feature.appsettings.AppSettingsEvent.CopyPermissionCommand
+import com.android.geto.feature.appsettings.AppSettingsEvent.CopyCommand
 import com.android.geto.feature.appsettings.AppSettingsEvent.DeleteAppSetting
 import com.android.geto.feature.appsettings.AppSettingsEvent.GetSecureSettingsByName
 import com.android.geto.feature.appsettings.AppSettingsEvent.LaunchIntentForPackage
@@ -104,6 +104,7 @@ import com.android.geto.feature.appsettings.AppSettingsEvent.RevertAppSettings
 import com.android.geto.feature.appsettings.dialog.appsetting.AppSettingDialog
 import com.android.geto.feature.appsettings.dialog.appsetting.AppSettingDialogState
 import com.android.geto.feature.appsettings.dialog.appsetting.rememberAppSettingDialogState
+import com.android.geto.feature.appsettings.dialog.command.CommandDialog
 import com.android.geto.feature.appsettings.dialog.shortcut.ShortcutDialog
 import com.android.geto.feature.appsettings.dialog.shortcut.ShortcutDialogState
 import com.android.geto.feature.appsettings.dialog.shortcut.rememberShortcutDialogState
@@ -111,7 +112,6 @@ import com.android.geto.feature.appsettings.dialog.template.TemplateDialog
 import com.android.geto.feature.appsettings.dialog.template.TemplateDialogState
 import com.android.geto.feature.appsettings.dialog.template.TemplateDialogUiState
 import com.android.geto.feature.appsettings.dialog.template.rememberTemplateDialogState
-import com.android.geto.feature.appsettings.dialog.writesecuresettingspermission.WriteSecureSettingsPermissionDialog
 import com.android.geto.feature.appsettings.navigation.AppSettingsRouteData
 import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.flow.collect
@@ -247,9 +247,9 @@ internal fun AppSettingsScreen(
         templateDialogState = templateDialogState,
         packageName = packageName,
         onAddAppSetting = { onEvent(AddAppSetting(it)) },
-        onCopyPermissionCommand = { label, text ->
+        onCopyCommand = { label, text ->
             onEvent(
-                CopyPermissionCommand(
+                CopyCommand(
                     label = label,
                     text = text,
                 ),
@@ -595,7 +595,7 @@ private fun AppSettingsDialogs(
     templateDialogState: TemplateDialogState,
     packageName: String,
     onAddAppSetting: (AppSetting) -> Unit,
-    onCopyPermissionCommand: (String, String) -> Unit,
+    onCopyCommand: (String, String) -> Unit,
     onAddShortcut: (GetoShortcutInfoCompat) -> Unit,
     onPermissionDialogDismissRequest: () -> Unit,
 ) {
@@ -609,9 +609,9 @@ private fun AppSettingsDialogs(
     }
 
     if (showPermissionDialog) {
-        WriteSecureSettingsPermissionDialog(
-            onCopyClick = onCopyPermissionCommand,
-            contentDescription = "Write Secure Settings Permission Dialog",
+        CommandDialog(
+            onCopyClick = onCopyCommand,
+            contentDescription = "Command Dialog",
             onDismissRequest = onPermissionDialogDismissRequest,
         )
     }
diff --git a/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/AppSettingsViewModel.kt b/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/AppSettingsViewModel.kt
index 157e5481c..93027c561 100644
--- a/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/AppSettingsViewModel.kt
+++ b/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/AppSettingsViewModel.kt
@@ -45,7 +45,7 @@ import com.android.geto.feature.appsettings.AppSettingsEvent.AddAppSetting
 import com.android.geto.feature.appsettings.AppSettingsEvent.ApplyAppSettings
 import com.android.geto.feature.appsettings.AppSettingsEvent.AutoLaunchApp
 import com.android.geto.feature.appsettings.AppSettingsEvent.CheckAppSetting
-import com.android.geto.feature.appsettings.AppSettingsEvent.CopyPermissionCommand
+import com.android.geto.feature.appsettings.AppSettingsEvent.CopyCommand
 import com.android.geto.feature.appsettings.AppSettingsEvent.DeleteAppSetting
 import com.android.geto.feature.appsettings.AppSettingsEvent.GetSecureSettingsByName
 import com.android.geto.feature.appsettings.AppSettingsEvent.LaunchIntentForPackage
@@ -165,8 +165,8 @@ class AppSettingsViewModel @Inject constructor(
                 checkAppSetting(appSetting = event.appSetting)
             }
 
-            is CopyPermissionCommand -> {
-                copyPermissionCommand(
+            is CopyCommand -> {
+                copyCommand(
                     label = event.label,
                     text = event.text,
                 )
@@ -267,7 +267,7 @@ class AppSettingsViewModel @Inject constructor(
         }
     }
 
-    private fun copyPermissionCommand(label: String, text: String) {
+    private fun copyCommand(label: String, text: String) {
         _setPrimaryClipResult.update {
             clipboardManagerWrapper.setPrimaryClip(
                 label = label,
diff --git a/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/dialog/writesecuresettingspermission/WriteSecureSettingsPermissionDialog.kt b/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/dialog/command/CommandDialog.kt
similarity index 89%
rename from feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/dialog/writesecuresettingspermission/WriteSecureSettingsPermissionDialog.kt
rename to feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/dialog/command/CommandDialog.kt
index ed135dd8a..f3f24a23c 100644
--- a/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/dialog/writesecuresettingspermission/WriteSecureSettingsPermissionDialog.kt
+++ b/feature/app-settings/src/main/kotlin/com/android/geto/feature/appsettings/dialog/command/CommandDialog.kt
@@ -15,7 +15,7 @@
  *   limitations under the License.
  *
  */
-package com.android.geto.feature.appsettings.dialog.writesecuresettingspermission
+package com.android.geto.feature.appsettings.dialog.command
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -37,7 +37,7 @@ import com.android.geto.core.designsystem.component.DialogContainer
 import com.android.geto.feature.appsettings.R
 
 @Composable
-internal fun WriteSecureSettingsPermissionDialog(
+internal fun CommandDialog(
     modifier: Modifier = Modifier,
     contentDescription: String,
     onCopyClick: (String, String) -> Unit,
@@ -55,11 +55,11 @@ internal fun WriteSecureSettingsPermissionDialog(
         Column(
             modifier = Modifier.fillMaxWidth(),
         ) {
-            PermissionDialogTitle()
+            CommandDialogTitle()
 
-            PermissionDialogContent()
+            CommandDialogContent()
 
-            PermissionDialogButtons(
+            CommandDialogButtons(
                 onCancelClick = onDismissRequest,
                 onCopyClick = {
                     onCopyClick(commandLabel, command)
@@ -72,7 +72,7 @@ internal fun WriteSecureSettingsPermissionDialog(
 }
 
 @Composable
-private fun PermissionDialogTitle(modifier: Modifier = Modifier) {
+private fun CommandDialogTitle(modifier: Modifier = Modifier) {
     Spacer(modifier = Modifier.height(10.dp))
 
     Text(
@@ -83,7 +83,7 @@ private fun PermissionDialogTitle(modifier: Modifier = Modifier) {
 }
 
 @Composable
-private fun PermissionDialogContent(modifier: Modifier = Modifier) {
+private fun CommandDialogContent(modifier: Modifier = Modifier) {
     Text(
         modifier = modifier.padding(10.dp),
         text = stringResource(id = R.string.copy_permission_command_message),
@@ -92,7 +92,7 @@ private fun PermissionDialogContent(modifier: Modifier = Modifier) {
 }
 
 @Composable
-fun PermissionDialogButtons(
+fun CommandDialogButtons(
     modifier: Modifier = Modifier,
     onCancelClick: () -> Unit,
     onCopyClick: () -> Unit,
diff --git a/feature/app-settings/src/test/kotlin/com/android/geto/feature/appsettings/AppSettingsViewModelTest.kt b/feature/app-settings/src/test/kotlin/com/android/geto/feature/appsettings/AppSettingsViewModelTest.kt
index adf4319b6..b1ab8c4b9 100644
--- a/feature/app-settings/src/test/kotlin/com/android/geto/feature/appsettings/AppSettingsViewModelTest.kt
+++ b/feature/app-settings/src/test/kotlin/com/android/geto/feature/appsettings/AppSettingsViewModelTest.kt
@@ -558,7 +558,7 @@ class AppSettingsViewModelTest {
     }
 
     @Test
-    fun setPrimaryClipResult_isFalse_whenCopyPermissionCommand() = runTest {
+    fun setPrimaryClipResult_isFalse_whenCopyCommand() = runTest {
         backgroundScope.launch(UnconfinedTestDispatcher()) {
             viewModel.revertAppSettingsResult.collect()
         }
@@ -566,7 +566,7 @@ class AppSettingsViewModelTest {
         clipboardManagerWrapper.setSDKInt(33)
 
         viewModel.onEvent(
-            event = AppSettingsEvent.CopyPermissionCommand(
+            event = AppSettingsEvent.CopyCommand(
                 label = "label",
                 text = "text",
             ),
@@ -579,7 +579,7 @@ class AppSettingsViewModelTest {
     }
 
     @Test
-    fun setPrimaryClipResult_isTrue_whenCopyPermissionCommand() = runTest {
+    fun setPrimaryClipResult_isTrue_whenCopyCommand() = runTest {
         backgroundScope.launch(UnconfinedTestDispatcher()) {
             viewModel.setPrimaryClipResult.collect()
         }
@@ -587,7 +587,7 @@ class AppSettingsViewModelTest {
         clipboardManagerWrapper.setSDKInt(32)
 
         viewModel.onEvent(
-            event = AppSettingsEvent.CopyPermissionCommand(
+            event = AppSettingsEvent.CopyCommand(
                 label = "label",
                 text = "text",
             ),
diff --git a/feature/app-settings/src/test/kotlin/com/android/geto/feature/appsettings/dialog/writesecuresettingspermission/WriteSecureSettingsPermissionDialogScreenshotTest.kt b/feature/app-settings/src/test/kotlin/com/android/geto/feature/appsettings/dialog/command/CommandDialogScreenshotTest.kt
similarity index 87%
rename from feature/app-settings/src/test/kotlin/com/android/geto/feature/appsettings/dialog/writesecuresettingspermission/WriteSecureSettingsPermissionDialogScreenshotTest.kt
rename to feature/app-settings/src/test/kotlin/com/android/geto/feature/appsettings/dialog/command/CommandDialogScreenshotTest.kt
index 93f11263a..4456468c4 100644
--- a/feature/app-settings/src/test/kotlin/com/android/geto/feature/appsettings/dialog/writesecuresettingspermission/WriteSecureSettingsPermissionDialogScreenshotTest.kt
+++ b/feature/app-settings/src/test/kotlin/com/android/geto/feature/appsettings/dialog/command/CommandDialogScreenshotTest.kt
@@ -15,7 +15,7 @@
  *   limitations under the License.
  *
  */
-package com.android.geto.feature.appsettings.dialog.writesecuresettingspermission
+package com.android.geto.feature.appsettings.dialog.command
 
 import androidx.activity.ComponentActivity
 import androidx.compose.material3.Surface
@@ -38,7 +38,7 @@ import kotlin.test.Test
 @GraphicsMode(GraphicsMode.Mode.NATIVE)
 @Config(application = HiltTestApplication::class)
 @LooperMode(LooperMode.Mode.PAUSED)
-class WriteSecureSettingsPermissionDialogScreenshotTest {
+class CommandDialogScreenshotTest {
 
     @get:Rule
     val composeTestRule = createAndroidComposeRule<ComponentActivity>()
@@ -46,12 +46,12 @@ class WriteSecureSettingsPermissionDialogScreenshotTest {
     @Test
     fun permissionDialog() {
         composeTestRule.captureDialogForDevice(
-            fileName = "WriteSecureSettingsPermissionDialog",
+            fileName = "CommandDialog",
             deviceName = "foldable",
             deviceSpec = DefaultTestDevices.FOLDABLE.spec,
         ) {
             GetoTheme {
-                WriteSecureSettingsPermissionDialog(
+                CommandDialog(
                     contentDescription = "",
                     onCopyClick = { _, _ -> },
                     onDismissRequest = {},
@@ -63,14 +63,14 @@ class WriteSecureSettingsPermissionDialogScreenshotTest {
     @Test
     fun permissionDialog_dark() {
         composeTestRule.captureDialogForDevice(
-            fileName = "WriteSecureSettingsPermissionDialog",
+            fileName = "CommandDialog",
             deviceName = "foldable_dark",
             deviceSpec = DefaultTestDevices.FOLDABLE.spec,
             darkMode = true,
         ) {
             GetoTheme {
                 Surface {
-                    WriteSecureSettingsPermissionDialog(
+                    CommandDialog(
                         contentDescription = "",
                         onCopyClick = { _, _ -> },
                         onDismissRequest = {},
diff --git a/feature/app-settings/src/test/screenshots/WriteSecureSettingsPermissionDialog_foldable.png b/feature/app-settings/src/test/screenshots/CommandDialog_foldable.png
similarity index 100%
rename from feature/app-settings/src/test/screenshots/WriteSecureSettingsPermissionDialog_foldable.png
rename to feature/app-settings/src/test/screenshots/CommandDialog_foldable.png
diff --git a/feature/app-settings/src/test/screenshots/WriteSecureSettingsPermissionDialog_foldable_dark.png b/feature/app-settings/src/test/screenshots/CommandDialog_foldable_dark.png
similarity index 100%
rename from feature/app-settings/src/test/screenshots/WriteSecureSettingsPermissionDialog_foldable_dark.png
rename to feature/app-settings/src/test/screenshots/CommandDialog_foldable_dark.png

From 49bbce7681ecc88a327214b81f2acdcfbce3e2c9 Mon Sep 17 00:00:00 2001
From: JackEblan <jackeblan115@gmail.com>
Date: Tue, 12 Nov 2024 06:54:40 +0800
Subject: [PATCH 6/7] Spotless

---
 .../DefaultRevertSettingsBroadcastReceiver.kt                  | 3 ++-
 .../core/testing/framework/DummyNotificationManagerWrapper.kt  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/broadcast-receiver/src/main/kotlin/com/android/geto/broadcastreceiver/DefaultRevertSettingsBroadcastReceiver.kt b/broadcast-receiver/src/main/kotlin/com/android/geto/broadcastreceiver/DefaultRevertSettingsBroadcastReceiver.kt
index a1099bcb8..c08b28d18 100644
--- a/broadcast-receiver/src/main/kotlin/com/android/geto/broadcastreceiver/DefaultRevertSettingsBroadcastReceiver.kt
+++ b/broadcast-receiver/src/main/kotlin/com/android/geto/broadcastreceiver/DefaultRevertSettingsBroadcastReceiver.kt
@@ -28,7 +28,8 @@ import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 
 @AndroidEntryPoint
-class DefaultRevertSettingsBroadcastReceiver @Inject constructor() : BroadcastReceiver(),
+class DefaultRevertSettingsBroadcastReceiver @Inject constructor() :
+    BroadcastReceiver(),
     RevertSettingsBroadcastReceiver {
     @Inject
     lateinit var broadcastReceiverController: BroadcastReceiverController
diff --git a/core/testing/src/main/kotlin/com/android/geto/core/testing/framework/DummyNotificationManagerWrapper.kt b/core/testing/src/main/kotlin/com/android/geto/core/testing/framework/DummyNotificationManagerWrapper.kt
index 544783e54..7b00ee2ec 100644
--- a/core/testing/src/main/kotlin/com/android/geto/core/testing/framework/DummyNotificationManagerWrapper.kt
+++ b/core/testing/src/main/kotlin/com/android/geto/core/testing/framework/DummyNotificationManagerWrapper.kt
@@ -19,6 +19,7 @@ package com.android.geto.core.testing.framework
 
 import android.app.Notification
 import android.graphics.drawable.Drawable
+import com.android.geto.core.domain.broadcastreceiver.RevertSettingsBroadcastReceiver
 import com.android.geto.core.domain.framework.NotificationManagerWrapper
 
 class DummyNotificationManagerWrapper : NotificationManagerWrapper {
@@ -33,7 +34,7 @@ class DummyNotificationManagerWrapper : NotificationManagerWrapper {
     }
 
     override fun getRevertNotification(
-        cls: Class<*>,
+        revertSettingsBroadcastReceiver: RevertSettingsBroadcastReceiver,
         packageName: String,
         icon: Drawable?,
         contentTitle: String,

From 8d0ee789b2e5853c248bf6348b4fce123c16c2ba Mon Sep 17 00:00:00 2001
From: JackEblan <jackeblan115@gmail.com>
Date: Tue, 12 Nov 2024 12:22:12 +0800
Subject: [PATCH 7/7] Fixed failed tests

---
 core/testing/build.gradle.kts | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/core/testing/build.gradle.kts b/core/testing/build.gradle.kts
index 780dab5bd..7028b330d 100644
--- a/core/testing/build.gradle.kts
+++ b/core/testing/build.gradle.kts
@@ -37,5 +37,16 @@ dependencies {
     implementation(libs.kotlinx.coroutines.test)
 
     implementation(projects.core.common)
+    implementation(projects.core.data)
     implementation(projects.core.domain)
+
+    implementation(projects.broadcastReceiver)
+    implementation(projects.foregroundService)
+    implementation(projects.framework.assetManager)
+    implementation(projects.framework.clipboardManager)
+    implementation(projects.framework.notificationManager)
+    implementation(projects.framework.packageManager)
+    implementation(projects.framework.secureSettings)
+    implementation(projects.framework.shortcutManager)
+    implementation(projects.framework.usageStatsManager)
 }