From 39a45436409239bf550f1908bb22a09da79a57ac Mon Sep 17 00:00:00 2001 From: tkrmagid Date: Wed, 5 Aug 2026 14:37:31 +0900 Subject: [PATCH] feat: EasyAppliance app v0.3.0 (SmartThings elderly-friendly remote) --- .gitignore | 15 + README.md | 51 ++- app/build.gradle.kts | 91 +++++ app/proguard-rules.pro | 0 app/src/main/AndroidManifest.xml | 28 ++ .../kr/tkrmagid/easyappliance/MainActivity.kt | 20 ++ .../easyappliance/data/DeviceImages.kt | 42 +++ .../easyappliance/data/DeviceRepository.kt | 60 ++++ .../easyappliance/data/ImageStorage.kt | 20 ++ .../kr/tkrmagid/easyappliance/data/Macro.kt | 27 ++ .../kr/tkrmagid/easyappliance/data/Models.kt | 39 +++ .../easyappliance/data/SettingsRepository.kt | 105 ++++++ .../data/smartthings/SmartThingsApi.kt | 83 +++++ .../SmartThingsDeviceRepository.kt | 77 ++++ .../smartthings/SmartThingsStatusMapper.kt | 74 ++++ .../tkrmagid/easyappliance/ui/AdminGesture.kt | 49 +++ .../tkrmagid/easyappliance/ui/AdminScreen.kt | 328 ++++++++++++++++++ .../kr/tkrmagid/easyappliance/ui/AppRoot.kt | 89 +++++ .../easyappliance/ui/ConnectionWarning.kt | 108 ++++++ .../tkrmagid/easyappliance/ui/DeviceImage.kt | 37 ++ .../tkrmagid/easyappliance/ui/HomeScreen.kt | 268 ++++++++++++++ .../tkrmagid/easyappliance/ui/MacroEditor.kt | 197 +++++++++++ .../tkrmagid/easyappliance/ui/theme/Theme.kt | 50 +++ .../tkrmagid/easyappliance/ui/theme/Type.kt | 17 + .../tkrmagid/easyappliance/vm/AppViewModel.kt | 190 ++++++++++ .../res/drawable/ic_launcher_foreground.xml | 27 ++ app/src/main/res/drawable/img_aircon.xml | 11 + app/src/main/res/drawable/img_device.xml | 8 + app/src/main/res/drawable/img_fridge.xml | 9 + app/src/main/res/drawable/img_tv.xml | 9 + app/src/main/res/drawable/img_washer.xml | 10 + .../res/mipmap-anydpi-v26/ic_launcher.xml | 5 + .../mipmap-anydpi-v26/ic_launcher_round.xml | 5 + app/src/main/res/values/colors.xml | 6 + app/src/main/res/values/strings.xml | 3 + app/src/main/res/values/themes.xml | 7 + .../easyappliance/MockDeviceRepositoryTest.kt | 50 +++ .../SmartThingsStatusMapperTest.kt | 74 ++++ build.gradle.kts | 6 + gradle.properties | 5 + gradle/libs.versions.toml | 45 +++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43583 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 252 ++++++++++++++ gradlew.bat | 94 +++++ settings.gradle.kts | 23 ++ 46 files changed, 2719 insertions(+), 2 deletions(-) create mode 100644 .gitignore create mode 100644 app/build.gradle.kts create mode 100644 app/proguard-rules.pro create mode 100644 app/src/main/AndroidManifest.xml create mode 100644 app/src/main/java/kr/tkrmagid/easyappliance/MainActivity.kt create mode 100644 app/src/main/java/kr/tkrmagid/easyappliance/data/DeviceImages.kt create mode 100644 app/src/main/java/kr/tkrmagid/easyappliance/data/DeviceRepository.kt create mode 100644 app/src/main/java/kr/tkrmagid/easyappliance/data/ImageStorage.kt create mode 100644 app/src/main/java/kr/tkrmagid/easyappliance/data/Macro.kt create mode 100644 app/src/main/java/kr/tkrmagid/easyappliance/data/Models.kt create mode 100644 app/src/main/java/kr/tkrmagid/easyappliance/data/SettingsRepository.kt create mode 100644 app/src/main/java/kr/tkrmagid/easyappliance/data/smartthings/SmartThingsApi.kt create mode 100644 app/src/main/java/kr/tkrmagid/easyappliance/data/smartthings/SmartThingsDeviceRepository.kt create mode 100644 app/src/main/java/kr/tkrmagid/easyappliance/data/smartthings/SmartThingsStatusMapper.kt create mode 100644 app/src/main/java/kr/tkrmagid/easyappliance/ui/AdminGesture.kt create mode 100644 app/src/main/java/kr/tkrmagid/easyappliance/ui/AdminScreen.kt create mode 100644 app/src/main/java/kr/tkrmagid/easyappliance/ui/AppRoot.kt create mode 100644 app/src/main/java/kr/tkrmagid/easyappliance/ui/ConnectionWarning.kt create mode 100644 app/src/main/java/kr/tkrmagid/easyappliance/ui/DeviceImage.kt create mode 100644 app/src/main/java/kr/tkrmagid/easyappliance/ui/HomeScreen.kt create mode 100644 app/src/main/java/kr/tkrmagid/easyappliance/ui/MacroEditor.kt create mode 100644 app/src/main/java/kr/tkrmagid/easyappliance/ui/theme/Theme.kt create mode 100644 app/src/main/java/kr/tkrmagid/easyappliance/ui/theme/Type.kt create mode 100644 app/src/main/java/kr/tkrmagid/easyappliance/vm/AppViewModel.kt create mode 100644 app/src/main/res/drawable/ic_launcher_foreground.xml create mode 100644 app/src/main/res/drawable/img_aircon.xml create mode 100644 app/src/main/res/drawable/img_device.xml create mode 100644 app/src/main/res/drawable/img_fridge.xml create mode 100644 app/src/main/res/drawable/img_tv.xml create mode 100644 app/src/main/res/drawable/img_washer.xml create mode 100644 app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml create mode 100644 app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml create mode 100644 app/src/main/res/values/colors.xml create mode 100644 app/src/main/res/values/strings.xml create mode 100644 app/src/main/res/values/themes.xml create mode 100644 app/src/test/java/kr/tkrmagid/easyappliance/MockDeviceRepositoryTest.kt create mode 100644 app/src/test/java/kr/tkrmagid/easyappliance/SmartThingsStatusMapperTest.kt create mode 100644 build.gradle.kts create mode 100644 gradle.properties create mode 100644 gradle/libs.versions.toml create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle.kts diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..7ff173e --- /dev/null +++ b/.gitignore @@ -0,0 +1,15 @@ +*.iml +.gradle/ +/local.properties +/keystore.properties +*.keystore +*.jks +/.idea/ +.DS_Store +/build +/captures +.externalNativeBuild +.cxx +app/build/ +build/ +.kotlin/ diff --git a/README.md b/README.md index e34d10e..9d58ce3 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,51 @@ -# washing_machine_app +# 쉬운 가전 리모컨 (EasyAppliance) -세탁기 앱 저장소입니다. (edit test: 2026-08-05, 저장된 Gitea 토큰으로 푸시 검증) +SmartThings 가전(세탁기·에어컨 등)을 어르신도 쉽게 쓸 수 있도록 만든 안드로이드 앱. +큰 글씨·고대비·큰 버튼의 직관적 UX로, 등록된 기기 중 한 대를 골라 상태 확인과 +켜기/끄기, 시작 매크로를 제공합니다. +## 주요 기능 + +- 한 대 선택 조작: 관리자 화면에서 조작할 기기 1대를 선택 +- 숨김 관리자 진입: 화면 위쪽 양쪽 모서리를 동시에 약 1.5초 길게 누르면 진입 + (어르신이 실수로 들어가지 않도록) +- 큰 상태 표시: 운전 중/꺼짐, 남은 시간, 에어컨 온도 등 +- 관리자에서 표시 정보·기능 on/off, 기기 이름·사진 변경(기본 이미지 + 직접 추가) +- 시작 매크로: "시작"을 누르면 물 온도·수위 등 설정을 적용한 뒤 자동 시작 +- 연결 끊김 시 화면 중앙 큰 경고창 + 다시 연결하기(백그라운드 재시도, 복구 시 자동 해제) +- 설정은 저장되어 앱을 껐다 켜도 유지, 앱 복귀/주기적 폴링으로 최신화 +- 폴드/플립 대응 반응형 레이아웃, 삼성 뒤로가기 지원 + +## SmartThings 연결 + +관리자 화면에서 SmartThings Personal Access Token을 입력하면 실제 기기 목록/상태/제어에 +연결됩니다. 토큰이 없으면 샘플(목업) 데이터로 동작합니다. 토큰은 +https://account.smartthings.com/tokens 에서 발급합니다. + +## 빌드 + +Android SDK와 JDK 17+ 필요. + +```bash +./gradlew :app:assembleDebug # 디버그 APK +./gradlew :app:testDebugUnitTest # 단위 테스트 +``` + +릴리즈 서명 빌드는 프로젝트 루트에 `keystore.properties`(gitignore됨)가 있을 때만 +서명됩니다: + +```properties +storeFile=/절대/경로/키스토어.keystore +storePassword=... +keyAlias=... +keyPassword=... +``` + +```bash +./gradlew :app:assembleRelease +``` + +## 기술 스택 + +Kotlin, Jetpack Compose(Material3), DataStore, Retrofit + kotlinx.serialization, Coil. +minSdk 24 / targetSdk 35. diff --git a/app/build.gradle.kts b/app/build.gradle.kts new file mode 100644 index 0000000..62c6845 --- /dev/null +++ b/app/build.gradle.kts @@ -0,0 +1,91 @@ +import java.io.FileInputStream +import java.util.Properties + +plugins { + alias(libs.plugins.android.application) + alias(libs.plugins.kotlin.android) + alias(libs.plugins.kotlin.compose) + alias(libs.plugins.kotlin.serialization) +} + +// Optional release signing: only active when keystore.properties is present +// (kept out of version control). Without it, release builds are unsigned. +val keystorePropsFile = rootProject.file("keystore.properties") +val keystoreProps = Properties().apply { + if (keystorePropsFile.exists()) FileInputStream(keystorePropsFile).use { load(it) } +} +val hasReleaseSigning = keystorePropsFile.exists() + +android { + namespace = "kr.tkrmagid.easyappliance" + compileSdk = 35 + + defaultConfig { + applicationId = "kr.tkrmagid.easyappliance" + minSdk = 24 + targetSdk = 35 + versionCode = 3 + versionName = "0.3.0" + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + } + + signingConfigs { + if (hasReleaseSigning) { + create("release") { + storeFile = file(keystoreProps["storeFile"] as String) + storePassword = keystoreProps["storePassword"] as String + keyAlias = keystoreProps["keyAlias"] as String + keyPassword = keystoreProps["keyPassword"] as String + } + } + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + if (hasReleaseSigning) { + signingConfig = signingConfigs.getByName("release") + } + } + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + kotlinOptions { + jvmTarget = "17" + } + buildFeatures { + compose = true + } +} + +dependencies { + implementation(libs.androidx.core.ktx) + implementation(libs.androidx.lifecycle.runtime.ktx) + implementation(libs.androidx.lifecycle.runtime.compose) + implementation(libs.androidx.lifecycle.viewmodel.compose) + implementation(libs.androidx.activity.compose) + implementation(platform(libs.androidx.compose.bom)) + implementation(libs.androidx.ui) + implementation(libs.androidx.ui.graphics) + implementation(libs.androidx.ui.tooling.preview) + implementation(libs.androidx.material3) + implementation(libs.androidx.material.icons.extended) + implementation(libs.androidx.navigation.compose) + implementation(libs.androidx.datastore.preferences) + implementation(libs.kotlinx.serialization.json) + implementation(libs.retrofit) + implementation(libs.okhttp.logging) + implementation(libs.retrofit.kotlinx.serialization) + implementation(libs.coil.compose) + + debugImplementation(libs.androidx.ui.tooling) + + testImplementation(libs.junit) + testImplementation(libs.kotlinx.coroutines.test) +} diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..e69de29 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..6a94bc4 --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + diff --git a/app/src/main/java/kr/tkrmagid/easyappliance/MainActivity.kt b/app/src/main/java/kr/tkrmagid/easyappliance/MainActivity.kt new file mode 100644 index 0000000..d9c9a4c --- /dev/null +++ b/app/src/main/java/kr/tkrmagid/easyappliance/MainActivity.kt @@ -0,0 +1,20 @@ +package kr.tkrmagid.easyappliance + +import android.os.Bundle +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.activity.enableEdgeToEdge +import kr.tkrmagid.easyappliance.ui.AppRoot +import kr.tkrmagid.easyappliance.ui.theme.EasyApplianceTheme + +class MainActivity : ComponentActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + enableEdgeToEdge() + super.onCreate(savedInstanceState) + setContent { + EasyApplianceTheme { + AppRoot() + } + } + } +} diff --git a/app/src/main/java/kr/tkrmagid/easyappliance/data/DeviceImages.kt b/app/src/main/java/kr/tkrmagid/easyappliance/data/DeviceImages.kt new file mode 100644 index 0000000..fc9e60a --- /dev/null +++ b/app/src/main/java/kr/tkrmagid/easyappliance/data/DeviceImages.kt @@ -0,0 +1,42 @@ +package kr.tkrmagid.easyappliance.data + +import androidx.annotation.DrawableRes +import kr.tkrmagid.easyappliance.R + +/** + * Built-in appliance pictures shown as defaults in the admin image picker. + * An image override is stored as either "builtin:" or a content:// Uri string. + */ +object DeviceImages { + + const val BUILTIN_PREFIX = "builtin:" + + data class Builtin(val key: String, val label: String, @DrawableRes val res: Int) + + val builtins: List = listOf( + Builtin("washer", "세탁기", R.drawable.img_washer), + Builtin("aircon", "에어컨", R.drawable.img_aircon), + Builtin("fridge", "냉장고", R.drawable.img_fridge), + Builtin("tv", "TV", R.drawable.img_tv), + Builtin("device", "기타 기기", R.drawable.img_device), + ) + + /** Drawable resource for a "builtin:" reference, or null if not a builtin. */ + @DrawableRes + fun resForRef(ref: String?): Int? { + if (ref == null || !ref.startsWith(BUILTIN_PREFIX)) return null + val key = ref.removePrefix(BUILTIN_PREFIX) + return builtins.firstOrNull { it.key == key }?.res + } + + fun refForKey(key: String): String = "$BUILTIN_PREFIX$key" + + /** Default built-in reference for a device type. */ + fun defaultRefFor(type: DeviceType): String = when (type) { + DeviceType.WASHER -> refForKey("washer") + DeviceType.AIRCONDITIONER -> refForKey("aircon") + DeviceType.REFRIGERATOR -> refForKey("fridge") + DeviceType.TV -> refForKey("tv") + DeviceType.OTHER -> refForKey("device") + } +} diff --git a/app/src/main/java/kr/tkrmagid/easyappliance/data/DeviceRepository.kt b/app/src/main/java/kr/tkrmagid/easyappliance/data/DeviceRepository.kt new file mode 100644 index 0000000..8515666 --- /dev/null +++ b/app/src/main/java/kr/tkrmagid/easyappliance/data/DeviceRepository.kt @@ -0,0 +1,60 @@ +package kr.tkrmagid.easyappliance.data + +/** + * Source of devices and their status. A real SmartThings-backed implementation + * will replace [MockDeviceRepository] once an API token is configured; the UI + * only depends on this interface. + */ +interface DeviceRepository { + suspend fun listDevices(): List + suspend fun getStatus(deviceId: String): DeviceStatus + suspend fun setPower(deviceId: String, on: Boolean) + + /** Apply each macro step, then start the device. */ + suspend fun runMacro(deviceId: String, steps: List) +} + +/** + * In-memory sample data so the whole UX can be built and demoed before a real + * SmartThings token exists. Power toggles are reflected back on next status read. + */ +class MockDeviceRepository : DeviceRepository { + + private val powerState = mutableMapOf( + "washer-1" to false, + "aircon-1" to true, + ) + + override suspend fun listDevices(): List = listOf( + Device("washer-1", "세탁기", DeviceType.WASHER), + Device("aircon-1", "거실 에어컨", DeviceType.AIRCONDITIONER), + ) + + override suspend fun getStatus(deviceId: String): DeviceStatus { + val on = powerState[deviceId] ?: false + return when (deviceId) { + "washer-1" -> DeviceStatus( + powerOn = on, + operatingState = if (on) "운전 중" else "꺼짐", + remainingMinutes = if (on) 32 else null, + reservation = null, + ) + "aircon-1" -> DeviceStatus( + powerOn = on, + operatingState = if (on) "냉방 중" else "꺼짐", + currentTemperature = 27, + targetTemperature = if (on) 24 else null, + ) + else -> DeviceStatus(powerOn = on) + } + } + + override suspend fun setPower(deviceId: String, on: Boolean) { + powerState[deviceId] = on + } + + override suspend fun runMacro(deviceId: String, steps: List) { + // Sample mode: steps are a no-op; the device simply starts. + powerState[deviceId] = true + } +} diff --git a/app/src/main/java/kr/tkrmagid/easyappliance/data/ImageStorage.kt b/app/src/main/java/kr/tkrmagid/easyappliance/data/ImageStorage.kt new file mode 100644 index 0000000..453f34e --- /dev/null +++ b/app/src/main/java/kr/tkrmagid/easyappliance/data/ImageStorage.kt @@ -0,0 +1,20 @@ +package kr.tkrmagid.easyappliance.data + +import android.content.Context +import android.net.Uri +import java.io.File + +/** + * Copies a picked image into app-internal storage so it survives restarts + * (Photo Picker URIs are not durably readable). Returns a file:// reference. + */ +object ImageStorage { + fun saveDeviceImage(context: Context, source: Uri, deviceId: String): String? = runCatching { + val dir = File(context.filesDir, "device_images").apply { mkdirs() } + val file = File(dir, "img_${deviceId.hashCode()}_${System.nanoTime()}.jpg") + context.contentResolver.openInputStream(source)?.use { input -> + file.outputStream().use { output -> input.copyTo(output) } + } ?: return null + "file://${file.absolutePath}" + }.getOrNull() +} diff --git a/app/src/main/java/kr/tkrmagid/easyappliance/data/Macro.kt b/app/src/main/java/kr/tkrmagid/easyappliance/data/Macro.kt new file mode 100644 index 0000000..11c91af --- /dev/null +++ b/app/src/main/java/kr/tkrmagid/easyappliance/data/Macro.kt @@ -0,0 +1,27 @@ +package kr.tkrmagid.easyappliance.data + +import kotlinx.serialization.Serializable + +/** + * One SmartThings command applied as part of a macro, e.g. set water + * temperature. [args] are stored as strings and converted to JSON at send time + * (numeric strings become numbers). + */ +@Serializable +data class MacroStep( + val capability: String, + val command: String, + val args: List = emptyList(), + /** Human-readable description shown in admin, e.g. "물 온도 40도". */ + val label: String = "", +) + +/** + * Per-device macro: when enabled, the home screen shows a single "시작" button + * that applies every step and then starts the device. + */ +@Serializable +data class DeviceMacro( + val enabled: Boolean = false, + val steps: List = emptyList(), +) diff --git a/app/src/main/java/kr/tkrmagid/easyappliance/data/Models.kt b/app/src/main/java/kr/tkrmagid/easyappliance/data/Models.kt new file mode 100644 index 0000000..88cf8c0 --- /dev/null +++ b/app/src/main/java/kr/tkrmagid/easyappliance/data/Models.kt @@ -0,0 +1,39 @@ +package kr.tkrmagid.easyappliance.data + +/** Broad appliance category, used to pick icons and default labels. */ +enum class DeviceType { WASHER, AIRCONDITIONER, REFRIGERATOR, TV, OTHER } + +/** Korean category name shown in warnings and defaults, e.g. "세탁기". */ +fun DeviceType.koreanLabel(): String = when (this) { + DeviceType.WASHER -> "세탁기" + DeviceType.AIRCONDITIONER -> "에어컨" + DeviceType.REFRIGERATOR -> "냉장고" + DeviceType.TV -> "TV" + DeviceType.OTHER -> "기기" +} + +/** A SmartThings device the user can control. */ +data class Device( + val id: String, + val label: String, + val type: DeviceType, + val online: Boolean = true, +) + +/** + * Normalized status shown on the home screen. Not every field applies to every + * device; null means "not reported / not applicable". + */ +data class DeviceStatus( + val powerOn: Boolean = false, + /** Human-readable run state, e.g. "운전 중", "정지", "일시정지". */ + val operatingState: String? = null, + /** Remaining minutes for a running cycle, if reported. */ + val remainingMinutes: Int? = null, + /** Reservation / scheduled-start description, if set. */ + val reservation: String? = null, + /** Current temperature (aircon), if reported. */ + val currentTemperature: Int? = null, + /** Target temperature (aircon), if reported. */ + val targetTemperature: Int? = null, +) diff --git a/app/src/main/java/kr/tkrmagid/easyappliance/data/SettingsRepository.kt b/app/src/main/java/kr/tkrmagid/easyappliance/data/SettingsRepository.kt new file mode 100644 index 0000000..e8a2761 --- /dev/null +++ b/app/src/main/java/kr/tkrmagid/easyappliance/data/SettingsRepository.kt @@ -0,0 +1,105 @@ +package kr.tkrmagid.easyappliance.data + +import android.content.Context +import androidx.datastore.core.DataStore +import androidx.datastore.preferences.core.Preferences +import androidx.datastore.preferences.core.booleanPreferencesKey +import androidx.datastore.preferences.core.edit +import androidx.datastore.preferences.core.stringPreferencesKey +import androidx.datastore.preferences.preferencesDataStore +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.map +import kotlinx.serialization.decodeFromString +import kotlinx.serialization.encodeToString +import kotlinx.serialization.json.Json + +private val Context.dataStore: DataStore by preferencesDataStore(name = "settings") + +/** User/admin choices that must survive app restarts. */ +data class AppSettings( + val selectedDeviceId: String? = null, + val showRemainingTime: Boolean = true, + val showReservation: Boolean = true, + val showPowerControls: Boolean = true, + /** SmartThings Personal Access Token; null/blank means use sample data. */ + val smartThingsToken: String? = null, + /** deviceId -> custom display name. */ + val labelOverrides: Map = emptyMap(), + /** deviceId -> image reference ("builtin:" or a content:// Uri). */ + val imageOverrides: Map = emptyMap(), + /** deviceId -> start macro. */ + val deviceMacros: Map = emptyMap(), +) + +/** Persists [AppSettings] via Jetpack DataStore. */ +class SettingsRepository(private val context: Context) { + + val settings: Flow = context.dataStore.data.map { p -> + AppSettings( + selectedDeviceId = p[KEY_SELECTED_DEVICE], + showRemainingTime = p[KEY_SHOW_REMAINING] ?: true, + showReservation = p[KEY_SHOW_RESERVATION] ?: true, + showPowerControls = p[KEY_SHOW_POWER] ?: true, + smartThingsToken = p[KEY_TOKEN]?.takeIf { it.isNotBlank() }, + labelOverrides = decodeMap(p[KEY_LABEL_OVERRIDES]), + imageOverrides = decodeMap(p[KEY_IMAGE_OVERRIDES]), + deviceMacros = decodeMacros(p[KEY_MACROS]), + ) + } + + suspend fun setSelectedDevice(deviceId: String) = + edit { it[KEY_SELECTED_DEVICE] = deviceId } + + suspend fun setShowRemainingTime(value: Boolean) = + edit { it[KEY_SHOW_REMAINING] = value } + + suspend fun setShowReservation(value: Boolean) = + edit { it[KEY_SHOW_RESERVATION] = value } + + suspend fun setShowPowerControls(value: Boolean) = + edit { it[KEY_SHOW_POWER] = value } + + suspend fun setToken(token: String) = + edit { it[KEY_TOKEN] = token.trim() } + + suspend fun setDeviceLabel(deviceId: String, label: String) = edit { prefs -> + val map = decodeMap(prefs[KEY_LABEL_OVERRIDES]).toMutableMap() + if (label.isBlank()) map.remove(deviceId) else map[deviceId] = label.trim() + prefs[KEY_LABEL_OVERRIDES] = Json.encodeToString(map) + } + + suspend fun setDeviceImage(deviceId: String, imageRef: String) = edit { prefs -> + val map = decodeMap(prefs[KEY_IMAGE_OVERRIDES]).toMutableMap() + map[deviceId] = imageRef + prefs[KEY_IMAGE_OVERRIDES] = Json.encodeToString(map) + } + + suspend fun setDeviceMacro(deviceId: String, macro: DeviceMacro) = edit { prefs -> + val map = decodeMacros(prefs[KEY_MACROS]).toMutableMap() + map[deviceId] = macro + prefs[KEY_MACROS] = Json.encodeToString(map) + } + + private suspend fun edit(block: (androidx.datastore.preferences.core.MutablePreferences) -> Unit) { + context.dataStore.edit(block) + } + + private fun decodeMap(raw: String?): Map = + if (raw.isNullOrBlank()) emptyMap() + else runCatching { Json.decodeFromString>(raw) }.getOrDefault(emptyMap()) + + private fun decodeMacros(raw: String?): Map = + if (raw.isNullOrBlank()) emptyMap() + else runCatching { Json.decodeFromString>(raw) }.getOrDefault(emptyMap()) + + private companion object { + val KEY_SELECTED_DEVICE = stringPreferencesKey("selected_device_id") + val KEY_SHOW_REMAINING = booleanPreferencesKey("show_remaining_time") + val KEY_SHOW_RESERVATION = booleanPreferencesKey("show_reservation") + val KEY_SHOW_POWER = booleanPreferencesKey("show_power_controls") + val KEY_TOKEN = stringPreferencesKey("smartthings_token") + val KEY_LABEL_OVERRIDES = stringPreferencesKey("label_overrides_json") + val KEY_IMAGE_OVERRIDES = stringPreferencesKey("image_overrides_json") + val KEY_MACROS = stringPreferencesKey("device_macros_json") + } +} diff --git a/app/src/main/java/kr/tkrmagid/easyappliance/data/smartthings/SmartThingsApi.kt b/app/src/main/java/kr/tkrmagid/easyappliance/data/smartthings/SmartThingsApi.kt new file mode 100644 index 0000000..934ac91 --- /dev/null +++ b/app/src/main/java/kr/tkrmagid/easyappliance/data/smartthings/SmartThingsApi.kt @@ -0,0 +1,83 @@ +package kr.tkrmagid.easyappliance.data.smartthings + +import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory +import kotlinx.serialization.Serializable +import kotlinx.serialization.json.Json +import kotlinx.serialization.json.JsonElement +import kotlinx.serialization.json.JsonObject +import okhttp3.Interceptor +import okhttp3.MediaType.Companion.toMediaType +import okhttp3.OkHttpClient +import retrofit2.Retrofit +import retrofit2.http.Body +import retrofit2.http.GET +import retrofit2.http.POST +import retrofit2.http.Path +import java.util.concurrent.TimeUnit + +@Serializable +data class DevicesResponse(val items: List = emptyList()) + +@Serializable +data class StDevice( + val deviceId: String, + val label: String? = null, + val name: String? = null, + val components: List = emptyList(), +) + +@Serializable +data class StComponent(val id: String = "main", val capabilities: List = emptyList()) + +@Serializable +data class StCapability(val id: String) + +@Serializable +data class StCommand( + val component: String = "main", + val capability: String, + val command: String, + val arguments: List = emptyList(), +) + +@Serializable +data class StCommandsRequest(val commands: List) + +interface SmartThingsApi { + @GET("v1/devices") + suspend fun listDevices(): DevicesResponse + + @GET("v1/devices/{id}/status") + suspend fun deviceStatus(@Path("id") deviceId: String): JsonObject + + @POST("v1/devices/{id}/commands") + suspend fun sendCommands(@Path("id") deviceId: String, @Body body: StCommandsRequest) +} + +/** Builds a [SmartThingsApi] bound to a Personal Access Token. */ +object SmartThingsClient { + private const val BASE_URL = "https://api.smartthings.com/" + + val json = Json { ignoreUnknownKeys = true; coerceInputValues = true } + + fun create(token: String): SmartThingsApi { + val auth = Interceptor { chain -> + val req = chain.request().newBuilder() + .addHeader("Authorization", "Bearer $token") + .addHeader("Accept", "application/json") + .build() + chain.proceed(req) + } + val client = OkHttpClient.Builder() + .addInterceptor(auth) + .connectTimeout(15, TimeUnit.SECONDS) + .readTimeout(15, TimeUnit.SECONDS) + .build() + return Retrofit.Builder() + .baseUrl(BASE_URL) + .client(client) + .addConverterFactory(json.asConverterFactory("application/json".toMediaType())) + .build() + .create(SmartThingsApi::class.java) + } +} diff --git a/app/src/main/java/kr/tkrmagid/easyappliance/data/smartthings/SmartThingsDeviceRepository.kt b/app/src/main/java/kr/tkrmagid/easyappliance/data/smartthings/SmartThingsDeviceRepository.kt new file mode 100644 index 0000000..95282f7 --- /dev/null +++ b/app/src/main/java/kr/tkrmagid/easyappliance/data/smartthings/SmartThingsDeviceRepository.kt @@ -0,0 +1,77 @@ +package kr.tkrmagid.easyappliance.data.smartthings + +import kr.tkrmagid.easyappliance.data.Device +import kr.tkrmagid.easyappliance.data.DeviceRepository +import kr.tkrmagid.easyappliance.data.DeviceStatus +import kr.tkrmagid.easyappliance.data.DeviceType +import kr.tkrmagid.easyappliance.data.MacroStep +import kotlinx.serialization.json.JsonElement +import kotlinx.serialization.json.JsonPrimitive + +/** [DeviceRepository] backed by the real SmartThings Cloud API. */ +class SmartThingsDeviceRepository( + private val api: SmartThingsApi, +) : DeviceRepository { + + private val typeCache = mutableMapOf() + + override suspend fun listDevices(): List { + return api.listDevices().items.map { d -> + val caps = d.components.flatMap { c -> c.capabilities.map { it.id } }.toSet() + val type = inferType(caps, d.label, d.name) + typeCache[d.deviceId] = type + Device( + id = d.deviceId, + label = d.label ?: d.name ?: "기기", + type = type, + online = true, + ) + } + } + + override suspend fun getStatus(deviceId: String): DeviceStatus { + val json = api.deviceStatus(deviceId) + val type = typeCache[deviceId] ?: DeviceType.OTHER + return SmartThingsStatusMapper.map(json, type) + } + + override suspend fun setPower(deviceId: String, on: Boolean) { + api.sendCommands( + deviceId, + StCommandsRequest( + listOf(StCommand(capability = "switch", command = if (on) "on" else "off")), + ), + ) + } + + override suspend fun runMacro(deviceId: String, steps: List) { + val commands = steps.map { step -> + StCommand( + capability = step.capability, + command = step.command, + arguments = step.args.map { it.toJsonElement() }, + ) + } + StCommand(capability = "switch", command = "on") + api.sendCommands(deviceId, StCommandsRequest(commands)) + } + + private fun String.toJsonElement(): JsonElement = + toIntOrNull()?.let { JsonPrimitive(it) } + ?: toDoubleOrNull()?.let { JsonPrimitive(it) } + ?: JsonPrimitive(this) + + private fun inferType(caps: Set, label: String?, name: String?): DeviceType { + val text = "${label.orEmpty()} ${name.orEmpty()}" + return when { + caps.any { it.contains("washerOperatingState", ignoreCase = true) } -> DeviceType.WASHER + caps.any { it.contains("airConditionerMode", ignoreCase = true) } -> DeviceType.AIRCONDITIONER + caps.any { it.contains("refrigeration", ignoreCase = true) } -> DeviceType.REFRIGERATOR + caps.contains("tvChannel") || caps.contains("mediaPlayback") -> DeviceType.TV + text.contains("세탁") || text.contains("washer", true) -> DeviceType.WASHER + text.contains("에어컨") || text.contains("aircon", true) || text.contains("air conditioner", true) -> DeviceType.AIRCONDITIONER + text.contains("냉장") || text.contains("fridge", true) -> DeviceType.REFRIGERATOR + text.contains("tv", true) -> DeviceType.TV + else -> DeviceType.OTHER + } + } +} diff --git a/app/src/main/java/kr/tkrmagid/easyappliance/data/smartthings/SmartThingsStatusMapper.kt b/app/src/main/java/kr/tkrmagid/easyappliance/data/smartthings/SmartThingsStatusMapper.kt new file mode 100644 index 0000000..fb29191 --- /dev/null +++ b/app/src/main/java/kr/tkrmagid/easyappliance/data/smartthings/SmartThingsStatusMapper.kt @@ -0,0 +1,74 @@ +package kr.tkrmagid.easyappliance.data.smartthings + +import kr.tkrmagid.easyappliance.data.DeviceStatus +import kr.tkrmagid.easyappliance.data.DeviceType +import kotlinx.serialization.json.JsonObject +import kotlinx.serialization.json.JsonPrimitive +import kotlinx.serialization.json.jsonObject +import kotlinx.serialization.json.jsonPrimitive + +/** + * Best-effort mapping from a SmartThings `/status` payload to our [DeviceStatus]. + * SmartThings status is deeply nested with capability-specific keys; this reads + * the common capabilities defensively and returns nulls for anything missing. + * Refine per real device once a token is available. + */ +object SmartThingsStatusMapper { + + fun map(status: JsonObject, type: DeviceType): DeviceStatus { + val main = status["components"]?.jsonObject?.get("main")?.jsonObject + ?: return DeviceStatus(powerOn = false) + + val powerOn = attr(main, "switch", "switch")?.contentOrNull() == "on" + + return when (type) { + DeviceType.WASHER -> mapWasher(main, powerOn) + DeviceType.AIRCONDITIONER -> mapAircon(main, powerOn) + else -> DeviceStatus(powerOn = powerOn, operatingState = if (powerOn) "켜짐" else "꺼짐") + } + } + + private fun mapWasher(main: JsonObject, powerOn: Boolean): DeviceStatus { + val machine = attr(main, "washerOperatingState", "machineState")?.contentOrNull() + ?: attr(main, "samsungce.washerOperatingState", "operatingState")?.contentOrNull() + val state = when (machine) { + "run" -> "운전 중" + "pause" -> "일시정지" + "stop" -> "정지" + else -> if (powerOn) "켜짐" else "꺼짐" + } + val remaining = numberAttr(main, "samsungce.washerOperatingState", "remainingTime") + ?.let { secondsToMinutes(it) } + return DeviceStatus( + powerOn = powerOn, + operatingState = state, + remainingMinutes = remaining, + ) + } + + private fun mapAircon(main: JsonObject, powerOn: Boolean): DeviceStatus { + val current = numberAttr(main, "temperatureMeasurement", "temperature") + val target = numberAttr(main, "thermostatCoolingSetpoint", "coolingSetpoint") + ?: numberAttr(main, "custom.thermostatSetpointControl", "coolingSetpoint") + return DeviceStatus( + powerOn = powerOn, + operatingState = if (powerOn) "냉방 중" else "꺼짐", + currentTemperature = current, + targetTemperature = if (powerOn) target else null, + ) + } + + private fun attr(main: JsonObject, capability: String, attribute: String): JsonPrimitive? = + runCatching { + main[capability]?.jsonObject?.get(attribute)?.jsonObject?.get("value") as? JsonPrimitive + }.getOrNull() + + private fun numberAttr(main: JsonObject, capability: String, attribute: String): Int? = + attr(main, capability, attribute)?.let { it.contentOrNull()?.toDoubleOrNull()?.toInt() } + + private fun JsonPrimitive.contentOrNull(): String? = + runCatching { jsonPrimitive.content }.getOrNull()?.takeIf { it != "null" } + + private fun secondsToMinutes(seconds: Int): Int = + if (seconds > 300) (seconds + 59) / 60 else seconds +} diff --git a/app/src/main/java/kr/tkrmagid/easyappliance/ui/AdminGesture.kt b/app/src/main/java/kr/tkrmagid/easyappliance/ui/AdminGesture.kt new file mode 100644 index 0000000..3a2a2dc --- /dev/null +++ b/app/src/main/java/kr/tkrmagid/easyappliance/ui/AdminGesture.kt @@ -0,0 +1,49 @@ +package kr.tkrmagid.easyappliance.ui + +import androidx.compose.ui.Modifier +import androidx.compose.ui.input.pointer.PointerEvent +import androidx.compose.ui.input.pointer.pointerInput +import kotlinx.coroutines.withTimeoutOrNull + +/** + * Hidden admin unlock: the user must press BOTH top corners at the same time and + * hold for ~1.5s. This is intentionally hard to trigger by accident so older + * users don't stumble into the admin screen, while a caretaker can still open it. + */ +fun Modifier.adminUnlockGesture( + holdMillis: Long = 1500L, + cornerFraction: Float = 0.30f, + onUnlock: () -> Unit, +): Modifier = this.pointerInput(Unit) { + val zoneW = size.width * cornerFraction + val zoneH = size.height * cornerFraction + + fun PointerEvent.bothTopCornersHeld(): Boolean { + val pressed = changes.filter { it.pressed }.map { it.position } + val topLeft = pressed.any { it.x < zoneW && it.y < zoneH } + val topRight = pressed.any { it.x > size.width - zoneW && it.y < zoneH } + return topLeft && topRight + } + + while (true) { + // 1) Wait until both top corners are pressed simultaneously. + awaitPointerEventScope { + do { } while (!awaitPointerEvent().bothTopCornersHeld()) + } + // 2) They are held now. If they stay held for the full duration, the inner + // wait never returns and withTimeoutOrNull yields null -> unlock. If a + // finger lifts, an event fires, the loop returns, and we abort. + val releasedEarly = withTimeoutOrNull(holdMillis) { + awaitPointerEventScope { + do { } while (awaitPointerEvent().bothTopCornersHeld()) + } + } + if (releasedEarly == null) { + onUnlock() + // Wait for fingers to lift so we don't immediately re-trigger. + awaitPointerEventScope { + do { } while (awaitPointerEvent().bothTopCornersHeld()) + } + } + } +} diff --git a/app/src/main/java/kr/tkrmagid/easyappliance/ui/AdminScreen.kt b/app/src/main/java/kr/tkrmagid/easyappliance/ui/AdminScreen.kt new file mode 100644 index 0000000..28357bd --- /dev/null +++ b/app/src/main/java/kr/tkrmagid/easyappliance/ui/AdminScreen.kt @@ -0,0 +1,328 @@ +package kr.tkrmagid.easyappliance.ui + +import androidx.activity.compose.rememberLauncherForActivityResult +import androidx.activity.result.PickVisualMediaRequest +import androidx.activity.result.contract.ActivityResultContracts +import androidx.compose.foundation.border +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.selection.selectable +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.Button +import androidx.compose.material3.Card +import androidx.compose.material3.CardDefaults +import androidx.compose.material3.HorizontalDivider +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.OutlinedButton +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.RadioButton +import androidx.compose.material3.Switch +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.input.KeyboardType +import androidx.compose.ui.text.input.PasswordVisualTransformation +import androidx.compose.ui.text.input.VisualTransformation +import androidx.compose.ui.unit.dp +import androidx.compose.foundation.text.KeyboardOptions +import kr.tkrmagid.easyappliance.data.Device +import kr.tkrmagid.easyappliance.data.DeviceImages +import kr.tkrmagid.easyappliance.data.DeviceMacro +import kr.tkrmagid.easyappliance.data.ImageStorage +import kr.tkrmagid.easyappliance.vm.HomeUiState +import kr.tkrmagid.easyappliance.vm.displayLabelFor +import kr.tkrmagid.easyappliance.vm.imageRefFor +import kr.tkrmagid.easyappliance.vm.macroFor + +@Composable +fun AdminScreen( + state: HomeUiState, + onSelectDevice: (String) -> Unit, + onToggleRemaining: (Boolean) -> Unit, + onToggleReservation: (Boolean) -> Unit, + onTogglePowerControls: (Boolean) -> Unit, + onSetLabel: (String, String) -> Unit, + onSetImageRef: (String, String) -> Unit, + onSetToken: (String) -> Unit, + onSetMacro: (String, DeviceMacro) -> Unit, + onPreviewWarning: () -> Unit, + onBack: () -> Unit, + modifier: Modifier = Modifier, +) { + val selected = state.selected + Column( + modifier = modifier + .fillMaxSize() + .verticalScroll(rememberScrollState()) + .padding(20.dp), + ) { + Text("관리자 설정", style = MaterialTheme.typography.headlineLarge) + Spacer(Modifier.height(24.dp)) + + SectionTitle("조작할 기기 선택") + Card( + modifier = Modifier.fillMaxWidth(), + colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceVariant), + ) { + Column(Modifier.fillMaxWidth().padding(vertical = 4.dp)) { + state.devices.forEach { device -> + DeviceRow( + device = device, + subtitle = state.displayLabelFor(device), + selected = device.id == selected?.id, + onClick = { onSelectDevice(device.id) }, + ) + } + if (state.devices.isEmpty()) { + Text( + "표시할 기기가 없습니다.", + style = MaterialTheme.typography.bodyLarge, + modifier = Modifier.padding(16.dp), + ) + } + } + } + + if (selected != null) { + Spacer(Modifier.height(28.dp)) + SectionTitle("이름 바꾸기") + NameEditor( + current = state.displayLabelFor(selected), + onSave = { onSetLabel(selected.id, it) }, + ) + + Spacer(Modifier.height(28.dp)) + SectionTitle("사진 바꾸기") + ImagePicker( + currentRef = state.imageRefFor(selected), + onPickBuiltin = { onSetImageRef(selected.id, it) }, + onPickCustom = { onSetImageRef(selected.id, it) }, + deviceId = selected.id, + ) + + Spacer(Modifier.height(28.dp)) + SectionTitle("매크로 (시작 자동화)") + MacroEditor( + device = selected, + macro = state.macroFor(selected) ?: DeviceMacro(), + onChange = { onSetMacro(selected.id, it) }, + ) + } + + Spacer(Modifier.height(28.dp)) + SectionTitle("표시할 정보 / 기능") + Card( + modifier = Modifier.fillMaxWidth(), + colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceVariant), + ) { + Column(Modifier.fillMaxWidth().padding(8.dp)) { + ToggleRow("남은 시간 표시", state.settings.showRemainingTime, onToggleRemaining) + HorizontalDivider() + ToggleRow("예약 정보 표시", state.settings.showReservation, onToggleReservation) + HorizontalDivider() + ToggleRow("켜기 / 끄기 버튼 표시", state.settings.showPowerControls, onTogglePowerControls) + } + } + + Spacer(Modifier.height(28.dp)) + SectionTitle("SmartThings 연결") + TokenEditor( + usingRealApi = state.usingRealApi, + onSave = onSetToken, + ) + + Spacer(Modifier.height(20.dp)) + OutlinedButton( + onClick = { onPreviewWarning(); onBack() }, + modifier = Modifier.fillMaxWidth().height(64.dp), + ) { + Text("연결 경고창 미리보기 (테스트)", style = MaterialTheme.typography.bodyLarge) + } + + Spacer(Modifier.height(28.dp)) + Button( + onClick = onBack, + modifier = Modifier.fillMaxWidth().height(76.dp), + ) { + Text("저장하고 닫기", style = MaterialTheme.typography.labelLarge) + } + } +} + +@Composable +private fun NameEditor(current: String, onSave: (String) -> Unit) { + var text by remember(current) { mutableStateOf(current) } + Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) { + OutlinedTextField( + value = text, + onValueChange = { text = it }, + singleLine = true, + textStyle = MaterialTheme.typography.bodyLarge, + modifier = Modifier.weight(1f), + ) + Spacer(Modifier.size(12.dp)) + Button(onClick = { onSave(text) }, modifier = Modifier.height(56.dp)) { + Text("저장") + } + } +} + +@Composable +private fun ImagePicker( + currentRef: String, + onPickBuiltin: (String) -> Unit, + onPickCustom: (String) -> Unit, + deviceId: String, +) { + val context = LocalContext.current + val launcher = rememberLauncherForActivityResult( + ActivityResultContracts.PickVisualMedia(), + ) { uri -> + if (uri != null) { + ImageStorage.saveDeviceImage(context, uri, deviceId)?.let(onPickCustom) + } + } + + Column(Modifier.fillMaxWidth()) { + Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) { + DeviceImage(imageRef = currentRef, modifier = Modifier.size(72.dp)) + Spacer(Modifier.size(16.dp)) + Text("현재 사진", style = MaterialTheme.typography.bodyLarge) + } + Spacer(Modifier.height(16.dp)) + Text("기본 사진 중 선택", style = MaterialTheme.typography.bodyMedium) + Spacer(Modifier.height(8.dp)) + Row( + Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(12.dp), + ) { + DeviceImages.builtins.forEach { b -> + val ref = DeviceImages.refForKey(b.key) + val isSel = ref == currentRef + Column( + horizontalAlignment = Alignment.CenterHorizontally, + modifier = Modifier + .clip(RoundedCornerShape(12.dp)) + .border( + width = if (isSel) 3.dp else 1.dp, + color = if (isSel) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.outlineVariant, + shape = RoundedCornerShape(12.dp), + ) + .clickable { onPickBuiltin(ref) } + .padding(6.dp), + ) { + DeviceImage(imageRef = ref, modifier = Modifier.size(48.dp)) + Text(b.label, style = MaterialTheme.typography.bodyMedium) + } + } + } + Spacer(Modifier.height(16.dp)) + OutlinedButton( + onClick = { + launcher.launch( + PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.ImageOnly), + ) + }, + modifier = Modifier.fillMaxWidth().height(60.dp), + ) { + Text("갤러리에서 사진 추가", style = MaterialTheme.typography.bodyLarge) + } + } +} + +@Composable +private fun TokenEditor(usingRealApi: Boolean, onSave: (String) -> Unit) { + var token by remember { mutableStateOf("") } + var reveal by remember { mutableStateOf(false) } + Column(Modifier.fillMaxWidth()) { + Text( + if (usingRealApi) "상태: 실기기 연결 (토큰 설정됨)" else "상태: 샘플 모드 (토큰 없음)", + style = MaterialTheme.typography.bodyLarge, + color = if (usingRealApi) MaterialTheme.colorScheme.secondary else MaterialTheme.colorScheme.onSurfaceVariant, + ) + Spacer(Modifier.height(12.dp)) + OutlinedTextField( + value = token, + onValueChange = { token = it }, + singleLine = true, + label = { Text("SmartThings 토큰 입력") }, + visualTransformation = if (reveal) VisualTransformation.None else PasswordVisualTransformation(), + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password), + modifier = Modifier.fillMaxWidth(), + ) + Row( + Modifier.fillMaxWidth().padding(top = 8.dp), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically, + ) { + Row(verticalAlignment = Alignment.CenterVertically) { + Switch(checked = reveal, onCheckedChange = { reveal = it }) + Text(" 토큰 보기", style = MaterialTheme.typography.bodyMedium) + } + Button( + onClick = { if (token.isNotBlank()) onSave(token) }, + modifier = Modifier.height(56.dp), + ) { + Text("토큰 저장") + } + } + } +} + +@Composable +private fun SectionTitle(text: String) { + Text( + text, + style = MaterialTheme.typography.titleLarge, + fontWeight = FontWeight.Bold, + modifier = Modifier.padding(bottom = 12.dp), + ) +} + +@Composable +private fun DeviceRow(device: Device, subtitle: String, selected: Boolean, onClick: () -> Unit) { + Row( + modifier = Modifier + .fillMaxWidth() + .selectable(selected = selected, onClick = onClick) + .padding(horizontal = 16.dp, vertical = 16.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + RadioButton(selected = selected, onClick = onClick) + Spacer(Modifier.size(8.dp)) + Text(subtitle, style = MaterialTheme.typography.titleLarge) + } +} + +@Composable +private fun ToggleRow(label: String, checked: Boolean, onCheckedChange: (Boolean) -> Unit) { + Row( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 12.dp, vertical = 16.dp), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.SpaceBetween, + ) { + Text(label, style = MaterialTheme.typography.bodyLarge, modifier = Modifier.weight(1f)) + Switch(checked = checked, onCheckedChange = onCheckedChange) + } +} diff --git a/app/src/main/java/kr/tkrmagid/easyappliance/ui/AppRoot.kt b/app/src/main/java/kr/tkrmagid/easyappliance/ui/AppRoot.kt new file mode 100644 index 0000000..75348c7 --- /dev/null +++ b/app/src/main/java/kr/tkrmagid/easyappliance/ui/AppRoot.kt @@ -0,0 +1,89 @@ +package kr.tkrmagid.easyappliance.ui + +import androidx.activity.compose.BackHandler +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.Scaffold +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.saveable.rememberSaveable +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.lifecycle.Lifecycle +import androidx.lifecycle.compose.LifecycleEventEffect +import androidx.lifecycle.compose.collectAsStateWithLifecycle +import androidx.lifecycle.viewmodel.compose.viewModel +import kr.tkrmagid.easyappliance.data.koreanLabel +import kr.tkrmagid.easyappliance.vm.AppViewModel +import kr.tkrmagid.easyappliance.vm.displayLabelFor +import kotlinx.coroutines.delay + +private enum class Screen { HOME, ADMIN } + +private const val POLL_OK_MS = 15_000L +private const val POLL_OFFLINE_MS = 5_000L + +@Composable +fun AppRoot() { + val vm: AppViewModel = viewModel() + val state by vm.state.collectAsStateWithLifecycle() + var screen by rememberSaveable { mutableStateOf(Screen.HOME) } + + // Refresh when returning to the foreground... + LifecycleEventEffect(Lifecycle.Event.ON_RESUME) { vm.refresh() } + // ...and poll while composed; retry faster while disconnected so the warning + // clears itself as soon as the device/API is reachable again. + LaunchedEffect(Unit) { + while (true) { + val connected = vm.state.value.connected + delay(if (connected) POLL_OK_MS else POLL_OFFLINE_MS) + if (vm.state.value.connected) vm.refresh() else vm.retryConnection() + } + } + + // System / Samsung back: admin -> home; block back while the warning is up. + BackHandler(enabled = screen == Screen.ADMIN) { screen = Screen.HOME } + BackHandler(enabled = state.showConnectionWarning) { /* must use the buttons */ } + + Scaffold(modifier = Modifier.fillMaxSize()) { padding -> + Box(Modifier.fillMaxSize().padding(padding)) { + when (screen) { + Screen.HOME -> HomeScreen( + state = state, + onTogglePower = vm::togglePower, + onRunMacro = vm::runMacro, + onRefresh = vm::refresh, + modifier = Modifier + .fillMaxSize() + .adminUnlockGesture { screen = Screen.ADMIN }, + ) + Screen.ADMIN -> AdminScreen( + state = state, + onSelectDevice = vm::selectDevice, + onToggleRemaining = vm::setShowRemainingTime, + onToggleReservation = vm::setShowReservation, + onTogglePowerControls = vm::setShowPowerControls, + onSetLabel = vm::setDeviceLabel, + onSetImageRef = vm::setDeviceImage, + onSetToken = vm::setToken, + onSetMacro = vm::setDeviceMacro, + onPreviewWarning = vm::previewConnectionWarning, + onBack = { screen = Screen.HOME }, + ) + } + + if (state.showConnectionWarning) { + val selected = state.selected + ConnectionWarning( + deviceTypeLabel = selected?.type?.koreanLabel() ?: "기기", + deviceName = selected?.let { state.displayLabelFor(it) } ?: "기기", + onRetry = vm::retryConnection, + onDismiss = vm::dismissWarning, + ) + } + } + } +} diff --git a/app/src/main/java/kr/tkrmagid/easyappliance/ui/ConnectionWarning.kt b/app/src/main/java/kr/tkrmagid/easyappliance/ui/ConnectionWarning.kt new file mode 100644 index 0000000..85038f1 --- /dev/null +++ b/app/src/main/java/kr/tkrmagid/easyappliance/ui/ConnectionWarning.kt @@ -0,0 +1,108 @@ +package kr.tkrmagid.easyappliance.ui + +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.interaction.MutableInteractionSource +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.widthIn +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Close +import androidx.compose.material.icons.filled.Refresh +import androidx.compose.material.icons.filled.WifiOff +import androidx.compose.material3.Button +import androidx.compose.material3.Card +import androidx.compose.material3.CardDefaults +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.remember +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp + +/** + * Full-screen modal shown when the selected device / API is unreachable. + * Big headline for older users, a mandatory "다시 연결하기" button, and a small + * "x" in the corner for users who know to dismiss it manually. + */ +@Composable +fun ConnectionWarning( + deviceTypeLabel: String, + deviceName: String, + onRetry: () -> Unit, + onDismiss: () -> Unit, +) { + val noRipple = remember { MutableInteractionSource() } + Box( + modifier = Modifier + .fillMaxSize() + .background(Color(0xCC000000)) + // Swallow taps so the screen behind cannot be operated while offline. + .clickable(interactionSource = noRipple, indication = null) {}, + contentAlignment = Alignment.Center, + ) { + Card( + modifier = Modifier + .widthIn(max = 520.dp) + .fillMaxWidth() + .padding(24.dp), + colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surface), + ) { + Box(Modifier.fillMaxWidth()) { + IconButton( + onClick = onDismiss, + modifier = Modifier.align(Alignment.TopEnd).padding(4.dp), + ) { + Icon(Icons.Filled.Close, contentDescription = "닫기") + } + + Column( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 24.dp, vertical = 32.dp), + horizontalAlignment = Alignment.CenterHorizontally, + ) { + Icon( + Icons.Filled.WifiOff, + contentDescription = null, + tint = MaterialTheme.colorScheme.error, + modifier = Modifier.size(64.dp), + ) + Spacer(Modifier.height(16.dp)) + Text( + "${deviceTypeLabel}와 연결할 수 없습니다", + style = MaterialTheme.typography.headlineMedium, + color = MaterialTheme.colorScheme.error, + textAlign = TextAlign.Center, + ) + Spacer(Modifier.height(12.dp)) + Text( + "API 또는 '${deviceName}' 과(와) 연결 실패", + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + textAlign = TextAlign.Center, + ) + Spacer(Modifier.height(28.dp)) + Button( + onClick = onRetry, + modifier = Modifier.fillMaxWidth().height(80.dp), + ) { + Icon(Icons.Filled.Refresh, contentDescription = null, modifier = Modifier.size(28.dp)) + Text(" 다시 연결하기", style = MaterialTheme.typography.labelLarge) + } + } + } + } + } +} diff --git a/app/src/main/java/kr/tkrmagid/easyappliance/ui/DeviceImage.kt b/app/src/main/java/kr/tkrmagid/easyappliance/ui/DeviceImage.kt new file mode 100644 index 0000000..04a60e6 --- /dev/null +++ b/app/src/main/java/kr/tkrmagid/easyappliance/ui/DeviceImage.kt @@ -0,0 +1,37 @@ +package kr.tkrmagid.easyappliance.ui + +import androidx.compose.foundation.Image +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.layout.ContentScale +import androidx.compose.ui.res.painterResource +import coil.compose.AsyncImage +import kr.tkrmagid.easyappliance.data.DeviceImages + +/** + * Renders a device image from an image reference: a built-in drawable + * ("builtin:") or a file/content Uri string (custom photo). + */ +@Composable +fun DeviceImage( + imageRef: String, + modifier: Modifier = Modifier, + contentScale: ContentScale = ContentScale.Fit, +) { + val builtinRes = DeviceImages.resForRef(imageRef) + if (builtinRes != null) { + Image( + painter = painterResource(builtinRes), + contentDescription = null, + modifier = modifier, + contentScale = contentScale, + ) + } else { + AsyncImage( + model = imageRef, + contentDescription = null, + modifier = modifier, + contentScale = ContentScale.Crop, + ) + } +} diff --git a/app/src/main/java/kr/tkrmagid/easyappliance/ui/HomeScreen.kt b/app/src/main/java/kr/tkrmagid/easyappliance/ui/HomeScreen.kt new file mode 100644 index 0000000..99ea525 --- /dev/null +++ b/app/src/main/java/kr/tkrmagid/easyappliance/ui/HomeScreen.kt @@ -0,0 +1,268 @@ +package kr.tkrmagid.easyappliance.ui + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.BoxWithConstraints +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.widthIn +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.verticalScroll +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.PowerSettingsNew +import androidx.compose.material.icons.filled.Refresh +import androidx.compose.material3.Button +import androidx.compose.material3.ButtonDefaults +import androidx.compose.material3.Card +import androidx.compose.material3.CardDefaults +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.OutlinedButton +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp +import kr.tkrmagid.easyappliance.data.DeviceType +import androidx.compose.material.icons.filled.PlayArrow +import kr.tkrmagid.easyappliance.vm.HomeUiState +import kr.tkrmagid.easyappliance.vm.displayLabelFor +import kr.tkrmagid.easyappliance.vm.imageRefFor +import kr.tkrmagid.easyappliance.vm.macroFor + +private val BigButtonHeight = 84.dp + +@Composable +fun HomeScreen( + state: HomeUiState, + onTogglePower: (Boolean) -> Unit, + onRunMacro: () -> Unit, + onRefresh: () -> Unit, + modifier: Modifier = Modifier, +) { + BoxWithConstraints(modifier = modifier.fillMaxSize()) { + // Responsive: cap content width on large / unfolded screens, stack the + // power buttons vertically on very narrow screens (flip closed cover). + val narrow = maxWidth < 340.dp + val contentMaxWidth = if (maxWidth < 600.dp) maxWidth else 600.dp + + val device = state.selected + if (device == null) { + EmptyState() + return@BoxWithConstraints + } + + Column( + modifier = Modifier + .fillMaxSize() + .verticalScroll(rememberScrollState()) + .padding(20.dp), + horizontalAlignment = Alignment.CenterHorizontally, + ) { + Column( + modifier = Modifier.widthIn(max = contentMaxWidth).fillMaxWidth(), + horizontalAlignment = Alignment.CenterHorizontally, + ) { + DeviceImage( + imageRef = state.imageRefFor(device), + modifier = Modifier.size(if (narrow) 96.dp else 128.dp), + ) + Spacer(Modifier.height(12.dp)) + Text( + text = state.displayLabelFor(device), + style = MaterialTheme.typography.headlineLarge, + textAlign = TextAlign.Center, + ) + Spacer(Modifier.height(20.dp)) + + StatusCard(state) + + if (state.settings.showPowerControls) { + Spacer(Modifier.height(28.dp)) + val macroOn = state.macroFor(device)?.enabled == true + if (macroOn) { + MacroControls( + isOn = state.status?.powerOn == true, + onStart = onRunMacro, + onOff = { onTogglePower(false) }, + ) + } else { + PowerControls( + isOn = state.status?.powerOn == true, + stacked = narrow, + onTogglePower = onTogglePower, + ) + } + } + + Spacer(Modifier.height(20.dp)) + OutlinedButton( + onClick = onRefresh, + modifier = Modifier.fillMaxWidth().height(BigButtonHeight), + ) { + Icon(Icons.Filled.Refresh, contentDescription = null, modifier = Modifier.size(30.dp)) + Text(" 새로고침", style = MaterialTheme.typography.labelLarge) + } + } + } + } +} + +@Composable +private fun StatusCard(state: HomeUiState) { + Card( + modifier = Modifier.fillMaxWidth(), + colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceVariant), + elevation = CardDefaults.cardElevation(defaultElevation = 2.dp), + ) { + Column( + modifier = Modifier.fillMaxWidth().padding(24.dp), + horizontalAlignment = Alignment.CenterHorizontally, + ) { + if (state.loading && state.status == null) { + CircularProgressIndicator() + Spacer(Modifier.height(12.dp)) + Text("불러오는 중...", style = MaterialTheme.typography.bodyLarge) + return@Column + } + val status = state.status + val on = status?.powerOn == true + Text( + text = status?.operatingState ?: if (on) "켜짐" else "꺼짐", + style = MaterialTheme.typography.displayLarge, + color = if (on) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.onSurfaceVariant, + textAlign = TextAlign.Center, + ) + + if (state.settings.showRemainingTime && status?.remainingMinutes != null) { + Spacer(Modifier.height(12.dp)) + Text( + "남은 시간 약 ${status.remainingMinutes}분", + style = MaterialTheme.typography.titleLarge, + textAlign = TextAlign.Center, + ) + } + + if (state.selected?.type == DeviceType.AIRCONDITIONER) { + status?.currentTemperature?.let { + Spacer(Modifier.height(12.dp)) + val target = status.targetTemperature?.let { t -> " · 설정 ${t}도" } ?: "" + Text( + "현재 ${it}도$target", + style = MaterialTheme.typography.titleLarge, + textAlign = TextAlign.Center, + ) + } + } + + if (state.settings.showReservation) { + status?.reservation?.let { + Spacer(Modifier.height(12.dp)) + Text("예약: $it", style = MaterialTheme.typography.titleLarge, textAlign = TextAlign.Center) + } + } + } + } +} + +@Composable +private fun PowerControls(isOn: Boolean, stacked: Boolean, onTogglePower: (Boolean) -> Unit) { + val onButton: @Composable (Modifier) -> Unit = { m -> + Button( + onClick = { onTogglePower(true) }, + enabled = !isOn, + modifier = m.height(BigButtonHeight), + colors = ButtonDefaults.buttonColors( + containerColor = MaterialTheme.colorScheme.secondary, + contentColor = Color.White, + ), + ) { + Icon(Icons.Filled.PowerSettingsNew, contentDescription = null, modifier = Modifier.size(30.dp)) + Text(" 켜기", style = MaterialTheme.typography.labelLarge) + } + } + val offButton: @Composable (Modifier) -> Unit = { m -> + Button( + onClick = { onTogglePower(false) }, + enabled = isOn, + modifier = m.height(BigButtonHeight), + colors = ButtonDefaults.buttonColors( + containerColor = MaterialTheme.colorScheme.error, + contentColor = Color.White, + ), + ) { + Icon(Icons.Filled.PowerSettingsNew, contentDescription = null, modifier = Modifier.size(30.dp)) + Text(" 끄기", style = MaterialTheme.typography.labelLarge) + } + } + + if (stacked) { + Column(Modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(16.dp)) { + onButton(Modifier.fillMaxWidth()) + offButton(Modifier.fillMaxWidth()) + } + } else { + Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(16.dp)) { + onButton(Modifier.weight(1f)) + offButton(Modifier.weight(1f)) + } + } +} + +@Composable +private fun MacroControls(isOn: Boolean, onStart: () -> Unit, onOff: () -> Unit) { + Column(Modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(16.dp)) { + Button( + onClick = onStart, + modifier = Modifier.fillMaxWidth().height(96.dp), + colors = ButtonDefaults.buttonColors( + containerColor = MaterialTheme.colorScheme.secondary, + contentColor = Color.White, + ), + ) { + Icon(Icons.Filled.PlayArrow, contentDescription = null, modifier = Modifier.size(36.dp)) + Text(" 시작", style = MaterialTheme.typography.headlineMedium) + } + Button( + onClick = onOff, + enabled = isOn, + modifier = Modifier.fillMaxWidth().height(BigButtonHeight), + colors = ButtonDefaults.buttonColors( + containerColor = MaterialTheme.colorScheme.error, + contentColor = Color.White, + ), + ) { + Icon(Icons.Filled.PowerSettingsNew, contentDescription = null, modifier = Modifier.size(30.dp)) + Text(" 끄기", style = MaterialTheme.typography.labelLarge) + } + } +} + +@Composable +private fun EmptyState() { + Column( + modifier = Modifier.fillMaxSize(), + verticalArrangement = Arrangement.Center, + horizontalAlignment = Alignment.CenterHorizontally, + ) { + Text( + "등록된 기기가 없습니다", + style = MaterialTheme.typography.headlineMedium, + textAlign = TextAlign.Center, + ) + Spacer(Modifier.height(16.dp)) + Text( + "관리자 화면에서 기기를 선택해 주세요.\n(화면 위쪽 양쪽 모서리를 동시에 길게 누르세요)", + style = MaterialTheme.typography.bodyLarge, + textAlign = TextAlign.Center, + ) + } +} diff --git a/app/src/main/java/kr/tkrmagid/easyappliance/ui/MacroEditor.kt b/app/src/main/java/kr/tkrmagid/easyappliance/ui/MacroEditor.kt new file mode 100644 index 0000000..93d8cb2 --- /dev/null +++ b/app/src/main/java/kr/tkrmagid/easyappliance/ui/MacroEditor.kt @@ -0,0 +1,197 @@ +package kr.tkrmagid.easyappliance.ui + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.FlowRow +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.ExperimentalLayoutApi +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Delete +import androidx.compose.material3.Button +import androidx.compose.material3.Card +import androidx.compose.material3.CardDefaults +import androidx.compose.material3.FilterChip +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.Switch +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp +import kr.tkrmagid.easyappliance.data.Device +import kr.tkrmagid.easyappliance.data.DeviceMacro +import kr.tkrmagid.easyappliance.data.DeviceType +import kr.tkrmagid.easyappliance.data.MacroStep + +private const val TEMP_CAP = "custom.washerWaterTemperature" +private const val TEMP_CMD = "setWasherWaterTemperature" +private const val LEVEL_CAP = "custom.washerWaterLevel" +private const val LEVEL_CMD = "setWasherWaterLevel" + +private data class Preset(val value: String, val label: String) + +private val TEMP_PRESETS = listOf( + Preset("cold", "냉수"), + Preset("30", "30도"), + Preset("40", "40도"), + Preset("60", "60도"), +) +private val LEVEL_PRESETS = listOf( + Preset("low", "낮음"), + Preset("medium", "중간"), + Preset("high", "높음"), +) + +@OptIn(ExperimentalLayoutApi::class) +@Composable +fun MacroEditor(device: Device, macro: DeviceMacro, onChange: (DeviceMacro) -> Unit) { + Card( + modifier = Modifier.fillMaxWidth(), + colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceVariant), + ) { + Column(Modifier.fillMaxWidth().padding(12.dp)) { + Row( + Modifier.fillMaxWidth().padding(4.dp), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.SpaceBetween, + ) { + Text( + "매크로 사용 (시작 시 자동 설정)", + style = MaterialTheme.typography.bodyLarge, + modifier = Modifier.weight(1f), + ) + Switch( + checked = macro.enabled, + onCheckedChange = { onChange(macro.copy(enabled = it)) }, + ) + } + + if (!macro.enabled) return@Column + + if (device.type == DeviceType.WASHER) { + Spacer(Modifier.height(8.dp)) + Text("물 온도", style = MaterialTheme.typography.bodyMedium) + FlowRow(horizontalArrangement = Arrangement.spacedBy(8.dp)) { + TEMP_PRESETS.forEach { p -> + val selected = macro.steps.any { it.capability == TEMP_CAP && it.args == listOf(p.value) } + FilterChip( + selected = selected, + onClick = { + onChange( + macro.upsert( + MacroStep(TEMP_CAP, TEMP_CMD, listOf(p.value), "물 온도 ${p.label}"), + ), + ) + }, + label = { Text(p.label) }, + ) + } + } + Spacer(Modifier.height(8.dp)) + Text("수위(물 높이)", style = MaterialTheme.typography.bodyMedium) + FlowRow(horizontalArrangement = Arrangement.spacedBy(8.dp)) { + LEVEL_PRESETS.forEach { p -> + val selected = macro.steps.any { it.capability == LEVEL_CAP && it.args == listOf(p.value) } + FilterChip( + selected = selected, + onClick = { + onChange( + macro.upsert( + MacroStep(LEVEL_CAP, LEVEL_CMD, listOf(p.value), "수위 ${p.label}"), + ), + ) + }, + label = { Text(p.label) }, + ) + } + } + Spacer(Modifier.height(4.dp)) + Text( + "※ 삼성 세탁기 기준 예시 명령입니다. 실제 기기에서 동작하지 않으면 아래 '직접 추가'로 조정하세요.", + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } + + Spacer(Modifier.height(12.dp)) + Text("현재 매크로 동작", style = MaterialTheme.typography.bodyMedium) + if (macro.steps.isEmpty()) { + Text( + "설정된 동작이 없습니다. 시작 시 전원만 켜집니다.", + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + modifier = Modifier.padding(vertical = 4.dp), + ) + } else { + macro.steps.forEach { step -> + Row( + Modifier.fillMaxWidth().padding(vertical = 2.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + Text( + step.label.ifBlank { "${step.capability} · ${step.command}" }, + style = MaterialTheme.typography.bodyLarge, + modifier = Modifier.weight(1f), + ) + IconButton(onClick = { onChange(macro.removeStep(step)) }) { + Icon(Icons.Filled.Delete, contentDescription = "삭제") + } + } + } + } + + Spacer(Modifier.height(12.dp)) + AdvancedStepAdder(onAdd = { onChange(macro.upsert(it)) }) + } + } +} + +@Composable +private fun AdvancedStepAdder(onAdd: (MacroStep) -> Unit) { + var cap by remember { mutableStateOf("") } + var cmd by remember { mutableStateOf("") } + var arg by remember { mutableStateOf("") } + Column(Modifier.fillMaxWidth()) { + Text("직접 추가 (고급)", style = MaterialTheme.typography.bodyMedium) + OutlinedTextField( + value = cap, onValueChange = { cap = it }, singleLine = true, + label = { Text("capability") }, modifier = Modifier.fillMaxWidth(), + ) + OutlinedTextField( + value = cmd, onValueChange = { cmd = it }, singleLine = true, + label = { Text("command") }, modifier = Modifier.fillMaxWidth(), + ) + OutlinedTextField( + value = arg, onValueChange = { arg = it }, singleLine = true, + label = { Text("argument (선택)") }, modifier = Modifier.fillMaxWidth(), + ) + Spacer(Modifier.height(8.dp)) + Button( + onClick = { + if (cap.isNotBlank() && cmd.isNotBlank()) { + val args = if (arg.isBlank()) emptyList() else listOf(arg.trim()) + onAdd(MacroStep(cap.trim(), cmd.trim(), args, "$cap · $cmd")) + cap = ""; cmd = ""; arg = "" + } + }, + modifier = Modifier.height(52.dp), + ) { Text("명령 추가") } + } +} + +private fun DeviceMacro.upsert(step: MacroStep): DeviceMacro = + copy(steps = steps.filterNot { it.capability == step.capability } + step) + +private fun DeviceMacro.removeStep(step: MacroStep): DeviceMacro = + copy(steps = steps.filterNot { it.capability == step.capability && it.command == step.command && it.args == step.args }) diff --git a/app/src/main/java/kr/tkrmagid/easyappliance/ui/theme/Theme.kt b/app/src/main/java/kr/tkrmagid/easyappliance/ui/theme/Theme.kt new file mode 100644 index 0000000..10b6cd2 --- /dev/null +++ b/app/src/main/java/kr/tkrmagid/easyappliance/ui/theme/Theme.kt @@ -0,0 +1,50 @@ +package kr.tkrmagid.easyappliance.ui.theme + +import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.lightColorScheme +import androidx.compose.material3.darkColorScheme +import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.Color + +// High-contrast, calm palette tuned for older users. +private val BrandPrimary = Color(0xFF1565C0) +private val BrandPrimaryDark = Color(0xFF90CAF9) + +private val LightColors = lightColorScheme( + primary = BrandPrimary, + onPrimary = Color.White, + primaryContainer = Color(0xFFD6E4FF), + onPrimaryContainer = Color(0xFF001A41), + secondary = Color(0xFF2E7D32), + onSecondary = Color.White, + error = Color(0xFFC62828), + onError = Color.White, + background = Color(0xFFFDFDFD), + onBackground = Color(0xFF1A1A1A), + surface = Color(0xFFFFFFFF), + onSurface = Color(0xFF1A1A1A), + surfaceVariant = Color(0xFFEEF2F7), + onSurfaceVariant = Color(0xFF33383E), +) + +private val DarkColors = darkColorScheme( + primary = BrandPrimaryDark, + onPrimary = Color(0xFF00305F), + background = Color(0xFF121212), + onBackground = Color(0xFFF2F2F2), + surface = Color(0xFF1E1E1E), + onSurface = Color(0xFFF2F2F2), +) + +@Composable +fun EasyApplianceTheme( + darkTheme: Boolean = isSystemInDarkTheme(), + content: @Composable () -> Unit, +) { + MaterialTheme( + colorScheme = if (darkTheme) DarkColors else LightColors, + typography = ElderlyTypography, + content = content, + ) +} diff --git a/app/src/main/java/kr/tkrmagid/easyappliance/ui/theme/Type.kt b/app/src/main/java/kr/tkrmagid/easyappliance/ui/theme/Type.kt new file mode 100644 index 0000000..8f1f528 --- /dev/null +++ b/app/src/main/java/kr/tkrmagid/easyappliance/ui/theme/Type.kt @@ -0,0 +1,17 @@ +package kr.tkrmagid.easyappliance.ui.theme + +import androidx.compose.material3.Typography +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.sp + +// Larger-than-default type scale so text stays readable for older users. +val ElderlyTypography = Typography( + displayLarge = TextStyle(fontWeight = FontWeight.Bold, fontSize = 48.sp, lineHeight = 56.sp), + headlineLarge = TextStyle(fontWeight = FontWeight.Bold, fontSize = 40.sp, lineHeight = 48.sp), + headlineMedium = TextStyle(fontWeight = FontWeight.Bold, fontSize = 32.sp, lineHeight = 40.sp), + titleLarge = TextStyle(fontWeight = FontWeight.Bold, fontSize = 28.sp, lineHeight = 34.sp), + bodyLarge = TextStyle(fontWeight = FontWeight.Normal, fontSize = 22.sp, lineHeight = 30.sp), + bodyMedium = TextStyle(fontWeight = FontWeight.Normal, fontSize = 20.sp, lineHeight = 28.sp), + labelLarge = TextStyle(fontWeight = FontWeight.Bold, fontSize = 24.sp, lineHeight = 30.sp), +) diff --git a/app/src/main/java/kr/tkrmagid/easyappliance/vm/AppViewModel.kt b/app/src/main/java/kr/tkrmagid/easyappliance/vm/AppViewModel.kt new file mode 100644 index 0000000..769c5c8 --- /dev/null +++ b/app/src/main/java/kr/tkrmagid/easyappliance/vm/AppViewModel.kt @@ -0,0 +1,190 @@ +package kr.tkrmagid.easyappliance.vm + +import android.app.Application +import androidx.lifecycle.AndroidViewModel +import androidx.lifecycle.viewModelScope +import kr.tkrmagid.easyappliance.data.AppSettings +import kr.tkrmagid.easyappliance.data.Device +import kr.tkrmagid.easyappliance.data.DeviceRepository +import kr.tkrmagid.easyappliance.data.DeviceStatus +import kr.tkrmagid.easyappliance.data.MockDeviceRepository +import kr.tkrmagid.easyappliance.data.DeviceImages +import kr.tkrmagid.easyappliance.data.DeviceMacro +import kr.tkrmagid.easyappliance.data.SettingsRepository +import kr.tkrmagid.easyappliance.data.smartthings.SmartThingsClient +import kr.tkrmagid.easyappliance.data.smartthings.SmartThingsDeviceRepository +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.flow.update +import kotlinx.coroutines.launch + +data class HomeUiState( + val loading: Boolean = true, + val devices: List = emptyList(), + val selected: Device? = null, + val status: DeviceStatus? = null, + val settings: AppSettings = AppSettings(), + val usingRealApi: Boolean = false, + /** False when the selected device / API cannot be reached. */ + val connected: Boolean = true, + /** True after the user closes the warning with the small "x". */ + val warningDismissed: Boolean = false, + val error: String? = null, +) { + val showConnectionWarning: Boolean get() = !connected && !warningDismissed +} + +class AppViewModel(app: Application) : AndroidViewModel(app) { + + private val settingsRepo = SettingsRepository(app) + private var deviceRepo: DeviceRepository = MockDeviceRepository() + private var activeToken: String? = null + private var lastSelectedId: String? = null + /** Preview flag so the admin can see the warning UI without a real outage. */ + private var forcedWarning = false + + private val _state = MutableStateFlow(HomeUiState()) + val state: StateFlow = _state.asStateFlow() + + init { + viewModelScope.launch { + settingsRepo.settings.collect { settings -> applySettings(settings) } + } + } + + private suspend fun applySettings(settings: AppSettings) { + val tokenChanged = settings.smartThingsToken != activeToken + if (tokenChanged) { + activeToken = settings.smartThingsToken + deviceRepo = if (settings.smartThingsToken.isNullOrBlank()) { + MockDeviceRepository() + } else { + SmartThingsDeviceRepository(SmartThingsClient.create(settings.smartThingsToken)) + } + } + _state.update { + it.copy(settings = settings, usingRealApi = !settings.smartThingsToken.isNullOrBlank()) + } + if (tokenChanged || _state.value.devices.isEmpty()) { + loadDevices() + } + resolveSelectionAndStatus(settings) + } + + private suspend fun loadDevices() { + runCatching { deviceRepo.listDevices() } + .onSuccess { devices -> + _state.update { it.copy(devices = devices, connected = true) } + } + .onFailure { + _state.update { it.copy(loading = false, connected = false) } + } + } + + private suspend fun resolveSelectionAndStatus(settings: AppSettings) { + val devices = _state.value.devices + val selected = devices.firstOrNull { it.id == settings.selectedDeviceId } + ?: devices.firstOrNull() + _state.update { it.copy(selected = selected) } + if (selected == null) { + _state.update { it.copy(loading = false) } + return + } + if (selected.id != lastSelectedId) { + lastSelectedId = selected.id + loadStatus(selected.id) + } else { + _state.update { it.copy(loading = false) } + } + } + + private suspend fun loadStatus(deviceId: String) { + runCatching { deviceRepo.getStatus(deviceId) } + .onSuccess { status -> + _state.update { + it.copy( + loading = false, + status = status, + connected = !forcedWarning, + warningDismissed = if (!forcedWarning) false else it.warningDismissed, + error = null, + ) + } + } + .onFailure { + _state.update { it.copy(loading = false, connected = false) } + } + } + + /** Refresh selected device status; also used by the periodic poll. */ + fun refresh() { + val id = _state.value.selected?.id ?: return + viewModelScope.launch { loadStatus(id) } + } + + /** "다시 연결하기" — clear preview flag and re-attempt list + status. */ + fun retryConnection() { + forcedWarning = false + viewModelScope.launch { + loadDevices() + resolveSelectionAndStatus(_state.value.settings) + } + } + + fun dismissWarning() { + _state.update { it.copy(warningDismissed = true) } + } + + /** Admin preview of the disconnection warning (testing aid). */ + fun previewConnectionWarning() { + forcedWarning = true + _state.update { it.copy(connected = false, warningDismissed = false) } + } + + fun selectDevice(deviceId: String) { + viewModelScope.launch { settingsRepo.setSelectedDevice(deviceId) } + } + + fun togglePower(on: Boolean) { + val id = _state.value.selected?.id ?: return + viewModelScope.launch { + runCatching { deviceRepo.setPower(id, on) } + .onFailure { _state.update { s -> s.copy(connected = false) } } + loadStatus(id) + } + } + + /** Run the selected device's start macro (apply presets, then start). */ + fun runMacro() { + val id = _state.value.selected?.id ?: return + val macro = _state.value.settings.deviceMacros[id] ?: return + viewModelScope.launch { + runCatching { deviceRepo.runMacro(id, macro.steps) } + .onFailure { _state.update { s -> s.copy(connected = false) } } + loadStatus(id) + } + } + + fun setDeviceMacro(deviceId: String, macro: DeviceMacro) { + viewModelScope.launch { settingsRepo.setDeviceMacro(deviceId, macro) } + } + + fun setShowRemainingTime(value: Boolean) { viewModelScope.launch { settingsRepo.setShowRemainingTime(value) } } + fun setShowReservation(value: Boolean) { viewModelScope.launch { settingsRepo.setShowReservation(value) } } + fun setShowPowerControls(value: Boolean) { viewModelScope.launch { settingsRepo.setShowPowerControls(value) } } + fun setToken(token: String) { viewModelScope.launch { settingsRepo.setToken(token) } } + fun setDeviceLabel(deviceId: String, label: String) { viewModelScope.launch { settingsRepo.setDeviceLabel(deviceId, label) } } + fun setDeviceImage(deviceId: String, imageRef: String) { viewModelScope.launch { settingsRepo.setDeviceImage(deviceId, imageRef) } } +} + +/** Display name for a device, applying the admin's custom-name override. */ +fun HomeUiState.displayLabelFor(device: Device): String = + settings.labelOverrides[device.id]?.takeIf { it.isNotBlank() } ?: device.label + +/** Image reference for a device: custom override, else the type default. */ +fun HomeUiState.imageRefFor(device: Device): String = + settings.imageOverrides[device.id] ?: DeviceImages.defaultRefFor(device.type) + +/** The device's macro, or null if none configured. */ +fun HomeUiState.macroFor(device: Device): DeviceMacro? = settings.deviceMacros[device.id] diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000..017b7af --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/img_aircon.xml b/app/src/main/res/drawable/img_aircon.xml new file mode 100644 index 0000000..36c72de --- /dev/null +++ b/app/src/main/res/drawable/img_aircon.xml @@ -0,0 +1,11 @@ + + + + + + diff --git a/app/src/main/res/drawable/img_device.xml b/app/src/main/res/drawable/img_device.xml new file mode 100644 index 0000000..78d7ac8 --- /dev/null +++ b/app/src/main/res/drawable/img_device.xml @@ -0,0 +1,8 @@ + + + + + diff --git a/app/src/main/res/drawable/img_fridge.xml b/app/src/main/res/drawable/img_fridge.xml new file mode 100644 index 0000000..0e8cddd --- /dev/null +++ b/app/src/main/res/drawable/img_fridge.xml @@ -0,0 +1,9 @@ + + + + + + diff --git a/app/src/main/res/drawable/img_tv.xml b/app/src/main/res/drawable/img_tv.xml new file mode 100644 index 0000000..358e42d --- /dev/null +++ b/app/src/main/res/drawable/img_tv.xml @@ -0,0 +1,9 @@ + + + + + + diff --git a/app/src/main/res/drawable/img_washer.xml b/app/src/main/res/drawable/img_washer.xml new file mode 100644 index 0000000..5961f82 --- /dev/null +++ b/app/src/main/res/drawable/img_washer.xml @@ -0,0 +1,10 @@ + + + + + + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..a8a8fa5 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..a8a8fa5 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..928ecd6 --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,6 @@ + + + #1565C0 + #FFFFFF + #1565C0 + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..f9fb2d6 --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + 쉬운 가전 리모컨 + diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..6ead39e --- /dev/null +++ b/app/src/main/res/values/themes.xml @@ -0,0 +1,7 @@ + + + + diff --git a/app/src/test/java/kr/tkrmagid/easyappliance/MockDeviceRepositoryTest.kt b/app/src/test/java/kr/tkrmagid/easyappliance/MockDeviceRepositoryTest.kt new file mode 100644 index 0000000..1bd20f1 --- /dev/null +++ b/app/src/test/java/kr/tkrmagid/easyappliance/MockDeviceRepositoryTest.kt @@ -0,0 +1,50 @@ +package kr.tkrmagid.easyappliance + +import kotlinx.coroutines.test.runTest +import kr.tkrmagid.easyappliance.data.MockDeviceRepository +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test + +class MockDeviceRepositoryTest { + + @Test + fun listsBothSampleDevices() = runTest { + val repo = MockDeviceRepository() + val ids = repo.listDevices().map { it.id } + assertEquals(listOf("washer-1", "aircon-1"), ids) + } + + @Test + fun powerToggleIsReflectedInStatus() = runTest { + val repo = MockDeviceRepository() + assertFalse(repo.getStatus("washer-1").powerOn) + + repo.setPower("washer-1", true) + val on = repo.getStatus("washer-1") + assertTrue(on.powerOn) + assertEquals("운전 중", on.operatingState) + assertEquals(32, on.remainingMinutes) + + repo.setPower("washer-1", false) + assertFalse(repo.getStatus("washer-1").powerOn) + } + + @Test + fun runMacroStartsDevice() = runTest { + val repo = MockDeviceRepository() + assertFalse(repo.getStatus("washer-1").powerOn) + repo.runMacro("washer-1", emptyList()) + assertTrue(repo.getStatus("washer-1").powerOn) + } + + @Test + fun airconReportsTemperatureWhenOn() = runTest { + val repo = MockDeviceRepository() + val status = repo.getStatus("aircon-1") + assertTrue(status.powerOn) + assertEquals(27, status.currentTemperature) + assertEquals(24, status.targetTemperature) + } +} diff --git a/app/src/test/java/kr/tkrmagid/easyappliance/SmartThingsStatusMapperTest.kt b/app/src/test/java/kr/tkrmagid/easyappliance/SmartThingsStatusMapperTest.kt new file mode 100644 index 0000000..a41da8b --- /dev/null +++ b/app/src/test/java/kr/tkrmagid/easyappliance/SmartThingsStatusMapperTest.kt @@ -0,0 +1,74 @@ +package kr.tkrmagid.easyappliance + +import kr.tkrmagid.easyappliance.data.DeviceType +import kr.tkrmagid.easyappliance.data.smartthings.SmartThingsStatusMapper +import kotlinx.serialization.json.Json +import kotlinx.serialization.json.jsonObject +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Test + +class SmartThingsStatusMapperTest { + + private fun obj(json: String) = Json.parseToJsonElement(json).jsonObject + + @Test + fun mapsRunningWasher() { + val status = obj( + """ + {"components":{"main":{ + "switch":{"switch":{"value":"on"}}, + "washerOperatingState":{"machineState":{"value":"run"}}, + "samsungce.washerOperatingState":{"remainingTime":{"value":1980}} + }}} + """.trimIndent(), + ) + val result = SmartThingsStatusMapper.map(status, DeviceType.WASHER) + assertTrue(result.powerOn) + assertEquals("운전 중", result.operatingState) + assertEquals(33, result.remainingMinutes) + } + + @Test + fun mapsAircon() { + val status = obj( + """ + {"components":{"main":{ + "switch":{"switch":{"value":"on"}}, + "temperatureMeasurement":{"temperature":{"value":27}}, + "thermostatCoolingSetpoint":{"coolingSetpoint":{"value":24}} + }}} + """.trimIndent(), + ) + val result = SmartThingsStatusMapper.map(status, DeviceType.AIRCONDITIONER) + assertTrue(result.powerOn) + assertEquals("냉방 중", result.operatingState) + assertEquals(27, result.currentTemperature) + assertEquals(24, result.targetTemperature) + } + + @Test + fun offDeviceHasNoTarget() { + val status = obj( + """ + {"components":{"main":{ + "switch":{"switch":{"value":"off"}}, + "temperatureMeasurement":{"temperature":{"value":28}}, + "thermostatCoolingSetpoint":{"coolingSetpoint":{"value":22}} + }}} + """.trimIndent(), + ) + val result = SmartThingsStatusMapper.map(status, DeviceType.AIRCONDITIONER) + assertTrue(!result.powerOn) + assertEquals("꺼짐", result.operatingState) + assertEquals(28, result.currentTemperature) + assertNull(result.targetTemperature) + } + + @Test + fun missingComponentsIsSafe() { + val result = SmartThingsStatusMapper.map(obj("""{}"""), DeviceType.WASHER) + assertTrue(!result.powerOn) + } +} diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..132ad8d --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,6 @@ +plugins { + alias(libs.plugins.android.application) apply false + alias(libs.plugins.kotlin.android) apply false + alias(libs.plugins.kotlin.compose) apply false + alias(libs.plugins.kotlin.serialization) apply false +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..71e8721 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,5 @@ +org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 +org.gradle.caching=true +android.useAndroidX=true +android.nonTransitiveRClass=true +kotlin.code.style=official diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..5c69408 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,45 @@ +[versions] +agp = "8.7.3" +kotlin = "2.0.21" +coreKtx = "1.15.0" +lifecycle = "2.8.7" +activityCompose = "1.9.3" +composeBom = "2024.12.01" +navigationCompose = "2.8.5" +datastore = "1.1.1" +serialization = "1.7.3" +retrofit = "2.11.0" +okhttp = "4.12.0" +retrofitSerialization = "1.0.0" +coil = "2.7.0" +junit = "4.13.2" +coroutinesTest = "1.9.0" + +[libraries] +androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } +androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycle" } +androidx-lifecycle-runtime-compose = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "lifecycle" } +androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "lifecycle" } +androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" } +androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" } +androidx-ui = { group = "androidx.compose.ui", name = "ui" } +androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" } +androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" } +androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" } +androidx-material3 = { group = "androidx.compose.material3", name = "material3" } +androidx-material-icons-extended = { group = "androidx.compose.material", name = "material-icons-extended" } +androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "navigationCompose" } +androidx-datastore-preferences = { group = "androidx.datastore", name = "datastore-preferences", version.ref = "datastore" } +kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "serialization" } +retrofit = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "retrofit" } +okhttp-logging = { group = "com.squareup.okhttp3", name = "logging-interceptor", version.ref = "okhttp" } +retrofit-kotlinx-serialization = { group = "com.jakewharton.retrofit", name = "retrofit2-kotlinx-serialization-converter", version.ref = "retrofitSerialization" } +coil-compose = { group = "io.coil-kt", name = "coil-compose", version.ref = "coil" } +junit = { group = "junit", name = "junit", version.ref = "junit" } +kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "coroutinesTest" } + +[plugins] +android-application = { id = "com.android.application", version.ref = "agp" } +kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } +kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } +kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..a4b76b9530d66f5e68d973ea569d8e19de379189 GIT binary patch literal 43583 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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 GZ~q4|mN%#X literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..e2847c8 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..f5feea6 --- /dev/null +++ b/gradlew @@ -0,0 +1,252 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.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.apache.org/licenses/LICENSE-2.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. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..9b42019 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..aa77249 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,23 @@ +pluginManagement { + repositories { + google { + content { + includeGroupByRegex("com\\.android.*") + includeGroupByRegex("com\\.google.*") + includeGroupByRegex("androidx.*") + } + } + mavenCentral() + gradlePluginPortal() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} + +rootProject.name = "EasyAppliance" +include(":app")